Make parent_class static.

Sun Nov  5 04:24:53 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkcellrenderertextpixbuf.c: Make parent_class
	static.

Tue Sep 19 10:54:22 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkimcontext*.[ch] gtk/gtkimmulticontext.[ch]
	gtk/gtktextlayout.[ch] gtk/gtktextview.c gtk/gtkentry.c:
	Add support for positioning the cursor within the preedit string.

Mon Sep 18 23:56:32 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktextview.c: Check for bindings after passing
	events to im context filter.

Mon Sep 18 11:50:51 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktextlayout.c (add_preedit_attrs): Handle
	empty attribute lists properly.

Sun Sep 17 10:08:16 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/queryimmodules.c (main): Return non-zero exit
	status if errors were encountered querying any
	modules.

Sat Sep 16 14:01:52 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtk.h: include gtkmodule.h gtkoldeditable.h,
	don't include gtkthemes.h.

	* gtk/testgtk.c gtk/testtext.c: Set environment variables
	to point

	* gtk/Makefile.am: Add new .c and .h files, build
	gtk-query-immodules and use it to create a gtk.immodules
	file for use of test programs.

	* gtk/gtkpreview.c: remove extra blank line.

Sat Sep 16 13:21:04 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkimcontextsimple.c (gtk_im_context_simple_add_table):
	Add the ability to add extra tables beyond the default
	one, and also the ability to have compose sequences
	that are prefixes of other compose sequences.

	* gtk/gtkimcontextsimple.c: Export a preedit string which
	consists of possible candidates for keystrokes that have
	been entered but not yet committed.

	* gtk/gtkimcontext.[ch] gtk/immulticontext.[ch]
	gtk/gtkimcontextsimple.[ch]: add gtk_im_context_reset()

	* gtk/gtkmulticontext.[ch] (gtk_im_multicontext_append_menuitems):
	Add a function to add input-method switching menu items
	to a menu.

	* gtk/gtkimmulticontext.[ch]: Properly handly set_client_window
	when switching input methods.

	* gtk/gtkimcontextsimple.[ch]: Change the format of
	the compose table to allow compose tables of different
	lengths / sequence.

Sat Sep 16 13:05:48 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkimmodule.[ch]: Support routines for loading
	GtkIMContext implementations dynamically at runtime.

	* gtk/queryimmodules.c: Program to query the available
	input modules and write the results into a file.

	* gtk/gtkrc.[ch] (gtk_rc_get_im_module_file): Add
	extra config options "im_module_file" (cache file for
	input method modules), and "im_module_path" - path
	to look for modules when generating cache file.

	This doesn't scale.

Sat Sep 16 13:09:06 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkthemes.[ch] gtk/gtkmodule.[ch]: Move most of the
	generic	code from gtkthemes into a new abstraction
	GtkModule which has the logic for implementing
	a loadable module which implements a number of
	GObject types.

Sat Sep 16 13:07:13 2000  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkeditable.[ch]: Convert GtkEditable from
	a class into an interface

	* gtk/gtkoldeditable.[ch]: Move the old editable
	implementation into here, so legacy widgets can
	still rely on the implemenation. GtkOldEditable
	exports GtkEditable. Make selection handling
	code use new text conversion functions (and
	handle UTF-8 as a side-effect). Use GtkClipboard
	for CLIPBOARD.

	* gtk/gtktext.[ch] gtk/gtkcombo.c gtk/gtkspinbutton.c:
	Adopt to match above changes.

	* gtk/gtkentry.[ch]: Implement GtkEditable directly,
	avoid GtkOldEditable implementation. Restructure
        to reduce number of places that modify state directly.
	Move to GtkBindingSet. Display the preedit string.
	Queue recomputation of PangoLayout and scroll position
	to improve effiency of doing complex changes naively.
	Add a menu with cut/copy/paste and input method selection.

Thu Sep 14 22:11:05 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktextlayout.[ch]: Add gtk_text_layout_set_preedit_string()
	to set preedit string and attributes; display preedit string by
	inserting string and attributes at cursor when creating the
	GtkTextLineDisplay.

	* gtk/gtktextlayout.c: Move all conversions between byte
	positions in PangoLayout and GtkTextIter into new functions
	line_display_iter_to_index/index_to_iter that properly
	handle the preedit string.

	* gtk/gtktextmark.[ch]: Restore gtk_text_mark_get_name, modify
	it to return const char * (eventually will end up
	as GCONST char *, most likely.)

	* gtk/gtktextview.[ch]: Handle the preedit string, call
	gtk_im_context_reset() as necessary, add a menu to switch
	input methods.

	* gtk/gtktextlayout.[ch]: Remove useless
	gtk_text_layout_get_log_attrs() function.

1 files changed, 107 insertions, 6 deletions

diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index 58b8296a18..2ec808356f 100644
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -17,9 +17,18 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <string.h>
+
+#ifdef GDK_WINDOWING_X11
+#include <X11/Xlocale.h>	/* so we get the right setlocale */
+#else
+#include <locale.h>
+#endif
+
 #include "gtksignal.h"
 #include "gtkimmulticontext.h"
-#include "gtkimcontextsimple.h"
+#include "gtkimmodule.h"
+#include "gtkmenuitem.h"
 
 static void     gtk_im_multicontext_class_init         (GtkIMMulticontextClass  *class);
 static void     gtk_im_multicontext_init               (GtkIMMulticontext       *im_multicontext);
