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, 105 insertions, 323 deletions

diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c
index dc1049540..af3a2cb04 100644
--- a/gtk/gtkthemes.c
+++ b/gtk/gtkthemes.c
@@ -29,384 +29,166 @@
 #include <stdlib.h>
 #include <gmodule.h>
 #include "gtkthemes.h"
-#include "gtkmain.h"
 #include "gtkrc.h"
-#include "gtkselection.h"
-#include "gtksignal.h"
-#include "gtkwidget.h"
 #include "config.h"
 #include "gtkintl.h"
 
-/*****************************
- *****************************
- * temporary compat code, make GtkThemeEnginePlugin a GObject plus GTypePlugin interface
- */
-typedef struct _GtkThemeEnginePlugin GtkThemeEnginePlugin;
-typedef struct _GObjectClass         GtkThemeEnginePluginClass;
-static void gtk_theme_engine_plugin_use                (GTypePlugin     *plugin);
-static void gtk_theme_engine_plugin_unuse              (GTypePlugin     *plugin);
-static void gtk_theme_engine_plugin_complete_type_info (GTypePlugin     *plugin,
-							GType            g_type,
-							GTypeInfo       *info,
-							GTypeValueTable *value_table);
-GType	    gtk_theme_engine_plugin_get_type	       (void);
-struct _GtkThemeEnginePlugin
-{
-  GObject parent_instance;
-
-  GtkThemeEngine *engine;
-  gchar *engine_name;
-  GTypeInfo info;
-  GType type;
-  GType parent_type;
-};
-#define GTK_TYPE_THEME_ENGINE_PLUGIN              (gtk_theme_engine_plugin_get_type ())
-#define GTK_THEME_ENGINE_PLUGIN(plugin)           (G_TYPE_CHECK_INSTANCE_CAST ((plugin), GTK_TYPE_THEME_ENGINE_PLUGIN, GtkThemeEnginePlugin))
-#define GTK_THEME_ENGINE_PLUGIN_CLASS(class)      (G_TYPE_CHECK_CLASS_CAST ((class), GTK_TYPE_THEME_ENGINE_PLUGIN, GtkThemeEnginePluginClass))
-#define GTK_IS_THEME_ENGINE_PLUGIN(plugin)        (G_TYPE_CHECK_INSTANCE_TYPE ((plugin), GTK_TYPE_THEME_ENGINE_PLUGIN))
-#define GTK_IS_THEME_ENGINE_PLUGIN_CLASS(class)   (G_TYPE_CHECK_CLASS_TYPE ((class), GTK_TYPE_THEME_ENGINE_PLUGIN))
-#define GTK_THEME_ENGINE_PLUGIN_GET_CLASS(plugin) (G_TYPE_INSTANCE_GET_CLASS ((plugin), GTK_TYPE_THEME_ENGINE_PLUGIN, GtkThemeEnginePluginClass))
-static void
-gtk_theme_engine_plugin_shutdown (GObject *object)
-{
-  GtkThemeEnginePlugin *plugin = GTK_THEME_ENGINE_PLUGIN (object);
-
-  g_warning (G_STRLOC ": shutdown should never happen for static type plugins");
-
-  g_object_ref (object);
-
-  /* chain parent class handler */
-  G_OBJECT_CLASS (g_type_class_peek_parent (GTK_THEME_ENGINE_PLUGIN_GET_CLASS (plugin)))->shutdown (object);
-}
-static void
-gtk_theme_engine_plugin_class_init (GtkThemeEnginePluginClass *class)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-
-  gobject_class->shutdown = gtk_theme_engine_plugin_shutdown;
-}
-static void
-theme_engine_plugin_iface_init (GTypePluginClass *iface)
-{
-  iface->use_plugin = gtk_theme_engine_plugin_use;
-  iface->unuse_plugin = gtk_theme_engine_plugin_unuse;
-  iface->complete_type_info = gtk_theme_engine_plugin_complete_type_info;
-}
-GType
-gtk_theme_engine_plugin_get_type (void)
-{
-  static GType theme_engine_plugin_type = 0;
-
-  if (!theme_engine_plugin_type)
-    {
-      static const GTypeInfo theme_engine_plugin_info = {
-	sizeof (GtkThemeEnginePluginClass),
-	NULL,           /* base_init */
-	NULL,           /* base_finalize */
-	(GClassInitFunc) gtk_theme_engine_plugin_class_init,
-	NULL,           /* class_finalize */
-	NULL,           /* class_data */
-	sizeof (GtkThemeEnginePlugin),
-	0,		/* n_preallocs */
-	NULL,		/* instance_init */
-      };
-      static const GInterfaceInfo iface_info = {
-	(GInterfaceInitFunc) theme_engine_plugin_iface_init,
-	NULL,               /* interface_finalize */
-	NULL,               /* interface_data */
-      };
-
-      theme_engine_plugin_type = g_type_register_static (G_TYPE_OBJECT, "GtkThemeEnginePlugin", &theme_engine_plugin_info, 0);
-
-      g_type_add_interface_static (theme_engine_plugin_type, G_TYPE_TYPE_PLUGIN, &iface_info);
-    }
-
-  return theme_engine_plugin_type;
-}
-/* end of GtkThemeEnginePlugin object implementation stuff
- *****************************
- *****************************/
+typedef struct _GtkThemeEngineClass GtkThemeEngineClass;
 
 struct _GtkThemeEngine
 {
+  GTypeModule parent_instance;
+  
   GModule *library;
 
-  void (*init) (GtkThemeEngine *);
+  void (*init) (GTypeModule *);
   void (*exit) (void);
   GtkRcStyle *(*create_rc_style) ();
 
   gchar *name;
+};
 
