AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

wayland: Small improvements to update_direction

Browse Source 
Avoid memory allocation if possible, and use the proper
min/max keycodes.
This commit is contained in:
Matthias Clasen 2016-05-03 23:14:05 -04:00
parent 09aa48b748
commit adc90b9e9d
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gdk/wayland/gdkkeys-wayland.c
View File

@ -462,22 +462,22 @@ static void
update_direction (GdkWaylandKeymap *keymap) update_direction (GdkWaylandKeymap *keymap)
{ {
gint num_layouts; gint num_layouts;
gint i;
gint *rtl; gint *rtl;
xkb_keycode_t min_keycode, max_keycode;
guint key; guint key;
gboolean have_rtl, have_ltr; gboolean have_rtl, have_ltr;
gint i;
num_layouts = xkb_keymap_num_layouts (keymap->xkb_keymap); num_layouts = xkb_keymap_num_layouts (keymap->xkb_keymap);
g_free (keymap->direction); keymap->direction = g_renew (PangoDirection, keymap->direction, num_layouts);
keymap->direction = g_new0 (PangoDirection, num_layouts); rtl = g_newa (gint, num_layouts);
rtl = g_new0 (gint, num_layouts); min_keycode = xkb_keymap_min_keycode (keymap->xkb_keymap);
max_keycode = xkb_keymap_max_keycode (keymap->xkb_keymap);
for (key = 8; key < 255; key++) /* FIXME: min/max keycode */ for (key = min_keycode; key < max_keycode; key++)
{ {
gint layouts; gint layouts, layout;
gint layout;
layouts = xkb_keymap_num_layouts_for_key (keymap->xkb_keymap, key); layouts = xkb_keymap_num_layouts_for_key (keymap->xkb_keymap, key);
for (layout = 0; layout < layouts; layout++) for (layout = 0; layout < layouts; layout++)
@ -490,6 +490,7 @@ update_direction (GdkWaylandKeymap *keymap)
for (sym = 0; sym < num_syms; sym++) for (sym = 0; sym < num_syms; sym++)
{ {
PangoDirection dir; PangoDirection dir;
dir = pango_unichar_direction (xkb_keysym_to_utf32 (syms[sym])); dir = pango_unichar_direction (xkb_keysym_to_utf32 (syms[sym]));
switch (dir) switch (dir)
{ {
@ -523,8 +524,6 @@ update_direction (GdkWaylandKeymap *keymap)
if (have_rtl && have_ltr) if (have_rtl && have_ltr)
keymap->bidi = TRUE; keymap->bidi = TRUE;
g_free (rtl);
} }
GdkKeymap * GdkKeymap *