look for masks in the right place. display the error with just the requested button...

[chaz/openbox] / engines / openbox / obengine.h

diff --git a/engines/openbox/obengine.h b/engines/openbox/obengine.h
index df6cdbcd3e7ee3f2301f310f2643e08eae52cf0b..b4cd7d48f6a38d660ea55181f7d81d28411f81de 100644 (file)
--- a/engines/openbox/obengine.h
+++ b/engines/openbox/obengine.h
@@ -28,27 +28,39 @@ extern color_rgb *ob_s_titlebut_focused_color;
 extern color_rgb *ob_s_titlebut_unfocused_color;
 
 extern int ob_s_winfont_height;
-extern int ob_s_winfont_shadow;
-extern int ob_s_winfont_shadow_offset;
 extern ObFont *ob_s_winfont;
 
-extern pixmap_mask *ob_s_max_mask;
-extern pixmap_mask *ob_s_icon_mask;
-extern pixmap_mask *ob_s_desk_mask;
+extern pixmap_mask *ob_s_max_set_mask;
+extern pixmap_mask *ob_s_max_unset_mask;
+extern pixmap_mask *ob_s_iconify_mask;
+extern pixmap_mask *ob_s_desk_set_mask;
+extern pixmap_mask *ob_s_desk_unset_mask;
+extern pixmap_mask *ob_s_shade_set_mask;
+extern pixmap_mask *ob_s_shade_unset_mask;
 extern pixmap_mask *ob_s_close_mask;
 
 extern Appearance *ob_a_focused_unpressed_max;
 extern Appearance *ob_a_focused_pressed_max;
+extern Appearance *ob_a_focused_pressed_set_max;
 extern Appearance *ob_a_unfocused_unpressed_max;
 extern Appearance *ob_a_unfocused_pressed_max;
+extern Appearance *ob_a_unfocused_pressed_set_max;
 extern Appearance *ob_a_focused_unpressed_close;
 extern Appearance *ob_a_focused_pressed_close;
 extern Appearance *ob_a_unfocused_unpressed_close;
 extern Appearance *ob_a_unfocused_pressed_close;
 extern Appearance *ob_a_focused_unpressed_desk;
 extern Appearance *ob_a_focused_pressed_desk;
+extern Appearance *ob_a_focused_pressed_set_desk;
 extern Appearance *ob_a_unfocused_unpressed_desk;
 extern Appearance *ob_a_unfocused_pressed_desk;
+extern Appearance *ob_a_unfocused_pressed_set_desk;
+extern Appearance *ob_a_focused_unpressed_shade;
+extern Appearance *ob_a_focused_pressed_shade;
+extern Appearance *ob_a_focused_pressed_set_shade;
+extern Appearance *ob_a_unfocused_unpressed_shade;
+extern Appearance *ob_a_unfocused_pressed_shade;
+extern Appearance *ob_a_unfocused_pressed_set_shade;
 extern Appearance *ob_a_focused_unpressed_iconify;
 extern Appearance *ob_a_focused_pressed_iconify;
 extern Appearance *ob_a_unfocused_unpressed_iconify;
@@ -63,6 +75,9 @@ extern Appearance *ob_a_icon;
 extern Appearance *ob_a_focused_handle;
 extern Appearance *ob_a_unfocused_handle;
 
+extern Appearance *ob_app_hilite_label;
+extern Appearance *ob_app_unhilite_label;
+
 typedef struct ObFrame {
     Frame frame;
 
@@ -71,6 +86,7 @@ typedef struct ObFrame {
     Window max;
     Window close;
     Window desk;
+    Window shade;
     Window icon;
     Window iconify;
     Window handle;
@@ -95,6 +111,7 @@ typedef struct ObFrame {
     int label_x;       /* x-position of the window title */
     int iconify_x;     /* x-position of the window iconify button */
     int desk_x;         /* x-position of the window all-desktops button */
+    int shade_x;         /* x-position of the window shade button */
     int max_x;         /* x-position of the window maximize button */
     int close_x;       /* x-position of the window close button */
     int bwidth;        /* border width */
@@ -103,6 +120,7 @@ typedef struct ObFrame {
     gboolean max_press;
     gboolean close_press;
     gboolean desk_press;
+    gboolean shade_press;
     gboolean iconify_press;
 } ObFrame;