Tk Source Code

Check-in [1099ec55]
Login
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2019 Conference, Houston/TX, US, Nov 4-8
Send your abstracts to [email protected]
or submit via the online form by Sep 9.

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix for keyboard modifier events, thanks to Trevor Williams for patch
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-5-branch
Files: files | file ages | folders
SHA1: 1099ec554e34014b16b8c8e8f5668428fd80ad73
User & Date: kevin_walzer 2015-03-05 15:57:17
Context
2015-03-06
02:45
Fix for crash in deleted toplevels when not removed from Cocoa window menu; thanks to Marc Culler for patch check-in: 225542ce user: kevin_walzer tags: core-8-5-branch
2015-03-05
16:25
merge 8.5 check-in: c9d80a11 user: dgp tags: core-8-5-18-rc
15:57
Merge mark check-in: be999214 user: kevin_walzer tags: trunk
15:57
Fix for keyboard modifier events, thanks to Trevor Williams for patch check-in: 1099ec55 user: kevin_walzer tags: core-8-5-branch
2015-02-28
02:59
Fix for 5824a992df, images not displaying in Cocoa in label with sunken relief check-in: c4051e7a user: kevin_walzer tags: core-8-5-branch
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to macosx/tkMacOSXKeyboard.c.

730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
    /*
     * Handle pure modifier keys specially. We use -1 as a signal for
     * this.
     */

    if (eventPtr->xany.send_event == -1) {
	int modifier = eventPtr->xkey.keycode;

	if (modifier == NSCommandKeyMask) {
	    return XK_Meta_L;
	} else if (modifier == NSShiftKeyMask) {
	    return XK_Shift_L;
	} else if (modifier == NSAlphaShiftKeyMask) {
	    return XK_Caps_Lock;






|







730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
    /*
     * Handle pure modifier keys specially. We use -1 as a signal for
     * this.
     */

    if (eventPtr->xany.send_event == -1) {
	int modifier = eventPtr->xkey.keycode & NSDeviceIndependentModifierFlagsMask;

	if (modifier == NSCommandKeyMask) {
	    return XK_Meta_L;
	} else if (modifier == NSShiftKeyMask) {
	    return XK_Shift_L;
	} else if (modifier == NSAlphaShiftKeyMask) {
	    return XK_Caps_Lock;