diff options
author | Sebastien Helleu <flashcode@flashtux.org> | 2005-01-26 22:21:58 +0000 |
---|---|---|
committer | Sebastien Helleu <flashcode@flashtux.org> | 2005-01-26 22:21:58 +0000 |
commit | 9a7b7af41c4712e3b24c87278b90c5de100f8ab4 (patch) | |
tree | 318d598b10b1e36bad052004a955be86d5f1087a /src/gui | |
parent | 7debba0eca70d31a6649022ec948acbac5f879f4 (diff) | |
download | weechat-9a7b7af41c4712e3b24c87278b90c5de100f8ab4.zip |
Away nicks are now displayed with another color
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/curses/gui-display.c | 9 | ||||
-rw-r--r-- | src/gui/curses/gui-input.c | 7 | ||||
-rw-r--r-- | src/gui/gui.h | 33 |
3 files changed, 31 insertions, 18 deletions
diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c index 3cdba098b..db77184be 100644 --- a/src/gui/curses/gui-display.c +++ b/src/gui/curses/gui-display.c @@ -60,7 +60,7 @@ t_gui_color gui_colors[] = }; char *nicks_colors[COLOR_WIN_NICK_NUMBER] = -{ "cyan", "magenta", "green", "brown", "lightblue", "gray", +{ "cyan", "magenta", "green", "brown", "lightblue", "default", "lightcyan", "lightmagenta", "lightgreen", "blue" }; int color_attr[NUM_COLORS]; @@ -858,7 +858,9 @@ gui_draw_buffer_nick (t_gui_buffer *buffer, int erase) } } } - gui_window_set_color (ptr_win->win_nick, COLOR_WIN_NICK); + gui_window_set_color (ptr_win->win_nick, + (ptr_nick->is_away) ? + COLOR_WIN_NICK_AWAY : COLOR_WIN_NICK); mvwprintw (ptr_win->win_nick, y, x, format, ptr_nick->nick); y++; if ((cfg_look_nicklist_position == CFG_LOOK_NICKLIST_TOP) || @@ -1785,6 +1787,8 @@ gui_init_colors () cfg_col_input_nick & A_CHARTEXT, cfg_col_input_bg); init_pair (COLOR_WIN_NICK, cfg_col_nick & A_CHARTEXT, cfg_col_nick_bg); + init_pair (COLOR_WIN_NICK_AWAY, + cfg_col_nick_away & A_CHARTEXT, cfg_col_nick_bg); init_pair (COLOR_WIN_NICK_OP, cfg_col_nick_op & A_CHARTEXT, cfg_col_nick_bg); init_pair (COLOR_WIN_NICK_HALFOP, @@ -1845,6 +1849,7 @@ gui_init_colors () color_attr[COLOR_WIN_INPUT_CHANNEL - 1] = (cfg_col_input_channel >= 0) ? cfg_col_input_channel & A_BOLD : 0; color_attr[COLOR_WIN_INPUT_NICK - 1] = (cfg_col_input_nick >= 0) ? cfg_col_input_nick & A_BOLD : 0; color_attr[COLOR_WIN_NICK - 1] = (cfg_col_nick >= 0) ? cfg_col_nick & A_BOLD : 0; + color_attr[COLOR_WIN_NICK_AWAY - 1] = (cfg_col_nick_away >= 0) ? cfg_col_nick_away & A_BOLD : 0; color_attr[COLOR_WIN_NICK_OP - 1] = (cfg_col_nick_op >= 0) ? cfg_col_nick_op & A_BOLD : 0; color_attr[COLOR_WIN_NICK_HALFOP - 1] = (cfg_col_nick_halfop >= 0) ? cfg_col_nick_halfop & A_BOLD : 0; color_attr[COLOR_WIN_NICK_VOICE - 1] = (cfg_col_nick_voice >= 0) ? cfg_col_nick_voice & A_BOLD : 0; diff --git a/src/gui/curses/gui-input.c b/src/gui/curses/gui-input.c index 264991f6d..a0efdcc20 100644 --- a/src/gui/curses/gui-input.c +++ b/src/gui/curses/gui-input.c @@ -645,6 +645,7 @@ gui_main_loop () quit_weechat = 0; old_min = -1; old_sec = -1; + check_away = 0; while (!quit_weechat) { new_time = time (NULL); @@ -667,6 +668,12 @@ gui_main_loop () if (gui_infobar->remaining_time == 0) gui_infobar_remove (); } + check_away++; + if (check_away >= CHECK_AWAY_DELAY) + { + check_away = 0; + server_check_away (); + } } timeout.tv_sec = 0; diff --git a/src/gui/gui.h b/src/gui/gui.h index 498a1dbc9..3ad47f4b3 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -26,7 +26,7 @@ #define INPUT_BUFFER_BLOCK_SIZE 256 -#define NUM_COLORS 46 +#define NUM_COLORS 47 #define COLOR_WIN_TITLE 1 #define COLOR_WIN_CHAT 2 #define COLOR_WIN_CHAT_TIME 3 @@ -50,22 +50,23 @@ #define COLOR_WIN_INPUT_CHANNEL 21 #define COLOR_WIN_INPUT_NICK 22 #define COLOR_WIN_NICK 23 -#define COLOR_WIN_NICK_OP 24 -#define COLOR_WIN_NICK_HALFOP 25 -#define COLOR_WIN_NICK_VOICE 26 -#define COLOR_WIN_NICK_SEP 27 -#define COLOR_WIN_NICK_SELF 28 -#define COLOR_WIN_NICK_PRIVATE 29 -#define COLOR_WIN_NICK_FIRST 30 -#define COLOR_WIN_NICK_LAST 39 +#define COLOR_WIN_NICK_AWAY 24 +#define COLOR_WIN_NICK_OP 25 +#define COLOR_WIN_NICK_HALFOP 26 +#define COLOR_WIN_NICK_VOICE 27 +#define COLOR_WIN_NICK_SEP 28 +#define COLOR_WIN_NICK_SELF 29 +#define COLOR_WIN_NICK_PRIVATE 30 +#define COLOR_WIN_NICK_FIRST 31 +#define COLOR_WIN_NICK_LAST 40 #define COLOR_WIN_NICK_NUMBER (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1) -#define COLOR_DCC_SELECTED 40 -#define COLOR_DCC_WAITING 41 -#define COLOR_DCC_CONNECTING 42 -#define COLOR_DCC_ACTIVE 43 -#define COLOR_DCC_DONE 44 -#define COLOR_DCC_FAILED 45 -#define COLOR_DCC_ABORTED 46 +#define COLOR_DCC_SELECTED 41 +#define COLOR_DCC_WAITING 42 +#define COLOR_DCC_CONNECTING 43 +#define COLOR_DCC_ACTIVE 44 +#define COLOR_DCC_DONE 45 +#define COLOR_DCC_FAILED 46 +#define COLOR_DCC_ABORTED 47 #define SERVER(buffer) ((t_irc_server *)(buffer->server)) #define CHANNEL(buffer) ((t_irc_channel *)(buffer->channel)) |