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 Side-by-Side Diffs Ignore Whitespace Patch

Changes to macosx/tkMacOSXKeyboard.c.

   730    730   
   731    731       /*
   732    732        * Handle pure modifier keys specially. We use -1 as a signal for
   733    733        * this.
   734    734        */
   735    735   
   736    736       if (eventPtr->xany.send_event == -1) {
   737         -	int modifier = eventPtr->xkey.keycode;
          737  +	int modifier = eventPtr->xkey.keycode & NSDeviceIndependentModifierFlagsMask;
   738    738   
   739    739   	if (modifier == NSCommandKeyMask) {
   740    740   	    return XK_Meta_L;
   741    741   	} else if (modifier == NSShiftKeyMask) {
   742    742   	    return XK_Shift_L;
   743    743   	} else if (modifier == NSAlphaShiftKeyMask) {
   744    744   	    return XK_Caps_Lock;