From 80c7817dc22ce75c3062453817fb8df3f1e16a60 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Wed, 24 Mar 2010 13:54:50 +0000 Subject: Fixed bug where cmd-shift-key was not distinguished from cmd-key on US keyboards git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7327 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_cocoa.mm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 136926f07..55673b547 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -1139,6 +1139,9 @@ OSStatus cocoaKeyboardHandler(NSEvent *theEvent) static NSText *edit; static int countevents; static CFMutableStringRef sequence; // will contain the two characters of the composition sequence + if ( (mods & NSShiftKeyMask) && (mods & NSCommandKeyMask) ) { + s = [s uppercaseString]; // US keyboards return lowercase letter in s if cmd-shift-key is hit + } if (compose) { // we are in a composition sequence // the only benefit of sending events to the NSText object edit is that the deadkey becomes visible // at its keyUp event; without this, the deadkey remains invisible -- cgit v1.2.3