]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkhscrollbar.c
Fix typos
[~andy/gtk] / gtk / gtkhscrollbar.c
index 22038549aeb3ed9d6b54a44dbab026b4cdde6b14..f6ed5037a4cbf502c9648776058ce2fd1c729a9d 100644 (file)
@@ -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
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <config.h>
 #include "gtkhscrollbar.h"
-#include "gtksignal.h"
 #include "gdk/gdkkeysyms.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
-
-#define EPSILON 0.01
-
-#define RANGE_CLASS(w)  GTK_RANGE_GET_CLASS (w)
-
-enum {
-  PROP_0,
-  PROP_ADJUSTMENT
-};
-
-static void     gtk_hscrollbar_class_init       (GtkHScrollbarClass *klass);
-static void     gtk_hscrollbar_init             (GtkHScrollbar      *hscrollbar);
-static void     gtk_hscrollbar_get_property     (GObject            *object,
-                                                guint               prop_id,
-                                                GValue             *value,
-                                                GParamSpec         *pspec);
-static void     gtk_hscrollbar_set_property     (GObject            *object,
-                                                guint               prop_id,
-                                                const GValue       *value,
-                                                GParamSpec         *pspec);
-static void     gtk_hscrollbar_realize          (GtkWidget          *widget);
-static void     gtk_hscrollbar_size_allocate    (GtkWidget          *widget,
-                                                GtkAllocation      *allocation);
-static void     gtk_hscrollbar_draw_step_forw   (GtkRange           *range);
-static void     gtk_hscrollbar_draw_step_back   (GtkRange           *range);
-static void     gtk_hscrollbar_slider_update    (GtkRange           *range);
-static void     gtk_hscrollbar_calc_slider_size (GtkHScrollbar      *hscrollbar);
-static gboolean gtk_hscrollbar_trough_keys      (GtkRange           *range,
-                                                GdkEventKey        *key,
-                                                GtkScrollType      *scroll,
-                                                GtkTroughType      *pos);
-
-
-GtkType
-gtk_hscrollbar_get_type (void)
-{
-  static GtkType hscrollbar_type = 0;
-  
-  if (!hscrollbar_type)
-    {
-      static const GtkTypeInfo hscrollbar_info =
-      {
-        "GtkHScrollbar",
-        sizeof (GtkHScrollbar),
-        sizeof (GtkHScrollbarClass),
-        (GtkClassInitFunc) gtk_hscrollbar_class_init,
-        (GtkObjectInitFunc) gtk_hscrollbar_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-      
-      hscrollbar_type = gtk_type_unique (GTK_TYPE_SCROLLBAR, &hscrollbar_info);
-    }
-  
-  return hscrollbar_type;
-}
+G_DEFINE_TYPE (GtkHScrollbar, gtk_hscrollbar, GTK_TYPE_SCROLLBAR)
 
 static void
 gtk_hscrollbar_class_init (GtkHScrollbarClass *class)
 {
-  GObjectClass *gobject_class;
-  GtkObjectClass *object_class;
-  GtkWidgetClass *widget_class;
-  GtkRangeClass *range_class;
-  
-  gobject_class = (GObjectClass*) class;
-  object_class = (GtkObjectClass*) class;
-  widget_class = (GtkWidgetClass*) class;
-  range_class = (GtkRangeClass*) class;
-  
-  gobject_class->set_property = gtk_hscrollbar_set_property;
-  gobject_class->get_property = gtk_hscrollbar_get_property;
-
-  widget_class->realize = gtk_hscrollbar_realize;
-  widget_class->size_allocate = gtk_hscrollbar_size_allocate;
-  
-  range_class->draw_step_forw = gtk_hscrollbar_draw_step_forw;
-  range_class->draw_step_back = gtk_hscrollbar_draw_step_back;
-  range_class->slider_update = gtk_hscrollbar_slider_update;
-  range_class->trough_click = _gtk_range_default_htrough_click;
-  range_class->trough_keys = gtk_hscrollbar_trough_keys;
-  range_class->motion = _gtk_range_default_hmotion;
-
-  g_object_class_install_property (gobject_class,
-                                  PROP_ADJUSTMENT,
-                                  g_param_spec_object ("adjustment",
-                                                       _("Adjustment"),
-                                                       _("The GtkAdjustment that determines the values to use for this scrollbar."),
-                                                       GTK_TYPE_ADJUSTMENT,
-                                                       G_PARAM_READWRITE));
-
-}
-
-static void 
-gtk_hscrollbar_set_property (GObject                    *object,
-                            guint                       prop_id,
-                            const GValue               *value,
-                            GParamSpec                 *pspec)
-{
-  GtkHScrollbar *hscrollbar;
-  
-  hscrollbar = GTK_HSCROLLBAR (object);
-  
-  switch (prop_id)
-    {
-    case PROP_ADJUSTMENT:
-      gtk_range_set_adjustment (GTK_RANGE (hscrollbar), 
-                               g_value_get_object (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void 
-gtk_hscrollbar_get_property (GObject                    *object,
-                            guint                       prop_id,
-                            GValue                     *value,
-                            GParamSpec                 *pspec)
-{
-  GtkHScrollbar *hscrollbar;
-  
-  hscrollbar = GTK_HSCROLLBAR (object);
-  
-  switch (prop_id)
-    {
-    case PROP_ADJUSTMENT:
-      g_value_set_object (value, G_OBJECT (hscrollbar));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
+  GTK_RANGE_CLASS (class)->stepper_detail = "hscrollbar";
 }
 
 static void
 gtk_hscrollbar_init (GtkHScrollbar *hscrollbar)
 {
-  GtkWidget *widget;
-  GtkRequisition *requisition;
-  
-  widget = GTK_WIDGET (hscrollbar);
-  requisition = &widget->requisition;
-  
-  requisition->width = (RANGE_CLASS (widget)->min_slider_size +
-                        RANGE_CLASS (widget)->stepper_size +
-                        RANGE_CLASS (widget)->stepper_slider_spacing +
-                        widget->style->xthickness) * 2;
-  requisition->height = (RANGE_CLASS (widget)->slider_width +
-                         widget->style->ythickness * 2);
+  GtkRange *range;
+
+  range = GTK_RANGE (hscrollbar);
+
+  range->orientation = GTK_ORIENTATION_HORIZONTAL;
 }
 
 GtkWidget*
@@ -188,287 +54,12 @@ gtk_hscrollbar_new (GtkAdjustment *adjustment)
 {
   GtkWidget *hscrollbar;
   
-  hscrollbar = gtk_widget_new (GTK_TYPE_HSCROLLBAR,
-                              "adjustment", adjustment,
-                              NULL);
+  hscrollbar = g_object_new (GTK_TYPE_HSCROLLBAR,
+                            "adjustment", adjustment,
+                            NULL);
 
   return hscrollbar;
 }
 
-
-static void
-gtk_hscrollbar_realize (GtkWidget *widget)
-{
-  GtkRange *range;
-  GdkWindowAttr attributes;
-  gint attributes_mask;
-  
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_HSCROLLBAR (widget));
-  
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
-  range = GTK_RANGE (widget);
-  
-  attributes.x = widget->allocation.x;
-  attributes.y = widget->allocation.y + (widget->allocation.height - widget->requisition.height) / 2;
-  attributes.width = widget->allocation.width;
-  attributes.height = widget->requisition.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 = widget->style->xthickness;
-  attributes.y = widget->style->ythickness;
-  attributes.width = RANGE_CLASS (widget)->stepper_size;
-  attributes.height = RANGE_CLASS (widget)->stepper_size;
-  
-  range->step_back = gdk_window_new (range->trough, &attributes, attributes_mask);
-  
-  attributes.x = (widget->allocation.width -
-                  widget->style->xthickness -
-                  RANGE_CLASS (widget)->stepper_size);
-  
-  range->step_forw = gdk_window_new (range->trough, &attributes, attributes_mask);
-  
-  attributes.x = 0;
-  attributes.y = widget->style->ythickness;
-  attributes.width = RANGE_CLASS (widget)->min_slider_size;
-  attributes.height = RANGE_CLASS (widget)->slider_width;
-  attributes.event_mask |= (GDK_BUTTON_MOTION_MASK |
-                            GDK_POINTER_MOTION_HINT_MASK);
-  
-  range->slider = gdk_window_new (range->trough, &attributes, attributes_mask);
-  
-  gtk_hscrollbar_calc_slider_size (GTK_HSCROLLBAR (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_hscrollbar_size_allocate (GtkWidget     *widget,
-                              GtkAllocation *allocation)
-{
-  GtkRange *range;
-  
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GTK_IS_HSCROLLBAR (widget));
-  g_return_if_fail (allocation != NULL);
-  
-  widget->allocation = *allocation;
-  if (GTK_WIDGET_REALIZED (widget))
-    {
-      range = GTK_RANGE (widget);
-      
-      gdk_window_move_resize (range->trough,
-                              allocation->x,
-                              allocation->y + (allocation->height - widget->requisition.height) / 2,
-                              allocation->width, widget->requisition.height);
-      gdk_window_move_resize (range->step_back,
-                              widget->style->xthickness,
-                              widget->style->ythickness,
-                              RANGE_CLASS (widget)->stepper_size,
-                              widget->requisition.height - widget->style->ythickness * 2);
-      gdk_window_move_resize (range->step_forw,
-                              allocation->width - widget->style->xthickness -
-                              RANGE_CLASS (widget)->stepper_size,
-                              widget->style->ythickness,
-                              RANGE_CLASS (widget)->stepper_size,
-                              widget->requisition.height - widget->style->ythickness * 2);
-      
-      _gtk_range_slider_update (GTK_RANGE (widget));
-    }
-}
-
-static void
-gtk_hscrollbar_draw_step_forw (GtkRange *range)
-{
-  GtkStateType state_type;
-  GtkShadowType shadow_type;
-  
-  g_return_if_fail (range != NULL);
-  g_return_if_fail (GTK_IS_HSCROLLBAR (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), "hscrollbar",
-                       GTK_ARROW_RIGHT,
-                       TRUE, 0, 0, -1, -1);
-    }
-}
-
-static void
-gtk_hscrollbar_draw_step_back (GtkRange *range)
-{
-  GtkStateType state_type;
-  GtkShadowType shadow_type;
-  
-  g_return_if_fail (range != NULL);
-  g_return_if_fail (GTK_IS_HSCROLLBAR (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), "hscrollbar",
-                       GTK_ARROW_LEFT,
-                       TRUE, 0, 0, -1, -1);
-    }
-}
-
-static void
-gtk_hscrollbar_slider_update (GtkRange *range)
-{
-  g_return_if_fail (range != NULL);
-  g_return_if_fail (GTK_IS_HSCROLLBAR (range));
-  
-  gtk_hscrollbar_calc_slider_size (GTK_HSCROLLBAR (range));
-  _gtk_range_default_hslider_update (range);
-}
-
-static void
-gtk_hscrollbar_calc_slider_size (GtkHScrollbar *hscrollbar)
-{
-  GtkRange *range;
-  gint step_back_x;
-  gint step_back_width;
-  gint step_forw_x;
-  gint slider_width;
-  gint slider_height;
-  gint left, right;
-  gint width;
-  
-  g_return_if_fail (hscrollbar != NULL);
-  g_return_if_fail (GTK_IS_HSCROLLBAR (hscrollbar));
-  
-  if (GTK_WIDGET_REALIZED (hscrollbar))
-    {
-      range = GTK_RANGE (hscrollbar);
-      
-      gdk_window_get_size (range->step_back, &step_back_width, NULL);
-      gdk_window_get_position (range->step_back, &step_back_x, NULL);
-      gdk_window_get_position (range->step_forw, &step_forw_x, NULL);
-      
-      left = (step_back_x +
-              step_back_width +
-              RANGE_CLASS (hscrollbar)->stepper_slider_spacing);
-      right = step_forw_x - RANGE_CLASS (hscrollbar)->stepper_slider_spacing;
-      width = right - left;
-      
-      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;
-          
-          width = (width * range->adjustment->page_size /
-                   (range->adjustment->upper - range->adjustment->lower));
-          
-          if (width < RANGE_CLASS (hscrollbar)->min_slider_size)
-            width = RANGE_CLASS (hscrollbar)->min_slider_size;
-        }
-      
-      gdk_window_get_size (range->slider, &slider_width, &slider_height);
-      
-      if (slider_width != width)
-       {
-         gdk_window_resize (range->slider, width, slider_height);
-         gdk_window_invalidate_rect (range->slider, NULL, FALSE);
-       }
-    }
-}
-
-static gboolean
-gtk_hscrollbar_trough_keys(GtkRange *range,
-                           GdkEventKey *key,
-                           GtkScrollType *scroll,
-                           GtkTroughType *pos)
-{
-  gint return_val = FALSE;
-  switch (key->keyval)
-    {
-    case GDK_Left:
-      return_val = TRUE;
-      *scroll = GTK_SCROLL_STEP_BACKWARD;
-      break;
-    case GDK_Right:
-      return_val = TRUE;
-      *scroll = GTK_SCROLL_STEP_FORWARD;
-      break;
-    case GDK_Home:
-      return_val = TRUE;
-      if (key->state & GDK_CONTROL_MASK)
-        *scroll = GTK_SCROLL_PAGE_BACKWARD;
-      else
-        *pos = GTK_TROUGH_START;
-      break;
-    case GDK_End:
-      return_val = TRUE;
-      if (key->state & GDK_CONTROL_MASK)
-        *scroll = GTK_SCROLL_PAGE_FORWARD;
-      else
-        *pos = GTK_TROUGH_END;
-      break;
-    }
-  return return_val;
-}
+#define __GTK_HSCROLLBAR_C__
+#include "gtkaliasdef.c"