modules/engines/ms-windows/xp_theme.[ch] Add support for drawing

2007-06-26  Cody Russell  <bratsche@gnome.org>

        * modules/engines/ms-windows/xp_theme.[ch]
        * modules/engines/ms-windows/msw_style.c: Add support for
        drawing checkboxes with inconsistent states. (Tor, #164809)

svn path=/trunk/; revision=18246

diff --git a/ChangeLog b/ChangeLog
index 363a23595a52ea1e0a0f398f999ed8f25a685fac..590da07f555d5328341b069e3e63c1794cb4a149 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-26  Cody Russell  <bratsche@gnome.org>
+
+       * modules/engines/ms-windows/xp_theme.[ch]
+       * modules/engines/ms-windows/msw_style.c: Add support for 
+       drawing checkboxes with inconsistent states. (Tor, #164809)
+
 2007-06-26  Johan Dahlin  <jdahlin@async.com.br>
 
        * gtk/gtk-builder-convert (GtkBuilderConverter.to_xml): Encode 

diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c
index 5c71b3929a0e75216770eabb641d4b765f1ea194..b2d92b67a0944587fe2923332bef5f1a171d28bc 100755 (executable)
--- a/modules/engines/ms-windows/msw_style.c
+++ b/modules/engines/ms-windows/msw_style.c
@@ -68,6 +68,7 @@ typedef enum
     CHECK_LIGHT,
     CHECK_MID,
     CHECK_TEXT,
+    CHECK_INCONSISTENT,
     RADIO_BASE,
     RADIO_BLACK,
     RADIO_DARK,
@@ -113,6 +114,10 @@ static const guint8 check_text_bits[] = {
     0xd8, 0x01, 0xf8,
     0x00, 0x70, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
+static const char check_inconsistent_bits[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0xf0,
+    0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
 static const guint8 radio_base_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0xf0, 0x01, 0xf8, 0x03, 0xfc, 0x07, 0xfc, 0x07,
     0xfc, 0x07, 0xfc,
@@ -157,6 +162,7 @@ static struct
     {check_light_bits, NULL},
     {check_mid_bits, NULL},
     {check_text_bits, NULL},
+    {check_inconsistent_bits, NULL},
     {radio_base_bits, NULL},
     {radio_black_bits, NULL},
     {radio_dark_bits, NULL},
@@ -1118,10 +1124,23 @@ draw_check (GtkStyle * style,
        }
     else
        {
-           if (!xp_theme_draw (window, shadow == GTK_SHADOW_IN
-                               ? XP_THEME_ELEMENT_PRESSED_CHECKBOX
-                               : XP_THEME_ELEMENT_CHECKBOX,
-                               style, x, y, width, height, state, area))
+         XpThemeElement theme_elt = XP_THEME_ELEMENT_CHECKBOX;
+         switch (shadow)
+           {
+           case GTK_SHADOW_ETCHED_IN:
+             theme_elt = XP_THEME_ELEMENT_INCONSISTENT_CHECKBOX;
+             break;
+
+           case GTK_SHADOW_IN:
+             theme_elt = XP_THEME_ELEMENT_PRESSED_CHECKBOX;
+             break;
+
+           default:
+             break;
+           }
+
+         if (!xp_theme_draw (window, theme_elt,
+                             style, x, y, width, height, state, area))
                {
                     if( detail && !strcmp(detail, "cellcheck") )
                         state = GTK_STATE_NORMAL;
@@ -1144,6 +1163,11 @@ draw_check (GtkStyle * style,
                            draw_part (window, style->text_aa_gc[state], area,
                                       x, y, CHECK_AA);
                        }
+                   else if (shadow == GTK_SHADOW_ETCHED_IN)
+                     {
+                       draw_part (window, style->text_gc[state], area, x, y, CHECK_INCONSISTENT);
+                       draw_part (window, style->text_aa_gc[state], area, x, y, CHECK_AA);
+                     }
                }
        }
 }

diff --git a/modules/engines/ms-windows/xp_theme.c b/modules/engines/ms-windows/xp_theme.c
index 187069d0d9d065f19801aa10b3c87e29dd6cb21a..cdc73bb42cb5b6e018045146aa856ece7a5c762a 100755 (executable)
--- a/modules/engines/ms-windows/xp_theme.c
+++ b/modules/engines/ms-windows/xp_theme.c
@@ -97,6 +97,7 @@ static const LPCWSTR class_descriptors[] = {
 };
 
 static const short element_part_map[XP_THEME_ELEMENT__SIZEOF] = {
+    BP_CHECKBOX,
     BP_CHECKBOX,
     BP_CHECKBOX,
     BP_PUSHBUTTON,
@@ -358,6 +359,7 @@ xp_theme_get_handle_by_element (XpThemeElement element)
            break;
 
        case XP_THEME_ELEMENT_PRESSED_CHECKBOX:
+       case XP_THEME_ELEMENT_INCONSISTENT_CHECKBOX:
        case XP_THEME_ELEMENT_CHECKBOX:
        case XP_THEME_ELEMENT_BUTTON:
        case XP_THEME_ELEMENT_DEFAULT_BUTTON:
@@ -644,6 +646,23 @@ xp_theme_map_gtk_state (XpThemeElement element, GtkStateType state)
                }
            break;
 
+       case XP_THEME_ELEMENT_INCONSISTENT_CHECKBOX:
+         switch (state)
+           {
+           case GTK_STATE_SELECTED:
+             ret = CBS_MIXEDPRESSED;
+             break;
+           case GTK_STATE_PRELIGHT:
+             ret = CBS_MIXEDHOT;
+             break;
+           case GTK_STATE_INSENSITIVE:
+             ret = CBS_MIXEDDISABLED;
+             break;
+           default:
+             ret = CBS_MIXEDNORMAL;
+           }
+         break;
+
        case XP_THEME_ELEMENT_PRESSED_CHECKBOX:
        case XP_THEME_ELEMENT_PRESSED_RADIO_BUTTON:
            switch (state)

diff --git a/modules/engines/ms-windows/xp_theme.h b/modules/engines/ms-windows/xp_theme.h
index 7c03565f1dc07c68248a751249af8db9b2d84aa3..d0770975a53cb82c1c31f0bbb53de9fd21a42495 100755 (executable)
--- a/modules/engines/ms-windows/xp_theme.h
+++ b/modules/engines/ms-windows/xp_theme.h
@@ -1,129 +1,130 @@
-/* MS-Windows Engine (aka GTK-Wimp)\r
- *\r
- * Copyright (C) 2003, 2004 Raymond Penners <raymond@dotsphinx.com>\r
- *\r
- * This library is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU Library General Public\r
- * License as published by the Free Software Foundation; either\r
- * version 2 of the License, or (at your option) any later version.\r
- *\r
- * This library is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
- * Library General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU Library General Public\r
- * License along with this library; if not, write to the\r
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,\r
- * Boston, MA 02111-1307, USA.\r
- */\r
-\r
-#ifndef XP_THEME_H\r
-#define XP_THEME_H\r
-\r
-#include <windows.h>\r
-\r
-#include "gtk/gtk.h"\r
-\r
-typedef enum\r
-{\r
-  XP_THEME_CLASS_SCROLLBAR = 0,\r
-  XP_THEME_CLASS_BUTTON,\r
-  XP_THEME_CLASS_HEADER,\r
-  XP_THEME_CLASS_COMBOBOX,\r
-  XP_THEME_CLASS_TAB,\r
-  XP_THEME_CLASS_EDIT,\r
-  XP_THEME_CLASS_TREEVIEW,\r
-  XP_THEME_CLASS_SPIN,\r
-  XP_THEME_CLASS_PROGRESS,\r
-  XP_THEME_CLASS_TOOLTIP,\r
-  XP_THEME_CLASS_REBAR,\r
-  XP_THEME_CLASS_TOOLBAR,\r
-  XP_THEME_CLASS_GLOBALS,\r
-  XP_THEME_CLASS_MENU,\r
-  XP_THEME_CLASS_WINDOW,\r
-  XP_THEME_CLASS_STATUS,\r
-  XP_THEME_CLASS_TRACKBAR,\r
-  XP_THEME_CLASS__SIZEOF\r
-} XpThemeClass;\r
-\r
-typedef enum\r
-{\r
-  XP_THEME_ELEMENT_PRESSED_CHECKBOX = 0,\r
-  XP_THEME_ELEMENT_CHECKBOX,\r
-  XP_THEME_ELEMENT_BUTTON,\r
-  XP_THEME_ELEMENT_LIST_HEADER,\r
-  XP_THEME_ELEMENT_COMBOBUTTON,\r
-  XP_THEME_ELEMENT_BODY,\r
-  XP_THEME_ELEMENT_TAB_ITEM,\r
-  XP_THEME_ELEMENT_TAB_ITEM_LEFT_EDGE,\r
-  XP_THEME_ELEMENT_TAB_ITEM_RIGHT_EDGE,\r
-  XP_THEME_ELEMENT_TAB_PANE,\r
-  XP_THEME_ELEMENT_SCROLLBAR_H,\r
-  XP_THEME_ELEMENT_SCROLLBAR_V,\r
-  XP_THEME_ELEMENT_ARROW_UP,\r
-  XP_THEME_ELEMENT_ARROW_DOWN,\r
-  XP_THEME_ELEMENT_ARROW_LEFT,\r
-  XP_THEME_ELEMENT_ARROW_RIGHT,\r
-  XP_THEME_ELEMENT_SCROLLBAR_GRIPPER_H,\r
-  XP_THEME_ELEMENT_SCROLLBAR_GRIPPER_V,\r
-  XP_THEME_ELEMENT_TROUGH_H,\r
-  XP_THEME_ELEMENT_TROUGH_V,\r
-  XP_THEME_ELEMENT_EDIT_TEXT,\r
-  XP_THEME_ELEMENT_DEFAULT_BUTTON,\r
-  XP_THEME_ELEMENT_SPIN_BUTTON_UP,\r
-  XP_THEME_ELEMENT_SPIN_BUTTON_DOWN,\r
-  XP_THEME_ELEMENT_PRESSED_RADIO_BUTTON,\r
-  XP_THEME_ELEMENT_RADIO_BUTTON,\r
-  XP_THEME_ELEMENT_TREEVIEW_EXPANDER_OPENED,\r
-  XP_THEME_ELEMENT_TREEVIEW_EXPANDER_CLOSED,\r
-  XP_THEME_ELEMENT_PROGRESS_BAR_H,\r
-  XP_THEME_ELEMENT_PROGRESS_BAR_V,\r
-  XP_THEME_ELEMENT_PROGRESS_TROUGH_H,\r
-  XP_THEME_ELEMENT_PROGRESS_TROUGH_V,\r
-  XP_THEME_ELEMENT_TOOLTIP,\r
-  XP_THEME_ELEMENT_REBAR,\r
-  XP_THEME_ELEMENT_REBAR_GRIPPER_H,\r
-  XP_THEME_ELEMENT_REBAR_GRIPPER_V,\r
-  XP_THEME_ELEMENT_REBAR_CHEVRON,\r
-  XP_THEME_ELEMENT_TOOLBAR_BUTTON,\r
-  XP_THEME_ELEMENT_MENU_ITEM,\r
-  XP_THEME_ELEMENT_MENU_SEPARATOR,\r
-  XP_THEME_ELEMENT_STATUS_GRIPPER,\r
-  XP_THEME_ELEMENT_STATUS_PANE,\r
-  XP_THEME_ELEMENT_LINE_H,\r
-  XP_THEME_ELEMENT_LINE_V,\r
-  XP_THEME_ELEMENT_TOOLBAR_SEPARATOR_H,\r
-  XP_THEME_ELEMENT_TOOLBAR_SEPARATOR_V,\r
-  XP_THEME_ELEMENT_SCALE_TROUGH_H,\r
-  XP_THEME_ELEMENT_SCALE_TROUGH_V,\r
-  XP_THEME_ELEMENT_SCALE_SLIDER_H,\r
-  XP_THEME_ELEMENT_SCALE_SLIDER_V,\r
-  XP_THEME_ELEMENT_SCALE_TICS_H,\r
-  XP_THEME_ELEMENT_SCALE_TICS_V,\r
-  XP_THEME_ELEMENT__SIZEOF\r
-} XpThemeElement;\r
-\r
-typedef enum\r
-{\r
-  XP_THEME_FONT_CAPTION,\r
-  XP_THEME_FONT_MENU,\r
-  XP_THEME_FONT_STATUS,\r
-  XP_THEME_FONT_MESSAGE\r
-} XpThemeFont;\r
-\r
-void xp_theme_init (void);\r
-void xp_theme_reset (void);\r
-void xp_theme_exit (void);\r
-gboolean xp_theme_draw (GdkWindow *win, XpThemeElement element,\r
-                        GtkStyle *style, int x, int y, int width,\r
-                        int height, GtkStateType state_type,\r
-                        GdkRectangle *area);\r
-gboolean xp_theme_is_drawable (XpThemeElement element);\r
-gboolean xp_theme_get_system_font (XpThemeClass klazz, XpThemeFont fontId, OUT LOGFONT *lf);\r
-gboolean xp_theme_get_system_color (XpThemeClass klazz, int colorId, OUT DWORD * pColor);\r
-gboolean xp_theme_get_system_metric (XpThemeClass klazz, int metricId, OUT int * pVal);\r
-\r
-gboolean xp_theme_is_active (void);\r
-\r
-#endif /* XP_THEME_H */\r
+/* MS-Windows Engine (aka GTK-Wimp)
+ *
+ * Copyright (C) 2003, 2004 Raymond Penners <raymond@dotsphinx.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef XP_THEME_H
+#define XP_THEME_H
+
+#include <windows.h>
+
+#include "gtk/gtk.h"
+
+typedef enum
+{
+  XP_THEME_CLASS_SCROLLBAR = 0,
+  XP_THEME_CLASS_BUTTON,
+  XP_THEME_CLASS_HEADER,
+  XP_THEME_CLASS_COMBOBOX,
+  XP_THEME_CLASS_TAB,
+  XP_THEME_CLASS_EDIT,
+  XP_THEME_CLASS_TREEVIEW,
+  XP_THEME_CLASS_SPIN,
+  XP_THEME_CLASS_PROGRESS,
+  XP_THEME_CLASS_TOOLTIP,
+  XP_THEME_CLASS_REBAR,
+  XP_THEME_CLASS_TOOLBAR,
+  XP_THEME_CLASS_GLOBALS,
+  XP_THEME_CLASS_MENU,
+  XP_THEME_CLASS_WINDOW,
+  XP_THEME_CLASS_STATUS,
+  XP_THEME_CLASS_TRACKBAR,
+  XP_THEME_CLASS__SIZEOF
+} XpThemeClass;
+
+typedef enum
+{
+  XP_THEME_ELEMENT_PRESSED_CHECKBOX = 0,
+  XP_THEME_ELEMENT_CHECKBOX,
+  XP_THEME_ELEMENT_INCONSISTENT_CHECKBOX,
+  XP_THEME_ELEMENT_BUTTON,
+  XP_THEME_ELEMENT_LIST_HEADER,
+  XP_THEME_ELEMENT_COMBOBUTTON,
+  XP_THEME_ELEMENT_BODY,
+  XP_THEME_ELEMENT_TAB_ITEM,
+  XP_THEME_ELEMENT_TAB_ITEM_LEFT_EDGE,
+  XP_THEME_ELEMENT_TAB_ITEM_RIGHT_EDGE,
+  XP_THEME_ELEMENT_TAB_PANE,
+  XP_THEME_ELEMENT_SCROLLBAR_H,
+  XP_THEME_ELEMENT_SCROLLBAR_V,
+  XP_THEME_ELEMENT_ARROW_UP,
+  XP_THEME_ELEMENT_ARROW_DOWN,
+  XP_THEME_ELEMENT_ARROW_LEFT,
+  XP_THEME_ELEMENT_ARROW_RIGHT,
+  XP_THEME_ELEMENT_SCROLLBAR_GRIPPER_H,
+  XP_THEME_ELEMENT_SCROLLBAR_GRIPPER_V,
+  XP_THEME_ELEMENT_TROUGH_H,
+  XP_THEME_ELEMENT_TROUGH_V,
+  XP_THEME_ELEMENT_EDIT_TEXT,
+  XP_THEME_ELEMENT_DEFAULT_BUTTON,
+  XP_THEME_ELEMENT_SPIN_BUTTON_UP,
+  XP_THEME_ELEMENT_SPIN_BUTTON_DOWN,
+  XP_THEME_ELEMENT_PRESSED_RADIO_BUTTON,
+  XP_THEME_ELEMENT_RADIO_BUTTON,
+  XP_THEME_ELEMENT_TREEVIEW_EXPANDER_OPENED,
+  XP_THEME_ELEMENT_TREEVIEW_EXPANDER_CLOSED,
+  XP_THEME_ELEMENT_PROGRESS_BAR_H,
+  XP_THEME_ELEMENT_PROGRESS_BAR_V,
+  XP_THEME_ELEMENT_PROGRESS_TROUGH_H,
+  XP_THEME_ELEMENT_PROGRESS_TROUGH_V,
+  XP_THEME_ELEMENT_TOOLTIP,
+  XP_THEME_ELEMENT_REBAR,
+  XP_THEME_ELEMENT_REBAR_GRIPPER_H,
+  XP_THEME_ELEMENT_REBAR_GRIPPER_V,
+  XP_THEME_ELEMENT_REBAR_CHEVRON,
+  XP_THEME_ELEMENT_TOOLBAR_BUTTON,
+  XP_THEME_ELEMENT_MENU_ITEM,
+  XP_THEME_ELEMENT_MENU_SEPARATOR,
+  XP_THEME_ELEMENT_STATUS_GRIPPER,
+  XP_THEME_ELEMENT_STATUS_PANE,
+  XP_THEME_ELEMENT_LINE_H,
+  XP_THEME_ELEMENT_LINE_V,
+  XP_THEME_ELEMENT_TOOLBAR_SEPARATOR_H,
+  XP_THEME_ELEMENT_TOOLBAR_SEPARATOR_V,
+  XP_THEME_ELEMENT_SCALE_TROUGH_H,
+  XP_THEME_ELEMENT_SCALE_TROUGH_V,
+  XP_THEME_ELEMENT_SCALE_SLIDER_H,
+  XP_THEME_ELEMENT_SCALE_SLIDER_V,
+  XP_THEME_ELEMENT_SCALE_TICS_H,
+  XP_THEME_ELEMENT_SCALE_TICS_V,
+  XP_THEME_ELEMENT__SIZEOF
+} XpThemeElement;
+
+typedef enum
+{
+  XP_THEME_FONT_CAPTION,
+  XP_THEME_FONT_MENU,
+  XP_THEME_FONT_STATUS,
+  XP_THEME_FONT_MESSAGE
+} XpThemeFont;
+
+void xp_theme_init (void);
+void xp_theme_reset (void);
+void xp_theme_exit (void);
+gboolean xp_theme_draw (GdkWindow *win, XpThemeElement element,
+                        GtkStyle *style, int x, int y, int width,
+                        int height, GtkStateType state_type,
+                        GdkRectangle *area);
+gboolean xp_theme_is_drawable (XpThemeElement element);
+gboolean xp_theme_get_system_font (XpThemeClass klazz, XpThemeFont fontId, OUT LOGFONT *lf);
+gboolean xp_theme_get_system_color (XpThemeClass klazz, int colorId, OUT DWORD * pColor);
+gboolean xp_theme_get_system_metric (XpThemeClass klazz, int metricId, OUT int * pVal);
+
+gboolean xp_theme_is_active (void);
+
+#endif /* XP_THEME_H */