From f619f91a8fb8e01e399ab29c1f1355146d730bc4 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 30 Nov 2012 14:39:42 +0100 Subject: [PATCH] gtk: add more OSX special casing for the deadacute and deaddoubleacute keys So " plus foo prduces foo-with-diaereses and ' plus c produces c-with-cedilla. (cherry picked from commit c0102b30894401a9a1d6d93a972bcc6c37f1b5ac) --- gtk/gtkimcontextsimple.c | 49 ++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index ae88ef4d0c..1ffb42f60b 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -371,28 +371,53 @@ check_quartz_special_cases (GtkIMContextSimple *context_simple, gint n_compose) { GtkIMContextSimplePrivate *priv = context_simple->priv; + gunichar value = 0; - if (n_compose == 2 && - priv->compose_buffer[1] == GDK_KEY_space) + if (n_compose == 2) { - gunichar value = 0; - switch (priv->compose_buffer[0]) { case GDK_KEY_dead_doubleacute: - value = '"'; break; - } + switch (priv->compose_buffer[1]) + { + case GDK_KEY_dead_doubleacute: + case GDK_KEY_space: + value = '"'; break; - if (value > 0) - { - gtk_im_context_simple_commit_char (GTK_IM_CONTEXT (context_simple), value); - priv->compose_buffer[0] = 0; + case 'a': value = GDK_KEY_adiaeresis; break; + case 'A': value = GDK_KEY_Adiaeresis; break; + case 'e': value = GDK_KEY_ediaeresis; break; + case 'E': value = GDK_KEY_Ediaeresis; break; + case 'i': value = GDK_KEY_idiaeresis; break; + case 'I': value = GDK_KEY_Idiaeresis; break; + case 'o': value = GDK_KEY_odiaeresis; break; + case 'O': value = GDK_KEY_Odiaeresis; break; + case 'u': value = GDK_KEY_udiaeresis; break; + case 'U': value = GDK_KEY_Udiaeresis; break; + case 'y': value = GDK_KEY_ydiaeresis; break; + case 'Y': value = 0x0178; break; /* should be GDK_KEY_Ydiaeresis ?? */ + } + break; - GTK_NOTE (MISC, g_print ("quartz: U+%04X\n", value)); - return TRUE; + case GDK_KEY_dead_acute: + switch (priv->compose_buffer[1]) + { + case 'c': value = GDK_KEY_ccedilla; break; + case 'C': value = GDK_KEY_Ccedilla; break; + } + break; } } + if (value > 0) + { + gtk_im_context_simple_commit_char (GTK_IM_CONTEXT (context_simple), value); + priv->compose_buffer[0] = 0; + + GTK_NOTE (MISC, g_print ("quartz: U+%04X\n", value)); + return TRUE; + } + return FALSE; }