[mutter/wayland] keybindings: Use xkb_keysym_get_name
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] keybindings: Use xkb_keysym_get_name
- Date: Mon, 7 Apr 2014 21:56:55 +0000 (UTC)
commit db058d4a81af745dee3865965edf9171cd716ad8
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon Apr 7 17:49:06 2014 -0400
keybindings: Use xkb_keysym_get_name
src/core/keybindings.c | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
---
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index cbe893d..1737057 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -196,6 +196,14 @@ reload_keymap (MetaDisplay *display)
&display->keysyms_per_keycode);
}
+static const char *
+keysym_name (xkb_keysym_t keysym)
+{
+ static char name[32] = "";
+ xkb_keysym_get_name (keysym, name, sizeof (name));
+ return name;
+}
+
static void
reload_modmap (MetaDisplay *display)
{
@@ -236,12 +244,9 @@ reload_modmap (MetaDisplay *display)
{
if (syms[j] != 0)
{
- const char *str;
-
- str = XKeysymToString (syms[j]);
meta_topic (META_DEBUG_KEYBINDINGS,
"Keysym %s bound to modifier 0x%x\n",
- str ? str : "none",
+ keysym_name (syms[j]),
(1 << ( i / modmap->max_keypermod)));
}
@@ -1020,18 +1025,6 @@ meta_display_shutdown_keys (MetaDisplay *display)
g_hash_table_destroy (display->key_bindings);
}
-static const char*
-keysym_name (int keysym)
-{
- const char *name;
-
- name = XKeysymToString (keysym);
- if (name == NULL)
- name = "(unknown)";
-
- return name;
-}
-
/* Grab/ungrab, ignoring all annoying modifiers like NumLock etc. */
static void
meta_change_keygrab (MetaDisplay *display,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]