X-Git-Url: https://git.xinqibao.xyz/slock.git/blobdiff_plain/8322f22871ee1da82546dfcdea484ef9db6d4942..20e294a66f4925b7db43e77ddcb0b885fedeca18:/slock.c diff --git a/slock.c b/slock.c index 97a80c5..866df90 100644 --- a/slock.c +++ b/slock.c @@ -1,6 +1,5 @@ -/* (C)opyright MMVI-MMVII Anselm R. Garbe - * See LICENSE file for license details. - */ +/* © 2006-2007 Anselm R. Garbe + * See LICENSE file for license details. */ #define _XOPEN_SOURCE 500 #if HAVE_SHADOW_H #include @@ -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,21 +80,20 @@ 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, w, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask, + if(XGrabPointer(dpy, root, 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) + if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess) break; usleep(1000);