X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=69c85100c9c89909ddf26a45376e5a660a6576b8;hb=b8715ba30901551998adff78603015a5dd089cb0;hp=fbb7bb6685320beb0811a71e6eacfc276b3f7ac9;hpb=5be0a82a353b67160142134de1cc51fa31d72759;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index fbb7bb66..69c85100 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -972,7 +972,6 @@ static void event_handle_client(ObClient *client, XEvent *e)
 
 static void event_handle_menu(ObClient *client, XEvent *e)
 {
-    static ObMenuEntry *over = NULL;
     ObMenuEntry *entry;
     ObMenu *top;
     GList *it = NULL;
@@ -982,39 +981,13 @@ static void event_handle_menu(ObClient *client, XEvent *e)
     ob_debug("EVENT %d\n", e->type);
     switch (e->type) {
     case KeyPress:
-        if (e->xkey.keycode == ob_keycode(OB_KEY_DOWN))
-            over = menu_control_keyboard_nav(over, OB_KEY_DOWN);
-        else if (e->xkey.keycode == ob_keycode(OB_KEY_UP))
-            over = menu_control_keyboard_nav(over, OB_KEY_UP);
-        else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN))
-            over = menu_control_keyboard_nav(over, OB_KEY_RETURN);
-        else if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
-            over = menu_control_keyboard_nav(over, OB_KEY_ESCAPE);
-        else {
-            if (over) {
-                if (over->parent->mouseover)
-                    over->parent->mouseover(over, FALSE);
-                else
-                    menu_control_mouseover(over, FALSE);
-                menu_entry_render(over);
-                over = NULL;
-            }
-/*
-  if (top->hide)
-  top->hide(top);
-  else
-*/
-            menu_hide(top);
-        }
+        menu_control_keyboard_nav(e->xkey.keycode);
         break;
     case ButtonPress:
-        if (e->xbutton.button > 3) break;
-
 	ob_debug("BUTTON PRESS\n");
+
         break;
     case ButtonRelease:
-        if (e->xbutton.button > 3) break;
-
 	ob_debug("BUTTON RELEASED\n");
 
         for (it = menu_visible; it; it = g_list_next(it)) {
@@ -1030,36 +1003,17 @@ static void event_handle_menu(ObClient *client, XEvent *e)
                                                     m->location.x,
                                                     e->xbutton.y_root -
                                                     m->location.y))) {
-                    if (over) {
-                        if (over->parent->mouseover)
-                            over->parent->mouseover(over, FALSE);
-                        else
-                            menu_control_mouseover(over, FALSE); 
-                        menu_entry_render(over);
-                        over = NULL;
-                        /* this hides the menu */
-                        menu_entry_fire(entry);
-                    }
+                    m->selected(entry, e->xbutton.button,
+                                e->xbutton.x_root,
+                                e->xbutton.y_root);
+                    break;
                 }
-                break;
             }
         }
-        if (!it) {
-            if (over) {
-                if (over->parent->mouseover)
-                    over->parent->mouseover(over, FALSE);
-                else
-                    menu_control_mouseover(over, FALSE); 
-                menu_entry_render(over);
-                over = NULL;
-            }
-/*
-            if (top->hide)
-                top->hide(top);
-            else
-*/
-                menu_hide(top);
-        }
+
+        /* will call the menu_hide() for each submenu as well */
+        if (!it)
+            menu_hide(menu_visible->data);
 	
         break;
     case MotionNotify:
@@ -1071,31 +1025,14 @@ static void event_handle_menu(ObClient *client, XEvent *e)
                                                 m->location.x,
                                                 e->xmotion.y_root -
                                                 m->location.y))) {
-                if (over && entry != over) {
-                    if (over->parent->mouseover)
-                        over->parent->mouseover(over, FALSE);
-                    else
-                        menu_control_mouseover(over, FALSE);
-                    menu_entry_render(over);
-                }
+                if (m->over && m->over->data != entry)
+                    m->mouseover(m->over->data, FALSE);
 
-                over = entry;
-                if (over->parent->mouseover)
-                    over->parent->mouseover(over, TRUE);
-                else
-                    menu_control_mouseover(over, TRUE);
-                menu_entry_render(over);
+                m->mouseover(entry, TRUE);
                 break;
             }
         }
-        if (!it && over) {
-            if (over->parent->mouseover)
-                over->parent->mouseover(over, FALSE);
-            else
-                menu_control_mouseover(over, FALSE);
-            menu_entry_render(over);
-            over = NULL;
-        }
+
         break;
     }
 }