diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | src/Fl_get_key_mac.cxx | 8 | ||||
| -rw-r--r-- | src/Fl_mac.cxx | 9 |
3 files changed, 10 insertions, 8 deletions
@@ -1,5 +1,6 @@ CHANGES IN FLTK 1.1.4 + - Fl::get_key(x) would mix up Ctrl and Meta on OS X - The configure script used the wrong dynamic library linking command for OSX (STR #51) - The Fl_Text_Editor widget did not set changed() nor diff --git a/src/Fl_get_key_mac.cxx b/src/Fl_get_key_mac.cxx index a50d185df..dfb22b155 100644 --- a/src/Fl_get_key_mac.cxx +++ b/src/Fl_get_key_mac.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_get_key_mac.cxx,v 1.1.2.6 2003/01/30 21:43:05 easysw Exp $" +// "$Id: Fl_get_key_mac.cxx,v 1.1.2.7 2003/05/28 05:10:05 matthiaswm Exp $" // // MacOS keyboard state routines for the Fast Light Tool Kit (FLTK). // @@ -59,8 +59,8 @@ static const struct {unsigned short vk, fltk;} vktab[] = { { 0x7a, FL_F+1 }, { 0x78, FL_F+2 }, { 0x63, FL_F+3 }, { 0x76, FL_F+4 }, { 0x60, FL_F+5 }, { 0x61, FL_F+6 }, { 0x62, FL_F+7 }, { 0x64, FL_F+8 }, { 0x65, FL_F+9 }, { 0x6D, FL_F+10 }, { 0x67, FL_F+11 }, { 0x6f, FL_F+12 }, - { 56, FL_Shift_L }, { 56, FL_Shift_R }, { 55, FL_Control_L }, { 55, FL_Control_R }, - { 57, FL_Caps_Lock }, { 59, FL_Meta_L }, { 59, FL_Meta_R }, + { 56, FL_Shift_L }, { 56, FL_Shift_R }, { 59, FL_Control_L }, { 59, FL_Control_R }, + { 57, FL_Caps_Lock }, { 55, FL_Meta_L }, { 55, FL_Meta_R }, { 58, FL_Alt_L }, { 58, FL_Alt_R }, }; @@ -99,5 +99,5 @@ int Fl::get_key(int k) { } // -// End of "$Id: Fl_get_key_mac.cxx,v 1.1.2.6 2003/01/30 21:43:05 easysw Exp $". +// End of "$Id: Fl_get_key_mac.cxx,v 1.1.2.7 2003/05/28 05:10:05 matthiaswm Exp $". // diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx index 855b9536d..f2ee20c16 100644 --- a/src/Fl_mac.cxx +++ b/src/Fl_mac.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_mac.cxx,v 1.1.2.42 2003/05/26 14:19:48 easysw Exp $" +// "$Id: Fl_mac.cxx,v 1.1.2.43 2003/05/28 05:10:05 matthiaswm Exp $" // // MacOS specific code for the Fast Light Tool Kit (FLTK). // @@ -116,7 +116,7 @@ static unsigned short macKeyLookUp[128] = 'u', '[', 'i', 'p', FL_Enter, 'l', 'j', '\'', 'k', ';', '\\', ',', '/', 'n', 'm', '.', - FL_Tab, ' ', '`', FL_BackSpace, 0, FL_Escape, 0, 0, + FL_Tab, ' ', '`', FL_BackSpace, 0/*kp_enter on powerbook G4*/, FL_Escape, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, FL_KP+'.', FL_Right, FL_KP+'*', 0, FL_KP+'+', FL_Left, FL_Num_Lock, @@ -770,7 +770,8 @@ static void chord_to_e_state( UInt32 chord ) static ulong state[] = { 0, FL_BUTTON1, FL_BUTTON3, FL_BUTTON1|FL_BUTTON3, FL_BUTTON2, - FL_BUTTON2|FL_BUTTON1, FL_BUTTON2|FL_BUTTON3, FL_BUTTON2|FL_BUTTON1|FL_BUTTON3 + FL_BUTTON2|FL_BUTTON1, FL_BUTTON2|FL_BUTTON3, + FL_BUTTON2|FL_BUTTON1|FL_BUTTON3 }; Fl::e_state = ( Fl::e_state & 0xff0000 ) | state[ chord & 0x07 ]; } @@ -1775,6 +1776,6 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) { // -// End of "$Id: Fl_mac.cxx,v 1.1.2.42 2003/05/26 14:19:48 easysw Exp $". +// End of "$Id: Fl_mac.cxx,v 1.1.2.43 2003/05/28 05:10:05 matthiaswm Exp $". // |