]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkscale.c
Deprecate widget flag: GTK_WIDGET_MAPPED
[~andy/gtk] / gtk / gtkscale.c
index 2bc4944a0ede57837e76ffc84630bd7f2aeac053..9e92d9cbd376b14f241c0d4a63c41d2cbe1dc74b 100644 (file)
 /* 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 Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#include "config.h"
+
 #include <math.h>
-#include "gtkcontainer.h"
+#include <stdlib.h>
+
+#include "gdk/gdkkeysyms.h"
 #include "gtkscale.h"
+#include "gtkiconfactory.h"
+#include "gtkicontheme.h"
+#include "gtkmarshalers.h"
+#include "gtkbindings.h"
+#include "gtkprivate.h"
+#include "gtkintl.h"
+#include "gtkbuildable.h"
+#include "gtkbuilderprivate.h"
+#include "gtkalias.h"
 
 
-#define SCALE_CLASS(w)  GTK_SCALE_CLASS (GTK_OBJECT (w)->klass)
+#define        MAX_DIGITS      (64)    /* don't change this,
+                                * a) you don't need to and
+                                * b) you might cause buffer owerflows in
+                                *    unrelated code portions otherwise
+                                */
 
+#define GTK_SCALE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_SCALE, GtkScalePrivate))
 
-static void gtk_scale_class_init      (GtkScaleClass *klass);
-static void gtk_scale_init            (GtkScale      *scale);
-static void gtk_scale_map             (GtkWidget     *widget);
-static void gtk_scale_unmap           (GtkWidget     *widget);
+typedef struct _GtkScalePrivate GtkScalePrivate;
 
-static void gtk_scale_draw_background (GtkRange      *range);
+typedef struct _GtkScaleMark GtkScaleMark;
 
+struct _GtkScaleMark
+{
+  gdouble          value;
+  gchar           *markup;
+  GtkPositionType  position;
+};
 
-static GtkRangeClass *parent_class = NULL;
+struct _GtkScalePrivate
+{
+  PangoLayout *layout;
+  GSList      *marks;
+};
 
+enum {
+  PROP_0,
+  PROP_DIGITS,
+  PROP_DRAW_VALUE,
+  PROP_VALUE_POS
+};
 
-GtkType
-gtk_scale_get_type (void)
-{
-  static GtkType scale_type = 0;
+enum {
+  FORMAT_VALUE,
+  LAST_SIGNAL
+};
 
-  if (!scale_type)
-    {
-      GtkTypeInfo scale_info =
-      {
-       "GtkScale",
-       sizeof (GtkScale),
-       sizeof (GtkScaleClass),
-       (GtkClassInitFunc) gtk_scale_class_init,
-       (GtkObjectInitFunc) gtk_scale_init,
-       /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      scale_type = gtk_type_unique (GTK_TYPE_RANGE, &scale_info);
-    }
+static guint signals[LAST_SIGNAL];
+
+static void     gtk_scale_set_property            (GObject        *object,
+                                                   guint           prop_id,
+                                                   const GValue   *value,
+                                                   GParamSpec     *pspec);
+static void     gtk_scale_get_property            (GObject        *object,
+                                                   guint           prop_id,
+                                                   GValue         *value,
+                                                   GParamSpec     *pspec);
+static void     gtk_scale_size_request            (GtkWidget      *widget,
+                                                   GtkRequisition *requisition);
+static void     gtk_scale_style_set               (GtkWidget      *widget,
+                                                   GtkStyle       *previous);
+static void     gtk_scale_get_range_border        (GtkRange       *range,
+                                                   GtkBorder      *border);
+static void     gtk_scale_get_mark_label_size     (GtkScale        *scale,
+                                                   GtkPositionType  position,
+                                                   gint            *count1,
+                                                   gint            *width1,
+                                                   gint            *height1,
+                                                   gint            *count2,
+                                                   gint            *width2,
+                                                   gint            *height2);
+static void     gtk_scale_finalize                (GObject        *object);
+static void     gtk_scale_screen_changed          (GtkWidget      *widget,
+                                                   GdkScreen      *old_screen);
+static gboolean gtk_scale_expose                  (GtkWidget      *widget,
+                                                   GdkEventExpose *event);
+static void     gtk_scale_real_get_layout_offsets (GtkScale       *scale,
+                                                   gint           *x,
+                                                   gint           *y);
+static void     gtk_scale_buildable_interface_init   (GtkBuildableIface *iface);
+static gboolean gtk_scale_buildable_custom_tag_start (GtkBuildable  *buildable,
+                                                      GtkBuilder    *builder,
+                                                      GObject       *child,
+                                                      const gchar   *tagname,
+                                                      GMarkupParser *parser,
+                                                      gpointer      *data);
+static void     gtk_scale_buildable_custom_finished  (GtkBuildable  *buildable,
+                                                      GtkBuilder    *builder,
+                                                      GObject       *child,
+                                                      const gchar   *tagname,
+                                                      gpointer       user_data);
+
+
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GtkScale, gtk_scale, GTK_TYPE_RANGE,
+                                  G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
+                                                         gtk_scale_buildable_interface_init))
 
-  return scale_type;
+
+static gboolean
+single_string_accumulator (GSignalInvocationHint *ihint,
+                           GValue                *return_accu,
+                           const GValue          *handler_return,
+                           gpointer               dummy)
+{
+  gboolean continue_emission;
+  const gchar *str;
+  
+  str = g_value_get_string (handler_return);
+  g_value_set_string (return_accu, str);
+  continue_emission = str == NULL;
+  
+  return continue_emission;
 }
 
