callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow holding compose key while entering a sequence

Browse Source 
This broke when we started allowing Super, Hyper and Meta as
accel modifiers. See bug 601959.
This commit is contained in:
Matthias Clasen
2009-11-28 21:47:36 -05:00
parent bbb4e4910b
commit c08ed56f13
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkimcontextsimple.c
View File

@ -860,7 +860,10 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
/* If we are already in a non-hex sequence, or /* If we are already in a non-hex sequence, or
* this keystroke is not hex modifiers + hex digit, don't filter * this keystroke is not hex modifiers + hex digit, don't filter
* key events with accelerator modifiers held down. * key events with accelerator modifiers held down. We only treat
* Control and Alt as accel modifiers here, since Super, Hyper and
* Meta are often co-located with Mode_Switch, Multi_Key or
* ISO_Level3_Switch.
*/ */
if (!have_hex_mods || if (!have_hex_mods ||
(n_compose > 0 && !context_simple->in_hex_sequence) || (n_compose > 0 && !context_simple->in_hex_sequence) ||
@ -868,7 +871,7 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
(context_simple->in_hex_sequence && !hex_keyval && (context_simple->in_hex_sequence && !hex_keyval &&
!is_hex_start && !is_hex_end && !is_escape && !is_backspace)) !is_hex_start && !is_hex_end && !is_escape && !is_backspace))
{ {
if (event->state & (gtk_accelerator_get_default_mod_mask () & ~GDK_SHIFT_MASK) || if (event->state & (GDK_MOD1_MASK | GDK_CONTROL_MASK) ||
(context_simple->in_hex_sequence && context_simple->modifiers_dropped && (context_simple->in_hex_sequence && context_simple->modifiers_dropped &&
(event->keyval == GDK_Return || (event->keyval == GDK_Return ||
event->keyval == GDK_ISO_Enter || event->keyval == GDK_ISO_Enter ||