Tk Source Code

Check-in [c9d80a11]
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:merge 8.5
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-5-18-rc
Files: files | file ages | folders
SHA1: c9d80a110b4a9584f3172b4ecc1bf7454a7ec27c
User & Date: dgp 2015-03-05 16:25:27
Context
2015-03-06
12:48
merge 8.5 check-in: c343244c user: dgp tags: core-8-5-18-rc
2015-03-05
16:25
merge 8.5 check-in: c9d80a11 user: dgp tags: core-8-5-18-rc
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-03-02
22:35
merge 8.5 check-in: c21f2b51 user: dgp tags: core-8-5-18-rc
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;