X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=8329f0287b3c35c94b49e52f84c32ae88b3daacf;hb=5009498d5934944c70b6c520ca45a727800e9528;hp=7dfcc0c70d91e527f1a979aae83600bd4da4561c;hpb=ceaf23b6b4965ad2841e8763934715fe45b75685;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 7dfcc0c7..8329f028 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -64,6 +64,12 @@ typedef struct
     gboolean ignored;
 } ObEventData;
 
+typedef struct
+{
+    ObClient *client;
+    Time time;
+} ObFocusDelayData;
+
 static void event_process(const XEvent *e, gpointer data);
 static void event_client_dest(ObClient *client, gpointer data);
 static void event_handle_root(XEvent *e);
@@ -73,6 +79,7 @@ static void event_handle_dockapp(ObDockApp *app, XEvent *e);
 static void event_handle_client(ObClient *c, XEvent *e);
 static void event_handle_group(ObGroup *g, XEvent *e);
 
+static void focus_delay_destroy(gpointer data);
 static gboolean focus_delay_func(gpointer data);
 static void focus_delay_client_dest(ObClient *client, gpointer data);
 
@@ -98,6 +105,11 @@ static guint ignore_enter_focus = 0;
 
 static gboolean menu_can_hide;
 
+static ObFocusDelayData focus_delay_data = { .client = NULL,
+                                             .time = CurrentTime };
+
+
+
 #ifdef USE_SM
 static void ice_handler(gint fd, gpointer conn)
 {
@@ -387,9 +399,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
     switch(e->type) {
     case EnterNotify:
     case LeaveNotify:
-        if (e->xcrossing.detail == NotifyInferior)
-            return TRUE;
-        break;
+        return keyboard_interactively_grabbed();
     case FocusIn:
     case FocusOut:
         /* I don't think this should ever happen with our event masks, but
@@ -440,27 +450,28 @@ static void event_process(const XEvent *ec, gpointer data)
             }
         }
 
-#if 1 /* focus debugging stuff */
     if (e->type == FocusIn || e->type == FocusOut) {
         gint mode = e->xfocus.mode;
         gint detail = e->xfocus.detail;
         Window window = e->xfocus.window;
         if (detail == NotifyVirtual) {
-            ob_debug("FOCUS %s NOTIFY VIRTUAL window 0x%x\n",
-                     (e->type == FocusIn ? "IN" : "OUT"), window);
+            ob_debug_type(OB_DEBUG_FOCUS,
+                          "FOCUS %s NOTIFY VIRTUAL window 0x%x\n",
+                          (e->type == FocusIn ? "IN" : "OUT"), window);
         }
 
         else if (detail == NotifyNonlinearVirtual) {
-            ob_debug("FOCUS %s NOTIFY NONLINVIRTUAL window 0x%x\n",
-                     (e->type == FocusIn ? "IN" : "OUT"), window);
+            ob_debug_type(OB_DEBUG_FOCUS,
+                          "FOCUS %s NOTIFY NONLINVIRTUAL window 0x%x\n",
+                          (e->type == FocusIn ? "IN" : "OUT"), window);
         }
 
         else
-            ob_debug("UNKNOWN FOCUS %s (d %d, m %d) window 0x%x\n",
-                     (e->type == FocusIn ? "IN" : "OUT"),
-                     detail, mode, window);
+            ob_debug_type(OB_DEBUG_FOCUS,
+                          "UNKNOWN FOCUS %s (d %d, m %d) window 0x%x\n",
+                          (e->type == FocusIn ? "IN" : "OUT"),
+                          detail, mode, window);
     }
-#endif
 
     event_set_curtime(e);
     event_hack_mods(e);
@@ -472,7 +483,13 @@ static void event_process(const XEvent *ec, gpointer data)
             ed->ignored = FALSE;
 
     /* deal with it in the kernel */
-    if (group)
+
+    if (menu_frame_visible &&
+        (e->type == EnterNotify || e->type == LeaveNotify))
+    {
+        /* crossing events for menu */
+        event_handle_menu(e);
+    } else if (group)
         event_handle_group(group, e);
     else if (client)
         event_handle_client(client, e);
@@ -612,12 +629,16 @@ void event_enter_client(ObClient *client)
     if (client_normal(client) && client_can_focus(client)) {
         if (config_focus_delay) {
             ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func);
+
+            focus_delay_data.client = client;
+            focus_delay_data.time = event_curtime;
+
             ob_main_loop_timeout_add(ob_main_loop,
                                      config_focus_delay,
                                      focus_delay_func,
-                                     client, NULL);
+                                     NULL, focus_delay_destroy);
         } else
-            focus_delay_func(client);
+            focus_delay_func(NULL);
     }
 }
 
