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, 30 insertions, 10 deletions

diff --git a/gtk/gtkgc.c b/gtk/gtkgc.c
index f10f3a97e..78481a6c0 100644
--- a/gtk/gtkgc.c
+++ b/gtk/gtkgc.c
@@ -61,7 +61,6 @@ static gint      gtk_gc_drawable_equal   (GtkGCDrawable *a,
 
 static gint initialize = TRUE;
 static GCache *gc_cache = NULL;
-static GHashTable *gc_drawable_ht = NULL;
 
 static GMemChunk *key_mem_chunk = NULL;
 
@@ -97,6 +96,30 @@ gtk_gc_release (GdkGC *gc)
   g_cache_remove (gc_cache, gc);
 }
 
+static void 
+free_gc_drawable (gpointer data)
+{
+  GtkGCDrawable *drawable = data;
+  g_object_unref (G_OBJECT (drawable->drawable));
+  g_free (drawable);
+}
+
+static GHashTable*
+gtk_gc_get_drawable_ht (GdkScreen *screen)
+{
+  GHashTable *ht = g_object_get_data (G_OBJECT (screen), "gtk-gc-drawable-ht");
+  if (!ht)
+    {
+      ht = g_hash_table_new_full ((GHashFunc) gtk_gc_drawable_hash,
+				  (GEqualFunc) gtk_gc_drawable_equal,
+				  NULL, free_gc_drawable);
+      g_object_set_data_full (G_OBJECT (screen), 
+			      "gtk-gc-drawable-ht", ht, 
+			      (GDestroyNotify)g_hash_table_destroy);
+    }
+  
+  return ht;
+}
 
 static void
 gtk_gc_init (void)
@@ -110,9 +133,6 @@ gtk_gc_init (void)
 			  (GHashFunc) gtk_gc_key_hash,
 			  (GHashFunc) gtk_gc_value_hash,
 			  (GEqualFunc) gtk_gc_key_equal);
-
-  gc_drawable_ht = g_hash_table_new ((GHashFunc) gtk_gc_drawable_hash,
-				     (GEqualFunc) gtk_gc_drawable_equal);
 }
 
 static GtkGCKey*
@@ -143,17 +163,18 @@ gtk_gc_new (gpointer key)
   GtkGCKey *keyval;
   GtkGCDrawable *drawable;
   GdkGC *gc;
+  GHashTable *ht;
 
   keyval = key;
-
-  drawable = g_hash_table_lookup (gc_drawable_ht, &keyval->depth);
+  ht = gtk_gc_get_drawable_ht (keyval->colormap->screen);
+  drawable = g_hash_table_lookup (ht, &keyval->depth);
   if (!drawable)
     {
       drawable = g_new (GtkGCDrawable, 1);
       drawable->depth = keyval->depth;
-      drawable->drawable = gdk_pixmap_new (NULL, 1, 1, drawable->depth);
-
-      g_hash_table_insert (gc_drawable_ht, &drawable->depth, drawable);
+      drawable->drawable = gdk_pixmap_new (gdk_screen_get_root_window (keyval->colormap->screen), 
+					   1, 1, drawable->depth);
+      g_hash_table_insert (ht, &drawable->depth, drawable);
     }
 
   gc = gdk_gc_new_with_values (drawable->drawable, &keyval->values, keyval->mask);
@@ -377,7 +398,6 @@ gtk_gc_key_equal (gpointer a,
   return TRUE;
 }
 
-
 static guint
 gtk_gc_drawable_hash (GtkGCDrawable *d)
 {