brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

accel-parse: Use libxkbcommon for keysym parsing

Browse Source 
This kills our dependency on GTK+ / GDK entirely.
This commit is contained in:
Jasper St. Pierre 2014-04-07 11:12:14 -04:00
parent 806f1742ac
commit e70f336a09
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/meta-accel-parse.c
View File

@ -26,7 +26,7 @@
#include "meta-accel-parse.h" #include "meta-accel-parse.h"
#include <gtk/gtk.h> #include <xkbcommon/xkbcommon.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@ -297,8 +297,8 @@ accelerator_parse (const gchar *accelerator,
} }
else else
{ {
keyval = gdk_keyval_from_name (accelerator); keyval = xkb_keysym_from_name (accelerator, XKB_KEYSYM_CASE_INSENSITIVE);
if (keyval == GDK_KEY_VoidSymbol) if (keyval == XKB_KEY_NoSymbol)
{ {
error = TRUE; error = TRUE;
goto out; goto out;
@ -315,7 +315,7 @@ out:
keyval = keycode = mods = 0; keyval = keycode = mods = 0;
if (accelerator_key) if (accelerator_key)
*accelerator_key = gdk_keyval_to_lower (keyval); *accelerator_key = keyval;
if (accelerator_keycode) if (accelerator_keycode)
*accelerator_keycode = keycode; *accelerator_keycode = keycode;
if (accelerator_mods) if (accelerator_mods)