From bf85c6e696693ef5a277c0334c01493dedf4fadd Mon Sep 17 00:00:00 2001
From: Reinhard Tartler <siretart@tauware.de>
Date: Sun, 13 Nov 2011 09:53:12 +0100
Subject: Imported nxcompshad-3.5.0-2.tar.gz

Summary: Imported nxcompshad-3.5.0-2.tar.gz
Keywords:

Imported nxcompshad-3.5.0-2.tar.gz
into Git repository
---
 nxcompshad/X11.cpp | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'nxcompshad/X11.cpp')

diff --git a/nxcompshad/X11.cpp b/nxcompshad/X11.cpp
index cb8f55fc5..2d1140f11 100644
--- a/nxcompshad/X11.cpp
+++ b/nxcompshad/X11.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXCOMPSHAD, NX protocol compression and NX extensions to this software */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -981,6 +981,7 @@ void Poller::handleKeyboardEvent(Display *display, XEvent *event)
 
   Bool isKeyPress = False;
   Bool isModifier = False;
+  Bool isShiftComb = False;
   Bool skip = False;
 
   if (event -> type == KeyPress)
@@ -1048,19 +1049,26 @@ void Poller::handleKeyboardEvent(Display *display, XEvent *event)
             (!modeSwitchOn && !level3ShiftOn && !altROn) &&
                 !skip)
     {
-      keysym = keymapKeycodeToKeysym(event -> xkey.keycode, shadowKeysyms,
-                                         shadowMinKey, shadowMapWidth, 1);
-    }
+      KeySym tempKeysym = keymapKeycodeToKeysym(event -> xkey.keycode, shadowKeysyms,
+                                                    shadowMinKey, shadowMapWidth, 1);
 
-    if ((!leftShiftOn && !rightShiftOn) &&
-            (modeSwitchOn || level3ShiftOn || altROn))
+      if (tempKeysym == 0)
+      {
+        isShiftComb = True;
+      }
+      else
+      {
+        keysym = tempKeysym;
+      }
+    }
+    else if ((!leftShiftOn && !rightShiftOn) &&
+                 (modeSwitchOn || level3ShiftOn || altROn))
     {
       keysym = keymapKeycodeToKeysym(event -> xkey.keycode, shadowKeysyms,
                                          shadowMinKey, shadowMapWidth, 2);
     }
-
-    if ((leftShiftOn || rightShiftOn) &&
-            (modeSwitchOn || level3ShiftOn || altROn))
+    else if ((leftShiftOn || rightShiftOn) &&
+                 (modeSwitchOn || level3ShiftOn || altROn))
     {
       keysym = keymapKeycodeToKeysym(event -> xkey.keycode, shadowKeysyms,
                                        shadowMinKey, shadowMapWidth, 3);
@@ -1103,7 +1111,7 @@ void Poller::handleKeyboardEvent(Display *display, XEvent *event)
    * Send fake modifier events.
    */
 
-  if (!isModifier)
+  if (!isModifier && isShiftComb == False)
   {
     sendFakeModifierEvents(col, ((keysym >> 8) == 0) && (keysym >= XK_A) && (keysym <= XK_Z));
   }
-- 
cgit v1.2.3