High contrast themes patch

[Bill Haneman <bill haneman sun com>]

Hi:

There's been some interest in making the HC themes work as well as
possible with 8bit displays; also there's some accessibility impact
since dithered stuff is possibly harder to read.

I have changed the colors in the RC files to use colors from the
Netscape color cube wherever possible.  In this patch I only allocate a
single color outside the 6x6x6 cube (since there's no color in the cube
that fits the bill, as far as I can tell), and I do that only for
HighContrast; the Inverse variant uses only colors in the cube.  I think
allocating a single new color is a reasonable tradeoff, since there
should be 40 left over after the Netscape cube is allocated.

Anyhow this required changing the way colors are specified from a
floating-point triplet {0.8, 0.8, 0.2} to strings ("black") and hex
("#cccc66").

The patch also:

* adds a text color for INSENSITIVE, which was missing from the RC
files;

* tweaks the greenish-yellow bg[SELECTED] color to something that has
better contrast with text and foreground, and which I think is a little
less ugly;

* improves the contrast in the bg[SELECTED] color in the inverse themes,
for instance sliders are more visible in inverse mode now.

Let me know if there are reasons not to commit, otherwise please give
the nod.

thanks!

-Bill

? autom4te.cache
? themes-patch.diff
Index: HighContrast/gtk-2.0/HighContrast.rc
===================================================================
RCS file: /cvs/gnome/gnome-themes/HighContrast/gtk-2.0/HighContrast.rc,v
retrieving revision 1.2
diff -u -r1.2 HighContrast.rc
--- HighContrast/gtk-2.0/HighContrast.rc	4 Dec 2002 18:00:49 -0000	1.2
+++ HighContrast/gtk-2.0/HighContrast.rc	5 Dec 2002 01:55:44 -0000
@@ -18,33 +18,34 @@
   GtkHSV::focus-line-pattern = "\0"
   GtkWidget::interior_focus = 1
   GtkWidget::focus-padding = 0
-  GtkEntry::cursor_color    = { 0.80, 0.00, 0.00 }
-  GtkTextView::cursor_color    = { 0.80, 0.00, 0.00 }
+  GtkEntry::cursor_color    = "#cc0000"
+  GtkTextView::cursor_color    = "#cc0000"
   GtkTextView::cursor_aspect_ratio = 0.1
   GtkEntry::cursor_aspect_ratio = 0.1
 
-  fg[NORMAL]      = { 0.00, 0.00, 0.00 }
-  text[NORMAL]      = { 0.00, 0.00, 0.00 }
-  bg[NORMAL]      = { 1.00, 1.00, 1.00 }
-  base[NORMAL]    = { 1.00, 1.00, 1.00 }
+  fg[NORMAL]      = "black"
+  text[NORMAL]      = "black"
+  bg[NORMAL]      = "white"
+  base[NORMAL]    = "white"
 
-  fg[INSENSITIVE]      = { 0.6, 0.6, 0.6 }
-  bg[INSENSITIVE]      = { 0.75, 0.75, 0.77 }
-  base[INSENSITIVE]      = { 0.75, 0.75, 0.77 }
+  fg[INSENSITIVE]      = "#999999"
+  text[INSENSITIVE]    = "#999999"
+  bg[INSENSITIVE]      = "#ccccff"
+  base[INSENSITIVE]      = "#ccccff"
 
-  fg[PRELIGHT]    = { 0.80, 0.80, 1.00 }
-  text[PRELIGHT]    = { 0.80, 0.80, 1.00 }
-  bg[PRELIGHT]    = { 0.00, 0.00, 0.00 }
-  base[PRELIGHT]    = { 0.00, 0.00, 0.00 }
+  fg[PRELIGHT]    = "#ccccff"
+  text[PRELIGHT]    = "#ccccff"
+  bg[PRELIGHT]    = "black"
+  base[PRELIGHT]    = "black"
 
-  fg[ACTIVE]      = { 0.00, 0.00, 0.00 }
-  text[ACTIVE]      = { 0.00, 0.00, 0.00 }
-  bg[ACTIVE]      = { 0.65, 0.65, 0.50 }
-  base[ACTIVE]      = { 0.65, 0.65, 0.50 }
+  fg[ACTIVE]      = "black"
+  text[ACTIVE]      = "black"
+  bg[ACTIVE]      = { 0.72, 0.72, 0.57 }
+  base[ACTIVE]      = { 0.72, 0.72, 0.57 }
 