@@ -678,18 +699,18 @@ static void event_handle_client(ObClient *client, XEvent *e)
         if (!XCheckIfEvent(ob_display, &ce, look_for_focusin, NULL)) {
             /* There is no FocusIn, this means focus went to a window that
                is not being managed, or a window on another screen. */
-            ob_debug("Focus went to a black hole !\n");
+            ob_debug_type(OB_DEBUG_FOCUS, "Focus went to a black hole !\n");
         } else if (ce.xany.window == e->xany.window) {
             /* If focus didn't actually move anywhere, there is nothing to do*/
             break;
         } else if (ce.xfocus.detail == NotifyPointerRoot ||
                  ce.xfocus.detail == NotifyDetailNone) {
-            ob_debug("Focus went to root\n");
+            ob_debug_type(OB_DEBUG_FOCUS, "Focus went to root\n");
             /* Focus has been reverted to the root window or nothing, so fall
                back to something other than the window which just had it. */
             focus_fallback(FALSE);
         } else if (ce.xfocus.detail == NotifyInferior) {
-            ob_debug("Focus went to parent\n");
+            ob_debug_type(OB_DEBUG_FOCUS, "Focus went to parent\n");
             /* Focus has been reverted to parent, which is our frame window,
                or the root window, so fall back to something other than the
                window which had it. */
@@ -701,8 +722,9 @@ static void event_handle_client(ObClient *client, XEvent *e)
             if (ed.ignored) {
                 /* The FocusIn was ignored, this means it was on a window
                    that isn't a client. */
-                ob_debug("Focus went to an unmanaged window 0x%x !\n",
-                         ce.xfocus.window);
+                ob_debug_type(OB_DEBUG_FOCUS,
+                              "Focus went to an unmanaged window 0x%x !\n",
+                              ce.xfocus.window);
                 focus_fallback(TRUE);
             }
         }
@@ -780,21 +802,19 @@ static void event_handle_client(ObClient *client, XEvent *e)
             if (e->xcrossing.mode == NotifyGrab ||
                 e->xcrossing.mode == NotifyUngrab)
             {
-#ifdef DEBUG_FOCUS
-                ob_debug("%sNotify mode %d detail %d on %lx IGNORED\n",
-                         (e->type == EnterNotify ? "Enter" : "Leave"),
-                         e->xcrossing.mode,
-                         e->xcrossing.detail, client?client->window:0);
-#endif
+                ob_debug_type(OB_DEBUG_FOCUS,
+                              "%sNotify mode %d detail %d on %lx IGNORED\n",
+                              (e->type == EnterNotify ? "Enter" : "Leave"),
+                              e->xcrossing.mode,
+                              e->xcrossing.detail, client?client->window:0);
             } else {
-#ifdef DEBUG_FOCUS
-                ob_debug("%sNotify mode %d detail %d on %lx, "
-                         "focusing window: %d\n",
-                         (e->type == EnterNotify ? "Enter" : "Leave"),
-                         e->xcrossing.mode,
-                         e->xcrossing.detail, (client?client->window:0),
-                         !nofocus);
-#endif
+                ob_debug_type(OB_DEBUG_FOCUS,
+                              "%sNotify mode %d detail %d on %lx, "
+                              "focusing window: %d\n",
+                              (e->type == EnterNotify ? "Enter" : "Leave"),
+                              e->xcrossing.mode,
+                              e->xcrossing.detail, (client?client->window:0),
+                              !nofocus);
                 if (!nofocus && config_focus_follow)
                     event_enter_client(client);
             }
