X-Git-Url: https://git.armaanb.net/?p=slock.git;a=blobdiff_plain;f=slock.c;h=68e813f4e86041ed7be45492771adcdfcb7d9187;hp=320ed2b4e3a40272fc37d0ce200d51b11e51ae55;hb=10d4e479c5f6d91bf86e15be3a12c6b09c9808be;hpb=4b4fcca1bc3a05e0a4bb5453dfe6dbd84a54b071 diff --git a/slock.c b/slock.c index 320ed2b..68e813f 100644 --- a/slock.c +++ b/slock.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -22,53 +23,89 @@ #include #endif +enum { + INIT, + INPUT, + FAILED, + NUMCOLS +}; + +#include "config.h" + typedef struct { int screen; Window root, win; Pixmap pmap; - unsigned long colors[2]; + unsigned long colors[NUMCOLS]; } Lock; static Lock **locks; static int nscreens; static Bool running = True; +static Bool failure = False; +static Bool rr; +static int rrevbase; +static int rrerrbase; static void -die(const char *errstr, ...) { +die(const char *errstr, ...) +{ va_list ap; va_start(ap, errstr); vfprintf(stderr, errstr, ap); va_end(ap); - exit(EXIT_FAILURE); + exit(1); } +#ifdef __linux__ +#include + +static void +dontkillme(void) +{ + int fd; + + fd = open("/proc/self/oom_score_adj", O_WRONLY); + if (fd < 0 && errno == ENOENT) + return; + if (fd < 0 || write(fd, "-1000\n", 6) != 6 || close(fd) != 0) + die("cannot disable the out-of-memory killer for this process\n"); +} +#endif + #ifndef HAVE_BSD_AUTH +/* only run as root */ static const char * -getpw(void) { /* only run as root */ +getpw(void) +{ const char *rval; struct passwd *pw; + errno = 0; pw = getpwuid(getuid()); - if(!pw) - die("slock: cannot retrieve password entry (make sure to suid or sgid slock)"); - endpwent(); + if (!pw) { + if (errno) + die("slock: getpwuid: %s\n", strerror(errno)); + else + die("slock: cannot retrieve password entry\n"); + } rval = pw->pw_passwd; #if HAVE_SHADOW_H - if (strlen(rval) >= 1) { /* kludge, assumes pw placeholder entry has len >= 1 */ + if (rval[0] == 'x' && rval[1] == '\0') { struct spwd *sp; sp = getspnam(getenv("USER")); - if(!sp) + if (!sp) die("slock: cannot retrieve shadow entry (make sure to suid or sgid slock)\n"); - endspent(); rval = sp->sp_pwdp; } #endif /* drop privileges */ - if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0) - die("slock: cannot drop privileges"); + if (geteuid() == 0 && + ((getegid() != pw->pw_gid && setgid(pw->pw_gid) < 0) || setuid(pw->pw_uid) < 0)) + die("slock: cannot drop privileges\n"); return rval; } #endif @@ -93,71 +130,83 @@ readpw(Display *dpy, const char *pws) * had been removed and you can set it with "xset" or some other * utility. This way the user can easily set a customized DPMS * timeout. */ - while(running && !XNextEvent(dpy, &ev)) { - if(ev.type == KeyPress) { + while (running && !XNextEvent(dpy, &ev)) { + if (ev.type == KeyPress) { buf[0] = 0; - num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0); - if(IsKeypadKey(ksym)) { - if(ksym == XK_KP_Enter) + num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0); + if (IsKeypadKey(ksym)) { + if (ksym == XK_KP_Enter) ksym = XK_Return; - else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) + else if (ksym >= XK_KP_0 && ksym <= XK_KP_9) ksym = (ksym - XK_KP_0) + XK_0; } - if(IsFunctionKey(ksym) || IsKeypadKey(ksym) - || IsMiscFunctionKey(ksym) || IsPFKey(ksym) - || IsPrivateKeypadKey(ksym)) + if (IsFunctionKey(ksym) || + IsKeypadKey(ksym) || + IsMiscFunctionKey(ksym) || + IsPFKey(ksym) || + IsPrivateKeypadKey(ksym)) continue; - switch(ksym) { + switch (ksym) { case XK_Return: passwd[len] = 0; #ifdef HAVE_BSD_AUTH running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd); #else - running = strcmp(crypt(passwd, pws), pws); + running = !!strcmp(crypt(passwd, pws), pws); #endif - if(running != False) + if (running) { XBell(dpy, 100); + failure = True; + } len = 0; break; case XK_Escape: len = 0; break; case XK_BackSpace: - if(len) + if (len) --len; break; default: - if(num && !iscntrl((int) buf[0]) && (len + num < sizeof passwd)) { + if (num && !iscntrl((int) buf[0]) && (len + num < sizeof(passwd))) { memcpy(passwd + len, buf, num); len += num; } break; } - if(llen == 0 && len != 0) { - for(screen = 0; screen < nscreens; screen++) { - XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[1]); + if (llen == 0 && len != 0) { + for (screen = 0; screen < nscreens; screen++) { + XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[INPUT]); XClearWindow(dpy, locks[screen]->win); } - } else if(llen != 0 && len == 0) { - for(screen = 0; screen < nscreens; screen++) { - XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[0]); + } else if (llen != 0 && len == 0) { + for (screen = 0; screen < nscreens; screen++) { + XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[failure || failonclear ? FAILED : INIT]); XClearWindow(dpy, locks[screen]->win); } } llen = len; - } - else for(screen = 0; screen < nscreens; screen++) + } else if (rr && ev.type == rrevbase + RRScreenChangeNotify) { + XRRScreenChangeNotifyEvent *rre = (XRRScreenChangeNotifyEvent*)&ev; + for (screen = 0; screen < nscreens; screen++) { + if (locks[screen]->win == rre->window) { + XResizeWindow(dpy, locks[screen]->win, rre->width, rre->height); + XClearWindow(dpy, locks[screen]->win); + } + } + } else for (screen = 0; screen < nscreens; screen++) XRaiseWindow(dpy, locks[screen]->win); } } static void -unlockscreen(Display *dpy, Lock *lock) { +unlockscreen(Display *dpy, Lock *lock) +{ if(dpy == NULL || lock == NULL) return; XUngrabPointer(dpy, CurrentTime); - XFreeColors(dpy, DefaultColormap(dpy, lock->screen), lock->colors, 2, 0); + XFreeColors(dpy, DefaultColormap(dpy, lock->screen), lock->colors, NUMCOLS, 0); XFreePixmap(dpy, lock->pmap); XDestroyWindow(dpy, lock->win); @@ -165,69 +214,75 @@ unlockscreen(Display *dpy, Lock *lock) { } static Lock * -lockscreen(Display *dpy, int screen) { +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; XSetWindowAttributes wa; Cursor invisible; - if(dpy == NULL || screen < 0) + if (dpy == NULL || screen < 0) return NULL; lock = malloc(sizeof(Lock)); - if(lock == NULL) + if (lock == NULL) return NULL; lock->screen = screen; lock->root = RootWindow(dpy, lock->screen); + for (i = 0; i < NUMCOLS; i++) { + XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), colorname[i], &color, &dummy); + lock->colors[i] = color.pixel; + } + /* init */ wa.override_redirect = 1; - wa.background_pixel = BlackPixel(dpy, lock->screen); + wa.background_pixel = lock->colors[INIT]; lock->win = XCreateWindow(dpy, lock->root, 0, 0, DisplayWidth(dpy, lock->screen), DisplayHeight(dpy, lock->screen), - 0, DefaultDepth(dpy, lock->screen), CopyFromParent, - DefaultVisual(dpy, lock->screen), CWOverrideRedirect | CWBackPixel, &wa); - XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR2, &color, &dummy); - lock->colors[1] = color.pixel; - XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR1, &color, &dummy); - lock->colors[0] = color.pixel; + 0, DefaultDepth(dpy, lock->screen), CopyFromParent, + DefaultVisual(dpy, lock->screen), CWOverrideRedirect | CWBackPixel, &wa); 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); - for(len = 1000; len; len--) { - if(XGrabPointer(dpy, lock->root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask, - GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess) + if (rr) + XRRSelectInput(dpy, lock->win, RRScreenChangeNotifyMask); + for (len = 1000; len; len--) { + if (XGrabPointer(dpy, lock->root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask, + GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess) break; usleep(1000); } - if(running && (len > 0)) { - for(len = 1000; len; len--) { - if(XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync, CurrentTime) - == GrabSuccess) + if (running && (len > 0)) { + for (len = 1000; len; len--) { + if (XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess) break; usleep(1000); } - running = (len > 0); } - if(!running) { + running &= (len > 0); + if (!running) { unlockscreen(dpy, lock); lock = NULL; } - else + else { XSelectInput(dpy, lock->root, SubstructureNotifyMask); + } return lock; } static void -usage(void) { +usage(void) +{ fprintf(stderr, "usage: slock [-v]\n"); - exit(EXIT_FAILURE); + exit(1); } int @@ -238,29 +293,44 @@ main(int argc, char **argv) { Display *dpy; int screen; - if((argc == 2) && !strcmp("-v", argv[1])) - die("slock-%s, © 2006-2012 Anselm R Garbe\n", VERSION); - else if(argc != 1) + if ((argc == 2) && !strcmp("-v", argv[1])) + die("slock-%s, © 2006-2015 slock engineers\n", VERSION); + else if (argc != 1) usage(); - if(!getpwuid(getuid())) - die("slock: no passwd entry for you"); +#ifdef __linux__ + dontkillme(); +#endif + + if (!getpwuid(getuid())) + die("slock: no passwd entry for you\n"); #ifndef HAVE_BSD_AUTH pws = getpw(); #endif - if(!(dpy = XOpenDisplay(0))) - die("slock: cannot open display"); + if (!(dpy = XOpenDisplay(0))) + die("slock: cannot open display\n"); + rr = XRRQueryExtension(dpy, &rrevbase, &rrerrbase); /* Get the number of screens in display "dpy" and blank them all. */ nscreens = ScreenCount(dpy); locks = malloc(sizeof(Lock *) * nscreens); - if(locks == NULL) - die("slock: malloc: %s", strerror(errno)); - for(screen = 0; screen < nscreens; screen++) - locks[screen] = lockscreen(dpy, screen); + if (locks == NULL) + die("slock: malloc: %s\n", strerror(errno)); + int nlocks = 0; + for (screen = 0; screen < nscreens; screen++) { + if ( (locks[screen] = lockscreen(dpy, screen)) != NULL) + nlocks++; + } XSync(dpy, False); + /* Did we actually manage to lock something? */ + if (nlocks == 0) { /* nothing to protect */ + free(locks); + XCloseDisplay(dpy); + return 1; + } + /* Everything is now blank. Now wait for the correct password. */ #ifdef HAVE_BSD_AUTH readpw(dpy); @@ -269,7 +339,7 @@ main(int argc, char **argv) { #endif /* Password ok, unlock everything and quit. */ - for(screen = 0; screen < nscreens; screen++) + for (screen = 0; screen < nscreens; screen++) unlockscreen(dpy, locks[screen]); free(locks);