X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fmenu.c;h=0c285cbf1b4e890975b78122e93e3a604b6f4f7d;hb=12af0aedf2da4f360954cfaaeaf77234b36e4858;hp=4c7adc926ff2ce2faa30ea1c1a1e4fcc809007f4;hpb=b6e3e1bc7e929200fc2c4bc744be2c1e2b80ecf6;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index 4c7adc92..0c285cbf 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -1,12 +1,15 @@
+#include "debug.h"
 #include "menu.h"
 #include "openbox.h"
 #include "stacking.h"
 #include "client.h"
 #include "grab.h"
+#include "config.h"
 #include "screen.h"
 #include "geom.h"
 #include "plugin.h"
 #include "misc.h"
+#include "parser/parse.h"
 
 GHashTable *menu_hash = NULL;
 GList *menu_visible = NULL;
@@ -17,39 +20,44 @@ GList *menu_visible = NULL;
 #define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
                          ButtonPressMask | ButtonReleaseMask)
 
-static void parse_menu(xmlDocPtr doc, xmlNodePtr node, void *data)
+static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                       gpointer data)
 {
-    parse_menu_full(doc, node, data, TRUE);
+    g_message("%s", __FUNCTION__);
+    parse_menu_full(i, doc, node, data, TRUE);
 }
 
 
-void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data,
-                       gboolean newmenu)
+void parse_menu_full(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                     gpointer data, gboolean newmenu)
 {
-    Action *act;
+    ObAction *act;
     xmlNodePtr nact;
 
     gchar *id = NULL, *title = NULL, *label = NULL, *plugin;
-    ObMenu *menu = NULL, *parent;
+    ObMenu *menu = NULL, *parent = NULL;
 
     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);
+        ob_debug("menu label %s\n", title);
 
         if (parse_attr_string("plugin", node, &plugin)) {
             PluginMenuCreateData data;
+            data.parse_inst = i;
             data.doc = doc;
             data.node = node;
             data.parent = menu;
-            parent = plugin_create(plugin, &data);
+
+            if (plugin_open_reopen(plugin, i))
+                menu = plugin_create(plugin, &data);
             g_free(plugin);
         } else
             menu = menu_new(title, id, data ? *((ObMenu**)data) : NULL);
             
-        if (data)
+        if (data && menu)
             *((ObMenu**)data) = menu;
     } else {
         menu = (ObMenu *)data;
@@ -64,14 +72,17 @@ void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data,
                 data.doc = doc;
                 data.node = node;
                 data.parent = menu;
-                parent = plugin_create(plugin, &data);
+                if (plugin_open_reopen(plugin, i))
+                    parent = plugin_create(plugin, &data);
                 g_free(plugin);
             } else {
                 parent = menu;
-                parse_menu(doc, node, &parent);
+                parse_menu(i, doc, node, &parent);
+            }
+
+            if (parent)
                 menu_add_entry(menu, menu_entry_new_submenu(parent->label,
                                                             parent));
