Tk Source Code

Check-in [1a123d5d]
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 trunk
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-6-4-rc
Files: files | file ages | folders
SHA1: 1a123d5d00f2ecb89d2ebadc1e29dab50ce6ec99
User & Date: dgp 2015-03-05 16:25:55
Context
2015-03-06
12:52
merge trunk check-in: a75f7fbf user: dgp tags: rc0, core-8-6-4-rc
2015-03-05
16:25
merge trunk check-in: 1a123d5d user: dgp tags: core-8-6-4-rc
16:05
update changes check-in: e7317861 user: dgp tags: core-8-6-4-rc
15:57
Merge mark check-in: be999214 user: kevin_walzer tags: trunk
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
745
    /*
     * 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;