Keystroke.c: Fix modifier handling

Code could not distinguish between ctrl-alt-shift and ctrl-alt. Fixes ArcticaProject/nx-libs#395

Keystroke.c: Fix modifier handling
5595e3d1 · Ulrich Sibiller · af5a83bb · 5595e3d1
Commit 5595e3d1 authored Mar 13, 2017 by Ulrich Sibiller
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Keystroke.c nx-X11/programs/Xserver/hw/nxagent/Keystroke.c +2 -1

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
@@ -155,10 +155,11 @@ static Bool modifier_matches(unsigned int mask, int compare_alt_meta, unsigned i
    }

    mask &= ~nxagentAltMetaMask;
+    state &= ~nxagentAltMetaMask;
  }

  /* all modifiers except meta/alt have to match exactly, extra bits are evil */
-  if ((mask & state) != mask) {
+  if (mask != state) {
    ret = False;
  }