| 1 |
remi 08/10/01 21:49:04 |
| 2 |
|
| 3 |
Added: gtk+-2.14.3-reorder-compose-key-table-order.patch |
| 4 |
gtk+-2.14.3-fix-combining-broken-diacritics.patch |
| 5 |
Log: |
| 6 |
x11-libs/gtk+: fix broken diacritics on intl keyboards (see gnome bug #554192) |
| 7 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.25-gentoo-r3 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-libs/gtk+/files/gtk+-2.14.3-reorder-compose-key-table-order.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/files/gtk+-2.14.3-reorder-compose-key-table-order.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/files/gtk+-2.14.3-reorder-compose-key-table-order.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gtk+-2.14.3-reorder-compose-key-table-order.patch |
| 16 |
=================================================================== |
| 17 |
Index: gtk/gtkimcontextsimple.c |
| 18 |
=================================================================== |
| 19 |
--- gtk/gtkimcontextsimple.c (revision 21564) |
| 20 |
+++ gtk/gtkimcontextsimple.c (working copy) |
| 21 |
@@ -933,12 +933,12 @@ |
| 22 |
return TRUE; |
| 23 |
tmp_list = tmp_list->next; |
| 24 |
} |
| 25 |
- |
| 26 |
- if (check_algorithmically (context_simple, n_compose)) |
| 27 |
- return TRUE; |
| 28 |
|
| 29 |
if (check_compact_table (context_simple, >k_compose_table_compact, n_compose)) |
| 30 |
return TRUE; |
| 31 |
+ |
| 32 |
+ if (check_algorithmically (context_simple, n_compose)) |
| 33 |
+ return TRUE; |
| 34 |
} |
| 35 |
|
| 36 |
/* The current compose_buffer doesn't match anything */ |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.1 x11-libs/gtk+/files/gtk+-2.14.3-fix-combining-broken-diacritics.patch |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/files/gtk+-2.14.3-fix-combining-broken-diacritics.patch?rev=1.1&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/files/gtk+-2.14.3-fix-combining-broken-diacritics.patch?rev=1.1&content-type=text/plain |
| 44 |
|
| 45 |
Index: gtk+-2.14.3-fix-combining-broken-diacritics.patch |
| 46 |
=================================================================== |
| 47 |
Index: gtk/gtkimcontextsimple.c |
| 48 |
=================================================================== |
| 49 |
--- gtk/gtkimcontextsimple.c (revision 21556) |
| 50 |
+++ gtk/gtkimcontextsimple.c (revision 21557) |
| 51 |
@@ -407,11 +407,19 @@ |
| 52 |
return FALSE; |
| 53 |
} |
| 54 |
|
| 55 |
-/* When updating the table of the compose sequences, also update here. |
| 56 |
+/* Checks if a keysym is a dead key. Dead key keysym values are defined in |
| 57 |
+ * ../gdk/gdkkeysyms.h and the first is GDK_dead_grave. As X.Org is updated, |
| 58 |
+ * more dead keys are added and we need to update the upper limit. |
| 59 |
+ * Also checks if the keysym belongs to the non-spacing mark Unicode category, |
| 60 |
+ * by invoking gdk_keyval_to_unicode(). For keysyms like 0x1000000 + 0x0301, |
| 61 |
+ * it converts them to 0x301, which makes g_unichar_type() report them as |
| 62 |
+ * non-spacing mark. Thus, we check that the value is less then 0x1000000. |
| 63 |
+ * check_algorithmically() does not handle keysyms > 0x1000000. |
| 64 |
*/ |
| 65 |
#define IS_DEAD_KEY(k) \ |
| 66 |
(((k) >= GDK_dead_grave && (k) <= (GDK_dead_dasia+1)) || \ |
| 67 |
- g_unichar_type (gdk_keyval_to_unicode (k)) == G_UNICODE_NON_SPACING_MARK) |
| 68 |
+ ((g_unichar_type (gdk_keyval_to_unicode (k)) == G_UNICODE_NON_SPACING_MARK) && \ |
| 69 |
+ ((k) < 0x1000000))) |
| 70 |
|
| 71 |
static gboolean |
| 72 |
check_algorithmically (GtkIMContextSimple *context_simple, |
Archives