-  GSList *plugins;		/* TypePlugins for this engine */
-  
-  guint refcount;
+struct _GtkThemeEngineClass
+{
+  GTypeModuleClass parent_class;
 };
 
 static GHashTable *engine_hash = NULL;
 
-#ifdef __EMX__
-static void gen_8_3_dll_name(gchar *name, gchar *fullname)
-{
-    /* 8.3 dll filename restriction */
-    fullname[0] = '_';
-    strncpy (fullname + 1, name, 7);
-    fullname[8] = '\0';
-    strcat (fullname, ".dll");
-}                                                	
-#endif
-
-GtkThemeEngine*
-gtk_theme_engine_get (const gchar *name)
+static gboolean
+gtk_theme_engine_load (GTypeModule *module)
 {
-  GtkThemeEngine *result;
+  GtkThemeEngine *engine = GTK_THEME_ENGINE (module);
   
-  if (!engine_hash)
-    engine_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-  /* get the library name for the theme */
+  gchar *fullname;
+  gchar *engine_path;
+      
+  fullname = g_module_build_path (NULL, engine->name);
+  engine_path = gtk_rc_find_module_in_path (fullname);
   
-  result = g_hash_table_lookup (engine_hash, name);
-
-  if (!result)
+  if (!engine_path)
     {
-       gchar *fullname;
-       gchar *engine_path;
-       GModule *library;
+      g_warning (_("Unable to locate loadable module in module_path: \"%s\","),
+		 fullname);
       
-#ifndef __EMX__
-       fullname = g_module_build_path (NULL, name);
-#else
-       fullname = g_malloc (13);
-       gen_8_3_dll_name(name, fullname);
-#endif
-       engine_path = gtk_rc_find_module_in_path (fullname);
-#ifdef __EMX__
-       if (!engine_path)
-	 {
-	   /* try theme name without prefix '_' */
-	   memmove(fullname, fullname + 1, strlen(fullname));
-	   engine_path = gtk_rc_find_module_in_path (fullname);
-	 }
-#endif
-
-       if (!engine_path)
-	 {
-	   g_warning (_("Unable to locate loadable module in module_path: \"%s\","),
-		      fullname);
-	   
-	   g_free (fullname);
-	   return NULL;
-	 }
-       g_free (fullname);
+      g_free (fullname);
+      return FALSE;
+    }
+    
+  g_free (fullname);
        
-       /* load the lib */
-
-       GTK_NOTE (MISC, g_message ("Loading Theme %s\n", engine_path));
+  /* load the lib */
+  
+  GTK_NOTE (MISC, g_message ("Loading Theme %s\n", engine_path));
        
-       library = g_module_open (engine_path, 0);
-       g_free(engine_path);
-       if (!library)
-	 {
-	   g_warning (g_module_error());
-	   return NULL;
-	 }
-       else
-	 {
-	    result = g_new (GtkThemeEngine, 1);
-	    
-	    result->refcount = 1;
-	    result->name = g_strdup (name);
-	    result->library = library;
-	    result->plugins = NULL;
-	    
-	    /* extract symbols from the lib */
-	    if (!g_module_symbol (library, "theme_init",
-				  (gpointer *)&result->init) ||
-		!g_module_symbol (library, "theme_exit", 
-				  (gpointer *)&result->exit) ||
-		!g_module_symbol (library, "theme_create_rc_style", 
-				  (gpointer *)&result->create_rc_style))
-	      {
-		g_warning (g_module_error());
-		g_free (result);
-		return NULL;
-	      }
-	    
-	    /* call the theme's init (theme_init) function to let it */
-	    /* setup anything it needs to set up. */
-	    result->init((GtkThemeEngine *)result);
-	    
-	    g_hash_table_insert (engine_hash, result->name, result);
-	 }
+  engine->library = g_module_open (engine_path, 0);
+  g_free(engine_path);
+  if (!engine->library)
+    {
+      g_warning (g_module_error());
+      return FALSE;
     }
-  else
-    result->refcount++;
-
-  return (GtkThemeEngine *)result;
-}
-
-void
-gtk_theme_engine_ref (GtkThemeEngine *engine)
-{
-  g_return_if_fail (engine != NULL);
   
-  engine->refcount++;
-}
-
-void
-gtk_theme_engine_unref (GtkThemeEngine *engine)
-{
-  GSList *tmp_list;
-
-  g_return_if_fail (engine != NULL);
-  g_return_if_fail (engine->refcount > 0);
-
-  engine->refcount--;
-
-  if (engine->refcount == 0)
+  /* extract symbols from the lib */
+  if (!g_module_symbol (engine->library, "theme_init",
+			(gpointer *)&engine->init) ||
+      !g_module_symbol (engine->library, "theme_exit", 
+			(gpointer *)&engine->exit) ||
+      !g_module_symbol (engine->library, "theme_create_rc_style", 
+			(gpointer *)&engine->create_rc_style))
     {
-      engine->exit();
-
-      g_hash_table_remove (engine_hash, engine->name);
-
-      tmp_list = engine->plugins;
-      while (tmp_list)
-	{
-	  GtkThemeEnginePlugin *plugin = tmp_list->data;
-	  plugin->engine = NULL;
-
-	  tmp_list = tmp_list->next;
-	}
-      g_slist_free (engine->plugins);
-      
+      g_warning (g_module_error());
       g_module_close (engine->library);
-      g_free (engine->name);
-      g_free (engine);
+      
+      return FALSE;
     }
-}
+	    
+  /* call the theme's init (theme_init) function to let it */
+  /* setup anything it needs to set up. */
+  engine->init (module);
 
