X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtk-contrib%2Fpsppire-sheet.c;h=a69aee0ae410011d3bdc15304349399be292b06b;hb=f7d7808a7a0aa4301da16074482ba9547ceff2c8;hp=33e7b47a0cce90cf7121ab275a78c965d3b66d0a;hpb=1eb005826d07b540f8595c6ffab0781dea9e5f6b;p=pspp-builds.git

diff --git a/lib/gtk-contrib/psppire-sheet.c b/lib/gtk-contrib/psppire-sheet.c
index 33e7b47a..a69aee0a 100644
--- a/lib/gtk-contrib/psppire-sheet.c
+++ b/lib/gtk-contrib/psppire-sheet.c
@@ -80,7 +80,13 @@ enum
     PSPPIRE_SHEET_IN_XDRAG = 1 << 1,
     PSPPIRE_SHEET_IN_YDRAG = 1 << 2,
     PSPPIRE_SHEET_IN_DRAG = 1 << 3,
+
+    /* This flag is set when the user is actually in the process
+       of making a selection - ie while the mouse button is
+       depressed.
+    */
     PSPPIRE_SHEET_IN_SELECTION = 1 << 4,
+
     PSPPIRE_SHEET_IN_RESIZE = 1 << 5
   };
 
@@ -375,10 +381,10 @@ POSSIBLE_RESIZE (const PsppireSheet *sheet, gint x, gint y,
   ydrag = psppire_axis_start_pixel (sheet->vaxis, sheet->range.rowi) +
     psppire_axis_unit_size (sheet->vaxis, sheet->range.rowi);
 
-  if (sheet->state == PSPPIRE_SHEET_COLUMN_SELECTED)
+  if (sheet->select_status == PSPPIRE_SHEET_COLUMN_SELECTED)
     ydrag = psppire_axis_start_pixel (sheet->vaxis, min_visible_row (sheet));
 
-  if (sheet->state == PSPPIRE_SHEET_ROW_SELECTED)
+  if (sheet->select_status == PSPPIRE_SHEET_ROW_SELECTED)
     xdrag = psppire_axis_start_pixel (sheet->haxis, min_visible_column (sheet));
 
   *drag_column = column_from_xpixel (sheet, x);
@@ -497,20 +503,12 @@ static void psppire_sheet_cell_draw (PsppireSheet *sheet, gint row, gint column)
 static void draw_sheet_region (PsppireSheet *sheet, GdkRegion *region);
 
 
-/* highlight the visible part of the selected range */
-static void psppire_sheet_range_draw_selection	 (PsppireSheet *sheet,
-						  PsppireSheetRange range);
-
 /* Selection */
 
 static void psppire_sheet_real_select_range 	 (PsppireSheet *sheet,
 						  const PsppireSheetRange *range);
 static void psppire_sheet_real_unselect_range 	 (PsppireSheet *sheet,
 						  const PsppireSheetRange *range);
-static void psppire_sheet_extend_selection		 (PsppireSheet *sheet,
-						  gint row, gint column);
-static void psppire_sheet_new_selection		 (PsppireSheet *sheet,
-						  PsppireSheetRange *range);
 static void psppire_sheet_draw_border 		 (PsppireSheet *sheet,
 						  PsppireSheetRange range);
 
@@ -759,7 +757,7 @@ psppire_sheet_set_vertical_axis (PsppireSheet *sheet, PsppireAxis *a)
     g_object_ref (sheet->vaxis);
 }
 
