s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash in key replace logic.

Browse Source
This commit is contained in:
Daiki Ueno
2011-08-25 05:30:54 +09:00
parent 2f64b3ee13
commit 6fb96ea5d6
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/client.c
View File

@ -835,7 +835,7 @@ replace_keycode (Client *client,
if (replaced_keycode == 0) if (replaced_keycode == 0)
return FALSE; return FALSE;
replaced_keysym = XKeycodeToKeysym (xdisplay, replaced_keycode, 0); replaced_keysym = XKeycodeToKeysym (xdisplay, replaced_keycode, 0);
XFlush (xdisplay); XSync (xdisplay, False);
offset = client->xkb->map->key_sym_map[replaced_keycode].offset; offset = client->xkb->map->key_sym_map[replaced_keycode].offset;
client->xkb->map->syms[offset] = *keysym; client->xkb->map->syms[offset] = *keysym;
@ -845,7 +845,7 @@ replace_keycode (Client *client,
changes.num_key_syms = 1; changes.num_key_syms = 1;
XkbChangeMap (xdisplay, client->xkb, &changes); XkbChangeMap (xdisplay, client->xkb, &changes);
XFlush (xdisplay); XSync (xdisplay, False);
*keycode = replaced_keycode; *keycode = replaced_keycode;
*keysym = replaced_keysym; *keysym = replaced_keysym;
@ -860,7 +860,7 @@ get_keycode_from_gdk_keymap (Client *client,
guint *modifiers) guint *modifiers)
{ {
GdkKeymap *keymap = gdk_keymap_get_default (); GdkKeymap *keymap = gdk_keymap_get_default ();
GdkKeymapKey *keys, *best_match; GdkKeymapKey *keys, *best_match = NULL;
gint n_keys, i; gint n_keys, i;
if (!gdk_keymap_get_entries_for_keyval (keymap, keysym, &keys, &n_keys)) if (!gdk_keymap_get_entries_for_keyval (keymap, keysym, &keys, &n_keys))
@ -870,11 +870,15 @@ get_keycode_from_gdk_keymap (Client *client,
if (keys[i].group == eekboard_context_get_group (client->context, NULL)) if (keys[i].group == eekboard_context_get_group (client->context, NULL))
best_match = &keys[i]; best_match = &keys[i];
if (!best_match) {
g_free (keys);
return FALSE;
}
*keycode = best_match->keycode; *keycode = best_match->keycode;
*modifiers = best_match->level == 1 ? EEK_SHIFT_MASK : 0; *modifiers = best_match->level == 1 ? EEK_SHIFT_MASK : 0;
g_free (keys); g_free (keys);
return TRUE; return TRUE;
} }
@ -931,7 +935,10 @@ send_fake_key_event (Client *client,
/* Clear level shift modifiers */ /* Clear level shift modifiers */
keyboard_modifiers &= ~EEK_SHIFT_MASK; keyboard_modifiers &= ~EEK_SHIFT_MASK;
keyboard_modifiers &= ~EEK_LOCK_MASK; keyboard_modifiers &= ~EEK_LOCK_MASK;
//keyboard_modifiers &= ~eek_keyboard_get_alt_gr_mask (client->keyboard); /* FIXME: may need to remap ISO_Level3_Shift and NumLock */
//keyboard_modifiers &= ~EEK_MOD5_MASK;
//keyboard_modifiers &= ~client->alt_gr_mask;
//keyboard_modifiers &= ~client->num_lock_mask;
modifiers |= keyboard_modifiers; modifiers |= keyboard_modifiers;
@ -972,6 +979,7 @@ on_key_pressed (EekboardContext *context,
if (g_strcmp0 (eek_symbol_get_name (symbol), "preferences") == 0) { if (g_strcmp0 (eek_symbol_get_name (symbol), "preferences") == 0) {
PreferencesDialog *dialog = preferences_dialog_new (); PreferencesDialog *dialog = preferences_dialog_new ();
preferences_dialog_run (dialog); preferences_dialog_run (dialog);
return;
} }