/* -*- 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
#include "openbox.h"
#include "mouse.h"
+#include "gettext.h"
#include <glib.h>
#include <string.h>
#include <stdlib.h>
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("Mod3", str) ||
+ !g_ascii_strcasecmp("M", 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;
!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);
+ g_message(_("Invalid modifier key '%s' in key/pointer binding"), str);
return 0;
}
/* 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 */
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;
+ g_message(_("Invalid button '%s' in pointer binding"), l);
+ goto translation_fail;
}
ret = TRUE;
/* 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)) {
/* 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);
}
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;