Try to figure out if this is Digital Unix and we need -std1 to get the

Sat May  9 20:11:20 1998  Owen Taylor  <otaylor@gtk.org>

	* configure.in (LIBS): Try to figure out if this
	is Digital Unix and we need -std1 to get the
	right prototypes.

Sat May  9 20:08:12 1998  Owen Taylor  <otaylor@gtk.org>

	* glib/gmem.c: Experimentally restore GMemChunk
	to its primeval state - where mem areas are
	freed incrementally instead of searching the tree
	every time a mem area is completely empty. Also,
	always keep one mem chunk around. (Reduced calls
	to malloc() a lot, but doesn't really improve
	performance significiantly)

Fri May  8 21:31:50 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkwidget.c (gtk_widget_queue_draw): Free the
	draw-queue when we are done.

	(gtk_widget_queue_draw/_queu_resize): Always return
	FALSE and avoid having two idles at the same time.

Fri May  8 21:04:00 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtktext.c: Various fixes to make sure cache
	lines are freed if line_start_cache doesn't point to the
	beginning of the cache.

Thu May  7 09:44:22 1998  Owen Taylor  <otaylor@gtk.org>

	* style_set improvements for GtkText and GtkEntry

Tue May  5 19:49:27 1998  Owen Taylor  <otaylor@gtk.org>

	* gdk/gdkpixmap.c: Patches from Gordon Matzigkeit
	to speed things up and remove code duplication.

	Reintegrated buffer overflow patches, and added
	some extra paranoia.

Tue May  5 17:04:14 1998  Owen Taylor  <otaylor@gtk.org>

	* gdk/gdk.c (gdk_event_translate): A guint * was
	being passed where X expected a Keysym *, and
	keysyms are long's on Alpha Linux. This was causing
	segfaults in Xlib, apparently because of alignment.
	(Bug located by Juergen Haas <haas@forwiss.uni-passau.de>)

Tue May  5 19:11:27 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkdrawingarea.c (gtk_drawing_area_realize): Always
	set GDK_EXPOSURE_MASK for DrawingAreas

