add an obscured flag that tracks if the frame is at all obscured

[chaz/openbox] / render / theme.c

diff --git a/render/theme.c b/render/theme.c
index 50df679148ba3f82db0f1ab471a31a4b03588b78..6880f008a44665b691c9f7967d6ab8506e63fe50 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -59,6 +59,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     theme->a_menu_item = RrAppearanceNew(inst, 1);
     theme->a_menu_disabled = RrAppearanceNew(inst, 1);
     theme->a_menu_hilite = RrAppearanceNew(inst, 1);
+    theme->a_menu_bullet = RrAppearanceNew(inst, 1);
+    theme->a_clear = RrAppearanceNew(inst, 0);
 
     theme->app_hilite_bg = RrAppearanceNew(inst, 0);
     theme->app_unhilite_bg = RrAppearanceNew(inst, 0);
@@ -241,6 +243,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     if (!read_color(db, inst,
                     "menu.frame.textColor", &theme->menu_color))
         theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff);
+    if (!read_color(db, inst,
+                    "menu.bullet.picColor", &theme->menu_bullet_color))
+        theme->menu_bullet_color = RrColorNew(inst, 0, 0, 0);
     if (!read_color(db, inst,
                     "menu.frame.disableColor", &theme->menu_disabled_color))
         theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0);
@@ -248,6 +253,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
                     "menu.hilite.textColor", &theme->menu_hilite_color))
         theme->menu_hilite_color = RrColorNew(inst, 0, 0, 0);
 
+    
     if (read_mask(inst, "max.xbm", theme, &theme->max_mask)) {
         if (!read_mask(inst, "max_pressed.xbm", theme,
                        &theme->max_pressed_mask)) {
@@ -267,12 +273,12 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         }
    } else {
         {
-            char data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
-            theme->max_mask = RrPixmapMaskNew(inst, 7, 7, data);
+            guchar data[] = { 0x7f, 0x7f, 0x7f, 0x41, 0x41, 0x41, 0x7f };
+            theme->max_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
         }
         {
-            char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
-            theme->max_toggled_mask = RrPixmapMaskNew(inst, 7, 7, data);
+            guchar data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f };
+            theme->max_toggled_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
         }
         theme->max_pressed_mask = RrPixmapMaskCopy(theme->max_mask);
         theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask);
@@ -296,8 +302,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         }
     } else {
         {
-            char data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
-            theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, data);
+            guchar data[] = { 0x00, 0x00, 0x00, 0x00, 0x7f, 0x7f, 0x7f };
+            theme->iconify_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
         }
         theme->iconify_pressed_mask = RrPixmapMaskCopy(theme->iconify_mask);
         theme->iconify_disabled_mask = RrPixmapMaskCopy(theme->iconify_mask);
@@ -324,12 +330,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         }
     } else {
         {
-            char data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
-            theme->desk_mask = RrPixmapMaskNew(inst, 7, 7, data);
+            guchar data[] = { 0x63, 0x63, 0x00, 0x00, 0x00, 0x63, 0x63 };
+            theme->desk_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
         }
         {
-            char data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
-            theme->desk_toggled_mask = RrPixmapMaskNew(inst, 7, 7, data);
+            guchar data[] = { 0x00, 0x36, 0x36, 0x08, 0x36, 0x36, 0x00 };
+            theme->desk_toggled_mask = RrPixmapMaskNew(inst, 7, 7,
+                                                       (char*)data);
         }
         theme->desk_pressed_mask = RrPixmapMaskCopy(theme->desk_mask);
         theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask);
@@ -356,12 +363,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         }
     } else {
         {
-            char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 };
-            theme->shade_mask = RrPixmapMaskNew(inst, 7, 7, data);
+            guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00 };
+            theme->shade_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
         }
         {
-            char data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f };
-            theme->shade_toggled_mask = RrPixmapMaskNew(inst, 7, 7, data);
+            guchar data[] = { 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x7f };
+            theme->shade_toggled_mask = RrPixmapMaskNew(inst, 7, 7,
+                                                        (char*)data);
         }
         theme->shade_pressed_mask = RrPixmapMaskCopy(theme->shade_mask);
         theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask);