-static const GtkBorder default_cell_padding = { 3, 3, 2, 2 };
+static const GtkBorder default_cell_padding = {3, 3, 3, 3};
 
 static void
 psppire_sheet_set_property (GObject         *object,
@@ -1135,7 +1133,7 @@ psppire_sheet_init (PsppireSheet *sheet)
 
   sheet->flags = 0;
   sheet->selection_mode = GTK_SELECTION_NONE;
-  sheet->state = PSPPIRE_SHEET_NORMAL;
+  sheet->select_status = PSPPIRE_SHEET_NORMAL;
 
   GTK_WIDGET_UNSET_FLAGS (sheet, GTK_NO_WINDOW);
   GTK_WIDGET_SET_FLAGS (sheet, GTK_CAN_FOCUS);
@@ -1163,8 +1161,6 @@ psppire_sheet_init (PsppireSheet *sheet)
   sheet->range.col0 = 0;
   sheet->range.coli = 0;
 
-  sheet->state = PSPPIRE_SHEET_NORMAL;
-
   sheet->sheet_window = NULL;
   sheet->entry_widget = NULL;
   sheet->button = NULL;
@@ -1414,9 +1410,9 @@ psppire_sheet_change_entry (PsppireSheet *sheet, GtkType entry_type)
   g_return_if_fail (sheet != NULL);
   g_return_if_fail (PSPPIRE_IS_SHEET (sheet));
 
-  state = sheet->state;
+  state = sheet->select_status;
 
-  if (sheet->state == PSPPIRE_SHEET_NORMAL)
+  if (sheet->select_status == PSPPIRE_SHEET_NORMAL)
     psppire_sheet_hide_entry_widget (sheet);
 
   sheet->entry_type = entry_type;
@@ -1627,15 +1623,14 @@ psppire_sheet_select_row (PsppireSheet *sheet, gint row)
   if (row < 0 || row >= psppire_axis_unit_count (sheet->vaxis))
     return;
 
-  if (sheet->state != PSPPIRE_SHEET_NORMAL)
+  if (sheet->select_status != PSPPIRE_SHEET_NORMAL)
     psppire_sheet_real_unselect_range (sheet, NULL);
 
-  sheet->state = PSPPIRE_SHEET_ROW_SELECTED;
+  sheet->select_status = PSPPIRE_SHEET_ROW_SELECTED;
   sheet->range.row0 = row;
   sheet->range.col0 = 0;
   sheet->range.rowi = row;
   sheet->range.coli = psppire_axis_unit_count (sheet->haxis) - 1;
-  sheet->active_cell.row = row;
 
   g_signal_emit (sheet, sheet_signals[SELECT_ROW], 0, row);
   psppire_sheet_real_select_range (sheet, NULL);
@@ -1651,15 +1646,14 @@ psppire_sheet_select_column (PsppireSheet *sheet, gint column)
   if (column < 0 || column >= psppire_axis_unit_count (sheet->haxis))
     return;
 
-  if (sheet->state != PSPPIRE_SHEET_NORMAL)
+  if (sheet->select_status != PSPPIRE_SHEET_NORMAL)
     psppire_sheet_real_unselect_range (sheet, NULL);
 
-  sheet->state = PSPPIRE_SHEET_COLUMN_SELECTED;
+  sheet->select_status = PSPPIRE_SHEET_COLUMN_SELECTED;
   sheet->range.row0 = 0;
   sheet->range.col0 = column;
   sheet->range.rowi = psppire_axis_unit_count (sheet->vaxis) - 1;
   sheet->range.coli = column;
-  sheet->active_cell.col = column;
 
   g_signal_emit (sheet, sheet_signals[SELECT_COLUMN], 0, column);
   psppire_sheet_real_select_range (sheet, NULL);
@@ -1856,7 +1850,6 @@ psppire_sheet_style_set (GtkWidget *widget,
   set_entry_widget_font (sheet);
 }
 
-#define BORDER_WIDTH 3
 
 static void
 psppire_sheet_realize (GtkWidget *widget)
@@ -1964,7 +1957,10 @@ psppire_sheet_realize (GtkWidget *widget)
   values.foreground = widget->style->white;
   values.function = GDK_INVERT;
   values.subwindow_mode = GDK_INCLUDE_INFERIORS;
-  values.line_width = BORDER_WIDTH;
+  values.line_width = MAX (sheet->cell_padding->left,
+			   MAX (sheet->cell_padding->right,
+				MAX (sheet->cell_padding->top,
+				     sheet->cell_padding->bottom)));
 
   sheet->xor_gc = gdk_gc_new_with_values (widget->window,
 					  &values,
@@ -1974,13 +1970,15 @@ psppire_sheet_realize (GtkWidget *widget)
 					  GDK_GC_LINE_WIDTH
 					  );
 
-
   gtk_widget_set_parent_window (sheet->entry_widget, sheet->sheet_window);
   gtk_widget_set_parent (sheet->entry_widget, GTK_WIDGET (sheet));
 
   gtk_widget_set_parent_window (sheet->button, sheet->sheet_window);
   gtk_widget_set_parent (sheet->button, GTK_WIDGET (sheet));
 
+  sheet->button->style = gtk_style_attach (sheet->button->style,
+                                          sheet->sheet_window);
+
 
   sheet->cursor_drag = gdk_cursor_new_for_display (display, GDK_PLUS);
 
@@ -2138,11 +2136,9 @@ psppire_sheet_unmap (GtkWidget *widget)
     gdk_window_hide (sheet->row_title_window);
   gdk_window_hide (widget->window);
 
-  if (GTK_WIDGET_MAPPED (sheet->entry_widget))
-    gtk_widget_unmap (sheet->entry_widget);
-
-  if (GTK_WIDGET_MAPPED (sheet->button))
-    gtk_widget_unmap (sheet->button);
+  gtk_widget_unmap (sheet->entry_widget);
+  gtk_widget_unmap (sheet->button);
+  gtk_widget_unmap (sheet->hover_window->window);
 }
 
 /* get cell attributes of the given cell */
@@ -2315,12 +2311,7 @@ draw_sheet_region (PsppireSheet *sheet, GdkRegion *region)
 	psppire_sheet_cell_draw (sheet, i, j);
     }
 
-  if (sheet->state != PSPPIRE_SHEET_NORMAL &&
-      psppire_sheet_range_isvisible (sheet, &sheet->range))
-    psppire_sheet_range_draw_selection (sheet, drawing_range);
-
-
-  if (sheet->state == GTK_STATE_NORMAL &&
+  if (sheet->select_status == GTK_STATE_NORMAL &&
       sheet->active_cell.row >= drawing_range.row0 &&
       sheet->active_cell.row <= drawing_range.rowi &&
       sheet->active_cell.col >= drawing_range.col0 &&
@@ -2329,68 +2320,6 @@ draw_sheet_region (PsppireSheet *sheet, GdkRegion *region)
 }
 
 
-static void
-psppire_sheet_range_draw_selection (PsppireSheet *sheet, PsppireSheetRange range)
-{
-  GdkRectangle area;
-  gint i, j;
-  PsppireSheetRange aux;
-
-  if (range.col0 > sheet->range.coli || range.coli < sheet->range.col0 ||
-      range.row0 > sheet->range.rowi || range.rowi < sheet->range.row0)
-    return;
-
-  if (!psppire_sheet_range_isvisible (sheet, &range)) return;
-  if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
-
-  aux = range;
-
-  range.col0 = MAX (sheet->range.col0, range.col0);
-  range.coli = MIN (sheet->range.coli, range.coli);
-  range.row0 = MAX (sheet->range.row0, range.row0);
-  range.rowi = MIN (sheet->range.rowi, range.rowi);
-
-  range.col0 = MAX (range.col0, min_visible_column (sheet));
-  range.coli = MIN (range.coli, max_visible_column (sheet));
-  range.row0 = MAX (range.row0, min_visible_row (sheet));
-  range.rowi = MIN (range.rowi, max_visible_row (sheet));
-
-  for (i = range.row0; i <= range.rowi; i++)
-    {
-      for (j = range.col0; j <= range.coli; j++)
-	{
-	  if (psppire_sheet_cell_get_state (sheet, i, j) == GTK_STATE_SELECTED)
-	    {
-	      rectangle_from_cell (sheet, i, j, &area);
-
-	      if (i == sheet->range.row0)
-		{
-		  area.y = area.y + 2;
-		  area.height = area.height - 2;
-		}
-	      if (i == sheet->range.rowi) area.height = area.height - 3;
-	      if (j == sheet->range.col0)
-		{
-		  area.x = area.x + 2;
-		  area.width = area.width - 2;
-		}
-	      if (j == sheet->range.coli) area.width = area.width - 3;
-
-	      if (i != sheet->active_cell.row || j != sheet->active_cell.col)
-		{
-		  gdk_draw_rectangle (sheet->sheet_window,
-				      sheet->xor_gc,
-				      TRUE,
-				      area.x + 1, area.y + 1,
-				      area.width, area.height);
-		}
-	    }
-
-	}
-    }
-
-  psppire_sheet_draw_border (sheet, sheet->range);
-}
 
 static inline gint
 safe_strcmp (const gchar *s1, const gchar *s2)
@@ -2502,7 +2431,7 @@ psppire_sheet_cell_get_state (PsppireSheet *sheet, gint row, gint col)
   if (col >= psppire_axis_unit_count (sheet->haxis) || row >= psppire_axis_unit_count (sheet->vaxis)) return 0;
   if (col < 0 || row < 0) return 0;
 
-  state = sheet->state;
+  state = sheet->select_status;
   range = &sheet->range;
 
   switch (state)
@@ -2660,7 +2589,7 @@ entry_load_text (PsppireSheet *sheet)
   PsppireSheetCellAttr attributes;
 
   if (!GTK_WIDGET_VISIBLE (sheet->entry_widget)) return;
-  if (sheet->state != GTK_STATE_NORMAL) return;
+  if (sheet->select_status != GTK_STATE_NORMAL) return;
 
   row = sheet->active_cell.row;
   col = sheet->active_cell.col;
@@ -2707,24 +2636,20 @@ change_active_cell (PsppireSheet *sheet, gint row, gint col)
        || col > psppire_axis_unit_count (sheet->haxis))
     return;
 
