X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtksheet%2Fpsppire-axis-impl.c;h=dd515a572d9228b4fabf8aa65678f48b420dc38a;hb=614492cb70a6d5ee1ef440df03e12acc59ebc417;hp=7a8b00d7dfa5814bef82174adab59974a1db57c7;hpb=d26b0b232197cf1610544f3c9a96eeb0285dd2cb;p=pspp

diff --git a/lib/gtksheet/psppire-axis-impl.c b/lib/gtksheet/psppire-axis-impl.c
index 7a8b00d7df..dd515a572d 100644
--- a/lib/gtksheet/psppire-axis-impl.c
+++ b/lib/gtksheet/psppire-axis-impl.c
@@ -41,7 +41,7 @@ struct axis_node
 };
 
 static gint
-get_unit_at_pixel (const PsppireAxis *axis, glong pixel)
+unit_at_pixel (const PsppireAxis *axis, glong pixel)
 {
   PsppireAxisImpl *a = PSPPIRE_AXIS_IMPL (axis);
 
@@ -73,7 +73,7 @@ unit_count (const PsppireAxis *axis)
 
 /* Returns the pixel at the start of UNIT */
 static glong
-pixel_start (const PsppireAxis *axis, gint unit)
+start_pixel (const PsppireAxis *axis, gint unit)
 {
   gfloat fraction;
   PsppireAxisImpl *a = PSPPIRE_AXIS_IMPL (axis);
@@ -139,8 +139,8 @@ psppire_impl_iface_init (PsppireAxisIface *iface)
 {
   iface->unit_size = unit_size;
   iface->unit_count = unit_count;
-  iface->pixel_start = pixel_start;
-  iface->get_unit_at_pixel = get_unit_at_pixel;
+  iface->start_pixel = start_pixel;
+  iface->unit_at_pixel = unit_at_pixel;
   iface->total_size = total_size;
 }
 
@@ -243,8 +243,11 @@ psppire_axis_impl_append (PsppireAxisImpl *a, gint size)
 void
 psppire_axis_impl_append_n (PsppireAxisImpl *a, gint n_units, gint size)
 {
-  struct axis_node *node = pool_alloc (a->pool, sizeof *node);
+  struct axis_node *node;
 
+  g_return_if_fail (n_units > 0);
+
+  node = pool_alloc (a->pool, sizeof *node);
 
   tower_insert (&a->unit_tower, n_units, &node->unit_node, NULL);
   tower_insert (&a->pixel_tower, size * n_units, &node->pixel_node, NULL);
@@ -260,10 +263,17 @@ split (PsppireAxisImpl *a, gint posn)
   unsigned long int start;
   gfloat fraction;
   struct axis_node *new_node ;
-  struct tower_node *n = tower_lookup (&a->unit_tower, posn, &start);
+  struct tower_node *n;
+  struct axis_node *existing_node;
+
+
+  /* Nothing needs to be done */
+  if ( posn == 0)
+    return;
+
+  n = tower_lookup (&a->unit_tower, posn, &start);
 
-  struct axis_node *existing_node =
-    tower_data (n, struct axis_node, unit_node);
+  existing_node = tower_data (n, struct axis_node, unit_node);
 
   /* Nothing needs to be done, if the range element is already split here */
   if ( posn - start == 0)
@@ -298,28 +308,32 @@ split (PsppireAxisImpl *a, gint posn)
 void
 psppire_axis_impl_insert (PsppireAxisImpl *a, gint posn, gint size)
 {
-  struct tower_node *n;
-  unsigned long int start;
-  struct axis_node *before;
+  struct axis_node *before = NULL;
   struct axis_node *new_node = pool_alloc (a->pool, sizeof (*new_node));
 
-  split (a, posn);
+  if ( posn > 0)
+    {
+      unsigned long int start = 0;
+      struct tower_node *n;
 
-  n = tower_lookup (&a->unit_tower, posn, &start);
-  g_assert (posn == start);
+      split (a, posn);
 
-  before = tower_data (n, struct axis_node, unit_node);
+      n = tower_lookup (&a->unit_tower, posn, &start);
+      g_assert (posn == start);
+
+      before = tower_data (n, struct axis_node, unit_node);
+    }
 
   tower_insert (&a->unit_tower,
 		1,
 		&new_node->unit_node,
-		&before->unit_node);
+		before ? &before->unit_node : NULL);
 
 
   tower_insert (&a->pixel_tower,
 		size,
 		&new_node->pixel_node,
-		&before->pixel_node);
+		before ? &before->pixel_node : NULL);
 }
 
 
@@ -373,14 +387,16 @@ psppire_axis_impl_clear (PsppireAxisImpl *a)
 
 
 void
-psppire_axis_impl_delete (PsppireAxisImpl *a, gint first, gint n_cases)
+psppire_axis_impl_delete (PsppireAxisImpl *a, gint first, gint n_units)
 {
   gint i;
   g_warning ("%s FIXME: This is an inefficient implementation", __FUNCTION__);
 
-  for (i = first; i < first + n_cases; ++i)
+  g_return_if_fail (first + n_units < tower_height (&a->unit_tower));
+
+  for (i = first; i < first + n_units; ++i)
     {
-      struct axis_node *an = make_single (a, i);
+      struct axis_node *an = make_single (a, first);
 
       tower_delete (&a->unit_tower, &an->unit_node);
       tower_delete (&a->pixel_tower, &an->pixel_node);