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, 53 insertions, 112 deletions

diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h
index 55c1c22e9e..9fb5ba06ad 100644
--- a/gtk/gtkeditable.h
+++ b/gtk/gtkeditable.h
@@ -31,132 +31,73 @@
 #include <gdk/gdk.h>
 #include <gtk/gtkwidget.h>
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
 
-#define GTK_TYPE_EDITABLE            (gtk_editable_get_type ())
-#define GTK_EDITABLE(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_EDITABLE, GtkEditable))
-#define GTK_EDITABLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_EDITABLE, GtkEditableClass))
-#define GTK_IS_EDITABLE(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_EDITABLE))
-#define GTK_IS_EDITABLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_EDITABLE))
-#define GTK_EDITABLE_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_EDITABLE, GtkEditableClass))
-
+#define GTK_TYPE_EDITABLE             (gtk_editable_get_type ())
+#define GTK_EDITABLE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EDITABLE, GtkEditable))
+#define GTK_EDITABLE_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_EDITABLE, GtkEditableClass))
+#define GTK_IS_EDITABLE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_EDITABLE))
+#define GTK_IS_EDITABLE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_EDITABLE))
+#define GTK_EDITABLE_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_EDITABLE, GtkEditableClass))
 
-typedef struct _GtkEditable       GtkEditable;
+typedef struct _GtkEditable       GtkEditable;         /* Dummy typedef */
 typedef struct _GtkEditableClass  GtkEditableClass;
 
-typedef void (*GtkTextFunction) (GtkEditable  *editable, guint32 time);
-
-struct _GtkEditable
-{
-  GtkWidget widget;
-
-  /*< public >*/
-  guint      current_pos;
-
-  guint      selection_start_pos;
-  guint      selection_end_pos;
-  guint      has_selection : 1;
-
-  /*< private >*/
-  guint      editable : 1;
-  guint      visible : 1;
-  GdkIC     *ic;
-  GdkICAttr *ic_attr;
-  
-  gchar *clipboard_text;
-};
-
 struct _GtkEditableClass
 {
-  GtkWidgetClass parent_class;
+  GTypeInterface		   base_iface;
   
   /* Signals for notification/filtering of changes */
-  void (* changed)      (GtkEditable    *editable);
-  void (* insert_text)  (GtkEditable    *editable,
-			 const gchar    *text,
-			 gint            length,
-			 gint           *position);
-  void (* delete_text)  (GtkEditable    *editable,
-			 gint            start_pos,
-			 gint            end_pos);
-
-  /* Bindings actions */
-  void (* activate)        (GtkEditable *editable);
-  void (* set_editable)    (GtkEditable *editable,
-			    gboolean	 is_editable);
-  void (* move_cursor)     (GtkEditable *editable,
-			    gint         x,
-			    gint         y);
-  void (* move_word)       (GtkEditable *editable,
-			    gint         n);
-  void (* move_page)       (GtkEditable *editable,
-			    gint         x,
-			    gint         y);
-  void (* move_to_row)     (GtkEditable *editable,
-			    gint         row);
-  void (* move_to_column)  (GtkEditable *editable,
-			    gint         row);
-  void (* kill_char)       (GtkEditable *editable,
-			    gint         direction);
-  void (* kill_word)       (GtkEditable *editable,
-			    gint         direction);
-  void (* kill_line)       (GtkEditable *editable,
-			    gint         direction);
-  void (* cut_clipboard)   (GtkEditable *editable);
-  void (* copy_clipboard)  (GtkEditable *editable);
-  void (* paste_clipboard) (GtkEditable *editable);
-
-  /* Virtual functions. get_chars is in paricular not a signal because
-   * it returns malloced memory. The others are not signals because
-   * they would not be particularly useful as such. (All changes to
-   * selection and position do not go through these functions)
-   */
-  void (* update_text)  (GtkEditable    *editable,
-			 gint            start_pos,
-			 gint            end_pos);
-  gchar* (* get_chars)  (GtkEditable    *editable,
-			 gint            start_pos,
-			 gint            end_pos);
-  void (* set_selection)(GtkEditable    *editable,
-			 gint            start_pos,
-			 gint            end_pos);
-  void (* set_position) (GtkEditable    *editable,
-			 gint            position);
+  void (* insert_text)              (GtkEditable    *editable,
+				     const gchar    *text,
+				     gint            length,
+				     gint           *position);
+  void (* delete_text)              (GtkEditable    *editable,
+				     gint            start_pos,
+				     gint            end_pos);
+  gchar* (* get_chars)              (GtkEditable    *editable,
+				     gint            start_pos,
+				     gint            end_pos);
+  void (* set_selection_bounds)     (GtkEditable    *editable,
+				     gint            start_pos,
+				     gint            end_pos);
+  gboolean (* get_selection_bounds) (GtkEditable    *editable,
+				     gint           *start_pos,
+				     gint           *end_pos);
+  void (* set_position)             (GtkEditable    *editable,
+				     gint            position);
+  gint (* get_position)             (GtkEditable    *editable);
 };
 