@@ -910,14 +930,14 @@ static void event_handle_client(ObClient *client, XEvent *e)
         }
         break;
     case UnmapNotify:
-        ob_debug("UnmapNotify for window 0x%x eventwin 0x%x sendevent %d "
-                 "ignores left %d\n",
-                 client->window, e->xunmap.event, e->xunmap.from_configure,
-                 client->ignore_unmaps);
         if (client->ignore_unmaps) {
             client->ignore_unmaps--;
             break;
         }
+        ob_debug("UnmapNotify for window 0x%x eventwin 0x%x sendevent %d "
+                 "ignores left %d\n",
+                 client->window, e->xunmap.event, e->xunmap.from_configure,
+                 client->ignore_unmaps);
         client_unmanage(client);
         break;
     case DestroyNotify:
@@ -1163,7 +1183,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
             client_update_icons(client);
         }
         else if (msgtype == prop_atoms.net_wm_user_time) {
-            client_update_user_time(client, TRUE);
+            client_update_user_time(client);
         }
         else if (msgtype == prop_atoms.sm_client_id) {
             client_update_sm_client_id(client);
@@ -1262,26 +1282,21 @@ static void event_handle_menu(XEvent *ev)
                 menu_frame_hide_all();
         }
         break;
-    case MotionNotify:
-        if ((f = menu_frame_under(ev->xmotion.x_root,
-                                  ev->xmotion.y_root))) {
-            if ((e = menu_entry_frame_under(ev->xmotion.x_root,
-                                            ev->xmotion.y_root))) {
-                /* XXX menu_frame_entry_move_on_screen(f); */
-                menu_frame_select(f, e);
-            }
+    case EnterNotify:
+        if ((e = g_hash_table_lookup(menu_frame_map, &ev->xcrossing.window))) {
+            if (e->ignore_enters)
+                --e->ignore_enters;
+            else
+                menu_frame_select(e->frame, e);
         }
+        break;
+    case LeaveNotify:
+        if ((e = g_hash_table_lookup(menu_frame_map, &ev->xcrossing.window)) &&
+            (f = find_active_menu()) && f->selected == e &&
+            e->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU)
         {
-            ObMenuFrame *a;
-
-            a = find_active_menu();
-            if (a && a != f &&
-                a->selected->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU)
-            {
-                menu_frame_select(a, NULL);
-            }
+            menu_frame_select(e->frame, NULL);
         }
-        break;
     case KeyPress:
         if (ev->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
             menu_frame_hide_all();
@@ -1317,14 +1332,21 @@ static gboolean menu_hide_delay_func(gpointer data)
     return FALSE; /* no repeat */
 }
 
-static gboolean focus_delay_func(gpointer data)
+static void focus_delay_destroy(gpointer data)
 {
-    ObClient *c = data;
+    focus_delay_data.client = NULL;
+    focus_delay_data.time = CurrentTime;
+}
 
-    if (focus_client != c) {
-        if (client_focus(c) && config_focus_raise)
-            client_raise(c);
+static gboolean focus_delay_func(gpointer data)
+{
+    Time old = event_curtime;
+    event_curtime = focus_delay_data.time;
+    if (focus_client != focus_delay_data.client) {
+        if (client_focus(focus_delay_data.client) && config_focus_raise)
+            client_raise(focus_delay_data.client);
     }
+    event_curtime = old;
     return FALSE; /* no repeat */
 }
 
@@ -1378,6 +1400,9 @@ void event_ignore_queued_enters()
 
 gboolean event_time_after(Time t1, Time t2)
 {
+    g_assert(t1 != CurrentTime);
+    g_assert(t2 != CurrentTime);
+
     /*
       Timestamp values wrap around (after about 49.7 days). The server, given
       its current time is represented by timestamp T, always interprets