-  if (sheet->state != PSPPIRE_SHEET_NORMAL)
+  if (sheet->select_status != PSPPIRE_SHEET_NORMAL)
     {
-      sheet->state = PSPPIRE_SHEET_NORMAL;
+      sheet->select_status = PSPPIRE_SHEET_NORMAL;
       psppire_sheet_real_unselect_range (sheet, NULL);
     }
 
   old_row = sheet->active_cell.row;
   old_col = sheet->active_cell.col;
 
-  /* Erase the old cell */
-  psppire_sheet_draw_active_cell (sheet);
-
   entry_load_text (sheet);
 
-  sheet->range.row0 = row;
-  sheet->range.col0 = col;
-  sheet->range.rowi = row;
-  sheet->range.coli = col;
+  /* Erase the old cell border */
+  psppire_sheet_draw_active_cell (sheet);
+
   sheet->active_cell.row = row;
   sheet->active_cell.col = col;
   sheet->selection_cell.row = row;
@@ -2762,7 +2687,7 @@ psppire_sheet_show_entry_widget (PsppireSheet *sheet)
     return;
 
   if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
-  if (sheet->state != PSPPIRE_SHEET_NORMAL) return;
+  if (sheet->select_status != PSPPIRE_SHEET_NORMAL) return;
   if (PSPPIRE_SHEET_IN_SELECTION (sheet)) return;
 
   GTK_WIDGET_SET_FLAGS (GTK_WIDGET (sheet->entry_widget), GTK_VISIBLE);
@@ -2833,250 +2758,6 @@ psppire_sheet_draw_active_cell (PsppireSheet *sheet)
 
 
 
