summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcc_benny <cc_benny>2004-02-25 13:29:41 (GMT)
committercc_benny <cc_benny>2004-02-25 13:29:41 (GMT)
commitf349b2208bae08f3b60426e6ccc2fcf6afdd6ef8 (patch)
treeeddd34b80d1e3e8714416cafadea542acb23f1cd
parentd3b3f301b12582829c0e8153d5436972c8e02885 (diff)
downloadtk-f349b2208bae08f3b60426e6ccc2fcf6afdd6ef8.zip
tk-f349b2208bae08f3b60426e6ccc2fcf6afdd6ef8.tar.gz
tk-f349b2208bae08f3b60426e6ccc2fcf6afdd6ef8.tar.bz2
* (TkpInitKeymapInfo): Don't make <Alt> and <Meta> synonyms
for <Command> and <Option> for now. (Copied from 1.17)
-rw-r--r--macosx/tkMacOSXKeyboard.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/macosx/tkMacOSXKeyboard.c b/macosx/tkMacOSXKeyboard.c
index 24ada94..597f3cf 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.5.2.2 2004/02/16 00:42:34 wolfsuit Exp $
+ * RCS: @(#) $Id: tkMacOSXKeyboard.c,v 1.5.2.3 2004/02/25 13:29:41 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