summaryrefslogtreecommitdiff
path: root/src/Fl_get_key_mac.cxx
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2006-06-07 09:46:03 +0000
committerMatthias Melcher <fltk@matthiasm.com>2006-06-07 09:46:03 +0000
commitd2f9ebf9b94fd249589fc2f39dcbbb471f41f980 (patch)
tree428fbfe361a47cf6d311b6f29f4d28da99e56017 /src/Fl_get_key_mac.cxx
parentabd221aa5644e44a2c708d8e77ee26ae84913506 (diff)
OS X: fixed handling of the KP_Enter key which is at different key codes for the Powerbook vs. Desktop machines.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5182 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_get_key_mac.cxx')
-rw-r--r--src/Fl_get_key_mac.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Fl_get_key_mac.cxx b/src/Fl_get_key_mac.cxx
index 7a99f52f7..39ad9d263 100644
--- a/src/Fl_get_key_mac.cxx
+++ b/src/Fl_get_key_mac.cxx
@@ -96,8 +96,12 @@ int Fl::get_key(int k) {
printf("%08x %08x %08x %08x\n", (ulong*)(foo)[3], (ulong*)(foo)[2], (ulong*)(foo)[1], (ulong*)(foo)[0]);
}
#endif
- int i = fltk2mac(k);
unsigned char *b = (unsigned char*)foo;
+ // KP_Enter can be at different locations for Powerbooks vs. desktop Macs
+ if (k==FL_KP_Enter) {
+ return (((b[0x34>>3]>>(0x34&7))&1)||((b[0x4c>>3]>>(0x4c&7))&1));
+ }
+ int i = fltk2mac(k);
return (b[i>>3]>>(i&7))&1;
}