Added tag 0.5 for changeset bd24ea7fcca2

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index 6541b70..97a80c5 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -1,7 +1,10 @@
-/* (C)opyright MMIV-MMV Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII 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>
+#endif
 
 #include <ctype.h>
 #include <pwd.h>
@@ -9,9 +12,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#if HAVE_SHADOW_H
-#include <shadow.h>
-#endif
 #include <sys/types.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
@@ -58,7 +58,7 @@ main(int argc, char **argv) {
        Display *dpy;
        KeySym ksym;
        Pixmap pmap;
-       Window w;
+       Window root, w;
        XColor black, dummy;
        XEvent ev;
        XSetWindowAttributes wa;
@@ -73,14 +73,12 @@ main(int argc, char **argv) {
                exit(EXIT_FAILURE);
        }
        screen = DefaultScreen(dpy);
+       root = RootWindow(dpy, screen);
 
        /* init */
-       len = 0;
-
        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);
 
@@ -88,22 +86,30 @@ main(int argc, char **argv) {
        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--)
-               usleep(1000);
-       running = running && (len > 0);
        XMapRaised(dpy, w);
+       for(len = 1000; len; len--) {
+               if(XGrabPointer(dpy, w, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
+                       GrabModeAsync, GrabModeSync, None, invisible, CurrentTime) == GrabSuccess)
+                       break;
+               usleep(1000);
+       }
+       if((running = running && (len > 0))) {
+               for(len = 1000; len; len--) {
+                       if(XGrabKeyboard(dpy, w, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+                               == GrabSuccess)
+                               break;
+                       usleep(1000);
+               }
+               running = (len > 0);
+       }
+       len = 0;
        XSync(dpy, False);
 
        /* main event loop */
        while(running && !XNextEvent(dpy, &ev))
                if(ev.type == KeyPress) {
                        buf[0] = 0;
-                       num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0);
+                       num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);
                        if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
                                        || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
                                        || IsPrivateKeypadKey(ksym))
@@ -120,11 +126,11 @@ main(int argc, char **argv) {
                                break;
                        case XK_BackSpace:
                                if(len)
-                                 --len;
+                                       --len;
                                break;
                        default:
-                               if(num && !iscntrl((int) buf[0])) {
-                                       memcpy(passwd + len,buf,num);
+                               if(num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) { 
+                                       memcpy(passwd + len, buf, num);
                                        len += num;
                                }
                                break;