#include <string.h>
#include <stdlib.h>
-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;
return 0;
}
-gboolean translate_button(char *str, guint *state, guint *button)
+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 */
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_warning("Invalid button '%s' in pointer binding.", l);
+ goto translation_fail;
}
ret = TRUE;
return ret;
}
-gboolean translate_key(char *str, guint *state, guint *keycode)
+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;
/* 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)) {
*keycode = XKeysymToKeycode(ob_display, sym);
}
if (!*keycode) {
- g_warning("Key '%s' does not exist on the display.", l);
- goto translation_fail;
+ g_warning("Key '%s' does not exist on the display.", l);
+ goto translation_fail;
}
ret = TRUE;