-  fg[SELECTED]    = { 1.00, 1.00, 1.00 }
-  text[SELECTED]    = { 1.00, 1.00, 1.00 }
-  bg[SELECTED]    = { 0.00, 0.00, 0.00 }
-  base[SELECTED]    = { 0.10, 0.20, 0.20 }
+  fg[SELECTED]    = "white"
+  text[SELECTED]    = "white"
+  bg[SELECTED]    = "black"
+  base[SELECTED]    = "#333300"
 
 
Index: HighContrastInverse/gtk-2.0/HighContrastInverse.rc
===================================================================
RCS file: /cvs/gnome/gnome-themes/HighContrastInverse/gtk-2.0/HighContrastInverse.rc,v
retrieving revision 1.3
diff -u -r1.3 HighContrastInverse.rc
--- HighContrastInverse/gtk-2.0/HighContrastInverse.rc	4 Dec 2002 18:00:50 -0000	1.3
+++ HighContrastInverse/gtk-2.0/HighContrastInverse.rc	5 Dec 2002 01:55:45 -0000
@@ -1,4 +1,4 @@
-# High-Contrast, Large Print, Inverse Video Theme v0.1
+# High-Contrast, Inverse Video Theme v0.1
 # This is the whole basic theme, just this one gtkrc file.
 # It uses components of the standard theme engine
 # Written by Bill Haneman, based on Standard theme by T. Liebeck, 
@@ -19,34 +19,35 @@
   GtkHSV::focus-line-pattern = "\0"
   GtkWidget::interior_focus = 1
   GtkWidget::focus-padding = 0
-  GtkEntry::cursor_color    = { 0.00, 0.80, 0.80 }
+  GtkEntry::cursor_color    = "#00cccc"
 #  GtkWidget::cursor_aspect_ratio = 0.1
-  GtkTextView::cursor_color    = { 0.00, 0.80, 0.80 }
+  GtkTextView::cursor_color    = "#00cccc"
   GtkTextView::cursor_aspect_ratio = 0.1 
   GtkEntry::cursor_aspect_ratio = 0.1
   NautilusIconContainer::frame_text = 1
   
-  fg[NORMAL]      = { 1.00, 1.00, 1.00 }
-  text[NORMAL]      = { 1.00, 1.00, 1.00 }
-  bg[NORMAL]      = { 0.10, 0.10, 0.10 } 
-  base[NORMAL]    = { 0.15, 0.15, 0.15 }
-
-  fg[INSENSITIVE]      = { 0.4, 0.4, 0.4 }
-  bg[INSENSITIVE]      = { 0.25, 0.25, 0.23 }
-  base[INSENSITIVE]      = { 0.25, 0.25, 0.23 }
-
-  fg[PRELIGHT]    = { 0.10, 0.10, 0.10 } 
-  text[PRELIGHT]    = { 0.10, 0.10, 0.10 }
-  bg[PRELIGHT]    = { 1.00, 1.00, 1.00 }
-  base[PRELIGHT]    = { 1.00, 1.00, 1.00 }
-
-  fg[ACTIVE]      = { 1.00, 1.00, 1.00 }
-  text[ACTIVE]      = { 1.00, 1.00, 1.00 }
-  bg[ACTIVE]      = { 0.35, 0.35, 0.50 }
-  base[ACTIVE]      = { 0.65, 0.65, 0.50 }
-
-  fg[SELECTED]    = { 0.10, 0.10, 0.10 }
-  text[SELECTED]    = { 0.10, 0.10, 0.10 }
-  bg[SELECTED]    = { 1.00, 1.00, 1.00 }
-  base[SELECTED]    = { 0.90, 0.80, 0.80 }
+  fg[NORMAL]      = "white"
+  text[NORMAL]      = "white"
+  bg[NORMAL]      = "#330033" 
+  base[NORMAL]    = "#330033"
+
+  fg[INSENSITIVE]      = "#666666"
+  bg[INSENSITIVE]      = "#333333"
+  text[INSENSITIVE]      = "#666666"
+  base[INSENSITIVE]      = "#333333"
+
+  fg[PRELIGHT]    = "#003333"
+  text[PRELIGHT]    = "#003333"
+  bg[PRELIGHT]    = "white"
+  base[PRELIGHT]    = "white"
+
+  fg[ACTIVE]      = "white"
+  text[ACTIVE]      = "white"
+  bg[ACTIVE]      = "#666699"
+  base[ACTIVE]      = "#666699"
+
+  fg[SELECTED]    = "#330033"
+  text[SELECTED]    = "#330033"
+  bg[SELECTED]    = "white"
+  base[SELECTED]    = "#ffcccc"
 
