X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkimmulticontext.c;h=712d5ca8736d83396e7295ca70b4f49796efd579;hb=HEAD;hp=db173d70219b55a37fc84aa75855254a350be763;hpb=c09cc89317d222e54e98d4e2e9f2792de13897ec;p=~andy%2Fgtk
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index db173d702..712d5ca87 100644
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -12,36 +12,51 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
-#include
+#include "config.h"
#include
#include
#include "gtkimmulticontext.h"
-#include "gtkimmodule.h"
-#include "gtkmain.h"
-#include "gtkradiomenuitem.h"
+#include "gtkimmoduleprivate.h"
#include "gtkintl.h"
+#include "gtklabel.h"
+#include "gtkmain.h"
#include "gtkprivate.h"
-#include "gtkalias.h"
+#include "gtkradiomenuitem.h"
+#include "gtkseparatormenuitem.h"
+#include "gtksettings.h"
+
+
+/**
+ * SECTION:gtkimmulticontext
+ * @Short_description: An input method context supporting multiple, loadable input methods
+ * @Title: GtkIMMulticontext
+ */
+
+
+#define NONE_ID "gtk-im-context-none"
struct _GtkIMMulticontextPrivate
{
- GdkWindow *client_window;
- GdkRectangle cursor_location;
+ GtkIMContext *slave;
+
+ GdkWindow *client_window;
+ GdkRectangle cursor_location;
- guint use_preedit : 1;
- guint have_cursor_location : 1;
- guint focus_in : 1;
+ gchar *context_id;
+ gchar *context_id_aux;
+
+ 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_notify (GObject *object,
+ GParamSpec *pspec);
static void gtk_im_multicontext_finalize (GObject *object);
static void gtk_im_multicontext_set_slave (GtkIMMulticontext *multicontext,
@@ -86,45 +101,20 @@ static gboolean gtk_im_multicontext_delete_surrounding_cb (GtkIMContext *
gint offset,
gint n_chars,
GtkIMMulticontext *multicontext);
-static GtkIMContextClass *parent_class;
-static const gchar *global_context_id = NULL;
+static void propagate_purpose (GtkIMMulticontext *context);
-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, g_intern_static_string ("GtkIMMulticontext"),
- &im_multicontext_info, 0);
- }
+static const gchar *global_context_id = NULL;
- 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);
+
+ gobject_class->notify = gtk_im_multicontext_notify;
im_context_class->set_client_window = gtk_im_multicontext_set_client_window;
im_context_class->get_preedit_string = gtk_im_multicontext_get_preedit_string;
@@ -138,17 +128,22 @@ gtk_im_multicontext_class_init (GtkIMMulticontextClass *class)
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;
+ GtkIMMulticontextPrivate *priv;
- multicontext->priv = g_new0 (GtkIMMulticontextPrivate, 1);
- multicontext->priv->use_preedit = TRUE;
- multicontext->priv->have_cursor_location = FALSE;
- multicontext->priv->focus_in = FALSE;
+ multicontext->priv = G_TYPE_INSTANCE_GET_PRIVATE (multicontext, GTK_TYPE_IM_MULTICONTEXT, GtkIMMulticontextPrivate);
+ priv = multicontext->priv;
+
+ priv->slave = NULL;
+ priv->use_preedit = TRUE;
+ priv->have_cursor_location = FALSE;
+ priv->focus_in = FALSE;
}
/**
@@ -168,11 +163,13 @@ static void
gtk_im_multicontext_finalize (GObject *object)
{
GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (object);
-
+ GtkIMMulticontextPrivate *priv = multicontext->priv;
+
gtk_im_multicontext_set_slave (multicontext, NULL, TRUE);
- g_free (multicontext->priv);
+ g_free (priv->context_id);
+ g_free (priv->context_id_aux);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gtk_im_multicontext_parent_class)->finalize (object);
}
static void
@@ -183,56 +180,58 @@ gtk_im_multicontext_set_slave (GtkIMMulticontext *multicontext,
GtkIMMulticontextPrivate *priv = multicontext->priv;
gboolean need_preedit_changed = FALSE;
- if (multicontext->slave)
+ if (priv->slave)
{
if (!finalizing)
- gtk_im_context_reset (multicontext->slave);
+ gtk_im_context_reset (priv->slave);
- g_signal_handlers_disconnect_by_func (multicontext->slave,
+ g_signal_handlers_disconnect_by_func (priv->slave,
gtk_im_multicontext_preedit_start_cb,
multicontext);
- g_signal_handlers_disconnect_by_func (multicontext->slave,
+ g_signal_handlers_disconnect_by_func (priv->slave,
gtk_im_multicontext_preedit_end_cb,
multicontext);
- g_signal_handlers_disconnect_by_func (multicontext->slave,
+ g_signal_handlers_disconnect_by_func (priv->slave,
gtk_im_multicontext_preedit_changed_cb,
multicontext);
- g_signal_handlers_disconnect_by_func (multicontext->slave,
+ g_signal_handlers_disconnect_by_func (priv->slave,
gtk_im_multicontext_commit_cb,
multicontext);
- g_object_unref (multicontext->slave);
- multicontext->slave = NULL;
+ g_object_unref (priv->slave);
+ priv->slave = NULL;
if (!finalizing)
need_preedit_changed = TRUE;
}
-
- multicontext->slave = slave;
- if (multicontext->slave)
+ priv->slave = slave;
+
+ if (priv->slave)
{
- g_object_ref (multicontext->slave);
+ g_object_ref (priv->slave);
+
+ propagate_purpose (multicontext);
- g_signal_connect (multicontext->slave, "preedit_start",
+ g_signal_connect (priv->slave, "preedit-start",
G_CALLBACK (gtk_im_multicontext_preedit_start_cb),
multicontext);
- g_signal_connect (multicontext->slave, "preedit_end",
+ g_signal_connect (priv->slave, "preedit-end",
G_CALLBACK (gtk_im_multicontext_preedit_end_cb),
multicontext);
- g_signal_connect (multicontext->slave, "preedit_changed",
+ g_signal_connect (priv->slave, "preedit-changed",
G_CALLBACK (gtk_im_multicontext_preedit_changed_cb),
multicontext);
- g_signal_connect (multicontext->slave, "commit",
+ g_signal_connect (priv->slave, "commit",
G_CALLBACK (gtk_im_multicontext_commit_cb),
multicontext);
- g_signal_connect (multicontext->slave, "retrieve_surrounding",
+ g_signal_connect (priv->slave, "retrieve-surrounding",
G_CALLBACK (gtk_im_multicontext_retrieve_surrounding_cb),
multicontext);
- g_signal_connect (multicontext->slave, "delete_surrounding",
+ g_signal_connect (priv->slave, "delete-surrounding",
G_CALLBACK (gtk_im_multicontext_delete_surrounding_cb),
multicontext);
-
+
if (!priv->use_preedit) /* Default is TRUE */
gtk_im_context_set_use_preedit (slave, FALSE);
if (priv->client_window)
@@ -244,43 +243,90 @@ gtk_im_multicontext_set_slave (GtkIMMulticontext *multicontext,
}
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)
+{
+ GtkIMMulticontextPrivate *priv = multicontext->priv;
+
+ if (priv->context_id_aux)
+ return priv->context_id_aux;
+
+ if (!global_context_id)
+ global_context_id = _gtk_im_module_get_default_context_id (priv->client_window);
+
+ return global_context_id;
}
static GtkIMContext *
gtk_im_multicontext_get_slave (GtkIMMulticontext *multicontext)
{
- if (!multicontext->slave)
+ GtkIMMulticontextPrivate *priv = multicontext->priv;
+
+ if (g_strcmp0 (priv->context_id, get_effective_context_id (multicontext)) != 0)
+ gtk_im_multicontext_set_slave (multicontext, NULL, FALSE);
+
+ if (!priv->slave)
{
GtkIMContext *slave;
- if (!global_context_id)
- {
- gchar *locale = _gtk_get_lc_ctype ();
- global_context_id = _gtk_im_module_get_default_context_id (locale);
- g_free (locale);
- }
-
- slave = _gtk_im_module_create (global_context_id);
+ g_free (priv->context_id);
+
+ priv->context_id = g_strdup (get_effective_context_id (multicontext));
+
+ if (g_strcmp0 (priv->context_id, NONE_ID) == 0)
+ return NULL;
+
+ slave = _gtk_im_module_create (priv->context_id);
gtk_im_multicontext_set_slave (multicontext, slave, FALSE);
g_object_unref (slave);
-
- multicontext->context_id = global_context_id;
}
- return multicontext->slave;
+ return priv->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);
+ GtkIMMulticontextPrivate *priv = multicontext->priv;
+ GtkIMContext *slave;
+ GdkScreen *screen;
+ GtkSettings *settings;
+ gboolean connected;
- multicontext->priv->client_window = window;
-
+ priv->client_window = window;
+
+ if (window)
+ {
+ screen = gdk_window_get_screen (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;
+ }
+ }
+
+ slave = gtk_im_multicontext_get_slave (multicontext);
if (slave)
gtk_im_context_set_client_window (slave, window);
}
@@ -313,29 +359,53 @@ gtk_im_multicontext_filter_keypress (GtkIMContext *context,
GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext);
if (slave)
- return gtk_im_context_filter_keypress (slave, event);
+ {
+ return gtk_im_context_filter_keypress (slave, event);
+ }
else
- return FALSE;
+ {
+ GdkDisplay *display;
+ GdkModifierType no_text_input_mask;
+
+ display = gdk_window_get_display (event->window);
+
+ no_text_input_mask =
+ gdk_keymap_get_modifier_mask (gdk_keymap_get_for_display (display),
+ GDK_MODIFIER_INTENT_NO_TEXT_INPUT);
+
+ if (event->type == GDK_KEY_PRESS &&
+ (event->state & no_text_input_mask) == 0)
+ {
+ gunichar ch;
+
+ ch = gdk_keyval_to_unicode (event->keyval);
+ if (ch != 0 && !g_unichar_iscntrl (ch))
+ {
+ gint len;
+ gchar buf[10];
+
+ len = g_unichar_to_utf8 (ch, buf);
+ buf[len] = '\0';
+
+ g_signal_emit_by_name (multicontext, "commit", buf);
+
+ return TRUE;
+ }
+ }
+ }
+
+ return FALSE;
}
static void
gtk_im_multicontext_focus_in (GtkIMContext *context)
{
GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
- GtkIMContext *slave;
+ GtkIMMulticontextPrivate *priv = multicontext->priv;
+ GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext);
- /* 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)
- gtk_im_multicontext_set_slave (multicontext, NULL, FALSE);
+ priv->focus_in = TRUE;
- slave = gtk_im_multicontext_get_slave (multicontext);
-
- multicontext->priv->focus_in = TRUE;
-
if (slave)
gtk_im_context_focus_in (slave);
}
@@ -344,10 +414,11 @@ static void
gtk_im_multicontext_focus_out (GtkIMContext *context)
{
GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
+ GtkIMMulticontextPrivate *priv = multicontext->priv;
GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext);
- multicontext->priv->focus_in = FALSE;
-
+ priv->focus_in = FALSE;
+
if (slave)
gtk_im_context_focus_out (slave);
}
@@ -367,10 +438,11 @@ gtk_im_multicontext_set_cursor_location (GtkIMContext *context,
GdkRectangle *area)
{
GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
+ GtkIMMulticontextPrivate *priv = multicontext->priv;
GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext);
- multicontext->priv->have_cursor_location = TRUE;
- multicontext->priv->cursor_location = *area;
+ priv->have_cursor_location = TRUE;
+ priv->cursor_location = *area;
if (slave)
gtk_im_context_set_cursor_location (slave, area);
@@ -381,11 +453,12 @@ gtk_im_multicontext_set_use_preedit (GtkIMContext *context,
gboolean use_preedit)
{
GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
+ GtkIMMulticontextPrivate *priv = multicontext->priv;
GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext);
use_preedit = use_preedit != FALSE;
- multicontext->priv->use_preedit = use_preedit;
+ priv->use_preedit = use_preedit;
if (slave)
gtk_im_context_set_use_preedit (slave, use_preedit);
@@ -429,21 +502,21 @@ static void
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
@@ -451,7 +524,7 @@ gtk_im_multicontext_commit_cb (GtkIMContext *slave,
const gchar *str,
GtkIMMulticontext *multicontext)
{
- g_signal_emit_by_name (multicontext, "commit", str);;
+ g_signal_emit_by_name (multicontext, "commit", str);
}
static gboolean
@@ -460,7 +533,7 @@ gtk_im_multicontext_retrieve_surrounding_cb (GtkIMContext *slave,
{
gboolean result;
- g_signal_emit_by_name (multicontext, "retrieve_surrounding", &result);
+ g_signal_emit_by_name (multicontext, "retrieve-surrounding", &result);
return result;
}
@@ -473,7 +546,7 @@ gtk_im_multicontext_delete_surrounding_cb (GtkIMContext *slave,
{
gboolean result;
- g_signal_emit_by_name (multicontext, "delete_surrounding",
+ g_signal_emit_by_name (multicontext, "delete-surrounding",
offset, n_chars, &result);
return result;
@@ -483,20 +556,37 @@ static void
activate_cb (GtkWidget *menuitem,
GtkIMMulticontext *context)
{
- if (GTK_CHECK_MENU_ITEM (menuitem)->active)
+ if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem)))
{
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;
@@ -507,38 +597,89 @@ void
gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
GtkMenuShell *menushell)
{
+ GtkIMMulticontextPrivate *priv = context->priv;
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 (priv->client_window);
+ system_menuitem = menuitem = gtk_radio_menu_item_new_with_label (group, C_("input method menu", "System"));
+ if (!priv->context_id_aux)
+ 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_radio_menu_item_new_with_label (group, C_("input method menu", "None"));
+ if (g_strcmp0 (priv->context_id_aux, NONE_ID) == 0)
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menuitem), TRUE);
+ g_object_set_data (G_OBJECT (menuitem), I_("gtk-context-id"), NONE_ID);
+ g_signal_connect (menuitem, "activate", G_CALLBACK (activate_cb), context);
+ gtk_widget_show (menuitem);
+ gtk_menu_shell_append (menushell, menuitem);
+ group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (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_get_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
@@ -547,15 +688,24 @@ gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
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 ((priv->context_id_aux &&
+ strcmp (contexts[i]->context_id, priv->context_id_aux) == 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);
@@ -567,5 +717,71 @@ gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
g_free (contexts);
}
-#define __GTK_IM_MULTICONTEXT_C__
-#include "gtkaliasdef.c"
+/**
+ * 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)
+{
+ g_return_val_if_fail (GTK_IS_IM_MULTICONTEXT (context), NULL);
+
+ return context->priv->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)
+{
+ GtkIMMulticontextPrivate *priv;
+
+ g_return_if_fail (GTK_IS_IM_MULTICONTEXT (context));
+
+ priv = context->priv;
+
+ gtk_im_context_reset (GTK_IM_CONTEXT (context));
+ g_free (priv->context_id_aux);
+ priv->context_id_aux = g_strdup (context_id);
+ gtk_im_multicontext_set_slave (context, NULL, FALSE);
+}
+
+static void
+propagate_purpose (GtkIMMulticontext *context)
+{
+ GtkInputPurpose purpose;
+ GtkInputHints hints;
+
+ if (context->priv->slave == NULL)
+ return;
+
+ g_object_get (context, "input-purpose", &purpose, NULL);
+ g_object_set (context->priv->slave, "input-purpose", purpose, NULL);
+
+ g_object_get (context, "input-hints", &hints, NULL);
+ g_object_set (context->priv->slave, "input-hints", hints, NULL);
+}
+
+static void
+gtk_im_multicontext_notify (GObject *object,
+ GParamSpec *pspec)
+{
+ propagate_purpose (GTK_IM_MULTICONTEXT (object));
+}