@@ -383,13 +391,18 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         }
     } else {
         {
-            char data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
-            theme->close_mask = RrPixmapMaskNew(inst, 7, 7, data);
+            guchar data[] = { 0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63 };
+            theme->close_mask = RrPixmapMaskNew(inst, 7, 7, (char*)data);
         }
         theme->close_pressed_mask = RrPixmapMaskCopy(theme->close_mask);
         theme->close_disabled_mask = RrPixmapMaskCopy(theme->close_mask);
         theme->close_hover_mask = RrPixmapMaskCopy(theme->close_mask);
-    }        
+    }
+
+    if (!read_mask(inst, "bullet.xbm", theme, &theme->menu_bullet_mask)) {
+        guchar data[] = { 0x18, 0x30, 0x60, 0xfe, 0xfe, 0x60, 0x30, 0x18 };
+        theme->menu_bullet_mask = RrPixmapMaskNew(inst, 8, 8, (char*)data);
+    }
 
     /* read the decoration textures */
     if (!read_appearance(db, inst,
@@ -585,6 +598,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         RrAppearanceCopy(theme->a_focused_pressed_max);
 
     theme->a_icon->surface.grad = RR_SURFACE_PARENTREL;
+    theme->a_clear->surface.grad = RR_SURFACE_PARENTREL;
 
     /* set up the textures */
     theme->a_focused_label->texture[0].type = 
@@ -614,6 +628,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
 
     theme->a_menu_item->surface.grad = 
         theme->a_menu_disabled->surface.grad =
+        theme->a_menu_bullet->surface.grad =
         theme->app_icon->surface.grad = RR_SURFACE_PARENTREL;
 
     theme->a_menu_item->texture[0].type =
@@ -630,6 +645,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->menu_disabled_color;
     theme->a_menu_hilite->texture[0].data.text.color =
         theme->menu_hilite_color;
+    theme->a_menu_bullet->texture[0].data.mask.color =
+        theme->menu_bullet_color;
 
     theme->a_disabled_focused_max->texture[0].type = 
         theme->a_disabled_unfocused_max->texture[0].type = 
@@ -676,7 +693,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->a_focused_unpressed_iconify->texture[0].type = 
         theme->a_focused_pressed_iconify->texture[0].type = 
         theme->a_unfocused_unpressed_iconify->texture[0].type = 
-        theme->a_unfocused_pressed_iconify->texture[0].type = RR_TEXTURE_MASK;
+        theme->a_unfocused_pressed_iconify->texture[0].type =
+        theme->a_menu_bullet->texture[0].type = RR_TEXTURE_MASK;
+    
     theme->a_disabled_focused_max->texture[0].data.mask.mask = 
         theme->a_disabled_unfocused_max->texture[0].data.mask.mask = 
         theme->max_disabled_mask;
@@ -718,7 +737,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->desk_mask;
     theme->a_toggled_focused_desk->texture[0].data.mask.mask = 
         theme->a_toggled_unfocused_desk->texture[0].data.mask.mask =
-        theme->desk_mask;
+        theme->desk_toggled_mask;
     theme->a_disabled_focused_shade->texture[0].data.mask.mask = 
         theme->a_disabled_unfocused_shade->texture[0].data.mask.mask = 
         theme->shade_disabled_mask;
@@ -733,7 +752,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->shade_mask;
     theme->a_toggled_focused_shade->texture[0].data.mask.mask = 
         theme->a_toggled_unfocused_shade->texture[0].data.mask.mask =
-        theme->shade_mask;
+        theme->shade_toggled_mask;
     theme->a_disabled_focused_iconify->texture[0].data.mask.mask = 
         theme->a_disabled_unfocused_iconify->texture[0].data.mask.mask = 
         theme->iconify_disabled_mask;
@@ -746,6 +765,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = 
         theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = 
         theme->iconify_mask;
+    theme->a_menu_bullet->texture[0].data.mask.mask = 
+        theme->menu_bullet_mask;
     theme->a_disabled_focused_max->texture[0].data.mask.color = 
         theme->a_disabled_focused_close->texture[0].data.mask.color = 
         theme->a_disabled_focused_desk->texture[0].data.mask.color = 
@@ -802,6 +823,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->a_unfocused_pressed_shade->texture[0].data.mask.color = 
         theme->a_unfocused_pressed_iconify->texture[0].data.mask.color =
         theme->titlebut_unfocused_pressed_color;
+    theme->a_menu_bullet->texture[0].data.mask.color = 
+        theme->menu_bullet_color;
 
     XrmDestroyDatabase(db);
 
@@ -861,6 +884,7 @@ void RrThemeFree(RrTheme *theme)
         RrPixmapMaskFree(theme->close_disabled_mask);
         RrPixmapMaskFree(theme->close_hover_mask);
         RrPixmapMaskFree(theme->close_pressed_mask);
+        RrPixmapMaskFree(theme->menu_bullet_mask);
 
         RrFontClose(theme->winfont);
         RrFontClose(theme->mtitlefont);
@@ -926,6 +950,7 @@ void RrThemeFree(RrTheme *theme)
         RrAppearanceFree(theme->a_menu_item);
         RrAppearanceFree(theme->a_menu_disabled);
         RrAppearanceFree(theme->a_menu_hilite);
+        RrAppearanceFree(theme->a_clear);
         RrAppearanceFree(theme->app_hilite_bg);
         RrAppearanceFree(theme->app_unhilite_bg);
         RrAppearanceFree(theme->app_hilite_label);
@@ -938,19 +963,19 @@ static XrmDatabase loaddb(RrTheme *theme, char *name)
 {
     XrmDatabase db;
 
-    char *s = g_build_filename(name, "themerc", NULL);
+    char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
+                               name, "themerc", NULL);
     if ((db = XrmGetFileDatabase(s)))
         theme->path = g_path_get_dirname(s);
     g_free(s);
     if (db == NULL) {
-       char *s = g_build_filename(g_get_home_dir(), ".openbox", "themes",
-                                  name, "themerc", NULL);
+       char *s = g_build_filename(THEMEDIR, name, "themerc", NULL);
        if ((db = XrmGetFileDatabase(s)))
             theme->path = g_path_get_dirname(s);
        g_free(s);
     }
     if (db == NULL) {
-       char *s = g_build_filename(THEMEDIR, name, "themerc", NULL);
+        char *s = g_build_filename(name, "themerc", NULL);
        if ((db = XrmGetFileDatabase(s)))
             theme->path = g_path_get_dirname(s);
         g_free(s);