X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=36a0d124452ac5efe94a7b827d0dd8eb5207a3ae;hb=091e296a3dd1020cdd4af2acbd35735778f05788;hp=91f7915cbe7b5661575918fbdedf308336482197;hpb=740c5b2a20d5110435d0874f8cc6a4c9dfd14777;p=chaz%2Fopenbox

diff --git a/openbox/grab.c b/openbox/grab.c
index 91f7915c..36a0d124 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    grab.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -53,14 +54,14 @@ gboolean grab_keyboard(gboolean grab)
         if (kgrabs++ == 0) {
             ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen),
                                 FALSE, GrabModeAsync, GrabModeAsync,
-                                event_lasttime) == Success;
+                                event_curtime) == Success;
             if (!ret)
                 --kgrabs;
         } else
             ret = TRUE;
     } else if (kgrabs > 0) {
         if (--kgrabs == 0)
-            XUngrabKeyboard(ob_display, event_lasttime);
+            XUngrabKeyboard(ob_display, event_curtime);
         ret = TRUE;
     }
 
@@ -75,15 +76,15 @@ gboolean grab_pointer(gboolean grab, ObCursor cur)
         if (pgrabs++ == 0) {
             ret = XGrabPointer(ob_display, screen_support_win,
                                False, GRAB_PTR_MASK, GrabModeAsync,
-                               GrabModeAsync, FALSE,
-                               ob_cursor(cur), event_lasttime) == Success;
+                               GrabModeAsync, None,
+                               ob_cursor(cur), event_curtime) == Success;
             if (!ret)
                 --pgrabs;
         } else
             ret = TRUE;
     } else if (pgrabs > 0) {
         if (--pgrabs == 0) {
-            XUngrabPointer(ob_display, event_lasttime);
+            XUngrabPointer(ob_display, event_curtime);
         }
         ret = TRUE;
     }
@@ -97,16 +98,16 @@ gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
     if (grab) {
         if (pgrabs++ == 0) {
             ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
-                               GrabModeAsync, GrabModeAsync, TRUE,
+                               GrabModeAsync, GrabModeAsync, None,
                                ob_cursor(cur),
-                               event_lasttime) == Success;
+                               event_curtime) == Success;
             if (!ret)
                 --pgrabs;
         } else
             ret = TRUE;
     } else if (pgrabs > 0) {
         if (--pgrabs == 0) {
-            XUngrabPointer(ob_display, event_lasttime);
+            XUngrabPointer(ob_display, event_curtime);
         }
         ret = TRUE;
     }