-static void
-psppire_sheet_new_selection (PsppireSheet *sheet, PsppireSheetRange *range)
-{
-  gint i, j, mask1, mask2;
-  gint state, selected;
-  gint x, y, width, height;
-  PsppireSheetRange new_range, aux_range;
-
-  g_return_if_fail (sheet != NULL);
-
-  if (range == NULL) range=&sheet->range;
-
-  new_range=*range;
-
-  range->row0 = MIN (range->row0, sheet->range.row0);
-  range->rowi = MAX (range->rowi, sheet->range.rowi);
-  range->col0 = MIN (range->col0, sheet->range.col0);
-  range->coli = MAX (range->coli, sheet->range.coli);
-
-  range->row0 = MAX (range->row0, min_visible_row (sheet));
-  range->rowi = MIN (range->rowi, max_visible_row (sheet));
-  range->col0 = MAX (range->col0, min_visible_column (sheet));
-  range->coli = MIN (range->coli, max_visible_column (sheet));
-
-  aux_range.row0 = MAX (new_range.row0, min_visible_row (sheet));
-  aux_range.rowi = MIN (new_range.rowi, max_visible_row (sheet));
-  aux_range.col0 = MAX (new_range.col0, min_visible_column (sheet));
-  aux_range.coli = MIN (new_range.coli, max_visible_column (sheet));
-
-  for (i = range->row0; i <= range->rowi; i++)
-    {
-      for (j = range->col0; j <= range->coli; j++)
-	{
-
-	  state = psppire_sheet_cell_get_state (sheet, i, j);
-	  selected= (i <= new_range.rowi && i >= new_range.row0 &&
-		     j <= new_range.coli && j >= new_range.col0) ? TRUE : FALSE;
-
-	  if (state == GTK_STATE_SELECTED && selected &&
-	      (i == sheet->range.row0 || i == sheet->range.rowi ||
-	       j == sheet->range.col0 || j == sheet->range.coli ||
-	       i == new_range.row0 || i == new_range.rowi ||
-	       j == new_range.col0 || j == new_range.coli))
-	    {
-
-	      mask1 = i == sheet->range.row0 ? 1 : 0;
-	      mask1 = i == sheet->range.rowi ? mask1 + 2 : mask1;
-	      mask1 = j == sheet->range.col0 ? mask1 + 4 : mask1;
-	      mask1 = j == sheet->range.coli ? mask1 + 8 : mask1;
-
-	      mask2 = i == new_range.row0 ? 1 : 0;
-	      mask2 = i == new_range.rowi ? mask2 + 2 : mask2;
-	      mask2 = j == new_range.col0 ? mask2 + 4 : mask2;
-	      mask2 = j == new_range.coli ? mask2 + 8 : mask2;
-
-	      if (mask1 != mask2)
-		{
-		  x = psppire_axis_start_pixel (sheet->haxis, j);
-		  y = psppire_axis_start_pixel (sheet->vaxis, i);
-		  width = psppire_axis_start_pixel (sheet->haxis, j)- x+
-		    psppire_axis_unit_size (sheet->haxis, j);
-		  height = psppire_axis_start_pixel (sheet->vaxis, i) - y + psppire_axis_unit_size (sheet->vaxis, i);
-
-		  if (i == sheet->range.row0)
-		    {
-		      y = y - 3;
-		      height = height + 3;
-		    }
-		  if (i == sheet->range.rowi) height = height + 3;
-		  if (j == sheet->range.col0)
-		    {
-		      x = x - 3;
-		      width = width + 3;
-		    }
-		  if (j == sheet->range.coli) width = width + 3;
-
-		  if (i != sheet->active_cell.row || j != sheet->active_cell.col)
-		    {
-		      x = psppire_axis_start_pixel (sheet->haxis, j);
-		      y = psppire_axis_start_pixel (sheet->vaxis, i);
-		      width = psppire_axis_start_pixel (sheet->haxis, j)- x+
-			psppire_axis_unit_size (sheet->haxis, j);
-
-		      height = psppire_axis_start_pixel (sheet->vaxis, i) - y + psppire_axis_unit_size (sheet->vaxis, i);
-
-		      if (i == new_range.row0)
-			{
-			  y = y+2;
-			  height = height - 2;
-			}
-		      if (i == new_range.rowi) height = height - 3;
-		      if (j == new_range.col0)
-			{
-			  x = x+2;
-			  width = width - 2;
-			}
-		      if (j == new_range.coli) width = width - 3;
-
-		      gdk_draw_rectangle (sheet->sheet_window,
-					  sheet->xor_gc,
-					  TRUE,
-					  x + 1, y + 1,
-					  width, height);
-		    }
-		}
-	    }
-	}
-    }
-
-  for (i = range->row0; i <= range->rowi; i++)
-    {
-      for (j = range->col0; j <= range->coli; j++)
-	{
-
-	  state = psppire_sheet_cell_get_state (sheet, i, j);
-	  selected= (i <= new_range.rowi && i >= new_range.row0 &&
-		     j <= new_range.coli && j >= new_range.col0) ? TRUE : FALSE;
-
-	  if (state == GTK_STATE_SELECTED && !selected)
-	    {
-
-	      x = psppire_axis_start_pixel (sheet->haxis, j);
-	      y = psppire_axis_start_pixel (sheet->vaxis, i);
-	      width = psppire_axis_start_pixel (sheet->haxis, j) - x + psppire_axis_unit_size (sheet->haxis, j);
-	      height = psppire_axis_start_pixel (sheet->vaxis, i) - y + psppire_axis_unit_size (sheet->vaxis, i);
-
-	      if (i == sheet->range.row0)
-		{
-		  y = y - 3;
-		  height = height + 3;
-		}
-	      if (i == sheet->range.rowi) height = height + 3;
-	      if (j == sheet->range.col0)
-		{
-		  x = x - 3;
-		  width = width + 3;
-		}
-	      if (j == sheet->range.coli) width = width + 3;
-
-	    }
-	}
-    }
-
-  for (i = range->row0; i <= range->rowi; i++)
-    {
-      for (j = range->col0; j <= range->coli; j++)
-	{
-
-	  state = psppire_sheet_cell_get_state (sheet, i, j);
-	  selected= (i <= new_range.rowi && i >= new_range.row0 &&
-		     j <= new_range.coli && j >= new_range.col0) ? TRUE : FALSE;
-
-	  if (state != GTK_STATE_SELECTED && selected &&
-	      (i != sheet->active_cell.row || j != sheet->active_cell.col))
-	    {
-
-	      x = psppire_axis_start_pixel (sheet->haxis, j);
-	      y = psppire_axis_start_pixel (sheet->vaxis, i);
-	      width = psppire_axis_start_pixel (sheet->haxis, j) - x + psppire_axis_unit_size (sheet->haxis, j);
-	      height = psppire_axis_start_pixel (sheet->vaxis, i) - y + psppire_axis_unit_size (sheet->vaxis, i);
-
-	      if (i == new_range.row0)
-		{
-		  y = y+2;
-		  height = height - 2;
-		}
-	      if (i == new_range.rowi) height = height - 3;
-	      if (j == new_range.col0)
-		{
-		  x = x+2;
-		  width = width - 2;
-		}
-	      if (j == new_range.coli) width = width - 3;
-
-	      gdk_draw_rectangle (sheet->sheet_window,
-				  sheet->xor_gc,
-				  TRUE,
-				  x + 1, y + 1,
-				  width, height);
-
-	    }
-
-	}
-    }
-
-  for (i = aux_range.row0; i <= aux_range.rowi; i++)
-    {
-      for (j = aux_range.col0; j <= aux_range.coli; j++)
-	{
-	  state = psppire_sheet_cell_get_state (sheet, i, j);
-
-	  mask1 = i == sheet->range.row0 ? 1 : 0;
-	  mask1 = i == sheet->range.rowi ? mask1 + 2 : mask1;
-	  mask1 = j == sheet->range.col0 ? mask1 + 4 : mask1;
-	  mask1 = j == sheet->range.coli ? mask1 + 8 : mask1;
-
-	  mask2 = i == new_range.row0 ? 1 : 0;
-	  mask2 = i == new_range.rowi ? mask2 + 2 : mask2;
-	  mask2 = j == new_range.col0 ? mask2 + 4 : mask2;
-	  mask2 = j == new_range.coli ? mask2 + 8 : mask2;
-	  if (mask2 != mask1 || (mask2 == mask1 && state != GTK_STATE_SELECTED))
-	    {
-	      x = psppire_axis_start_pixel (sheet->haxis, j);
-	      y = psppire_axis_start_pixel (sheet->vaxis, i);
-	      width = psppire_axis_unit_size (sheet->haxis, j);
-	      height = psppire_axis_unit_size (sheet->vaxis, i);
-	      if (mask2 & 1)
-		gdk_draw_rectangle (sheet->sheet_window,
-				    sheet->xor_gc,
-				    TRUE,
-				    x + 1, y - 1,
-				    width, 3);
-
-
-	      if (mask2 & 2)
-		gdk_draw_rectangle (sheet->sheet_window,
-				    sheet->xor_gc,
-				    TRUE,
-				    x + 1, y + height - 1,
-				    width, 3);
-
-	      if (mask2 & 4)
-		gdk_draw_rectangle (sheet->sheet_window,
-				    sheet->xor_gc,
-				    TRUE,
-				    x - 1, y + 1,
-				    3, height);
-
-
-	      if (mask2 & 8)
-		gdk_draw_rectangle (sheet->sheet_window,
-				    sheet->xor_gc,
-				    TRUE,
-				    x + width - 1, y + 1,
-				    3, height);
-	    }
-	}
-    }
-
-  *range = new_range;
-}
-
-
-
 static void
 psppire_sheet_draw_border (PsppireSheet *sheet, PsppireSheetRange new_range)
 {
@@ -3084,11 +2765,24 @@ psppire_sheet_draw_border (PsppireSheet *sheet, PsppireSheetRange new_range)
 
   rectangle_from_range (sheet, &new_range, &area);
 
-  gdk_draw_rectangle (sheet->sheet_window,
-		      sheet->xor_gc,
+  area.width ++;
+  area.height ++;
+
+  gdk_gc_set_clip_rectangle (sheet->xor_gc, &area);
+
+  area.x += sheet->cell_padding->left / 2;
+  area.y += sheet->cell_padding->top / 2;
+  area.width -= (sheet->cell_padding->left + sheet->cell_padding->right ) / 2;
+  area.height -= (sheet->cell_padding->top + sheet->cell_padding->bottom ) / 2;
+
+  gdk_draw_rectangle (sheet->sheet_window,  sheet->xor_gc,
 		      FALSE,
-		      area.x, area.y,
-		      area.width, area.height);
+		      area.x,
+		      area.y,
+		      area.width,
+		      area.height);
+
+  gdk_gc_set_clip_rectangle (sheet->xor_gc, NULL);
 }
 
 
