Fixed nicklist display bug and added term window title
This commit is contained in:
parent
c32bc12d8e
commit
4ad98ebc52
@ -1095,7 +1095,6 @@ gui_switch_to_window (t_gui_window *window)
|
|||||||
if (!another_window)
|
if (!another_window)
|
||||||
{
|
{
|
||||||
/* create new windows */
|
/* create new windows */
|
||||||
gui_calculate_pos_size (window);
|
|
||||||
window->win_title = newwin (1, COLS, 0, 0);
|
window->win_title = newwin (1, COLS, 0, 0);
|
||||||
window->win_chat = newwin (window->win_chat_height,
|
window->win_chat = newwin (window->win_chat_height,
|
||||||
window->win_chat_width,
|
window->win_chat_width,
|
||||||
@ -1113,12 +1112,12 @@ gui_switch_to_window (t_gui_window *window)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
gui_calculate_pos_size (window);
|
|
||||||
|
|
||||||
/* create chat & nick windows */
|
/* create chat & nick windows */
|
||||||
if (WIN_IS_CHANNEL(window) && !(window->win_nick))
|
if (WIN_IS_CHANNEL(window))
|
||||||
{
|
{
|
||||||
/* add nick list window */
|
/* (re)create nicklist window */
|
||||||
|
if (window->win_nick)
|
||||||
|
delwin (window->win_nick);
|
||||||
delwin (window->win_chat);
|
delwin (window->win_chat);
|
||||||
window->win_chat = newwin (window->win_chat_height,
|
window->win_chat = newwin (window->win_chat_height,
|
||||||
window->win_chat_width,
|
window->win_chat_width,
|
||||||
@ -1129,10 +1128,11 @@ gui_switch_to_window (t_gui_window *window)
|
|||||||
window->win_nick_y,
|
window->win_nick_y,
|
||||||
window->win_nick_x);
|
window->win_nick_x);
|
||||||
}
|
}
|
||||||
if (!(WIN_IS_CHANNEL(window)) && window->win_nick)
|
if (!(WIN_IS_CHANNEL(window)))
|
||||||
{
|
{
|
||||||
/* remove nick list window */
|
/* remove nick list window */
|
||||||
delwin (window->win_nick);
|
if (window->win_nick)
|
||||||
|
delwin (window->win_nick);
|
||||||
window->win_nick = NULL;
|
window->win_nick = NULL;
|
||||||
delwin (window->win_chat);
|
delwin (window->win_chat);
|
||||||
window->win_chat = newwin (window->win_chat_height,
|
window->win_chat = newwin (window->win_chat_height,
|
||||||
@ -1505,6 +1505,12 @@ gui_init ()
|
|||||||
|
|
||||||
signal (SIGWINCH, gui_resize_term_handler);
|
signal (SIGWINCH, gui_resize_term_handler);
|
||||||
|
|
||||||
|
#ifdef __LINUX__
|
||||||
|
/* set title for term window, not for console */
|
||||||
|
if (strcmp (getenv ("TERM"), "linux") != 0)
|
||||||
|
printf ("\e]2;" WEECHAT_NAME " " WEECHAT_VERSION "\a\e]1;" WEECHAT_NAME " " WEECHAT_VERSION "\a");
|
||||||
|
#endif
|
||||||
|
|
||||||
gui_ready = 1;
|
gui_ready = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1095,7 +1095,6 @@ gui_switch_to_window (t_gui_window *window)
|
|||||||
if (!another_window)
|
if (!another_window)
|
||||||
{
|
{
|
||||||
/* create new windows */
|
/* create new windows */
|
||||||
gui_calculate_pos_size (window);
|
|
||||||
window->win_title = newwin (1, COLS, 0, 0);
|
window->win_title = newwin (1, COLS, 0, 0);
|
||||||
window->win_chat = newwin (window->win_chat_height,
|
window->win_chat = newwin (window->win_chat_height,
|
||||||
window->win_chat_width,
|
window->win_chat_width,
|
||||||
@ -1113,12 +1112,12 @@ gui_switch_to_window (t_gui_window *window)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
gui_calculate_pos_size (window);
|
|
||||||
|
|
||||||
/* create chat & nick windows */
|
/* create chat & nick windows */
|
||||||
if (WIN_IS_CHANNEL(window) && !(window->win_nick))
|
if (WIN_IS_CHANNEL(window))
|
||||||
{
|
{
|
||||||
/* add nick list window */
|
/* (re)create nicklist window */
|
||||||
|
if (window->win_nick)
|
||||||
|
delwin (window->win_nick);
|
||||||
delwin (window->win_chat);
|
delwin (window->win_chat);
|
||||||
window->win_chat = newwin (window->win_chat_height,
|
window->win_chat = newwin (window->win_chat_height,
|
||||||
window->win_chat_width,
|
window->win_chat_width,
|
||||||
@ -1129,10 +1128,11 @@ gui_switch_to_window (t_gui_window *window)
|
|||||||
window->win_nick_y,
|
window->win_nick_y,
|
||||||
window->win_nick_x);
|
window->win_nick_x);
|
||||||
}
|
}
|
||||||
if (!(WIN_IS_CHANNEL(window)) && window->win_nick)
|
if (!(WIN_IS_CHANNEL(window)))
|
||||||
{
|
{
|
||||||
/* remove nick list window */
|
/* remove nick list window */
|
||||||
delwin (window->win_nick);
|
if (window->win_nick)
|
||||||
|
delwin (window->win_nick);
|
||||||
window->win_nick = NULL;
|
window->win_nick = NULL;
|
||||||
delwin (window->win_chat);
|
delwin (window->win_chat);
|
||||||
window->win_chat = newwin (window->win_chat_height,
|
window->win_chat = newwin (window->win_chat_height,
|
||||||
@ -1505,6 +1505,12 @@ gui_init ()
|
|||||||
|
|
||||||
signal (SIGWINCH, gui_resize_term_handler);
|
signal (SIGWINCH, gui_resize_term_handler);
|
||||||
|
|
||||||
|
#ifdef __LINUX__
|
||||||
|
/* set title for term window, not for console */
|
||||||
|
if (strcmp (getenv ("TERM"), "linux") != 0)
|
||||||
|
printf ("\e]2;" WEECHAT_NAME " " WEECHAT_VERSION "\a\e]1;" WEECHAT_NAME " " WEECHAT_VERSION "\a");
|
||||||
|
#endif
|
||||||
|
|
||||||
gui_ready = 1;
|
gui_ready = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user