X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenuframe.c;h=7b86f4d7cf7ce370958cd0ce1f62fc517f7251ec;hb=ee58f96a8403b8058e3165e32b391cd136a5108f;hp=29b9b638f51ead4d001c3b1401c4f7fef740be43;hpb=c34ef4028e504b8ce862b9c2e47b284ab66717dd;p=chaz%2Fopenbox

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 29b9b638..7b86f4d7 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -1,31 +1,57 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   menuframe.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003        Ben Jansens
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program 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 General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "menuframe.h"
 #include "client.h"
 #include "menu.h"
 #include "screen.h"
 #include "grab.h"
 #include "openbox.h"
+#include "mainloop.h"
+#include "config.h"
 #include "render/theme.h"
 
-#define SEPARATOR_HEIGHT 5
+#define PADDING 2
+#define SEPARATOR_HEIGHT 3
+#define MAX_MENU_WIDTH 400
 
 #define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask |\
-			 LeaveWindowMask)
+                         LeaveWindowMask)
 #define TITLE_EVENTMASK (ButtonPressMask | ButtonMotionMask)
 #define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
                          ButtonPressMask | ButtonReleaseMask)
 
 GList *menu_frame_visible;
 
+static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry,
+                                              ObMenuFrame *frame);
+static void menu_entry_frame_free(ObMenuEntryFrame *self);
 static void menu_frame_render(ObMenuFrame *self);
 static void menu_frame_update(ObMenuFrame *self);
+static gboolean menu_entry_frame_submenu_timeout(gpointer data);
 
-static Window createWindow(Window parent, unsigned long mask,
-			   XSetWindowAttributes *attrib)
+static Window createWindow(Window parent, gulong mask,
+                           XSetWindowAttributes *attrib)
 {
     return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
-			 RrDepth(ob_rr_inst), InputOutput,
+                         RrDepth(ob_rr_inst), InputOutput,
                          RrVisual(ob_rr_inst), mask, attrib);
-                       
 }
 
 ObMenuFrame* menu_frame_new(ObMenu *menu, ObClient *client)
@@ -37,11 +63,13 @@ ObMenuFrame* menu_frame_new(ObMenu *menu, ObClient *client)
     self->type = Window_Menu;
     self->menu = menu;
     self->selected = NULL;
+    self->show_title = TRUE;
     self->client = client;
+    self->direction_right = TRUE;
 
     attr.event_mask = FRAME_EVENTMASK;
     self->window = createWindow(RootWindow(ob_display, ob_screen),
-                                   CWEventMask, &attr);
+                                CWEventMask, &attr);
     attr.event_mask = TITLE_EVENTMASK;
     self->title = createWindow(self->window, CWEventMask, &attr);
     self->items = createWindow(self->window, 0, NULL);
@@ -51,12 +79,21 @@ ObMenuFrame* menu_frame_new(ObMenu *menu, ObClient *client)
     self->a_title = RrAppearanceCopy(ob_rr_theme->a_menu_title);
     self->a_items = RrAppearanceCopy(ob_rr_theme->a_menu);
 
+    stacking_add(MENU_AS_WINDOW(self));
+
     return self;
 }
 
 void menu_frame_free(ObMenuFrame *self)
 {
     if (self) {
+        while (self->entries) {
+            menu_entry_frame_free(self->entries->data);
+            self->entries = g_list_delete_link(self->entries, self->entries);
+        }
+
+        stacking_remove(MENU_AS_WINDOW(self));
+
         XDestroyWindow(ob_display, self->items);
         XDestroyWindow(ob_display, self->title);
         XDestroyWindow(ob_display, self->window);
@@ -68,7 +105,8 @@ void menu_frame_free(ObMenuFrame *self)
     }
 }
 
-ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, ObMenuFrame *frame)
+static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry,
+                                              ObMenuFrame *frame)
 {
     ObMenuEntryFrame *self;
     XSetWindowAttributes attr;
@@ -79,49 +117,65 @@ ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, ObMenuFrame *frame)
 
     attr.event_mask = ENTRY_EVENTMASK;
     self->window = createWindow(self->frame->items, CWEventMask, &attr);
-    self->icon = createWindow(self->window, 0, NULL);
     self->text = createWindow(self->window, 0, NULL);
-    self->bullet = createWindow(self->window, 0, NULL);
+    if (entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR) {
+        self->icon = createWindow(self->window, 0, NULL);
+        self->bullet = createWindow(self->window, 0, NULL);
+    }
 
     XMapWindow(ob_display, self->window);
     XMapWindow(ob_display, self->text);
 
-    self->a_normal = RrAppearanceCopy(ob_rr_theme->a_menu_item);
+    self->a_normal = RrAppearanceCopy(ob_rr_theme->a_menu_normal);
     self->a_disabled = RrAppearanceCopy(ob_rr_theme->a_menu_disabled);