-            }
 
         }
         else if (!xmlStrcasecmp(node->name, (const xmlChar*) "item")) {
@@ -106,6 +117,8 @@ void menu_destroy_hash_value(ObMenu *self)
 {
     GList *it;
 
+    if (self->destroy) self->destroy(self);
+
     for (it = self->entries; it; it = it->next)
         menu_entry_free(it->data);
     g_list_free(self->entries);
@@ -138,69 +151,17 @@ void menu_entry_free(ObMenuEntry *self)
     RrAppearanceFree(self->a_item);
     RrAppearanceFree(self->a_disabled);
     RrAppearanceFree(self->a_hilite);
+    RrAppearanceFree(self->a_submenu);
     XDestroyWindow(ob_display, self->item);
-
+    XDestroyWindow(ob_display, self->submenu_pic);
     g_free(self);
 }
-    
-void menu_startup()
+ 
+void menu_startup(ObParseInst *i)
 {
-/*
-    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()
@@ -208,6 +169,43 @@ void menu_shutdown()
     g_hash_table_destroy(menu_hash);
 }
 
+void menu_parse()
+{
+    ObParseInst *i;
+    xmlDocPtr doc;
+    xmlNodePtr node;
+    gchar *p;
+    gboolean loaded = FALSE;
+
+    i = parse_startup();
+
+    if (config_menu_path)
+        if (!(loaded =
+              parse_load(config_menu_path, "openbox_menu", &doc, &node)))
+            g_warning("Failed to load menu from '%s'", config_menu_path);
+    if (!loaded) {
+        p = g_build_filename(g_get_home_dir(), ".openbox", "menu", NULL);
+        if (!(loaded =
+              parse_load(p, "openbox_menu", &doc, &node)))
+            g_warning("Failed to load menu from '%s'", p);
+        g_free(p);
+    }
+    if (!loaded) {
+        p = g_build_filename(RCDIR, "menu", NULL);
+        if (!(loaded =
+              parse_load(p, "openbox_menu", &doc, &node)))
+            g_warning("Failed to load menu from '%s'", p);
+        g_free(p);
+    }
+
+    if (loaded) {
+        parse_register(i, "menu", parse_menu, NULL);
+        parse_tree(i, doc, node->xmlChildrenNode);
+    }
+
+    parse_shutdown(i);
+}
+
 static Window createWindow(Window parent, unsigned long mask,
 			   XSetWindowAttributes *attrib)
 {
@@ -218,7 +216,11 @@ 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,
+                      menu_controller_destroy destroy)
 {
     XSetWindowAttributes attrib;
     ObMenu *self;
@@ -229,17 +231,20 @@ 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->destroy = destroy;
+    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;
@@ -273,7 +278,7 @@ void menu_free(char *name)
     g_hash_table_remove(menu_hash, name);
 }
 
-ObMenuEntry *menu_entry_new_full(char *label, Action *action,
+ObMenuEntry *menu_entry_new_full(char *label, ObAction *action,
                                ObMenuEntryRenderType render_type,
                                gpointer submenu)
 {
@@ -314,13 +319,17 @@ void menu_add_entry(ObMenu *menu, ObMenuEntry *entry)
 
     attrib.event_mask = ENTRY_EVENTMASK;
     entry->item = createWindow(menu->items, CWEventMask, &attrib);
+    entry->submenu_pic = createWindow(menu->items, CWEventMask, &attrib);
     XMapWindow(ob_display, entry->item);
+    XMapWindow(ob_display, entry->submenu_pic);
 
-    entry->a_item = entry->a_disabled = entry->a_hilite = NULL;
+    entry->a_item = entry->a_disabled = entry->a_hilite = entry->a_submenu
+        = NULL;
 
     menu->invalid = TRUE;
 
     g_hash_table_insert(window_map, &entry->item, menu);
+    g_hash_table_insert(window_map, &entry->submenu_pic, menu);
 }
 
 void menu_show(char *name, int x, int y, ObClient *client)
@@ -341,7 +350,7 @@ void menu_show_full(ObMenu *self, int x, int y, ObClient *client)
 {
     g_assert(self != NULL);
        
-    menu_render(self);
+    self->update(self);
     
     self->client = client;
 
@@ -353,11 +362,7 @@ void menu_show_full(ObMenu *self, int x, int y, ObClient *client)
         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) {
@@ -365,18 +370,9 @@ void menu_hide(ObMenu *self) {
         XUnmapWindow(ob_display, self->frame);
         self->shown = FALSE;
 	if (self->open_submenu)
-	    menu_hide(self->open_submenu);
+	    self->open_submenu->hide(self->open_submenu);
 	if (self->parent && self->parent->open_submenu == self) {
-            ObMenuEntry *e;
-
 	    self->parent->open_submenu = NULL;
-
-            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)) {
@@ -384,6 +380,11 @@ void menu_hide(ObMenu *self) {
             grab_pointer(FALSE, None);
         }
         menu_visible = g_list_remove(menu_visible, self);
+        if (self->over) {
+            ((ObMenuEntry *)self->over->data)->hilite = FALSE;
+            menu_entry_render(self->over->data);
+            self->over = NULL;
+        }
     }
 }
 
@@ -431,14 +432,19 @@ 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;
 
+    /* ignore wheel scrolling */
+    if (button == 4 || button == 5) return;
+
     if (self->action) {
         self->action->data.any.c = self->parent->client;
         self->action->func(&self->action->data);
@@ -446,7 +452,7 @@ void menu_entry_fire(ObMenuEntry *self)
         /* hide the whole thing */
         m = self->parent;
         while (m->parent) m = m->parent;
-        menu_hide(m);
+        m->hide(m);
     }
 }
 
@@ -479,7 +485,7 @@ void menu_control_show(ObMenu *self, int x, int y, ObClient *client)
         stacking_raise(MENU_AS_WINDOW(self));
 	self->shown = TRUE;
     } else if (self->shown && self->open_submenu) {
-	menu_hide(self->open_submenu);
+	self->open_submenu->hide(self->open_submenu);
     }
 }
 
@@ -489,15 +495,17 @@ void menu_control_mouseover(ObMenuEntry *self, gboolean enter)
     Rect *a;
     ObMenuEntry *e;
 
