X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=f9716c3028f91389151dcadced0a1bdaf01103e3;hb=c8983c42a7c27321d18825f2a130c15e29046f7b;hp=01b54b4c10a9325d602bf87767e4ab8f3c185368;hpb=939fbcfd31e07a6e0f1cdbfcef9b04f63e6af700;p=chaz%2Fopenbox

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 01b54b4c..f9716c30 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -2,7 +2,7 @@
 
    keyboard.c for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -32,6 +32,7 @@
 #include "keyboard.h"
 #include "translate.h"
 #include "moveresize.h"
+#include "gettext.h"
 
 #include <glib.h>
 
@@ -67,18 +68,12 @@ static void grab_for_window(Window win, gboolean grab)
     }
 }
 
-void keyboard_grab_for_client(ObClient *c, gboolean grab)
-{
-    grab_for_window(c->window, grab);
-}
-
 static void grab_keys(gboolean grab)
 {
     GList *it;
 
     grab_for_window(screen_support_win, grab);
-    for (it = client_list; it; it = g_list_next(it))
-        grab_for_window(((ObClient*)it->data)->window, grab);
+    grab_for_window(RootWindow(ob_display, ob_screen), grab);
 }
 
 static gboolean chain_timeout(gpointer data)
@@ -127,7 +122,7 @@ gboolean keyboard_bind(GList *keylist, ObAction *action)
         t = tree;
 
     if (conflict) {
-        g_warning("conflict with binding");
+        g_message(_("Conflict with key binding in config file"));
         tree_destroy(tree);
         return FALSE;
     }
@@ -164,10 +159,9 @@ gboolean keyboard_interactive_grab(guint state, ObClient *client,
     g_assert(action->data.any.interactive);
 
     if (!interactive_states) {
-        if (!grab_keyboard(TRUE))
-            return FALSE;
-        if (!grab_pointer(TRUE, OB_CURSOR_NONE)) {
-            grab_keyboard(FALSE);
+        grab_pointer(TRUE, FALSE, OB_CURSOR_POINTER);
+        if (!grab_keyboard(TRUE)) {
+            grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
             return FALSE;
         }
     }
@@ -195,7 +189,7 @@ void keyboard_interactive_end(ObInteractiveState *s,
 
     if (!interactive_states) {
         grab_keyboard(FALSE);
-        grab_pointer(FALSE, OB_CURSOR_NONE);
+        grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
         keyboard_reset_chains();
     }
 }
@@ -234,7 +228,9 @@ gboolean keyboard_process_interactive_grab(const XEvent *e, ObClient **client)
                 done = TRUE;
             else */if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
                 cancel = done = TRUE;
-        }
+        } else if (e->type == ButtonPress)
+            cancel = done = TRUE;
+
         if (done) {
             keyboard_interactive_end(s, e->xkey.state, cancel, e->xkey.time);