pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-08 02:33:12 +02:00
Code Activity

Added colors for input buffer and current channel of status bar

Browse Source
This commit is contained in:
Sebastien Helleu
2005-10-02 20:52:38 +00:00
parent 4a7b3436ae
commit 16389e0728
26 changed files with 1854 additions and 1686 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+1
View File
@@ -5,6 +5,7 @@ ChangeLog - 2005-10-02
Version 0.1.6 (under dev!):
* added colors for input buffer and current channel of status bar
* added online help for config options (with /set full_option_name)
* enhanced "smart" hotlist, with names (new options:
look_hotlist_names_{count|level|length})
doc/weechat_doc_en.texi
+7 -1
View File
@@ -385,6 +385,9 @@ Type: color (Curses or Gtk color), default value: 'default'@*
@item col_status_delimiters
Color for status bar delimiters@*
Type: color (Curses or Gtk color), default value: 'cyan'@*
@item col_status_channel
Color for current channel in status bar@*
Type: color (Curses or Gtk color), default value: 'white'@*
@item col_status_data_msg
Color for window with new messages (status bar)@*
Type: color (Curses or Gtk color), default value: 'yellow'@*
@@ -423,7 +426,10 @@ Color for input text (channel name)@*
Type: color (Curses or Gtk color), default value: 'white'@*
@item col_input_nick
Color for input text (nick name)@*
Type: color (Curses or Gtk color), default value: 'lightgreen'@*
Type: color (Curses or Gtk color), default value: 'lightcyan'@*
@item col_input_delimiters
Color for input text (delimiters)@*
Type: color (Curses or Gtk color), default value: 'cyan'@*
@item col_input_bg
Background for input window@*
Type: color (Curses or Gtk color), default value: 'default'@*
doc/weechat_doc_es.texi
+7 -1
View File
@@ -385,6 +385,9 @@ Typo: color (color Curses @'o Gtk), valor por defecto: 'default'@*
@item col_status_delimiters
Color para los delimitadores de la barra de estado@*
Typo: color (color Curses @'o Gtk), valor por defecto: 'cyan'@*
@item col_status_channel
Color for current channel in status bar@*
Typo: color (color Curses @'o Gtk), valor por defecto: 'white'@*
@item col_status_data_msg
Color para una ventana con mensajes nuevos (barra de estado)@*
Typo: color (color Curses @'o Gtk), valor por defecto: 'yellow'@*
@@ -423,7 +426,10 @@ Color para el texto de entrada (nombre de canal)@*
Typo: color (color Curses @'o Gtk), valor por defecto: 'white'@*
@item col_input_nick
Color para el texto de entrada (alias)@*
Typo: color (color Curses @'o Gtk), valor por defecto: 'lightgreen'@*
Typo: color (color Curses @'o Gtk), valor por defecto: 'lightcyan'@*
@item col_input_delimiters
Color for input text (delimiters)@*
Typo: color (color Curses @'o Gtk), valor por defecto: 'cyan'@*
@item col_input_bg
Color de fondo para la ventana de entrada@*
Typo: color (color Curses @'o Gtk), valor por defecto: 'default'@*
doc/weechat_doc_fr.texi
+7 -1
View File
@@ -386,6 +386,9 @@ Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'default'@*
@item col_status_delimiters
Couleur pour les d@'elimiteurs de la barre de statut@*
Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'cyan'@*
@item col_status_channel
Couleur pour le canal courant dans la barre de statut@*
Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'white'@*
@item col_status_data_msg
Couleur pour une fen@^etre avec de nouvelles infos (barre de statut)@*
Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'yellow'@*
@@ -424,7 +427,10 @@ Couleur pour le texte saisi (nom du canal)@*
Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'white'@*
@item col_input_nick
Couleur pour le texte saisi (pseudo)@*
Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightgreen'@*
Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightcyan'@*
@item col_input_delimiters
Couleur pour le texte saisi (d@'elimiteurs)@*
Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'cyan'@*
@item col_input_bg
Couleur de fond pour la fen@^etre de saisie@*
Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'default'@*
doc/weechat_doc_pt.texi
+7 -1
View File
@@ -383,6 +383,9 @@ Type: color (Curses or Gtk color), default value: 'default'@*
@item col_status_delimiters
Color for status bar delimiters@*
Type: color (Curses or Gtk color), default value: 'cyan'@*
@item col_status_channel
Color for current channel in status bar@*
Type: color (Curses or Gtk color), default value: 'white'@*
@item col_status_data_msg
Color for window with new messages (status bar)@*
Type: color (Curses or Gtk color), default value: 'yellow'@*
@@ -421,7 +424,10 @@ Color for input text (channel name)@*
Type: color (Curses or Gtk color), default value: 'white'@*
@item col_input_nick
Color for input text (nick name)@*
Type: color (Curses or Gtk color), default value: 'lightgreen'@*
Type: color (Curses or Gtk color), default value: 'lightcyan'@*
@item col_input_delimiters
Color for input text (delimiters)@*
Type: color (Curses or Gtk color), default value: 'cyan'@*
@item col_input_bg
Background for input window@*
Type: color (Curses or Gtk color), default value: 'default'@*
po/cs.po
+204 -196
View File
File diff suppressed because it is too large Load Diff
po/es.po
+204 -196
View File
File diff suppressed because it is too large Load Diff
po/fr.po
+206 -197
View File
File diff suppressed because it is too large Load Diff
po/weechat.pot
+205 -197
View File
File diff suppressed because it is too large Load Diff
src/common/weeconfig.c
+11 -1
View File
@@ -226,6 +226,7 @@ int cfg_col_chat_highlight;
int cfg_col_chat_bg;
int cfg_col_status;
int cfg_col_status_delimiters;
int cfg_col_status_channel;
int cfg_col_status_data_msg;
int cfg_col_status_data_private;
int cfg_col_status_data_highlight;
@@ -239,6 +240,7 @@ int cfg_col_infobar_bg;
int cfg_col_input;
int cfg_col_input_channel;
int cfg_col_input_nick;
int cfg_col_input_delimiters;
int cfg_col_input_bg;
int cfg_col_nick;
int cfg_col_nick_away;
@@ -335,6 +337,10 @@ t_config_option weechat_options_colors[] =
N_("color for status bar delimiters"),
OPTION_TYPE_COLOR, 0, 0, 0,
"cyan", NULL, &cfg_col_status_delimiters, NULL, &config_change_color },
{ "col_status_channel", N_("color for current channel in status bar"),
N_("color for current channel in status bar"),
OPTION_TYPE_COLOR, 0, 0, 0,
"white", NULL, &cfg_col_status_channel, NULL, &config_change_color },
{ "col_status_data_msg", N_("color for window with new messages"),
N_("color for window with new messages (status bar)"),
OPTION_TYPE_COLOR, 0, 0, 0,
@@ -390,7 +396,11 @@ t_config_option weechat_options_colors[] =
{ "col_input_nick", N_("color for input text (nick name)"),
N_("color for input text (nick name)"),
OPTION_TYPE_COLOR, 0, 0, 0,
"lightgreen", NULL, &cfg_col_input_nick, NULL, &config_change_color },
"lightcyan", NULL, &cfg_col_input_nick, NULL, &config_change_color },
{ "col_input_delimiters", N_("color for input text (delimiters)"),
N_("color for input text (delimiters)"),
OPTION_TYPE_COLOR, 0, 0, 0,
"cyan", NULL, &cfg_col_input_delimiters, NULL, &config_change_color },
{ "col_input_bg", N_("background for input window"),
N_("background for input window"),
OPTION_TYPE_COLOR, 0, 0, 0,
src/common/weeconfig.h
+2
View File
@@ -123,6 +123,7 @@ extern int cfg_col_chat_highlight;
extern int cfg_col_chat_bg;
extern int cfg_col_status;
extern int cfg_col_status_delimiters;
extern int cfg_col_status_channel;
extern int cfg_col_status_data_msg;
extern int cfg_col_status_data_private;
extern int cfg_col_status_data_highlight;
@@ -136,6 +137,7 @@ extern int cfg_col_infobar_bg;
extern int cfg_col_input;
extern int cfg_col_input_channel;
extern int cfg_col_input_nick;
extern int cfg_col_input_delimiters;
extern int cfg_col_input_bg;
extern int cfg_col_nick;
extern int cfg_col_nick_away;
src/gui/curses/gui-display.c
+32 -20
View File
@@ -1269,7 +1269,7 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
COLOR_WIN_STATUS_DELIMITERS);
wprintw (ptr_win->win_status, ":");
gui_window_set_color (ptr_win->win_status,
COLOR_WIN_STATUS);
COLOR_WIN_STATUS_CHANNEL);
if (SERVER(ptr_win->buffer)->is_connected)
wprintw (ptr_win->win_status, "[%s] ",
SERVER(ptr_win->buffer)->name);
@@ -1287,7 +1287,7 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
COLOR_WIN_STATUS_DELIMITERS);
wprintw (ptr_win->win_status, ":");
gui_window_set_color (ptr_win->win_status,
COLOR_WIN_STATUS);
COLOR_WIN_STATUS_CHANNEL);
if ((!CHANNEL(ptr_win->buffer)->nicks)
&& (CHANNEL(ptr_win->buffer)->type != CHAT_PRIVATE))
wprintw (ptr_win->win_status, "(%s)",
@@ -1342,7 +1342,7 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
COLOR_WIN_STATUS_DELIMITERS);
wprintw (ptr_win->win_status, "(");
gui_window_set_color (ptr_win->win_status,
COLOR_WIN_STATUS);
COLOR_WIN_STATUS_CHANNEL);
wprintw (ptr_win->win_status, "DCC");
gui_window_set_color (ptr_win->win_status,
COLOR_WIN_STATUS_DELIMITERS);
@@ -1360,7 +1360,7 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
ptr_win->buffer->number);
gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS_DELIMITERS);
wprintw (ptr_win->win_status, ":");
gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS);
gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS_CHANNEL);
if (ptr_win->buffer->dcc)
wprintw (ptr_win->win_status, "<DCC> ");
else
@@ -1740,17 +1740,20 @@ gui_draw_buffer_input (t_gui_buffer *buffer, int erase)
}
if (CHANNEL(buffer))
{
snprintf (format, 32, "%%s %%s> %%-%ds", input_width);
gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_CHANNEL);
mvwprintw (ptr_win->win_input, 0, 0, "%s ", CHANNEL(buffer)->name);
gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_NICK);
wprintw (ptr_win->win_input, "%s", SERVER(buffer)->nick);
gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_DELIMITERS);
wprintw (ptr_win->win_input, "> ");
gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT);
snprintf (format, 32, "%%-%ds", input_width);
if (ptr_win == gui_current_window)
mvwprintw (ptr_win->win_input, 0, 0, format,
CHANNEL(buffer)->name,
SERVER(buffer)->nick,
buffer->input_buffer + buffer->input_buffer_1st_display);
wprintw (ptr_win->win_input, format,
buffer->input_buffer + buffer->input_buffer_1st_display);
else
mvwprintw (ptr_win->win_input, 0, 0, format,
CHANNEL(buffer)->name,
SERVER(buffer)->nick,
"");
wprintw (ptr_win->win_input, format,
"");
wclrtoeol (ptr_win->win_input);
ptr_win->win_input_x = strlen (CHANNEL(buffer)->name) +
strlen (SERVER(buffer)->nick) + 3 +
@@ -1761,19 +1764,22 @@ gui_draw_buffer_input (t_gui_buffer *buffer, int erase)
}
else
{
snprintf (format, 32, "%%s> %%-%ds", input_width);
gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_NICK);
if (SERVER(buffer) && (SERVER(buffer)->is_connected))
ptr_nickname = SERVER(buffer)->nick;
else
ptr_nickname = cfg_look_no_nickname;
mvwprintw (ptr_win->win_input, 0, 0, "%s", ptr_nickname);
gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_DELIMITERS);
wprintw (ptr_win->win_input, "> ");
gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT);
snprintf (format, 32, "%%-%ds", input_width);
if (ptr_win == gui_current_window)
mvwprintw (ptr_win->win_input, 0, 0, format,
ptr_nickname,
buffer->input_buffer + buffer->input_buffer_1st_display);
wprintw (ptr_win->win_input, format,
buffer->input_buffer + buffer->input_buffer_1st_display);
else
mvwprintw (ptr_win->win_input, 0, 0, format,
ptr_nickname,
"");
wprintw (ptr_win->win_input, format,
"");
wclrtoeol (ptr_win->win_input);
ptr_win->win_input_x = strlen (ptr_nickname) + 2 +
(buffer->input_buffer_pos - buffer->input_buffer_1st_display);
@@ -2447,6 +2453,8 @@ gui_init_colors ()
cfg_col_status, cfg_col_status_bg);
init_pair (COLOR_WIN_STATUS_DELIMITERS,
cfg_col_status_delimiters, cfg_col_status_bg);
init_pair (COLOR_WIN_STATUS_CHANNEL,
cfg_col_status_channel, cfg_col_status_bg);
init_pair (COLOR_WIN_STATUS_DATA_MSG,
cfg_col_status_data_msg, cfg_col_status_bg);
init_pair (COLOR_WIN_STATUS_DATA_PRIVATE,
@@ -2469,6 +2477,8 @@ gui_init_colors ()
cfg_col_input_channel, cfg_col_input_bg);
init_pair (COLOR_WIN_INPUT_NICK,
cfg_col_input_nick, cfg_col_input_bg);
init_pair (COLOR_WIN_INPUT_DELIMITERS,
cfg_col_input_delimiters, cfg_col_input_bg);
init_pair (COLOR_WIN_NICK,
cfg_col_nick, cfg_col_nick_bg);
init_pair (COLOR_WIN_NICK_AWAY,
@@ -2529,6 +2539,7 @@ gui_init_colors ()
color_attr[COLOR_WIN_CHAT_HIGHLIGHT - 1] = (cfg_col_chat_highlight >= 0) ? cfg_col_chat_highlight & A_BOLD : 0;
color_attr[COLOR_WIN_STATUS - 1] = (cfg_col_status >= 0) ? cfg_col_status & A_BOLD : 0;
color_attr[COLOR_WIN_STATUS_DELIMITERS - 1] = (cfg_col_status_delimiters >= 0) ? cfg_col_status_delimiters & A_BOLD : 0;
color_attr[COLOR_WIN_STATUS_CHANNEL - 1] = (cfg_col_status_channel >= 0) ? cfg_col_status_channel & A_BOLD : 0;
color_attr[COLOR_WIN_STATUS_DATA_MSG - 1] = (cfg_col_status_data_msg >= 0) ? cfg_col_status_data_msg & A_BOLD : 0;
color_attr[COLOR_WIN_STATUS_DATA_PRIVATE - 1] = (cfg_col_status_data_private >= 0) ? cfg_col_status_data_private & A_BOLD : 0;
color_attr[COLOR_WIN_STATUS_DATA_HIGHLIGHT - 1] = (cfg_col_status_data_highlight >= 0) ? cfg_col_status_data_highlight & A_BOLD : 0;
@@ -2540,6 +2551,7 @@ gui_init_colors ()
color_attr[COLOR_WIN_INPUT - 1] = (cfg_col_input >= 0) ? cfg_col_input & A_BOLD : 0;
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_INPUT_DELIMITERS - 1] = (cfg_col_input_delimiters >= 0) ? cfg_col_input_delimiters & 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_CHANOWNER - 1] = (cfg_col_nick_chanowner >= 0) ? cfg_col_nick_chanowner & A_BOLD : 0;
src/gui/gui.h
+34 -32
View File
@@ -26,7 +26,7 @@
#define INPUT_BUFFER_BLOCK_SIZE 256
#define NUM_COLORS 54
#define NUM_COLORS 56
#define COLOR_WIN_TITLE 1
#define COLOR_WIN_CHAT 2
#define COLOR_WIN_CHAT_TIME 3
@@ -42,38 +42,40 @@
#define COLOR_WIN_CHAT_HIGHLIGHT 13
#define COLOR_WIN_STATUS 14
#define COLOR_WIN_STATUS_DELIMITERS 15
#define COLOR_WIN_STATUS_DATA_MSG 16
#define COLOR_WIN_STATUS_DATA_PRIVATE 17
#define COLOR_WIN_STATUS_DATA_HIGHLIGHT 18
#define COLOR_WIN_STATUS_DATA_OTHER 19
#define COLOR_WIN_STATUS_MORE 20
#define COLOR_WIN_INFOBAR 21
#define COLOR_WIN_INFOBAR_DELIMITERS 22
#define COLOR_WIN_INFOBAR_HIGHLIGHT 23
#define COLOR_WIN_INPUT 24
#define COLOR_WIN_INPUT_CHANNEL 25
#define COLOR_WIN_INPUT_NICK 26
#define COLOR_WIN_NICK 27
#define COLOR_WIN_NICK_AWAY 28
#define COLOR_WIN_NICK_CHANOWNER 29
#define COLOR_WIN_NICK_CHANADMIN 30
#define COLOR_WIN_NICK_OP 31
#define COLOR_WIN_NICK_HALFOP 32
#define COLOR_WIN_NICK_VOICE 33
#define COLOR_WIN_NICK_MORE 34
#define COLOR_WIN_NICK_SEP 35
#define COLOR_WIN_NICK_SELF 36
#define COLOR_WIN_NICK_PRIVATE 37
#define COLOR_WIN_NICK_FIRST 38
#define COLOR_WIN_NICK_LAST 47
#define COLOR_WIN_STATUS_CHANNEL 16
#define COLOR_WIN_STATUS_DATA_MSG 17
#define COLOR_WIN_STATUS_DATA_PRIVATE 18
#define COLOR_WIN_STATUS_DATA_HIGHLIGHT 19
#define COLOR_WIN_STATUS_DATA_OTHER 20
#define COLOR_WIN_STATUS_MORE 21
#define COLOR_WIN_INFOBAR 22
#define COLOR_WIN_INFOBAR_DELIMITERS 23
#define COLOR_WIN_INFOBAR_HIGHLIGHT 24
#define COLOR_WIN_INPUT 25
#define COLOR_WIN_INPUT_CHANNEL 26
#define COLOR_WIN_INPUT_NICK 27
#define COLOR_WIN_INPUT_DELIMITERS 28
#define COLOR_WIN_NICK 29
#define COLOR_WIN_NICK_AWAY 30
#define COLOR_WIN_NICK_CHANOWNER 31
#define COLOR_WIN_NICK_CHANADMIN 32
#define COLOR_WIN_NICK_OP 33
#define COLOR_WIN_NICK_HALFOP 34
#define COLOR_WIN_NICK_VOICE 35
#define COLOR_WIN_NICK_MORE 36
#define COLOR_WIN_NICK_SEP 37
#define COLOR_WIN_NICK_SELF 38
#define COLOR_WIN_NICK_PRIVATE 39
#define COLOR_WIN_NICK_FIRST 40
#define COLOR_WIN_NICK_LAST 49
#define COLOR_WIN_NICK_NUMBER (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1)
#define COLOR_DCC_SELECTED 48
#define COLOR_DCC_WAITING 49
#define COLOR_DCC_CONNECTING 50
#define COLOR_DCC_ACTIVE 51
#define COLOR_DCC_DONE 52
#define COLOR_DCC_FAILED 53
#define COLOR_DCC_ABORTED 54
#define COLOR_DCC_SELECTED 50
#define COLOR_DCC_WAITING 51
#define COLOR_DCC_CONNECTING 52
#define COLOR_DCC_ACTIVE 53
#define COLOR_DCC_DONE 54
#define COLOR_DCC_FAILED 55
#define COLOR_DCC_ABORTED 56
#define SERVER(buffer) ((t_irc_server *)(buffer->server))
#define CHANNEL(buffer) ((t_irc_channel *)(buffer->channel))
weechat/ChangeLog
+1
View File
@@ -5,6 +5,7 @@ ChangeLog - 2005-10-02
Version 0.1.6 (under dev!):
* added colors for input buffer and current channel of status bar
* added online help for config options (with /set full_option_name)
* enhanced "smart" hotlist, with names (new options:
look_hotlist_names_{count|level|length})
weechat/doc/weechat_doc_en.texi
+7 -1
View File
@@ -385,6 +385,9 @@ Type: color (Curses or Gtk color), default value: 'default'@*
@item col_status_delimiters
Color for status bar delimiters@*
Type: color (Curses or Gtk color), default value: 'cyan'@*
@item col_status_channel
Color for current channel in status bar@*
Type: color (Curses or Gtk color), default value: 'white'@*
@item col_status_data_msg
Color for window with new messages (status bar)@*
Type: color (Curses or Gtk color), default value: 'yellow'@*
@@ -423,7 +426,10 @@ Color for input text (channel name)@*
Type: color (Curses or Gtk color), default value: 'white'@*
@item col_input_nick
Color for input text (nick name)@*
Type: color (Curses or Gtk color), default value: 'lightgreen'@*
Type: color (Curses or Gtk color), default value: 'lightcyan'@*
@item col_input_delimiters
Color for input text (delimiters)@*
Type: color (Curses or Gtk color), default value: 'cyan'@*
@item col_input_bg
Background for input window@*
Type: color (Curses or Gtk color), default value: 'default'@*
weechat/doc/weechat_doc_es.texi
+7 -1
View File
@@ -385,6 +385,9 @@ Typo: color (color Curses @'o Gtk), valor por defecto: 'default'@*
@item col_status_delimiters
Color para los delimitadores de la barra de estado@*
Typo: color (color Curses @'o Gtk), valor por defecto: 'cyan'@*
@item col_status_channel
Color for current channel in status bar@*
Typo: color (color Curses @'o Gtk), valor por defecto: 'white'@*
@item col_status_data_msg
Color para una ventana con mensajes nuevos (barra de estado)@*
Typo: color (color Curses @'o Gtk), valor por defecto: 'yellow'@*
@@ -423,7 +426,10 @@ Color para el texto de entrada (nombre de canal)@*
Typo: color (color Curses @'o Gtk), valor por defecto: 'white'@*
@item col_input_nick
Color para el texto de entrada (alias)@*
Typo: color (color Curses @'o Gtk), valor por defecto: 'lightgreen'@*
Typo: color (color Curses @'o Gtk), valor por defecto: 'lightcyan'@*
@item col_input_delimiters
Color for input text (delimiters)@*
Typo: color (color Curses @'o Gtk), valor por defecto: 'cyan'@*
@item col_input_bg
Color de fondo para la ventana de entrada@*
Typo: color (color Curses @'o Gtk), valor por defecto: 'default'@*
weechat/doc/weechat_doc_fr.texi
+7 -1
View File
@@ -386,6 +386,9 @@ Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'default'@*
@item col_status_delimiters
Couleur pour les d@'elimiteurs de la barre de statut@*
Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'cyan'@*
@item col_status_channel
Couleur pour le canal courant dans la barre de statut@*
Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'white'@*
@item col_status_data_msg
Couleur pour une fen@^etre avec de nouvelles infos (barre de statut)@*
Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'yellow'@*
@@ -424,7 +427,10 @@ Couleur pour le texte saisi (nom du canal)@*
Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'white'@*
@item col_input_nick
Couleur pour le texte saisi (pseudo)@*
Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightgreen'@*
Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'lightcyan'@*
@item col_input_delimiters
Couleur pour le texte saisi (d@'elimiteurs)@*
Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'cyan'@*
@item col_input_bg
Couleur de fond pour la fen@^etre de saisie@*
Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'default'@*
weechat/doc/weechat_doc_pt.texi
+7 -1
View File
@@ -383,6 +383,9 @@ Type: color (Curses or Gtk color), default value: 'default'@*
@item col_status_delimiters
Color for status bar delimiters@*
Type: color (Curses or Gtk color), default value: 'cyan'@*
@item col_status_channel
Color for current channel in status bar@*
Type: color (Curses or Gtk color), default value: 'white'@*
@item col_status_data_msg
Color for window with new messages (status bar)@*
Type: color (Curses or Gtk color), default value: 'yellow'@*
@@ -421,7 +424,10 @@ Color for input text (channel name)@*
Type: color (Curses or Gtk color), default value: 'white'@*
@item col_input_nick
Color for input text (nick name)@*
Type: color (Curses or Gtk color), default value: 'lightgreen'@*
Type: color (Curses or Gtk color), default value: 'lightcyan'@*
@item col_input_delimiters
Color for input text (delimiters)@*
Type: color (Curses or Gtk color), default value: 'cyan'@*
@item col_input_bg
Background for input window@*
Type: color (Curses or Gtk color), default value: 'default'@*
weechat/po/cs.po
+204 -196
View File
File diff suppressed because it is too large Load Diff
weechat/po/es.po
+204 -196
View File
File diff suppressed because it is too large Load Diff
weechat/po/fr.po
+206 -197
View File
File diff suppressed because it is too large Load Diff
weechat/po/weechat.pot
+205 -197
View File
File diff suppressed because it is too large Load Diff
weechat/src/common/weeconfig.c
+11 -1
View File
@@ -226,6 +226,7 @@ int cfg_col_chat_highlight;
int cfg_col_chat_bg;
int cfg_col_status;
int cfg_col_status_delimiters;
int cfg_col_status_channel;
int cfg_col_status_data_msg;
int cfg_col_status_data_private;
int cfg_col_status_data_highlight;
@@ -239,6 +240,7 @@ int cfg_col_infobar_bg;
int cfg_col_input;
int cfg_col_input_channel;
int cfg_col_input_nick;
int cfg_col_input_delimiters;
int cfg_col_input_bg;
int cfg_col_nick;
int cfg_col_nick_away;
@@ -335,6 +337,10 @@ t_config_option weechat_options_colors[] =
N_("color for status bar delimiters"),
OPTION_TYPE_COLOR, 0, 0, 0,
"cyan", NULL, &cfg_col_status_delimiters, NULL, &config_change_color },
{ "col_status_channel", N_("color for current channel in status bar"),
N_("color for current channel in status bar"),
OPTION_TYPE_COLOR, 0, 0, 0,
"white", NULL, &cfg_col_status_channel, NULL, &config_change_color },
{ "col_status_data_msg", N_("color for window with new messages"),
N_("color for window with new messages (status bar)"),
OPTION_TYPE_COLOR, 0, 0, 0,
@@ -390,7 +396,11 @@ t_config_option weechat_options_colors[] =
{ "col_input_nick", N_("color for input text (nick name)"),
N_("color for input text (nick name)"),
OPTION_TYPE_COLOR, 0, 0, 0,
"lightgreen", NULL, &cfg_col_input_nick, NULL, &config_change_color },
"lightcyan", NULL, &cfg_col_input_nick, NULL, &config_change_color },
{ "col_input_delimiters", N_("color for input text (delimiters)"),
N_("color for input text (delimiters)"),
OPTION_TYPE_COLOR, 0, 0, 0,
"cyan", NULL, &cfg_col_input_delimiters, NULL, &config_change_color },
{ "col_input_bg", N_("background for input window"),
N_("background for input window"),
OPTION_TYPE_COLOR, 0, 0, 0,
weechat/src/common/weeconfig.h
+2
View File
@@ -123,6 +123,7 @@ extern int cfg_col_chat_highlight;
extern int cfg_col_chat_bg;
extern int cfg_col_status;
extern int cfg_col_status_delimiters;
extern int cfg_col_status_channel;
extern int cfg_col_status_data_msg;
extern int cfg_col_status_data_private;
extern int cfg_col_status_data_highlight;
@@ -136,6 +137,7 @@ extern int cfg_col_infobar_bg;
extern int cfg_col_input;
extern int cfg_col_input_channel;
extern int cfg_col_input_nick;
extern int cfg_col_input_delimiters;
extern int cfg_col_input_bg;
extern int cfg_col_nick;
extern int cfg_col_nick_away;
weechat/src/gui/curses/gui-display.c
+32 -20
View File
@@ -1269,7 +1269,7 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
COLOR_WIN_STATUS_DELIMITERS);
wprintw (ptr_win->win_status, ":");
gui_window_set_color (ptr_win->win_status,
COLOR_WIN_STATUS);
COLOR_WIN_STATUS_CHANNEL);
if (SERVER(ptr_win->buffer)->is_connected)
wprintw (ptr_win->win_status, "[%s] ",
SERVER(ptr_win->buffer)->name);
@@ -1287,7 +1287,7 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
COLOR_WIN_STATUS_DELIMITERS);
wprintw (ptr_win->win_status, ":");
gui_window_set_color (ptr_win->win_status,
COLOR_WIN_STATUS);
COLOR_WIN_STATUS_CHANNEL);
if ((!CHANNEL(ptr_win->buffer)->nicks)
&& (CHANNEL(ptr_win->buffer)->type != CHAT_PRIVATE))
wprintw (ptr_win->win_status, "(%s)",
@@ -1342,7 +1342,7 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
COLOR_WIN_STATUS_DELIMITERS);
wprintw (ptr_win->win_status, "(");
gui_window_set_color (ptr_win->win_status,
COLOR_WIN_STATUS);
COLOR_WIN_STATUS_CHANNEL);
wprintw (ptr_win->win_status, "DCC");
gui_window_set_color (ptr_win->win_status,
COLOR_WIN_STATUS_DELIMITERS);
@@ -1360,7 +1360,7 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase)
ptr_win->buffer->number);
gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS_DELIMITERS);
wprintw (ptr_win->win_status, ":");
gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS);
gui_window_set_color (ptr_win->win_status, COLOR_WIN_STATUS_CHANNEL);
if (ptr_win->buffer->dcc)
wprintw (ptr_win->win_status, "<DCC> ");
else
@@ -1740,17 +1740,20 @@ gui_draw_buffer_input (t_gui_buffer *buffer, int erase)
}
if (CHANNEL(buffer))
{
snprintf (format, 32, "%%s %%s> %%-%ds", input_width);
gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_CHANNEL);
mvwprintw (ptr_win->win_input, 0, 0, "%s ", CHANNEL(buffer)->name);
gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_NICK);
wprintw (ptr_win->win_input, "%s", SERVER(buffer)->nick);
gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_DELIMITERS);
wprintw (ptr_win->win_input, "> ");
gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT);
snprintf (format, 32, "%%-%ds", input_width);
if (ptr_win == gui_current_window)
mvwprintw (ptr_win->win_input, 0, 0, format,
CHANNEL(buffer)->name,
SERVER(buffer)->nick,
buffer->input_buffer + buffer->input_buffer_1st_display);
wprintw (ptr_win->win_input, format,
buffer->input_buffer + buffer->input_buffer_1st_display);
else
mvwprintw (ptr_win->win_input, 0, 0, format,
CHANNEL(buffer)->name,
SERVER(buffer)->nick,
"");
wprintw (ptr_win->win_input, format,
"");
wclrtoeol (ptr_win->win_input);
ptr_win->win_input_x = strlen (CHANNEL(buffer)->name) +
strlen (SERVER(buffer)->nick) + 3 +
@@ -1761,19 +1764,22 @@ gui_draw_buffer_input (t_gui_buffer *buffer, int erase)
}
else
{
snprintf (format, 32, "%%s> %%-%ds", input_width);
gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_NICK);
if (SERVER(buffer) && (SERVER(buffer)->is_connected))
ptr_nickname = SERVER(buffer)->nick;
else
ptr_nickname = cfg_look_no_nickname;
mvwprintw (ptr_win->win_input, 0, 0, "%s", ptr_nickname);
gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT_DELIMITERS);
wprintw (ptr_win->win_input, "> ");
gui_window_set_color (ptr_win->win_input, COLOR_WIN_INPUT);
snprintf (format, 32, "%%-%ds", input_width);
if (ptr_win == gui_current_window)
mvwprintw (ptr_win->win_input, 0, 0, format,
ptr_nickname,
buffer->input_buffer + buffer->input_buffer_1st_display);
wprintw (ptr_win->win_input, format,
buffer->input_buffer + buffer->input_buffer_1st_display);
else
mvwprintw (ptr_win->win_input, 0, 0, format,
ptr_nickname,
"");
wprintw (ptr_win->win_input, format,
"");
wclrtoeol (ptr_win->win_input);
ptr_win->win_input_x = strlen (ptr_nickname) + 2 +
(buffer->input_buffer_pos - buffer->input_buffer_1st_display);
@@ -2447,6 +2453,8 @@ gui_init_colors ()
cfg_col_status, cfg_col_status_bg);
init_pair (COLOR_WIN_STATUS_DELIMITERS,
cfg_col_status_delimiters, cfg_col_status_bg);
init_pair (COLOR_WIN_STATUS_CHANNEL,
cfg_col_status_channel, cfg_col_status_bg);
init_pair (COLOR_WIN_STATUS_DATA_MSG,
cfg_col_status_data_msg, cfg_col_status_bg);
init_pair (COLOR_WIN_STATUS_DATA_PRIVATE,
@@ -2469,6 +2477,8 @@ gui_init_colors ()
cfg_col_input_channel, cfg_col_input_bg);
init_pair (COLOR_WIN_INPUT_NICK,
cfg_col_input_nick, cfg_col_input_bg);
init_pair (COLOR_WIN_INPUT_DELIMITERS,
cfg_col_input_delimiters, cfg_col_input_bg);
init_pair (COLOR_WIN_NICK,
cfg_col_nick, cfg_col_nick_bg);
init_pair (COLOR_WIN_NICK_AWAY,
@@ -2529,6 +2539,7 @@ gui_init_colors ()
color_attr[COLOR_WIN_CHAT_HIGHLIGHT - 1] = (cfg_col_chat_highlight >= 0) ? cfg_col_chat_highlight & A_BOLD : 0;
color_attr[COLOR_WIN_STATUS - 1] = (cfg_col_status >= 0) ? cfg_col_status & A_BOLD : 0;
color_attr[COLOR_WIN_STATUS_DELIMITERS - 1] = (cfg_col_status_delimiters >= 0) ? cfg_col_status_delimiters & A_BOLD : 0;
color_attr[COLOR_WIN_STATUS_CHANNEL - 1] = (cfg_col_status_channel >= 0) ? cfg_col_status_channel & A_BOLD : 0;
color_attr[COLOR_WIN_STATUS_DATA_MSG - 1] = (cfg_col_status_data_msg >= 0) ? cfg_col_status_data_msg & A_BOLD : 0;
color_attr[COLOR_WIN_STATUS_DATA_PRIVATE - 1] = (cfg_col_status_data_private >= 0) ? cfg_col_status_data_private & A_BOLD : 0;
color_attr[COLOR_WIN_STATUS_DATA_HIGHLIGHT - 1] = (cfg_col_status_data_highlight >= 0) ? cfg_col_status_data_highlight & A_BOLD : 0;
@@ -2540,6 +2551,7 @@ gui_init_colors ()
color_attr[COLOR_WIN_INPUT - 1] = (cfg_col_input >= 0) ? cfg_col_input & A_BOLD : 0;
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_INPUT_DELIMITERS - 1] = (cfg_col_input_delimiters >= 0) ? cfg_col_input_delimiters & 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_CHANOWNER - 1] = (cfg_col_nick_chanowner >= 0) ? cfg_col_nick_chanowner & A_BOLD : 0;
weechat/src/gui/gui.h
+34 -32
View File
@@ -26,7 +26,7 @@
#define INPUT_BUFFER_BLOCK_SIZE 256
#define NUM_COLORS 54
#define NUM_COLORS 56
#define COLOR_WIN_TITLE 1
#define COLOR_WIN_CHAT 2
#define COLOR_WIN_CHAT_TIME 3
@@ -42,38 +42,40 @@
#define COLOR_WIN_CHAT_HIGHLIGHT 13
#define COLOR_WIN_STATUS 14
#define COLOR_WIN_STATUS_DELIMITERS 15
#define COLOR_WIN_STATUS_DATA_MSG 16
#define COLOR_WIN_STATUS_DATA_PRIVATE 17
#define COLOR_WIN_STATUS_DATA_HIGHLIGHT 18
#define COLOR_WIN_STATUS_DATA_OTHER 19
#define COLOR_WIN_STATUS_MORE 20
#define COLOR_WIN_INFOBAR 21
#define COLOR_WIN_INFOBAR_DELIMITERS 22
#define COLOR_WIN_INFOBAR_HIGHLIGHT 23
#define COLOR_WIN_INPUT 24
#define COLOR_WIN_INPUT_CHANNEL 25
#define COLOR_WIN_INPUT_NICK 26
#define COLOR_WIN_NICK 27
#define COLOR_WIN_NICK_AWAY 28
#define COLOR_WIN_NICK_CHANOWNER 29
#define COLOR_WIN_NICK_CHANADMIN 30
#define COLOR_WIN_NICK_OP 31
#define COLOR_WIN_NICK_HALFOP 32
#define COLOR_WIN_NICK_VOICE 33
#define COLOR_WIN_NICK_MORE 34
#define COLOR_WIN_NICK_SEP 35
#define COLOR_WIN_NICK_SELF 36
#define COLOR_WIN_NICK_PRIVATE 37
#define COLOR_WIN_NICK_FIRST 38
#define COLOR_WIN_NICK_LAST 47
#define COLOR_WIN_STATUS_CHANNEL 16
#define COLOR_WIN_STATUS_DATA_MSG 17
#define COLOR_WIN_STATUS_DATA_PRIVATE 18
#define COLOR_WIN_STATUS_DATA_HIGHLIGHT 19
#define COLOR_WIN_STATUS_DATA_OTHER 20
#define COLOR_WIN_STATUS_MORE 21
#define COLOR_WIN_INFOBAR 22
#define COLOR_WIN_INFOBAR_DELIMITERS 23
#define COLOR_WIN_INFOBAR_HIGHLIGHT 24
#define COLOR_WIN_INPUT 25
#define COLOR_WIN_INPUT_CHANNEL 26
#define COLOR_WIN_INPUT_NICK 27
#define COLOR_WIN_INPUT_DELIMITERS 28
#define COLOR_WIN_NICK 29
#define COLOR_WIN_NICK_AWAY 30
#define COLOR_WIN_NICK_CHANOWNER 31
#define COLOR_WIN_NICK_CHANADMIN 32
#define COLOR_WIN_NICK_OP 33
#define COLOR_WIN_NICK_HALFOP 34
#define COLOR_WIN_NICK_VOICE 35
#define COLOR_WIN_NICK_MORE 36
#define COLOR_WIN_NICK_SEP 37
#define COLOR_WIN_NICK_SELF 38
#define COLOR_WIN_NICK_PRIVATE 39
#define COLOR_WIN_NICK_FIRST 40
#define COLOR_WIN_NICK_LAST 49
#define COLOR_WIN_NICK_NUMBER (COLOR_WIN_NICK_LAST - COLOR_WIN_NICK_FIRST + 1)
#define COLOR_DCC_SELECTED 48
#define COLOR_DCC_WAITING 49
#define COLOR_DCC_CONNECTING 50
#define COLOR_DCC_ACTIVE 51
#define COLOR_DCC_DONE 52
#define COLOR_DCC_FAILED 53
#define COLOR_DCC_ABORTED 54
#define COLOR_DCC_SELECTED 50
#define COLOR_DCC_WAITING 51
#define COLOR_DCC_CONNECTING 52
#define COLOR_DCC_ACTIVE 53
#define COLOR_DCC_DONE 54
#define COLOR_DCC_FAILED 55
#define COLOR_DCC_ABORTED 56
#define SERVER(buffer) ((t_irc_server *)(buffer->server))
#define CHANNEL(buffer) ((t_irc_channel *)(buffer->channel))