Revision: 4584
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4584&view=rev
Author: ossman_
Date: 2011-07-13 17:56:26 +0000 (Wed, 13 Jul 2011)
Log Message:
-----------
Port over the AltGr hack that the old Windows viewer has. Seems we need this
to get sane behaviour when connecting to a Unix desktop.
Modified Paths:
--------------
trunk/vncviewer/Viewport.cxx
Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx 2011-07-12 16:58:12 UTC (rev 4583)
+++ trunk/vncviewer/Viewport.cxx 2011-07-13 17:56:26 UTC (rev 4584)
@@ -715,6 +715,43 @@
if (keySym == XK_VoidSymbol)
return;
+#ifdef WIN32
+ // Ugly hack alert!
+ //
+ // Windows doesn't have a proper AltGr, but handles it using fake
+ // Ctrl+Alt. Unfortunately X11 doesn't generally like the combination
+ // Ctrl+Alt+AltGr, which we usually end up with when Xvnc tries to
+ // get everything in the correct state. Cheat and temporarily release
+ // Ctrl and Alt whenever we get a key with a symbol.
+ bool need_cheat = true;
+
+ if (keyText[0] == '\0')
+ need_cheat = false;
+ else if ((downKeySym.find(FL_Control_L) == downKeySym.end()) &&
+ (downKeySym.find(FL_Control_R) == downKeySym.end()))
+ need_cheat = false;
+ else if ((downKeySym.find(FL_Alt_L) == downKeySym.end()) &&
+ (downKeySym.find(FL_Alt_R) == downKeySym.end()))
+ need_cheat = false;
+
+ if (need_cheat) {
+ vlog.debug("Faking release of AltGr (Ctrl+Alt)");
+ try {
+ if (downKeySym.find(FL_Control_L) != downKeySym.end())
+ cc->writer()->keyEvent(XK_Control_L, false);
+ if (downKeySym.find(FL_Control_R) != downKeySym.end())
+ cc->writer()->keyEvent(XK_Control_R, false);
+ if (downKeySym.find(FL_Alt_L) != downKeySym.end())
+ cc->writer()->keyEvent(XK_Alt_L, false);
+ if (downKeySym.find(FL_Alt_R) != downKeySym.end())
+ cc->writer()->keyEvent(XK_Alt_R, false);
+ } catch (rdr::Exception& e) {
+ vlog.error(e.str());
+ exit_vncviewer(e.str());
+ }
+ }
+#endif
+
vlog.debug("Key pressed: 0x%04x (0x%04x) '%s' => 0x%04x",
origKeyCode, keyCode, keyText, keySym);
@@ -726,6 +763,26 @@
vlog.error(e.str());
exit_vncviewer(e.str());
}
+
+#ifdef WIN32
+ // Ugly hack continued...
+ if (need_cheat) {
+ vlog.debug("Restoring AltGr state");
+ try {
+ if (downKeySym.find(FL_Control_L) != downKeySym.end())
+ cc->writer()->keyEvent(XK_Control_L, true);
+ if (downKeySym.find(FL_Control_R) != downKeySym.end())
+ cc->writer()->keyEvent(XK_Control_R, true);
+ if (downKeySym.find(FL_Alt_L) != downKeySym.end())
+ cc->writer()->keyEvent(XK_Alt_L, true);
+ if (downKeySym.find(FL_Alt_R) != downKeySym.end())
+ cc->writer()->keyEvent(XK_Alt_R, true);
+ } catch (rdr::Exception& e) {
+ vlog.error(e.str());
+ exit_vncviewer(e.str());
+ }
+ }
+#endif
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric
Ries, the creator of the Lean Startup Methodology on "Lean Startup
Secrets Revealed." This video shows you how to validate your ideas,
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
