Added "col_real_white" option to active real white (useful only if term has not

white background)

doc/weechat_doc_en.texi

@@ -35,7 +35,7 @@
 
 @title WeeChat - User guide
 @subtitle Fast, light and extensible IRC client
-@subtitle Documentation for WeeChat v0.1.6-cvs - November, 5 2005
+@subtitle Documentation for WeeChat v0.1.6-cvs - November, 6 2005
 
 @author FlashCode <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
 
@@ -352,6 +352,9 @@ Type: boolean (values: 'on' or 'off'), default value: 'on'@*
 @item look_day_change_timestamp
 Timestamp for date displayed when day changed@*
 Type: string (any string), default value: '%a, %d %b %Y'@*
+@item col_real_white
+If set, uses real white color, disabled by default for terms with white background (if you never use white background, you should turn on this option to see real white instead of default term foreground color)@*
+Type: boolean (values: 'on' or 'off'), default value: 'off'@*
 @item col_title
 Color for title bar@*
 Type: color (Curses or Gtk color), default value: 'default'@*

doc/weechat_doc_es.texi

@@ -36,7 +36,7 @@
 
 @title WeeChat - Gui@'on de usuario.
 @subtitle Cliente IRC r@'apido, peque@~no y extensible
-@subtitle Documentaci@'on para WeeChat v0.1.6-cvs - 5 de noviembre de 2005
+@subtitle Documentaci@'on para WeeChat v0.1.6-cvs - 6 de noviembre de 2005
 
 @author FlashCode <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
 
@@ -352,6 +352,9 @@ Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'on'@*
 @item look_day_change_timestamp
 Timestamp for date displayed when day changed@*
 Typo: cadena (cualquier cadena), valor por defecto: '%a, %d %b %Y'@*