Index: HighContrastLargePrint/gtk-2.0/HighContrastLargePrint.rc
===================================================================
RCS file: /cvs/gnome/gnome-themes/HighContrastLargePrint/gtk-2.0/HighContrastLargePrint.rc,v
retrieving revision 1.3
diff -u -r1.3 HighContrastLargePrint.rc
--- HighContrastLargePrint/gtk-2.0/HighContrastLargePrint.rc	4 Dec 2002 18:00:51 -0000	1.3
+++ HighContrastLargePrint/gtk-2.0/HighContrastLargePrint.rc	5 Dec 2002 01:55:45 -0000
@@ -19,35 +19,37 @@
   GtkHSV::focus-line-pattern = "\0"
   GtkWidget::interior_focus = 1
   GtkWidget::focus-padding = 0
-  GtkEntry::cursor_color    = { 0.80, 0.00, 0.00 }
+  GtkEntry::cursor_color    = "#cc0000"
+  GtkTextView::cursor_color    = "#cc0000"
   GtkRange::slider_width = 20
   GtkTreeView::expander_size = 20
 #  GtkWidget::cursor_aspect_ratio = 0.1
-  GtkTextView::cursor_color    = { 0.80, 0.00, 0.00 }
   GtkTextView::cursor_aspect_ratio = 0.1
   GtkEntry::cursor_aspect_ratio = 0.1
 
-  fg[NORMAL]      = { 0.00, 0.00, 0.00 }
-  text[NORMAL]      = { 0.00, 0.00, 0.00 }
-  bg[NORMAL]      = { 1.00, 1.00, 1.00 }
-  base[NORMAL]    = { 1.00, 1.00, 1.00 }
-
-  fg[INSENSITIVE]      = { 0.6, 0.6, 0.6 }
-  bg[INSENSITIVE]      = { 0.75, 0.75, 0.77 }
-  base[INSENSITIVE]      = { 0.75, 0.75, 0.77 }
-
-  fg[PRELIGHT]    = { 1.00, 1.00, 1.00 }
-  text[PRELIGHT]    = { 1.00, 1.00, 1.00 }
-  bg[PRELIGHT]    = { 0.00, 0.00, 0.00 }
-  base[PRELIGHT]    = { 0.00, 0.00, 0.00 }
-
-  fg[ACTIVE]      = { 0.00, 0.00, 0.00 }
-  text[ACTIVE]      = { 0.00, 0.00, 0.00 }
-  bg[ACTIVE]      = { 0.65, 0.65, 0.50 }
-  base[ACTIVE]      = { 0.65, 0.65, 0.50 }
-
-  fg[SELECTED]    = { 1.00, 1.00, 1.00 }
-  text[SELECTED]    = { 1.00, 1.00, 1.00 }
-  bg[SELECTED]    = { 0.00, 0.00, 0.00 }
-  base[SELECTED]    = { 0.10, 0.20, 0.20 }
+  fg[NORMAL]      = "black"
+  text[NORMAL]      = "black"
+  bg[NORMAL]      = "white"
+  base[NORMAL]    = "white"
+
+  fg[INSENSITIVE]      = "#999999"
+  text[INSENSITIVE]    = "#999999"
+  bg[INSENSITIVE]      = "#ccccff"
+  base[INSENSITIVE]      = "#ccccff"
+
+  fg[PRELIGHT]    = "white"
+  text[PRELIGHT]    = "white"
+  bg[PRELIGHT]    = "black"
+  base[PRELIGHT]    = "black"
+
+  fg[ACTIVE]      = "black"
+  text[ACTIVE]      = "black"
+  bg[ACTIVE]      = { 0.72, 0.72, 0.57 }
+  base[ACTIVE]      = { 0.72, 0.72, 0.57 }
+
+  fg[SELECTED]    = "white"
+  text[SELECTED]    = "white"
+  bg[SELECTED]    = "black"
+  base[SELECTED]    = "#333300"
+
 
