diff options
| author | hobbs <hobbs> | 2000-02-09 02:13:43 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2000-02-09 02:13:43 (GMT) |
| commit | 059c15807f394adcfc695c32df5b50ce2c7e246a (patch) | |
| tree | ff6a4c8b0268173d5f2e3e61b6a03e90baae0ea8 /generic/tkStubInit.c | |
| parent | acfa815d400ff9f351e628c2dd24089170b2bfe3 (diff) | |
| download | tk-059c15807f394adcfc695c32df5b50ce2c7e246a.zip tk-059c15807f394adcfc695c32df5b50ce2c7e246a.tar.gz tk-059c15807f394adcfc695c32df5b50ce2c7e246a.tar.bz2 | |
* generic/tk.decls:
* generic/tkBind.c:
* generic/tkInt.decls:
* generic/tkIntDecls.h:
* generic/tkStubInit.c:
* mac/tkMacKeyboard.c:
* unix/tkUnixKey.c:
* win/tkWinKey.c: Fix for keyboard handling of "dead" keys and
caps lock from Peter Spjuth.
Split functions into platform specific files:
Static functions GetKeySym(), SetKeycodeAndState() and InitKeymapInfo()
from tkBind.c moved into platform files tkWinKey.c tkUnixKey.c and
tkMacKeyboard.c. GetKeySym() and SetKeycodeAndState() renamed to
Tkp* and made public (as private functions) in tkInt.decls.
Step 2, fixes in tkWinKey.c
New static function: KeycodeToKeysym(), based on XKeycodeToKeysym()
but with different arguments, and a lot of improvements.
TkpGetString() changed to use KeycodeToKeysym() + other fixes.
TkpGetKeySym() changed to use KeycodeToKeysym() + other fixes.
InitKeymapInfo() changed to use KeycodeToKeysym().
TkpSetKeycodeAndState() rewritten, mostly by copying code from
XKeysymToKeycode().
XKeycodeToKeysym() rewritten. Preferably it should be removed.
EXPLANATION: The main problem is ToAscii() which has a lot of side
effects, and also that XKeycodeToKeysym() is not provided enough
input to do a proper job. The changes' main goal is to avoid
calling ToAscii() if not necessary, and to provide it with as
correct information as possible when called. Also some attempts
to clean up what ToAscii() did are done. See the code for details.
BUGS FIXED: Typing shifted (and AltGr) dead keys did not work.
Keyboard lock lamps did not work on Win98.
Events regarding AltGr-keys behaved badly.
Example: On a Swedish keyboard, $ is typed with AltGr-4.
That keyboard event would get the keysym '4' not 'dollar'.
Also, doing [event generete . <Key-dollar>] would send keysym '4'.
Translation to ascii in TkpGetString did not handle return and
tab correctly. I.e. [event generate . <Key-Return>] gave wrong %A
Diffstat (limited to 'generic/tkStubInit.c')
| -rw-r--r-- | generic/tkStubInit.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index c1f2607..0b8472f 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkStubInit.c,v 1.16 2000/02/08 11:31:33 hobbs Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.17 2000/02/09 02:13:51 hobbs Exp $ */ #include "tkInt.h" @@ -344,6 +344,8 @@ TkIntStubs tkIntStubs = { #endif /* MAC_TCL */ TkpDrawHighlightBorder, /* 135 */ TkSetFocusWin, /* 136 */ + TkpSetKeycodeAndState, /* 137 */ + TkpGetKeySym, /* 138 */ }; TkIntPlatStubs tkIntPlatStubs = { |