all repos — openbox @ 5d4cbbc67444c3955f705b3aeddf29be1c731866

openbox fork - make it a bit more like ryudo 

add suppot for showing pixmap masks in menus where the rgba icons go too
Dana Jansens danakj@orodu.net
commit

5d4cbbc67444c3955f705b3aeddf29be1c731866

parent

0185445e3ab64ec4435f9b27164ce1508b840f86

3 files changed, 31 insertions(+), 3 deletions(-)

jump to
M openbox/menu.h → openbox/menu.h 
@@ -64,6 +64,10 @@ /* Icon shit */
     gint icon_width;
     gint icon_height;
     RrPixel32 *icon_data;
+
+    /* Mask icon */
+    RrPixmapMask *mask;
+    RrColor *mask_color;
 };
 
 struct _ObSubmenuMenuEntry {
M openbox/menuframe.c → openbox/menuframe.c 
@@ -107,8 +107,9 @@ self->a_selected = RrAppearanceCopy(ob_rr_theme->a_menu_hilite);
 
     self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
     self->a_icon->texture[0].type = RR_TEXTURE_RGBA;
+    self->a_mask = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
+    self->a_mask->texture[0].type = RR_TEXTURE_MASK;
     self->a_bullet = RrAppearanceCopy(ob_rr_theme->a_menu_bullet);
-    self->a_bullet->texture[0].type = RR_TEXTURE_MASK;
 
     self->a_text_normal =
         RrAppearanceCopy(ob_rr_theme->a_menu_text_item);

@@ -133,6 +134,7 @@ RrAppearanceFree(self->a_disabled);
         RrAppearanceFree(self->a_selected);
 
         RrAppearanceFree(self->a_icon);
+        RrAppearanceFree(self->a_mask);
         RrAppearanceFree(self->a_text_normal);
         RrAppearanceFree(self->a_text_disabled);
         RrAppearanceFree(self->a_text_selected);

@@ -254,7 +256,7 @@ XUnmapWindow(ob_display, self->text);
         break;
     }
 
-    if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+    if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR &&
         self->entry->data.normal.icon_data)
     {
         XMoveResizeWindow(ob_display, self->icon, PADDING, 0,

@@ -272,6 +274,22 @@ self->a_icon->surface.parenty = 0;
         RrPaint(self->a_icon, self->icon,
                 self->frame->item_h, self->frame->item_h);
         XMapWindow(ob_display, self->icon);
+    } else if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR &&
+               self->entry->data.normal.mask)
+    {
+        XMoveResizeWindow(ob_display, self->icon, PADDING, 0,
+                          self->frame->item_h,
+                          self->frame->item_h);
+        self->a_mask->texture[0].data.mask.mask =
+            self->entry->data.normal.mask;
+        self->a_mask->texture[0].data.mask.color =
+            self->entry->data.normal.mask_color;
+        self->a_mask->surface.parent = item_a;
+        self->a_mask->surface.parentx = PADDING;
+        self->a_mask->surface.parenty = 0;
+        RrPaint(self->a_mask, self->icon,
+                self->frame->item_h, self->frame->item_h);
+        XMapWindow(ob_display, self->icon);
     } else
         XUnmapWindow(ob_display, self->icon);
 

@@ -353,13 +371,18 @@ case OB_MENU_ENTRY_TYPE_NORMAL:
             text_a->texture[0].data.text.string = e->entry->data.normal.label;
             RrMinsize(text_a, &tw, &th);
 
-            if (e->entry->data.normal.icon_data)
+            if (e->entry->data.normal.icon_data ||
+                e->entry->data.normal.mask)
                 has_icon = TRUE;
             break;
         case OB_MENU_ENTRY_TYPE_SUBMENU:
             sub = e->entry->data.submenu.submenu;
             text_a->texture[0].data.text.string = sub ? sub->title : "";
             RrMinsize(text_a, &tw, &th);
+
+            if (e->entry->data.normal.icon_data ||
+                e->entry->data.normal.mask)
+                has_icon = TRUE;
 
             tw += self->item_h - PADDING;
             break;
M openbox/menuframe.h → openbox/menuframe.h 
@@ -69,6 +69,7 @@ RrAppearance *a_disabled;
     RrAppearance *a_selected;
 
     RrAppearance *a_icon;
+    RrAppearance *a_mask;
     RrAppearance *a_bullet;
     RrAppearance *a_text_normal;
     RrAppearance *a_text_disabled;