diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2009-04-13 07:32:01 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2009-04-13 07:32:01 +0000 |
| commit | c2e3704d6b1fb3a65cc781de6f9b4a4f70131e2b (patch) | |
| tree | e71fefe9b09c2c22c87057b3b91f6de514144e39 /src/Fl_mac.cxx | |
| parent | ead9c2ce24c88523ebe9295015f993231a61b66a (diff) | |
Little rearrangement for readibility
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6758 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_mac.cxx')
| -rw-r--r-- | src/Fl_mac.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx index 69217df1e..a92573ac1 100644 --- a/src/Fl_mac.cxx +++ b/src/Fl_mac.cxx @@ -1304,7 +1304,7 @@ pascal OSStatus carbonKeyboardHandler( // In this mode, there seem to be no key-down codes // printf("%08x %08x %08x\n", keyCode, mods, key); maskedKeyCode = keyCode & 0x7f; - /* output a human readable event identifier for debugging */ + /* output a human readable event identifier for debugging const char *ev = ""; switch (kind) { case kEventRawKeyDown: ev = "kEventRawKeyDown"; break; @@ -1313,8 +1313,8 @@ pascal OSStatus carbonKeyboardHandler( case kEventRawKeyModifiersChanged: ev = "kEventRawKeyModifiersChanged"; break; default: ev = "unknown"; } -// printf("%08x %08x %08x '%c' %s \n", mods, keyCode, key, key, ev); -// */ + printf("%08x %08x %08x '%c' %s \n", mods, keyCode, key, key, ev); + */ switch (kind) { case kEventRawKeyDown: @@ -1345,14 +1345,13 @@ pascal OSStatus carbonKeyboardHandler( } // if the user pressed alt/option, event_key should have the keycap, // but event_text should generate the international symbol + sym = macKeyLookUp[maskedKeyCode]; if ( isalpha(key) ) sym = tolower(key); - else if ( Fl::e_state&FL_CTRL && key<32 ) + else if ( Fl::e_state&FL_CTRL && key<32 && sym<0xff00) sym = key+96; - else if ( Fl::e_state&FL_ALT ) // find the keycap of this key + else if ( Fl::e_state&FL_ALT && sym<0xff00) // find the keycap of this key sym = keycode_to_sym( maskedKeyCode, 0, macKeyLookUp[ maskedKeyCode ] ); - else - sym = macKeyLookUp[ maskedKeyCode ]; Fl::e_keysym = Fl::e_original_keysym = sym; // Handle FL_KP_Enter on regular keyboards and on Powerbooks if ( maskedKeyCode==0x4c || maskedKeyCode==0x34) key=0x0d; |