Keyboard.c: Make xkblock more robust

If xorg upstream xkb gets extended one day the previous code would not block new xkb calls even if they would change keyboard settings. So only act on the currently known calls and throw an error for all unknown calls.

Keyboard.c: Make xkblock more robust
8b206a26 · Ulrich Sibiller · Mike Gabriel · 1e1ea1ce · 8b206a26
Commit 8b206a26 authored Jul 22, 2017 by Ulrich Sibiller Committed by Mike Gabriel Dec 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 1 deletion

Keyboard.c nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +21 -1

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -1600,11 +1600,31 @@ int ProcXkbInhibited(register ClientPtr client)
    {
      return BadAccess;
    }
-    default:
+    case X_kbBell:
+    case X_kbGetCompatMap:
+    case X_kbGetControls:
+    case X_kbGetDeviceInfo:
+    case X_kbGetGeometry:
+    case X_kbGetIndicatorMap:
+    case X_kbGetIndicatorState:
+    case X_kbGetMap:
+    case X_kbGetNamedIndicator:
+    case X_kbGetNames:
+    case X_kbGetState:
+    case X_kbListComponents:
+    case X_kbPerClientFlags:
+    case X_kbSelectEvents:
+    case X_kbSetDeviceInfo:
+    case X_kbUseExtension:
    {
      return (client->swapped ? nxagentXkbWrapper.SProcXkbDispatchBackup(client) :
                  nxagentXkbWrapper.ProcXkbDispatchBackup(client));
    }
+    default:
+    {
+      /* Just make sure that it works in case xkb gets extended in future  */
+      return BadImplementation;
+    }
  }
 }