summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcc_benny <cc_benny>2004-02-17 19:49:16 (GMT)
committercc_benny <cc_benny>2004-02-17 19:49:16 (GMT)
commit5d636d378ae1dccd1dd760f5e49a7173c554045d (patch)
tree3540b074854fcb2b9e4e94cb78a1f735d1602bc1
parent6b428be3fa7c6ef3a45767a445732b8751c20b1e (diff)
downloadtk-5d636d378ae1dccd1dd760f5e49a7173c554045d.zip
tk-5d636d378ae1dccd1dd760f5e49a7173c554045d.tar.gz
tk-5d636d378ae1dccd1dd760f5e49a7173c554045d.tar.bz2
* (TkpInitKeymapInfo): Don't make <Alt> and <Meta> synonyms
for <Command> and <Option> for now.
-rw-r--r--macosx/tkMacOSXKeyboard.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/macosx/tkMacOSXKeyboard.c b/macosx/tkMacOSXKeyboard.c
index f1c2f12..97886c8 100644
--- a/macosx/tkMacOSXKeyboard.c
+++ b/macosx/tkMacOSXKeyboard.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXKeyboard.c,v 1.16 2004/02/14 16:32:39 cc_benny Exp $
+ * RCS: @(#) $Id: tkMacOSXKeyboard.c,v 1.17 2004/02/17 19:49:16 cc_benny Exp $
*/
#include "tkInt.h"
@@ -805,8 +805,22 @@ TkpInitKeymapInfo(
dispPtr->lockUsage = LU_CAPS;
dispPtr->modeModMask = 0;
+
+#if 0
+ /*
+ * With this, <Alt> and <Meta> become synonyms for <Command> and <Option>
+ * in bindings like they are (and always have been) in the keysyms that
+ * are reported by KeyPress events. But the init scripts like text.tcl
+ * have some disabling bindings for <Meta>, so we don't want this without
+ * some changes in those scripts. See also bug #700311.
+ */
+
dispPtr->altModMask = ALT_MASK;
dispPtr->metaModMask = OPTION_MASK;
+#else
+ dispPtr->altModMask = 0;
+ dispPtr->metaModMask = 0;
+#endif
/*
* MacOSX doesn't use the keycodes for the modifiers for anything, and we