Revision: 5104
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=5104&view=rev
Author: ossman_
Date: 2013-05-23 11:40:30 +0000 (Thu, 23 May 2013)
Log Message:
-----------
Relax the requirements on addKeysym() so that it can add new
entries that still require modifying the current modifier state.
Modified Paths:
--------------
trunk/unix/xserver/hw/vnc/Input.cc
Modified: trunk/unix/xserver/hw/vnc/Input.cc
===================================================================
--- trunk/unix/xserver/hw/vnc/Input.cc 2013-05-22 12:57:16 UTC (rev 5103)
+++ trunk/unix/xserver/hw/vnc/Input.cc 2013-05-23 11:40:30 UTC (rev 5104)
@@ -507,7 +507,16 @@
vlog.info("Added unknown keysym 0x%x to keycode %d",
keysym, keycode);
- new_state = state;
+ /*
+ * The state given to addKeysym() is just a hint and
+ * the actual result might still require some state
+ * changes.
+ */
+ keycode = keysymToKeycode(keysym, state, &new_state);
+ if (keycode == 0) {
+ vlog.error("Newly added keysym 0x%x cannot be
generated", keysym);
+ return;
+ }
}
/*
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
