X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=4c7adc926ff2ce2faa30ea1c1a1e4fcc809007f4;hb=d03c1afac676c612c2d70584ceb4101607ac4c7e;hp=23bb11289398aa830362b61547466c9d8c4a127a;hpb=6357583c396382dd6ed8ac42004177f204fabe62;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index 23bb1128..4c7adc92 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -1,15 +1,17 @@
 #include "menu.h"
 #include "openbox.h"
 #include "stacking.h"
+#include "client.h"
 #include "grab.h"
 #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 | \
@@ -17,28 +19,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;
-    Menu *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 ? *((Menu**)data) : NULL);
-    if (data)
-        *((Menu**)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;
+        g_message("menu label %s", 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)) {
@@ -61,14 +95,14 @@ parse_menu_fail:
     g_free(title);
 }
 
-void menu_control_show(Menu *self, int x, int y, Client *client);
+void menu_control_show(ObMenu *self, int x, int y, ObClient *client);
 
-void menu_destroy_hash_key(Menu *menu)
+void menu_destroy_hash_key(ObMenu *menu)
 {
     g_free(menu);
 }
 
-void menu_destroy_hash_value(Menu *self)
+void menu_destroy_hash_value(ObMenu *self)
 {
     GList *it;
 
@@ -86,6 +120,7 @@ void menu_destroy_hash_value(Menu *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);
@@ -93,7 +128,7 @@ void menu_destroy_hash_value(Menu *self)
     g_free(self);
 }
 
