Fix warning

[pspp-builds.git] / lib / gtksheet / gtksheet.c

diff --git a/lib/gtksheet/gtksheet.c b/lib/gtksheet/gtksheet.c
index 658061510a7b4757891a28c65b3239e72c0a4eda..ec49e49923f16b6077b73e2bbdc745e74af42745 100644 (file)
--- a/lib/gtksheet/gtksheet.c
+++ b/lib/gtksheet/gtksheet.c
@@ -226,12 +226,20 @@ static gboolean
 on_column_boundary (const GtkSheet *sheet, gint x, gint *column)
 {
   gint col;
+  gint pixel;
 
   x += sheet->hadjustment->value;
 
+  if ( x < 0)
+    return FALSE;
+
   col = column_from_xpixel (sheet, x);
 
-  if ( column_from_xpixel (sheet, x - DRAG_WIDTH / 2) < col )
+  pixel = x - DRAG_WIDTH / 2;
+  if (pixel < 0)
+    pixel = 0;
+
+  if ( column_from_xpixel (sheet, pixel) < col )
     {
       *column = col - 1;
       return TRUE;
@@ -250,12 +258,20 @@ static gboolean
 on_row_boundary (const GtkSheet *sheet, gint y, gint *row)
 {
   gint r;
+  gint pixel;
 
   y += sheet->vadjustment->value;
 
+  if ( y < 0)
+    return FALSE;
+
   r = row_from_ypixel (sheet, y);
 
-  if ( row_from_ypixel (sheet, y - DRAG_WIDTH / 2) < r )
+  pixel = y - DRAG_WIDTH / 2;
+  if (pixel < 0)
+    pixel = 0;
+
+  if ( row_from_ypixel (sheet, pixel) < r )
     {
       *row = r - 1;
       return TRUE;
@@ -368,16 +384,9 @@ rectangle_from_range (GtkSheet *sheet, const GtkSheetRange *range,
   r->x = psppire_axis_start_pixel (sheet->haxis, range->col0);
   r->x -= round (sheet->hadjustment->value);
 
-  if ( sheet->row_titles_visible)
-    r->x += sheet->row_title_area.width;
-
-
   r->y = psppire_axis_start_pixel (sheet->vaxis, range->row0);
   r->y -= round (sheet->vadjustment->value);
 
-  if ( sheet->column_titles_visible)
-    r->y += sheet->column_title_area.height;
-
   r->width = psppire_axis_start_pixel (sheet->haxis, range->coli) -
     psppire_axis_start_pixel (sheet->haxis, range->col0) +
     psppire_axis_unit_size (sheet->haxis, range->coli);
@@ -386,6 +395,16 @@ rectangle_from_range (GtkSheet *sheet, const GtkSheetRange *range,
     psppire_axis_start_pixel (sheet->vaxis, range->row0) +
     psppire_axis_unit_size (sheet->vaxis, range->rowi);
 
+  if ( sheet->column_titles_visible)
+    {
+      r->y += sheet->column_title_area.height;
+    }
+
+  if ( sheet->row_titles_visible)
+    {
+      r->x += sheet->row_title_area.width;
+    }
+
   return TRUE;
 }
 
@@ -527,11 +546,6 @@ static void gtk_sheet_real_cell_clear               (GtkSheet *sheet,
                                                  gint column);
 
 
-static void gtk_sheet_row_size_request (GtkSheet *sheet,
-                                       gint row,
-                                       guint *requisition);
-
-
 /* Signals */
 enum
   {
@@ -1129,7 +1143,7 @@ static void
 redraw_range (GtkSheet *sheet, GtkSheetRange *range)
 {
   GdkRectangle rect;
- 
+
   if ( ! GTK_WIDGET_REALIZED (sheet))
     return;
 
@@ -1139,6 +1153,18 @@ redraw_range (GtkSheet *sheet, GtkSheetRange *range)
     {
       GdkRegion *r = gdk_drawable_get_visible_region (sheet->sheet_window);
       gdk_region_get_clipbox (r, &rect);
+
+      if ( sheet->column_titles_visible)
+       {
+         rect.y += sheet->column_title_area.height;
+         rect.height -= sheet->column_title_area.height;
+       }
+
+      if ( sheet->row_titles_visible)
+       {
+         rect.x += sheet->row_title_area.width;
+         rect.width -= sheet->row_title_area.width;
+       }
     }
 
   gdk_window_invalidate_rect (sheet->sheet_window, &rect, FALSE);
@@ -1400,7 +1426,11 @@ gtk_sheet_show_column_titles (GtkSheet *sheet)
   if (sheet->vadjustment)
     g_signal_emit_by_name (sheet->vadjustment,
                           "value_changed");
+
   size_allocate_global_button (sheet);
+
+  if ( sheet->row_titles_visible)
+    gtk_widget_show (sheet->button);
 }
 
 
@@ -1427,7 +1457,11 @@ gtk_sheet_show_row_titles (GtkSheet *sheet)
   if (sheet->hadjustment)
     g_signal_emit_by_name (sheet->hadjustment,
                           "value_changed");
+
   size_allocate_global_button (sheet);
+
+  if ( sheet->column_titles_visible)
+    gtk_widget_show (sheet->button);
 }
 
 void
@@ -1441,8 +1475,8 @@ gtk_sheet_hide_column_titles (GtkSheet *sheet)
     {
       if (sheet->column_title_window)
        gdk_window_hide (sheet->column_title_window);
-      if (GTK_WIDGET_VISIBLE (sheet->button))
-       gtk_widget_hide (sheet->button);
+
+      gtk_widget_hide (sheet->button);
 
       adjust_scrollbars (sheet);
     }
@@ -1464,8 +1498,7 @@ gtk_sheet_hide_row_titles (GtkSheet *sheet)
       if (sheet->row_title_window)
        gdk_window_hide (sheet->row_title_window);
 
-      if (GTK_WIDGET_VISIBLE (sheet->button))
-       gtk_widget_hide (sheet->button);
+      gtk_widget_hide (sheet->button);
 
       adjust_scrollbars (sheet);
     }
@@ -1507,19 +1540,19 @@ gtk_sheet_moveto (GtkSheet *sheet,
 
 
   if (row >= 0)
-  {
-    gint y =  psppire_axis_start_pixel (sheet->vaxis, row);
+    {
+      gint y =  psppire_axis_start_pixel (sheet->vaxis, row);
 
-    gtk_adjustment_set_value (sheet->vadjustment, y - height * row_align);
-  }
+      gtk_adjustment_set_value (sheet->vadjustment, y - height * row_align);
+    }
 
 
   if (col >= 0)
-  {
-    gint x =  psppire_axis_start_pixel (sheet->haxis, col);
+    {
+      gint x =  psppire_axis_start_pixel (sheet->haxis, col);
 
-    gtk_adjustment_set_value (sheet->hadjustment, x - width * col_align);
-  }
+      gtk_adjustment_set_value (sheet->hadjustment, x - width * col_align);
+    }
 }
 
 
@@ -1541,7 +1574,6 @@ gtk_sheet_select_row (GtkSheet *sheet, gint row)
   sheet->range.rowi = row;
   sheet->range.coli = psppire_axis_unit_count (sheet->haxis) - 1;
   sheet->active_cell.row = row;
-  sheet->active_cell.col = 0;
 
   g_signal_emit (sheet, sheet_signals[SELECT_ROW], 0, row);
   gtk_sheet_real_select_range (sheet, NULL);
@@ -1565,7 +1597,6 @@ gtk_sheet_select_column (GtkSheet *sheet, gint column)
   sheet->range.col0 = column;
   sheet->range.rowi = psppire_axis_unit_count (sheet->vaxis) - 1;
   sheet->range.coli = column;
-  sheet->active_cell.row = 0;
   sheet->active_cell.col = column;
 
   g_signal_emit (sheet, sheet_signals[SELECT_COLUMN], 0, column);
@@ -1909,6 +1940,8 @@ create_global_button (GtkSheet *sheet)
 {
   sheet->button = gtk_button_new_with_label (" ");
 
+  GTK_WIDGET_UNSET_FLAGS(sheet->button, GTK_CAN_FOCUS);
+
   g_object_ref_sink (sheet->button);
 
   g_signal_connect (sheet->button,
@@ -1933,7 +1966,6 @@ size_allocate_global_button (GtkSheet *sheet)
   allocation.height = sheet->column_title_area.height;
 
   gtk_widget_size_allocate (sheet->button, &allocation);
-  gtk_widget_show (sheet->button);
 }
 
 static void
@@ -2011,18 +2043,12 @@ gtk_sheet_map (GtkWidget *widget)
          gtk_widget_map (sheet->entry_widget);
        }
 
-      if (GTK_WIDGET_VISIBLE (sheet->button) &&
-         !GTK_WIDGET_MAPPED (sheet->button))
+      if (!GTK_WIDGET_MAPPED (sheet->button))
        {
          gtk_widget_show (sheet->button);
          gtk_widget_map (sheet->button);
        }
 
-      if (GTK_BIN (sheet->button)->child)
-       if (GTK_WIDGET_VISIBLE (GTK_BIN (sheet->button)->child) &&
-           !GTK_WIDGET_MAPPED (GTK_BIN (sheet->button)->child))
-         gtk_widget_map (GTK_BIN (sheet->button)->child);
-
       redraw_range (sheet, NULL);
       change_active_cell (sheet,
                     sheet->active_cell.row,
@@ -2518,9 +2544,6 @@ gtk_sheet_set_active_cell (GtkSheet *sheet, gint row, gint col)
       col >= psppire_axis_unit_count (sheet->haxis))
     return;
 
-  sheet->active_cell.row = row;
-  sheet->active_cell.col = col;
-
   if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
     return;
 
@@ -3698,7 +3721,7 @@ motion_timeout_callback (gpointer data)
 
   if ( gtk_sheet_get_pixel_info (sheet, x, y, &row, &column) )
     {
-      if (sheet->row_title_under)
+      if (sheet->row_title_under && row >= 0)
        {
          gchar *text = g_sheet_model_get_row_subtitle (sheet->model, row);
 
@@ -3706,7 +3729,7 @@ motion_timeout_callback (gpointer data)
          g_free (text);
        }
 
-      if (sheet->column_title_under)
+      if (sheet->column_title_under && column >= 0)
        {
          gchar *text = g_sheet_model_get_column_subtitle (sheet->model,
                                                           column);
@@ -4362,7 +4385,6 @@ gtk_sheet_size_allocate (GtkWidget *widget,
   if (sheet->column_titles_visible)
     sheet->row_title_area.y += sheet->column_title_area.height;
 
-
   if (GTK_WIDGET_REALIZED (widget) && sheet->column_titles_visible)
     gdk_window_move_resize (sheet->column_title_window,
                            sheet->column_title_area.x,
@@ -4378,6 +4400,8 @@ gtk_sheet_size_allocate (GtkWidget *widget,
                            sheet->row_title_area.width,
                            sheet->row_title_area.height);
 
+  size_allocate_global_button (sheet);
+
   if (sheet->haxis)
     {
       gint width = sheet->column_title_area.width;
@@ -4445,8 +4469,6 @@ draw_column_title_buttons (GtkSheet *sheet)
 
   if (!GTK_WIDGET_DRAWABLE (sheet)) return;
 
-  size_allocate_global_button (sheet);
-
   draw_column_title_buttons_range (sheet, min_visible_column (sheet), 
                                   max_visible_column (sheet));
 }
@@ -4487,9 +4509,6 @@ draw_row_title_buttons (GtkSheet *sheet)
 
   if (!GTK_WIDGET_DRAWABLE (sheet)) return;
 
-  size_allocate_global_button (sheet);
-
-
   draw_row_title_buttons_range (sheet, min_visible_row (sheet),
                                max_visible_row (sheet));
 }
@@ -4653,6 +4672,8 @@ draw_button (GtkSheet *sheet, GdkWindow *window,
                         allocation.x, allocation.y,
                         allocation.width, allocation.height);
 
+  gtk_widget_ensure_style (sheet->button);
+
   gtk_paint_box (sheet->button->style, window,
                 GTK_STATE_NORMAL, GTK_SHADOW_OUT,
                 &allocation, GTK_WIDGET (sheet->button),
@@ -4928,6 +4949,24 @@ adjust_scrollbars (GtkSheet *sheet)
     }
 }
 
+/* Subtracts the region of WIDGET from REGION */
+static void
+subtract_widget_region (GdkRegion *region, GtkWidget *widget)
+{
+  GdkRectangle rect;
+  GdkRectangle intersect;
+  GdkRegion *region2;
+
+  gdk_region_get_clipbox (region, &rect);
+  gtk_widget_intersect (widget,
+                       &rect,
+                       &intersect);
+
+  region2 = gdk_region_rectangle (&intersect);
+  gdk_region_subtract (region, region2);
+  gdk_region_destroy (region2);
+}
+
 static void
 vadjustment_value_changed (GtkAdjustment *adjustment,
                           gpointer data)
@@ -4944,12 +4983,12 @@ vadjustment_value_changed (GtkAdjustment *adjustment,
   region =
     gdk_drawable_get_visible_region (GDK_DRAWABLE (sheet->sheet_window));
 
+  subtract_widget_region (region, sheet->button);
   gdk_window_begin_paint_region (sheet->sheet_window, region);
 
   draw_sheet_region (sheet, region);
 
   draw_row_title_buttons (sheet);
-  //  size_allocate_global_button (sheet);
   gtk_sheet_draw_active_cell (sheet);
 
   gdk_window_end_paint (sheet->sheet_window);
@@ -4974,12 +5013,12 @@ hadjustment_value_changed (GtkAdjustment *adjustment,
   region =
     gdk_drawable_get_visible_region (GDK_DRAWABLE (sheet->sheet_window));
 
+  subtract_widget_region (region, sheet->button);
   gdk_window_begin_paint_region (sheet->sheet_window, region);
 
   draw_sheet_region (sheet, region);
 
   draw_column_title_buttons (sheet);
-  //  size_allocate_global_button (sheet);
 
   gtk_sheet_draw_active_cell (sheet);
 
@@ -5100,6 +5139,9 @@ set_column_width (GtkSheet *sheet,
   if (column < 0 || column >= psppire_axis_unit_count (sheet->haxis))
     return;
 
+  if ( width <= 0)
+    return;
+
   psppire_axis_resize (sheet->haxis, column, width);
 
   if (GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
@@ -5122,6 +5164,9 @@ set_row_height (GtkSheet *sheet,
   if (row < 0 || row >= psppire_axis_unit_count (sheet->vaxis))
     return;
 
+  if (height <= 0)
+    return;
+
   psppire_axis_resize (sheet->vaxis, row, height);
 
   if (GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)) )