X-Git-Url: https://git.xinqibao.xyz/slock.git/blobdiff_plain/2d85c5baed4c4b4ecc19f7934fac1fc6a5b5c410..0ff0d9f7a7156a0e0b41d5b208ae5625e3a15dab:/slock.c?ds=sidebyside diff --git a/slock.c b/slock.c index c81f5dd..700acfb 100644 --- a/slock.c +++ b/slock.c @@ -31,8 +31,6 @@ enum { NUMCOLS }; -#include "config.h" - struct lock { int screen; Window root, win; @@ -46,6 +44,8 @@ struct xrandr { int errbase; }; +#include "config.h" + static void die(const char *errstr, ...) { @@ -76,10 +76,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 +100,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(pw->pw_name))) - die("slock: getspnam: cannot retrieve shadow entry (make sure to suid or sgid slock)\n"); + 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 = getpwuid_shadow(getuid()))) - die("slock: getpwnam_shadow: cannot retrieve shadow entry (make sure to suid or sgid slock)\n"); + 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,16 +128,17 @@ 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; while (running && !XNextEvent(dpy, &ev)) { if (ev.type == KeyPress) { @@ -155,7 +158,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, continue; 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)); @@ -163,7 +166,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; @@ -174,29 +177,39 @@ 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++) @@ -221,31 +234,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 */ @@ -268,9 +287,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; } @@ -303,13 +324,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__ @@ -360,8 +381,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); } }