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 aafc7c0..daa3cf7 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -1,6 +1,5 @@
-/* (C)opyright MMIV-MMV 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>
@@ -58,13 +57,13 @@ main(int argc, char **argv) {
        Display *dpy;
        KeySym ksym;
        Pixmap pmap;
-       Window w;
+       Window root, w;
        XColor black, dummy;
        XEvent ev;
        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();
@@ -73,29 +72,35 @@ main(int argc, char **argv) {
                exit(EXIT_FAILURE);
        }
        screen = DefaultScreen(dpy);
+       root = RootWindow(dpy, screen);
 
        /* init */
        wa.override_redirect = 1;
        wa.background_pixel = BlackPixel(dpy, screen);
-       w = XCreateWindow(dpy, RootWindow(dpy, screen), 0, 0,
-                       DisplayWidth(dpy, screen), DisplayHeight(dpy, screen),
+       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);
-       running = XGrabPointer(dpy, RootWindow(dpy, screen), False,
-                       ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
-                       GrabModeAsync, GrabModeSync, None, invisible, CurrentTime) == GrabSuccess;
-       len = 10;
-       for(len = 10; len && (XGrabKeyboard(dpy, RootWindow(dpy, screen), True, GrabModeAsync,
-               GrabModeAsync, CurrentTime) != GrabSuccess); len--)
+       XMapRaised(dpy, w);
+       for(len = 1000; len; len--) {
+               if(XGrabPointer(dpy, root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
+                       GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess)
+                       break;
                usleep(1000);
-       running = running && (len > 0);
+       }
+       if((running = running && (len > 0))) {
+               for(len = 1000; len; len--) {
+                       if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+                               == GrabSuccess)
+                               break;
+                       usleep(1000);
+               }
+               running = (len > 0);
+       }
        len = 0;
-       XMapRaised(dpy, w);
        XSync(dpy, False);
 
        /* main event loop */
@@ -122,7 +127,7 @@ main(int argc, char **argv) {
                                        --len;
                                break;
                        default:
-                               if(num && !iscntrl((int) buf[0])) {
+                               if(num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) { 
                                        memcpy(passwd + len, buf, num);
                                        len += num;
                                }