-GtkRcStyle *
-gtk_theme_engine_create_rc_style (GtkThemeEngine *engine)
-{
-  g_return_val_if_fail (engine != NULL, NULL);
-  
-  return engine->create_rc_style ();
+  return TRUE;
 }
 
 static void
-gtk_theme_engine_plugin_use (GTypePlugin *plugin)
+gtk_theme_engine_unload (GTypeModule *module)
 {
-  GtkThemeEnginePlugin *theme_plugin = GTK_THEME_ENGINE_PLUGIN (plugin);
+  GtkThemeEngine *engine = GTK_THEME_ENGINE (module);
 
-  if (theme_plugin->engine == NULL)
-    {
-      gtk_theme_engine_get (theme_plugin->engine_name);
-      if (!theme_plugin->engine)
-	{
-	  g_warning ("An attempt to create an instance of a type from\n"
-		     "a previously loaded theme engine was made after the engine\n"
-		     "was unloaded, but the engine could not be reloaded or no longer\n"
-		     "implements the type. Bad things will happen.\n");
-	}
-    }
-  else
-    gtk_theme_engine_ref (theme_plugin->engine);
-}
+  engine->exit();
 
-static void
-gtk_theme_engine_plugin_unuse (GTypePlugin *plugin)
-{
-  GtkThemeEnginePlugin *theme_plugin = GTK_THEME_ENGINE_PLUGIN (plugin);
+  g_module_close (engine->library);
+  engine->library = NULL;
 
-  g_return_if_fail (theme_plugin->engine != NULL);
-  
-  gtk_theme_engine_unref (theme_plugin->engine);
+  engine->init = NULL;
+  engine->exit = NULL;
+  engine->create_rc_style = NULL;
 }
-			       
+
 static void
-gtk_theme_engine_plugin_complete_type_info (GTypePlugin     *plugin,
-					    GType            g_type,
-					    GTypeInfo       *info,
-					    GTypeValueTable *value_table)
+gtk_theme_engine_class_init (GtkThemeEngineClass *class)
 {
-  GtkThemeEnginePlugin *theme_plugin = GTK_THEME_ENGINE_PLUGIN (plugin);
+  GTypeModuleClass *module_class = G_TYPE_MODULE_CLASS (class);
 
-  *info = theme_plugin->info;
+  module_class->load = gtk_theme_engine_load;
+  module_class->unload = gtk_theme_engine_unload;
 }
 
