Author: spitzak
Date: 2008-07-15 23:35:10 -0700 (Tue, 15 Jul 2008)
New Revision: 6147
Log:
Further fixes based on info in str 1649
Previous one was wrong and would make AltGr act like Alt


Modified:
   trunk/src/compose.cxx

Modified: trunk/src/compose.cxx
===================================================================
--- trunk/src/compose.cxx       2008-07-16 06:02:44 UTC (rev 6146)
+++ trunk/src/compose.cxx       2008-07-16 06:35:10 UTC (rev 6147)
@@ -406,12 +406,16 @@
   int i = e_keysym;
 #endif
 
+#if USE_X11
+  // AltGr key produces ALT and SCROLLLOCK, but must return true as the
+  // text should be inserted, not used as a menu shortcut:
+  if ((e_state & ALT) && (e_state & SCROLLLOCK));
+  else
+#endif
   // Alt+letters are reserved for shortcuts.  But alt+foreign letters
   // has to be allowed, because some key layouts require alt to be held
   // down in order to type them...
-  // SCROLLLOCK is set by AltGr key on Spanish (at least) keyboards, so
-  // don't interfere with the input method.
-  if ((e_state & (ALT|META|SCROLLLOCK)) && !(ascii & 128)) return false;
+  if ((e_state & (ALT|META)) && !(ascii & 128)) return false;
 
   // See if they type the compose prefix key:
   if (i == RightCtrlKey || i == 0xff20/* Multi-Key */) {

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to