@@ -3107,19 +2801,7 @@ psppire_sheet_real_select_range (PsppireSheet *sheet,
   if (range->row0 < 0 || range->rowi < 0) return;
   if (range->col0 < 0 || range->coli < 0) return;
 
-  state = sheet->state;
-
-#if 0
-  if (range->coli != sheet->range.coli || range->col0 != sheet->range.col0 ||
-      range->rowi != sheet->range.rowi || range->row0 != sheet->range.row0)
-    {
-      psppire_sheet_new_selection (sheet, &sheet->range);
-    }
-  else
-    {
-      psppire_sheet_range_draw_selection (sheet, sheet->range);
-    }
-#endif
+  state = sheet->select_status;
 
   psppire_sheet_update_primary_selection (sheet);
 
@@ -3146,19 +2828,17 @@ psppire_sheet_select_range (PsppireSheet *sheet, const PsppireSheetRange *range)
   if (range->col0 < 0 || range->coli < 0) return;
 
 
-  if (sheet->state != PSPPIRE_SHEET_NORMAL)
+  if (sheet->select_status != PSPPIRE_SHEET_NORMAL)
     psppire_sheet_real_unselect_range (sheet, NULL);
 
   sheet->range.row0 = range->row0;
   sheet->range.rowi = range->rowi;
   sheet->range.col0 = range->col0;
   sheet->range.coli = range->coli;
-  sheet->active_cell.row = range->row0;
-  sheet->active_cell.col = range->col0;
   sheet->selection_cell.row = range->rowi;
   sheet->selection_cell.col = range->coli;
 
-  sheet->state = PSPPIRE_SHEET_RANGE_SELECTED;
+  sheet->select_status = PSPPIRE_SHEET_RANGE_SELECTED;
   psppire_sheet_real_select_range (sheet, NULL);
 }
 
@@ -3169,10 +2849,7 @@ psppire_sheet_unselect_range (PsppireSheet *sheet)
     return;
 
   psppire_sheet_real_unselect_range (sheet, NULL);
-  sheet->state = GTK_STATE_NORMAL;
-
-  change_active_cell (sheet,
-		 sheet->active_cell.row, sheet->active_cell.col);
+  sheet->select_status = GTK_STATE_NORMAL;
 }
 
 
