Attachment "585584ad66-fn-keycode-fix.diff" to
ticket [585584ad]
added by
chrstphrchvz
2020-04-18 10:10:25.
diff --git macosx/tkMacOSXKeyEvent.c macosx/tkMacOSXKeyEvent.c
index f69a531f5..03e80d399 100644
--- macosx/tkMacOSXKeyEvent.c
+++ macosx/tkMacOSXKeyEvent.c
@@ -126,6 +126,13 @@ static unsigned isFunctionKey(unsigned int code);
xEvent.xany.send_event = -1;
xEvent.xkey.keycode = (modifiers ^ savedModifiers);
+
+ /*
+ * Only update savedModifiers for NSFlagsChanged events since some
+ * non-modifier keys (e.g. function keys) have modifier flags set
+ */
+ savedModifiers = modifiers;
+
break;
case NSKeyUp:
characters = [theEvent characters];
@@ -173,7 +180,6 @@ static unsigned isFunctionKey(unsigned int code);
*/
Tk_QueueWindowEvent(&xEvent, TCL_QUEUE_TAIL);
- savedModifiers = modifiers;
return theEvent;
}
}
@@ -184,7 +190,8 @@ static unsigned isFunctionKey(unsigned int code);
* interpretKeyEvents. But we only need to send KeyDown events.
*/
- if (type == NSKeyDown) {
+ switch (type) {
+ case NSKeyDown:
if (NS_KEYLOG) {
TKLog(@"keyDown: %s compose sequence.\n",
processingCompose == YES ? "Continue" : "Begin");
@@ -211,8 +218,11 @@ static unsigned isFunctionKey(unsigned int code);
break;
}
}
+ break;
+ case NSFlagsChanged:
+ savedModifiers = modifiers;
+ break;
}
- savedModifiers = modifiers;
return theEvent;
}
@end