diff options
| author | culler <culler> | 2019-10-28 03:25:09 (GMT) |
|---|---|---|
| committer | culler <culler> | 2019-10-28 03:25:09 (GMT) |
| commit | 6af97014d232e4b9ae065090afaa2a2201662c5f (patch) | |
| tree | ce39e19ebb327b6f1e1d4643b4423e365bf75993 /macosx/tkMacOSXKeyEvent.c | |
| parent | 462b4db6dcd8464fff394c9b445a70d2812b3de8 (diff) | |
| download | tk-6af97014d232e4b9ae065090afaa2a2201662c5f.zip tk-6af97014d232e4b9ae065090afaa2a2201662c5f.tar.gz tk-6af97014d232e4b9ae065090afaa2a2201662c5f.tar.bz2 | |
Apply patch from Kevin Walzer to restore functionality of Cut/Copy/Paste keyboard shortcuts on Aqua.
Diffstat (limited to 'macosx/tkMacOSXKeyEvent.c')
| -rw-r--r-- | macosx/tkMacOSXKeyEvent.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c index c689f6d..7ce8fc8 100644 --- a/macosx/tkMacOSXKeyEvent.c +++ b/macosx/tkMacOSXKeyEvent.c @@ -208,22 +208,6 @@ static unsigned isFunctionKey(unsigned int code); xEvent.xany.type = KeyPress; } - /* - * For the command key, take the input manager's word so things - * like dvorak / qwerty layout work. - */ - - if ((modifiers & NSCommandKeyMask) == NSCommandKeyMask - && (modifiers & NSAlternateKeyMask) != NSAlternateKeyMask - && len > 0 && !isFunctionKey(code)) { - - /* - * Prevent keycode-based translation in tkMacOSXKeyboard.c - */ - - xEvent.xkey.nbytes = [characters length]; - } - if ([characters length] > 0) { xEvent.xkey.keycode = (keyCode << 16) | (UInt16) [characters characterAtIndex:0]; @@ -492,6 +476,7 @@ static unsigned isFunctionKey(unsigned int code); * Called by the system to get a position for popup character selection windows * such as a Character Palette, or a selection menu for IME. */ + - (NSRect)firstRectForCharacterRange: (NSRange)theRange actualRange: (NSRangePointer)thePointer { @@ -510,7 +495,6 @@ static unsigned isFunctionKey(unsigned int code); return rect; } - - (NSInteger)conversationIdentifier { return (NSInteger) self; @@ -606,6 +590,7 @@ static unsigned isFunctionKey(unsigned int code); /* * Set up basic fields in xevent for keyboard input. */ + static void setupXEvent(XEvent *xEvent, NSWindow *w, unsigned int state) { |