X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ftranslate.c;h=50d500082ce098757b795972700f6f4abebf4279;hb=HEAD;hp=11a88f662129c8ac12a229b6c5131e5735d0e4c8;hpb=ebe3091560a859996a9904c342c62b512b39bee0;p=chaz%2Fopenbox diff --git a/openbox/translate.c b/openbox/translate.c index 11a88f66..50d50008 100644 --- a/openbox/translate.c +++ b/openbox/translate.c @@ -1,7 +1,8 @@ /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- translate.c for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2006 Mikael Magnusson + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,49 +19,70 @@ #include "openbox.h" #include "mouse.h" +#include "gettext.h" +#include "obt/keyboard.h" + #include #include #include -static guint translate_modifier(char *str) +static guint translate_modifier(gchar *str) { - 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; + guint mask = 0; + + if (!g_ascii_strcasecmp("Mod1", str)) mask = Mod1Mask; + else if (!g_ascii_strcasecmp("Mod2", str)) mask = Mod2Mask; + else if (!g_ascii_strcasecmp("Mod3", str)) mask = Mod3Mask; + else if (!g_ascii_strcasecmp("Mod4", str)) mask = Mod4Mask; + else if (!g_ascii_strcasecmp("Mod5", str)) mask = Mod5Mask; + else if (!g_ascii_strcasecmp("Control", str) || - !g_ascii_strcasecmp("C", str)) return ControlMask; + !g_ascii_strcasecmp("C", str)) + mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_CONTROL); + else if (!g_ascii_strcasecmp("Alt", str) || + !g_ascii_strcasecmp("A", str)) + mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_ALT); + else if (!g_ascii_strcasecmp("Meta", str) || + !g_ascii_strcasecmp("M", str)) + mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_META); + /* W = windows key, is linked to the Super_L/R buttons */ + else if (!g_ascii_strcasecmp("Super", str) || + !g_ascii_strcasecmp("W", str)) + mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SUPER); else if (!g_ascii_strcasecmp("Shift", str) || - !g_ascii_strcasecmp("S", str)) return ShiftMask; - g_warning("Invalid modifier '%s' in binding.", str); - return 0; + !g_ascii_strcasecmp("S", str)) + mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_SHIFT); + else if (!g_ascii_strcasecmp("Hyper", str) || + !g_ascii_strcasecmp("H", str)) + mask = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_HYPER); + else + g_message(_("Invalid modifier key \"%s\" in key/mouse binding"), str); + + return mask; } gboolean translate_button(const gchar *str, guint *state, guint *button) { - char **parsed; - char *l; - int i; + gchar **parsed; + gchar *l; + gint i; gboolean ret = FALSE; parsed = g_strsplit(str, "-", -1); - + /* first, find the button (last token) */ l = NULL; for (i = 0; parsed[i] != NULL; ++i) - l = parsed[i]; + l = parsed[i]; if (l == NULL) - goto translation_fail; + goto translation_fail; /* figure out the mod mask */ *state = 0; for (i = 0; parsed[i] != l; ++i) { - guint m = translate_modifier(parsed[i]); - if (!m) goto translation_fail; - *state |= m; + guint m = translate_modifier(parsed[i]); + if (!m) goto translation_fail; + *state |= m; } /* figure out the button */ @@ -70,10 +92,8 @@ gboolean translate_button(const gchar *str, guint *state, guint *button) else if (!g_ascii_strcasecmp("Up", l)) *button = 4; else if (!g_ascii_strcasecmp("Down", l)) *button = 5; else if (!g_ascii_strncasecmp("Button", l, 6)) *button = atoi(l+6); - if (!*button) { - g_warning("Invalid button '%s' in pointer binding.", l); - goto translation_fail; - } + if (!*button) + goto translation_fail; ret = TRUE; @@ -84,27 +104,29 @@ translation_fail: gboolean translate_key(const gchar *str, guint *state, guint *keycode) { - char **parsed; - char *l; - int i; + gchar **parsed; + gchar *l; + gint i; gboolean ret = FALSE; KeySym sym; parsed = g_strsplit(str, "-", -1); - + + *state = *keycode = 0; + /* first, find the key (last token) */ l = NULL; for (i = 0; parsed[i] != NULL; ++i) - l = parsed[i]; + l = parsed[i]; if (l == NULL) - goto translation_fail; + goto translation_fail; /* figure out the mod mask */ *state = 0; for (i = 0; parsed[i] != l; ++i) { - guint m = translate_modifier(parsed[i]); - if (!m) goto translation_fail; - *state |= m; + guint m = translate_modifier(parsed[i]); + if (!m) goto translation_fail; + *state |= m; } if (!g_ascii_strncasecmp("0x", l, 2)) { @@ -113,21 +135,21 @@ gboolean translate_key(const gchar *str, guint *state, guint *keycode) /* take it directly */ *keycode = strtol(l, &end, 16); if (*l == '\0' || *end != '\0') { - g_warning("Invalid key code '%s' in key binding.", l); + g_message(_("Invalid key code \"%s\" in key binding"), l); goto translation_fail; } } else { /* figure out the keycode */ sym = XStringToKeysym(l); if (sym == NoSymbol) { - g_warning("Invalid key name '%s' in key binding.", l); + g_message(_("Invalid key name \"%s\" in key binding"), l); goto translation_fail; } - *keycode = XKeysymToKeycode(ob_display, sym); + *keycode = XKeysymToKeycode(obt_display, sym); } if (!*keycode) { - g_warning("Key '%s' does not exist on the display.", l); - goto translation_fail; + g_message(_("Requested key \"%s\" does not exist on the display"), l); + goto translation_fail; } ret = TRUE;