-    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_bullet = RrAppearanceCopy(ob_rr_theme->a_menu_bullet);
-    self->a_bullet->texture[0].type = RR_TEXTURE_MASK;
+    self->a_selected = RrAppearanceCopy(ob_rr_theme->a_menu_selected);
+
+    if (entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR) {
+        self->a_separator = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
+        self->a_separator->texture[0].type = RR_TEXTURE_LINE_ART;
+    } else {
+        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_normal =
+            RrAppearanceCopy(ob_rr_theme->a_menu_bullet_normal);
+        self->a_bullet_selected =
+            RrAppearanceCopy(ob_rr_theme->a_menu_bullet_selected);
+    }
 
     self->a_text_normal =
-        RrAppearanceCopy(ob_rr_theme->a_menu_text_item);
+        RrAppearanceCopy(ob_rr_theme->a_menu_text_normal);
     self->a_text_disabled =
         RrAppearanceCopy(ob_rr_theme->a_menu_text_disabled);
     self->a_text_selected =
-        RrAppearanceCopy(ob_rr_theme->a_menu_text_hilite);
+        RrAppearanceCopy(ob_rr_theme->a_menu_text_selected);
 
     return self;
 }
 
-void menu_entry_frame_free(ObMenuEntryFrame *self)
+static void menu_entry_frame_free(ObMenuEntryFrame *self)
 {
     if (self) {
-        XDestroyWindow(ob_display, self->icon);
         XDestroyWindow(ob_display, self->text);
-        XDestroyWindow(ob_display, self->bullet);
         XDestroyWindow(ob_display, self->window);
+        if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR) {
+            XDestroyWindow(ob_display, self->icon);
+            XDestroyWindow(ob_display, self->bullet);
+        }
 
         RrAppearanceFree(self->a_normal);
         RrAppearanceFree(self->a_disabled);
         RrAppearanceFree(self->a_selected);
 
+        RrAppearanceFree(self->a_separator);
         RrAppearanceFree(self->a_icon);
+        RrAppearanceFree(self->a_mask);
         RrAppearanceFree(self->a_text_normal);
         RrAppearanceFree(self->a_text_disabled);
         RrAppearanceFree(self->a_text_selected);
-        RrAppearanceFree(self->a_bullet);
+        RrAppearanceFree(self->a_bullet_normal);
+        RrAppearanceFree(self->a_bullet_selected);
 
         g_free(self);
     }
@@ -129,35 +183,70 @@ void menu_entry_frame_free(ObMenuEntryFrame *self)
 
 void menu_frame_move(ObMenuFrame *self, gint x, gint y)
 {
-    /* XXX screen constraints */
     RECT_SET_POINT(self->area, x, y);
     XMoveWindow(ob_display, self->window, self->area.x, self->area.y);
 }
 