+    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 = menu_find_entry_by_submenu(self->parent,
-                                           self->parent->open_submenu);
+            e = (ObMenuEntry *) self->parent->over->data;
             e->hilite = FALSE;
             menu_entry_render(e);
-	    menu_hide(self->parent->open_submenu);
+	    self->parent->open_submenu->hide(self->parent->open_submenu);
         }
 	
 	if (self->submenu && self->parent->open_submenu != self->submenu) {
@@ -511,153 +519,138 @@ void menu_control_mouseover(ObMenuEntry *self, gboolean enter)
 		ob_rr_theme->bwidth - ob_rr_theme->menu_overlap;
 
 	    /* need to get the width. is this bad?*/
-	    menu_render(self->submenu);
+	    self->submenu->update(self->submenu);
 
             a = screen_physical_area_monitor(self->parent->xin_area);
 
-	    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->menu_overlap;
+	    if (self->submenu->size.width + x >= a->x + a->width) {
+                int newparentx = a->x + a->width
+                    - self->submenu->size.width
+                    - self->parent->size.width
+                    - ob_rr_theme->bwidth
+                    - ob_rr_theme->menu_overlap;
+                
+                x = a->x + a->width - self->submenu->size.width
+                    - ob_rr_theme->menu_overlap;
+                XWarpPointer(ob_display, None, None, 0, 0, 0, 0,
+                             newparentx - self->parent->location.x, 0);
+
+                menu_show_full(self->parent, newparentx,
+                               self->parent->location.y, self->parent->client);
+            }
 	    
 	    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;
+	}
+        self->hilite = TRUE;
+        self->parent->over = g_list_find(self->parent->entries, self);
+        
+    } else
+        self->hilite = FALSE;
+    
+    menu_entry_render(self);
 }
 
-ObMenuEntry *menu_control_keyboard_nav(ObMenuEntry *over, ObKey key)
+void menu_control_keyboard_nav(unsigned int key)
 {
-    GList *it = NULL;
-        
-    switch (key) {
+    static ObMenu *current_menu = NULL;
+    ObMenuEntry *e = 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;
+    else if (key == ob_keycode(OB_KEY_RETURN))
+        obkey = OB_KEY_RETURN;
+
+    
+    if (current_menu == NULL)
+        current_menu = menu_visible->data;
+    
+    switch (obkey) {
     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 (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 (over) {
-            if (over->parent->mouseover)
-                over->parent->mouseover(over, TRUE);
-            else
-                menu_control_mouseover(over, TRUE);
-            menu_entry_render(over);
-        }
+        if (current_menu->over)
+            current_menu->mouseover(current_menu->over->data, TRUE);
         
         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);
-            }
+        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
-            over = (over->parent->entries != NULL ?
-                    g_list_last(over->parent->entries)->data :
-                    NULL);
+            current_menu->over = g_list_last(current_menu->entries);
 
-        if (over->parent->mouseover)
-            over->parent->mouseover(over, TRUE);
-        else
-            menu_control_mouseover(over, TRUE);
-        menu_entry_render(over);
+        if (current_menu->over)
+            current_menu->mouseover(current_menu->over->data, TRUE);
+        
         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);
+    case OB_KEY_RIGHT: {
+        if (current_menu->over == NULL)
+            return;
+        e = (ObMenuEntry *)current_menu->over->data;
+        if (e->submenu) {
+            current_menu->mouseover(e, TRUE);
+            current_menu = e->submenu;
+            current_menu->over = current_menu->entries;
+            if (current_menu->over)
+                current_menu->mouseover(current_menu->over->data, TRUE);
         }
         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);
-            }
+
+    case OB_KEY_RETURN: {
+        if (current_menu->over == NULL)
+            return;
+        e = (ObMenuEntry *)current_menu->over->data;
+
+        current_menu->mouseover(e, FALSE);
+        current_menu->over = NULL;
+        /* zero is enter */
+        menu_entry_fire(e, 0, 0, 0);
+    }
+        
+    case OB_KEY_LEFT: {
+        if (current_menu->over != NULL) {
+            current_menu->mouseover(current_menu->over->data, FALSE);
+            current_menu->over = NULL;
         }
         
-        over = NULL;
+        current_menu->hide(current_menu);
+
+        if (current_menu->parent)
+            current_menu = current_menu->parent;
+        
         break;
     }
     default:
-        g_error("Unknown key");
+        ((ObMenu *)menu_visible->data)->hide(menu_visible->data);
+        current_menu = NULL;
     }
+    return;
+}
 
-    return over;
+void menu_noop()
+{
+    /* This noop brought to you by OLS 2003 Email Garden. */
 }