applied Ryan Sorensen bugfix which allows slock to acquire the keyboard grab asynchro...

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index ba75493..daa3cf7 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -1,6 +1,5 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * See LICENSE file for license details. */
 #define _XOPEN_SOURCE 500
 #if HAVE_SHADOW_H
 #include <shadow.h>
@@ -64,7 +63,7 @@ main(int argc, char **argv) {
        XSetWindowAttributes wa;
 
        if((argc > 1) && !strncmp(argv[1], "-v", 3)) {
-               fputs("slock-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+               fputs("slock-"VERSION", © 2006-2007 Anselm R. Garbe\n", stdout);
                exit(EXIT_SUCCESS);
        }
        pws = get_password();
@@ -81,14 +80,14 @@ main(int argc, char **argv) {
        w = XCreateWindow(dpy, root, 0, 0, DisplayWidth(dpy, screen), DisplayHeight(dpy, screen),
                        0, DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixel, &wa);
-
        XAllocNamedColor(dpy, DefaultColormap(dpy, screen), "black", &black, &dummy);
        pmap = XCreateBitmapFromData(dpy, w, curs, 8, 8);
        invisible = XCreatePixmapCursor(dpy, pmap, pmap, &black, &black, 0, 0);
        XDefineCursor(dpy, w, invisible);
+       XMapRaised(dpy, w);
        for(len = 1000; len; len--) {
                if(XGrabPointer(dpy, root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
-                       GrabModeAsync, GrabModeSync, None, invisible, CurrentTime) == GrabSuccess)
+                       GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess)
                        break;
                usleep(1000);
        }
@@ -102,7 +101,6 @@ main(int argc, char **argv) {
                running = (len > 0);
        }
        len = 0;
-       XMapRaised(dpy, w);
        XSync(dpy, False);
 
        /* main event loop */