X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=plugins%2Fkeyboard%2Ftranslate.c;h=25e1c6a6a0e388819ca117f4b88894537bd0977f;hb=1fb5c4b595677a029c75b75ef85a69ec90160da8;hp=9de898e670fa4d1afc5692e35bb21a8d161381a9;hpb=930891f119321043d2a6172975d7b9c8568145f9;p=chaz%2Fopenbox diff --git a/plugins/keyboard/translate.c b/plugins/keyboard/translate.c index 9de898e6..25e1c6a6 100644 --- a/plugins/keyboard/translate.c +++ b/plugins/keyboard/translate.c @@ -4,13 +4,17 @@ static guint translate_modifier(char *str) { - if (!strcmp("Mod1", str) || !strcmp("A", str)) return Mod1Mask; - else if (!strcmp("Mod2", str)) return Mod2Mask; - else if (!strcmp("Mod3", str)) return Mod3Mask; - else if (!strcmp("Mod4", str) || !strcmp("W", str)) return Mod4Mask; - else if (!strcmp("Mod5", str)) return Mod5Mask; - else if (!strcmp("Control", str) || !strcmp("C", str)) return ControlMask; - else if (!strcmp("Shift", str) || !strcmp("S", str)) return ShiftMask; + if (!g_ascii_strcasecmp("Mod1", str) || + !g_ascii_strcasecmp("A", str)) return Mod1Mask; + else if (!g_ascii_strcasecmp("Mod2", str)) return Mod2Mask; + else if (!g_ascii_strcasecmp("Mod3", str)) return Mod3Mask; + else if (!g_ascii_strcasecmp("Mod4", str) || + !g_ascii_strcasecmp("W", str)) return Mod4Mask; + else if (!g_ascii_strcasecmp("Mod5", str)) return Mod5Mask; + else if (!g_ascii_strcasecmp("Control", str) || + !g_ascii_strcasecmp("C", str)) return ControlMask; + else if (!g_ascii_strcasecmp("Shift", str) || + !g_ascii_strcasecmp("S", str)) return ShiftMask; g_warning("Invalid modifier '%s' in binding.", str); return 0; } @@ -47,7 +51,7 @@ gboolean translate_key(char *str, guint *state, guint *keycode) goto translation_fail; } *keycode = XKeysymToKeycode(ob_display, sym); - if (!keycode) { + if (!*keycode) { g_warning("Key '%s' does not exist on the display.", l); goto translation_fail; }