#include "openbox.h"
#include "mouse.h"
#include "modkeys.h"
+#include "translate.h"
#include "gettext.h"
#include <glib.h>
#include <string.h>
!g_ascii_strcasecmp("H", str))
mask = modkeys_key_to_mask(OB_MODKEY_KEY_HYPER);
else
- g_message(_("Invalid modifier key '%s' in key/mouse binding"), str);
+ g_message(_("Invalid modifier key \"%s\" in key/mouse binding"), str);
return mask;
}
gboolean ret = FALSE;
parsed = g_strsplit(str, "-", -1);
-
+
/* first, find the button (last token) */
l = NULL;
for (i = 0; parsed[i] != NULL; ++i)
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)
/* take it directly */
*keycode = strtol(l, &end, 16);
if (*l == '\0' || *end != '\0') {
- g_message(_("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_message(_("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_message(_("Requested key '%s' does not exist on the display"), l);
+ g_message(_("Requested key \"%s\" does not exist on the display"), l);
goto translation_fail;
}
return ret;
}
-const gchar *translate_keycode(guint keycode)
+gchar *translate_keycode(guint keycode)
{
KeySym sym;
const gchar *ret = NULL;
{
gunichar unikey = 0;
- const char *key;
+ char *key;
if ((key = translate_keycode(keycode)) != NULL &&
/* don't accept keys that aren't a single letter, like "space" */
key[1] == '\0')
if (unikey == (gunichar)-1 || unikey == (gunichar)-2 || unikey == 0)
unikey = 0;
}
+ g_free(key);
return unikey;
}