-/**
- * gtk_theme_engine_register_type:
- * @engine:      a #GtkThemeEngine
- * @parent_type: the type for the parent class
- * @type_name:   name for the type
- * @type_info:   type information structure
- * 
- * Looks up or registers a type that is implemented with a particular
- * theme engine. If a type with name @type_name is already registered,
- * the #GType identifier for the type is returned, otherwise the type
- * is newly registered, and the resulting #GType identifier returned.
- *
- * As long as any instances of the type exist, the a reference will be
- * held to the theme engine and the theme engine will not be unloaded.
- *
- * Return value: the type identifier for the class.
- **/
 GType
-gtk_theme_engine_register_type (GtkThemeEngine  *engine,
-				GType            parent_type,
-				const gchar     *type_name,
-				const GTypeInfo *type_info)
+gtk_theme_engine_get_type (void)
 {
-  GtkThemeEnginePlugin *plugin;
-  GType type;
-  
-  g_return_val_if_fail (engine != NULL, 0);
-  g_return_val_if_fail (type_name != NULL, 0);
-  g_return_val_if_fail (type_info != NULL, 0);
+  static GType theme_engine_type = 0;
 
-  type = g_type_from_name (type_name);
-  if (type)
-    plugin = GTK_THEME_ENGINE_PLUGIN (g_type_get_plugin (type));
-  else
+  if (!theme_engine_type)
     {
-      plugin = g_object_new (GTK_TYPE_THEME_ENGINE_PLUGIN, NULL);
+      static const GTypeInfo theme_engine_info = {
+        sizeof (GtkThemeEngineClass),
+        NULL,           /* base_init */
+        NULL,           /* base_finalize */
+        (GClassInitFunc) gtk_theme_engine_class_init,
+        NULL,           /* class_finalize */
+        NULL,           /* class_data */
+        sizeof (GtkThemeEngine),
+        0,              /* n_preallocs */
+        NULL,           /* instance_init */
+      };
 
-      plugin->engine = NULL;
-      plugin->engine_name = NULL;
-      plugin->parent_type = parent_type;
-      plugin->type = g_type_register_dynamic (parent_type, type_name, G_TYPE_PLUGIN (plugin), 0);
+      theme_engine_type = g_type_register_static (G_TYPE_TYPE_MODULE, "GtkThemeEngine", &theme_engine_info, 0);
     }
   
-  if (plugin->engine)
-    {
-      if (plugin->engine != engine)
-	{
-	  g_warning ("Two different theme engines tried to register '%s'.", type_name);
-	  return 0;
-	}
+  return theme_engine_type;
+}
 
-      if (plugin->parent_type != parent_type)
-	{
-	  g_warning ("Type '%s' recreated with different parent type.\n"
-		     "(was '%s', now '%s')", type_name,
-		     g_type_name (plugin->parent_type),
-		     g_type_name (parent_type));
-	  return 0;
-	}
-    }
-  else
-    {
-      plugin->engine = engine;
-      if (plugin->engine_name)
-	g_free (plugin->engine_name);
+GtkThemeEngine*
+gtk_theme_engine_get (const gchar *name)
+{
+  GtkThemeEngine *result;
+  
+  if (!engine_hash)
+    engine_hash = g_hash_table_new (g_str_hash, g_str_equal);
 
-      plugin->engine_name = g_strdup (engine->name);
-      
-      plugin->info = *type_info;
+  /* get the library name for the theme
+   */
+  result = g_hash_table_lookup (engine_hash, name);
 
-      engine->plugins = g_slist_prepend (engine->plugins, plugin);
+  if (!result)
+    {
+      result = GTK_THEME_ENGINE (g_object_new (GTK_TYPE_THEME_ENGINE, NULL));
+      g_type_module_set_name (G_TYPE_MODULE (result), name);
+
+      g_hash_table_insert (engine_hash, result->name, result);
     }
 
-  return plugin->type;
+  if (!g_type_module_use (G_TYPE_MODULE (result)))
+    return NULL;
+
+  return result;
 }
 
+GtkRcStyle *
+gtk_theme_engine_create_rc_style (GtkThemeEngine *engine)
+{
+  g_return_val_if_fail (engine != NULL, NULL);
+
+  return engine->create_rc_style ();
+}