Merge branch 'backport' into work

[dana/openbox.git] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index baf88e8..fc0fd99 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -27,7 +27,6 @@
 #include "focus_cycle.h"
 #include "screen.h"
 #include "keyboard.h"
-#include "hooks.h"
 #include "focus.h"
 #include "stacking.h"
 #include "obt/prop.h"
@@ -73,7 +72,6 @@ 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);
@@ -85,11 +83,6 @@ void focus_set_client(ObClient *client)
     screen_install_colormap(focus_client, FALSE);
     screen_install_colormap(client, TRUE);
 
-    /* in the middle of cycling..? kill it. */
-    focus_cycle_stop(focus_client);
-    focus_cycle_stop(client);
-
-    old = focus_client;
     focus_client = client;
 
     if (client != NULL) {
@@ -104,9 +97,6 @@ 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,
@@ -202,8 +192,6 @@ void focus_nothing(void)
     /* nothing is focused, update the colormap and _the root property_ */
     focus_set_client(NULL);
 
-    event_cancel_all_key_grabs();
-
     /* when nothing will be focused, send focus to the backup target */
     XSetInputFocus(obt_display, screen_support_win, RevertToPointerRoot,
                    event_curtime);