-void menu_frame_move_on_screen(ObMenuFrame *self)
+void menu_frame_place_topmenu(ObMenuFrame *self, gint x, gint y)
 {
-    Rect *a;
-    guint i;
-    gint dx = 0, dy = 0;
-
-    for (i = 0; i < screen_num_monitors; ++i) {
-        a = screen_physical_area_monitor(i);
-        if (RECT_INTERSECTS_RECT(*a, self->area))
-            break;
+    if (self->client && x < 0 && y < 0) {
+        x = self->client->frame->area.x + self->client->frame->size.left;
+        y = self->client->frame->area.y + self->client->frame->size.top;
+    } else {
+        x -= ob_rr_theme->mbwidth;
+        y -= ob_rr_theme->mbwidth + self->title_h;
     }
-    if (a) a = screen_physical_area_monitor(0);
+    menu_frame_move(self, x, y);
+}
+
+void menu_frame_place_submenu(ObMenuFrame *self)
+{
+    gint x, y;
+    gint overlap;
+    gint bwidth;
+
+    overlap = (config_menu_middle ? 0 : ob_rr_theme->menu_overlap);
+    bwidth = ob_rr_theme->mbwidth;
+
+
+    if (self->direction_right)
+        x = self->parent->area.x + self->parent->area.width - overlap - bwidth;
+    else
+        x = self->parent->area.x - self->area.width + overlap + bwidth;
 
-    dx = MIN(0, (a->x + a->width) - (self->area.x + self->area.width));
-    dy = MIN(0, (a->y + a->height) - (self->area.y + self->area.height));
-    if (!dx) dx = MAX(0, a->x - self->area.x);
-    if (!dy) dy = MAX(0, a->y - self->area.y);
+    y = self->parent->area.y + self->parent->title_h +
+        self->parent_entry->area.y + overlap;
+    if (config_menu_middle)
+        y = y - (self->area.height - (bwidth * 2) - self->item_h) / 2;
 
-    if (dx || dy) {
-        ObMenuFrame *f;
+    menu_frame_move(self, x, y);
+}
+
+void menu_frame_move_on_screen(ObMenuFrame *self, gint *dx, gint *dy)
+{
+    Rect *a = NULL;
+    gint pos, half;
+
+    *dx = *dy = 0;
 
-        for (f = self; f; f = f->parent)
-            menu_frame_move(f, f->area.x + dx, f->area.y + dy);
-        XWarpPointer(ob_display, None, None, 0, 0, 0, 0, dx, dy);
+    a = screen_physical_area_monitor(self->monitor);
+
+    half = g_list_length(self->entries) / 2;
+    pos = g_list_index(self->entries, self->selected);
+
+    /* if in the bottom half then check this stuff first, will keep the bottom
+       edge of the menu visible */
+    if (pos > half) {
+        *dx = MAX(*dx, a->x - self->area.x);
+        *dy = MAX(*dy, a->y - self->area.y);
+    }
+    *dx = MIN(*dx, (a->x + a->width) - (self->area.x + self->area.width));
+    *dy = MIN(*dy, (a->y + a->height) - (self->area.y + self->area.height));
+    /* if in the top half then check this stuff last, will keep the top
+       edge of the menu visible */
+    if (pos <= half) {
+        *dx = MAX(*dx, a->x - self->area.x);
+        *dy = MAX(*dy, a->y - self->area.y);
     }
 }
 
@@ -165,8 +254,11 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
 {
     RrAppearance *item_a, *text_a;
     gint th; /* temp */
+    ObMenu *sub;
+    ObMenuFrame *frame = self->frame;
 
-    item_a = (!self->entry->enabled ?
+    item_a = ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+               !self->entry->data.normal.enabled) ?
               self->a_disabled :
               (self == self->frame->selected ?
                self->a_selected :
@@ -177,8 +269,10 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
         th = self->frame->item_h;
         break;
     case OB_MENU_ENTRY_TYPE_SEPARATOR:
-        th = SEPARATOR_HEIGHT;
+        th = SEPARATOR_HEIGHT + 2*PADDING;
         break;
+    default:
+        g_assert_not_reached();
     }
     RECT_SET_SIZE(self->area, self->frame->inner_w, th);
     XResizeWindow(ob_display, self->window,
@@ -188,7 +282,8 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
     item_a->surface.parenty = self->area.y;
     RrPaint(item_a, self->window, self->area.width, self->area.height);
 
-    text_a = (!self->entry->enabled ?
+    text_a = ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+               !self->entry->data.normal.enabled) ?
               self->a_text_disabled :
               (self == self->frame->selected ?
                self->a_text_selected :
@@ -198,8 +293,8 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
         text_a->texture[0].data.text.string = self->entry->data.normal.label;
         break;
     case OB_MENU_ENTRY_TYPE_SUBMENU:
-        text_a->texture[0].data.text.string =
-            self->entry->data.submenu.submenu->title;
+        sub = self->entry->data.submenu.submenu;
+        text_a->texture[0].data.text.string = sub ? sub->title : "";
         break;
     case OB_MENU_ENTRY_TYPE_SEPARATOR:
         break;
@@ -207,48 +302,126 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
 
     switch (self->entry->type) {
     case OB_MENU_ENTRY_TYPE_NORMAL:
+        XMoveResizeWindow(ob_display, self->text,
+                          self->frame->text_x, PADDING,
+                          self->frame->text_w,
+                          self->frame->item_h - 2*PADDING);
+        text_a->surface.parent = item_a;
+        text_a->surface.parentx = self->frame->text_x;
+        text_a->surface.parenty = PADDING;
+        RrPaint(text_a, self->text, self->frame->text_w,
+                self->frame->item_h - 2*PADDING);
+        break;
     case OB_MENU_ENTRY_TYPE_SUBMENU:
         XMoveResizeWindow(ob_display, self->text,
-                          self->frame->text_x, 0,
-                          self->frame->text_w, self->frame->item_h);
+                          self->frame->text_x, PADDING,
+                          self->frame->text_w - self->frame->item_h,
+                          self->frame->item_h - 2*PADDING);
         text_a->surface.parent = item_a;
         text_a->surface.parentx = self->frame->text_x;
-        text_a->surface.parenty = 0;
-        RrPaint(text_a, self->text, self->frame->text_w, self->frame->item_h);
-        XMapWindow(ob_display, self->text);
+        text_a->surface.parenty = PADDING;
+        RrPaint(text_a, self->text, self->frame->text_w - self->frame->item_h,
+                self->frame->item_h - 2*PADDING);
         break;
     case OB_MENU_ENTRY_TYPE_SEPARATOR:
-        XUnmapWindow(ob_display, self->text);
+        XMoveResizeWindow(ob_display, self->text, PADDING, PADDING,
+                          self->area.width - 2*PADDING, SEPARATOR_HEIGHT);
+        self->a_separator->surface.parent = item_a;
+        self->a_separator->surface.parentx = PADDING;
+        self->a_separator->surface.parenty = PADDING;
+        self->a_separator->texture[0].data.lineart.color =
+            text_a->texture[0].data.text.color;
+        self->a_separator->texture[0].data.lineart.x1 = 2*PADDING;
+        self->a_separator->texture[0].data.lineart.y1 = SEPARATOR_HEIGHT / 2;
+        self->a_separator->texture[0].data.lineart.x2 =
+            self->area.width - 4*PADDING;
+        self->a_separator->texture[0].data.lineart.y2 = SEPARATOR_HEIGHT / 2;
+        RrPaint(self->a_separator, self->text,
+                self->area.width - 2*PADDING, SEPARATOR_HEIGHT);
         break;
     }
 
-    /* XXX draw icons */
-    if (0) {
-        XMoveResizeWindow(ob_display, self->icon, 0, 0,
-                          self->frame->item_h, self->frame->item_h);
-        /* XXX set the RGBA surface stuff */
+    if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR &&
+        self->entry->data.normal.icon_data)
+    {
+        XMoveResizeWindow(ob_display, self->icon,
+                          PADDING, frame->item_margin.top,
+                          self->frame->item_h - frame->item_margin.top
+                          - frame->item_margin.bottom,
+                          self->frame->item_h - frame->item_margin.top
+                          - frame->item_margin.bottom);
+        self->a_icon->texture[0].data.rgba.width =
+            self->entry->data.normal.icon_width;
+        self->a_icon->texture[0].data.rgba.height =
+            self->entry->data.normal.icon_height;
+        self->a_icon->texture[0].data.rgba.data =
+            self->entry->data.normal.icon_data;
         self->a_icon->surface.parent = item_a;
-        self->a_icon->surface.parentx = 0;
-        self->a_icon->surface.parenty = 0;
+        self->a_icon->surface.parentx = PADDING;
+        self->a_icon->surface.parenty = frame->item_margin.top;
         RrPaint(self->a_icon, self->icon,
-                self->frame->item_h, self->frame->item_h);
+                self->frame->item_h - frame->item_margin.top
+                - frame->item_margin.bottom,
+                self->frame->item_h - frame->item_margin.top
+                - frame->item_margin.bottom);
+        XMapWindow(ob_display, self->icon);
+    } else if (self->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR &&
+               self->entry->data.normal.mask)
+    {
+        RrColor *c;
+
+        XMoveResizeWindow(ob_display, self->icon,
+                          PADDING, frame->item_margin.top,
+                          self->frame->item_h - frame->item_margin.top
+                          - frame->item_margin.bottom,
+                          self->frame->item_h - frame->item_margin.top
+                          - frame->item_margin.bottom);
+        self->a_mask->texture[0].data.mask.mask =
+            self->entry->data.normal.mask;
+
+        c = ((self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+              !self->entry->data.normal.enabled) ?
+             self->entry->data.normal.mask_disabled_color :
+             (self == self->frame->selected ?
+              self->entry->data.normal.mask_selected_color :
+              self->entry->data.normal.mask_normal_color));
+        self->a_mask->texture[0].data.mask.color = c;
+
+        self->a_mask->surface.parent = item_a;
+        self->a_mask->surface.parentx = PADDING;
+        self->a_mask->surface.parenty = frame->item_margin.top;
+        RrPaint(self->a_mask, self->icon,
+                self->frame->item_h - frame->item_margin.top
+                - frame->item_margin.bottom,
+                self->frame->item_h - frame->item_margin.top
+                - frame->item_margin.bottom);
         XMapWindow(ob_display, self->icon);
     } else
         XUnmapWindow(ob_display, self->icon);
 
     if (self->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
+        RrAppearance *bullet_a;
         XMoveResizeWindow(ob_display, self->bullet,
-                          self->frame->text_x + self->frame->text_w, 0,
-                          self->frame->item_h, self->frame->item_h);
-        self->a_bullet->surface.parent = item_a;
-        self->a_bullet->surface.parentx =
-            self->frame->text_x + self->frame->text_w;
-        self->a_bullet->surface.parenty = 0;
-        RrPaint(self->a_bullet, self->bullet,
-                self->frame->item_h, self->frame->item_h);
+                          self->frame->text_x + self->frame->text_w
+                          - self->frame->item_h + PADDING, PADDING,
+                          self->frame->item_h - 2*PADDING,
+                          self->frame->item_h - 2*PADDING);
+        bullet_a = (self == self->frame->selected ?
+                    self->a_bullet_selected :
+                    self->a_bullet_normal);
+        bullet_a->surface.parent = item_a;
+        bullet_a->surface.parentx =
+            self->frame->text_x + self->frame->text_w - self->frame->item_h
+            + PADDING;
+        bullet_a->surface.parenty = PADDING;
+        RrPaint(bullet_a, self->bullet,
+                self->frame->item_h - 2*PADDING,
+                self->frame->item_h - 2*PADDING);
         XMapWindow(ob_display, self->bullet);
     } else
         XUnmapWindow(ob_display, self->bullet);
+
+    XFlush(ob_display);
 }
 
 static void menu_frame_render(ObMenuFrame *self)
@@ -257,33 +430,62 @@ static void menu_frame_render(ObMenuFrame *self)
     gint allitems_h = 0;
     gint tw, th; /* temps */
     GList *it;
-    gboolean has_icon = FALSE, has_bullet = FALSE;
+    gboolean has_icon = FALSE;
+    ObMenu *sub;
 
-    XSetWindowBorderWidth(ob_display, self->window, ob_rr_theme->bwidth);
+    XSetWindowBorderWidth(ob_display, self->window, ob_rr_theme->mbwidth);
     XSetWindowBorder(ob_display, self->window,
-                     RrColorPixel(ob_rr_theme->b_color));
+                     RrColorPixel(ob_rr_theme->menu_b_color));
 
