summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2010-03-24 13:54:50 +0000
committerManolo Gouy <Manolo>2010-03-24 13:54:50 +0000
commit80c7817dc22ce75c3062453817fb8df3f1e16a60 (patch)
tree019723f66ff9476f7361e3d71c7e1921e91cdc9b
parent5b7707b1b11310903789acf4e67185bc8c9b125a (diff)
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
-rw-r--r--src/Fl_cocoa.mm3
1 files changed, 3 insertions, 0 deletions
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