mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-25 13:11:13 +00:00
Patch to add support for string conversion callbacks to
GtkIMContextXIM (#101814)
This commit is contained in:
parent
d517de5f91
commit
eecb33d6b0
19
ChangeLog
19
ChangeLog
@ -1,3 +1,22 @@
|
|||||||
|
2004-04-24 Theppitak Karoonboonyanan <thep@linux.thainet>
|
||||||
|
|
||||||
|
Patch to add support for string conversion callbacks to
|
||||||
|
GtkIMContextXIM (#101814)
|
||||||
|
|
||||||
|
* modules/input/gtkimcontextxim.c: Set the string conversion callback
|
||||||
|
if supported by the XIC.
|
||||||
|
|
||||||
|
(struct _GtkIMContextXIM): Add string_conversion_callback member.
|
||||||
|
|
||||||
|
(struct _GtkXIMInfo, setup_im): Check and keep flag inidicating
|
||||||
|
whether string conversion callback is supported.
|
||||||
|
|
||||||
|
(gtk_im_context_get_ic, +set_string_conversion_callback,
|
||||||
|
+string_conversion_callback): Also initialize string conversion
|
||||||
|
callback, if supported, along with the IC initialization.
|
||||||
|
|
||||||
|
* modules/input/imxim.c: Make "xim" module default for Thai as well.
|
||||||
|
|
||||||
2004-04-23 Matthias Clasen <mclasen@redhat.com>
|
2004-04-23 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly
|
* gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly
|
||||||
|
@ -1,3 +1,22 @@
|
|||||||
|
2004-04-24 Theppitak Karoonboonyanan <thep@linux.thainet>
|
||||||
|
|
||||||
|
Patch to add support for string conversion callbacks to
|
||||||
|
GtkIMContextXIM (#101814)
|
||||||
|
|
||||||
|
* modules/input/gtkimcontextxim.c: Set the string conversion callback
|
||||||
|
if supported by the XIC.
|
||||||
|
|
||||||
|
(struct _GtkIMContextXIM): Add string_conversion_callback member.
|
||||||
|
|
||||||
|
(struct _GtkXIMInfo, setup_im): Check and keep flag inidicating
|
||||||
|
whether string conversion callback is supported.
|
||||||
|
|
||||||
|
(gtk_im_context_get_ic, +set_string_conversion_callback,
|
||||||
|
+string_conversion_callback): Also initialize string conversion
|
||||||
|
callback, if supported, along with the IC initialization.
|
||||||
|
|
||||||
|
* modules/input/imxim.c: Make "xim" module default for Thai as well.
|
||||||
|
|
||||||
2004-04-23 Matthias Clasen <mclasen@redhat.com>
|
2004-04-23 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly
|
* gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly
|
||||||
|
@ -1,3 +1,22 @@
|
|||||||
|
2004-04-24 Theppitak Karoonboonyanan <thep@linux.thainet>
|
||||||
|
|
||||||
|
Patch to add support for string conversion callbacks to
|
||||||
|
GtkIMContextXIM (#101814)
|
||||||
|
|
||||||
|
* modules/input/gtkimcontextxim.c: Set the string conversion callback
|
||||||
|
if supported by the XIC.
|
||||||
|
|
||||||
|
(struct _GtkIMContextXIM): Add string_conversion_callback member.
|
||||||
|
|
||||||
|
(struct _GtkXIMInfo, setup_im): Check and keep flag inidicating
|
||||||
|
whether string conversion callback is supported.
|
||||||
|
|
||||||
|
(gtk_im_context_get_ic, +set_string_conversion_callback,
|
||||||
|
+string_conversion_callback): Also initialize string conversion
|
||||||
|
callback, if supported, along with the IC initialization.
|
||||||
|
|
||||||
|
* modules/input/imxim.c: Make "xim" module default for Thai as well.
|
||||||
|
|
||||||
2004-04-23 Matthias Clasen <mclasen@redhat.com>
|
2004-04-23 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly
|
* gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly
|
||||||
|
@ -1,3 +1,22 @@
|
|||||||
|
2004-04-24 Theppitak Karoonboonyanan <thep@linux.thainet>
|
||||||
|
|
||||||
|
Patch to add support for string conversion callbacks to
|
||||||
|
GtkIMContextXIM (#101814)
|
||||||
|
|
||||||
|
* modules/input/gtkimcontextxim.c: Set the string conversion callback
|
||||||
|
if supported by the XIC.
|
||||||
|
|
||||||
|
(struct _GtkIMContextXIM): Add string_conversion_callback member.
|
||||||
|
|
||||||
|
(struct _GtkXIMInfo, setup_im): Check and keep flag inidicating
|
||||||
|
whether string conversion callback is supported.
|
||||||
|
|
||||||
|
(gtk_im_context_get_ic, +set_string_conversion_callback,
|
||||||
|
+string_conversion_callback): Also initialize string conversion
|
||||||
|
callback, if supported, along with the IC initialization.
|
||||||
|
|
||||||
|
* modules/input/imxim.c: Make "xim" module default for Thai as well.
|
||||||
|
|
||||||
2004-04-23 Matthias Clasen <mclasen@redhat.com>
|
2004-04-23 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly
|
* gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly
|
||||||
|
@ -1,3 +1,22 @@
|
|||||||
|
2004-04-24 Theppitak Karoonboonyanan <thep@linux.thainet>
|
||||||
|
|
||||||
|
Patch to add support for string conversion callbacks to
|
||||||
|
GtkIMContextXIM (#101814)
|
||||||
|
|
||||||
|
* modules/input/gtkimcontextxim.c: Set the string conversion callback
|
||||||
|
if supported by the XIC.
|
||||||
|
|
||||||
|
(struct _GtkIMContextXIM): Add string_conversion_callback member.
|
||||||
|
|
||||||
|
(struct _GtkXIMInfo, setup_im): Check and keep flag inidicating
|
||||||
|
whether string conversion callback is supported.
|
||||||
|
|
||||||
|
(gtk_im_context_get_ic, +set_string_conversion_callback,
|
||||||
|
+string_conversion_callback): Also initialize string conversion
|
||||||
|
callback, if supported, along with the IC initialization.
|
||||||
|
|
||||||
|
* modules/input/imxim.c: Make "xim" module default for Thai as well.
|
||||||
|
|
||||||
2004-04-23 Matthias Clasen <mclasen@redhat.com>
|
2004-04-23 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
* gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly
|
* gtk/gtkclipboard.c (gtk_clipboard_wait_for_targets): Correctly
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include "locale.h"
|
#include "locale.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "gtk/gtkintl.h"
|
#include "gtk/gtkintl.h"
|
||||||
#include "gtk/gtklabel.h"
|
#include "gtk/gtklabel.h"
|
||||||
@ -63,6 +64,8 @@ struct _GtkIMContextXIM
|
|||||||
XIMCallback status_done_callback;
|
XIMCallback status_done_callback;
|
||||||
XIMCallback status_draw_callback;
|
XIMCallback status_draw_callback;
|
||||||
|
|
||||||
|
XICCallback string_conversion_callback;
|
||||||
|
|
||||||
XIC ic;
|
XIC ic;
|
||||||
|
|
||||||
guint filter_key_release : 1;
|
guint filter_key_release : 1;
|
||||||
@ -87,6 +90,7 @@ struct _GtkXIMInfo
|
|||||||
GSList *ics;
|
GSList *ics;
|
||||||
|
|
||||||
guint reconnecting :1;
|
guint reconnecting :1;
|
||||||
|
guint supports_string_conversion;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* A context status window; these are kept in the status_windows list. */
|
/* A context status window; these are kept in the status_windows list. */
|
||||||
@ -347,21 +351,31 @@ setup_im (GtkXIMInfo *info)
|
|||||||
G_CALLBACK (preedit_style_change),
|
G_CALLBACK (preedit_style_change),
|
||||||
info);
|
info);
|
||||||
|
|
||||||
status_style_change (info);
|
info->supports_string_conversion = FALSE;
|
||||||
preedit_style_change (info);
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
if (ic_values)
|
if (ic_values)
|
||||||
{
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < ic_values->count_values; i++)
|
||||||
|
if (strcmp (ic_values->supported_values[i],
|
||||||
|
XNStringConversionCallback) == 0)
|
||||||
|
{
|
||||||
|
info->supports_string_conversion = TRUE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
for (i = 0; i < ic_values->count_values; i++)
|
for (i = 0; i < ic_values->count_values; i++)
|
||||||
g_print ("%s\n", ic_values->supported_values[i]);
|
g_print ("%s\n", ic_values->supported_values[i]);
|
||||||
for (i = 0; i < xim_styles->count_styles; i++)
|
for (i = 0; i < xim_styles->count_styles; i++)
|
||||||
g_print ("%#x\n", xim_styles->supported_styles[i]);
|
g_print ("%#x\n", xim_styles->supported_styles[i]);
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (ic_values)
|
XFree (ic_values);
|
||||||
XFree (ic_values);
|
}
|
||||||
|
|
||||||
|
status_style_change (info);
|
||||||
|
preedit_style_change (info);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -1186,6 +1200,120 @@ status_draw_callback (XIC xic,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
string_conversion_callback (XIC xic, XPointer client_data, XPointer call_data)
|
||||||
|
{
|
||||||
|
GtkIMContextXIM *context_xim;
|
||||||
|
XIMStringConversionCallbackStruct *conv_data;
|
||||||
|
gchar *surrounding;
|
||||||
|
gint cursor_index;
|
||||||
|
|
||||||
|
context_xim = (GtkIMContextXIM *)client_data;
|
||||||
|
conv_data = (XIMStringConversionCallbackStruct *)call_data;
|
||||||
|
|
||||||
|
if (gtk_im_context_get_surrounding ((GtkIMContext *)context_xim,
|
||||||
|
&surrounding, &cursor_index))
|
||||||
|
{
|
||||||
|
gchar *text = NULL;
|
||||||
|
gsize text_len = 0;
|
||||||
|
gint subst_offset = 0, subst_nchars = 0;
|
||||||
|
gint i;
|
||||||
|
gchar *p = surrounding + cursor_index, *q;
|
||||||
|
gshort position = (gshort)conv_data->position;
|
||||||
|
|
||||||
|
if (position > 0)
|
||||||
|
{
|
||||||
|
for (i = position; i > 0 && *p; --i)
|
||||||
|
p = g_utf8_next_char (p);
|
||||||
|
if (i > 0)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
/* According to X11R6.4 Xlib - C Library Reference Manual
|
||||||
|
* section 13.5.7.3 String Conversion Callback,
|
||||||
|
* XIMStringConversionPosition is starting position _relative_
|
||||||
|
* to current client's cursor position. So it should be able
|
||||||
|
* to be negative, or referring to a position before the cursor
|
||||||
|
* would be impossible. But current X protocol defines this as
|
||||||
|
* unsigned short. So, compiler may warn about the value range
|
||||||
|
* here. We hope the X protocol is fixed soon.
|
||||||
|
*/
|
||||||
|
else if (position < 0)
|
||||||
|
{
|
||||||
|
for (i = position; i < 0 && p > surrounding; ++i)
|
||||||
|
p = g_utf8_prev_char (p);
|
||||||
|
if (i < 0)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (conv_data->direction)
|
||||||
|
{
|
||||||
|
case XIMForwardChar:
|
||||||
|
for (i = conv_data->factor, q = p; i > 0 && *q; --i)
|
||||||
|
q = g_utf8_next_char (q);
|
||||||
|
if (i > 0)
|
||||||
|
break;
|
||||||
|
text = g_locale_from_utf8 (p, q - p, NULL, &text_len, NULL);
|
||||||
|
subst_offset = position;
|
||||||
|
subst_nchars = conv_data->factor;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case XIMBackwardChar:
|
||||||
|
for (i = conv_data->factor, q = p; i > 0 && q > surrounding; --i)
|
||||||
|
q = g_utf8_prev_char (q);
|
||||||
|
if (i > 0)
|
||||||
|
break;
|
||||||
|
text = g_locale_from_utf8 (q, p - q, NULL, &text_len, NULL);
|
||||||
|
subst_offset = position - conv_data->factor;
|
||||||
|
subst_nchars = conv_data->factor;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case XIMForwardWord:
|
||||||
|
case XIMBackwardWord:
|
||||||
|
case XIMCaretUp:
|
||||||
|
case XIMCaretDown:
|
||||||
|
case XIMNextLine:
|
||||||
|
case XIMPreviousLine:
|
||||||
|
case XIMLineStart:
|
||||||
|
case XIMLineEnd:
|
||||||
|
case XIMAbsolutePosition:
|
||||||
|
case XIMDontChange:
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
/* block out any failure happenning to "text", including conversion */
|
||||||
|
if (text)
|
||||||
|
{
|
||||||
|
conv_data->text = (XIMStringConversionText *)
|
||||||
|
malloc (sizeof (XIMStringConversionText));
|
||||||
|
if (conv_data->text)
|
||||||
|
{
|
||||||
|
conv_data->text->length = text_len;
|
||||||
|
conv_data->text->feedback = NULL;
|
||||||
|
conv_data->text->encoding_is_wchar = False;
|
||||||
|
conv_data->text->string.mbs = (char *)malloc (text_len);
|
||||||
|
if (conv_data->text->string.mbs)
|
||||||
|
memcpy (conv_data->text->string.mbs, text, text_len);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
free (conv_data->text);
|
||||||
|
conv_data->text = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
g_free (text);
|
||||||
|
}
|
||||||
|
if (conv_data->operation == XIMStringConversionSubstitution
|
||||||
|
&& subst_nchars > 0)
|
||||||
|
{
|
||||||
|
gtk_im_context_delete_surrounding ((GtkIMContext *)context_xim,
|
||||||
|
subst_offset, subst_nchars);
|
||||||
|
}
|
||||||
|
|
||||||
|
g_free (surrounding);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static XVaNestedList
|
static XVaNestedList
|
||||||
set_preedit_callback (GtkIMContextXIM *context_xim)
|
set_preedit_callback (GtkIMContextXIM *context_xim)
|
||||||
{
|
{
|
||||||
@ -1223,6 +1351,21 @@ set_status_callback (GtkIMContextXIM *context_xim)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void
|
||||||
|
set_string_conversion_callback (GtkIMContextXIM *context_xim, XIC xic)
|
||||||
|
{
|
||||||
|
if (!context_xim->im_info->supports_string_conversion)
|
||||||
|
return;
|
||||||
|
|
||||||
|
context_xim->string_conversion_callback.client_data = (XPointer)context_xim;
|
||||||
|
context_xim->string_conversion_callback.callback = (XICProc)string_conversion_callback;
|
||||||
|
|
||||||
|
XSetICValues (xic,
|
||||||
|
XNStringConversionCallback,
|
||||||
|
(XPointer)&context_xim->string_conversion_callback,
|
||||||
|
NULL);
|
||||||
|
}
|
||||||
|
|
||||||
static XIC
|
static XIC
|
||||||
gtk_im_context_xim_get_ic (GtkIMContextXIM *context_xim)
|
gtk_im_context_xim_get_ic (GtkIMContextXIM *context_xim)
|
||||||
{
|
{
|
||||||
@ -1293,6 +1436,7 @@ gtk_im_context_xim_get_ic (GtkIMContextXIM *context_xim)
|
|||||||
XNFilterEvents, &mask,
|
XNFilterEvents, &mask,
|
||||||
NULL);
|
NULL);
|
||||||
context_xim->filter_key_release = (mask & KeyReleaseMask) != 0;
|
context_xim->filter_key_release = (mask & KeyReleaseMask) != 0;
|
||||||
|
set_string_conversion_callback (context_xim, xic);
|
||||||
}
|
}
|
||||||
|
|
||||||
context_xim->ic = xic;
|
context_xim->ic = xic;
|
||||||
|
@ -28,7 +28,7 @@ static const GtkIMContextInfo xim_ja_info = {
|
|||||||
N_("X Input Method"), /* Human readable name */
|
N_("X Input Method"), /* Human readable name */
|
||||||
GETTEXT_PACKAGE, /* Translation domain */
|
GETTEXT_PACKAGE, /* Translation domain */
|
||||||
GTK_LOCALEDIR, /* Dir for bindtextdomain (not strictly needed for "gtk+") */
|
GTK_LOCALEDIR, /* Dir for bindtextdomain (not strictly needed for "gtk+") */
|
||||||
"ko:ja:zh" /* Languages for which this module is the default */
|
"ko:ja:th:zh" /* Languages for which this module is the default */
|
||||||
};
|
};
|
||||||
|
|
||||||
static const GtkIMContextInfo *info_list[] = {
|
static const GtkIMContextInfo *info_list[] = {
|
||||||
|
Loading…
Reference in New Issue
Block a user