sloppy focus fixes, ignore a few more enter events

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index a9841b0e142f2c814035a579fc248b699a030dc2..409641df650b82107182476eef55e0064aaf3f2b 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -45,6 +45,8 @@ static void event_handle_client(ObClient *c, XEvent *e);
 static gboolean focus_delay_func(gpointer data);
 static void focus_delay_client_dest(gpointer data);
 
+static gboolean menu_hide_delay_func(gpointer data);
+
 #define INVALID_FOCUSIN(e) ((e)->xfocus.detail == NotifyInferior || \
                             (e)->xfocus.detail == NotifyAncestor || \
                             (e)->xfocus.detail > NotifyNonlinearVirtual)
@@ -70,6 +72,8 @@ static int mask_table_size;
 
 static ObClient *focus_delay_client;
 
+static gboolean menu_can_hide;
+
 #ifdef USE_SM
 static void ice_handler(int fd, gpointer conn)
 {
@@ -134,6 +138,10 @@ void event_shutdown(gboolean reconfig)
 {
     if (reconfig) return;
 
+#ifdef USE_SM
+    IceRemoveConnectionWatch(ice_watch, NULL);
+#endif
+
     client_remove_destructor(focus_delay_client_dest);
     XFreeModifiermap(modmap);
 }
@@ -386,11 +394,14 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
     case LeaveNotify:
         /* NotifyUngrab occurs when a mouse button is released and the event is
            caused, like when lowering a window */
-        /* NotifyVirtual occurs when ungrabbing the pointer */
+        /* NotifyVirtual and NotifyAncestor occurs when ungrabbing the
+           pointer (Ancestor happens when the pointer is on a window border) */
         if (e->xcrossing.mode == NotifyGrab ||
             e->xcrossing.detail == NotifyInferior ||
             (e->xcrossing.mode == NotifyUngrab &&
-             e->xcrossing.detail == NotifyVirtual)) {
+             (e->xcrossing.detail == NotifyAncestor ||
+              e->xcrossing.detail == NotifyNonlinearVirtual ||
+              e->xcrossing.detail == NotifyVirtual))) {
 #ifdef DEBUG_FOCUS
             ob_debug("%sNotify mode %d detail %d on %lx IGNORED\n",
                      (e->type == EnterNotify ? "Enter" : "Leave"),
@@ -487,19 +498,27 @@ static void event_process(const XEvent *ec, gpointer data)
     {
         if (menu_frame_visible)
             event_handle_menu(e);
-        else if (moveresize_in_progress)
-            moveresize_event(e);
         else {
-            ObFrameContext context;
+            if (!keyboard_process_interactive_grab(e, &client)) {
+                if (moveresize_in_progress)
+                    moveresize_event(e);
 
-            context = frame_context(client, e->xany.window);
+                menu_can_hide = FALSE;
+                ob_main_loop_timeout_add(ob_main_loop,
+                                         G_USEC_PER_SEC / 4,
+                                         menu_hide_delay_func,
+                                         NULL, NULL);
 
-            if (!keyboard_process_interactive_grab(e, &client, &context)) {
                 if (e->type == ButtonPress || e->type == ButtonRelease ||
                     e->type == MotionNotify)
-                    mouse_event(client, context, e);
+                    mouse_event(client, e);
                 else if (e->type == KeyPress)
-                    keyboard_event(client, e);
+                    /* when in the middle of a focus cycling action, this
+                       causes the window which appears to be focused to be
+                       the one on which the actions will be executed */
+                    keyboard_event((focus_cycle_target ?
+                                    focus_cycle_target :
+                                    (client ? client : focus_client)), e);
             }
         }
     }
@@ -569,7 +588,9 @@ static void event_handle_client(ObClient *client, XEvent *e)
         /* Wheel buttons don't draw because they are an instant click, so it
            is a waste of resources to go drawing it. */
         if (!(e->xbutton.button == 4 || e->xbutton.button == 5)) {
-            switch (frame_context(client, e->xbutton.window)) {
+            con = frame_context(client, e->xbutton.window);
+            con = mouse_button_frame_context(con, e->xbutton.button);
+            switch (con) {
             case OB_FRAME_CONTEXT_MAXIMIZE:
                 client->frame->max_press = (e->type == ButtonPress);
                 framerender_frame(client->frame);
@@ -680,15 +701,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
             break;
         case OB_FRAME_CONTEXT_FRAME:
             if (client_normal(client)) {
-                if (ob_state() == OB_STATE_STARTING) {
-                    /* move it to the top of the focus order */
-                    guint desktop = client->desktop;
-                    if (desktop == DESKTOP_ALL) desktop = screen_desktop;
-                    focus_order[desktop] = g_list_remove(focus_order[desktop],
-                                                         client);
-                    focus_order[desktop] = g_list_prepend(focus_order[desktop],
-                                                          client);
-                } else if (config_focus_follow) {
+                if (config_focus_follow) {
 #ifdef DEBUG_FOCUS
                     ob_debug("EnterNotify on %lx, focusing window\n",
                              client->window);
@@ -1120,14 +1133,11 @@ static void event_handle_menu(XEvent *ev)
 
     switch (ev->type) {
     case ButtonRelease:
-        if (!(f = menu_frame_under(ev->xbutton.x_root,
-                                   ev->xbutton.y_root)))
+        if ((e = menu_entry_frame_under(ev->xbutton.x_root,
+                                        ev->xbutton.y_root)))
+            menu_entry_frame_execute(e, ev->xbutton.state);
+        else if (menu_can_hide)
             menu_frame_hide_all();
-        else {
-            if ((e = menu_entry_frame_under(ev->xbutton.x_root,
-                                            ev->xbutton.y_root)))
-                menu_entry_frame_execute(e, ev->xbutton.state);
-        }
         break;
     case MotionNotify:
         if ((f = menu_frame_under(ev->xmotion.x_root,
@@ -1166,6 +1176,12 @@ static void event_handle_menu(XEvent *ev)
     }
 }
 
+static gboolean menu_hide_delay_func(gpointer data)
+{
+    menu_can_hide = TRUE;
+    return FALSE; /* no repeat */
+}
+
 static gboolean focus_delay_func(gpointer data)
 {
     client_focus(focus_delay_client);