Author: manolo
Date: 2012-03-10 07:39:56 -0800 (Sat, 10 Mar 2012)
New Revision: 9272
Log:
Transmitted changes related to the mackeyLookUp table from 1.3
Modified:
branches/branch-3.0/include/fltk3/osx.h
branches/branch-3.0/src/fltk3/cocoa.mm
branches/branch-3.0/src/fltk3/cocoa_get_key.cxx
branches/branch-3.0/test/keyboard_ui.fl
Modified: branches/branch-3.0/include/fltk3/osx.h
===================================================================
--- branches/branch-3.0/include/fltk3/osx.h 2012-03-10 08:45:44 UTC (rev
9271)
+++ branches/branch-3.0/include/fltk3/osx.h 2012-03-10 15:39:56 UTC (rev
9272)
@@ -144,6 +144,7 @@
static CGContextRef none_cursor_image(void);
static void *get_carbon_function(const char *name);
static void screen_work_area(int &X, int &Y, int &W, int &H, int n); //
compute work area of a given screen
+ static unsigned short *compute_macKeyLookUp();
private:
static void relink(fltk3::Window*, fltk3::Window*);
bool subwindow;
Modified: branches/branch-3.0/src/fltk3/cocoa.mm
===================================================================
--- branches/branch-3.0/src/fltk3/cocoa.mm 2012-03-10 08:45:44 UTC (rev
9271)
+++ branches/branch-3.0/src/fltk3/cocoa.mm 2012-03-10 15:39:56 UTC (rev
9272)
@@ -132,36 +132,8 @@
/*
* Mac keyboard lookup table
- * See also the inverse converter vktab in Fl_get_key_mac.cxx
*/
-static unsigned short macKeyLookUp[128] =
-{
- 'a', 's', 'd', 'f', 'h', 'g', 'z', 'x',
- 'c', 'v', '^', 'b', 'q', 'w', 'e', 'r',
-
- 'y', 't', '1', '2', '3', '4', '6', '5',
- '=', '9', '7', '-', '8', '0', ']', 'o',
-
- 'u', '[', 'i', 'p', fltk3::EnterKey, 'l', 'j', '\'',
- 'k', ';', '\\', ',', '/', 'n', 'm', '.',
-
- fltk3::TabKey, ' ', '`', fltk3::BackSpaceKey,
- fltk3::KPEnterKey, fltk3::EscapeKey, fltk3::MetaRKey, fltk3::MetaLKey,
- fltk3::ShiftLKey, fltk3::CapsLockKey, fltk3::AltLKey, fltk3::ControlLKey,
- fltk3::ShiftRKey, fltk3::AltRKey, fltk3::ControlRKey, 0/*fltk3::FKey*/,
-
- 0, fltk3::KPKey+'.', fltk3::RightKey, fltk3::KPKey+'*', 0, fltk3::KPKey+'+',
fltk3::LeftKey, fltk3::NumLockKey,
- fltk3::DownKey, 0, 0, fltk3::KPKey+'/', fltk3::KPEnterKey, fltk3::UpKey,
fltk3::KPKey+'-', 0,
-
- 0, fltk3::KPKey+'=', fltk3::KPKey+'0', fltk3::KPKey+'1', fltk3::KPKey+'2',
fltk3::KPKey+'3', fltk3::KPKey+'4', fltk3::KPKey+'5',
- fltk3::KPKey+'6', fltk3::KPKey+'7', 0, fltk3::KPKey+'8', fltk3::KPKey+'9',
0, 0, 0,
-
- fltk3::FKey+5, fltk3::FKey+6, fltk3::FKey+7, fltk3::FKey+3, fltk3::FKey+8,
fltk3::FKey+9, 0, fltk3::FKey+11,
- 0, fltk3::FKey+13, fltk3::FKey+16, fltk3::FKey+14, 0, fltk3::FKey+10,
fltk3::MenuKey, fltk3::FKey+12,
-
- 0, fltk3::FKey+15, fltk3::HelpKey, fltk3::HomeKey, fltk3::PageUpKey,
fltk3::DeleteKey, fltk3::FKey+4, fltk3::EndKey,
- fltk3::FKey+2, fltk3::PageDownKey, fltk3::FKey+1, fltk3::LeftKey,
fltk3::RightKey, fltk3::DownKey, fltk3::UpKey, 0/*FL_Power*/,
-};
+static unsigned short *macKeyLookUp = Fl_X::compute_macKeyLookUp();
/*
* convert the current mouse chord into the FLTK modifier state
Modified: branches/branch-3.0/src/fltk3/cocoa_get_key.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/cocoa_get_key.cxx 2012-03-10 08:45:44 UTC
(rev 9271)
+++ branches/branch-3.0/src/fltk3/cocoa_get_key.cxx 2012-03-10 15:39:56 UTC
(rev 9272)
@@ -33,43 +33,188 @@
#include <fltk3/x.h>
#include <config.h>
-// convert an FLTK (X) keysym to a MacOS symbol:
-// See also the inverse converter in table macKeyLookUp of Fl_cocoa.mm
-// This table is in numeric order by FLTK symbol order for binary search.
// The list of Mac OS virtual keycodes appears with OS 10.5 in
// ...../Carbon.framework/Frameworks/HIToolbox.framework/Headers/Events.h
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+#include <Carbon/Carbon.h>
+#else
+/*
+ * These constants are the virtual keycodes defined originally in
+ * Inside Mac Volume V, pg. V-191. They identify physical keys on a
+ * keyboard. Those constants with "ANSI" in the name are labeled
+ * according to the key position on an ANSI-standard US keyboard.
+ * For example, kVK_ANSI_A indicates the virtual keycode for the key
+ * with the letter 'A' in the US keyboard layout. Other keyboard
+ * layouts may have the 'A' key label on a different physical key;
+ * in this case, pressing 'A' will generate a different virtual
+ * keycode.
+ */
+enum {
+ kVK_ANSI_A = 0x00,
+ kVK_ANSI_S = 0x01,
+ kVK_ANSI_D = 0x02,
+ kVK_ANSI_F = 0x03,
+ kVK_ANSI_H = 0x04,
+ kVK_ANSI_G = 0x05,
+ kVK_ANSI_Z = 0x06,
+ kVK_ANSI_X = 0x07,
+ kVK_ANSI_C = 0x08,
+ kVK_ANSI_V = 0x09,
+ kVK_ANSI_B = 0x0B,
+ kVK_ANSI_Q = 0x0C,
+ kVK_ANSI_W = 0x0D,
+ kVK_ANSI_E = 0x0E,
+ kVK_ANSI_R = 0x0F,
+ kVK_ANSI_Y = 0x10,
+ kVK_ANSI_T = 0x11,
+ kVK_ANSI_1 = 0x12,
+ kVK_ANSI_2 = 0x13,
+ kVK_ANSI_3 = 0x14,
+ kVK_ANSI_4 = 0x15,
+ kVK_ANSI_6 = 0x16,
+ kVK_ANSI_5 = 0x17,
+ kVK_ANSI_Equal = 0x18,
+ kVK_ANSI_9 = 0x19,
+ kVK_ANSI_7 = 0x1A,
+ kVK_ANSI_Minus = 0x1B,
+ kVK_ANSI_8 = 0x1C,
+ kVK_ANSI_0 = 0x1D,
+ kVK_ANSI_RightBracket = 0x1E,
+ kVK_ANSI_O = 0x1F,
+ kVK_ANSI_U = 0x20,
+ kVK_ANSI_LeftBracket = 0x21,
+ kVK_ANSI_I = 0x22,
+ kVK_ANSI_P = 0x23,
+ kVK_ANSI_L = 0x25,
+ kVK_ANSI_J = 0x26,
+ kVK_ANSI_Quote = 0x27,
+ kVK_ANSI_K = 0x28,
+ kVK_ANSI_Semicolon = 0x29,
+ kVK_ANSI_Backslash = 0x2A,
+ kVK_ANSI_Comma = 0x2B,
+ kVK_ANSI_Slash = 0x2C,
+ kVK_ANSI_N = 0x2D,
+ kVK_ANSI_M = 0x2E,
+ kVK_ANSI_Period = 0x2F,
+ kVK_ANSI_Grave = 0x32,
+ kVK_ANSI_KeypadDecimal = 0x41,
+ kVK_ANSI_KeypadMultiply = 0x43,
+ kVK_ANSI_KeypadPlus = 0x45,
+ kVK_ANSI_KeypadClear = 0x47,
+ kVK_ANSI_KeypadDivide = 0x4B,
+ kVK_ANSI_KeypadEnter = 0x4C,
+ kVK_ANSI_KeypadMinus = 0x4E,
+ kVK_ANSI_KeypadEquals = 0x51,
+ kVK_ANSI_Keypad0 = 0x52,
+ kVK_ANSI_Keypad1 = 0x53,
+ kVK_ANSI_Keypad2 = 0x54,
+ kVK_ANSI_Keypad3 = 0x55,
+ kVK_ANSI_Keypad4 = 0x56,
+ kVK_ANSI_Keypad5 = 0x57,
+ kVK_ANSI_Keypad6 = 0x58,
+ kVK_ANSI_Keypad7 = 0x59,
+ kVK_ANSI_Keypad8 = 0x5B,
+ kVK_ANSI_Keypad9 = 0x5C
+};
+/* keycodes for keys that are independent of keyboard layout*/
+enum {
+ kVK_Return = 0x24,
+ kVK_Tab = 0x30,
+ kVK_Space = 0x31,
+ kVK_Delete = 0x33,
+ kVK_Escape = 0x35,
+ kVK_Command = 0x37,
+ kVK_Shift = 0x38,
+ kVK_CapsLock = 0x39,
+ kVK_Option = 0x3A,
+ kVK_Control = 0x3B,
+ kVK_RightShift = 0x3C,
+ kVK_RightOption = 0x3D,
+ kVK_RightControl = 0x3E,
+ kVK_Function = 0x3F,
+ kVK_F17 = 0x40,
+ kVK_VolumeUp = 0x48,
+ kVK_VolumeDown = 0x49,
+ kVK_Mute = 0x4A,
+ kVK_F18 = 0x4F,
+ kVK_F19 = 0x50,
+ kVK_F20 = 0x5A,
+ kVK_F5 = 0x60,
+ kVK_F6 = 0x61,
+ kVK_F7 = 0x62,
+ kVK_F3 = 0x63,
+ kVK_F8 = 0x64,
+ kVK_F9 = 0x65,
+ kVK_F11 = 0x67,
+ kVK_F13 = 0x69,
+ kVK_F16 = 0x6A,
+ kVK_F14 = 0x6B,
+ kVK_F10 = 0x6D,
+ kVK_F12 = 0x6F,
+ kVK_F15 = 0x71,
+ kVK_Help = 0x72,
+ kVK_Home = 0x73,
+ kVK_PageUp = 0x74,
+ kVK_ForwardDelete = 0x75,
+ kVK_F4 = 0x76,
+ kVK_End = 0x77,
+ kVK_F2 = 0x78,
+ kVK_PageDown = 0x79,
+ kVK_F1 = 0x7A,
+ kVK_LeftArrow = 0x7B,
+ kVK_RightArrow = 0x7C,
+ kVK_DownArrow = 0x7D,
+ kVK_UpArrow = 0x7E
+};
+
+#endif
+
+// convert an FLTK (X) keysym to a MacOS symbol:
+// This table is in numeric order by FLTK symbol order for binary search.
static const struct {unsigned short vk, fltk;} vktab[] = {
- { 49, ' ' }, { 39, '\'' }, { 43, ',' }, { 27, '-' }, { 47, '.' }, { 44, '/'
},
- { 29, '0' }, { 18, '1' }, { 19, '2' }, { 20, '3' },
- { 21, '4' }, { 23, '5' }, { 22, '6' }, { 26, '7' },
- { 28, '8' }, { 25, '9' }, { 41, ';' }, { 24, '=' },
- { 0, 'A' }, { 11, 'B' }, { 8, 'C' }, { 2, 'D' },
- { 14, 'E' }, { 3, 'F' }, { 5, 'G' }, { 4, 'H' },
- { 34, 'I' }, { 38, 'J' }, { 40, 'K' }, { 37, 'L' },
- { 46, 'M' }, { 45, 'N' }, { 31, 'O' }, { 35, 'P' },
- { 12, 'Q' }, { 15, 'R' }, { 1, 'S' }, { 17, 'T' },
- { 32, 'U' }, { 9, 'V' }, { 13, 'W' }, { 7, 'X' },
- { 16, 'Y' }, { 6, 'Z' },
- { 33, '[' }, { 30, ']' }, { 50, '`' }, { 42, '\\' },
- { 51, fltk3::BackSpaceKey }, { 48, fltk3::TabKey }, { 36, fltk3::EnterKey },
{ 0x7F, fltk3::PauseKey },
- { 0x7F, fltk3::ScrollLockKey }, { 53, fltk3::EscapeKey }, { 0x73,
fltk3::HomeKey }, { 123, fltk3::LeftKey },
- { 126, fltk3::UpKey }, { 124, fltk3::RightKey }, { 125, fltk3::DownKey }, {
0x74, fltk3::PageUpKey },
- { 0x79, fltk3::PageDownKey }, { 119, fltk3::EndKey }, { 0x7F,
fltk3::PrintKey }, { 0x7F, fltk3::InsertKey },
- { 0x6e, fltk3::MenuKey }, { 114, fltk3::HelpKey }, { 0x47, fltk3::NumLockKey
},
- { 76, fltk3::KPEnterKey }, { 67, fltk3::KPKey+'*' }, { 69,
fltk3::KPKey+'+'}, { 78, fltk3::KPKey+'-' }, { 65, fltk3::KPKey+'.' }, { 75,
fltk3::KPKey+'/' },
- { 82, fltk3::KPKey+'0' }, { 83, fltk3::KPKey+'1' }, { 84, fltk3::KPKey+'2'
}, { 85, fltk3::KPKey+'3' },
- { 86, fltk3::KPKey+'4' }, { 87, fltk3::KPKey+'5' }, { 88, fltk3::KPKey+'6'
}, { 89, fltk3::KPKey+'7' },
- { 91, fltk3::KPKey+'8' }, { 92, fltk3::KPKey+'9' }, { 81, fltk3::KPKey+'='
},
- { 0x7a, fltk3::FKey+1 }, { 0x78, fltk3::FKey+2 }, { 0x63, fltk3::FKey+3 },
{ 0x76, fltk3::FKey+4 },
- { 0x60, fltk3::FKey+5 }, { 0x61, fltk3::FKey+6 }, { 0x62, fltk3::FKey+7 },
{ 0x64, fltk3::FKey+8 },
- { 0x65, fltk3::FKey+9 }, { 0x6D, fltk3::FKey+10 }, { 0x67, fltk3::FKey+11 },
{ 0x6f, fltk3::FKey+12 },
- { 0x69, fltk3::FKey+13 }, { 0x6B, fltk3::FKey+14 }, { 0x71, fltk3::FKey+15
}, { 0x6A, fltk3::FKey+16 },
- { 0x38, fltk3::ShiftLKey }, { 0x3C, fltk3::ShiftRKey }, { 0x3B,
fltk3::ControlLKey }, { 0x3E, fltk3::ControlRKey },
- { 0x39, fltk3::CapsLockKey }, { 0x37, fltk3::MetaLKey }, { 0x36,
fltk3::MetaRKey },
- { 0x3A, fltk3::AltLKey }, { 0x3D, fltk3::AltRKey }, { 0x75, fltk3::DeleteKey
},
+ { kVK_Space, ' ' }, { kVK_ANSI_Quote, '\'' }, { kVK_ANSI_Comma, ',' }, {
kVK_ANSI_Minus, '-' }, { kVK_ANSI_Period, '.' }, { kVK_ANSI_Slash, '/' },
+ { kVK_ANSI_0, '0' }, { kVK_ANSI_1, '1' }, { kVK_ANSI_2, '2' }, {
kVK_ANSI_3, '3' },
+ { kVK_ANSI_4, '4' }, { kVK_ANSI_5, '5' }, { kVK_ANSI_6, '6' }, {
kVK_ANSI_7, '7' },
+ { kVK_ANSI_8, '8' }, { kVK_ANSI_9, '9' }, { kVK_ANSI_Semicolon, ';' }, {
kVK_ANSI_Equal, '=' },
+ { kVK_ANSI_A, 'A' }, { kVK_ANSI_B, 'B' }, { kVK_ANSI_C, 'C' }, {
kVK_ANSI_D, 'D' },
+ { kVK_ANSI_E, 'E' }, { kVK_ANSI_F, 'F' }, { kVK_ANSI_G, 'G' }, {
kVK_ANSI_H, 'H' },
+ { kVK_ANSI_I, 'I' }, { kVK_ANSI_J, 'J' }, { kVK_ANSI_K, 'K' }, {
kVK_ANSI_L, 'L' },
+ { kVK_ANSI_M, 'M' }, { kVK_ANSI_N, 'N' }, { kVK_ANSI_O, 'O' }, {
kVK_ANSI_P, 'P' },
+ { kVK_ANSI_Q, 'Q' }, { kVK_ANSI_R, 'R' }, { kVK_ANSI_S, 'S' }, {
kVK_ANSI_T, 'T' },
+ { kVK_ANSI_U, 'U' }, { kVK_ANSI_V, 'V' }, { kVK_ANSI_W, 'W' }, {
kVK_ANSI_X, 'X' },
+ { kVK_ANSI_Y, 'Y' }, { kVK_ANSI_Z, 'Z' },
+ { kVK_ANSI_LeftBracket, '[' }, { kVK_ANSI_Backslash, '\\' },{
kVK_ANSI_RightBracket, ']' }, { kVK_ANSI_Grave, '`' },
+ { kVK_Delete, fltk3::BackSpaceKey }, { kVK_Tab, fltk3::TabKey }, {
kVK_Return, fltk3::EnterKey }, /*{ 0x7F, fltk3::PauseKey },
+ { 0x7F, fltk3::ScrollLockKey },*/ { kVK_Escape, fltk3::EscapeKey }, {
kVK_Home, fltk3::HomeKey }, { kVK_LeftArrow, fltk3::LeftKey },
+ { kVK_UpArrow, fltk3::UpKey }, { kVK_RightArrow, fltk3::RightKey }, {
kVK_DownArrow, fltk3::DownKey }, { kVK_PageUp, fltk3::PageUpKey },
+ { kVK_PageDown, fltk3::PageDownKey }, { kVK_End, fltk3::EndKey }, /*{ 0x7F,
fltk3::PrintKey }, { 0x7F, fltk3::InsertKey },*/
+ { 0x6e, fltk3::MenuKey }, { kVK_Help, fltk3::HelpKey }, {
kVK_ANSI_KeypadClear, fltk3::NumLockKey },
+ { kVK_ANSI_KeypadEnter, fltk3::KPEnterKey }, { kVK_ANSI_KeypadMultiply,
fltk3::KPKey+'*' }, { kVK_ANSI_KeypadPlus, fltk3::KPKey+'+'},
+ { kVK_ANSI_KeypadMinus, fltk3::KPKey+'-' }, { kVK_ANSI_KeypadDecimal,
fltk3::KPKey+'.' }, { kVK_ANSI_KeypadDivide, fltk3::KPKey+'/' },
+ { kVK_ANSI_Keypad0, fltk3::KPKey+'0' }, { kVK_ANSI_Keypad1, fltk3::KPKey+'1'
}, { kVK_ANSI_Keypad2, fltk3::KPKey+'2' }, { kVK_ANSI_Keypad3, fltk3::KPKey+'3'
},
+ { kVK_ANSI_Keypad4, fltk3::KPKey+'4' }, { kVK_ANSI_Keypad5, fltk3::KPKey+'5'
}, { kVK_ANSI_Keypad6, fltk3::KPKey+'6' }, { kVK_ANSI_Keypad7, fltk3::KPKey+'7'
},
+ { kVK_ANSI_Keypad8, fltk3::KPKey+'8' }, { kVK_ANSI_Keypad9, fltk3::KPKey+'9'
}, { kVK_ANSI_KeypadEquals, fltk3::KPKey+'=' },
+ { kVK_F1, fltk3::FKey+1 }, { kVK_F2, fltk3::FKey+2 }, { kVK_F3,
fltk3::FKey+3 }, { kVK_F4, fltk3::FKey+4 },
+ { kVK_F5, fltk3::FKey+5 }, { kVK_F6, fltk3::FKey+6 }, { kVK_F7,
fltk3::FKey+7 }, { kVK_F8, fltk3::FKey+8 },
+ { kVK_F9, fltk3::FKey+9 }, { kVK_F10, fltk3::FKey+10 }, { kVK_F11,
fltk3::FKey+11 }, { kVK_F12, fltk3::FKey+12 },
+ { kVK_F13, fltk3::FKey+13 }, { kVK_F14, fltk3::FKey+14 }, { kVK_F15,
fltk3::FKey+15 }, { kVK_F16, fltk3::FKey+16 },
+ { kVK_Shift, fltk3::ShiftLKey }, { kVK_RightShift, fltk3::ShiftRKey }, {
kVK_Control, fltk3::ControlLKey }, { kVK_RightControl, fltk3::ControlRKey },
+ { kVK_CapsLock, fltk3::CapsLockKey }, { kVK_Command, fltk3::MetaLKey }, {
0x36, fltk3::MetaRKey },
+ { kVK_Option, fltk3::AltLKey }, { kVK_RightOption, fltk3::AltRKey }, {
kVK_ForwardDelete, fltk3::DeleteKey },
};
+// Computes the macKeyLookUp table that transforms a Mac OS virtual keycode
into an FLTK keysym
+unsigned short *Fl_X::compute_macKeyLookUp()
+{
+ static unsigned short macKeyLookUp[128];
+ memset(macKeyLookUp, 0, sizeof(macKeyLookUp));
+ for (unsigned i = 0; i < sizeof(vktab)/sizeof(*vktab); i++) {
+ macKeyLookUp[vktab[i].vk] = vktab[i].fltk;
+ }
+ return macKeyLookUp;
+}
+
static int fltk2mac(int fltk) {
int a = 0;
int b = sizeof(vktab)/sizeof(*vktab);
Modified: branches/branch-3.0/test/keyboard_ui.fl
===================================================================
--- branches/branch-3.0/test/keyboard_ui.fl 2012-03-10 08:45:44 UTC (rev
9271)
+++ branches/branch-3.0/test/keyboard_ui.fl 2012-03-10 15:39:56 UTC (rev
9272)
@@ -286,7 +286,6 @@
}
{fltk3::Button} {} {
label {\\}
- user_data {'|'}
callback key_cb
xywh {282 120 28 20} labelsize 10 align 20
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
