X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fmenu.c;h=d832392ea7730963e3a4eba05164c736780b755f;hb=d51702affa3e3895f9fca218de39690f8958b500;hp=a8a51117f92dea3a68b9a67f984f26eff161f4ce;hpb=a95dc346fe7951dd48e41a41fcaafb6d872b0337;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index a8a51117..d832392e 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -1,3 +1,4 @@
+#include "debug.h"
 #include "menu.h"
 #include "openbox.h"
 #include "stacking.h"
@@ -6,11 +7,12 @@
 #include "screen.h"
 #include "geom.h"
 #include "plugin.h"
+#include "misc.h"
 
 GHashTable *menu_hash = NULL;
-GSList *menu_visible = NULL;
+GList *menu_visible = NULL;
 
-#define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask | \
+#define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask |\
 			 LeaveWindowMask)
 #define TITLE_EVENTMASK (ButtonPressMask | ButtonMotionMask)
 #define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
@@ -18,28 +20,60 @@ GSList *menu_visible = NULL;
 
 static void parse_menu(xmlDocPtr doc, xmlNodePtr node, void *data)
 {
-    Action *act;
-    xmlNodePtr nact;
-    gchar *id = NULL, *title = NULL, *label = NULL;
-    ObMenu *menu, *parent;
+    parse_menu_full(doc, node, data, TRUE);
+}
 
-    if (!parse_attr_string("id", node->parent, &id))
-        goto parse_menu_fail;
-    if (!parse_attr_string("label", node->parent, &title))
-        goto parse_menu_fail;
 