-    if (!self->parent && self->menu->title) {
+    if (!self->parent && self->show_title) {
         XMoveWindow(ob_display, self->title, 
-                    -ob_rr_theme->bwidth, h - ob_rr_theme->bwidth);
+                    -ob_rr_theme->mbwidth, h - ob_rr_theme->mbwidth);
 
         self->a_title->texture[0].data.text.string = self->menu->title;
         RrMinsize(self->a_title, &tw, &th);
+        tw = MIN(tw, MAX_MENU_WIDTH) + ob_rr_theme->paddingx * 2;
         w = MAX(w, tw);
-        h += (self->title_h = th + ob_rr_theme->bwidth);
 
-        XSetWindowBorderWidth(ob_display, self->title, ob_rr_theme->bwidth);
+        th = ob_rr_theme->menu_title_height;
+        h += (self->title_h = th + ob_rr_theme->mbwidth);
+
+        XSetWindowBorderWidth(ob_display, self->title, ob_rr_theme->mbwidth);
         XSetWindowBorder(ob_display, self->title,
-                         RrColorPixel(ob_rr_theme->b_color));
+                         RrColorPixel(ob_rr_theme->menu_b_color));
     }
 
     XMoveWindow(ob_display, self->items, 0, h);
 
+    STRUT_SET(self->item_margin, 0, 0, 0, 0);
+
     if (self->entries) {
         ObMenuEntryFrame *e = self->entries->data;
+        gint l, t, r, b;
+
         e->a_text_normal->texture[0].data.text.string = "";
         RrMinsize(e->a_text_normal, &tw, &th);
+        tw += 2*PADDING;
+        th += 2*PADDING;
         self->item_h = th;
+
+        RrMargins(e->a_normal, &l, &t, &r, &b);
+        STRUT_SET(self->item_margin,
+                  MAX(self->item_margin.left, l),
+                  MAX(self->item_margin.top, t),
+                  MAX(self->item_margin.right, r),
+                  MAX(self->item_margin.bottom, b));
+        RrMargins(e->a_selected, &l, &t, &r, &b);
+        STRUT_SET(self->item_margin,
+                  MAX(self->item_margin.left, l),
+                  MAX(self->item_margin.top, t),
+                  MAX(self->item_margin.right, r),
+                  MAX(self->item_margin.bottom, b));
+        RrMargins(e->a_disabled, &l, &t, &r, &b);
+        STRUT_SET(self->item_margin,
+                  MAX(self->item_margin.left, l),
+                  MAX(self->item_margin.top, t),
+                  MAX(self->item_margin.right, r),
+                  MAX(self->item_margin.bottom, b));
     } else
         self->item_h = 0;
 