@@ -3200,8 +2877,7 @@ psppire_sheet_real_unselect_range (PsppireSheet *sheet,
 
 
 static gint
-psppire_sheet_expose (GtkWidget *widget,
-		  GdkEventExpose *event)
+psppire_sheet_expose (GtkWidget *widget, GdkEventExpose *event)
 {
   PsppireSheet *sheet = PSPPIRE_SHEET (widget);
 
@@ -3231,21 +2907,37 @@ psppire_sheet_expose (GtkWidget *widget,
     {
       draw_sheet_region (sheet, event->region);
 
-#if 0
-      if (sheet->state != PSPPIRE_SHEET_NORMAL)
+
+      if (sheet->select_status != PSPPIRE_SHEET_NORMAL)
 	{
+#if 0
 	  if (psppire_sheet_range_isvisible (sheet, &sheet->range))
 	    psppire_sheet_range_draw (sheet, &sheet->range);
 
 	  if (PSPPIRE_SHEET_IN_RESIZE (sheet) || PSPPIRE_SHEET_IN_DRAG (sheet))
 	    psppire_sheet_range_draw (sheet, &sheet->drag_range);
+#endif
 
 	  if (psppire_sheet_range_isvisible (sheet, &sheet->range))
-	    psppire_sheet_range_draw_selection (sheet, sheet->range);
+	    {
+	      GdkRectangle area;
+
+	      rectangle_from_range (sheet, &sheet->range, &area);
+	      
+	      gdk_draw_rectangle (sheet->sheet_window,
+				  sheet->xor_gc,
+				  TRUE,
+				  area.x + 1, area.y + 1,
+				  area.width, area.height);
+
+	    }
+
+#if 0
 	  if (PSPPIRE_SHEET_IN_RESIZE (sheet) || PSPPIRE_SHEET_IN_DRAG (sheet))
 	    draw_xor_rectangle (sheet, sheet->drag_range);
-	}
 #endif
+	}
+
 
       if ((!PSPPIRE_SHEET_IN_XDRAG (sheet)) && (!PSPPIRE_SHEET_IN_YDRAG (sheet)))
 	{
@@ -3279,7 +2971,7 @@ psppire_sheet_button_press (GtkWidget *widget,
   GdkModifierType mods;
   gint x, y;
   gint  row, column;
-  gboolean veto;
+
 
   g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (PSPPIRE_IS_SHEET (widget), FALSE);
@@ -3383,65 +3075,8 @@ psppire_sheet_button_press (GtkWidget *widget,
 			NULL, NULL, event->time);
       gtk_grab_add (GTK_WIDGET (sheet));
 
-      if (sheet->selection_mode != GTK_SELECTION_SINGLE &&
-	  sheet->selection_mode != GTK_SELECTION_NONE &&
-	  sheet->cursor_drag->type == GDK_SIZING &&
-	  !PSPPIRE_SHEET_IN_SELECTION (sheet) && !PSPPIRE_SHEET_IN_RESIZE (sheet))
-	{
-	  if (sheet->state == GTK_STATE_NORMAL)
-	    {
-	      row = sheet->active_cell.row;
-	      column = sheet->active_cell.col;
-	      sheet->active_cell.row = row;
-	      sheet->active_cell.col = column;
-	      sheet->drag_range = sheet->range;
-	      sheet->state = PSPPIRE_SHEET_RANGE_SELECTED;
-	      psppire_sheet_select_range (sheet, &sheet->drag_range);
-	    }
-	  sheet->x_drag = x;
-	  sheet->y_drag = y;
-	  if (row > sheet->range.rowi) row--;
-	  if (column > sheet->range.coli) column--;
-	  sheet->drag_cell.row = row;
-	  sheet->drag_cell.col = column;
-	  sheet->drag_range = sheet->range;
-	  draw_xor_rectangle (sheet, sheet->drag_range);
-	  PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_RESIZE);
-	}
-      else if (sheet->cursor_drag->type == GDK_TOP_LEFT_ARROW &&
-	       !PSPPIRE_SHEET_IN_SELECTION (sheet)
-	       && ! PSPPIRE_SHEET_IN_DRAG (sheet)
-	       && sheet->active_cell.row >= 0
-	       && sheet->active_cell.col >= 0
-	       )
-	{
-	  if (sheet->state == GTK_STATE_NORMAL)
-	    {
-	      row = sheet->active_cell.row;
-	      column = sheet->active_cell.col;
-	      sheet->active_cell.row = row;
-	      sheet->active_cell.col = column;
-	      sheet->drag_range = sheet->range;
-	      sheet->state = PSPPIRE_SHEET_RANGE_SELECTED;
-	      psppire_sheet_select_range (sheet, &sheet->drag_range);
-	    }
-	  sheet->x_drag = x;
-	  sheet->y_drag = y;
-	  if (row < sheet->range.row0) row++;
-	  if (row > sheet->range.rowi) row--;
-	  if (column < sheet->range.col0) column++;
-	  if (column > sheet->range.coli) column--;
-	  sheet->drag_cell.row = row;
-	  sheet->drag_cell.col = column;
-	  sheet->drag_range = sheet->range;
-	  draw_xor_rectangle (sheet, sheet->drag_range);
-	  PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_DRAG);
-	}
-      else
-	{
-	  veto = psppire_sheet_click_cell (sheet, row, column);
-	  if (veto) PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION);
-	}
+      if (psppire_sheet_click_cell (sheet, row, column))
+	PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION);
     }
 
   if (event->window == sheet->column_title_window)
@@ -3456,7 +3091,6 @@ psppire_sheet_button_press (GtkWidget *widget,
 
       if (psppire_sheet_model_get_column_sensitivity (sheet->model, column))
 	{
-	  veto = psppire_sheet_click_cell (sheet, -1, column);
 	  gtk_grab_add (GTK_WIDGET (sheet));
 	  PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION);
 	}
@@ -3473,7 +3107,6 @@ psppire_sheet_button_press (GtkWidget *widget,
       row = row_from_ypixel (sheet, y);
       if (psppire_sheet_model_get_row_sensitivity (sheet->model, row))
 	{
-	  veto = psppire_sheet_click_cell (sheet, row, -1);
 	  gtk_grab_add (GTK_WIDGET (sheet));
 	  PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION);
 	}
@@ -3504,7 +3137,7 @@ psppire_sheet_click_cell (PsppireSheet *sheet, gint row, gint column)
 
   if (forbid_move)
     {
-      if (sheet->state == GTK_STATE_NORMAL)
+      if (sheet->select_status == GTK_STATE_NORMAL)
 	return FALSE;
 
       row = sheet->active_cell.row;
@@ -3533,15 +3166,13 @@ psppire_sheet_click_cell (PsppireSheet *sheet, gint row, gint column)
       sheet->range.rowi = psppire_axis_unit_count (sheet->vaxis) - 1;
       sheet->range.coli =
 	psppire_axis_unit_count (sheet->haxis) - 1;
-      sheet->active_cell.row = 0;
-      sheet->active_cell.col = 0;
       psppire_sheet_select_range (sheet, NULL);
       return TRUE;
     }
 