-GtkType    gtk_editable_get_type       (void) G_GNUC_CONST;
-void       gtk_editable_select_region  (GtkEditable      *editable,
-					gint              start,
-					gint              end);
-void       gtk_editable_insert_text   (GtkEditable       *editable,
-					const gchar      *new_text,
-					gint              new_text_length,
-					gint             *position);
-void       gtk_editable_delete_text    (GtkEditable      *editable,
-					gint              start_pos,
-					gint              end_pos);
-gchar*     gtk_editable_get_chars      (GtkEditable      *editable,
-					gint              start_pos,
-					gint              end_pos);
-void       gtk_editable_cut_clipboard  (GtkEditable      *editable);
-void       gtk_editable_copy_clipboard (GtkEditable      *editable);
-void       gtk_editable_paste_clipboard (GtkEditable     *editable);
-void       gtk_editable_claim_selection (GtkEditable     *editable, 
-					 gboolean         claim, 
-					 guint32          time);
-void       gtk_editable_delete_selection (GtkEditable    *editable);
-
-void       gtk_editable_changed         (GtkEditable    *editable);
-void       gtk_editable_set_position    (GtkEditable    *editable,
-					 gint            position);
-gint       gtk_editable_get_position    (GtkEditable    *editable);
-void       gtk_editable_set_editable    (GtkEditable    *editable,
-					 gboolean        is_editable);
-
+GtkType  gtk_editable_get_type             (void) G_GNUC_CONST;
+void     gtk_editable_select_region        (GtkEditable *editable,
+					    gint         start,
+					    gint         end);
+gboolean gtk_editable_get_selection_bounds (GtkEditable *editable,
+					    gint        *start,
+					    gint        *end);
+void     gtk_editable_insert_text          (GtkEditable *editable,
+					    const gchar *new_text,
+					    gint         new_text_length,
+					    gint        *position);
+void     gtk_editable_delete_text          (GtkEditable *editable,
+					    gint         start_pos,
+					    gint         end_pos);
+gchar*   gtk_editable_get_chars            (GtkEditable *editable,
+					    gint         start_pos,
+					    gint         end_pos);
+void     gtk_editable_cut_clipboard        (GtkEditable *editable);
+void     gtk_editable_copy_clipboard       (GtkEditable *editable);
+void     gtk_editable_paste_clipboard      (GtkEditable *editable);
+void     gtk_editable_delete_selection     (GtkEditable *editable);
+void     gtk_editable_set_position         (GtkEditable *editable,
+					    gint         position);
+gint     gtk_editable_get_position         (GtkEditable *editable);
+void     gtk_editable_set_editable         (GtkEditable *editable,
+					    gboolean     is_editable);
 
 #ifdef __cplusplus
 }