@@ -294,7 +496,8 @@ static void menu_frame_render(ObMenuFrame *self)
         RECT_SET_POINT(e->area, 0, allitems_h);
         XMoveWindow(ob_display, e->window, 0, e->area.y);
 
-        text_a = (!e->entry->enabled ?
+        text_a = ((e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+                   !e->entry->data.normal.enabled) ?
                   e->a_text_disabled :
                   (e == self->selected ?
                    e->a_text_selected :
@@ -303,52 +506,62 @@ static void menu_frame_render(ObMenuFrame *self)
         case OB_MENU_ENTRY_TYPE_NORMAL:
             text_a->texture[0].data.text.string = e->entry->data.normal.label;
             RrMinsize(text_a, &tw, &th);
+            tw = MIN(tw, MAX_MENU_WIDTH);
 
-            /* XXX has_icon = TRUE; */
+            if (e->entry->data.normal.icon_data ||
+                e->entry->data.normal.mask)
+                has_icon = TRUE;
             break;
         case OB_MENU_ENTRY_TYPE_SUBMENU:
-            text_a->texture[0].data.text.string =
-                e->entry->data.submenu.submenu->title;
+            sub = e->entry->data.submenu.submenu;
+            text_a->texture[0].data.text.string = sub ? sub->title : "";
             RrMinsize(text_a, &tw, &th);
+            tw = MIN(tw, MAX_MENU_WIDTH);
+
+            if (e->entry->data.normal.icon_data ||
+                e->entry->data.normal.mask)
+                has_icon = TRUE;
 
-            has_bullet = TRUE;
+            tw += self->item_h - PADDING;
             break;
         case OB_MENU_ENTRY_TYPE_SEPARATOR:
             tw = 0;
             th = SEPARATOR_HEIGHT;
             break;
         }
+        tw += 2*PADDING;
+        th += 2*PADDING;
         w = MAX(w, tw);
         h += th;
         allitems_h += th;
     }
 
-    self->text_x = 0;
+    self->text_x = PADDING;
     self->text_w = w;
 
     if (self->entries) {
-        if (has_bullet)
-            w += self->item_h;
         if (has_icon) {
-            w += self->item_h;
-            self->text_x += self->item_h;
+            w += self->item_h + PADDING;
+            self->text_x += self->item_h + PADDING;
         }
     }
 
     if (!w) w = 10;
-    if (!allitems_h) allitems_h = 3;
-    if (!h) h = 3;
+    if (!allitems_h) {
+        allitems_h = 3;
+        h += 3;
+    }
 
     XResizeWindow(ob_display, self->window, w, h);
     XResizeWindow(ob_display, self->items, w, allitems_h);
 
     self->inner_w = w;
 
-    if (!self->parent && self->title) {
+    if (!self->parent && self->show_title) {
         XResizeWindow(ob_display, self->title,
-                      w, self->title_h - ob_rr_theme->bwidth);
+                      w, self->title_h - ob_rr_theme->mbwidth);
         RrPaint(self->a_title, self->title,
-                w, self->title_h - ob_rr_theme->bwidth);
+                w, self->title_h - ob_rr_theme->mbwidth);
         XMapWindow(ob_display, self->title);
     } else
         XUnmapWindow(ob_display, self->title);
