X-Git-Url: https://git.armaanb.net/?p=slock.git;a=blobdiff_plain;f=slock.c;h=2b06ca2a9c3b79c6ef7b9fe6fa2686edab91be7f;hp=f79917468021ca414a174a50e71372b4f59deda9;hb=HEAD;hpb=9a617db716641da8489e2062e04098220954bffe diff --git a/slock.c b/slock.c index f799174..2b06ca2 100644 --- a/slock.c +++ b/slock.c @@ -13,8 +13,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -24,6 +26,8 @@ char *argv0; +static time_t locktime; + enum { INIT, INPUT, @@ -31,8 +35,6 @@ enum { NUMCOLS }; -#include "config.h" - struct lock { int screen; Window root, win; @@ -46,6 +48,8 @@ struct xrandr { int errbase; }; +#include "config.h" + static void die(const char *errstr, ...) { @@ -76,10 +80,9 @@ dontkillme(void) if (fclose(f)) { if (errno == EACCES) die("slock: unable to disable OOM killer. " - "suid or sgid set?\n"); + "Make sure to suid or sgid slock.\n"); else - die("slock: fclose %s: %s\n", oomfile, - strerror(errno)); + die("slock: fclose %s: %s\n", oomfile, strerror(errno)); } } #endif @@ -101,20 +104,23 @@ gethash(void) hash = pw->pw_passwd; #if HAVE_SHADOW_H - if (hash[0] == 'x' && hash[1] == '\0') { + if (!strcmp(hash, "x")) { struct spwd *sp; - if (!(sp = getspnam(getenv("USER")))) - die("slock: getspnam: cannot retrieve shadow entry (make sure to suid or sgid slock)\n"); + if (!(sp = getspnam(pw->pw_name))) + die("slock: getspnam: cannot retrieve shadow entry. " + "Make sure to suid or sgid slock.\n"); hash = sp->sp_pwdp; } #else - if (hash[0] == '*' && hash[1] == '\0') { + if (!strcmp(hash, "*")) { #ifdef __OpenBSD__ - if (!(pw = getpwnam_shadow(getenv("USER")))) - die("slock: getpwnam_shadow: cannot retrieve shadow entry (make sure to suid or sgid slock)\n"); + if (!(pw = getpwuid_shadow(getuid()))) + die("slock: getpwnam_shadow: cannot retrieve shadow entry. " + "Make sure to suid or sgid slock.\n"); hash = pw->pw_passwd; #else - die("slock: getpwuid: cannot retrieve shadow entry (make sure to suid or sgid slock)\n"); + die("slock: getpwuid: cannot retrieve shadow entry. " + "Make sure to suid or sgid slock.\n"); #endif /* __OpenBSD__ */ } #endif /* HAVE_SHADOW_H */ @@ -126,22 +132,20 @@ static void readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, const char *hash) { + XRRScreenChangeNotifyEvent *rre; char buf[32], passwd[256], *inputhash; - int num, screen, running, failure; + int num, screen, running, failure, oldc; unsigned int len, color; KeySym ksym; XEvent ev; - static int oldc = INIT; len = 0; running = 1; failure = 0; + oldc = INIT; - /* As "slock" stands for "Simple X display locker", the DPMS settings - * 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)) { + running = !((time(NULL) - locktime < timetocancel) && (ev.type == MotionNotify)); if (ev.type == KeyPress) { explicit_bzero(&buf, sizeof(buf)); num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0); @@ -157,9 +161,25 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, IsPFKey(ksym) || IsPrivateKeypadKey(ksym)) continue; + if (ev.xkey.state & ControlMask) { + switch (ksym) { + case XK_u: + ksym = XK_Escape; + break; + case XK_m: + ksym = XK_Return; + break; + case XK_j: + ksym = XK_Return; + break; + case XK_h: + ksym = XK_BackSpace; + break; + } + } switch (ksym) { case XK_Return: - passwd[len] = 0; + passwd[len] = '\0'; errno = 0; if (!(inputhash = crypt(passwd, hash))) fprintf(stderr, "slock: crypt: %s\n", strerror(errno)); @@ -167,7 +187,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, running = !!strcmp(inputhash, hash); if (running) { XBell(dpy, 100); - failure = True; + failure = 1; } explicit_bzero(&passwd, sizeof(passwd)); len = 0; @@ -178,33 +198,45 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, break; case XK_BackSpace: if (len) - passwd[len--] = 0; + passwd[--len] = '\0'; 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; } - color = len ? INPUT : (failure || failonclear ? FAILED : INIT); + color = len ? INPUT : ((failure || failonclear) ? FAILED : INIT); if (running && oldc != color) { for (screen = 0; screen < nscreens; screen++) { - XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[color]); + XSetWindowBackground(dpy, + locks[screen]->win, + locks[screen]->colors[color]); XClearWindow(dpy, locks[screen]->win); } oldc = color; } } else if (rr->active && ev.type == rr->evbase + RRScreenChangeNotify) { - XRRScreenChangeNotifyEvent *rre = (XRRScreenChangeNotifyEvent*)&ev; + rre = (XRRScreenChangeNotifyEvent*)&ev; for (screen = 0; screen < nscreens; screen++) { if (locks[screen]->win == rre->window) { - XResizeWindow(dpy, locks[screen]->win, rre->width, rre->height); + if (rre->rotation == RR_Rotate_90 || + rre->rotation == RR_Rotate_270) + XResizeWindow(dpy, locks[screen]->win, + rre->height, rre->width); + else + XResizeWindow(dpy, locks[screen]->win, + rre->width, rre->height); XClearWindow(dpy, locks[screen]->win); + break; } } - } else for (screen = 0; screen < nscreens; screen++) - XRaiseWindow(dpy, locks[screen]->win); + } else { + for (screen = 0; screen < nscreens; screen++) + XRaiseWindow(dpy, locks[screen]->win); + } } } @@ -225,31 +257,37 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen) lock->root = RootWindow(dpy, lock->screen); for (i = 0; i < NUMCOLS; i++) { - XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), colorname[i], &color, &dummy); + XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), + colorname[i], &color, &dummy); lock->colors[i] = color.pixel; } /* init */ wa.override_redirect = 1; 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); + 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); lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8); - invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &color, &color, 0, 0); + invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, + &color, &color, 0, 0); XDefineCursor(dpy, lock->win, invisible); /* Try to grab mouse pointer *and* keyboard for 600ms, else fail the lock */ for (i = 0, ptgrab = kbgrab = -1; i < 6; i++) { if (ptgrab != GrabSuccess) { ptgrab = XGrabPointer(dpy, lock->root, False, - ButtonPressMask | ButtonReleaseMask | - PointerMotionMask, GrabModeAsync, - GrabModeAsync, None, invisible, CurrentTime); + ButtonPressMask | ButtonReleaseMask | + PointerMotionMask, GrabModeAsync, + GrabModeAsync, None, invisible, CurrentTime); } if (kbgrab != GrabSuccess) { kbgrab = XGrabKeyboard(dpy, lock->root, True, - GrabModeAsync, GrabModeAsync, CurrentTime); + GrabModeAsync, GrabModeAsync, CurrentTime); } /* input is grabbed: we can lock the screen */ @@ -259,6 +297,7 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen) XRRSelectInput(dpy, lock->win, RRScreenChangeNotifyMask); XSelectInput(dpy, lock->root, SubstructureNotifyMask); + locktime = time(NULL); return lock; } @@ -272,9 +311,11 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen) /* we couldn't grab all input: fail out */ if (ptgrab != GrabSuccess) - fprintf(stderr, "slock: unable to grab mouse pointer for screen %d\n", screen); + fprintf(stderr, "slock: unable to grab mouse pointer for screen %d\n", + screen); if (kbgrab != GrabSuccess) - fprintf(stderr, "slock: unable to grab keyboard for screen %d\n", screen); + fprintf(stderr, "slock: unable to grab keyboard for screen %d\n", + screen); return NULL; } @@ -295,6 +336,7 @@ main(int argc, char **argv) { const char *hash; Display *dpy; int s, nlocks, nscreens; + CARD16 standby, suspend, off; ARGBEGIN { case 'v': @@ -307,13 +349,13 @@ main(int argc, char **argv) { /* validate drop-user and -group */ errno = 0; if (!(pwd = getpwnam(user))) - die("slock: getpwnam %s: %s\n", user, errno ? - strerror(errno) : "user entry not found"); + die("slock: getpwnam %s: %s\n", user, + errno ? strerror(errno) : "user entry not found"); duid = pwd->pw_uid; errno = 0; if (!(grp = getgrnam(group))) - die("slock: getgrnam %s: %s\n", group, errno ? - strerror(errno) : "group entry not found"); + die("slock: getgrnam %s: %s\n", group, + errno ? strerror(errno) : "group entry not found"); dgid = grp->gr_gid; #ifdef __linux__ @@ -321,8 +363,9 @@ main(int argc, char **argv) { #endif hash = gethash(); - if (strlen(hash) < 2) - die("slock: failed to get user password hash.\n"); + errno = 0; + if (!crypt("", hash)) + die("slock: crypt: %s\n", strerror(errno)); if (!(dpy = XOpenDisplay(NULL))) die("slock: cannot open display\n"); @@ -354,6 +397,20 @@ main(int argc, char **argv) { if (nlocks != nscreens) return 1; + /* DPMS magic to disable the monitor */ + if (!DPMSCapable(dpy)) + die("slock: DPMSCapable failed\n"); + if (!DPMSEnable(dpy)) + die("slock: DPMSEnable failed\n"); + if (!DPMSGetTimeouts(dpy, &standby, &suspend, &off)) + die("slock: DPMSGetTimeouts failed\n"); + if (!standby || !suspend || !off) + die("slock: at least one DPMS variable is zero\n"); + if (!DPMSSetTimeouts(dpy, monitortime, monitortime, monitortime)) + die("slock: DPMSSetTimeouts failed\n"); + + XSync(dpy, 0); + /* run post-lock command */ if (argc > 0) { switch (fork()) { @@ -363,8 +420,7 @@ main(int argc, char **argv) { 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)); + fprintf(stderr, "slock: execvp %s: %s\n", argv[0], strerror(errno)); _exit(1); } } @@ -372,5 +428,9 @@ main(int argc, char **argv) { /* everything is now blank. Wait for the correct password */ readpw(dpy, &rr, locks, nscreens, hash); + /* reset DPMS values to inital ones */ + DPMSSetTimeouts(dpy, standby, suspend, off); + XSync(dpy, 0); + return 0; }