+
+#define add_slider_binding(binding_set, keyval, mask, scroll)              \
+  gtk_binding_entry_add_signal (binding_set, keyval, mask,                 \
+                                I_("move-slider"), 1, \
+                                GTK_TYPE_SCROLL_TYPE, scroll)
+
 static void
 gtk_scale_class_init (GtkScaleClass *class)
 {
-  GtkObjectClass *object_class;
+  GObjectClass   *gobject_class;
   GtkWidgetClass *widget_class;
-  GtkRangeClass *range_class;
-
-  object_class = (GtkObjectClass*) class;
+  GtkRangeClass  *range_class;
+  GtkBindingSet  *binding_set;
+  
+  gobject_class = G_OBJECT_CLASS (class);
   range_class = (GtkRangeClass*) class;
   widget_class = (GtkWidgetClass*) class;
+  
+  gobject_class->set_property = gtk_scale_set_property;
+  gobject_class->get_property = gtk_scale_get_property;
+  gobject_class->finalize = gtk_scale_finalize;
+
+  widget_class->style_set = gtk_scale_style_set;
+  widget_class->screen_changed = gtk_scale_screen_changed;
+  widget_class->expose_event = gtk_scale_expose;
+  widget_class->size_request = gtk_scale_size_request;
+
+  range_class->slider_detail = "Xscale";
+  range_class->get_range_border = gtk_scale_get_range_border;
+
+  class->get_layout_offsets = gtk_scale_real_get_layout_offsets;
+
+  /**
+   * GtkScale::format-value:
+   * @scale: the object which received the signal
+   * @value: the value to format
+   *
+   * Signal which allows you to change how the scale value is displayed.
+   * Connect a signal handler which returns an allocated string representing 
+   * @value. That string will then be used to display the scale's value.
+   *
+   * Here's an example signal handler which displays a value 1.0 as
+   * with "--&gt;1.0&lt;--".
+   * |[
+   * static gchar*
+   * format_value_callback (GtkScale *scale,
+   *                        gdouble   value)
+   * {
+   *   return g_strdup_printf ("--&gt;&percnt;0.*g&lt;--",
+   *                           gtk_scale_get_digits (scale), value);
+   *  }
+   * ]|
+   *
+   * Return value: allocated string representing @value
+   */
+  signals[FORMAT_VALUE] =
+    g_signal_new (I_("format-value"),
+                  G_TYPE_FROM_CLASS (gobject_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GtkScaleClass, format_value),
+                  single_string_accumulator, NULL,
+                  _gtk_marshal_STRING__DOUBLE,
+                  G_TYPE_STRING, 1,
+                  G_TYPE_DOUBLE);
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_DIGITS,
+                                   g_param_spec_int ("digits",
+                                                    P_("Digits"),
+                                                    P_("The number of decimal places that are displayed in the value"),
+                                                    -1,
+                                                    MAX_DIGITS,
+                                                    1,
+                                                    GTK_PARAM_READWRITE));
+  
+  g_object_class_install_property (gobject_class,
+                                   PROP_DRAW_VALUE,
+                                   g_param_spec_boolean ("draw-value",
+                                                        P_("Draw Value"),
+                                                        P_("Whether the current value is displayed as a string next to the slider"),
+                                                        TRUE,
+                                                        GTK_PARAM_READWRITE));
+  
+  g_object_class_install_property (gobject_class,
+                                   PROP_VALUE_POS,
+                                   g_param_spec_enum ("value-pos",
+                                                     P_("Value Position"),
+                                                     P_("The position in which the current value is displayed"),
+                                                     GTK_TYPE_POSITION_TYPE,
+                                                     GTK_POS_TOP,
+                                                     GTK_PARAM_READWRITE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                          g_param_spec_int ("slider-length",
+                                                            P_("Slider Length"),
+                                                            P_("Length of scale's slider"),
+                                                            0,
+                                                            G_MAXINT,
+                                                            31,
+                                                            GTK_PARAM_READABLE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                          g_param_spec_int ("value-spacing",
+                                                            P_("Value spacing"),
+                                                            P_("Space between value text and the slider/trough area"),
+                                                            0,
+                                                            G_MAXINT,
+                                                            2,
+                                                            GTK_PARAM_READABLE));
+  
+  /* All bindings (even arrow keys) are on both h/v scale, because
+   * blind users etc. don't care about scale orientation.
+   */
+  
+  binding_set = gtk_binding_set_by_class (class);
+
+  add_slider_binding (binding_set, GDK_Left, 0,
+                      GTK_SCROLL_STEP_LEFT);
+
+  add_slider_binding (binding_set, GDK_Left, GDK_CONTROL_MASK,
+                      GTK_SCROLL_PAGE_LEFT);
+
+  add_slider_binding (binding_set, GDK_KP_Left, 0,
+                      GTK_SCROLL_STEP_LEFT);
+
+  add_slider_binding (binding_set, GDK_KP_Left, GDK_CONTROL_MASK,
+                      GTK_SCROLL_PAGE_LEFT);
+
+  add_slider_binding (binding_set, GDK_Right, 0,
+                      GTK_SCROLL_STEP_RIGHT);
+
+  add_slider_binding (binding_set, GDK_Right, GDK_CONTROL_MASK,
+                      GTK_SCROLL_PAGE_RIGHT);
+
+  add_slider_binding (binding_set, GDK_KP_Right, 0,
+                      GTK_SCROLL_STEP_RIGHT);
+
+  add_slider_binding (binding_set, GDK_KP_Right, GDK_CONTROL_MASK,
+                      GTK_SCROLL_PAGE_RIGHT);
+
+  add_slider_binding (binding_set, GDK_Up, 0,
+                      GTK_SCROLL_STEP_UP);
+
+  add_slider_binding (binding_set, GDK_Up, GDK_CONTROL_MASK,
+                      GTK_SCROLL_PAGE_UP);
+
+  add_slider_binding (binding_set, GDK_KP_Up, 0,
+                      GTK_SCROLL_STEP_UP);
+
+  add_slider_binding (binding_set, GDK_KP_Up, GDK_CONTROL_MASK,
+                      GTK_SCROLL_PAGE_UP);
+
+  add_slider_binding (binding_set, GDK_Down, 0,
+                      GTK_SCROLL_STEP_DOWN);
+
+  add_slider_binding (binding_set, GDK_Down, GDK_CONTROL_MASK,
+                      GTK_SCROLL_PAGE_DOWN);
+
+  add_slider_binding (binding_set, GDK_KP_Down, 0,
+                      GTK_SCROLL_STEP_DOWN);
+
+  add_slider_binding (binding_set, GDK_KP_Down, GDK_CONTROL_MASK,
+                      GTK_SCROLL_PAGE_DOWN);
+   
+  add_slider_binding (binding_set, GDK_Page_Up, GDK_CONTROL_MASK,
+                      GTK_SCROLL_PAGE_LEFT);
+
+  add_slider_binding (binding_set, GDK_KP_Page_Up, GDK_CONTROL_MASK,
+                      GTK_SCROLL_PAGE_LEFT);  
+
+  add_slider_binding (binding_set, GDK_Page_Up, 0,
+                      GTK_SCROLL_PAGE_UP);
+
+  add_slider_binding (binding_set, GDK_KP_Page_Up, 0,
+                      GTK_SCROLL_PAGE_UP);
+  
+  add_slider_binding (binding_set, GDK_Page_Down, GDK_CONTROL_MASK,
+                      GTK_SCROLL_PAGE_RIGHT);
+
+  add_slider_binding (binding_set, GDK_KP_Page_Down, GDK_CONTROL_MASK,
+                      GTK_SCROLL_PAGE_RIGHT);
+
+  add_slider_binding (binding_set, GDK_Page_Down, 0,
+                      GTK_SCROLL_PAGE_DOWN);
+
+  add_slider_binding (binding_set, GDK_KP_Page_Down, 0,
+                      GTK_SCROLL_PAGE_DOWN);
+
+  /* Logical bindings (vs. visual bindings above) */
+
+  add_slider_binding (binding_set, GDK_plus, 0,
+                      GTK_SCROLL_STEP_FORWARD);  
 
-  parent_class = gtk_type_class (GTK_TYPE_RANGE);
+  add_slider_binding (binding_set, GDK_minus, 0,
+                      GTK_SCROLL_STEP_BACKWARD);  
 
-  widget_class->map = gtk_scale_map;
-  widget_class->unmap = gtk_scale_unmap;
+  add_slider_binding (binding_set, GDK_plus, GDK_CONTROL_MASK,
+                      GTK_SCROLL_PAGE_FORWARD);  
 
-  range_class->draw_background = gtk_scale_draw_background;
+  add_slider_binding (binding_set, GDK_minus, GDK_CONTROL_MASK,
+                      GTK_SCROLL_PAGE_BACKWARD);
 
-  class->slider_length = 31;
-  class->value_spacing = 2;
-  class->draw_value = NULL;
+
+  add_slider_binding (binding_set, GDK_KP_Add, 0,
+                      GTK_SCROLL_STEP_FORWARD);  
+
+  add_slider_binding (binding_set, GDK_KP_Subtract, 0,
+                      GTK_SCROLL_STEP_BACKWARD);  
+
+  add_slider_binding (binding_set, GDK_KP_Add, GDK_CONTROL_MASK,
+                      GTK_SCROLL_PAGE_FORWARD);  
+
+  add_slider_binding (binding_set, GDK_KP_Subtract, GDK_CONTROL_MASK,
+                      GTK_SCROLL_PAGE_BACKWARD);
+  
+  
+  add_slider_binding (binding_set, GDK_Home, 0,
+                      GTK_SCROLL_START);
+
+  add_slider_binding (binding_set, GDK_KP_Home, 0,
+                      GTK_SCROLL_START);
+
+  add_slider_binding (binding_set, GDK_End, 0,
+                      GTK_SCROLL_END);
+
+  add_slider_binding (binding_set, GDK_KP_End, 0,
+                      GTK_SCROLL_END);
+
+  g_type_class_add_private (gobject_class, sizeof (GtkScalePrivate));
+}
+
+static void
+gtk_scale_orientation_notify (GtkRange         *range,
+                              const GParamSpec *pspec)
+{
+  range->flippable = (range->orientation == GTK_ORIENTATION_HORIZONTAL);
 }
 
 static void
 gtk_scale_init (GtkScale *scale)
 {
-  GTK_WIDGET_SET_FLAGS (scale, GTK_CAN_FOCUS);
-  GTK_WIDGET_SET_FLAGS (scale, GTK_NO_WINDOW);
-  GTK_RANGE (scale)->digits = 1;
+  GtkRange *range = GTK_RANGE (scale);
+
+  gtk_widget_set_can_focus (GTK_WIDGET (scale), TRUE);
+
+  range->slider_size_fixed = TRUE;
+  range->has_stepper_a = FALSE;
+  range->has_stepper_b = FALSE;
+  range->has_stepper_c = FALSE;
+  range->has_stepper_d = FALSE;
+
   scale->draw_value = TRUE;
   scale->value_pos = GTK_POS_TOP;
+  scale->digits = 1;
+  range->round_digits = scale->digits;
+
+  gtk_scale_orientation_notify (range, NULL);
+  g_signal_connect (scale, "notify::orientation",
+                    G_CALLBACK (gtk_scale_orientation_notify),
+                    NULL);
 }
 
 static void
-gtk_scale_map (GtkWidget *widget)
+gtk_scale_set_property (GObject      *object,
+                       guint         prop_id,
+                       const GValue *value,
+                       GParamSpec   *pspec)
 {
-  GtkRange *range;
+  GtkScale *scale;
 
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_SCALE (widget));
+  scale = GTK_SCALE (object);
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
-  range = GTK_RANGE (widget);
+  switch (prop_id)
+    {
+    case PROP_DIGITS:
+      gtk_scale_set_digits (scale, g_value_get_int (value));
+      break;
+    case PROP_DRAW_VALUE:
+      gtk_scale_set_draw_value (scale, g_value_get_boolean (value));
+      break;
+    case PROP_VALUE_POS:
+      gtk_scale_set_value_pos (scale, g_value_get_enum (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_scale_get_property (GObject      *object,
+                       guint         prop_id,
+                       GValue       *value,
+                       GParamSpec   *pspec)
+{
+  GtkScale *scale;
 
-  if (GTK_WIDGET_NO_WINDOW (widget))
-    gtk_widget_queue_draw (widget);
+  scale = GTK_SCALE (object);
 
-  gdk_window_show (range->trough);
+  switch (prop_id)
+    {
+    case PROP_DIGITS:
+      g_value_set_int (value, scale->digits);
+      break;
+    case PROP_DRAW_VALUE:
+      g_value_set_boolean (value, scale->draw_value);
+      break;
+    case PROP_VALUE_POS:
+      g_value_set_enum (value, scale->value_pos);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
 }
 
-static void
-gtk_scale_unmap (GtkWidget *widget)
+#if 0
+/**
+ * gtk_scale_new:
+ * @orientation: the scale's orientation.
+ * @adjustment: the #GtkAdjustment which sets the range of the scale, or
+ *              %NULL to create a new adjustment.
+ *
+ * Creates a new #GtkScale.
+ *
+ * Return value: a new #GtkScale
+ *
+ * Since: 2.16
+ **/
+GtkWidget *
+gtk_scale_new (GtkOrientation  orientation,
+               GtkAdjustment  *adjustment)
 {
-  GtkRange *range;
+  g_return_val_if_fail (adjustment == NULL || GTK_IS_ADJUSTMENT (adjustment),
+                        NULL);
 
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_SCALE (widget));
+  return g_object_new (GTK_TYPE_SCALE,
+                       "orientation", orientation,
+                       "adjustment",  adjustment,
+                       NULL);
+}
 
-  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
-  range = GTK_RANGE (widget);
+/**
+ * gtk_scale_new_with_range:
+ * @orientation: the scale's orientation.
+ * @min: minimum value
+ * @max: maximum value
+ * @step: step increment (tick size) used with keyboard shortcuts
+ *
+ * Creates a new scale widget with the given orientation that lets the
+ * user input a number between @min and @max (including @min and @max)
+ * with the increment @step.  @step must be nonzero; it's the distance
+ * the slider moves when using the arrow keys to adjust the scale
+ * value.
+ *
+ * Note that the way in which the precision is derived works best if @step
+ * is a power of ten. If the resulting precision is not suitable for your
+ * needs, use gtk_scale_set_digits() to correct it.
+ *
+ * Return value: a new #GtkScale
+ *
+ * Since: 2.16
+ **/
+GtkWidget *
+gtk_scale_new_with_range (GtkOrientation orientation,
+                          gdouble        min,
+                          gdouble        max,
+                          gdouble        step)
+{
+  GtkObject *adj;
+  gint digits;
 
-  if (GTK_WIDGET_NO_WINDOW (widget))
-     gtk_widget_queue_clear (widget);
+  g_return_val_if_fail (min < max, NULL);
+  g_return_val_if_fail (step != 0.0, NULL);
+
+  adj = gtk_adjustment_new (min, min, max, step, 10 * step, 0);
+
+  if (fabs (step) >= 1.0 || step == 0.0)
+    {
+      digits = 0;
+    }
+  else
+    {
+      digits = abs ((gint) floor (log10 (fabs (step))));
+      if (digits > 5)
+        digits = 5;
+    }
 
-  gdk_window_hide (range->trough);
+  return g_object_new (GTK_TYPE_SCALE,
+                       "orientation", orientation,
+                       "adjustment",  adj,
+                       "digits",      digits,
+                       NULL);
 }
+#endif
 
+/**
+ * gtk_scale_set_digits:
+ * @scale: a #GtkScale
+ * @digits: the number of decimal places to display, 
+ *     e.g. use 1 to display 1.0, 2 to display 1.00, etc
+ * 
+ * Sets the number of decimal places that are displayed in the value.
+ * Also causes the value of the adjustment to be rounded off to this
+ * number of digits, so the retrieved value matches the value the user saw.
+ */
 void
 gtk_scale_set_digits (GtkScale *scale,
                      gint      digits)
 {
-  g_return_if_fail (scale != NULL);
+  GtkRange *range;
+  
   g_return_if_fail (GTK_IS_SCALE (scale));
 
-  if (GTK_RANGE (scale)->digits != digits)
+  range = GTK_RANGE (scale);
+  
+  digits = CLAMP (digits, -1, MAX_DIGITS);
+
+  if (scale->digits != digits)
     {
-      GTK_RANGE (scale)->digits = digits;
+      scale->digits = digits;
+      if (scale->draw_value)
+       range->round_digits = digits;
+      
+      _gtk_scale_clear_layout (scale);
+      gtk_widget_queue_resize (GTK_WIDGET (scale));
 
-      if (GTK_WIDGET_VISIBLE (scale) && GTK_WIDGET_MAPPED (scale))
-       gtk_widget_queue_resize (GTK_WIDGET (scale));
+      g_object_notify (G_OBJECT (scale), "digits");
     }
 }
 
+/**
+ * gtk_scale_get_digits:
+ * @scale: a #GtkScale
+ *
+ * Gets the number of decimal places that are displayed in the value.
+ *
+ * Returns: the number of decimal places that are displayed
+ */
+gint
+gtk_scale_get_digits (GtkScale *scale)
+{
+  g_return_val_if_fail (GTK_IS_SCALE (scale), -1);
+
+  return scale->digits;
+}
+
+/**
+ * gtk_scale_set_draw_value:
+ * @scale: a #GtkScale
+ * @draw_value: %TRUE to draw the value
+ * 
+ * Specifies whether the current value is displayed as a string next 
+ * to the slider.
+ */
 void
 gtk_scale_set_draw_value (GtkScale *scale,
-                         gint      draw_value)
+                         gboolean  draw_value)
 {
-  g_return_if_fail (scale != NULL);
   g_return_if_fail (GTK_IS_SCALE (scale));
 
+  draw_value = draw_value != FALSE;
+
   if (scale->draw_value != draw_value)
     {
-      scale->draw_value = (draw_value != 0);
+      scale->draw_value = draw_value;
+      if (draw_value)
+       GTK_RANGE (scale)->round_digits = scale->digits;
+      else
+       GTK_RANGE (scale)->round_digits = -1;
+
+      _gtk_scale_clear_layout (scale);
+
+      gtk_widget_queue_resize (GTK_WIDGET (scale));
 
-      if (GTK_WIDGET_VISIBLE (scale) && GTK_WIDGET_MAPPED (scale))
-       gtk_widget_queue_resize (GTK_WIDGET (scale));
+      g_object_notify (G_OBJECT (scale), "draw-value");
     }
 }
 
+/**
+ * gtk_scale_get_draw_value:
+ * @scale: a #GtkScale
+ *
+ * Returns whether the current value is displayed as a string 
+ * next to the slider.
+ *
+ * Returns: whether the current value is displayed as a string
+ */
+gboolean
+gtk_scale_get_draw_value (GtkScale *scale)
+{
+  g_return_val_if_fail (GTK_IS_SCALE (scale), FALSE);
+
+  return scale->draw_value;
+}
+
+/**
+ * gtk_scale_set_value_pos:
+ * @scale: a #GtkScale
+ * @pos: the position in which the current value is displayed
+ * 
+ * Sets the position in which the current value is displayed.
+ */
 void
 gtk_scale_set_value_pos (GtkScale        *scale,
                         GtkPositionType  pos)
 {
-  g_return_if_fail (scale != NULL);
+  GtkWidget *widget;
+
   g_return_if_fail (GTK_IS_SCALE (scale));
 
   if (scale->value_pos != pos)
     {
       scale->value_pos = pos;
+      widget = GTK_WIDGET (scale);
 
-      if (GTK_WIDGET_VISIBLE (scale) && GTK_WIDGET_MAPPED (scale))
-       gtk_widget_queue_resize (GTK_WIDGET (scale));
+      _gtk_scale_clear_layout (scale);
+      if (gtk_widget_get_visible (widget) && gtk_widget_get_mapped (widget))
+       gtk_widget_queue_resize (widget);
+
+      g_object_notify (G_OBJECT (scale), "value-pos");
     }
 }
 
-gint
-gtk_scale_value_width (GtkScale *scale)
+/**
+ * gtk_scale_get_value_pos:
+ * @scale: a #GtkScale
+ *
+ * Gets the position in which the current value is displayed.
+ *
+ * Returns: the position in which the current value is displayed
+ */
+GtkPositionType
+gtk_scale_get_value_pos (GtkScale *scale)
+{
+  g_return_val_if_fail (GTK_IS_SCALE (scale), 0);
+
+  return scale->value_pos;
+}
+
+static void
+gtk_scale_get_range_border (GtkRange  *range,
+                            GtkBorder *border)
+{
+  GtkScalePrivate *priv;
+  GtkWidget *widget;
+  GtkScale *scale;
+  gint w, h;
+  
+  widget = GTK_WIDGET (range);
+  scale = GTK_SCALE (range);
+  priv = GTK_SCALE_GET_PRIVATE (scale);
+
+  _gtk_scale_get_value_size (scale, &w, &h);
+
+  border->left = 0;
+  border->right = 0;
+  border->top = 0;
+  border->bottom = 0;
+
+  if (scale->draw_value)
+    {
+      gint value_spacing;
+      gtk_widget_style_get (widget, "value-spacing", &value_spacing, NULL);
+
+      switch (scale->value_pos)
+        {
+        case GTK_POS_LEFT:
+          border->left += w + value_spacing;
+          break;
+        case GTK_POS_RIGHT:
+          border->right += w + value_spacing;
+          break;
+        case GTK_POS_TOP:
+          border->top += h + value_spacing;
+          break;
+        case GTK_POS_BOTTOM:
+          border->bottom += h + value_spacing;
+          break;
+        }
+    }
+
+  if (priv->marks)
+    {
+      gint slider_width;
+      gint value_spacing;
+      gint n1, w1, h1, n2, w2, h2;
+  
+      gtk_widget_style_get (widget, 
+                            "slider-width", &slider_width,
+                            "value-spacing", &value_spacing, 
+                            NULL);
+
+
+      if (GTK_RANGE (scale)->orientation == GTK_ORIENTATION_HORIZONTAL)
+        {
+          gtk_scale_get_mark_label_size (scale, GTK_POS_TOP, &n1, &w1, &h1, &n2, &w2, &h2);
+          if (n1 > 0)
+            border->top += h1 + value_spacing + slider_width / 2;
+          if (n2 > 0)
+            border->bottom += h2 + value_spacing + slider_width / 2; 
+        }
+      else
+        {
+          gtk_scale_get_mark_label_size (scale, GTK_POS_LEFT, &n1, &w1, &h1, &n2, &w2, &h2);
+          if (n1 > 0)
+            border->left += w1 + value_spacing + slider_width / 2;
+          if (n2 > 0)
+            border->right += w2 + value_spacing + slider_width / 2;
+        }
+    }
+}
+
+/* FIXME this could actually be static at the moment. */
+void
+_gtk_scale_get_value_size (GtkScale *scale,
+                           gint     *width,
+                           gint     *height)
 {
   GtkRange *range;
-  gchar buffer[128];
-  gfloat value;
-  gint temp;
-  gint return_val;
-  gint digits;
-  gint i, j;
 
-  g_return_val_if_fail (scale != NULL, 0);
-  g_return_val_if_fail (GTK_IS_SCALE (scale), 0);
+  g_return_if_fail (GTK_IS_SCALE (scale));
 
-  return_val = 0;
   if (scale->draw_value)
     {
+      PangoLayout *layout;
+      PangoRectangle logical_rect;
+      gchar *txt;
+      
       range = GTK_RANGE (scale);
 
-      value = ABS (range->adjustment->lower);
-      if (value == 0) value = 1;
-      digits = log10 (value) + 1;
-      if (digits > 13)
-       digits = 13;
-
-      i = 0;
-      if (range->adjustment->lower < 0)
-        buffer[i++] = '-';
-      for (j = 0; j < digits; j++)
-        buffer[i++] = '0';
-      if (GTK_RANGE (scale)->digits)
-        buffer[i++] = '.';
-      for (j = 0; j < GTK_RANGE (scale)->digits; j++)
-        buffer[i++] = '0';
-      buffer[i] = '\0';
-
-      return_val = gdk_string_measure (GTK_WIDGET (scale)->style->font, buffer);
-
-      value = ABS (range->adjustment->upper);
-      if (value == 0) value = 1;
-      digits = log10 (value) + 1;
-      if (digits > 13)
-        digits = 13;
-
-      i = 0;
-      if (range->adjustment->lower < 0)
-        buffer[i++] = '-';
-      for (j = 0; j < digits; j++)
-        buffer[i++] = '0';
-      if (GTK_RANGE (scale)->digits)
-        buffer[i++] = '.';
-      for (j = 0; j < GTK_RANGE (scale)->digits; j++)
-        buffer[i++] = '0';
-      buffer[i] = '\0';
-
-      temp = gdk_string_measure (GTK_WIDGET (scale)->style->font, buffer);
-      return_val = MAX (return_val, temp);
+      layout = gtk_widget_create_pango_layout (GTK_WIDGET (scale), NULL);
+
+      txt = _gtk_scale_format_value (scale, range->adjustment->lower);
+      pango_layout_set_text (layout, txt, -1);
+      g_free (txt);
+      
+      pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+
+      if (width)
+       *width = logical_rect.width;
+      if (height)
+       *height = logical_rect.height;
+
+      txt = _gtk_scale_format_value (scale, range->adjustment->upper);
+      pango_layout_set_text (layout, txt, -1);
+      g_free (txt);
+      
+      pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+
+      if (width)
+       *width = MAX (*width, logical_rect.width);
+      if (height)
+       *height = MAX (*height, logical_rect.height);
+
+      g_object_unref (layout);
+    }
+  else
+    {
+      if (width)
+       *width = 0;
+      if (height)
+       *height = 0;
+    }
+
+}
+
+static void
+gtk_scale_get_mark_label_size (GtkScale        *scale,
+                               GtkPositionType  position,
+                               gint            *count1,
+                               gint            *width1,
+                               gint            *height1,
+                               gint            *count2,
+                               gint            *width2,
+                               gint            *height2)
+{
+  GtkScalePrivate *priv = GTK_SCALE_GET_PRIVATE (scale);
+  PangoLayout *layout;
+  PangoRectangle logical_rect;
+  GSList *m;
+  gint w, h;
+
+  *count1 = *count2 = 0;
+  *width1 = *width2 = 0;
+  *height1 = *height2 = 0;
+
+  layout = gtk_widget_create_pango_layout (GTK_WIDGET (scale), NULL);
+
+  for (m = priv->marks; m; m = m->next)
+    {
+      GtkScaleMark *mark = m->data;
+
+      if (mark->markup)
+        {
+          pango_layout_set_markup (layout, mark->markup, -1);
+          pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+
+         w = logical_rect.width;
+         h = logical_rect.height;
+        }
+      else
+        {
+          w = 0;
+          h = 0;
+        }
+
+      if (mark->position == position)
+        {
+          (*count1)++;
+          *width1 = MAX (*width1, w);
+          *height1 = MAX (*height1, h);
+        }
+      else
+        {
+          (*count2)++;
+          *width2 = MAX (*width2, w);
+          *height2 = MAX (*height2, h);
+        }
     }
 
-  return return_val;
+  g_object_unref (layout);
+}
+
+static void
+gtk_scale_style_set (GtkWidget *widget,
+                     GtkStyle  *previous)
+{
+  gint slider_length;
+  GtkRange *range;
+
+  range = GTK_RANGE (widget);
+  
+  gtk_widget_style_get (widget,
+                        "slider-length", &slider_length,
+                        NULL);
+  
+  range->min_slider_size = slider_length;
+  
+  _gtk_scale_clear_layout (GTK_SCALE (widget));
+
+  GTK_WIDGET_CLASS (gtk_scale_parent_class)->style_set (widget, previous);
+}
+
+static void
+gtk_scale_screen_changed (GtkWidget *widget,
+                          GdkScreen *old_screen)
+{
+  _gtk_scale_clear_layout (GTK_SCALE (widget));
+}
+
+static void
+gtk_scale_size_request (GtkWidget      *widget,
+                        GtkRequisition *requisition)
+{
+  GtkRange *range = GTK_RANGE (widget);
+  gint n1, w1, h1, n2, w2, h2;
+  gint slider_length;
+
+  GTK_WIDGET_CLASS (gtk_scale_parent_class)->size_request (widget, requisition);
+  
+  gtk_widget_style_get (widget, "slider-length", &slider_length, NULL);
+
+
+  if (range->orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+      gtk_scale_get_mark_label_size (GTK_SCALE (widget), GTK_POS_TOP, &n1, &w1, &h1, &n2, &w2, &h2);
+
+      w1 = (n1 - 1) * w1 + MAX (w1, slider_length);
+      w2 = (n2 - 1) * w2 + MAX (w2, slider_length);
+      requisition->width = MAX (requisition->width, MAX (w1, w2));
+    }
+  else
+    {
+      gtk_scale_get_mark_label_size (GTK_SCALE (widget), GTK_POS_LEFT, &n1, &w1, &h1, &n2, &w2, &h2);
+      h1 = (n1 - 1) * h1 + MAX (h1, slider_length);
+      h2 = (n2 - 1) * h1 + MAX (h2, slider_length);
+      requisition->height = MAX (requisition->height, MAX (h1, h2));
+    }
 }
 
+static gint
+find_next_pos (GtkWidget      *widget,
+               GSList          *list,
+               gint            *marks,
+               GtkPositionType  pos,
+               gint             match)
+{
+  GSList *m;
+  gint i;
+
+  for (m = list->next, i = 1; m; m = m->next, i++)
+    {
+      GtkScaleMark *mark = m->data;
+
+      if (match == (mark->position == pos))
+        return marks[i];
+    }
+
+  return widget->allocation.width;
+}
+
+static gboolean
+gtk_scale_expose (GtkWidget      *widget,
+                  GdkEventExpose *event)
+{
+  GtkScale *scale = GTK_SCALE (widget);
+  GtkScalePrivate *priv = GTK_SCALE_GET_PRIVATE (scale);
+  GtkRange *range = GTK_RANGE (scale);
+  GtkStateType state_type;
+  gint n_marks;
+  gint *marks;
+  gint focus_padding;
+  gint slider_width;
+  gint value_spacing;
+  gint min_sep = 4;
+
+  gtk_widget_style_get (widget,
+                        "focus-padding", &focus_padding,
+                        "slider-width", &slider_width, 
+                        "value-spacing", &value_spacing, 
+                        NULL);
+
+  /* We need to chain up _first_ so the various geometry members of
+   * GtkRange struct are updated.
+   */
+  GTK_WIDGET_CLASS (gtk_scale_parent_class)->expose_event (widget, event);
+
+  state_type = GTK_STATE_NORMAL;
+  if (!gtk_widget_is_sensitive (widget))
+    state_type = GTK_STATE_INSENSITIVE;
+
+  if (priv->marks)
+    {
+      gint i;
+      gint x1, x2, x3, y1, y2, y3;
+      PangoLayout *layout;
+      PangoRectangle logical_rect;
+      GSList *m;
+      gint min_pos_before, min_pos_after;
+      gint min_pos, max_pos;
+
+      n_marks = _gtk_range_get_stop_positions (range, &marks);
+      layout = gtk_widget_create_pango_layout (widget, NULL);
+
+      if (range->orientation == GTK_ORIENTATION_HORIZONTAL)
+        min_pos_before = min_pos_after = widget->allocation.x;
+      else
+        min_pos_before = min_pos_after = widget->allocation.y;
+      for (m = priv->marks, i = 0; m; m = m->next, i++)
+        {
+          GtkScaleMark *mark = m->data;
+    
+          if (range->orientation == GTK_ORIENTATION_HORIZONTAL)
+            {
+              x1 = widget->allocation.x + marks[i];
+              if (mark->position == GTK_POS_TOP)
+                {
+                  y1 = widget->allocation.y + range->range_rect.y;
+                  y2 = y1 - slider_width / 2;
+                  min_pos = min_pos_before;
+                  max_pos = widget->allocation.x + find_next_pos (widget, m, marks + i, GTK_POS_TOP, 1) - min_sep;
+                }
+              else
+                {
+                  y1 = widget->allocation.y + range->range_rect.y + range->range_rect.height;
+                  y2 = y1 + slider_width / 2;
+                  min_pos = min_pos_after;
+                  max_pos = widget->allocation.x + find_next_pos (widget, m, marks + i, GTK_POS_TOP, 0) - min_sep;
+                }
+
+              gtk_paint_vline (widget->style, widget->window, state_type,
+                               NULL, widget, "scale-mark", y1, y2, x1);
+
+              if (mark->markup)
+                {
+                  pango_layout_set_markup (layout, mark->markup, -1);
+                  pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+
+                  x3 = x1 - logical_rect.width / 2;
+                  if (x3 < min_pos)
+                    x3 = min_pos;
+                  if (x3 + logical_rect.width > max_pos)
+                        x3 = max_pos - logical_rect.width;
+                  if (x3 < widget->allocation.x)
+                     x3 = widget->allocation.x;
+                  if (mark->position == GTK_POS_TOP)
+                    {
+                      y3 = y2 - value_spacing - logical_rect.height;
+                      min_pos_before = x3 + logical_rect.width + min_sep;
+                    }
+                  else
+                    {
+                      y3 = y2 + value_spacing;
+                      min_pos_after = x3 + logical_rect.width + min_sep;
+                    }
+
+                  gtk_paint_layout (widget->style, widget->window, state_type,
+                                    FALSE, NULL, widget, "scale-mark",
+                                    x3, y3, layout);
+                }
+            }
+          else
+            {
+              if (mark->position == GTK_POS_LEFT)
+                {
+                  x1 = widget->allocation.x + range->range_rect.x;
+                  x2 = widget->allocation.x + range->range_rect.x - slider_width / 2;
+                  min_pos = min_pos_before;
+                  max_pos = widget->allocation.y + find_next_pos (widget, m, marks + i, GTK_POS_LEFT, 1) - min_sep;
+                }
+              else
+                {
+                  x1 = widget->allocation.x + range->range_rect.x + range->range_rect.width;
+                  x2 = widget->allocation.x + range->range_rect.x + range->range_rect.width + slider_width / 2;
+                  min_pos = min_pos_after;
+                  max_pos = widget->allocation.y + find_next_pos (widget, m, marks + i, GTK_POS_LEFT, 0) - min_sep;
+                }
+              y1 = widget->allocation.y + marks[i];
+
+              gtk_paint_hline (widget->style, widget->window, state_type,
+                               NULL, widget, "range-mark", x1, x2, y1);
+
+              if (mark->markup)
+                {
+                  pango_layout_set_markup (layout, mark->markup, -1);
+                  pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+              
+                  y3 = y1 - logical_rect.height / 2;
+                  if (y3 < min_pos)
+                    y3 = min_pos;
+                  if (y3 + logical_rect.height > max_pos)
+                    y3 = max_pos - logical_rect.height;
+                  if (y3 < widget->allocation.y)
+                    y3 = widget->allocation.y;
+                  if (mark->position == GTK_POS_LEFT)
+                    {
+                      x3 = x2 - value_spacing - logical_rect.width;
+                      min_pos_before = y3 + logical_rect.height + min_sep;
+                    }
+                  else
+                    {
+                      x3 = x2 + value_spacing;
+                      min_pos_after = y3 + logical_rect.height + min_sep;
+                    }
+
+                  gtk_paint_layout (widget->style, widget->window, state_type,
+                                    FALSE, NULL, widget, "scale-mark",
+                                    x3, y3, layout);
+                }
+            }
+        } 
+
+      g_object_unref (layout);
+      g_free (marks);
+    }
+
+  if (scale->draw_value)
+    {
+      PangoLayout *layout;
+      gint x, y;
+
+      layout = gtk_scale_get_layout (scale);
+      gtk_scale_get_layout_offsets (scale, &x, &y);
+
+      gtk_paint_layout (widget->style,
+                        widget->window,
+                        state_type,
+                       FALSE,
+                        NULL,
+                        widget,
+                        range->orientation == GTK_ORIENTATION_HORIZONTAL ?
+                        "hscale" : "vscale",
+                        x, y,
+                        layout);
+
+    }
+
+  return FALSE;
+}
+
+static void
+gtk_scale_real_get_layout_offsets (GtkScale *scale,
+                                   gint     *x,
+                                   gint     *y)
+{
+  GtkWidget *widget = GTK_WIDGET (scale);
+  GtkRange *range = GTK_RANGE (widget);
+  PangoLayout *layout = gtk_scale_get_layout (scale);
+  PangoRectangle logical_rect;
+  gint value_spacing;
+
+  if (!layout)
+    {
+      *x = 0;
+      *y = 0;
+
+      return;
+    }
+
+  gtk_widget_style_get (widget, "value-spacing", &value_spacing, NULL);
+
+  pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+
+  if (range->orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+      switch (scale->value_pos)
+        {
+        case GTK_POS_LEFT:
+          *x = range->range_rect.x - value_spacing - logical_rect.width;
+          *y = range->range_rect.y + (range->range_rect.height - logical_rect.height) / 2;
+          break;
+
+        case GTK_POS_RIGHT:
+          *x = range->range_rect.x + range->range_rect.width + value_spacing;
+          *y = range->range_rect.y + (range->range_rect.height - logical_rect.height) / 2;
+          break;
+
+        case GTK_POS_TOP:
+          *x = range->slider_start +
+            (range->slider_end - range->slider_start - logical_rect.width) / 2;
+          *x = CLAMP (*x, 0, widget->allocation.width - logical_rect.width);
+          *y = range->range_rect.y - logical_rect.height - value_spacing;
+          break;
+
+        case GTK_POS_BOTTOM:
+          *x = range->slider_start +
+            (range->slider_end - range->slider_start - logical_rect.width) / 2;
+          *x = CLAMP (*x, 0, widget->allocation.width - logical_rect.width);
+          *y = range->range_rect.y + range->range_rect.height + value_spacing;
+          break;
+
+        default:
+          g_return_if_reached ();
+          break;
+        }
+    }
+  else
+    {
+      switch (scale->value_pos)
+        {
+        case GTK_POS_LEFT:
+          *x = range->range_rect.x - logical_rect.width - value_spacing;
+          *y = range->slider_start + (range->slider_end - range->slider_start - logical_rect.height) / 2;
+          *y = CLAMP (*y, 0, widget->allocation.height - logical_rect.height);
+          break;
+
+        case GTK_POS_RIGHT:
+          *x = range->range_rect.x + range->range_rect.width + value_spacing;
+          *y = range->slider_start + (range->slider_end - range->slider_start - logical_rect.height) / 2;
+          *y = CLAMP (*y, 0, widget->allocation.height - logical_rect.height);
+          break;
+
+        case GTK_POS_TOP:
+          *x = range->range_rect.x + (range->range_rect.width - logical_rect.width) / 2;
+          *y = range->range_rect.y - logical_rect.height - value_spacing;
+          break;
+
+        case GTK_POS_BOTTOM:
+          *x = range->range_rect.x + (range->range_rect.width - logical_rect.width) / 2;
+          *y = range->range_rect.y + range->range_rect.height + value_spacing;
+          break;
+
+        default:
+          g_return_if_reached ();
+        }
+    }
+
+  *x += widget->allocation.x;
+  *y += widget->allocation.y;
+}
+
+/**
+ * _gtk_scale_format_value:
+ * @scale: a #GtkScale
+ * @value: adjustment value
+ * 
+ * Emits #GtkScale::format-value signal to format the value, 
+ * if no user signal handlers, falls back to a default format.
+ * 
+ * Return value: formatted value
+ */
+gchar*
+_gtk_scale_format_value (GtkScale *scale,
+                         gdouble   value)
+{
+  gchar *fmt = NULL;
+
+  g_signal_emit (scale,
+                 signals[FORMAT_VALUE],
+                 0,
+                 value,
+                 &fmt);
+
+  if (fmt)
+    return fmt;
+  else
+    /* insert a LRM, to prevent -20 to come out as 20- in RTL locales */
+    return g_strdup_printf ("\342\200\216%0.*f", scale->digits, value);
+}
+
+static void
+gtk_scale_finalize (GObject *object)
+{
+  GtkScale *scale = GTK_SCALE (object);
+
+  _gtk_scale_clear_layout (scale);
+  gtk_scale_clear_marks (scale);
+
+  G_OBJECT_CLASS (gtk_scale_parent_class)->finalize (object);
+}
+
+/**
+ * gtk_scale_get_layout:
+ * @scale: A #GtkScale
+ *
+ * Gets the #PangoLayout used to display the scale. 
+ * The returned object is owned by the scale so does 
+ * not need to be freed by the caller. 
+ *
+ * Return value: the #PangoLayout for this scale, or %NULL 
+ *    if the #GtkScale:draw-value property is %FALSE.
+ *   
+ * Since: 2.4
+ */
+PangoLayout *
+gtk_scale_get_layout (GtkScale *scale)
+{
+  GtkScalePrivate *priv = GTK_SCALE_GET_PRIVATE (scale);
+  gchar *txt;
+
+  g_return_val_if_fail (GTK_IS_SCALE (scale), NULL);
+
+  if (!priv->layout)
+    {
+      if (scale->draw_value)
+       priv->layout = gtk_widget_create_pango_layout (GTK_WIDGET (scale), NULL);
+    }
+
+  if (scale->draw_value) 
+    {
+      txt = _gtk_scale_format_value (scale,
+                                    GTK_RANGE (scale)->adjustment->value);
+      pango_layout_set_text (priv->layout, txt, -1);
+      g_free (txt);
+    }
+
+  return priv->layout;
+}
+
+/**
+ * gtk_scale_get_layout_offsets:
+ * @scale: a #GtkScale
+ * @x: (allow-none): location to store X offset of layout, or %NULL
+ * @y: (allow-none): location to store Y offset of layout, or %NULL
+ *
+ * Obtains the coordinates where the scale will draw the 
+ * #PangoLayout representing the text in the scale. Remember
+ * when using the #PangoLayout function you need to convert to
+ * and from pixels using PANGO_PIXELS() or #PANGO_SCALE. 
+ *
+ * If the #GtkScale:draw-value property is %FALSE, the return 
+ * values are undefined.
+ *
+ * Since: 2.4
+ */
+void 
+gtk_scale_get_layout_offsets (GtkScale *scale,
+                              gint     *x,
+                              gint     *y)
+{
+  gint local_x = 0; 
+  gint local_y = 0;
+
+  g_return_if_fail (GTK_IS_SCALE (scale));
+
+  if (GTK_SCALE_GET_CLASS (scale)->get_layout_offsets)
+    (GTK_SCALE_GET_CLASS (scale)->get_layout_offsets) (scale, &local_x, &local_y);
+
+  if (x)
+    *x = local_x;
+  
+  if (y)
+    *y = local_y;
+}
+
+void
+_gtk_scale_clear_layout (GtkScale *scale)
+{
+  GtkScalePrivate *priv = GTK_SCALE_GET_PRIVATE (scale);
+
+  g_return_if_fail (GTK_IS_SCALE (scale));
+
+  if (priv->layout)
+    {
+      g_object_unref (priv->layout);
+      priv->layout = NULL;
+    }
+}
+
+static void
+gtk_scale_mark_free (GtkScaleMark *mark)
+{
+  g_free (mark->markup);
+  g_free (mark);
+}
+
+/**
+ * gtk_scale_clear_marks:
+ * @scale: a #GtkScale
+ * 
+ * Removes any marks that have been added with gtk_scale_add_mark().
+ *
+ * Since: 2.16
+ */
 void
-gtk_scale_draw_value (GtkScale *scale)
+gtk_scale_clear_marks (GtkScale *scale)
 {
-  g_return_if_fail (scale != NULL);
+  GtkScalePrivate *priv = GTK_SCALE_GET_PRIVATE (scale);
+
   g_return_if_fail (GTK_IS_SCALE (scale));
 
-  if (SCALE_CLASS (scale)->draw_value)
-    (* SCALE_CLASS (scale)->draw_value) (scale);
+  g_slist_foreach (priv->marks, (GFunc)gtk_scale_mark_free, NULL);
+  g_slist_free (priv->marks);
+  priv->marks = NULL;
+
+  _gtk_range_set_stop_values (GTK_RANGE (scale), NULL, 0);
+
+  gtk_widget_queue_resize (GTK_WIDGET (scale));
+}
+
+static gint
+compare_marks (gpointer a, gpointer b)
+{
+  GtkScaleMark *ma, *mb;
+
+  ma = a; mb = b;
+
+  return (gint) (ma->value - mb->value);
+}
+
+/**
+ * gtk_scale_add_mark:
+ * @scale: a #GtkScale
+ * @value: the value at which the mark is placed, must be between 
+ *   the lower and upper limits of the scales' adjustment
+ * @position: where to draw the mark. For a horizontal scale, #GTK_POS_TOP
+ *   is drawn above the scale, anything else below. For a vertical scale,
+ *   #GTK_POS_LEFT is drawn to the left of the scale, anything else to the
+ *   right.
+ * @markup: (allow-none): Text to be shown at the mark, using <link linkend="PangoMarkupFormat">Pango markup</link>, or %NULL
+ *
+ *
+ * Adds a mark at @value. 
+ *
+ * A mark is indicated visually by drawing a tick mark next to the scale, 
+ * and GTK+ makes it easy for the user to position the scale exactly at the 
+ * marks value.
+ *
+ * If @markup is not %NULL, text is shown next to the tick mark. 
+ *
+ * To remove marks from a scale, use gtk_scale_clear_marks().
+ *
+ * Since: 2.16
+ */
+void
+gtk_scale_add_mark (GtkScale        *scale,
+                    gdouble          value,
+                    GtkPositionType  position,
+                    const gchar     *markup)
+{
+  GtkScalePrivate *priv = GTK_SCALE_GET_PRIVATE (scale);
+  GtkScaleMark *mark;
+  GSList *m;
+  gdouble *values;
+  gint n, i;
+
+  mark = g_new (GtkScaleMark, 1);
+  mark->value = value;
+  mark->markup = g_strdup (markup);
+  mark->position = position;
+  priv->marks = g_slist_insert_sorted (priv->marks, mark,
+                                       (GCompareFunc) compare_marks);
+
+  n = g_slist_length (priv->marks);
+  values = g_new (gdouble, n);
+  for (m = priv->marks, i = 0; m; m = m->next, i++)
+    {
+      mark = m->data;
+      values[i] = mark->value;
+    }
+  
+  _gtk_range_set_stop_values (GTK_RANGE (scale), values, n);
+
+  g_free (values);
+
+  gtk_widget_queue_resize (GTK_WIDGET (scale));
+}
+
+static GtkBuildableIface *parent_buildable_iface;
+
+static void
+gtk_scale_buildable_interface_init (GtkBuildableIface *iface)
+{
+  parent_buildable_iface = g_type_interface_peek_parent (iface);
+  iface->custom_tag_start = gtk_scale_buildable_custom_tag_start;
+  iface->custom_finished = gtk_scale_buildable_custom_finished;
+}
+
+typedef struct
+{
+  GtkScale *scale;
+  GtkBuilder *builder;
+  GSList *marks;
+} MarksSubparserData;
+
+typedef struct
+{
+  gdouble value;
+  GtkPositionType position;
+  GString *markup;
+  gchar *context;
+  gboolean translatable;
+} MarkData;
+
+static void
+mark_data_free (MarkData *data)
+{
+  g_string_free (data->markup, TRUE);
+  g_free (data->context);
+  g_slice_free (MarkData, data);
+}
+
+static void
+marks_start_element (GMarkupParseContext *context,
+                     const gchar         *element_name,
+                     const gchar        **names,
+                     const gchar        **values,
+                     gpointer             user_data,
+                     GError             **error)
+{
+  MarksSubparserData *parser_data = (MarksSubparserData*)user_data;
+  guint i;
+  gint line_number, char_number;
+
+  if (strcmp (element_name, "marks") == 0)
+   ;
+  else if (strcmp (element_name, "mark") == 0)
+    {
+      gdouble value = 0;
+      gboolean has_value = FALSE;
+      GtkPositionType position = GTK_POS_BOTTOM;
+      const gchar *msg_context = NULL;
+      gboolean translatable = FALSE;
+      MarkData *mark;
+
+      for (i = 0; names[i]; i++)
+        {
+          if (strcmp (names[i], "translatable") == 0)
+            {
+              if (!_gtk_builder_boolean_from_string (values[i], &translatable, error))
+                return;
+            }
+          else if (strcmp (names[i], "comments") == 0)
+            {
+              /* do nothing, comments are for translators */
+            }
+          else if (strcmp (names[i], "context") == 0)
+            msg_context = values[i];
+          else if (strcmp (names[i], "value") == 0)
+            {
+              GValue gvalue = { 0, };
+
+              if (!gtk_builder_value_from_string_type (parser_data->builder, G_TYPE_DOUBLE, values[i], &gvalue, error))
+                return;
+
+              value = g_value_get_double (&gvalue);
+              has_value = TRUE;
+            }
+          else if (strcmp (names[i], "position") == 0)
+            {
+              GValue gvalue = { 0, };
+
+              if (!gtk_builder_value_from_string_type (parser_data->builder, GTK_TYPE_POSITION_TYPE, values[i], &gvalue, error))
+                return;
+
+              position = g_value_get_enum (&gvalue);
+            }
+          else
+            {
+              g_markup_parse_context_get_position (context,
+                                                   &line_number,
+                                                   &char_number);
+              g_set_error (error,
+                           GTK_BUILDER_ERROR,
+                           GTK_BUILDER_ERROR_INVALID_ATTRIBUTE,
+                           "%s:%d:%d '%s' is not a valid attribute of <%s>",
+                           "<input>",
+                           line_number, char_number, names[i], "mark");
+              return;
+            }
+        }
+
+      if (!has_value)
+        {
+          g_markup_parse_context_get_position (context,
+                                               &line_number,
+                                               &char_number);
+          g_set_error (error,
+                       GTK_BUILDER_ERROR,
+                       GTK_BUILDER_ERROR_MISSING_ATTRIBUTE,
+                       "%s:%d:%d <%s> requires attribute \"%s\"",
+                       "<input>",
+                       line_number, char_number, "mark",
+                       "value");
+          return;
+        }
+
+      mark = g_slice_new (MarkData);
+      mark->value = value;
+      mark->position = position;
+      mark->markup = g_string_new ("");
+      mark->context = g_strdup (msg_context);
+      mark->translatable = translatable;
+
+      parser_data->marks = g_slist_prepend (parser_data->marks, mark);
+    }
+  else
+    {
+      g_markup_parse_context_get_position (context,
+                                           &line_number,
+                                           &char_number);
+      g_set_error (error,
+                   GTK_BUILDER_ERROR,
+                   GTK_BUILDER_ERROR_MISSING_ATTRIBUTE,
+                   "%s:%d:%d unsupported tag for GtkScale: \"%s\"",
+                   "<input>",
+                   line_number, char_number, element_name);
+      return;
+    }
+}
+
+static void
+marks_text (GMarkupParseContext  *context,
+            const gchar          *text,
+            gsize                 text_len,
+            gpointer              user_data,
+            GError              **error)
+{
+  MarksSubparserData *data = (MarksSubparserData*)user_data;
+
+  if (strcmp (g_markup_parse_context_get_element (context), "mark") == 0)
+    {
+      MarkData *mark = data->marks->data;
+
+      g_string_append_len (mark->markup, text, text_len);
+    }
 }
 
+static const GMarkupParser marks_parser =
+  {
+    marks_start_element,
+    NULL,
+    marks_text,
+  };
+
+
+static gboolean
+gtk_scale_buildable_custom_tag_start (GtkBuildable  *buildable,
+                                      GtkBuilder    *builder,
+                                      GObject       *child,
+                                      const gchar   *tagname,
+                                      GMarkupParser *parser,
+                                      gpointer      *data)
+{
+  MarksSubparserData *parser_data;
+
+  if (child)
+    return FALSE;
+
+  if (strcmp (tagname, "marks") == 0)
+    {
+      parser_data = g_slice_new0 (MarksSubparserData);
+      parser_data->scale = GTK_SCALE (buildable);
+      parser_data->marks = NULL;
+
+      *parser = marks_parser;
+      *data = parser_data;
+      return TRUE;
+    }
+
+  return parent_buildable_iface->custom_tag_start (buildable, builder, child,
+                                                   tagname, parser, data);
+}
 
 static void
-gtk_scale_draw_background (GtkRange *range)
+gtk_scale_buildable_custom_finished (GtkBuildable *buildable,
+                                     GtkBuilder   *builder,
+                                     GObject      *child,
+                                     const gchar  *tagname,
+                                     gpointer      user_data)
 {
-  g_return_if_fail (range != NULL);
-  g_return_if_fail (GTK_IS_SCALE (range));
+  GtkScale *scale = GTK_SCALE (buildable);
+  MarksSubparserData *marks_data;
+
+  if (strcmp (tagname, "marks") == 0)
+    {
+      GSList *m;
+      gchar *markup;
+
+      marks_data = (MarksSubparserData *)user_data;
 
-  gtk_scale_draw_value (GTK_SCALE (range));
+      for (m = marks_data->marks; m; m = m->next)
+        {
+          MarkData *mdata = m->data;
+
+          if (mdata->translatable && mdata->markup->len)
+            markup = _gtk_builder_parser_translate (gtk_builder_get_translation_domain (builder),
+                                                    mdata->context,
+                                                    mdata->markup->str);
+          else
+            markup = mdata->markup->str;
+
+          gtk_scale_add_mark (scale, mdata->value, mdata->position, markup);
+
+          mark_data_free (mdata);
+        }
+
+      g_slist_free (marks_data->marks);
+      g_slice_free (MarksSubparserData, marks_data);
+    }
 }
+
+#define __GTK_SCALE_C__
+#include "gtkaliasdef.c"