-  if (sheet->state != PSPPIRE_SHEET_NORMAL)
+  if (sheet->select_status != PSPPIRE_SHEET_NORMAL)
     {
-      sheet->state = PSPPIRE_SHEET_NORMAL;
+      sheet->select_status = PSPPIRE_SHEET_NORMAL;
       psppire_sheet_real_unselect_range (sheet, NULL);
     }
   else
@@ -3549,15 +3180,13 @@ psppire_sheet_click_cell (PsppireSheet *sheet, gint row, gint column)
       change_active_cell (sheet, row, column);
     }
 
-  sheet->active_cell.row = row;
-  sheet->active_cell.col = column;
   sheet->selection_cell.row = row;
   sheet->selection_cell.col = column;
   sheet->range.row0 = row;
   sheet->range.col0 = column;
   sheet->range.rowi = row;
   sheet->range.coli = column;
-  sheet->state = PSPPIRE_SHEET_NORMAL;
+  sheet->select_status = PSPPIRE_SHEET_NORMAL;
   PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION);
 
   gtk_widget_grab_focus (GTK_WIDGET (sheet->entry_widget));
@@ -3619,10 +3248,6 @@ psppire_sheet_button_release (GtkWidget *widget,
 
       psppire_sheet_real_unselect_range (sheet, NULL);
 
-      sheet->active_cell.row = sheet->active_cell.row +
-	(sheet->drag_range.row0 - sheet->range.row0);
-      sheet->active_cell.col = sheet->active_cell.col +
-	(sheet->drag_range.col0 - sheet->range.col0);
       sheet->selection_cell.row = sheet->selection_cell.row +
 	(sheet->drag_range.row0 - sheet->range.row0);
       sheet->selection_cell.col = sheet->selection_cell.col +
@@ -3644,10 +3269,6 @@ psppire_sheet_button_release (GtkWidget *widget,
 
       psppire_sheet_real_unselect_range (sheet, NULL);
 
-      sheet->active_cell.row = sheet->active_cell.row +
-	(sheet->drag_range.row0 - sheet->range.row0);
-      sheet->active_cell.col = sheet->active_cell.col +
-	(sheet->drag_range.col0 - sheet->range.col0);
       if (sheet->drag_range.row0 < sheet->range.row0)
 	sheet->selection_cell.row = sheet->drag_range.row0;
       if (sheet->drag_range.rowi >= sheet->range.rowi)
@@ -3660,13 +3281,13 @@ psppire_sheet_button_release (GtkWidget *widget,
       sheet->range = sheet->drag_range;
       sheet->drag_range = old_range;
 
-      if (sheet->state == GTK_STATE_NORMAL) sheet->state = PSPPIRE_SHEET_RANGE_SELECTED;
+      if (sheet->select_status == GTK_STATE_NORMAL) sheet->select_status = PSPPIRE_SHEET_RANGE_SELECTED;
       g_signal_emit (sheet, sheet_signals[RESIZE_RANGE], 0,
 		     &sheet->drag_range, &sheet->range);
       psppire_sheet_select_range (sheet, &sheet->range);
     }
 
-  if (sheet->state == PSPPIRE_SHEET_NORMAL && PSPPIRE_SHEET_IN_SELECTION (sheet))
+  if (sheet->select_status == PSPPIRE_SHEET_NORMAL && PSPPIRE_SHEET_IN_SELECTION (sheet))
     {
       PSPPIRE_SHEET_UNSET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION);
       gdk_display_pointer_ungrab (display, event->time);
@@ -3752,7 +3373,8 @@ create_hover_window (void)
 #define HOVER_WINDOW_Y_OFFSET 2
 
 static void
-show_subtitle (PsppireSheet *sheet, gint row, gint column, const gchar *subtitle)
+show_subtitle (PsppireSheet *sheet, gint row, gint column,
+	       const gchar *subtitle)
 {
   gint x, y;
   gint px, py;
@@ -3802,6 +3424,8 @@ motion_timeout_callback (gpointer data)
   PsppireSheet *sheet = PSPPIRE_SHEET (data);
   gint x, y;
   gint row, column;
+
+  gdk_threads_enter ();
   gtk_widget_get_pointer (GTK_WIDGET (sheet), &x, &y);
 
   if ( psppire_sheet_get_pixel_info (sheet, x, y, &row, &column) )
@@ -3825,6 +3449,7 @@ motion_timeout_callback (gpointer data)
 	}
     }
 
+  gdk_threads_leave ();
   return FALSE;
 }
 
@@ -4001,8 +3626,8 @@ psppire_sheet_motion (GtkWidget *widget,  GdkEventMotion *event)
       PsppireSheetRange aux;
       column = column_from_xpixel (sheet, x)- sheet->drag_cell.col;
       row = row_from_ypixel (sheet, y) - sheet->drag_cell.row;
-      if (sheet->state == PSPPIRE_SHEET_COLUMN_SELECTED) row = 0;
-      if (sheet->state == PSPPIRE_SHEET_ROW_SELECTED) column = 0;
+      if (sheet->select_status == PSPPIRE_SHEET_COLUMN_SELECTED) row = 0;
+      if (sheet->select_status == PSPPIRE_SHEET_ROW_SELECTED) column = 0;
       sheet->x_drag = x;
       sheet->y_drag = y;
       aux = sheet->range;
@@ -4064,8 +3689,8 @@ psppire_sheet_motion (GtkWidget *widget,  GdkEventMotion *event)
 	    row +=1;
 	}
 
-      if (sheet->state == PSPPIRE_SHEET_COLUMN_SELECTED) row = 0;
-      if (sheet->state == PSPPIRE_SHEET_ROW_SELECTED) column = 0;
+      if (sheet->select_status == PSPPIRE_SHEET_COLUMN_SELECTED) row = 0;
+      if (sheet->select_status == PSPPIRE_SHEET_ROW_SELECTED) column = 0;
       sheet->x_drag = x;
       sheet->y_drag = y;
       aux = sheet->range;
