Browse Source

Exit as soon as possible on input grabbing error

We want to know at once if slock failed or not to lock the screen, not
seing a black screen for a whole second (or two) and then die.
Thanks to ^7heo for reporting this.
master
Quentin Rameau 8 years ago committed by Markus Teich
parent
commit
c2f975773d
  1. 38
      slock.c

38
slock.c

@ -222,7 +222,6 @@ static Lock *
lockscreen(Display *dpy, int screen) lockscreen(Display *dpy, int screen)
{ {
char curs[] = {0, 0, 0, 0, 0, 0, 0, 0}; char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
unsigned int len;
int i; int i;
Lock *lock; Lock *lock;
XColor color, dummy; XColor color, dummy;
@ -249,36 +248,33 @@ lockscreen(Display *dpy, int screen)
lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8); 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); 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 */ /* Try to grab mouse pointer *and* keyboard, else fail the lock */
for (len = 1000; len; len--) { if (XGrabPointer(dpy, lock->root, False, ButtonPressMask |
if (XGrabPointer(dpy, lock->root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask, ButtonReleaseMask | PointerMotionMask, GrabModeAsync, GrabModeAsync,
GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess) None, invisible, CurrentTime) != GrabSuccess) {
break;
usleep(1000);
}
if (!len) {
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);
} else { running = 0;
for (len = 1000; len; len--) { unlockscreen(dpy, lock);
if (XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess) { return NULL;
/* everything fine, we grabbed both inputs */
XSelectInput(dpy, lock->root, SubstructureNotifyMask);
return lock;
}
usleep(1000);
} }
if (XGrabKeyboard(dpy, lock->root, True, GrabModeAsync, GrabModeAsync,
CurrentTime) != 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);
}
/* grabbing one of the inputs failed */
running = 0; running = 0;
unlockscreen(dpy, lock); unlockscreen(dpy, lock);
return NULL; return NULL;
} }
XMapRaised(dpy, lock->win);
if (rr)
XRRSelectInput(dpy, lock->win, RRScreenChangeNotifyMask);
XSelectInput(dpy, lock->root, SubstructureNotifyMask);
return lock;
}
static void static void
usage(void) usage(void)
{ {

Loading…
Cancel
Save