Author: spitzak
Date: 2007-04-10 06:47:10 -0400 (Tue, 10 Apr 2007)
New Revision: 5774
Log:
More checks of cross-platform compatabiltiy reveals that alt+x is not moved to
ctrl+x
on OS/X. Made the #x keyname not do this. Also changed it to parse the output of
keyname (disagreement on "command" and "cmd").
Modified:
trunk/src/key_name.cxx
Modified: trunk/src/key_name.cxx
===================================================================
--- trunk/src/key_name.cxx 2007-04-10 10:44:56 UTC (rev 5773)
+++ trunk/src/key_name.cxx 2007-04-10 10:47:10 UTC (rev 5774)
@@ -177,11 +177,11 @@
int shifts = 0;
while (name[0] && name[1]) {
if (*name == '#') {
- shifts |= fltk::ACCELERATOR; name++;
+ shifts |= fltk::ALT; name++;
} else if (*name == '+') {
shifts |= fltk::SHIFT; name++;
} else if (*name == '^') {
- shifts |= fltk::COMMAND; name++;
+ shifts |= fltk::COMMAND; name++; // ctrl on win/linux, meta on os/x
} else if (!strncasecmp(name, "alt", 3) && (name[3]=='-'||name[3]=='+')) {
shifts |= fltk::ALT; name += 4;
} else if (!strncasecmp(name, "shift",5) && (name[5]=='-'||name[5]=='+')) {
@@ -190,10 +190,10 @@
shifts |= fltk::CTRL; name += 5;
} else if (!strncasecmp(name, "meta", 4) && (name[4]=='-'||name[4]=='+')) {
shifts |= fltk::META; name += 5;
- } else if (!strncasecmp(name,"accelerator",11)&&
(name[11]=='-'||name[11]=='+')) {
- shifts |= fltk::ACCELERATOR; name += 12;
- } else if (!strncasecmp(name,"command",7)&& (name[7]=='-'||name[7]=='+')) {
- shifts |= fltk::COMMAND; name += 8;
+// } else if (!strncasecmp(name,"accelerator",11)&&
(name[11]=='-'||name[11]=='+')) {
+// shifts |= fltk::ACCELERATOR; name += 12;
+ } else if (!strncasecmp(name, "cmd", 3) && (name[3]=='-'||name[3]=='+')) {
+ shifts |= fltk::COMMAND; name += 4; // ctrl on win/linux, meta on os/x
} else break;
}
if (!*name) return 0;
_______________________________________________
fltk-commit mailing list
fltk-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/fltk-commit
