X-Git-Url: https://git.xinqibao.xyz/slock.git/blobdiff_plain/f5ef1b8eb5555da11e81d92d8d05acd4aba1ef40..a6dc051e3744ce5b14c54d2d246d3e8258207e76:/slock.c?ds=sidebyside
diff --git a/slock.c b/slock.c
index 6502c86..4531f95 100644
--- a/slock.c
+++ b/slock.c
@@ -26,7 +26,7 @@
enum {
INIT,
INPUT,
- EMPTY,
+ FAILED,
NUMCOLS
};
@@ -42,6 +42,7 @@ typedef struct {
static Lock **locks;
static int nscreens;
static Bool running = True;
+static Bool failure = False;
static Bool rr;
static int rrevbase;
static int rrerrbase;
@@ -66,10 +67,13 @@ dontkillme(void)
int fd;
fd = open("/proc/self/oom_score_adj", O_WRONLY);
- if (fd < 0 && errno == ENOENT)
+ 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");
+ }
+ if (fd < 0 || write(fd, "-1000\n", (sizeof("-1000\n") - 1)) !=
+ (sizeof("-1000\n") - 1) || close(fd) != 0) {
+ die("can't tame the oom-killer. is suid or sgid set?\n");
+ }
}
#endif
@@ -82,20 +86,18 @@ getpw(void)
struct passwd *pw;
errno = 0;
- pw = getpwuid(getuid());
- if (!pw) {
+ if (!(pw = getpwuid(getuid()))) {
if (errno)
die("slock: getpwuid: %s\n", strerror(errno));
else
die("slock: cannot retrieve password entry\n");
}
- rval = pw->pw_passwd;
+ rval = pw->pw_passwd;
#if HAVE_SHADOW_H
if (rval[0] == 'x' && rval[1] == '\0') {
struct spwd *sp;
- sp = getspnam(getenv("USER"));
- if (!sp)
+ if (!(sp = getspnam(getenv("USER"))))
die("slock: cannot retrieve shadow entry (make sure to suid or sgid slock)\n");
rval = sp->sp_pwdp;
}
@@ -118,11 +120,12 @@ readpw(Display *dpy, const char *pws)
{
char buf[32], passwd[256];
int num, screen;
- unsigned int len, llen;
+ unsigned int len, color;
KeySym ksym;
XEvent ev;
+ static int oldc = INIT;
- len = llen = 0;
+ len = 0;
running = True;
/* As "slock" stands for "Simple X display locker", the DPMS settings
@@ -132,7 +135,7 @@ readpw(Display *dpy, const char *pws)
while (running && !XNextEvent(dpy, &ev)) {
if (ev.type == KeyPress) {
buf[0] = 0;
- num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);
+ num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0);
if (IsKeypadKey(ksym)) {
if (ksym == XK_KP_Enter)
ksym = XK_Return;
@@ -153,8 +156,10 @@ readpw(Display *dpy, const char *pws)
#else
running = !!strcmp(crypt(passwd, pws), pws);
#endif
- if (running)
+ if (running) {
XBell(dpy, 100);
+ failure = True;
+ }
len = 0;
break;
case XK_Escape:
@@ -165,24 +170,20 @@ readpw(Display *dpy, const char *pws)
--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) {
+ 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[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[EMPTY]);
+ XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[color]);
XClearWindow(dpy, locks[screen]->win);
}
+ oldc = color;
}
- llen = len;
} else if (rr && ev.type == rrevbase + RRScreenChangeNotify) {
XRRScreenChangeNotifyEvent *rre = (XRRScreenChangeNotifyEvent*)&ev;
for (screen = 0; screen < nscreens; screen++) {
@@ -221,15 +222,10 @@ lockscreen(Display *dpy, int screen)
XSetWindowAttributes wa;
Cursor invisible;
- if (dpy == NULL || screen < 0)
- return NULL;
-
- lock = malloc(sizeof(Lock));
- if (lock == NULL)
+ if (!running || dpy == NULL || screen < 0 || !(lock = malloc(sizeof(Lock))))
return NULL;
lock->screen = screen;
-
lock->root = RootWindow(dpy, lock->screen);
for (i = 0; i < NUMCOLS; i++) {
@@ -249,52 +245,42 @@ lockscreen(Display *dpy, int screen)
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 (running && (len > 0)) {
+ if (!len) {
+ 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)
- break;
+ 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);
}
+ fprintf(stderr, "slock: unable to grab keyboard for screen %d\n", screen);
}
-
- running &= (len > 0);
- if (!running) {
- unlockscreen(dpy, lock);
- lock = NULL;
- }
- else {
- XSelectInput(dpy, lock->root, SubstructureNotifyMask);
- }
-
- return lock;
-}
-
-static void
-usage(void)
-{
- fprintf(stderr, "usage: slock [-v]\n");
- exit(1);
+ /* grabbing one of the inputs failed */
+ running = 0;
+ unlockscreen(dpy, lock);
+ return NULL;
}
int
-main(int argc, char **argv) {
+main(int argc, char **argv)
+{
#ifndef HAVE_BSD_AUTH
const char *pws;
#endif
Display *dpy;
int screen;
- if ((argc == 2) && !strcmp("-v", argv[1]))
- die("slock-%s, © 2006-2015 slock engineers\n", VERSION);
- else if (argc != 1)
- usage();
-
#ifdef __linux__
dontkillme();
#endif
@@ -311,12 +297,11 @@ main(int argc, char **argv) {
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)
+ if (!(locks = malloc(sizeof(Lock*) * nscreens)))
die("slock: malloc: %s\n", strerror(errno));
int nlocks = 0;
for (screen = 0; screen < nscreens; screen++) {
- if ( (locks[screen] = lockscreen(dpy, screen)) != NULL)
+ if ((locks[screen] = lockscreen(dpy, screen)) != NULL)
nlocks++;
}
XSync(dpy, False);
@@ -328,6 +313,13 @@ main(int argc, char **argv) {
return 1;
}
+ if (argc >= 2 && fork() == 0) {
+ if (dpy)
+ close(ConnectionNumber(dpy));
+ execvp(argv[1], argv+1);
+ die("slock: execvp %s failed: %s\n", argv[1], strerror(errno));
+ }
+
/* Everything is now blank. Now wait for the correct password. */
#ifdef HAVE_BSD_AUTH
readpw(dpy);