Change grabs to always grab pointer GrabModeSync

Experimentally, changing keyboard mode to GrabModeSync means xtrlock
cannot see us typing any more.

But we don't care about mouse events.

Hopefully this will fix #830726.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/xtrlock.c b/xtrlock.c
index 20208ddf7a0ec8715ceb430f24f0cc8c04998e0e..dee9be7d9729cb87cda4921cd907eebe9fd826fc 100644 (file)
--- a/xtrlock.c
+++ b/xtrlock.c
@@ -191,7 +191,7 @@ int main(int argc, char **argv){
   gs=0; /*gs==grab successful*/
   for (tvt=0 ; tvt<100; tvt++) {
     ret = XGrabKeyboard(display,window,False,
   gs=0; /*gs==grab successful*/
   for (tvt=0 ; tvt<100; tvt++) {
     ret = XGrabKeyboard(display,window,False,

-                       GrabModeAsync, /* pointer_mode */
+                       GrabModeSync, /* pointer_mode */

                        GrabModeAsync, /* keyboard_mode */
                        CurrentTime);
     if (ret == GrabSuccess) {
                        GrabModeAsync, /* keyboard_mode */
                        CurrentTime);
     if (ret == GrabSuccess) {


@@ -210,10 +210,10 @@ int main(int argc, char **argv){
   }
 
   if (XGrabPointer(display,window,False,(KeyPressMask|KeyReleaseMask)&0,
   }
 
   if (XGrabPointer(display,window,False,(KeyPressMask|KeyReleaseMask)&0,

-                  GrabModeAsync, /* pointer_mode */
-                  GrabModeAsync, /* pointer_mode */
+                  GrabModeSync, /* pointer_mode */
+                  GrabModeAsync, /* keyboard_mode */

                   None,
                   None,

-               cursor,CurrentTime)!=GrabSuccess) {
+                  cursor,CurrentTime)!=GrabSuccess) {

     XUngrabKeyboard(display,CurrentTime);
     fprintf(stderr,"xtrlock (version %s): cannot grab pointer\n",
            program_version);
     XUngrabKeyboard(display,CurrentTime);
     fprintf(stderr,"xtrlock (version %s): cannot grab pointer\n",
            program_version);