Integrate Erwann Chenede's multihead changes for the gtk/ directory.

Mon Apr 29 18:28:00 2002  Owen Taylor  <otaylor@redhat.com>

	Integrate Erwann Chenede's multihead changes for the gtk/ directory.

	* gtk/gtkclipboard.[ch]: Add gtk_clipboard_get_for_display(),
	make internals multihead aware.

	* gtk/gtkcolorsel.[ch]: Add
	gtk_color_selection_set_change_palette_with_screen_hook () [ugh!]
	make up for non-multihead safety of
	gtk_color_selection_set_change_palette_hook()

	* gtk/gtkinvisible.[ch] gtk/gtkmenu.[ch] gtkwindow.[ch]: Add
	gtk_{invisible,menu,window}_set_screen(); add "screen" properties
	for GtkWindow and GtkMenu.

	* gtk/gtkplug.[ch]: Add gtk_plug_construct_for_display(),
	gtk_plug_new_for_display(). Multihead fixes.

	* gtk/gtkselection.[ch]: Add gtk_selection_owner_set_for_display(),
	make internals multihead aware.

	* gtk/gtksettings.[ch]: Add gtk_settings_get_for_screen(), get
	rid of now-useless gtk_settings_constructor().

	* gtk/gtkstyle.[ch]: Add gtk_style_get_font_for_display(), fix
	check/radio button indicators bitmap handling to be multihead
	safe.

	* gtk/gtkwidget.[ch]: Add gtk_widget_get_screen(), gtk_widget_has_screen(),
	gtk_widget_get_display(), gtk_widget_get_clipboard(),
	gtk_widget_get_root_window().

	* gtk/gtkbindings.c gtk/gtkbutton.c gtk/gtkclist.c gtk/gtkcombo.c
	gtk/gtkctree.c gtk/gtkdnd.c gtk/gtkfilesel.c gtk/gtkgamma.c
	gtk/gtkhandlebox.c gtk/gtkhsv.c gtk/gtkimcontext.c gtk/gtklabel.c
	gtk/gtklist.c gtk/gtkmain.c gtk/gtkmenuitem.c gtk/gtkmenushell.c
	gtk/gtknotebook.c gtk/gtkoldeditable.c gtk/gtkoptionmenu.c
	gtk/gtkpaned.c gtk/gtkpreview.c gtk/gtksocket.c gtk/gtktext.c
	gtk/gtktextbuffer.c gtk/gtktextview.c gtk/gtktipsquery.c
	gtk/gtktooltips.c gtk/gtktreeview.c gtk/gtktreeviewcolumn.c:
	misc mechanical multihead-safety fixes.

	* gtk/gtkclipboard.c: Use a GtkImage rather than a pixmap for
	the dropper, look up the color palette only at realization time,
	other multihead fixes.

	* gtk/gtkcombo.c (gtk_combo_unrealize): Popdown the list when
	unrealizing.

	* gtk/gtkentry.c: Only claim ownership of the primary selection
	when realized, misc multihead fixes.

	* gtk/gtkfontsel.c: Only fill in fonts when attached to a screen,
	fix gtk_font_selection_get_font() for multihead.

	* gtk/gtkgc.c: make the depth => drawable hash per-screen.

	* gtk/gtkinvisible.c: Add a constructor that realizes the
	widget, so we get a realized widget with g_object_new() as
	well gtk_invisible_new() as before.

	* gtk/gtkmain.c: Get rid of unused gtk_visual/gtk_colormap
	variables.

	* gtk/gtktextdisplay.c: Add warnings if stipple bitmaps
	are used on the wrong screen.

	* gtk/gtktoolbar.c: Make handling of GtkSettings-based layout
	read properties and connect to settings when the screen is changed,
	rather than on init/finalize.

	* gtk/gtkwindow.c: Fix icon handing to be multihead safe ...
	default icon pixmaps/mask are only shared between windows on the
	same screen. Misc multihead fixes.

Sat Apr 27 13:49:53 2002  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkclipboard.c (gtk_clipboard_get_for_display):
	Update docs to reference GDK_SELECTION_CLIPBOARD rather GDK_NONE.

2002-04-29  Alex Larsson  <alexl@redhat.com>

	* gdk/linux-fb/gdkproperty-fb.c (gdk_property_get):
	Fix silly bug, noticed by Sven Neumann.

Sun Apr 28 22:43:55 2002  Jonathan Blandford  <jrb@gnome.org>

	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix
	so that you can set a new sort func.

