make ob_state a function so it cant be changed outside of openbox.c

[chaz/openbox] / plugins / keyboard / keyboard.c

diff --git a/plugins/keyboard/keyboard.c b/plugins/keyboard/keyboard.c
index f89620dbe6424132fdc93cd7fb61ae08ab87bbef..caee0dc119a1a50f6d1f83938208a125750df66e 100644 (file)
--- a/plugins/keyboard/keyboard.c
+++ b/plugins/keyboard/keyboard.c
@@ -1,9 +1,11 @@
 #include "kernel/focus.h"
+#include "kernel/screen.h"
 #include "kernel/frame.h"
 #include "kernel/dispatch.h"
 #include "kernel/openbox.h"
 #include "kernel/event.h"
 #include "kernel/grab.h"
+#include "kernel/client.h"
 #include "kernel/action.h"
 #include "kernel/prop.h"
 #include "kernel/timer.h"
@@ -79,7 +81,7 @@ KeyBindingTree *firstnode = NULL;
 
 static KeyBindingTree *curpos;
 static guint reset_key, reset_state;
-static Timer *chain_timer;
+static ObTimer *chain_timer;
 
 static void grab_for_window(Window win, gboolean grab)
 {
@@ -102,7 +104,7 @@ static void grab_keys(gboolean grab)
 {
     GList *it;
 
-    grab_for_window(focus_backup, grab);
+    grab_for_window(screen_support_win, grab);
     for (it = client_list; it; it = g_list_next(it))
         grab_for_window(((ObClient*)it->data)->frame->window, grab);
 }