@@ -358,16 +571,21 @@ static void menu_frame_render(ObMenuFrame *self)
     for (it = self->entries; it; it = g_list_next(it))
         menu_entry_frame_render(it->data);
 
-    w += ob_rr_theme->bwidth * 2;
-    h += ob_rr_theme->bwidth * 2;
+    w += ob_rr_theme->mbwidth * 2;
+    h += ob_rr_theme->mbwidth * 2;
 
     RECT_SET_SIZE(self->area, w, h);
+
+    XFlush(ob_display);
 }
 
 static void menu_frame_update(ObMenuFrame *self)
 {
     GList *mit, *fit;
 
+    menu_pipe_execute(self->menu);
+    menu_find_submenus(self->menu);
+
     self->selected = NULL;
 
     for (mit = self->menu->entries, fit = self->entries; mit && fit;
@@ -393,35 +611,127 @@ static void menu_frame_update(ObMenuFrame *self)
     menu_frame_render(self);
 }
 
-void menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent)
+static gboolean menu_frame_is_visible(ObMenuFrame *self)
 {
-    if (parent) {
-        if (parent->child)
-            menu_frame_hide(parent->child);
-        parent->child = self;
-    }
-    self->parent = parent;
+    return !!(g_list_find(menu_frame_visible, self));
+}
+
+static gboolean menu_frame_show(ObMenuFrame *self)
+{
+    GList *it;
 
     if (menu_frame_visible == NULL) {
         /* no menus shown yet */
-        grab_pointer(TRUE, None);
-        grab_keyboard(TRUE);
+        if (!grab_pointer(TRUE, OB_CURSOR_NONE))
+            return FALSE;
+        if (!grab_keyboard(TRUE)) {
+            grab_pointer(FALSE, OB_CURSOR_NONE);
+            return FALSE;
+        }
+    }
+
+    /* determine if the underlying menu is already visible */
+    for (it = menu_frame_visible; it; it = g_list_next(it)) {
+        ObMenuFrame *f = it->data;
+        if (f->menu == self->menu)
+            break;
+    }
+    if (!it) {
+        if (self->menu->update_func)
+            self->menu->update_func(self, self->menu->data);
     }
 
-    if (!g_list_find(menu_frame_visible, self)) {
-        menu_frame_visible = g_list_prepend(menu_frame_visible, self);
+    menu_frame_update(self);
+
+    menu_frame_visible = g_list_prepend(menu_frame_visible, self);
+
+    return TRUE;
+}
+
+gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y)
+{
+    gint dx, dy;
+    guint i;
+
+    if (menu_frame_is_visible(self))
+        return TRUE;
+    if (!menu_frame_show(self))
+        return FALSE;
+
+    menu_frame_place_topmenu(self, x, y);
 
-        menu_frame_update(self);
+    /* find the monitor the menu is on */
+    for (i = 0; i < screen_num_monitors; ++i) {
+        Rect *a = screen_physical_area_monitor(i);
+        if (RECT_CONTAINS(*a, x, y)) {
+            self->monitor = i;
+            break;
+        }
     }
 
-    menu_frame_move_on_screen(self);
+    menu_frame_move_on_screen(self, &dx, &dy);
+    menu_frame_move(self, self->area.x + dx, self->area.y + dy);
+
+    XMapWindow(ob_display, self->window);
+
+    return TRUE;
+}
+
+gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
+                                 ObMenuEntryFrame *parent_entry)
+{
+    gint dx, dy;
+
+    if (menu_frame_is_visible(self))
+        return TRUE;
+
+    self->monitor = parent->monitor;
+    self->parent = parent;
+    self->parent_entry = parent_entry;
+
+    /* set up parent's child to be us */
+    if (parent->child)
+        menu_frame_hide(parent->child);
+    parent->child = self;
+
+    if (!menu_frame_show(self))
+        return FALSE;
+
+    menu_frame_place_submenu(self);
+    menu_frame_move_on_screen(self, &dx, &dy);
+
+    if (dx == 0) {
+        menu_frame_move(self, self->area.x, self->area.y + dy);
+    } else {
+        gboolean dir;
+
+        /* flip the direction in which we're placing submenus */
+        if (dx > 0)
+            dir = TRUE;
+        else
+            dir = FALSE;
+
+        /* if it changed, then replace the menu on the opposite side,
+           and try keep it on the screen too */
+        if (dir != self->direction_right) {
+            self->direction_right = dir;
+            menu_frame_place_submenu(self);
+            menu_frame_move_on_screen(self, &dx, &dy);
+            menu_frame_move(self, self->area.x + dx, self->area.y + dy);
+        }
+    }
 
     XMapWindow(ob_display, self->window);
+
+    return TRUE;
 }
 
 void menu_frame_hide(ObMenuFrame *self)
 {
-    menu_frame_visible = g_list_remove(menu_frame_visible, self);
+    GList *it = g_list_find(menu_frame_visible, self);
+
+    if (!it)
+        return;
 
     if (self->child)
         menu_frame_hide(self->child);
@@ -429,10 +739,13 @@ void menu_frame_hide(ObMenuFrame *self)
     if (self->parent)
         self->parent->child = NULL;
     self->parent = NULL;
+    self->parent_entry = NULL;
+
+    menu_frame_visible = g_list_delete_link(menu_frame_visible, it);
 
     if (menu_frame_visible == NULL) {
         /* last menu shown */
-        grab_pointer(FALSE, None);
+        grab_pointer(FALSE, OB_CURSOR_NONE);
         grab_keyboard(FALSE);
     }
 
@@ -443,10 +756,28 @@ void menu_frame_hide(ObMenuFrame *self)
 
 void menu_frame_hide_all()
 {
-    while (menu_frame_visible)
-        menu_frame_hide(menu_frame_visible->data);
+    GList *it;
+
+    if (config_submenu_show_delay) {
+        /* remove any submenu open requests */
+        ob_main_loop_timeout_remove(ob_main_loop,
+                                    menu_entry_frame_submenu_timeout);
+    }
+    if ((it = g_list_last(menu_frame_visible)))
+        menu_frame_hide(it->data);
+}
+
+void menu_frame_hide_all_client(ObClient *client)
+{
+    GList *it = g_list_last(menu_frame_visible);
+    if (it) {
+        ObMenuFrame *f = it->data;
+        if (f->client == client)
+            menu_frame_hide(f);
+    }
 }
 
+
 ObMenuFrame* menu_frame_under(gint x, gint y)
 {
     ObMenuFrame *ret = NULL;
@@ -470,8 +801,8 @@ ObMenuEntryFrame* menu_entry_frame_under(gint x, gint y)
     GList *it;
 
     if ((frame = menu_frame_under(x, y))) {
-        x -= ob_rr_theme->bwidth + frame->area.x;
-        y -= frame->title_h + ob_rr_theme->bwidth + frame->area.y;
+        x -= ob_rr_theme->mbwidth + frame->area.x;
+        y -= frame->title_h + ob_rr_theme->mbwidth + frame->area.y;
 
         for (it = frame->entries; it; it = g_list_next(it)) {
             ObMenuEntryFrame *e = it->data;
@@ -485,27 +816,50 @@ ObMenuEntryFrame* menu_entry_frame_under(gint x, gint y)
     return ret;
 }
 
+static gboolean menu_entry_frame_submenu_timeout(gpointer data)
+{
+    menu_entry_frame_show_submenu((ObMenuEntryFrame*)data);
+    return FALSE;
+}
+
 void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry)
 {
     ObMenuEntryFrame *old = self->selected;
+    ObMenuFrame *oldchild = self->child;
+
+    if (entry && entry->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR)
+        entry = old;
 
     if (old == entry) return;
+   
+    if (config_submenu_show_delay) { 
+        /* remove any submenu open requests */
+        ob_main_loop_timeout_remove(ob_main_loop,
+                                    menu_entry_frame_submenu_timeout);
+    }
 
-    if (entry && entry->entry->type != OB_MENU_ENTRY_TYPE_SEPARATOR)
-        self->selected = entry;
-    else
-        self->selected = NULL;
+    self->selected = entry;
 
-    if (old) {
+    if (old)
         menu_entry_frame_render(old);
-        if (old->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)
-            menu_frame_hide(self->child);
-    }
+    if (oldchild)
+        menu_frame_hide(oldchild);
+
     if (self->selected) {
         menu_entry_frame_render(self->selected);
 
-        if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)
-            menu_entry_frame_show_submenu(self->selected);
+        if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
+            if (config_submenu_show_delay) {
+                /* initiate a new submenu open request */
+                ob_main_loop_timeout_add(ob_main_loop,
+                                         config_submenu_show_delay * 1000,
+                                         menu_entry_frame_submenu_timeout,
+                                         self->selected,
+                                         NULL);
+            } else {
+                menu_entry_frame_show_submenu(self->selected);
+            }
+        }
     }
 }
 