1 files changed, 38 insertions, 39 deletions

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index f5f02eea0c..50528d02ea 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -39,9 +39,6 @@ enum {
 static void	gtk_settings_init		 (GtkSettings		*settings);
 static void	gtk_settings_class_init		 (GtkSettingsClass	*class);
 static void	gtk_settings_finalize		 (GObject		*object);
-static GObject*	gtk_settings_constructor	 (GType			 type,
-						  guint			 n_construct_properties,
-						  GObjectConstructParam	*construct_properties);
 static void	gtk_settings_get_property	 (GObject		*object,
 						  guint			 property_id,
 						  GValue		*value,
@@ -59,7 +56,6 @@ static guint	settings_install_property_parser (GtkSettingsClass      *class,
 
 /* --- variables --- */
 static gpointer		 parent_class = NULL;
-static GtkSettings	*the_singleton = NULL;
 static GQuark		 quark_property_parser = 0;
 static GSList           *object_list = NULL;
 static guint		 class_n_properties = 0;
@@ -135,7 +131,6 @@ gtk_settings_class_init (GtkSettingsClass *class)
   
   parent_class = g_type_class_peek_parent (class);
 
-  gobject_class->constructor = gtk_settings_constructor;
   gobject_class->finalize = gtk_settings_finalize;
   gobject_class->get_property = gtk_settings_get_property;
   gobject_class->set_property = gtk_settings_set_property;
@@ -238,34 +233,45 @@ gtk_settings_finalize (GObject *object)
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-static GObject*
-gtk_settings_constructor (GType			 type,
-			  guint		         n_construct_properties,
-			  GObjectConstructParam *construct_properties)
+/**
+ * gtk_settings_get_for_screen:
+ * @screen : a #GdkScreen.
+ * 
+ * Gets the #GtkSettings object for @screen, creating it if necessary.
+ *
+ * Return value: a #GtkSettings object.
+ */
+GtkSettings*
+gtk_settings_get_for_screen (GdkScreen *screen)
 {
-  GObject *object;
-
-  /* currently we're a singleton, that might change with multiple display support though */
-  if (!the_singleton)
+  GtkSettings *settings;
+  
+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+  
+  settings = g_object_get_data (G_OBJECT (screen), "gtk-settings");
+  if (!settings)
     {
-      object = G_OBJECT_CLASS (parent_class)->constructor (type,
-							   n_construct_properties,
-							   construct_properties);
-      the_singleton = GTK_SETTINGS (g_object_ref (object));
+      settings = g_object_new (GTK_TYPE_SETTINGS, NULL);
+      settings->screen = screen;
+      g_object_set_data (G_OBJECT (screen), "gtk-settings", settings); 
+      gtk_rc_reparse_all_for_settings (settings, TRUE);
     }
-  else
-    object = g_object_ref (G_OBJECT (the_singleton));
-
-  return object;
+  
+  return settings;
 }
 
+/**
+ * gtk_settings_get_default:
+ * 
+ * Gets the #GtkSettings object for the default GDK screen, creating
+ * it if necessary. See gtk_settings_get_for_screen().
+ * 
+ * Return value: a #GtkSettings object
+ **/
 GtkSettings*
 gtk_settings_get_default (void)
 {
-  if (!the_singleton)
-    g_object_new (GTK_TYPE_SETTINGS, NULL);
-  
-  return the_singleton;	/* we don't add a reference count here, we'd be settings_ref_global() if we did */
+  return gtk_settings_get_for_screen (gdk_get_default_screen ());
 }
 
 static void
@@ -298,7 +304,7 @@ gtk_settings_get_property (GObject     *object,
       g_value_type_transformable (G_TYPE_STRING, G_VALUE_TYPE (value)) ||
       g_value_type_transformable (GDK_TYPE_COLOR, G_VALUE_TYPE (value)))
     {
-      if (gdk_setting_get (pspec->name, value))
+      if (gdk_screen_get_setting (settings->screen, pspec->name, value))
         g_param_value_validate (pspec, value);
       else
         g_value_copy (settings->property_values + property_id - 1, value);
@@ -311,7 +317,7 @@ gtk_settings_get_property (GObject     *object,
       
       g_value_init (&val, G_TYPE_STRING);
 
-      if (!gdk_setting_get (pspec->name, &val))
+      if (!gdk_screen_get_setting (settings->screen, pspec->name, &val))
         {
           g_value_copy (settings->property_values + property_id - 1, value);
         }
@@ -351,15 +357,12 @@ static void
 gtk_settings_notify (GObject    *object,
 		     GParamSpec *pspec)
 {
+  GtkSettings *settings = GTK_SETTINGS (object);
   guint property_id = pspec->param_id;
   gint double_click_time;
-  
-#if 1
-  GValue tmp_value = { 0, };
-  gchar *contents;
-  g_value_init (&tmp_value, G_PARAM_SPEC_VALUE_TYPE (pspec));
-  g_object_get_property (object, pspec->name, &tmp_value);
-  contents = g_strdup_value_contents (&tmp_value);
+
+  if (settings->screen == NULL) /* initialization */
+    return;
 
   switch (property_id)
     {
@@ -368,10 +371,6 @@ gtk_settings_notify (GObject    *object,
       gdk_set_double_click_time (double_click_time);
       break;
     }
-
-  g_free (contents);
-  g_value_unset (&tmp_value);
-#endif
 }
 
 gboolean
@@ -944,7 +943,7 @@ gtk_rc_property_parse_border (const GParamSpec *pspec,
 void
 _gtk_settings_handle_event (GdkEventSetting *event)
 {
-  GtkSettings *settings = gtk_settings_get_default ();
+  GtkSettings *settings = gtk_settings_get_for_screen (gdk_drawable_get_screen (event->window));
   
   if (g_object_class_find_property (G_OBJECT_GET_CLASS (settings), event->name))
     g_object_notify (G_OBJECT (settings), event->name);