@@ -32,11 +41,13 @@ static void     gtk_im_multicontext_set_client_window  (GtkIMContext
 							GdkWindow               *window);
 static void     gtk_im_multicontext_get_preedit_string (GtkIMContext            *context,
 							gchar                  **str,
-							PangoAttrList          **attrs);
+							PangoAttrList          **attrs,
+							gint                   *cursor_pos);
 static gboolean gtk_im_multicontext_filter_keypress    (GtkIMContext            *context,
 							GdkEventKey             *event);
 static void     gtk_im_multicontext_focus_in           (GtkIMContext            *context);
 static void     gtk_im_multicontext_focus_out          (GtkIMContext            *context);
+static void     gtk_im_multicontext_reset              (GtkIMContext            *context);
 
 void            gtk_im_multicontext_preedit_start_cb   (GtkIMContext            *slave,
 							GtkIMMulticontext       *multicontext);
@@ -50,6 +61,8 @@ void            gtk_im_multicontext_commit_cb          (GtkIMContext
 
 static GtkIMContextClass *parent_class;
 
+static const gchar *global_context_id = NULL;
+
 GtkType
 gtk_im_multicontext_get_type (void)
 {
@@ -88,6 +101,7 @@ gtk_im_multicontext_class_init (GtkIMMulticontextClass *class)
   im_context_class->filter_keypress = gtk_im_multicontext_filter_keypress;
   im_context_class->focus_in = gtk_im_multicontext_focus_in;
   im_context_class->focus_out = gtk_im_multicontext_focus_out;
+  im_context_class->reset = gtk_im_multicontext_reset;
 
   gobject_class->finalize = gtk_im_multicontext_finalize;
 }
@@ -141,6 +155,9 @@ gtk_im_multicontext_set_slave (GtkIMMulticontext *multicontext,
       gtk_signal_connect (GTK_OBJECT (multicontext->slave), "commit",
 			  GTK_SIGNAL_FUNC (gtk_im_multicontext_commit_cb),
 			  multicontext);
+
+      if (multicontext->client_window)
+	gtk_im_context_set_client_window (slave, multicontext->client_window);
     }
 }
 
@@ -148,7 +165,22 @@ static GtkIMContext *
 gtk_im_multicontext_get_slave (GtkIMMulticontext *multicontext)
 {
   if (!multicontext->slave)
-    gtk_im_multicontext_set_slave (multicontext, gtk_im_context_simple_new ());
+    {
+      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);
+	}
+	
+      gtk_im_multicontext_set_slave (multicontext, _gtk_im_module_create (global_context_id));
+      multicontext->context_id = global_context_id;
+    }
 
   return multicontext->slave;
 }
@@ -160,6 +192,8 @@ gtk_im_multicontext_set_client_window (GtkIMContext *context,
   GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
   GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext);
 
+  multicontext->client_window = window;
+  
   if (slave)
     gtk_im_context_set_client_window (slave, window);
 }
@@ -167,13 +201,14 @@ gtk_im_multicontext_set_client_window (GtkIMContext *context,
 static void
 gtk_im_multicontext_get_preedit_string (GtkIMContext   *context,
 					gchar         **str,
-					PangoAttrList **attrs)
+					PangoAttrList **attrs,
+					gint           *cursor_pos)
 {
   GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
   GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext);
 
   if (slave)
-    gtk_im_context_get_preedit_string (slave, str, attrs);
+    gtk_im_context_get_preedit_string (slave, str, attrs, cursor_pos);
   else
     {
       if (str)
@@ -200,7 +235,17 @@ static void
 gtk_im_multicontext_focus_in (GtkIMContext   *context)
 {
   GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
-  GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext);
+  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)
+    gtk_im_multicontext_set_slave (multicontext, NULL);
+
+  slave = gtk_im_multicontext_get_slave (multicontext);
 
   if (slave)
     gtk_im_context_focus_in (slave);
@@ -216,6 +261,16 @@ gtk_im_multicontext_focus_out (GtkIMContext   *context)
     gtk_im_context_focus_out (slave);
 }
 
+static void
+gtk_im_multicontext_reset (GtkIMContext   *context)
+{
+  GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context);
+  GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext);
+
+  if (slave)
+    gtk_im_context_reset (slave);
+}
+
 void
 gtk_im_multicontext_preedit_start_cb   (GtkIMContext      *slave,
 					GtkIMMulticontext *multicontext)
@@ -245,3 +300,49 @@ gtk_im_multicontext_commit_cb (GtkIMContext      *slave,
   gtk_signal_emit_by_name (GTK_OBJECT (multicontext), "commit", str);;
 }
 
+static void
+activate_cb (GtkWidget         *menuitem,
+	     GtkIMMulticontext *context)
+{
+  const gchar *id = gtk_object_get_data (GTK_OBJECT (menuitem), "gtk-context-id");
+
+  gtk_im_context_reset (GTK_IM_CONTEXT (context));
+
+  global_context_id = id;
+  gtk_im_multicontext_set_slave (context, NULL);
+}
+
+/**
+ * gtk_im_multicontext_append_menuitems:
+ * @context: a #GtkIMMultiContext
+ * @menushell: a #GtkMenuShell
+ * 
+ * Add menuitems for various available input methods to a menu;
+ * the menuitems, when selected, will switch the input method
+ * for the context and the global default input method.
+ **/
+void
+gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context,
+				      GtkMenuShell      *menushell)
+{
+  const GtkIMContextInfo **contexts;
+  gint n_contexts, i;
+  
+  _gtk_im_module_list (&contexts, &n_contexts);
+
+  for (i=0; i < n_contexts; i++)
+    {
+      GtkWidget *menuitem;
+
+      menuitem = gtk_menu_item_new_with_label (contexts[i]->context_name);
+
+      gtk_object_set_data (GTK_OBJECT (menuitem), "gtk-context-id",
+			   (char *)contexts[i]->context_id);
+      gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
+			  activate_cb, context);
+
+      gtk_widget_show (menuitem);
+      gtk_menu_shell_append (menushell, menuitem);
+    }
+}
+