X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=88ef01047160472775c7ac1ad58284cc776fcda7;hb=b906db3e11c06997261297cdb1992fd1b05738ff;hp=92cd76626fa9b0ce114a79a92bb5ba4fe30912fd;hpb=1e957a168808f0357509300e879c0a7e97b49a24;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index 92cd7662..88ef0104 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -28,6 +28,7 @@ #include "screen.h" #include "group.h" #include "prop.h" +#include "keyboard.h" #include "focus.h" #include "stacking.h" #include "popup.h" @@ -67,8 +68,8 @@ static gboolean valid_focus_target(ObClient *ft, gboolean all_desktops, gboolean dock_windows, gboolean desktop_windows); -static void focus_cycle_destructor(ObClient *client, gpointer data); -static void focus_tried_destructor(ObClient *client, gpointer data); +static void focus_cycle_destroy_notify(ObClient *client, gpointer data); +static void focus_tried_hide_notify(ObClient *client, gpointer data); static Window createWindow(Window parent, gulong mask, XSetWindowAttributes *attrib) @@ -86,8 +87,9 @@ void focus_startup(gboolean reconfig) if (!reconfig) { XSetWindowAttributes attr; - client_add_destructor(focus_cycle_destructor, NULL); - client_add_destructor(focus_tried_destructor, NULL); + client_add_destroy_notify(focus_cycle_destroy_notify, NULL); + client_add_destroy_notify(focus_tried_hide_notify, NULL); + client_add_hide_notify(focus_tried_hide_notify, NULL); /* start with nothing focused */ focus_nothing(); @@ -140,8 +142,9 @@ void focus_shutdown(gboolean reconfig) icon_popup_free(focus_cycle_popup); if (!reconfig) { - client_remove_destructor(focus_cycle_destructor); - client_remove_destructor(focus_tried_destructor); + client_remove_destroy_notify(focus_cycle_destroy_notify); + client_remove_destroy_notify(focus_tried_hide_notify); + client_remove_hide_notify(focus_tried_hide_notify); /* reset focus to root */ XSetInputFocus(ob_display, PointerRoot, RevertToNone, CurrentTime); @@ -198,6 +201,7 @@ void focus_set_client(ObClient *client) focus_tried = NULL; /* focus isn't "trying" to go anywhere now */ + ob_debug_type(OB_DEBUG_FOCUS, "focus tried = NULL\n"); } static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old) @@ -278,19 +282,17 @@ ObClient* focus_fallback(gboolean allow_refocus) old = focus_client; new = focus_fallback_target(allow_refocus, focus_client); - /* send focus somewhere if it is moving or if it was NULL before, - in which case it may not even be on the screen */ - if (!old || new != old) { - /* unfocus any focused clients.. they can be focused by Pointer events - and such, and then when we try focus them, we won't get a FocusIn - event at all for them. */ - focus_nothing(); + /* unfocus any focused clients.. they can be focused by Pointer events + and such, and then when we try focus them, we won't get a FocusIn + event at all for them. */ + focus_nothing(); - if (new) { - client_focus(new); - /* remember that we tried to send focus here */ - focus_tried = new; - } + if (new) { + client_focus(new); + /* remember that we tried to send focus here */ + focus_tried = new; + + ob_debug_type(OB_DEBUG_FOCUS, "focus tried = %s\n", new->title); } return new; @@ -304,8 +306,25 @@ void focus_nothing() screen_install_colormap(NULL, TRUE); } + /* Don't set focus_client to NULL here. It will be set to NULL when the + FocusOut event comes. Otherwise, if we focus nothing and then focus the + same window again, The focus code says nothing changed, but focus_client + ends up being NULL anyways. focus_client = NULL; + */ + focus_tried = NULL; /* focus isn't "trying" to go anywhere now */ + ob_debug_type(OB_DEBUG_FOCUS, "focus tried = NULL\n"); + + /* if there is a grab going on, then we need to cancel it. if we move + focus during the grab, applications will get NotifyWhileGrabbed events + and ignore them ! + + actions should not rely on being able to move focus during an + interactive grab. + */ + if (keyboard_interactively_grabbed()) + keyboard_interactive_cancel(); /* when nothing will be focused, send focus to the backup target */ XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot, @@ -415,7 +434,7 @@ static void popup_cycle(ObClient *c, gboolean show, g_free(showtext); } -static void focus_cycle_destructor(ObClient *client, gpointer data) +static void focus_cycle_destroy_notify(ObClient *client, gpointer data) { /* end cycling if the target disappears. CurrentTime is fine, time won't be used @@ -741,10 +760,13 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir, /* the currently selected window isn't interesting */ if(cur == c) continue; - if (!dock_windows && !desktop_windows && !client_normal(cur)) + if (cur->type == OB_CLIENT_TYPE_DOCK && !dock_windows) continue; - if (!(dock_windows && cur->type == OB_CLIENT_TYPE_DOCK) || - (desktop_windows && cur->type == OB_CLIENT_TYPE_DESKTOP)) + if (cur->type == OB_CLIENT_TYPE_DESKTOP && !desktop_windows) + continue; + if (!client_normal(cur) && + cur->type != OB_CLIENT_TYPE_DOCK && + cur->type != OB_CLIENT_TYPE_DESKTOP) continue; /* using c->desktop instead of screen_desktop doesn't work if the * current window was omnipresent, hope this doesn't have any other @@ -942,10 +964,13 @@ ObClient *focus_order_find_first(guint desktop) return NULL; } -static void focus_tried_destructor(ObClient *client, gpointer data) +static void focus_tried_hide_notify(ObClient *client, gpointer data) { XEvent ce; + ob_debug_type(OB_DEBUG_FOCUS, "checking focus tried (%s) against %s\n", + (focus_tried?focus_tried->title:"(null)"), client->title); + if (client == focus_tried) { /* we were trying to focus this window but it's gone */