-void menu_entry_free(MenuEntry *self)
+void menu_entry_free(ObMenuEntry *self)
 {
     g_free(self->label);
     action_free(self->action);
@@ -111,9 +146,9 @@ void menu_entry_free(MenuEntry *self)
 void menu_startup()
 {
 /*
-    Menu *m;
-    Menu *s;
-    Menu *t;
+    ObMenu *m;
+    ObMenu *s;
+    ObMenu *t;
     Action *a;
 */
 
@@ -182,13 +217,13 @@ static Window createWindow(Window parent, unsigned long mask,
                        
 }
 
-Menu *menu_new_full(char *label, char *name, Menu *parent, 
+ObMenu *menu_new_full(char *label, char *name, ObMenu *parent, 
                     menu_controller_show show, menu_controller_update update)
 {
     XSetWindowAttributes attrib;
-    Menu *self;
+    ObMenu *self;
 
-    self = g_new0(Menu, 1);
+    self = g_new0(ObMenu, 1);
     self->obwin.type = Window_Menu;
     self->label = g_strdup(label);
     self->name = g_strdup(name);
@@ -211,7 +246,7 @@ Menu *menu_new_full(char *label, char *name, Menu *parent,
 
     attrib.override_redirect = TRUE;
     attrib.event_mask = FRAME_EVENTMASK;
-    self->frame = createWindow(ob_root,
+    self->frame = createWindow(RootWindow(ob_display, ob_screen),
                                CWOverrideRedirect|CWEventMask, &attrib);
     attrib.event_mask = TITLE_EVENTMASK;
     self->title = createWindow(self->frame, CWEventMask, &attrib);
@@ -238,11 +273,11 @@ void menu_free(char *name)
     g_hash_table_remove(menu_hash, name);
 }
 
-MenuEntry *menu_entry_new_full(char *label, Action *action,
-                               MenuEntryRenderType render_type,
+ObMenuEntry *menu_entry_new_full(char *label, Action *action,
+                               ObMenuEntryRenderType render_type,
                                gpointer submenu)
 {
-    MenuEntry *menu_entry = g_new0(MenuEntry, 1);
+    ObMenuEntry *menu_entry = g_new0(ObMenuEntry, 1);
 
     menu_entry->label = g_strdup(label);
     menu_entry->render_type = render_type;
@@ -256,7 +291,7 @@ MenuEntry *menu_entry_new_full(char *label, Action *action,
     return menu_entry;
 }
 
-void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu)
+void menu_entry_set_submenu(ObMenuEntry *entry, ObMenu *submenu)
 {
     g_assert(entry != NULL);
     
@@ -266,7 +301,7 @@ void menu_entry_set_submenu(MenuEntry *entry, Menu *submenu)
         entry->parent->invalid = TRUE;
 }
 
-void menu_add_entry(Menu *menu, MenuEntry *entry)
+void menu_add_entry(ObMenu *menu, ObMenuEntry *entry)
 {
     XSetWindowAttributes attrib;
 
@@ -288,9 +323,9 @@ void menu_add_entry(Menu *menu, MenuEntry *entry)
     g_hash_table_insert(window_map, &entry->item, menu);
 }
 
-void menu_show(char *name, int x, int y, Client *client)
+void menu_show(char *name, int x, int y, ObClient *client)
 {
-    Menu *self;
+    ObMenu *self;
   
     self = g_hash_table_lookup(menu_hash, name);
     if (!self) {
@@ -302,7 +337,7 @@ void menu_show(char *name, int x, int y, Client *client)
     menu_show_full(self, x, y, client);
 }  
 
-void menu_show_full(Menu *self, int x, int y, Client *client)
+void menu_show_full(ObMenu *self, int x, int y, ObClient *client)
 {
     g_assert(self != NULL);
        
@@ -311,11 +346,11 @@ void menu_show_full(Menu *self, int x, int y, Client *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) {
@@ -325,28 +360,38 @@ void menu_show_full(Menu *self, int x, int y, Client *client)
     }
 }
 
-void menu_hide(Menu *self) {
+void menu_hide(ObMenu *self) {
     if (self->shown) {
         XUnmapWindow(ob_display, self->frame);
         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);
+            if (self->parent->mouseover)
+                self->parent->mouseover(e, FALSE);
+            else
+                menu_control_mouseover(e, FALSE);
+            menu_entry_render(e);
+        }
+
+        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);
     }
 }
 
-void menu_clear(Menu *self) {
+void menu_clear(ObMenu *self) {
     GList *it;
   
     for (it = self->entries; it; it = it->next) {
-	MenuEntry *entry = it->data;
+	ObMenuEntry *entry = it->data;
 	menu_entry_free(entry);
     }
     self->entries = NULL;
@@ -354,19 +399,31 @@ void menu_clear(Menu *self) {
 }
 
 
-MenuEntry *menu_find_entry(Menu *menu, Window win)
+ObMenuEntry *menu_find_entry(ObMenu *menu, Window win)
 {
     GList *it;
 
     for (it = menu->entries; it; it = it->next) {
-        MenuEntry *entry = it->data;
+        ObMenuEntry *entry = it->data;
         if (entry->item == win)
             return entry;
     }
     return NULL;
 }
 
-MenuEntry *menu_find_entry_by_pos(Menu *menu, int x, int y)
+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)
         return NULL;
@@ -378,9 +435,9 @@ MenuEntry *menu_find_entry_by_pos(Menu *menu, int x, int y)
     return g_list_nth_data(menu->entries, y / menu->item_h);
 }
 
-void menu_entry_fire(MenuEntry *self)
+void menu_entry_fire(ObMenuEntry *self)
 {
-    Menu *m;
+    ObMenu *m;
 
     if (self->action) {
         self->action->data.any.c = self->parent->client;
@@ -397,7 +454,8 @@ void menu_entry_fire(MenuEntry *self)
    Default menu controller action for showing.
 */
 
-void menu_control_show(Menu *self, int x, int y, Client *client) {
+void menu_control_show(ObMenu *self, int x, int y, ObClient *client)
+{
     guint i;
     Rect *a = NULL;
 
@@ -425,16 +483,22 @@ void menu_control_show(Menu *self, int x, int y, Client *client) {
     }
 }
 
-void menu_control_mouseover(MenuEntry *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;
@@ -444,7 +508,7 @@ void menu_control_mouseover(MenuEntry *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);
@@ -453,11 +517,147 @@ void menu_control_mouseover(MenuEntry *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;
+}
+
+ObMenuEntry *menu_control_keyboard_nav(ObMenuEntry *over, ObKey key)
+{
+    GList *it = NULL;
+        
+    switch (key) {
+    case OB_KEY_DOWN: {
+        if (over != NULL) {
+            if (over->parent->mouseover)
+                over->parent->mouseover(over, FALSE);
+            else
+                menu_control_mouseover(over, FALSE);
+            menu_entry_render(over);
+                
+            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) {
+            if (over->parent->mouseover)
+                over->parent->mouseover(over, TRUE);
+            else
+                menu_control_mouseover(over, TRUE);
+            menu_entry_render(over);
+        }
+        
+        break;
+    }
+    case OB_KEY_UP: {
+        if (over != NULL) {
+            if (over->parent->mouseover)
+                over->parent->mouseover(over, FALSE);
+            else
+                menu_control_mouseover(over, FALSE);
+            menu_entry_render(over);
+                
+            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);
+
+        if (over->parent->mouseover)
+            over->parent->mouseover(over, TRUE);
+        else
+            menu_control_mouseover(over, TRUE);
+        menu_entry_render(over);
+        break;
+    }
+    case OB_KEY_RETURN: {
+        if (over == NULL)
+            return over;
+
+        if (over->submenu) {
+            if (over->parent->mouseover)
+                over->parent->mouseover(over, FALSE);
+            else
+                menu_control_mouseover(over, FALSE);
+            menu_entry_render(over);
+
+            if (over->submenu->entries)
+                over = over->submenu->entries->data;
+
+            if (over->parent->mouseover)
+                over->parent->mouseover(over, TRUE);
+            else
+                menu_control_mouseover(over, TRUE);
+            menu_entry_render(over);
+        }
+        else {
+            if (over->parent->mouseover)
+                over->parent->mouseover(over, FALSE);
+            else
+                menu_control_mouseover(over, FALSE);
+            menu_entry_render(over);
+
+            menu_entry_fire(over);
+        }
+        break;
+    }
+    case OB_KEY_ESCAPE: {
+        if (over != NULL) {
+            if (over->parent->mouseover)
+                over->parent->mouseover(over, FALSE);
+            else
+                menu_control_mouseover(over, FALSE);
+            menu_entry_render(over);
+
+            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;
 }