#include "gtkimmulticontext.h"
#include "gtkimmodule.h"
+#include "gtkmain.h"
#include "gtkradiomenuitem.h"
#include "gtkintl.h"
+#include "gtkprivate.h" /* To get redefinition of GTK_LOCALE_DIR on Win32 */
+#include "gtkalias.h"
+
+struct _GtkIMMulticontextPrivate
+{
+ GdkWindow *client_window;
+ GdkRectangle cursor_location;
+ gchar *context_id;
+
+ guint use_preedit : 1;
+ guint have_cursor_location : 1;
+ guint focus_in : 1;
+};
-static void gtk_im_multicontext_class_init (GtkIMMulticontextClass *class);
-static void gtk_im_multicontext_init (GtkIMMulticontext *im_multicontext);
static void gtk_im_multicontext_finalize (GObject *object);
static void gtk_im_multicontext_set_slave (GtkIMMulticontext *multicontext,
gint offset,
gint n_chars,
GtkIMMulticontext *multicontext);
-static GtkIMContextClass *parent_class;
static const gchar *global_context_id = NULL;
-GType
-gtk_im_multicontext_get_type (void)
-{
- static GType im_multicontext_type = 0;
-
- if (!im_multicontext_type)
- {
- static const GTypeInfo im_multicontext_info =
- {
- sizeof (GtkIMMulticontextClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) gtk_im_multicontext_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkIMMulticontext),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_im_multicontext_init,
- };
-
- im_multicontext_type =
- g_type_register_static (GTK_TYPE_IM_CONTEXT, "GtkIMMulticontext",
- &im_multicontext_info, 0);
- }
-
- return im_multicontext_type;
-}
+G_DEFINE_TYPE (GtkIMMulticontext, gtk_im_multicontext, GTK_TYPE_IM_CONTEXT)
static void
gtk_im_multicontext_class_init (GtkIMMulticontextClass *class)
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
GtkIMContextClass *im_context_class = GTK_IM_CONTEXT_CLASS (class);
- parent_class = g_type_class_peek_parent (class);
-
im_context_class->set_client_window = gtk_im_multicontext_set_client_window;
im_context_class->get_preedit_string = gtk_im_multicontext_get_preedit_string;
im_context_class->filter_keypress = gtk_im_multicontext_filter_keypress;
im_context_class->get_surrounding = gtk_im_multicontext_get_surrounding;
gobject_class->finalize = gtk_im_multicontext_finalize;
+
+ g_type_class_add_private (gobject_class, sizeof (GtkIMMulticontextPrivate));
}
static void
gtk_im_multicontext_init (GtkIMMulticontext *multicontext)
{
multicontext->slave = NULL;
+
+ multicontext->priv = G_TYPE_INSTANCE_GET_PRIVATE (multicontext, GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontextPrivate);
+ multicontext->priv->use_preedit = TRUE;
+ multicontext->priv->have_cursor_location = FALSE;
+ multicontext->priv->focus_in = FALSE;
}
/**
static void
gtk_im_multicontext_finalize (GObject *object)
{
- gtk_im_multicontext_set_slave (GTK_IM_MULTICONTEXT (object), NULL, TRUE);
+ GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (object);
+
+ gtk_im_multicontext_set_slave (multicontext, NULL, TRUE);
+ g_free (multicontext->context_id);
+ g_free (multicontext->priv->context_id);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gtk_im_multicontext_parent_class)->finalize (object);
}
static void
GtkIMContext *slave,
gboolean finalizing)
{
+ GtkIMMulticontextPrivate *priv = multicontext->priv;
gboolean need_preedit_changed = FALSE;
if (multicontext->slave)
{
g_object_ref (multicontext->slave);
- g_signal_connect (multicontext->slave, "preedit_start",
+ g_signal_connect (multicontext->slave, "preedit-start",
G_CALLBACK (gtk_im_multicontext_preedit_start_cb),
multicontext);
- g_signal_connect (multicontext->slave, "preedit_end",
+ g_signal_connect (multicontext->slave, "preedit-end",
G_CALLBACK (gtk_im_multicontext_preedit_end_cb),
multicontext);
- g_signal_connect (multicontext->slave, "preedit_changed",
+ g_signal_connect (multicontext->slave, "preedit-changed",
G_CALLBACK (gtk_im_multicontext_preedit_changed_cb),
multicontext);
g_signal_connect (multicontext->slave, "commit",
G_CALLBACK (gtk_im_multicontext_commit_cb),
multicontext);
- g_signal_connect (multicontext->slave, "retrieve_surrounding",
+ g_signal_connect (multicontext->slave, "retrieve-surrounding",
G_CALLBACK (gtk_im_multicontext_retrieve_surrounding_cb),
multicontext);
- g_signal_connect (multicontext->slave, "delete_surrounding",
+ g_signal_connect (multicontext->slave, "delete-surrounding",
G_CALLBACK (gtk_im_multicontext_delete_surrounding_cb),
multicontext);
- if (multicontext->client_window)
- gtk_im_context_set_client_window (slave, multicontext->client_window);
+ if (!priv->use_preedit) /* Default is TRUE */
+ gtk_im_context_set_use_preedit (slave, FALSE);
+ if (priv->client_window)
+ gtk_im_context_set_client_window (slave, priv->client_window);
+ if (priv->have_cursor_location)
+ gtk_im_context_set_cursor_location (slave, &priv->cursor_location);
+ if (priv->focus_in)
+ gtk_im_context_focus_in (slave);
}
if (need_preedit_changed)
- g_signal_emit_by_name (multicontext, "preedit_changed");
+ g_signal_emit_by_name (multicontext, "preedit-changed");
+}
+
+static const gchar *
+get_effective_context_id (GtkIMMulticontext *multicontext)
+{
+ if (multicontext->priv->context_id)
+ return multicontext->priv->context_id;
+
+ if (!global_context_id)
+ global_context_id = _gtk_im_module_get_default_context_id (multicontext->priv->client_window);
+
+ return global_context_id;
}
static GtkIMContext *
{
GtkIMContext *slave;
- if (!global_context_id)
- {
- const char *locale;
-
-#ifdef HAVE_LC_MESSAGES
- locale = setlocale (LC_MESSAGES, NULL);
-#else
- locale = setlocale (LC_CTYPE, NULL);
-#endif
- global_context_id = _gtk_im_module_get_default_context_id (locale);
- }
-
- slave = _gtk_im_module_create (global_context_id);
+ g_free (multicontext->context_id);
+
+ multicontext->context_id = g_strdup (get_effective_context_id (multicontext));
+ slave = _gtk_im_module_create (multicontext->context_id);
gtk_im_multicontext_set_slave (multicontext, slave, FALSE);
g_object_unref (slave);
-
- multicontext->context_id = global_context_id;
}
return multicontext->slave;
}
+static void
+im_module_setting_changed (GtkSettings *settings,
+ gpointer data)
+{
+ global_context_id = NULL;
+}
+
+
static void
gtk_im_multicontext_set_client_window (GtkIMContext *context,
GdkWindow *window)
{
GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
- GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext);
+ GdkScreen *screen;
+ GtkSettings *settings;
+ gboolean connected;
- multicontext->client_window = window;
-
- if (slave)
- gtk_im_context_set_client_window (slave, window);
+ multicontext->priv->client_window = window;
+
+ if (window)
+ {
+ screen = gdk_drawable_get_screen (GDK_DRAWABLE (window));
+ settings = gtk_settings_get_for_screen (screen);
+
+ connected = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (settings),
+ "gtk-im-module-connected"));
+ if (!connected)
+ {
+ g_signal_connect (settings, "notify::gtk-im-module",
+ G_CALLBACK (im_module_setting_changed), NULL);
+ g_object_set_data (G_OBJECT (settings), "gtk-im-module-connected",
+ GINT_TO_POINTER (TRUE));
+
+ global_context_id = NULL;
+ }
+ }
+
+ if (g_strcmp0 (multicontext->context_id, get_effective_context_id (multicontext)) != 0)
+ gtk_im_multicontext_set_slave (multicontext, NULL, FALSE);
+
+ if (multicontext->slave)
+ gtk_im_context_set_client_window (multicontext->slave, window);
}
static void
GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
GtkIMContext *slave;
- /* If the global context type is different from the context we were
- * using before, get rid of the old slave and create a new one
- * for the new global context type.
- */
- if (!multicontext->context_id ||
- strcmp (global_context_id, multicontext->context_id) != 0)
+ if (g_strcmp0 (multicontext->context_id, get_effective_context_id (multicontext)) != 0)
gtk_im_multicontext_set_slave (multicontext, NULL, FALSE);
slave = gtk_im_multicontext_get_slave (multicontext);
-
+
+ multicontext->priv->focus_in = TRUE;
+
if (slave)
gtk_im_context_focus_in (slave);
}
GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext);
+ multicontext->priv->focus_in = FALSE;
+
if (slave)
gtk_im_context_focus_out (slave);
}
GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext);
+ multicontext->priv->have_cursor_location = TRUE;
+ multicontext->priv->cursor_location = *area;
+
if (slave)
gtk_im_context_set_cursor_location (slave, area);
}
GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext);
+ use_preedit = use_preedit != FALSE;
+
+ multicontext->priv->use_preedit = use_preedit;
+
if (slave)
gtk_im_context_set_use_preedit (slave, use_preedit);
}
gtk_im_multicontext_preedit_start_cb (GtkIMContext *slave,
GtkIMMulticontext *multicontext)
{
- g_signal_emit_by_name (multicontext, "preedit_start");
+ g_signal_emit_by_name (multicontext, "preedit-start");
}
static void
gtk_im_multicontext_preedit_end_cb (GtkIMContext *slave,
GtkIMMulticontext *multicontext)
{
- g_signal_emit_by_name (multicontext, "preedit_end");
+ g_signal_emit_by_name (multicontext, "preedit-end");
}
static void
gtk_im_multicontext_preedit_changed_cb (GtkIMContext *slave,
GtkIMMulticontext *multicontext)
{
- g_signal_emit_by_name (multicontext, "preedit_changed");
+ g_signal_emit_by_name (multicontext, "preedit-changed");
}
static void
{
gboolean result;
- g_signal_emit_by_name (multicontext, "retrieve_surrounding", &result);
+ g_signal_emit_by_name (multicontext, "retrieve-surrounding", &result);
return result;
}
{
gboolean result;
- g_signal_emit_by_name (multicontext, "delete_surrounding",
+ g_signal_emit_by_name (multicontext, "delete-surrounding",
offset, n_chars, &result);
return result;
{
const gchar *id = g_object_get_data (G_OBJECT (menuitem), "gtk-context-id");
- gtk_im_context_reset (GTK_IM_CONTEXT (context));
-
- global_context_id = id;
- gtk_im_multicontext_set_slave (context, NULL, FALSE);
+ gtk_im_multicontext_set_context_id (context, id);
}
}
+static int
+pathnamecmp (const char *a,
+ const char *b)
+{
+#ifndef G_OS_WIN32
+ return strcmp (a, b);
+#else
+ /* Ignore case insensitivity, probably not that relevant here. Just
+ * make sure slash and backslash compare equal.
+ */
+ while (*a && *b)
+ if ((G_IS_DIR_SEPARATOR (*a) && G_IS_DIR_SEPARATOR (*b)) ||
+ *a == *b)
+ a++, b++;
+ else
+ return (*a - *b);
+ return (*a - *b);
+#endif
+}
+
/**
* gtk_im_multicontext_append_menuitems:
- * @context: a #GtkIMMultiContext
+ * @context: a #GtkIMMulticontext
* @menushell: a #GtkMenuShell
*
* Add menuitems for various available input methods to a menu;
const GtkIMContextInfo **contexts;
guint n_contexts, i;
GSList *group = NULL;
+ GtkWidget *menuitem, *system_menuitem;
+ const char *system_context_id;
+ system_context_id = _gtk_im_module_get_default_context_id (context->priv->client_window);
+ system_menuitem = menuitem = gtk_radio_menu_item_new_with_label (group, C_("input method menu", "System"));
+ if (!context->priv->context_id)
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), TRUE);
+ group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
+ g_object_set_data (G_OBJECT (menuitem), I_("gtk-context-id"), NULL);
+ g_signal_connect (menuitem, "activate", G_CALLBACK (activate_cb), context);
+
+ gtk_widget_show (menuitem);
+ gtk_menu_shell_append (menushell, menuitem);
+
+ menuitem = gtk_separator_menu_item_new ();
+ gtk_widget_show (menuitem);
+ gtk_menu_shell_append (menushell, menuitem);
+
_gtk_im_module_list (&contexts, &n_contexts);
- for (i=0; i < n_contexts; i++)
+ for (i = 0; i < n_contexts; i++)
{
- GtkWidget *menuitem;
const gchar *translated_name;
#ifdef ENABLE_NLS
- if (contexts[i]->domain && contexts[i]->domain_dirname &&
- contexts[i]->domain[0] && contexts[i]->domain_dirname[0])
+ if (contexts[i]->domain && contexts[i]->domain[0])
{
- if (strcmp (contexts[i]->domain, GETTEXT_PACKAGE) == 0 &&
- strcmp (contexts[i]->domain_dirname, GTK_LOCALEDIR) == 0)
- /* Input method may have a name in the GTK+ message catalog */
- translated_name = _(contexts[i]->context_name);
- else
- /* Input method has own message catalog */
+ if (strcmp (contexts[i]->domain, GETTEXT_PACKAGE) == 0)
+ {
+ /* Same translation domain as GTK+ */
+ if (!(contexts[i]->domain_dirname && contexts[i]->domain_dirname[0]) ||
+ pathnamecmp (contexts[i]->domain_dirname, GTK_LOCALEDIR) == 0)
+ {
+ /* Empty or NULL, domain directory, or same as
+ * GTK+. Input method may have a name in the GTK+
+ * message catalog.
+ */
+ translated_name = _(contexts[i]->context_name);
+ }
+ else
+ {
+ /* Separate domain directory but the same
+ * translation domain as GTK+. We can't call
+ * bindtextdomain() as that would make GTK+ forget
+ * its own messages.
+ */
+ g_warning ("Input method %s should not use GTK's translation domain %s",
+ contexts[i]->context_id, GETTEXT_PACKAGE);
+ /* Try translating the name in GTK+'s domain */
+ translated_name = _(contexts[i]->context_name);
+ }
+ }
+ else if (contexts[i]->domain_dirname && contexts[i]->domain_dirname[0])
+ /* Input method has own translation domain and message catalog */
{
bindtextdomain (contexts[i]->domain,
contexts[i]->domain_dirname);
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (contexts[i]->domain, "UTF-8");
#endif
- translated_name = dgettext (contexts[i]->domain, contexts[i]->context_name);
+ translated_name = g_dgettext (contexts[i]->domain, contexts[i]->context_name);
+ }
+ else
+ {
+ /* Different translation domain, but no domain directory */
+ translated_name = contexts[i]->context_name;
}
}
else
- /* Either domain or domain_dirname is NULL or "". We assume that
- * input method does not want a translated name in this case
+ /* Empty or NULL domain. We assume that input method does not
+ * want a translated name in this case.
*/
translated_name = contexts[i]->context_name;
#else
menuitem = gtk_radio_menu_item_new_with_label (group,
translated_name);
- if ((global_context_id == NULL && group == NULL) ||
- (global_context_id &&
- strcmp (contexts[i]->context_id, global_context_id) == 0))
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem),
- TRUE);
-
+ if ((context->priv->context_id &&
+ strcmp (contexts[i]->context_id, context->priv->context_id) == 0))
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), TRUE);
+
+ if (strcmp (contexts[i]->context_id, system_context_id) == 0)
+ {
+ GtkWidget *label;
+ char *text;
+
+ label = gtk_bin_get_child (GTK_BIN (system_menuitem));
+ text = g_strdup_printf (C_("input method menu", "System (%s)"), translated_name);
+ gtk_label_set_text (GTK_LABEL (label), text);
+ g_free (text);
+ }
+
group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
- g_object_set_data (G_OBJECT (menuitem), "gtk-context-id",
+ g_object_set_data (G_OBJECT (menuitem), I_("gtk-context-id"),
(char *)contexts[i]->context_id);
g_signal_connect (menuitem, "activate",
G_CALLBACK (activate_cb), context);
g_free (contexts);
}
+/**
+ * gtk_im_multicontext_get_context_id:
+ * @context: a #GtkIMMulticontext
+ *
+ * Gets the id of the currently active slave of the @context.
+ *
+ * Returns: the id of the currently active slave
+ *
+ * Since: 2.16
+ */
+const char *
+gtk_im_multicontext_get_context_id (GtkIMMulticontext *context)
+{
+ return context->context_id;
+}
+
+/**
+ * gtk_im_multicontext_set_context_id:
+ * @context: a #GtkIMMulticontext
+ * @context_id: the id to use
+ *
+ * Sets the context id for @context.
+ *
+ * This causes the currently active slave of @context to be
+ * replaced by the slave corresponding to the new context id.
+ *
+ * Since: 2.16
+ */
+void
+gtk_im_multicontext_set_context_id (GtkIMMulticontext *context,
+ const char *context_id)
+{
+ gtk_im_context_reset (GTK_IM_CONTEXT (context));
+ g_free (context->priv->context_id);
+ context->priv->context_id = g_strdup (context_id);
+ gtk_im_multicontext_set_slave (context, NULL, FALSE);
+}
+
+
+#define __GTK_IM_MULTICONTEXT_C__
+#include "gtkaliasdef.c"