The branch, build-main has been updated via 15da210f5b7229481a08351174fa62fec0e540e7 (commit) via effcb18df9bb359dbd9a9f849b7b12c3c2253f76 (commit) via 04e1c44cfd5f58e418a71dfb07f5666c6005cda1 (commit) via 0c3ddddf98e725ace06f523ac406efd599d0cbb9 (commit) from ceda6a361ff962332dd4795b86b87665885f6867 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 11 +++++++---- Core.cpp | 2 +- Core.h | 2 +- Input.cpp | 2 +- Input.h | 2 +- LICENSE | 2 +- Logger.cpp | 2 +- Logger.h | 2 +- Makefile.in | 2 +- Manager.cpp | 2 +- Manager.h | 2 +- Misc.h | 2 +- Poller.h | 2 +- Regions.h | 2 +- Shadow.cpp | 2 +- Shadow.h | 2 +- Updater.cpp | 2 +- Updater.h | 2 +- VERSION | 3 +-- Win.cpp | 2 +- Win.h | 2 +- X11.cpp | 28 ++++++++++++++++++---------- X11.h | 2 +- debian/changelog | 12 ++++++++++++ debian/control | 1 + 25 files changed, 59 insertions(+), 36 deletions(-) mode change 100755 => 100644 Makefile.in The diff of changes is: diff --git a/CHANGELOG b/CHANGELOG index 9a6017a..3472a4a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,12 +1,15 @@ ChangeLog: -nxcompshad-3.4.0.4 +nxcompshad-3.5.0-2 -- Adds make install/uninstall functionality +- Fixed TR03G02189. Now key combinations involving the Shift keys + are recognized correctly. -nxcompshad-3.4.0.3 +nxcompshad-3.5.0-1 -- Changed version number scheme, upstream now maintained by X2go project +- Opened the 3.5.0 branch based on nxcompshad-3.4.0-3. + +- Updated copyright to year 2011. nxcompshad-3.4.0-3 diff --git a/Core.cpp b/Core.cpp index 6052de6..6f94493 100644 --- a/Core.cpp +++ b/Core.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 */ diff --git a/Core.h b/Core.h index b0a9943..9bc8a64 100644 --- a/Core.h +++ b/Core.h @@ -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 */ diff --git a/Input.cpp b/Input.cpp index 09e77a8..f9bf181 100644 --- a/Input.cpp +++ b/Input.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 */ diff --git a/Input.h b/Input.h index 764508e..6250e79 100644 --- a/Input.h +++ b/Input.h @@ -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 */ diff --git a/LICENSE b/LICENSE index 99d6e5c..2c7f95a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2001, 2010 NoMachine - http://www.nomachine.com/. +Copyright (c) 2001, 2011 NoMachine - http://www.nomachine.com/. NXCOMPSHAD and NX extensions to X are copyright of NoMachine. diff --git a/Logger.cpp b/Logger.cpp index 47e5e63..c367c5d 100644 --- a/Logger.cpp +++ b/Logger.cpp @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Logger.h b/Logger.h index 0a9cad9..94e4da8 100644 --- a/Logger.h +++ b/Logger.h @@ -1,6 +1,6 @@ /**************************************************************************/ /* */ -/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */ +/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ /* */ /* NXCOMP, NX protocol compression and NX extensions to this software */ /* are copyright of NoMachine. Redistribution and use of the present */ diff --git a/Makefile.in b/Makefile.in old mode 100755 new mode 100644 index 1727d58..3e5df7d --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ ############################################################################ # # -# Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. # +# Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. # # # # NXCOMP, NX protocol compression and NX extensions to this software # # are copyright of NoMachine. Redistribution and use of the present # diff --git a/Manager.cpp b/Manager.cpp index 38b92c2..ba9260a 100644 --- a/Manager.cpp +++ b/Manager.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 */ diff --git a/Manager.h b/Manager.h index 6f87cdc..2677549 100644 --- a/Manager.h +++ b/Manager.h @@ -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 */ diff --git a/Misc.h b/Misc.h index 8069a5c..27f2670 100644 --- a/Misc.h +++ b/Misc.h @@ -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 */ diff --git a/Poller.h b/Poller.h index 914ba1d..4435b5b 100644 --- a/Poller.h +++ b/Poller.h @@ -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 */ diff --git a/Regions.h b/Regions.h index 8ea41ad..b9303dc 100644 --- a/Regions.h +++ b/Regions.h @@ -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 */ diff --git a/Shadow.cpp b/Shadow.cpp index 6f2856c..f9525ad 100644 --- a/Shadow.cpp +++ b/Shadow.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 */ diff --git a/Shadow.h b/Shadow.h index ef65c0b..e1eddb9 100644 --- a/Shadow.h +++ b/Shadow.h @@ -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 */ diff --git a/Updater.cpp b/Updater.cpp index f1761ba..245c6ce 100644 --- a/Updater.cpp +++ b/Updater.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 */ diff --git a/Updater.h b/Updater.h index 4bcaa91..daa26c1 100644 --- a/Updater.h +++ b/Updater.h @@ -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 */ diff --git a/VERSION b/VERSION index 2e263ee..1545d96 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1 @@ -3.4.0.4 - +3.5.0 diff --git a/Win.cpp b/Win.cpp index 3f1e489..481cbca 100644 --- a/Win.cpp +++ b/Win.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 */ diff --git a/Win.h b/Win.h index 72566b8..fe591ff 100644 --- a/Win.h +++ b/Win.h @@ -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 */ diff --git a/X11.cpp b/X11.cpp index cb8f55f..2d1140f 100644 --- a/X11.cpp +++ b/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)); } diff --git a/X11.h b/X11.h index d34fd3d..2127542 100644 --- a/X11.h +++ b/X11.h @@ -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 */ diff --git a/debian/changelog b/debian/changelog index c38e830..59f25ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +nxcompshad (3.5.0-2-0~x2go2) UNRELEASED; urgency=low + + * Add dh-autoreconf as build-dep + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 30 Jun 2011 17:51:34 +0200 + +nxcompshad (3.5.0-2-0~x2go1) unstable; urgency=low + + * New upstream version + + -- Reinhard Tartler <siretart@tauware.de> Wed, 29 Jun 2011 15:51:58 +0200 + nxcompshad (3.4.0.4-0~x2go1) unstable; urgency=low * New upstream version (accepted debian patches) diff --git a/debian/control b/debian/control index 5f45586..457dd53 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Maintainer: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> Uploaders: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Build-Depends: + dh-autoreconf, debhelper (>= 7.0.50), libxtst-dev, libxdamage-dev, hooks/post-receive -- nxcompshad.git (NX compshad library) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nxcompshad.git" (NX compshad library).