X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=slock.c;h=847b3285f5a75af8cd62dfa30f90eeadc64b4a59;hb=b87bfa234378bcfc1b13273c5089f07902de1725;hp=a00fbb9a8f37bbca4d40b04ed40cba525d183781;hpb=a7afade1701a809f6a33b53525d59dd29b38d381;p=slock.git diff --git a/slock.c b/slock.c index a00fbb9..847b328 100644 --- a/slock.c +++ b/slock.c @@ -23,8 +23,11 @@ #include #endif +#include "arg.h" #include "util.h" +char *argv0; + enum { INIT, INPUT, @@ -54,7 +57,6 @@ die(const char *errstr, ...) { va_list ap; - fputs("slock: ", stderr); va_start(ap, errstr); vfprintf(stderr, errstr, ap); va_end(ap); @@ -155,7 +157,7 @@ readpw(Display *dpy, const char *pws) case XK_Return: passwd[len] = 0; #ifdef HAVE_BSD_AUTH - running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd); + running = !auth_userokay(getlogin(), NULL, "auth-slock", passwd); #else running = !!strcmp(crypt(passwd, pws), pws); #endif @@ -220,7 +222,6 @@ static Lock * lockscreen(Display *dpy, int screen) { char curs[] = {0, 0, 0, 0, 0, 0, 0, 0}; - unsigned int len; int i; Lock *lock; XColor color, dummy; @@ -247,41 +248,37 @@ lockscreen(Display *dpy, int screen) lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8); invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &color, &color, 0, 0); XDefineCursor(dpy, lock->win, invisible); - XMapRaised(dpy, lock->win); - if (rr) - XRRSelectInput(dpy, lock->win, RRScreenChangeNotifyMask); /* Try to grab mouse pointer *and* keyboard, else fail the lock */ - for (len = 1000; len; len--) { - if (XGrabPointer(dpy, lock->root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask, - GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess) - break; - usleep(1000); - } - if (!len) { + if (XGrabPointer(dpy, lock->root, False, ButtonPressMask | + ButtonReleaseMask | PointerMotionMask, GrabModeAsync, GrabModeAsync, + None, invisible, CurrentTime) != GrabSuccess) { fprintf(stderr, "slock: unable to grab mouse pointer for screen %d\n", screen); - } else { - for (len = 1000; len; len--) { - if (XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess) { - /* everything fine, we grabbed both inputs */ - XSelectInput(dpy, lock->root, SubstructureNotifyMask); - return lock; - } - usleep(1000); - } + running = 0; + unlockscreen(dpy, lock); + return NULL; + } + + if (XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync, + CurrentTime) != GrabSuccess) { fprintf(stderr, "slock: unable to grab keyboard for screen %d\n", screen); + running = 0; + unlockscreen(dpy, lock); + return NULL; } - /* grabbing one of the inputs failed */ - running = 0; - unlockscreen(dpy, lock); - return NULL; + + XMapRaised(dpy, lock->win); + if (rr) + XRRSelectInput(dpy, lock->win, RRScreenChangeNotifyMask); + + XSelectInput(dpy, lock->root, SubstructureNotifyMask); + return lock; } static void usage(void) { - fprintf(stderr, "usage: slock [-v|POST_LOCK_CMD]\n"); - exit(1); + die("usage: slock [-v | cmd [arg ...]]\n"); } int @@ -290,64 +287,86 @@ main(int argc, char **argv) { const char *pws; #endif Display *dpy; - int screen; + int s, nlocks; - if ((argc >= 2) && !strcmp("-v", argv[1])) - die("version %s, © 2006-2016 slock engineers\n", VERSION); - - /* treat first argument starting with a '-' as option */ - if ((argc >= 2) && argv[1][0] == '-') + ARGBEGIN { + case 'v': + fprintf(stderr, "slock-"VERSION"\n"); + return 0; + default: usage(); + } ARGEND #ifdef __linux__ dontkillme(); #endif - if (!getpwuid(getuid())) - die("no passwd entry for you\n"); + /* Check if the current user has a password entry */ + errno = 0; + if (!getpwuid(getuid())) { + if (errno == 0) + die("slock: no password entry for current user\n"); + else + die("slock: getpwuid: %s\n", strerror(errno)); + } #ifndef HAVE_BSD_AUTH pws = getpw(); #endif - if (!(dpy = XOpenDisplay(0))) - die("cannot open display\n"); + if (!(dpy = XOpenDisplay(NULL))) + die("slock: cannot open display\n"); + + /* check for Xrandr support */ rr = XRRQueryExtension(dpy, &rrevbase, &rrerrbase); - /* Get the number of screens in display "dpy" and blank them all. */ + + /* get number of screens in display "dpy" and blank them */ nscreens = ScreenCount(dpy); - if (!(locks = malloc(sizeof(Lock*) * nscreens))) - die("Out of memory.\n"); - int nlocks = 0; - for (screen = 0; screen < nscreens; screen++) { - if ((locks[screen] = lockscreen(dpy, screen)) != NULL) + if (!(locks = malloc(sizeof(Lock *) * nscreens))) { + XCloseDisplay(dpy); + die("slock: out of memory\n"); + } + for (nlocks = 0, s = 0; s < nscreens; s++) { + if ((locks[s] = lockscreen(dpy, s)) != NULL) nlocks++; } - XSync(dpy, False); + XSync(dpy, 0); - /* Did we actually manage to lock something? */ - if (nlocks == 0) { /* nothing to protect */ + /* did we actually manage to lock anything? */ + if (nlocks == 0) { + /* nothing to protect */ free(locks); XCloseDisplay(dpy); return 1; } - if (argc >= 2 && fork() == 0) { - if (dpy) - close(ConnectionNumber(dpy)); - execvp(argv[1], argv+1); - die("execvp %s failed: %s\n", argv[1], strerror(errno)); + /* run post-lock command */ + if (argc > 0) { + switch (fork()) { + case -1: + free(locks); + XCloseDisplay(dpy); + die("slock: fork failed: %s\n", strerror(errno)); + case 0: + if (close(ConnectionNumber(dpy)) < 0) + die("slock: close: %s\n", strerror(errno)); + execvp(argv[0], argv); + fprintf(stderr, "slock: execvp %s: %s\n", argv[0], + strerror(errno)); + _exit(1); + } } - /* Everything is now blank. Now wait for the correct password. */ + /* everything is now blank. Wait for the correct password */ #ifdef HAVE_BSD_AUTH readpw(dpy); #else readpw(dpy, pws); #endif - /* Password ok, unlock everything and quit. */ - for (screen = 0; screen < nscreens; screen++) - unlockscreen(dpy, locks[screen]); + /* password ok, unlock everything and quit */ + for (s = 0; s < nscreens; s++) + unlockscreen(dpy, locks[s]); free(locks); XCloseDisplay(dpy);