X-Git-Url: https://git.xinqibao.xyz/slock.git/blobdiff_plain/597d0f27f53cf152edd1c230def4fd7983ac5919..10ccc43597910428a22129cd942881835d95b5c0:/slock.c

diff --git a/slock.c b/slock.c
index 12c991f..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);
 
@@ -91,17 +93,6 @@ main(int argc, char **argv) {
 					|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
 					|| IsPrivateKeypadKey(ksym))
 				continue;
-			/* first check if a control mask is omitted */
-			if(ev.xkey.state & ControlMask) {
-				switch (ksym) {
-				case XK_h:
-				case XK_H: ksym = XK_BackSpace;
-					break;
-				case XK_u:
-				case XK_U: passwd[0] = 0;
-					continue;
-				}
-			}
 			switch(ksym) {
 			case XK_Return:
 #if HAVE_SHADOW_H
@@ -130,6 +121,7 @@ main(int argc, char **argv) {
 				break;
 			}
 		}
+	XUngrabPointer(dpy, CurrentTime);
 	XFreePixmap(dpy, pmap);
 	XDestroyWindow(dpy, w);
 	XCloseDisplay(dpy);