-    g_message("menu label %s", title);
+void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data,
+                       gboolean newmenu)
+{
+    Action *act;
+    xmlNodePtr nact;
 
-    menu = menu_new(title, id, data ? *((ObMenu**)data) : NULL);
-    if (data)
-        *((ObMenu**)data) = menu;
+    gchar *id = NULL, *title = NULL, *label = NULL, *plugin;
+    ObMenu *menu = NULL, *parent;
+
+    if (newmenu == TRUE) {
+        if (!parse_attr_string("id", node, &id))
+            goto parse_menu_fail;
+        if (!parse_attr_string("label", node, &title))
+            goto parse_menu_fail;
+        ob_debug("menu label %s\n", title);
+
+        if (parse_attr_string("plugin", node, &plugin)) {
+            PluginMenuCreateData data;
+            data.doc = doc;
+            data.node = node;
+            data.parent = menu;
+            parent = plugin_create(plugin, &data);
+            g_free(plugin);
+        } else
+            menu = menu_new(title, id, data ? *((ObMenu**)data) : NULL);
+            
+        if (data)
+            *((ObMenu**)data) = menu;
+    } else {
+        menu = (ObMenu *)data;
+    }
 
+    node = node->xmlChildrenNode;
+    
     while (node) {
         if (!xmlStrcasecmp(node->name, (const xmlChar*) "menu")) {
-            parent = menu;
-            parse_menu(doc, node->xmlChildrenNode, &parent);
-            menu_add_entry(menu, menu_entry_new_submenu(parent->label,
-                                                        parent));
+            if (parse_attr_string("plugin", node, &plugin)) {
+                PluginMenuCreateData data;
+                data.doc = doc;
+                data.node = node;
+                data.parent = menu;
+                parent = plugin_create(plugin, &data);
+                g_free(plugin);
+            } else {
+                parent = menu;
+                parse_menu(doc, node, &parent);
+                menu_add_entry(menu, menu_entry_new_submenu(parent->label,
+                                                            parent));
+            }
+
         }
         else if (!xmlStrcasecmp(node->name, (const xmlChar*) "item")) {
             if (parse_attr_string("label", node, &label)) {
@@ -87,6 +121,7 @@ void menu_destroy_hash_value(ObMenu *self)
     stacking_remove(self);
 
     RrAppearanceFree(self->a_title);
+    RrAppearanceFree(self->a_items);
     XDestroyWindow(ob_display, self->title);
     XDestroyWindow(ob_display, self->frame);
     XDestroyWindow(ob_display, self->items);
@@ -111,62 +146,12 @@ void menu_entry_free(ObMenuEntry *self)
     
 void menu_startup()
 {
-/*
-    ObMenu *m;
-    ObMenu *s;
-    ObMenu *t;
-    Action *a;
-*/
-
     menu_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
                                       (GDestroyNotify)menu_destroy_hash_key,
                                       (GDestroyNotify)menu_destroy_hash_value);
 
     parse_register("menu", parse_menu, NULL);
 
-/*
-    m = menu_new("sex menu", "root", NULL);
- 
-    a = action_from_string("execute");
-    a->data.execute.path = g_strdup("xterm");
-    menu_add_entry(m, menu_entry_new("xterm", a));
-    a = action_from_string("restart");
-    menu_add_entry(m, menu_entry_new("restart", a));
-    menu_add_entry(m, menu_entry_new_separator("--"));
-    a = action_from_string("exit");
-    menu_add_entry(m, menu_entry_new("exit", a));
-*/
-
-    /*
-    s = menu_new("subsex menu", "submenu", m);
-    a = action_from_string("execute");
-    a->data.execute.path = g_strdup("xclock");
-    menu_add_entry(s, menu_entry_new("xclock", a));
-
-    menu_add_entry(m, menu_entry_new_submenu("subz", s));
-
-    s = menu_new("empty", "chub", m);
-    menu_add_entry(m, menu_entry_new_submenu("empty", s));
-
-    s = menu_new("", "s-club", m);
-    menu_add_entry(m, menu_entry_new_submenu("empty", s));
-
-    s = menu_new(NULL, "h-club", m);
-    menu_add_entry(m, menu_entry_new_submenu("empty", s));
-
-    s = menu_new(NULL, "g-club", m);
-
-    a = action_from_string("execute");
-    a->data.execute.path = g_strdup("xterm");
-    menu_add_entry(s, menu_entry_new("xterm", a));
-    a = action_from_string("restart");
-    menu_add_entry(s, menu_entry_new("restart", a));
-    menu_add_entry(s, menu_entry_new_separator("--"));
-    a = action_from_string("exit");
-    menu_add_entry(s, menu_entry_new("exit", a));
-
-    menu_add_entry(m, menu_entry_new_submenu("long", s));
-    */
 }
 
 void menu_shutdown()
@@ -184,7 +169,10 @@ static Window createWindow(Window parent, unsigned long mask,
 }
 
 ObMenu *menu_new_full(char *label, char *name, ObMenu *parent, 
-                    menu_controller_show show, menu_controller_update update)
+                      menu_controller_show show, menu_controller_update update,
+                      menu_controller_selected selected,
+                      menu_controller_hide hide,
+                      menu_controller_mouseover mouseover)
 {
     XSetWindowAttributes attrib;
     ObMenu *self;
@@ -201,11 +189,12 @@ ObMenu *menu_new_full(char *label, char *name, ObMenu *parent,
     self->invalid = TRUE;
 
     /* default controllers */
-    self->show = show;
-    self->hide = NULL;
-    self->update = update;
-    self->mouseover = NULL;
-    self->selected = NULL;
+    self->show = (show != NULL ? show : menu_show_full);
+    self->hide = (hide != NULL ? hide : menu_hide);
+    self->update = (update != NULL ? update : menu_render);
+    self->mouseover = (mouseover != NULL ? mouseover :
+                       menu_control_mouseover);
+    self->selected = (selected != NULL ? selected : menu_entry_fire);
 
     self->plugin = NULL;
     self->plugin_data = NULL;
@@ -312,18 +301,14 @@ void menu_show_full(ObMenu *self, int x, int y, ObClient *client)
     self->client = client;
 
     if (!self->shown) {
-        if (!self->parent) {
+        if (!(self->parent && self->parent->shown)) {
             grab_pointer(TRUE, None);
             grab_keyboard(TRUE);
         }
-        menu_visible = g_slist_append(menu_visible, self);
+        menu_visible = g_list_append(menu_visible, self);
     }
 
-    if (self->show) {
-	self->show(self, x, y, client);
-    } else {
-      menu_control_show(self, x, y, client);
-    }
+    menu_control_show(self, x, y, client);
 }
 
 void menu_hide(ObMenu *self) {
@@ -332,14 +317,20 @@ void menu_hide(ObMenu *self) {
         self->shown = FALSE;
 	if (self->open_submenu)
 	    menu_hide(self->open_submenu);
-	if (self->parent && self->parent->open_submenu == self)
+	if (self->parent && self->parent->open_submenu == self) {
+            ObMenuEntry *e;
+
 	    self->parent->open_submenu = NULL;
 
-        if (!self->parent) {
+            e = menu_find_entry_by_submenu(self->parent, self);
+            self->parent->mouseover(e, FALSE);
+        }
+
+        if (!(self->parent && self->parent->shown)) {
             grab_keyboard(FALSE);
             grab_pointer(FALSE, None);
         }
-        menu_visible = g_slist_remove(menu_visible, self);
+        menu_visible = g_list_remove(menu_visible, self);
     }
 }
 
@@ -367,6 +358,18 @@ ObMenuEntry *menu_find_entry(ObMenu *menu, Window win)
     return NULL;
 }
 
+ObMenuEntry *menu_find_entry_by_submenu(ObMenu *menu, ObMenu *submenu)
+{
+    GList *it;
+
+    for (it = menu->entries; it; it = it->next) {
+        ObMenuEntry *entry = it->data;
+        if (entry->submenu == submenu)
+            return entry;
+    }
+    return NULL;
+}
+
 ObMenuEntry *menu_find_entry_by_pos(ObMenu *menu, int x, int y)
 {
     if (x < 0 || x >= menu->size.width || y < 0 || y >= menu->size.height)
@@ -375,14 +378,18 @@ ObMenuEntry *menu_find_entry_by_pos(ObMenu *menu, int x, int y)
     y -= menu->title_h + ob_rr_theme->bwidth;
     if (y < 0) return NULL;
     
-    g_message ("%d %p", y/menu->item_h, g_list_nth_data(menu->entries, y / menu->item_h));
+    ob_debug("%d %p\n", y/menu->item_h,
+             g_list_nth_data(menu->entries, y / menu->item_h));
     return g_list_nth_data(menu->entries, y / menu->item_h);
 }
 
-void menu_entry_fire(ObMenuEntry *self)
+void menu_entry_fire(ObMenuEntry *self, unsigned int button, unsigned int x,
+                     unsigned int y)
 {
     ObMenu *m;
 
+    if (button > 3) return;
+
     if (self->action) {
         self->action->data.any.c = self->parent->client;
         self->action->func(&self->action->data);
@@ -398,7 +405,8 @@ void menu_entry_fire(ObMenuEntry *self)
    Default menu controller action for showing.
 */
 
-void menu_control_show(ObMenu *self, int x, int y, ObClient *client) {
+void menu_control_show(ObMenu *self, int x, int y, ObClient *client)
+{
     guint i;
     Rect *a = NULL;
 
@@ -426,16 +434,22 @@ void menu_control_show(ObMenu *self, int x, int y, ObClient *client) {
     }
 }
 
-void menu_control_mouseover(ObMenuEntry *self, gboolean enter) {
+void menu_control_mouseover(ObMenuEntry *self, gboolean enter)
+{
     int x;
     Rect *a;
+    ObMenuEntry *e;
 
-    self->hilite = enter;
-  
     if (enter) {
 	if (self->parent->open_submenu && self->submenu 
 	    != self->parent->open_submenu)
+        {
+            e = menu_find_entry_by_submenu(self->parent,
+                                           self->parent->open_submenu);
+            e->hilite = FALSE;
+            menu_entry_render(e);
 	    menu_hide(self->parent->open_submenu);
+        }
 	
 	if (self->submenu && self->parent->open_submenu != self->submenu) {
 	    self->parent->open_submenu = self->submenu;
@@ -445,7 +459,7 @@ void menu_control_mouseover(ObMenuEntry *self, gboolean enter) {
 	    /* TODO: I don't understand why these bevels should be here.
 	       Something must be wrong in the width calculation */
 	    x = self->parent->location.x + self->parent->size.width + 
-		ob_rr_theme->bwidth;
+		ob_rr_theme->bwidth - ob_rr_theme->menu_overlap;
 
 	    /* need to get the width. is this bad?*/
 	    menu_render(self->submenu);
@@ -454,11 +468,121 @@ void menu_control_mouseover(ObMenuEntry *self, gboolean enter) {
 
 	    if (self->submenu->size.width + x >= a->x + a->width)
 		x = self->parent->location.x - self->submenu->size.width - 
-		    ob_rr_theme->bwidth;
+		    ob_rr_theme->bwidth + ob_rr_theme->menu_overlap;
 	    
 	    menu_show_full(self->submenu, x,
 			   self->parent->location.y + self->y,
                            self->parent->client);
 	} 
     }
+
+    if (enter || !self->submenu ||
+        menu_find_entry_by_submenu(self->parent,
+                                   self->parent->open_submenu) != self)
+        self->hilite = enter;
+
+    menu_entry_render(self);
+}
+
+ObMenuEntry *menu_control_keyboard_nav(ObMenuEntry *over, ObKey key)
+{
+    GList *it = NULL;
+        
+    switch (key) {
+    case OB_KEY_DOWN: {
+        if (over != NULL) {
+            over->parent->mouseover(over, FALSE);
+                
+            it = over->parent->entries;
+            while (it != NULL && it->data != over)
+                it = it->next;
+        }
+            
+        if (it && it->next)
+            over = (ObMenuEntry *)it->next->data;
+        else if (over == NULL) {
+            if (menu_visible && ((ObMenu *)menu_visible->data)->entries)
+                over = (ObMenuEntry *)
+                    (((ObMenu *)menu_visible->data)->entries)->data;
+            else
+                over = NULL;
+        } else {
+            over = (over->parent->entries != NULL ?
+                    over->parent->entries->data : NULL);
+        }
+
+        if (over)
+            over->parent->mouseover(over, TRUE);
+        
+        break;
+    }
+    case OB_KEY_UP: {
+        if (over != NULL) {
+            over->parent->mouseover(over, FALSE);
+                
+            it = g_list_last(over->parent->entries);
+            while (it != NULL && it->data != over)
+                it = it->prev;
+        } 
+            
+        if (it && it->prev)
+            over = (ObMenuEntry *)it->prev->data;
+        else if (over == NULL) {
+            it = g_list_last(menu_visible);
+            if (it != NULL) {
+                it = g_list_last(((ObMenu *)it->data)->entries);
+                over = (ObMenuEntry *)(it != NULL ? it->data : NULL);
+            }
+        } else
+            over = (over->parent->entries != NULL ?
+                    g_list_last(over->parent->entries)->data :
+                    NULL);
+
+        over->parent->mouseover(over, TRUE);
+        break;
+    }
+    case OB_KEY_RIGHT: {
+        if (over == NULL)
+            return over;
+
+        if (over->submenu) {
+            over->parent->mouseover(over, FALSE);
+
+            if (over->submenu->entries)
+                over = over->submenu->entries->data;
+
+            over->parent->mouseover(over, TRUE);
+        }
+        else {
+            over->parent->mouseover(over, FALSE);
+
+            /* zero is enter */
+            menu_entry_fire(over, 0, 0, 0);
+        }
+        break;
+    }
+    case OB_KEY_LEFT: {
+        if (over != NULL) {
+            over->parent->mouseover(over, FALSE);
+            menu_hide(over->parent);
+        } else {
+            it  = g_list_last(menu_visible);
+            if (it) {
+                menu_hide((ObMenu *)it->data);
+            }
+        }
+        
+        over = NULL;
+        break;
+    }
+    default:
+        g_error("Unknown key");
+    }
+
+    return over;
+}
+
+void menu_noop()
+{
+    /* This noop brought to you by OLS 2003 Email Garden. */
 }