make this special-case hscale/vscale details, so we can use it for

2001-06-03  Havoc Pennington  <hp@pobox.com>

	* gtk/gtkstyle.c (gtk_default_draw_slider): make this special-case
	hscale/vscale details, so we can use it for scrollbar as well.

	* tests/testgtk.c (reformat_value): honor digits from GtkScale

	* gtk/gtkenums.h (GtkTroughType): Remove this enum
	(GtkScrollType): add START and END from GtkTroughType

	* gtk/gtkstyle.c (gtk_default_draw_slider): was not properly using
	its x/y arguments

	* gtk/gtkrange.h, gtk/gtkrange.c, gtk/gtkscrollbar.h,
	gtk/gtkscrollbar.c, gtk/gtkscale.h, gtk/gtkscale.c,
	gtk/gtkhscrollbar.h, gtk/gtkhscrollbar.c, gtk/gtkvscrollbar.h,
	gtk/gtkvscrollbar.c, gtk/gtkhscale.h, gtk/gtkhscale.c,
	gtk/gtkvscale.h, gtk/gtkvscale.c: Rewrite GtkRange and subclasses.

	Notable changes in the process:

	- stepper_size style property is the height for vertical
	  ranges, width for horizontal; the other dimension matches
	  the trough size
	- add ability to do NeXT-style steppers (and several other styles
	  that don't make any sense)
	- added min_slider_length, fixed_slider_length properties to
          GtkScrollbar
        - cleaned some private (or at least useless) functions out of
          gtkscale.h
        - moved bindings to GtkScale from subclasses, even arrow keys,
	  since blind users don't know scale orientation.
        - change move_slider action signal to use new GtkScrollType,
	  remove GtkTroughType argument
	- digits rounds the values a range will input to the given
	  number of decimals, but will not try to force adjustment
	  values set by other controllers. That is, we no longer
	  modify adjustment->value inside a value_changed handler.
	- added getters for GtkScale setters
        - middle-click begins a slider drag

1 files changed, 6 insertions, 360 deletions

diff --git a/gtk/gtkvscrollbar.c b/gtk/gtkvscrollbar.c
index 54fb33732..795255b5e 100644
--- a/gtk/gtkvscrollbar.c
+++ b/gtk/gtkvscrollbar.c
@@ -1,5 +1,6 @@
 /* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ * Copyright (C) 2001 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -29,34 +30,8 @@
 #include "gdk/gdkkeysyms.h"
 #include "gtkintl.h"
 
-
-#define EPSILON 0.01
-
-#define RANGE_CLASS(w)  GTK_RANGE_GET_CLASS (w)
-
-enum {
-  PROP_0,
-};
-
 static void     gtk_vscrollbar_class_init       (GtkVScrollbarClass *klass);
 static void     gtk_vscrollbar_init             (GtkVScrollbar      *vscrollbar);
-static void     gtk_vscrollbar_set_property	(GObject            *object,
-						 guint               prop_id,
-						 const GValue       *value,
-						 GParamSpec         *pspec);
-static void     gtk_vscrollbar_get_property     (GObject            *object,
-						 guint               prop_id,
-						 GValue             *value,
-						 GParamSpec         *pspec);
-static void     gtk_vscrollbar_realize          (GtkWidget          *widget);
-static void     gtk_vscrollbar_size_request     (GtkWidget          *widget,
-						 GtkRequisition     *requisition);
-static void     gtk_vscrollbar_size_allocate    (GtkWidget          *widget,
-						 GtkAllocation      *allocation);
-static void     gtk_vscrollbar_draw_step_forw   (GtkRange           *range);
-static void     gtk_vscrollbar_draw_step_back   (GtkRange           *range);
-static void     gtk_vscrollbar_slider_update    (GtkRange           *range);
-static void     gtk_vscrollbar_calc_slider_size (GtkVScrollbar      *vscrollbar);
 
 GtkType
 gtk_vscrollbar_get_type (void)
@@ -86,67 +61,17 @@ gtk_vscrollbar_get_type (void)
 static void
 gtk_vscrollbar_class_init (GtkVScrollbarClass *class)
 {
-  GObjectClass   *gobject_class;
-  GtkWidgetClass *widget_class;
-  GtkRangeClass *range_class;
-  
-  gobject_class = G_OBJECT_CLASS (class);
-  widget_class = (GtkWidgetClass*) class;
-  range_class = (GtkRangeClass*) class;
-  
-  gobject_class->set_property = gtk_vscrollbar_set_property;
-  gobject_class->get_property = gtk_vscrollbar_get_property;
-  
-  widget_class->realize = gtk_vscrollbar_realize;
-  widget_class->size_request = gtk_vscrollbar_size_request;
-  widget_class->size_allocate = gtk_vscrollbar_size_allocate;
-  
-  range_class->draw_step_forw = gtk_vscrollbar_draw_step_forw;
-  range_class->draw_step_back = gtk_vscrollbar_draw_step_back;
-  range_class->slider_update = gtk_vscrollbar_slider_update;
-  range_class->trough_click = _gtk_range_default_vtrough_click;
-  range_class->motion = _gtk_range_default_vmotion;
+  GTK_RANGE_CLASS (class)->stepper_detail = "vscrollbar";
 }
 
 static void
-gtk_vscrollbar_set_property (GObject         *object,
-			     guint            prop_id,
-			     const GValue    *value,
-			     GParamSpec      *pspec)
+gtk_vscrollbar_init (GtkVScrollbar *vscrollbar)
 {
-  GtkVScrollbar *vscrollbar;
-  
-  vscrollbar = GTK_VSCROLLBAR (object);
-  
-  switch (prop_id)
-    {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
+  GtkRange *range;
 
-static void
-gtk_vscrollbar_get_property (GObject         *object,
-			     guint            prop_id,
-			     GValue          *value,
-			     GParamSpec      *pspec)
-{
-  GtkVScrollbar *vscrollbar;
-  
-  vscrollbar = GTK_VSCROLLBAR (object);
-  
-  switch (prop_id)
-    {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
+  range = GTK_RANGE (vscrollbar);
 
-static void
-gtk_vscrollbar_init (GtkVScrollbar *vscrollbar)
-{
+  range->orientation = GTK_ORIENTATION_VERTICAL;
 }
 
 GtkWidget*
@@ -160,282 +85,3 @@ gtk_vscrollbar_new (GtkAdjustment *adjustment)
   
   return vscrollbar;
 }
-
-
-static void
-gtk_vscrollbar_realize (GtkWidget *widget)
-{
-  GtkRange *range;
-  GdkWindowAttr attributes;
-  gint attributes_mask;
-  gint slider_width;
-  gint stepper_size;
-  gint trough_border;
-  
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_VSCROLLBAR (widget));
-  
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-  range = GTK_RANGE (widget);
-  
-  _gtk_range_get_props (range, &slider_width, &trough_border,
-			&stepper_size, NULL);
-
-  attributes.x = widget->allocation.x + (widget->allocation.width - widget->requisition.width) / 2;
-  attributes.y = widget->allocation.y;
-  attributes.width = widget->requisition.width;
-  attributes.height = widget->allocation.height;
-  attributes.wclass = GDK_INPUT_OUTPUT;
-  attributes.window_type = GDK_WINDOW_CHILD;
-  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 |= (GDK_EXPOSURE_MASK |
-                            GDK_BUTTON_PRESS_MASK |
-                            GDK_BUTTON_RELEASE_MASK |
-                            GDK_ENTER_NOTIFY_MASK |
-                            GDK_LEAVE_NOTIFY_MASK);
-  
-  attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-  widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask);
-  
-  range->trough = widget->window;
-  gdk_window_ref (range->trough);
-  
-  attributes.x = trough_border;
-  attributes.y = trough_border;
-  attributes.width = stepper_size;
-  attributes.height = stepper_size;
-  
-  range->step_back = gdk_window_new (range->trough, &attributes, attributes_mask);
-  
-  attributes.y = (widget->allocation.height -
-                  trough_border -
-                  stepper_size);
-  
-  range->step_forw = gdk_window_new (range->trough, &attributes, attributes_mask);
-  
-  attributes.x = trough_border;
-  attributes.y = 0;
-  attributes.width = slider_width;
-  attributes.height = RANGE_CLASS (widget)->min_slider_size;
-  attributes.event_mask |= (GDK_BUTTON_MOTION_MASK |
-                            GDK_POINTER_MOTION_HINT_MASK);
-  
-  range->slider = gdk_window_new (range->trough, &attributes, attributes_mask);
-  
-  gtk_vscrollbar_calc_slider_size (GTK_VSCROLLBAR (widget));
-  _gtk_range_slider_update (GTK_RANGE (widget));
-  
-  widget->style = gtk_style_attach (widget->style, widget->window);
-  
-  gdk_window_set_user_data (range->trough, widget);
-  gdk_window_set_user_data (range->slider, widget);
-  gdk_window_set_user_data (range->step_forw, widget);
-  gdk_window_set_user_data (range->step_back, widget);
-  
-  gtk_style_set_background (widget->style, range->trough, GTK_STATE_ACTIVE);
-  gtk_style_set_background (widget->style, range->slider, GTK_STATE_NORMAL);
-  gtk_style_set_background (widget->style, range->step_forw, GTK_STATE_ACTIVE);
-  gtk_style_set_background (widget->style, range->step_back, GTK_STATE_ACTIVE);
-  
-  gdk_window_show (range->slider);
-  gdk_window_show (range->step_forw);
-  gdk_window_show (range->step_back);
-}
-
-static void
-gtk_vscrollbar_size_request (GtkWidget      *widget,
-			     GtkRequisition *requisition)
-{
-  gint slider_width;
-  gint trough_border;
-  gint stepper_size;
-  gint stepper_spacing;
-  
-  GtkRange *range = GTK_RANGE (widget);
-
-  _gtk_range_get_props (range, &slider_width, &trough_border,
-			&stepper_size, &stepper_spacing);
-  
-  requisition->width = (slider_width +
-                        trough_border * 2);
-  requisition->height = (RANGE_CLASS (widget)->min_slider_size +
-                         stepper_size +
-                         stepper_spacing +
-                         trough_border) * 2;
-}
-
-static void
-gtk_vscrollbar_size_allocate (GtkWidget     *widget,
-                              GtkAllocation *allocation)
-{
-  GtkRange *range;
-  gint trough_border;
-  gint stepper_size;
-  
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_VSCROLLBAR (widget));
-  g_return_if_fail (allocation != NULL);
-  
-  widget->allocation = *allocation;
-  if (GTK_WIDGET_REALIZED (widget))
-    {
-      range = GTK_RANGE (widget);
-      
-      _gtk_range_get_props (range, NULL, &trough_border, 
-			    &stepper_size, NULL);
-  
-      gdk_window_move_resize (range->trough,
-                              allocation->x + (allocation->width - widget->requisition.width) / 2,
-                              allocation->y,
-                              widget->requisition.width, allocation->height);
-      gdk_window_move_resize (range->step_back,
-                              trough_border,
-                              trough_border,
-                              widget->requisition.width - trough_border * 2,
-                              stepper_size);
-      gdk_window_move_resize (range->step_forw,
-                              trough_border,
-                              allocation->height - trough_border -
-                              stepper_size,
-                              widget->requisition.width - trough_border * 2,
-                              stepper_size);
-      
-      _gtk_range_slider_update (GTK_RANGE (widget));
-    }
-}
-
-static void
-gtk_vscrollbar_draw_step_forw (GtkRange *range)
-{
-  GtkStateType state_type;
-  GtkShadowType shadow_type;
-  
-  g_return_if_fail (range != NULL);
-  g_return_if_fail (GTK_IS_VSCROLLBAR (range));
-  
-  if (GTK_WIDGET_DRAWABLE (range))
-    {
-      if (range->in_child == RANGE_CLASS (range)->step_forw)
-        {
-          if (range->click_child == RANGE_CLASS (range)->step_forw)
-            state_type = GTK_STATE_ACTIVE;
-          else
-            state_type = GTK_STATE_PRELIGHT;
-        }
-      else
-        state_type = GTK_STATE_NORMAL;
-      
-      if (range->click_child == RANGE_CLASS (range)->step_forw)
-        shadow_type = GTK_SHADOW_IN;
-      else
-        shadow_type = GTK_SHADOW_OUT;
-      
-      gtk_paint_arrow (GTK_WIDGET (range)->style, range->step_forw,
-                       state_type, shadow_type, 
-                       NULL, GTK_WIDGET (range), "vscrollbar",
-                       GTK_ARROW_DOWN,
-                       TRUE, 0, 0, -1, -1);
-    }
-}
-
-static void
-gtk_vscrollbar_draw_step_back (GtkRange *range)
-{
-  GtkStateType state_type;
-  GtkShadowType shadow_type;
-  
-  g_return_if_fail (range != NULL);
-  g_return_if_fail (GTK_IS_VSCROLLBAR (range));
-  
-  if (GTK_WIDGET_DRAWABLE (range))
-    {
-      if (range->in_child == RANGE_CLASS (range)->step_back)
-        {
-          if (range->click_child == RANGE_CLASS (range)->step_back)
-            state_type = GTK_STATE_ACTIVE;
-          else
-            state_type = GTK_STATE_PRELIGHT;
-        }
-      else
-        state_type = GTK_STATE_NORMAL;
-      
-      if (range->click_child == RANGE_CLASS (range)->step_back)
-        shadow_type = GTK_SHADOW_IN;
-      else
-        shadow_type = GTK_SHADOW_OUT;
-      
-      gtk_paint_arrow (GTK_WIDGET (range)->style, range->step_back,
-                       state_type, shadow_type, 
-                       NULL, GTK_WIDGET (range), "vscrollbar",
-                       GTK_ARROW_UP,
-                       TRUE, 0, 0, -1, -1);
-    }
-}
-
-static void
-gtk_vscrollbar_slider_update (GtkRange *range)
-{
-  g_return_if_fail (range != NULL);
-  g_return_if_fail (GTK_IS_VSCROLLBAR (range));
-  
-  gtk_vscrollbar_calc_slider_size (GTK_VSCROLLBAR (range));
-  _gtk_range_default_vslider_update (range);
-}
-
-static void
-gtk_vscrollbar_calc_slider_size (GtkVScrollbar *vscrollbar)
-{
-  GtkRange *range;
-  gint step_back_y;
-  gint step_back_height;
-  gint step_forw_y;
-  gint stepper_spacing;
-  gint slider_width;
-  gint slider_height;
-  gint top, bottom;
-  gint height;
-  
-  g_return_if_fail (vscrollbar != NULL);
-  g_return_if_fail (GTK_IS_VSCROLLBAR (vscrollbar));
-  
-  if (GTK_WIDGET_REALIZED (vscrollbar))
-    {
-      range = GTK_RANGE (vscrollbar);
-      
-      _gtk_range_get_props (range, NULL, NULL, NULL, &stepper_spacing);
-      
-      gdk_window_get_size (range->step_back, NULL, &step_back_height);
-      gdk_window_get_position (range->step_back, NULL, &step_back_y);
-      gdk_window_get_position (range->step_forw, NULL, &step_forw_y);
-      
-      top = (step_back_y +
-             step_back_height +
-             stepper_spacing);
-      bottom = step_forw_y - stepper_spacing;
-      height = bottom - top;
-      
-      if ((range->adjustment->page_size > 0) &&
-          (range->adjustment->lower != range->adjustment->upper))
-        {
-          if (range->adjustment->page_size >
-              (range->adjustment->upper - range->adjustment->lower))
-            range->adjustment->page_size = range->adjustment->upper - range->adjustment->lower;
-          
-          height = (height * range->adjustment->page_size /
-                    (range->adjustment->upper - range->adjustment->lower));
-          
-          if (height < RANGE_CLASS (vscrollbar)->min_slider_size)
-            height = RANGE_CLASS (vscrollbar)->min_slider_size;
-        }
-      
-      gdk_window_get_size (range->slider, &slider_width, &slider_height);
-      
-      if (slider_height != height)
-	{
-	  gdk_window_resize (range->slider, slider_width, height);
-	  gdk_window_invalidate_rect (range->slider, NULL, FALSE);
-	}
-    }
-}