Tue May  5 14:32:37 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkwidget.[ch]: removed gtk_widge_propagate_default_style
	(superceded by RC file reparsing capabilities)

	* gtk/gtkwindow.c: Add handling for _GDK_READ_RFCILES client
	events. (Shouldn't be sent to the InputOnly leader, which
	it is now by gdk_event_send_clientmessage_toall

	* gtk/testgtk.c: Added extra button to rcfiles test
	to send out _GDK_READ_RCFILES events.

Tue May  5 11:03:00 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkselection.c (gtk_selection_clear): Fixed
	reversed conditionals that caused segfault on some
	platforms.

Tue May  5 00:44:47 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtkcontainer.c (gtk_container_set_focus_[hv]adjustment):
	cast to GTK_OBJECT for gtk_object_ref.

9 files changed, 143 insertions, 109 deletions

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index de7b350a02..966358db93 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -1116,7 +1116,7 @@ gtk_container_set_focus_vadjustment (GtkContainer  *container,
     g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
 
   if (adjustment)
-    gtk_object_ref (adjustment);
+    gtk_object_ref (GTK_OBJECT(adjustment));
 
   gtk_object_set_data_by_id_full (GTK_OBJECT (container),
 				  vadjustment_key_id,
@@ -1134,7 +1134,7 @@ gtk_container_set_focus_hadjustment (GtkContainer  *container,
     g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
 
   if (adjustment)
-    gtk_object_ref (adjustment);
+    gtk_object_ref (GTK_OBJECT (adjustment));
 
   gtk_object_set_data_by_id_full (GTK_OBJECT (container),
 				  hadjustment_key_id,
diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c
index 0b6691999f..352c95b8e4 100644
--- a/gtk/gtkdrawingarea.c
+++ b/gtk/gtkdrawingarea.c
@@ -110,7 +110,7 @@ gtk_drawing_area_realize (GtkWidget *widget)
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.visual = gtk_widget_get_visual (widget);
   attributes.colormap = gtk_widget_get_colormap (widget);
-  attributes.event_mask = gtk_widget_get_events (widget);
+  attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK;
 
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
 
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 105643948b..93cf32e577 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2106,5 +2106,11 @@ gtk_entry_style_set	(GtkWidget      *widget,
       scroll_char = gtk_entry_find_position (entry, entry->scroll_offset);
       gtk_entry_recompute_offsets (GTK_ENTRY (widget));
       entry->scroll_offset = entry->char_offset[scroll_char];
+
+      gdk_window_set_background (widget->window, &widget->style->base[GTK_STATE_NORMAL]);
+      gdk_window_set_background (entry->text_area, &widget->style->base[GTK_STATE_NORMAL]);
     }
+
+  if (GTK_WIDGET_DRAWABLE (widget))
+    gdk_window_clear (widget->window);
 }
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 3f4dffa1a5..0f5e2c509a 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -630,18 +630,20 @@ gtk_selection_clear (GtkWidget *widget,
       tmp_list = tmp_list->next;
     }
     
-  if (selection_info->time > event->time)
-    return FALSE;		/* return FALSE to indicate that
+  if (tmp_list)
+    {
+      if (selection_info->time > event->time)
+	return FALSE;		/* return FALSE to indicate that
 				 * the selection was out of date,
 				 * and this clear should be ignored */
-  else
-    if (tmp_list)
-      {
-	current_selections = g_list_remove_link (current_selections, tmp_list);
-	g_list_free (tmp_list);
-	g_free (selection_info);
-      }
-
+      else
+	{
+	  current_selections = g_list_remove_link (current_selections, tmp_list);
+	  g_list_free (tmp_list);
+	  g_free (selection_info);
+	}
+    }
+  
   return TRUE;
 }
 
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 843fa465c2..69b533c29a 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -161,6 +161,8 @@ static void  gtk_text_init           (GtkText        *text);
 static void  gtk_text_destroy        (GtkObject      *object);
 static void  gtk_text_realize        (GtkWidget      *widget);
 static void  gtk_text_unrealize      (GtkWidget      *widget);
+static void  gtk_text_style_set	     (GtkWidget      *widget,
+				      GtkStyle       *previous_style);
 static void  gtk_text_draw_focus     (GtkWidget      *widget);
 static void  gtk_text_size_request   (GtkWidget      *widget,
 				      GtkRequisition *requisition);
@@ -458,6 +460,7 @@ gtk_text_class_init (GtkTextClass *class)
 
   widget_class->realize = gtk_text_realize;
   widget_class->unrealize = gtk_text_unrealize;
+  widget_class->style_set = gtk_text_style_set;
   widget_class->draw_focus = gtk_text_draw_focus;
   widget_class->size_request = gtk_text_size_request;
   widget_class->size_allocate = gtk_text_size_allocate;
@@ -1052,6 +1055,29 @@ gtk_text_realize (GtkWidget *widget)
     recompute_geometry (text);
 }
 
+static void 
+gtk_text_style_set	(GtkWidget      *widget,
+			 GtkStyle       *previous_style)
+{
+  GtkText *text;
+
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_TEXT (widget));
+
+  text = GTK_TEXT (widget);
+  if (GTK_WIDGET_REALIZED (widget))
+    {
+      gdk_window_set_background (widget->window, &widget->style->base[GTK_STATE_NORMAL]);
+      gdk_window_set_background (text->text_area, &widget->style->base[GTK_STATE_NORMAL]);
+
+      if ((widget->allocation.width > 1) || (widget->allocation.height > 1))
+	recompute_geometry (text);
+    }
+
+  if (GTK_WIDGET_DRAWABLE (widget))
+    gdk_window_clear (widget->window);
+}
+
 static void
 gtk_text_unrealize (GtkWidget *widget)
 {
@@ -1888,6 +1914,13 @@ gtk_text_adjustment (GtkAdjustment *adjustment,
   g_return_if_fail (text != NULL);
   g_return_if_fail (GTK_IS_TEXT (text));
 
+  /* Just ignore it if we haven't been size-allocated yet, or
+   * if something weird has happened */
+  if ((text->line_start_cache == NULL) || 
+      (GTK_WIDGET (text)->allocation.height <= 1) || 
+      (GTK_WIDGET (text)->allocation.width <= 1))
+    return;
+
   if (adjustment == text->hadj)
     {
       g_warning ("horizontal scrolling not implemented");
@@ -2958,8 +2991,11 @@ find_line_containing_point (GtkText* text, guint point,
       if (scroll)
 	{
 	  lph = pixel_height_of (text, cache->next);
-	  
-	  while (lph > height || lph == 0)
+
+	  /* Scroll the bottom of the line is on screen, or until
+	   * the line is the first onscreen line.
+	   */
+	  while (cache->next != text->line_start_cache && lph > height)
 	    {
 	      TEXT_SHOW_LINE (text, cache, "cache");
 	      TEXT_SHOW_LINE (text, cache->next, "cache->next");
@@ -3196,6 +3232,14 @@ free_cache (GtkText* text)
 {
   GList* cache = text->line_start_cache;
 
+  if (cache)
+    {
+      while (cache->prev)
+	cache = cache->prev;
+
+      text->line_start_cache = cache;
+    }
+
   for (; cache; cache = cache->next)
     g_mem_chunk_free (params_mem_chunk, cache->data);
 
@@ -3207,26 +3251,29 @@ free_cache (GtkText* text)
 static GList*
 remove_cache_line (GtkText* text, GList* member)
 {
+  GList *list;
+
   if (member == text->line_start_cache)
     {
       if (text->line_start_cache)
 	text->line_start_cache = text->line_start_cache->next;
-      return text->line_start_cache;
     }
-  else
-    {
-      GList *list = member->prev;
 
-      list->next = list->next->next;
+  if (member->prev)
+    {
+      list = member->prev;
+  
+      list->next = member->next;
       if (list->next)
 	list->next->prev = list;
+    }
 
-      member->next = NULL;
-      g_mem_chunk_free (params_mem_chunk, member->data);
-      g_list_free (member);
+  list = member->next;
+  
+  g_mem_chunk_free (params_mem_chunk, member->data);
+  g_list_free_1 (member);
 
-      return list->next;
-    }
+  return list;
 }
 
 /**********************************************************************/
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 47ab7bd328..d59b8f5e01 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -1558,8 +1558,12 @@ static gint
 gtk_widget_idle_draw (void *data)
 {
   GSList *node;
+  GSList *draw_queue;
 
-  node = gtk_widget_redraw_queue;
+  draw_queue = node = gtk_widget_redraw_queue;
+  /* We set this gtk_widget_redraw_queue to NULL first, in case anybody
+   * calls queue_draw recursively
+   */
   gtk_widget_redraw_queue = NULL;
   while (node)
     {
@@ -1567,7 +1571,9 @@ gtk_widget_idle_draw (void *data)
       node = node->next;
     }
 
-  return gtk_widget_redraw_queue != NULL;
+  g_slist_free (draw_queue);
+  
+  return FALSE;
 }
 
 void
@@ -1628,7 +1634,7 @@ gtk_widget_idle_sizer (void *data)
     }
   g_slist_free (free_slist);
 
-  return gtk_widget_resize_queue != NULL;
+  return FALSE;
 }
 
 void
@@ -2724,32 +2730,6 @@ gtk_widget_pop_style (void)
     }
 }
 
-/* Basically, send a message to all toplevel windows telling them
- * that a new _GTK_STYLE_COLORS property is available on the root
- * window
- */
-void
-gtk_widget_propagate_default_style (void)
-{
-  GdkEventClient sev;
-  int i;
-  
-  /* Set the property on the root window */
-  gdk_property_change(GDK_ROOT_PARENT(),
-		      gdk_atom_intern("_GTK_DEFAULT_COLORS", FALSE),
-		      gdk_atom_intern("STRING", FALSE),
-		      8*sizeof(gushort),
-		      GDK_PROP_MODE_REPLACE,
-		      (guchar *)gtk_widget_get_default_style(),
-		      GTK_STYLE_NUM_STYLECOLORS() * sizeof(GdkColor));
-
-  for(i = 0; i < 5; i++)
-    sev.data.l[i] = 0;
-  sev.data_format = 32;
-  sev.message_type = gdk_atom_intern ("_GTK_STYLE_CHANGED", FALSE);
-  gdk_event_send_clientmessage_toall ((GdkEvent *) &sev);
-}
-
 /*************************************************************
  * gtk_widget_set_parent_window:
  *     Set a non default parent window for widget
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 2dfc151024..08ea853316 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -474,10 +474,6 @@ void	   gtk_widget_restore_default_style (GtkWidget	*widget);
 /* Descend recursively and set rc-style on all widgets without user styles */
 void       gtk_widget_reset_rc_styles   (GtkWidget      *widget);
 
-/* Tell other Gtk applications to use the same default colors.
- */
-void	   gtk_widget_propagate_default_style	(void);
-
 /* Push/pop pairs, to change default values upon a widget's creation.
  * This will override the values that got set by the
  * gtk_widget_set_default_* () functions.
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 2d68eb1114..9608b081a5 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -22,6 +22,7 @@
 #include "gdk/gdkkeysyms.h"
 #include "gdk/gdkx.h"
 #include "gtkprivate.h"
+#include "gtkrc.h"
 #include "gtksignal.h"
 #include "gtkwindow.h"
 
@@ -110,6 +111,9 @@ static gint gtk_window_check_accelerator  (GtkWindow         *window,
 					   gint               key,
 					   guint              mods);
 
+static void gtk_window_read_rcfiles       (GtkWidget         *widget,
+					   GdkEventClient    *event);
+
 
 static GtkBinClass *parent_class = NULL;
 static guint window_signals[LAST_SIGNAL] = { 0 };
@@ -942,70 +946,43 @@ gtk_window_focus_out_event (GtkWidget     *widget,
 }
 
 static void
-gtk_window_style_set_event (GtkWidget *widget,
-			    GdkEventClient *event)
+gtk_window_read_rcfiles (GtkWidget *widget,
+			 GdkEventClient *event)
 {
-  GdkAtom atom_default_colors;
-  GtkStyle *style_newdefault;
-  GdkAtom realtype;
-  gint retfmt, retlen;
-  GdkColor *data, *stylecolors;
-  int i = 0;
-  GdkColormap *widget_cmap;
-  
-  atom_default_colors = gdk_atom_intern("_GTK_DEFAULT_COLORS", FALSE);
+  GList *toplevels;
   
-  if(gdk_property_get (GDK_ROOT_PARENT(),
-		       atom_default_colors,
-		       gdk_atom_intern("STRING", FALSE),
-		       0,
-		       sizeof(GdkColor) * GTK_STYLE_NUM_STYLECOLORS(),
-		       FALSE,
-		       &realtype,
-		       &retfmt,
-		       &retlen,
-		       (guchar **)&data) != TRUE) {
-    g_warning("gdk_property_get() failed in _GTK_STYLE_CHANGED handler\n");
-    return;
-  }
-  if(retfmt != sizeof(gushort)*8) {
-    g_warning("retfmt (%d) != sizeof(gushort)*8 (%d)\n", retfmt,
-	sizeof(gushort)*8);
-    return;
-  }
-  /* We have the color data, now let's interpret it */
-  style_newdefault = gtk_widget_get_default_style();
-  gtk_style_ref(style_newdefault);
-  stylecolors = (GdkColor *) style_newdefault;
-
-  widget_cmap = gtk_widget_get_colormap(widget);
-  for(i = 0; i < GTK_STYLE_NUM_STYLECOLORS(); i++) {
-    stylecolors[i] = data[i];
-    gdk_color_alloc(widget_cmap, &stylecolors[i]);
-  }
-
-  gtk_widget_set_default_style(style_newdefault);
-  gtk_style_unref(style_newdefault);
-
-  /* Now we need to redraw everything */
-  gtk_widget_draw(widget, NULL);
-  gtk_widget_draw_children(widget);
+  if (gtk_rc_reparse_all ())
+    {
+      toplevels = gdk_window_get_toplevels();
+      while (toplevels)
+	{
+	  GtkWidget *widget;
+	  gdk_window_get_user_data (toplevels->data, (gpointer *)&widget);
+	  
+	  if (widget)
+	    gtk_widget_reset_rc_styles (widget);
+	  
+	  toplevels = toplevels->next;
+	}
+      g_list_free (toplevels);
+    }
 }
 
 static gint
 gtk_window_client_event (GtkWidget	*widget,
 			 GdkEventClient	*event)
 {
-  GdkAtom atom_styleset;
+  static GdkAtom atom_rcfiles = GDK_NONE;
   g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (GTK_IS_WINDOW (widget), FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
-  atom_styleset = gdk_atom_intern("_GTK_STYLE_CHANGED", FALSE);
+  if (!atom_rcfiles)
+    atom_rcfiles = gdk_atom_intern("_GTK_READ_RCFILES", FALSE);
+
+  if(event->message_type == atom_rcfiles) 
+    gtk_window_read_rcfiles (widget, event);    
 
-  if(event->message_type == atom_styleset) {
-    gtk_window_style_set_event(widget, event);    
-  }
   return FALSE;
 }
 
diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index df5936d4fc..bbeb06b486 100644
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -6457,6 +6457,24 @@ reload_rc_file (void)
 }
 
 void
+reload_all_rc_files (void)
+{
+  static GdkAtom atom_rcfiles = GDK_NONE;
+
+  GdkEventClient sev;
+  int i;
+  
+  if (!atom_rcfiles)
+    atom_rcfiles = gdk_atom_intern("_GTK_READ_RCFILES", FALSE);
+
+  for(i = 0; i < 5; i++)
+    sev.data.l[i] = 0;
+  sev.data_format = 32;
+  sev.message_type = atom_rcfiles;
+  gdk_event_send_clientmessage_toall ((GdkEvent *) &sev);
+}
+
+void
 create_rc_file (void)
 {
   static GtkWidget *window = NULL;
@@ -6482,6 +6500,14 @@ create_rc_file (void)
       gtk_widget_grab_default (button);
       gtk_widget_show (button);
 
+      button = gtk_button_new_with_label ("Reload All");
+      gtk_signal_connect (GTK_OBJECT (button), "clicked",
+			  GTK_SIGNAL_FUNC(reload_all_rc_files), NULL);
+      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+      gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), 
+			  button, TRUE, TRUE, 0);
+      gtk_widget_show (button);
+
       button = gtk_button_new_with_label ("Close");
       gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 				 GTK_SIGNAL_FUNC(gtk_widget_destroy),