X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=23cf910148d711cdf89d4c4e4c08af8b2bfca7e3;hb=d78ae0546dae17eda6084a1bd33e63637ba802e5;hp=cff81bfb03918a0b5fe0e982cd5bedbea17d7e97;hpb=f6193ad9e048c5824142d3e7feeb109f91054052;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index cff81bfb..23cf9101 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -27,6 +27,7 @@ #include "focus_cycle.h" #include "screen.h" #include "keyboard.h" +#include "hooks.h" #include "focus.h" #include "stacking.h" #include "obt/prop.h" @@ -72,6 +73,7 @@ static void push_to_top(ObClient *client) void focus_set_client(ObClient *client) { Window active; + ObClient *old; ob_debug_type(OB_DEBUG_FOCUS, "focus_set_client 0x%lx", client ? client->window : 0); @@ -87,6 +89,7 @@ void focus_set_client(ObClient *client) focus_cycle_stop(focus_client); focus_cycle_stop(client); + old = focus_client; focus_client = client; if (client != NULL) { @@ -101,6 +104,9 @@ void focus_set_client(ObClient *client) active = client ? client->window : None; OBT_PROP_SET32(obt_root(ob_screen), NET_ACTIVE_WINDOW, WINDOW, active); } + + hooks_queue(OB_HOOK_WIN_UNFOCUS, old); + hooks_queue(OB_HOOK_WIN_FOCUS, client); } static ObClient* focus_fallback_target(gboolean allow_refocus, @@ -196,13 +202,6 @@ void focus_nothing(void) /* nothing is focused, update the colormap and _the root property_ */ focus_set_client(NULL); - /* 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. - */ event_cancel_all_key_grabs(); /* when nothing will be focused, send focus to the backup target */