Index: HighContrastLargePrintInverse/gtk-2.0/HighContrastLargePrintInverse.rc
===================================================================
RCS file: /cvs/gnome/gnome-themes/HighContrastLargePrintInverse/gtk-2.0/HighContrastLargePrintInverse.rc,v
retrieving revision 1.4
diff -u -r1.4 HighContrastLargePrintInverse.rc
--- HighContrastLargePrintInverse/gtk-2.0/HighContrastLargePrintInverse.rc	4 Dec 2002 18:00:52 -0000	1.4
+++ HighContrastLargePrintInverse/gtk-2.0/HighContrastLargePrintInverse.rc	5 Dec 2002 01:55:47 -0000
@@ -17,36 +17,36 @@
   GtkHSV::focus-line-pattern = "\0"
   GtkWidget::interior_focus = 1
   GtkWidget::focus-padding = 0
-  GtkEntry::cursor_color    = { 0.00, 0.80, 0.80 }
+  GtkEntry::cursor_color    = "#00cccc"
   GtkRange::slider_width = 20
   GtkTreeView::expander_size = 20
 #  GtkWidget::cursor_aspect_ratio = 0.1
   GtkTextView::cursor_aspect_ratio = 0.1
-  GtkTextView::cursor_color    = { 0.00, 0.80, 0.80 }
+  GtkTextView::cursor_color    = "#00cccc"
   GtkEntry::cursor_aspect_ratio = 0.1
   NautilusIconContainer::frame_text = 1
 
-  fg[NORMAL]      = { 1.00, 1.00, 1.00 }
-  text[NORMAL]      = { 1.00, 1.00, 1.00 }
-  bg[NORMAL]      = { 0.10, 0.10, 0.10 }
-  base[NORMAL]    = { 0.15, 0.15, 0.15 }
-
-  fg[INSENSITIVE]      = { 0.4, 0.4, 0.4 }
-  bg[INSENSITIVE]      = { 0.25, 0.25, 0.23 }
-  base[INSENSITIVE]      = { 0.25, 0.25, 0.23 }
-
-  fg[PRELIGHT]    = { 0.10, 0.10, 0.10 }
-  text[PRELIGHT]    = { 0.10, 0.10, 0.10 }
-  bg[PRELIGHT]    = { 1.00, 1.00, 1.00 }
-  base[PRELIGHT]    = { 1.00, 1.00, 1.00 }
-
-  fg[ACTIVE]      = { 1.00, 1.00, 1.00 }
-  text[ACTIVE]      = { 1.00, 1.00, 1.00 }
-  bg[ACTIVE]      = { 0.35, 0.35, 0.50 }
-  base[ACTIVE]      = { 0.65, 0.65, 0.50 }
-
-  fg[SELECTED]    = { 0.10, 0.10, 0.10 }
-  text[SELECTED]    = { 0.10, 0.10, 0.10 }
-  bg[SELECTED]    = { 1.00, 1.00, 1.00 }
-  base[SELECTED]    = { 0.90, 0.80, 0.80 }
-
+  fg[NORMAL]      = "white"
+  text[NORMAL]      = "white"
+  bg[NORMAL]      = "#330033" 
+  base[NORMAL]    = "#330033"
+
+  fg[INSENSITIVE]      = "#666666"
+  bg[INSENSITIVE]      = "#333333"
+  text[INSENSITIVE]      = "#666666"
+  base[INSENSITIVE]      = "#333333"
+
+  fg[PRELIGHT]    = "#003333"
+  text[PRELIGHT]    = "#003333"
+  bg[PRELIGHT]    = "white"
+  base[PRELIGHT]    = "white"
+
+  fg[ACTIVE]      = "white"
+  text[ACTIVE]      = "white"
+  bg[ACTIVE]      = "#666699"
+  base[ACTIVE]      = "#666699"
+
+  fg[SELECTED]    = "#330033"
+  text[SELECTED]    = "#330033"
+  bg[SELECTED]    = "white"
+  base[SELECTED]    = "#ffccff"