aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.mk2
-rw-r--r--slock.c9
2 files changed, 7 insertions, 4 deletions
diff --git a/config.mk b/config.mk
index fd98ccb..0ece512 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
# slock version
-VERSION = 0.1
+VERSION = 0.2
# Customize below to fit your system
diff --git a/slock.c b/slock.c
index 0f4c3cc..72afd1e 100644
--- a/slock.c
+++ b/slock.c
@@ -63,9 +63,6 @@ main(int argc, char **argv) {
/* init */
passwd[0] = 0;
- while(XGrabKeyboard(dpy, RootWindow(dpy, screen), True, GrabModeAsync,
- GrabModeAsync, CurrentTime) != GrabSuccess)
- usleep(1000);
wa.override_redirect = 1;
wa.background_pixel = BlackPixel(dpy, screen);
@@ -78,6 +75,11 @@ main(int argc, char **argv) {
pmap = XCreateBitmapFromData(dpy, w, curs, 8, 8);
invisible = XCreatePixmapCursor(dpy, pmap, pmap, &black, &black, 0, 0);
XDefineCursor(dpy, w, invisible);
+ running = XGrabPointer(dpy, RootWindow(dpy, screen), False,
+ ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
+ GrabModeAsync, GrabModeSync, None, invisible, CurrentTime) == GrabSuccess
+ && XGrabKeyboard(dpy, RootWindow(dpy, screen), True, GrabModeAsync,
+ GrabModeAsync, CurrentTime) == GrabSuccess;
XMapRaised(dpy, w);
XSync(dpy, False);
@@ -119,6 +121,7 @@ main(int argc, char **argv) {
break;
}
}
+ XUngrabPointer(dpy, CurrentTime);
XFreePixmap(dpy, pmap);
XDestroyWindow(dpy, w);
XCloseDisplay(dpy);