@@ -4100,11 +3725,19 @@ psppire_sheet_motion (GtkWidget *widget,  GdkEventMotion *event)
 
   psppire_sheet_get_pixel_info (sheet, x, y, &row, &column);
 
-  if (sheet->state == PSPPIRE_SHEET_NORMAL && row == sheet->active_cell.row &&
+  if (sheet->select_status == PSPPIRE_SHEET_NORMAL && row == sheet->active_cell.row &&
       column == sheet->active_cell.col) return TRUE;
 
   if (PSPPIRE_SHEET_IN_SELECTION (sheet) && mods&GDK_BUTTON1_MASK)
-    psppire_sheet_extend_selection (sheet, row, column);
+    {
+      GdkRectangle area;
+      sheet->range.rowi = row;
+      sheet->range.coli = column;
+      sheet->select_status = PSPPIRE_SHEET_RANGE_SELECTED;
+
+      rectangle_from_range (sheet, &sheet->range, &area);
+      gdk_window_invalidate_rect (sheet->sheet_window, &area, FALSE);
+    }
 
   return TRUE;
 }
@@ -4120,6 +3753,9 @@ psppire_sheet_crossing_notify (GtkWidget *widget,
   else if (event->window == sheet->row_title_window)
     sheet->row_title_under = event->type == GDK_ENTER_NOTIFY;
 
+  if (event->type == GDK_LEAVE_NOTIFY)
+    gtk_widget_hide (sheet->hover_window->window);
+
   return TRUE;
 }
 
@@ -4136,59 +3772,6 @@ psppire_sheet_focus_in (GtkWidget     *w,
 }
 
 
-static void
-psppire_sheet_extend_selection (PsppireSheet *sheet, gint row, gint column)
-{
-  PsppireSheetRange range;
-  gint state;
-  gint r, c;
-
-  if (row == sheet->selection_cell.row && column == sheet->selection_cell.col)
-    return;
-
-  if (sheet->selection_mode == GTK_SELECTION_SINGLE) return;
-
-  gtk_widget_grab_focus (GTK_WIDGET (sheet));
-
-  if (PSPPIRE_SHEET_IN_DRAG (sheet)) return;
-
-  state = sheet->state;
-
-  switch (sheet->state)
-    {
-    case PSPPIRE_SHEET_ROW_SELECTED:
-      column = psppire_axis_unit_count (sheet->haxis) - 1;
-      break;
-    case PSPPIRE_SHEET_COLUMN_SELECTED:
-      row = psppire_axis_unit_count (sheet->vaxis) - 1;
-      break;
-    case PSPPIRE_SHEET_NORMAL:
-      sheet->state = PSPPIRE_SHEET_RANGE_SELECTED;
-      r = sheet->active_cell.row;
-      c = sheet->active_cell.col;
-      sheet->range.col0 = c;
-      sheet->range.row0 = r;
-      sheet->range.coli = c;
-      sheet->range.rowi = r;
-      psppire_sheet_range_draw_selection (sheet, sheet->range);
-    case PSPPIRE_SHEET_RANGE_SELECTED:
-      sheet->state = PSPPIRE_SHEET_RANGE_SELECTED;
-    }
-
-  sheet->selection_cell.row = row;
-  sheet->selection_cell.col = column;
-
-  range.col0 = MIN (column, sheet->active_cell.col);
-  range.coli = MAX (column, sheet->active_cell.col);
-  range.row0 = MIN (row, sheet->active_cell.row);
-  range.rowi = MAX (row, sheet->active_cell.row);
-
-  if (range.row0 != sheet->range.row0 || range.rowi != sheet->range.rowi ||
-      range.col0 != sheet->range.col0 || range.coli != sheet->range.coli ||
-      state == PSPPIRE_SHEET_NORMAL)
-    psppire_sheet_real_select_range (sheet, &range);
-
-}
 
 static gint
 psppire_sheet_entry_key_press (GtkWidget *widget,
@@ -4665,10 +4248,10 @@ psppire_sheet_size_allocate_entry (PsppireSheet *sheet)
   rectangle_from_cell (sheet, sheet->active_cell.row,
 		       sheet->active_cell.col, &entry_alloc);
 
-  entry_alloc.width -= BORDER_WIDTH ;
-  entry_alloc.height -= BORDER_WIDTH ;
-  entry_alloc.x += DIV_RND_UP (BORDER_WIDTH, 2);
-  entry_alloc.y += DIV_RND_UP (BORDER_WIDTH, 2);
+  entry_alloc.x += sheet->cell_padding->left;
+  entry_alloc.y += sheet->cell_padding->right;
+  entry_alloc.width -= sheet->cell_padding->left + sheet->cell_padding->right;
+  entry_alloc.height -= sheet->cell_padding->top + sheet->cell_padding->bottom;
 
 
   gtk_widget_set_size_request (sheet->entry_widget, entry_alloc.width,
@@ -4793,8 +4376,9 @@ draw_button (PsppireSheet *sheet, GdkWindow *window,
 
   gtk_paint_box (sheet->button->style, window,
 		 GTK_STATE_NORMAL, GTK_SHADOW_OUT,
-		 &allocation, GTK_WIDGET (sheet->button),
-		 "buttondefault",
+		 &allocation,
+		 GTK_WIDGET (sheet->button),
+		 NULL,
 		 allocation.x, allocation.y,
 		 allocation.width, allocation.height);
 
@@ -4810,7 +4394,7 @@ draw_button (PsppireSheet *sheet, GdkWindow *window,
     gtk_paint_box (sheet->button->style, window,
 		   button->state, shadow_type,
 		   &allocation, GTK_WIDGET (sheet->button),
-		   "button",
+		   NULL,
 		   allocation.x, allocation.y,
 		   allocation.width, allocation.height);
 
@@ -4828,7 +4412,7 @@ draw_button (PsppireSheet *sheet, GdkWindow *window,
 			 shadow_type,
 			 NULL,
 			 GTK_WIDGET (sheet),
-			 "button",
+			 NULL,
 			 points,
 			 2,
 			 TRUE);