X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=1b3a0e4674f85e8636ba315e87202da8bc5d50ad;hb=21349b6046d21f7af959fb286790c977f4eead50;hp=00b0bfffa9f885896a553bc1999ec5fc781d9781;hpb=58f666a2a5111a16cbb1b416852e90c4c79f6671;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 00b0bfff..1b3a0e46 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -698,7 +698,6 @@ static void event_process(const XEvent *ec, gpointer data)
     if (e->type == ButtonPress || e->type == ButtonRelease) {
         ObWindow *w;
         static guint pressed = 0;
-        static Window pressed_win = None;
 
         event_sourcetime = event_curtime;
 
@@ -719,10 +718,8 @@ static void event_process(const XEvent *ec, gpointer data)
             if (prompt && !used)
                 used = event_handle_prompt(prompt, e);
 
-            if (e->type == ButtonPress) {
+            if (e->type == ButtonPress)
                 pressed = e->xbutton.button;
-                pressed_win = e->xbutton.subwindow;
-            }
         }
     }
     else if (e->type == KeyPress || e->type == KeyRelease ||
@@ -813,11 +810,14 @@ void event_enter_client(ObClient *client)
     g_assert(config_focus_follow);
 
     if (is_enter_focus_event_ignored(event_curserial)) {
-        ob_debug_type(OB_DEBUG_FOCUS, "Ignoring enter event with serial %lu\n"
+        ob_debug_type(OB_DEBUG_FOCUS, "Ignoring enter event with serial %lu "
                       "on client 0x%x", event_curserial, client->window);
         return;
     }
 
+    ob_debug_type(OB_DEBUG_FOCUS, "using enter event with serial %lu "
+                  "on client 0x%x", event_curserial, client->window);
+
     if (client_enter_focusable(client) && client_can_focus(client)) {
         if (config_focus_delay) {
             ObFocusDelayData *data;
@@ -2003,6 +2003,20 @@ static void event_handle_menu(ObMenuFrame *frame, XEvent *ev)
     ObMenuEntryFrame *e;
 
     switch (ev->type) {
+    case MotionNotify:
+        /* We need to catch MotionNotify in addition to EnterNotify because
+           it is possible for the menu to be opened under the mouse cursor, and
+           moving the mouse should select the item. */
+        if ((e = g_hash_table_lookup(menu_frame_map, &ev->xmotion.window))) {
+            if (e->ignore_enters)
+                --e->ignore_enters;
+            else if (!(f = find_active_menu()) ||
+                     f == e->frame ||
+                     f->parent == e->frame ||
+                     f->child == e->frame)
+                menu_frame_select(e->frame, e, FALSE);
+        }
+        break;
     case EnterNotify:
         if ((e = g_hash_table_lookup(menu_frame_map, &ev->xcrossing.window))) {
             if (e->ignore_enters)
@@ -2015,7 +2029,7 @@ static void event_handle_menu(ObMenuFrame *frame, XEvent *ev)
         }
         break;
     case LeaveNotify:
-        /*ignore leaves when we're already in the window */
+        /* ignore leaves when we're already in the window */
         if (ev->xcrossing.detail == NotifyInferior)
             break;