@@ -513,28 +867,88 @@ void menu_entry_frame_show_submenu(ObMenuEntryFrame *self)
 {
     ObMenuFrame *f;
 
+    if (!self->entry->data.submenu.submenu) return;
+
     f = menu_frame_new(self->entry->data.submenu.submenu,
                        self->frame->client);
-    menu_frame_move(f,
-                    self->frame->area.x + self->frame->area.width
-                    - ob_rr_theme->menu_overlap,
-                    self->frame->area.y + self->frame->title_h +
-                    self->area.y);
-    menu_frame_show(f, self->frame);
+    /* pass our direction on to our child */
+    f->direction_right = self->frame->direction_right;
+
+    menu_frame_show_submenu(f, self->frame, self);
+}
+
+void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state, Time time)
+{
+    if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+        self->entry->data.normal.enabled)
+    {
+        /* grab all this shizzle, cuz when the menu gets hidden, 'self'
+           gets freed */
+        ObMenuEntry *entry = self->entry;
+        ObMenuExecuteFunc func = self->frame->menu->execute_func;
+        gpointer data = self->frame->menu->data;
+        GSList *acts = self->entry->data.normal.actions;
+        ObClient *client = self->frame->client;
+
+        /* release grabs before executing the shit */
+        if (!(state & ControlMask))
+            menu_frame_hide_all();
+
+        if (func)
+            func(entry, state, data, time);
+        else
+            action_run(acts, client, state, time);
+    }
+}
+
+void menu_frame_select_previous(ObMenuFrame *self)
+{
+    GList *it = NULL, *start;
+
+    if (self->entries) {
+        start = it = g_list_find(self->entries, self->selected);
+        while (TRUE) {
+            ObMenuEntryFrame *e;
+
+            it = it ? g_list_previous(it) : g_list_last(self->entries);
+            if (it == start)
+                break;
+
+            if (it) {
+                e = it->data;
+                if (e->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)
+                    break;
+                if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+                    e->entry->data.normal.enabled)
+                    break;
+            }
+        }
+    }
+    menu_frame_select(self, it ? it->data : NULL);
 }
 
-void menu_entry_frame_execute(ObMenuEntryFrame *self)
+void menu_frame_select_next(ObMenuFrame *self)
 {
-    if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL) {
-        GSList *it;
-
-        for (it = self->entry->data.normal.actions; it;
-             it = g_slist_next(it))
-        {
-            ObAction *act = it->data;
-            act->data.any.c = self->frame->client;
-            act->func(&act->data);
+    GList *it = NULL, *start;
+
+    if (self->entries) {
+        start = it = g_list_find(self->entries, self->selected);
+        while (TRUE) {
+            ObMenuEntryFrame *e;
+
+            it = it ? g_list_next(it) : self->entries;
+            if (it == start)
+                break;
+
+            if (it) {
+                e = it->data;
+                if (e->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)
+                    break;
+                if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+                    e->entry->data.normal.enabled)
+                    break;
+            }
         }
-        menu_frame_hide_all();
     }
+    menu_frame_select(self, it ? it->data : NULL);
 }