+@item col_real_white
+If set, uses real white color, disabled by default for terms with white background (if you never use white background, you should turn on this option to see real white instead of default term foreground color)@*
+Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'off'@*
 @item col_title
 Color para la barra de t@'itulo@*
 Typo: color (color Curses @'o Gtk), valor por defecto: 'default'@*

doc/weechat_doc_fr.texi

@@ -36,7 +36,7 @@
 
 @title WeeChat - Guide utilisateur
 @subtitle Client IRC rapide, l@'eger et extensible
-@subtitle Documentation pour WeeChat v0.1.6-cvs - 5 novembre 2005
+@subtitle Documentation pour WeeChat v0.1.6-cvs - 6 novembre 2005
 
 @author FlashCode <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
 
@@ -353,6 +353,9 @@ Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
 @item look_day_change_timestamp
 Format de date pour la date affich@'ee quand le jour a chang@'e@*
 Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: '%a, %d %b %Y'@*
+@item col_real_white
+Si activ@'e, utilise la vraie couleur blanche, d@'esactiv@'e par d@'efaut pour les terminaux avec un fond blanc (si vous n'utilisez jamais de fond blanc, vous devriez activer cette option pour voir du vrai blanc au lieu de la couleur d'avant plant par d@'efaut du terminal)@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'off'@*
 @item col_title
 Couleur pour la barre de titre@*
 Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'default'@*

doc/weechat_doc_pt.texi

@@ -36,7 +36,7 @@
 
 @title WeeChat - Guia do Utilizador
 @subtitle Cliente de IRC rapido, leve e extencivel
-@subtitle Documenta@,{c}@~ao do WeeChat v0.1.6-cvs - 5 de novembro de 2005
+@subtitle Documenta@,{c}@~ao do WeeChat v0.1.6-cvs - 6 de novembro de 2005
 
 @author FlashCode <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
 
@@ -350,6 +350,9 @@ Type: boolean (values: 'on' or 'off'), default value: 'on'@*
 @item look_day_change_timestamp
 Timestamp for date displayed when day changed@*
 Type: string (any string), default value: '%a, %d %b %Y'@*
+@item col_real_white
+If set, uses real white color, disabled by default for terms with white background (if you never use white background, you should turn on this option to see real white instead of default term foreground color)@*
+Type: boolean (values: 'on' or 'off'), default value: 'off'@*
 @item col_title
 Color for title bar@*
 Type: color (Curses or Gtk color), default value: 'default'@*

src/common/weeconfig.c

@@ -234,6 +234,7 @@ t_config_option weechat_options_look[] =
 
 /* config, colors section */
 
+int cfg_col_real_white;
 int cfg_col_title;
 int cfg_col_title_bg;
 int cfg_col_chat;
@@ -290,7 +291,14 @@ int cfg_col_dcc_failed;
 int cfg_col_dcc_aborted;
 
 t_config_option weechat_options_colors[] =
-{ /* title window */
+{ /* general color settings */
+  { "col_real_white", N_("if set, uses real white color"),
+    N_("if set, uses real white color, disabled by default for terms with white "
+       "background (if you never use white background, you should turn on "
+       "this option to see real white instead of default term foreground color)"),
+    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE,
+    NULL, NULL, &cfg_col_real_white, NULL, config_change_color },
+  /* title window */
   { "col_title", N_("color for title bar"),
     N_("color for title bar"),
     OPTION_TYPE_COLOR, 0, 0, 0,
@@ -1050,6 +1058,7 @@ config_change_color ()
 {
     t_gui_window *ptr_win;
     
+    gui_init_color_pairs ();
     gui_rebuild_weechat_colors ();
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
         gui_redraw_buffer (ptr_win->buffer);

src/common/weeconfig.h

@@ -111,6 +111,7 @@ extern int cfg_look_hotlist_names_length;
 extern int cfg_look_day_change;
 extern char *cfg_look_day_change_timestamp;
 
+extern int cfg_col_real_white;
 extern int cfg_col_title;
 extern int cfg_col_title_bg;
 extern int cfg_col_chat;

src/gui/curses/gui-display.c

@@ -3091,6 +3091,30 @@ gui_pre_init (int *argc, char **argv[])
     (void) argv;
 }
 
+/*
+ * gui_init_color_pairs: init color pairs
+ */
+
+void
+gui_init_color_pairs ()
+{
+    int i;
+    char shift_colors[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
+    
+    if (has_colors ())
+    {
+        for (i = 1; i < COLOR_PAIRS; i++)
+            init_pair (i, shift_colors[i % 8], (i < 8) ? -1 : shift_colors[i / 8]);
+        
+        /* disable white on white, replaced by black on white */
+        init_pair (63, -1, -1);
+        
+        /* white on default bg is default (-1) */
+        if (!cfg_col_real_white)
+            init_pair (WEECHAT_COLOR_WHITE, -1, -1);
+    }
+}
+
 /*
  * gui_init_weechat_colors: init WeeChat colors
  */
@@ -3165,17 +3189,20 @@ gui_rebuild_weechat_colors ()
 {
     int i;
     
-    for (i = 0; i < NUM_COLORS; i++)
+    if (has_colors ())
     {
-        if (gui_color[i])
+        for (i = 0; i < NUM_COLORS; i++)
         {
-            if (gui_color[i]->string)
-                free (gui_color[i]->string);
-            free (gui_color[i]);
-            gui_color[i] = NULL;
+            if (gui_color[i])
+            {
+                if (gui_color[i]->string)
+                    free (gui_color[i]->string);
+                free (gui_color[i]);
+                gui_color[i] = NULL;
+            }
         }
+        gui_init_weechat_colors ();
     }
-    gui_init_weechat_colors ();
 }
 
 /*
@@ -3185,23 +3212,11 @@ gui_rebuild_weechat_colors ()
 void
 gui_init_colors ()
 {
-    int i;
-    char shift_colors[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
-    
     if (has_colors ())
     {
         start_color ();
         use_default_colors ();
-        
-        for (i = 1; i < COLOR_PAIRS; i++)
-            init_pair (i, shift_colors[i % 8], (i < 8) ? -1 : shift_colors[i / 8]);
-        
-        /* disable white on white, replaced by black on white */
-        init_pair (63, -1, -1);
-        
-        /* white on default bg is default (-1) */
-        init_pair (WEECHAT_COLOR_WHITE, -1, -1);
-        
+        gui_init_color_pairs ();
         gui_init_weechat_colors ();
     }
 }

src/gui/gui.h

@@ -490,6 +490,7 @@ extern void gui_window_merge_auto (t_gui_window *);
 extern void gui_window_merge_all (t_gui_window *);
 extern void gui_refresh_screen ();
 extern void gui_pre_init (int *, char **[]);
+extern void gui_init_color_pairs ();
 extern void gui_rebuild_weechat_colors ();
 extern void gui_set_window_title ();
 extern void gui_init ();

weechat/doc/weechat_doc_en.texi

@@ -35,7 +35,7 @@
 
 @title WeeChat - User guide
 @subtitle Fast, light and extensible IRC client
-@subtitle Documentation for WeeChat v0.1.6-cvs - November, 5 2005
+@subtitle Documentation for WeeChat v0.1.6-cvs - November, 6 2005
 
 @author FlashCode <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
 
@@ -352,6 +352,9 @@ Type: boolean (values: 'on' or 'off'), default value: 'on'@*
 @item look_day_change_timestamp
 Timestamp for date displayed when day changed@*
 Type: string (any string), default value: '%a, %d %b %Y'@*
+@item col_real_white
+If set, uses real white color, disabled by default for terms with white background (if you never use white background, you should turn on this option to see real white instead of default term foreground color)@*
+Type: boolean (values: 'on' or 'off'), default value: 'off'@*
 @item col_title
 Color for title bar@*
 Type: color (Curses or Gtk color), default value: 'default'@*

weechat/doc/weechat_doc_es.texi

@@ -36,7 +36,7 @@
 
 @title WeeChat - Gui@'on de usuario.
 @subtitle Cliente IRC r@'apido, peque@~no y extensible
-@subtitle Documentaci@'on para WeeChat v0.1.6-cvs - 5 de noviembre de 2005
+@subtitle Documentaci@'on para WeeChat v0.1.6-cvs - 6 de noviembre de 2005
 
 @author FlashCode <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
 
@@ -352,6 +352,9 @@ Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'on'@*
 @item look_day_change_timestamp
 Timestamp for date displayed when day changed@*
 Typo: cadena (cualquier cadena), valor por defecto: '%a, %d %b %Y'@*
+@item col_real_white
+If set, uses real white color, disabled by default for terms with white background (if you never use white background, you should turn on this option to see real white instead of default term foreground color)@*
+Typo: booleano (valores: 'on' u 'off'), valor por defecto: 'off'@*
 @item col_title
 Color para la barra de t@'itulo@*
 Typo: color (color Curses @'o Gtk), valor por defecto: 'default'@*

weechat/doc/weechat_doc_fr.texi

@@ -36,7 +36,7 @@
 
 @title WeeChat - Guide utilisateur
 @subtitle Client IRC rapide, l@'eger et extensible
-@subtitle Documentation pour WeeChat v0.1.6-cvs - 5 novembre 2005
+@subtitle Documentation pour WeeChat v0.1.6-cvs - 6 novembre 2005
 
 @author FlashCode <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
 
@@ -353,6 +353,9 @@ Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'on'@*
 @item look_day_change_timestamp
 Format de date pour la date affich@'ee quand le jour a chang@'e@*
 Type: cha@^ine (toute cha@^ine), valeur par d@'efaut: '%a, %d %b %Y'@*
+@item col_real_white
+Si activ@'e, utilise la vraie couleur blanche, d@'esactiv@'e par d@'efaut pour les terminaux avec un fond blanc (si vous n'utilisez jamais de fond blanc, vous devriez activer cette option pour voir du vrai blanc au lieu de la couleur d'avant plant par d@'efaut du terminal)@*
+Type: bool@'een (valeurs: 'on' ou 'off'), valeur par d@'efaut: 'off'@*
 @item col_title
 Couleur pour la barre de titre@*
 Type: couleur (couleur Curses ou Gtk), valeur par d@'efaut: 'default'@*

weechat/doc/weechat_doc_pt.texi

@@ -36,7 +36,7 @@
 
 @title WeeChat - Guia do Utilizador
 @subtitle Cliente de IRC rapido, leve e extencivel
-@subtitle Documenta@,{c}@~ao do WeeChat v0.1.6-cvs - 5 de novembro de 2005
+@subtitle Documenta@,{c}@~ao do WeeChat v0.1.6-cvs - 6 de novembro de 2005
 
 @author FlashCode <@email{flashcode@@flashtux.org, flashcode AT flashtux.org}>
 
@@ -350,6 +350,9 @@ Type: boolean (values: 'on' or 'off'), default value: 'on'@*
 @item look_day_change_timestamp
 Timestamp for date displayed when day changed@*
 Type: string (any string), default value: '%a, %d %b %Y'@*
+@item col_real_white
+If set, uses real white color, disabled by default for terms with white background (if you never use white background, you should turn on this option to see real white instead of default term foreground color)@*
+Type: boolean (values: 'on' or 'off'), default value: 'off'@*
 @item col_title
 Color for title bar@*
 Type: color (Curses or Gtk color), default value: 'default'@*

weechat/src/common/weeconfig.c

@@ -234,6 +234,7 @@ t_config_option weechat_options_look[] =
 
 /* config, colors section */
 
+int cfg_col_real_white;
 int cfg_col_title;
 int cfg_col_title_bg;
 int cfg_col_chat;
@@ -290,7 +291,14 @@ int cfg_col_dcc_failed;
 int cfg_col_dcc_aborted;
 
 t_config_option weechat_options_colors[] =
-{ /* title window */
+{ /* general color settings */
+  { "col_real_white", N_("if set, uses real white color"),
+    N_("if set, uses real white color, disabled by default for terms with white "
+       "background (if you never use white background, you should turn on "
+       "this option to see real white instead of default term foreground color)"),
+    OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_FALSE,
+    NULL, NULL, &cfg_col_real_white, NULL, config_change_color },
+  /* title window */
   { "col_title", N_("color for title bar"),
     N_("color for title bar"),
     OPTION_TYPE_COLOR, 0, 0, 0,
@@ -1050,6 +1058,7 @@ config_change_color ()
 {
     t_gui_window *ptr_win;
     
+    gui_init_color_pairs ();
     gui_rebuild_weechat_colors ();
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
         gui_redraw_buffer (ptr_win->buffer);

weechat/src/common/weeconfig.h

@@ -111,6 +111,7 @@ extern int cfg_look_hotlist_names_length;
 extern int cfg_look_day_change;
 extern char *cfg_look_day_change_timestamp;
 
+extern int cfg_col_real_white;
 extern int cfg_col_title;
 extern int cfg_col_title_bg;
 extern int cfg_col_chat;

weechat/src/gui/curses/gui-display.c

@@ -3091,6 +3091,30 @@ gui_pre_init (int *argc, char **argv[])
     (void) argv;
 }
 
+/*
+ * gui_init_color_pairs: init color pairs
+ */
+
+void
+gui_init_color_pairs ()
+{
+    int i;
+    char shift_colors[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
+    
+    if (has_colors ())
+    {
+        for (i = 1; i < COLOR_PAIRS; i++)
+            init_pair (i, shift_colors[i % 8], (i < 8) ? -1 : shift_colors[i / 8]);
+        
+        /* disable white on white, replaced by black on white */
+        init_pair (63, -1, -1);
+        
+        /* white on default bg is default (-1) */
+        if (!cfg_col_real_white)
+            init_pair (WEECHAT_COLOR_WHITE, -1, -1);
+    }
+}
+
 /*
  * gui_init_weechat_colors: init WeeChat colors
  */
@@ -3165,17 +3189,20 @@ gui_rebuild_weechat_colors ()
 {
     int i;
     
-    for (i = 0; i < NUM_COLORS; i++)
+    if (has_colors ())
     {
-        if (gui_color[i])
+        for (i = 0; i < NUM_COLORS; i++)
         {
-            if (gui_color[i]->string)
-                free (gui_color[i]->string);
-            free (gui_color[i]);
-            gui_color[i] = NULL;
+            if (gui_color[i])
+            {
+                if (gui_color[i]->string)
+                    free (gui_color[i]->string);
+                free (gui_color[i]);
+                gui_color[i] = NULL;
+            }
         }
+        gui_init_weechat_colors ();
     }
-    gui_init_weechat_colors ();
 }
 
 /*
@@ -3185,23 +3212,11 @@ gui_rebuild_weechat_colors ()
 void
 gui_init_colors ()
 {
-    int i;
-    char shift_colors[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
-    
     if (has_colors ())
     {
         start_color ();
         use_default_colors ();
-        
-        for (i = 1; i < COLOR_PAIRS; i++)
-            init_pair (i, shift_colors[i % 8], (i < 8) ? -1 : shift_colors[i / 8]);
-        
-        /* disable white on white, replaced by black on white */
-        init_pair (63, -1, -1);
-        
-        /* white on default bg is default (-1) */
-        init_pair (WEECHAT_COLOR_WHITE, -1, -1);
-        
+        gui_init_color_pairs ();
         gui_init_weechat_colors ();
     }
 }

weechat/src/gui/gui.h

@@ -490,6 +490,7 @@ extern void gui_window_merge_auto (t_gui_window *);
 extern void gui_window_merge_all (t_gui_window *);
 extern void gui_refresh_screen ();
 extern void gui_pre_init (int *, char **[]);
+extern void gui_init_color_pairs ();
 extern void gui_rebuild_weechat_colors ();
 extern void gui_set_window_title ();
 extern void gui_init ();