X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=0f2eff429925e1f4744415c32f43e995d0013611;hb=c90da6da781932c2d178bfb7e39ec1d5003543b7;hp=0bc820aefd358bc62b84e66b431533e1a0308736;hpb=f6ad401dabc52f9841323f93b89b2169afbdaacc;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index 0bc820ae..0f2eff42 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -27,7 +27,7 @@ static void parse_menu(xmlDocPtr doc, xmlNodePtr node, void *data)
 void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data,
                        gboolean newmenu)
 {
-    Action *act;
+    ObAction *act;
     xmlNodePtr nact;
 
     gchar *id = NULL, *title = NULL, *label = NULL, *plugin;
@@ -142,8 +142,9 @@ 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);
 }
     
@@ -232,7 +233,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)
 {
@@ -273,13 +274,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)
@@ -392,7 +397,8 @@ void menu_entry_fire(ObMenuEntry *self, unsigned int button, unsigned int x,
 {
     ObMenu *m;
 
-    if (button > 3) return;
+    /* ignore wheel scrolling */
+    if (button == 4 || button == 5) return;
 
     if (self->action) {
         self->action->data.any.c = self->parent->client;
@@ -472,9 +478,21 @@ void menu_control_mouseover(ObMenuEntry *self, gboolean enter)
 
             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,
@@ -581,8 +599,8 @@ void menu_control_keyboard_nav(unsigned int key)
         break;
     }
     default:
-        if (current_menu)
-            current_menu->hide(current_menu);
+        ((ObMenu *)menu_visible->data)->hide(menu_visible->data);
+        current_menu = NULL;
     }
     return;
 }