Keystroke.c: ignore CapsLock and NumLock most of the time

CapsLock and NumLock will only be taken into account for keystrokes
that explicitly require them. This is implemented for convenience and
fixes ArcticaProject/nx-libs#397

1 files changed, 10 insertions, 0 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
index d12b459fc..69b07dfe5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keystroke.c
@@ -34,6 +34,7 @@
 #include "Events.h"
 #include "Options.h"
 #include "Keystroke.h"
+#include "Keyboard.h"
 #include "Drawable.h"
 #include "Init.h" /* extern int nxagentX2go */
 
@@ -149,6 +150,15 @@ static Bool modifier_matches(unsigned int mask, int compare_alt_meta, unsigned i
     state &= ~nxagentAltMetaMask;
   }
 
+  /* ignore CapsLock and/or Numlock if the keystroke does not
+     explicitly require them */
+
+  if ( !(mask & nxagentCapsMask) )
+    state &= ~nxagentCapsMask;
+
+  if ( !(mask & nxagentNumlockMask) )
+    state &= ~nxagentNumlockMask;
+
   /* all modifiers except meta/alt have to match exactly, extra bits are evil */
   if (mask != state) {
     ret = False;