Refactor InputLock

Author: uli42

doc/nxagent/README.keystrokes

@@ -105,7 +105,7 @@ reread_keystrokes
   session.
 autograb
   enable/disable autograb mode
-lockinput
+inputlock
   lock/unlock pointer within nxagent window
 
 Only in builds with certain debugging options enabled, ignored otherwise:

etc/keystrokes.cfg

@@ -18,5 +18,5 @@
 <keystroke action="viewport_move_down" Control="1" AltMeta="1" key="Down" />
 <keystroke action="reread_keystrokes" Control="1" AltMeta="1" key="k" />
 <keystroke action="autograb" Control="1" AltMeta="1" key="g" />
-<keystroke action="lockinput" Control="1" AltMeta="1" key="c" />
+<keystroke action="inputlock" Control="1" AltMeta="1" key="c" />
 </keystrokes>

nx-X11/programs/Xserver/hw/nxagent/Events.c

@@ -770,35 +770,41 @@ static void nxagentToggleAutoGrab(void)
   }
 }
 
-/* TODO: drop inputlock when switching to Fullscreen */
-static void nxagentLockInput(void)
+static void nxagentEnableInputlock(void)
 {
-  #ifdef DEBUG
-  if (inputlock)
-    fprintf(stderr, "releasing inputlock\n");
-  else
-    fprintf(stderr, "activating inputlock\n");
-  #endif
+#ifdef DEBUG
+  fprintf(stderr, "activating inputlock\n");
+#endif
+  setWinNameSuffix("input locked");
+  XGrabPointer(nxagentDisplay,nxagentDefaultWindows[0], True,
+      ButtonPressMask | ButtonReleaseMask | PointerMotionMask | FocusChangeMask | EnterWindowMask | LeaveWindowMask,
+      GrabModeAsync, GrabModeAsync, nxagentDefaultWindows[0], None, CurrentTime);
+  inputlock = True;
+}
+
+static void nxagentDisableInputlock(void)
+{
+#ifdef DEBUG
+  fprintf(stderr, "deactivating inputlock\n");
+#endif
+  nxagentUngrabPointerAndKeyboard(NULL);
+  XTextProperty name = {
+    .value    = (unsigned char *)nxagentWindowName,
+    .encoding = XA_STRING,
+    .format   = 8,
+    .nitems   = strlen((char *) name.value)
+    };
+  setWinNameSuffix(NULL);
+  inputlock = False;
+}
 
+/* TODO: drop inputlock when switching to Fullscreen */
+static void nxagentToggleInputLock(void)
+{
   if (!inputlock)
-  {
-    setWinNameSuffix("input locked");
-    XGrabPointer(nxagentDisplay,nxagentDefaultWindows[0], True,
-		 ButtonPressMask | ButtonReleaseMask | PointerMotionMask | FocusChangeMask | EnterWindowMask | LeaveWindowMask,
-		 GrabModeAsync, GrabModeAsync, nxagentDefaultWindows[0], None, CurrentTime);
-  }
+    nxagentEnableInputlock();
   else
-  {
-    nxagentUngrabPointerAndKeyboard(NULL);
-    XTextProperty name = {
-      .value    = (unsigned char *)nxagentWindowName,
-      .encoding = XA_STRING,
-      .format   = 8,
-      .nitems   = strlen((char *) name.value)
-    };
-    setWinNameSuffix(NULL);
-  }
-  inputlock = !inputlock;
+    nxagentDisableInputlock();
 }
 
 static Bool nxagentExposurePredicate(Display *display, XEvent *event, XPointer window)
@@ -1200,9 +1206,9 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate)
 
             break;
           }
-          case doLockInput:
+          case doInputLock:
           {
-            nxagentLockInput();
+            nxagentToggleInputLock();
 
             break;
           }

nx-X11/programs/Xserver/hw/nxagent/Events.h

@@ -53,7 +53,7 @@ enum HandleEventResult
   doSwitchResizeMode,
   doSwitchDeferMode,
   doAutoGrab,
-  doLockInput
+  doInputLock
 };
 
 extern CARD32 nxagentLastEventTime;

nx-X11/programs/Xserver/hw/nxagent/Keystroke.c

@@ -93,7 +93,7 @@ char * nxagentSpecialKeystrokeNames[] = {
        "reread_keystrokes",
 
        "autograb",
-       "lockinput",
+       "inputlock",
 
        NULL,
 };
@@ -131,7 +131,7 @@ struct nxagentSpecialKeystrokeMap default_map[] = {
   {KEYSTROKE_VIEWPORT_MOVE_DOWN, ControlMask | ShiftMask, True, XK_KP_Down},
   {KEYSTROKE_REREAD_KEYSTROKES, ControlMask, True, XK_k},
   {KEYSTROKE_AUTOGRAB, ControlMask, True, XK_g},
-  {KEYSTROKE_LOCKINPUT, ControlMask, True, XK_c},
+  {KEYSTROKE_INPUTLOCK, ControlMask, True, XK_c},
   {KEYSTROKE_END_MARKER, 0, False, NoSymbol},
 };
 struct nxagentSpecialKeystrokeMap *map = default_map;
@@ -597,8 +597,8 @@ Bool nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result)
     case KEYSTROKE_AUTOGRAB:
       *result = doAutoGrab;
       break;
-    case KEYSTROKE_LOCKINPUT:
-      *result = doLockInput;
+    case KEYSTROKE_INPUTLOCK:
+      *result = doInputLock;
       break;
     case KEYSTROKE_NOTHING: /* do nothing. difference to KEYSTROKE_IGNORE is the return value */
     case KEYSTROKE_END_MARKER: /* just to make gcc STFU */

nx-X11/programs/Xserver/hw/nxagent/Keystroke.h

@@ -67,7 +67,7 @@ enum nxagentSpecialKeystroke {
        KEYSTROKE_REREAD_KEYSTROKES = 21,
 
        KEYSTROKE_AUTOGRAB = 22,
-       KEYSTROKE_LOCKINPUT = 23,
+       KEYSTROKE_INPUTLOCK = 23,
 
        KEYSTROKE_NOTHING = 24,