X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=7220c37b487183bfdd0ec076e10f78b788c7c3f0;hb=702995014a0ef567e98899bda931901d98461341;hp=e2c55c6de15d05cfb0e5bb9c220d93c410deb841;hpb=22ff8c587d815c021cad13f46094a31cc79243cf;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index e2c55c6d..7220c37b 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 | \
@@ -32,33 +34,42 @@ void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data,
     ObMenu *menu = NULL, *parent;
 
     if (newmenu == TRUE) {
-        if (!parse_attr_string("id", node->parent, &id))
+        if (!parse_attr_string("id", node, &id))
             goto parse_menu_fail;
-        if (!parse_attr_string("label", node->parent, &title))
+        if (!parse_attr_string("label", node, &title))
             goto parse_menu_fail;
-
-        g_message("menu label %s", title);
-
-        menu = menu_new(title, id, data ? *((ObMenu**)data) : NULL);
-
+        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")) {
             if (parse_attr_string("plugin", node, &plugin)) {
-                PluginMenuCreateData data = {
-                    .doc = doc,
-                    .node = node,
-                    .parent = menu
-                };
+                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->xmlChildrenNode, &parent);
+                parse_menu(doc, node, &parent);
                 menu_add_entry(menu, menu_entry_new_submenu(parent->label,
                                                             parent));
             }
@@ -110,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);
@@ -134,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()
@@ -207,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;
@@ -218,17 +183,19 @@ ObMenu *menu_new_full(char *label, char *name, ObMenu *parent,
     self->name = g_strdup(name);
     self->parent = parent;
     self->open_submenu = NULL;
+    self->over = NULL;
 
     self->entries = NULL;
     self->shown = FALSE;
     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;
@@ -335,18 +302,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) {
@@ -355,14 +318,16 @@ 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) {
+            self->over = NULL;
 	    self->parent->open_submenu = NULL;
+        }
 
-        if (!self->parent) {
+        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);
     }
 }
 
@@ -390,6 +355,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)
@@ -398,14 +375,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);
@@ -421,7 +402,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;
 
@@ -449,16 +431,24 @@ 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;
-  
+    g_assert(self != NULL);
+    
     if (enter) {
+        /* TODO: we prolly don't need open_submenu */
 	if (self->parent->open_submenu && self->submenu 
 	    != self->parent->open_submenu)
+        {
+            e = (ObMenuEntry *) self->parent->over->data;
+            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;
@@ -468,7 +458,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);
@@ -477,11 +467,111 @@ 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);
-	} 
+	}
+        self->hilite = TRUE;
+        self->parent->over = g_list_find(self->parent->entries, self);
+        
+    } else
+        self->hilite = FALSE;
+    
+    menu_entry_render(self);
+}
+
+void menu_control_keyboard_nav(unsigned int key)
+{
+    static ObMenu *current_menu = NULL;
+
+    ObKey obkey = OB_NUM_KEYS;
+
+    /* hrmm. could be fixed */
+    if (key == ob_keycode(OB_KEY_DOWN))
+        obkey = OB_KEY_DOWN;
+    else if (key == ob_keycode(OB_KEY_UP))
+        obkey = OB_KEY_UP;
+    else if (key == ob_keycode(OB_KEY_RIGHT)) /* fuck */
+        obkey = OB_KEY_RIGHT;
+    else if (key == ob_keycode(OB_KEY_LEFT)) /* users */
+        obkey = OB_KEY_LEFT;
+    
+    if (current_menu == NULL)
+        current_menu = menu_visible->data;
+    
+    switch (obkey) {
+    case OB_KEY_DOWN: {
+        if (current_menu->over) {
+            current_menu->mouseover(current_menu->over->data, FALSE);
+            current_menu->over = (current_menu->over->next != NULL ?
+                          current_menu->over->next :
+                          current_menu->entries);
+        }
+        else
+            current_menu->over = current_menu->entries;
+
+        if (current_menu->over)
+            current_menu->mouseover(current_menu->over->data, TRUE);
+        
+        break;
+    }
+    case OB_KEY_UP: {
+        if (current_menu->over) {
+            current_menu->mouseover(current_menu->over->data, FALSE);
+            current_menu->over = (current_menu->over->prev != NULL ?
+                          current_menu->over->prev :
+                g_list_last(current_menu->entries));
+        } else
+            current_menu->over = g_list_last(current_menu->entries);
+
+        if (current_menu->over)
+            current_menu->mouseover(current_menu->over->data, TRUE);
+        
+        break;
     }
+    case OB_KEY_RIGHT: {
+        ObMenuEntry *e;
+        if (current_menu->over == NULL)
+            return;
+
+        e = (ObMenuEntry *)current_menu->over->data;
+        if (e->submenu) {
+            current_menu = e->submenu;
+            current_menu->over = current_menu->entries;
+            if (current_menu->over)
+                current_menu->mouseover(current_menu->over->data, TRUE);
+        } else {
+            current_menu->mouseover(e, FALSE);
+            current_menu->over = NULL;
+            
+            /* zero is enter */
+            menu_entry_fire(e, 0, 0, 0);
+        }
+        break;
+    }
+    case OB_KEY_LEFT: {
+        if (current_menu->over != NULL) {
+            current_menu->mouseover(current_menu->over->data, FALSE);
+            current_menu->over = NULL;
+        }
+        
+        menu_hide(current_menu);
+
+        if (current_menu->parent)
+            current_menu = current_menu->parent;
+        
+        break;
+    }
+    default:
+        if (current_menu)
+            menu_hide(current_menu);
+    }
+    return;
+}
+
+void menu_noop()
+{
+    /* This noop brought to you by OLS 2003 Email Garden. */
 }