diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-01-29 23:33:07 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-01-29 23:33:07 +0000 |
| commit | a5f9b185ab432db4c6e259bbf6284f8c4bdd0569 (patch) | |
| tree | fc3420bd8d10f6c8a4874f4895056ce69ef38449 /modules | |
| parent | bdca6b33b8601efad6c3ba9ee767f91664479491 (diff) | |
| download | gdk-pixbuf-a5f9b185ab432db4c6e259bbf6284f8c4bdd0569.tar.gz | |
gtk/gtktextlayout.c (line_display_iter_to_index) Only adjust the preedit
Thu Jan 29 18:08:06 2004 Owen Taylor <otaylor@redhat.com>
* gtk/gtktextlayout.c (line_display_iter_to_index)
* gtk/gtktextlayout.c (line_display_index_to_iter): Only
adjust the preedit position for lines that include the
preedit string. (#132353, Yao Zhang). How the heck
did this work as well as it did?!?!
* modules/input/gtkimcontextxim.c (gtk_im_context_xim_get_ic):
Reverse change to change of XNFilterEvents event mask from
#110493 -- it's documented and in the Xlib code an
unsigned long.
* modules/input/gtkimcontextxim.c (preedit_start_callback):
Return -1 rather than void to indicate no length limit.
(#129548)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/input/gtkimcontextxim.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c index d865fc271..6b27aa3f0 100644 --- a/modules/input/gtkimcontextxim.c +++ b/modules/input/gtkimcontextxim.c @@ -966,7 +966,7 @@ gtk_im_context_xim_get_preedit_string (GtkIMContext *context, *cursor_pos = context_xim->preedit_cursor; } -static void +static int preedit_start_callback (XIC xic, XPointer client_data, XPointer call_data) @@ -976,6 +976,8 @@ preedit_start_callback (XIC xic, if (!context_xim->finalizing) g_signal_emit_by_name (context, "preedit_start"); + + return -1; /* No length limit */ } static void @@ -1276,7 +1278,7 @@ gtk_im_context_xim_get_ic (GtkIMContextXIM *context_xim) * stroke if both key pressed and released events are filtered. * (bugzilla #81759) */ - guint32 mask = 0xaaaaaaaa; + gulong mask = 0xaaaaaaaa; XGetICValues (xic, XNFilterEvents, &mask, NULL); |