static gboolean
-rectangle_from_range (PsppireSheet *sheet, const PsppireSheetRange *range,
+rectangle_from_range (PsppireSheet *sheet, const PsppireSheetRange *input,
GdkRectangle *r)
{
- g_return_val_if_fail (range, FALSE);
+ PsppireSheetRange range = *input;
- r->x = psppire_axis_start_pixel (sheet->haxis, range->col0);
+ if ( range.row0 == -1 ) range.row0 = min_visible_row (sheet);
+ if ( range.rowi == -1 ) range.rowi = max_visible_row (sheet);
+ if ( range.col0 == -1 ) range.col0 = min_visible_column (sheet);
+ if ( range.coli == -1 ) range.coli = max_visible_column (sheet);
+
+ r->x = psppire_axis_start_pixel (sheet->haxis, range.col0);
r->x -= round (sheet->hadjustment->value);
- r->y = psppire_axis_start_pixel (sheet->vaxis, range->row0);
+ r->y = psppire_axis_start_pixel (sheet->vaxis, range.row0);
r->y -= round (sheet->vadjustment->value);
- 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);
+ 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);
- r->height = psppire_axis_start_pixel (sheet->vaxis, range->rowi) -
- psppire_axis_start_pixel (sheet->vaxis, range->row0) +
- psppire_axis_unit_size (sheet->vaxis, range->rowi);
+ r->height = psppire_axis_start_pixel (sheet->vaxis, range.rowi) -
+ psppire_axis_start_pixel (sheet->vaxis, range.row0) +
+ psppire_axis_unit_size (sheet->vaxis, range.rowi);
if ( sheet->column_titles_visible)
{
/* 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_draw_border (PsppireSheet *sheet,
PsppireSheetRange range);
/**
* PsppireSheet::select-row
* @sheet: the sheet widget that emitted the signal
- * @row: the newly selected row index
+ * @row: the newly selected row index, or -1 if no row is selected.
*
* A row has been selected.
*/
/**
* PsppireSheet::select - column
* @sheet: the sheet widget that emitted the signal
- * @column: the newly selected column index
+ * @column: the newly selected column index, or -1 if no column is selected.
*
* A column has been selected.
*/
sheet->vaxis = NULL;
sheet->flags = 0;
- sheet->selection_mode = GTK_SELECTION_NONE;
sheet->select_status = PSPPIRE_SHEET_NORMAL;
GTK_WIDGET_UNSET_FLAGS (sheet, GTK_NO_WINDOW);
}
-void
-psppire_sheet_select_row (PsppireSheet *sheet, gint row)
-{
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (PSPPIRE_IS_SHEET (sheet));
-
- if (row < 0 || row >= psppire_axis_unit_count (sheet->vaxis))
- return;
-
- if (sheet->select_status != PSPPIRE_SHEET_NORMAL)
- psppire_sheet_real_unselect_range (sheet, NULL);
-
- 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;
-
- g_signal_emit (sheet, sheet_signals[SELECT_ROW], 0, row);
- psppire_sheet_real_select_range (sheet, NULL);
-}
-
-
-void
-psppire_sheet_select_column (PsppireSheet *sheet, gint column)
-{
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (PSPPIRE_IS_SHEET (sheet));
-
- if (column < 0 || column >= psppire_axis_unit_count (sheet->haxis))
- return;
-
- if (sheet->select_status != PSPPIRE_SHEET_NORMAL)
- psppire_sheet_real_unselect_range (sheet, NULL);
-
- 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;
-
- g_signal_emit (sheet, sheet_signals[SELECT_COLUMN], 0, column);
- psppire_sheet_real_select_range (sheet, NULL);
-}
-
-
static gboolean
gdk_gc_set_clip_rectangle (sheet->xor_gc, NULL);
}
+\f
-static void
-psppire_sheet_real_select_range (PsppireSheet *sheet,
- const PsppireSheetRange *range)
-{
- g_return_if_fail (sheet != NULL);
+/* Selection related functions */
- if (range == NULL) range = &sheet->range;
+void
+psppire_sheet_select_row (PsppireSheet *sheet, gint row)
+{
+ GdkRectangle area;
+ sheet->select_status = PSPPIRE_SHEET_ROW_SELECTED;
- memcpy (&sheet->range, range, sizeof (*range));
+ sheet->range.col0 = sheet->range.coli = -1;
+ sheet->range.row0 = sheet->range.rowi = row;
- if (range->row0 < 0 || range->rowi < 0) return;
- if (range->col0 < 0 || range->coli < 0) return;
+ rectangle_from_range (sheet, &sheet->range, &area);
+ area.x++;
+ area.y++;
- psppire_sheet_update_primary_selection (sheet);
+ gdk_window_invalidate_rect (sheet->sheet_window, &area, FALSE);
- g_signal_emit (sheet, sheet_signals[SELECT_RANGE], 0, &sheet->range);
+ g_signal_emit (sheet, sheet_signals [SELECT_ROW], 0, row);
}
-
void
-psppire_sheet_get_selected_range (PsppireSheet *sheet, PsppireSheetRange *range)
+psppire_sheet_select_column (PsppireSheet *sheet, gint column)
{
- g_return_if_fail (sheet != NULL);
- *range = sheet->range;
-}
+ GdkRectangle area;
+ sheet->select_status = PSPPIRE_SHEET_COLUMN_SELECTED;
+ sheet->range.col0 = sheet->range.coli = column;
+ sheet->range.row0 = sheet->range.rowi = -1;
-void
-psppire_sheet_select_range (PsppireSheet *sheet, const PsppireSheetRange *range)
-{
- g_return_if_fail (sheet != NULL);
+ rectangle_from_range (sheet, &sheet->range, &area);
+ area.x++;
+ area.y++;
- if (range == NULL) range=&sheet->range;
+ gdk_window_invalidate_rect (sheet->sheet_window, &area, FALSE);
- if (range->row0 < 0 || range->rowi < 0) return;
- if (range->col0 < 0 || range->coli < 0) return;
+ g_signal_emit (sheet, sheet_signals [SELECT_COLUMN], 0, column);
+}
- if (sheet->select_status != PSPPIRE_SHEET_NORMAL)
- psppire_sheet_real_unselect_range (sheet, NULL);
+void
+psppire_sheet_select_range (PsppireSheet *sheet, const PsppireSheetRange *range)
+{
+ GdkRectangle area;
+ sheet->select_status = PSPPIRE_SHEET_RANGE_SELECTED;
- sheet->range.row0 = range->row0;
- sheet->range.rowi = range->rowi;
- sheet->range.col0 = range->col0;
- sheet->range.coli = range->coli;
+ sheet->range = *range;
- sheet->select_status = PSPPIRE_SHEET_RANGE_SELECTED;
- psppire_sheet_real_select_range (sheet, NULL);
+ rectangle_from_range (sheet, range, &area);
+ area.x++;
+ area.y++;
+ gdk_window_invalidate_rect (sheet->sheet_window, &area, FALSE);
}
+
void
psppire_sheet_unselect_range (PsppireSheet *sheet)
{
- if (! GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
- return;
-
- psppire_sheet_real_unselect_range (sheet, NULL);
+ GdkRectangle area;
sheet->select_status = PSPPIRE_SHEET_NORMAL;
-}
+ rectangle_from_range (sheet, &sheet->range, &area);
+ area.x++;
+ area.y++;
+ gdk_window_invalidate_rect (sheet->sheet_window, &area, FALSE);
-static void
-psppire_sheet_real_unselect_range (PsppireSheet *sheet,
- const PsppireSheetRange *range)
+ g_signal_emit (sheet, sheet_signals [SELECT_COLUMN], 0, -1);
+ g_signal_emit (sheet, sheet_signals [SELECT_ROW], 0, -1);
+}
+
+void
+psppire_sheet_get_selected_range (PsppireSheet *sheet, PsppireSheetRange *range)
{
g_return_if_fail (sheet != NULL);
- g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)));
-
- if ( range == NULL)
- range = &sheet->range;
-
- if (range->row0 < 0 || range->rowi < 0) return;
- if (range->col0 < 0 || range->coli < 0) return;
-
- g_signal_emit (sheet, sheet_signals[SELECT_COLUMN], 0, -1);
- g_signal_emit (sheet, sheet_signals[SELECT_ROW], 0, -1);
-
- sheet->range.row0 = -1;
- sheet->range.rowi = -1;
- sheet->range.col0 = -1;
- sheet->range.coli = -1;
+ *range = sheet->range;
}
-
+\f
static gint
psppire_sheet_expose (GtkWidget *widget, GdkEventExpose *event)
psppire_sheet_range_draw (sheet, &sheet->drag_range);
#endif
- if (psppire_sheet_range_isvisible (sheet, &sheet->range))
{
GdkRectangle area;
sheet_signals[DOUBLE_CLICK_COLUMN], 0, column);
}
}
- else if (event->window == sheet->row_title_window)
+
+ if (event->window == sheet->row_title_window)
{
g_signal_emit (sheet,
sheet_signals[BUTTON_EVENT_ROW], 0,
NULL, NULL, event->time);
gtk_grab_add (GTK_WIDGET (sheet));
- if (psppire_sheet_click_cell (sheet, row, column))
+ if ( sheet->select_status == PSPPIRE_SHEET_NORMAL)
{
- if ( sheet->select_status == PSPPIRE_SHEET_NORMAL)
- {
- sheet->range.row0 = row;
- sheet->range.col0 = column;
- }
- else
- {
- GdkRectangle area;
- sheet->select_status = PSPPIRE_SHEET_NORMAL;
-
- rectangle_from_range (sheet, &sheet->range, &area);
- area.x++;
- area.y++;
- gdk_window_invalidate_rect (sheet->sheet_window, &area, FALSE);
- }
+ sheet->range.row0 = row;
+ sheet->range.col0 = column;
}
+ else
+ {
+ psppire_sheet_unselect_range (sheet);
+ }
+ psppire_sheet_click_cell (sheet, row, column);
}
if (event->window == sheet->column_title_window)
PSPPIRE_SHEET_UNSET_FLAGS (sheet, PSPPIRE_SHEET_IN_DRAG);
gdk_display_pointer_ungrab (display, event->time);
- psppire_sheet_real_unselect_range (sheet, NULL);
+ psppire_sheet_unselect_range (sheet);
old_range = sheet->range;
sheet->range = sheet->drag_range;
PSPPIRE_SHEET_UNSET_FLAGS (sheet, PSPPIRE_SHEET_IN_RESIZE);
gdk_display_pointer_ungrab (display, event->time);
- psppire_sheet_real_unselect_range (sheet, NULL);
+ psppire_sheet_unselect_range (sheet);
old_range = sheet->range;
sheet->range = sheet->drag_range;
gdk_window_set_cursor (sheet->sheet_window, sheet->cursor_drag);
}
- new_cursor = GDK_SIZING;
- if ( event->window == sheet->sheet_window &&
- sheet->selection_mode != GTK_SELECTION_NONE &&
- !PSPPIRE_SHEET_IN_DRAG (sheet) &&
- (POSSIBLE_RESIZE (sheet, x, y, &row, &column) ||
- PSPPIRE_SHEET_IN_RESIZE (sheet)) &&
- new_cursor != sheet->cursor_drag->type)
- {
- gdk_cursor_unref (sheet->cursor_drag);
- sheet->cursor_drag = gdk_cursor_new_for_display (display, GDK_SIZING);
- gdk_window_set_cursor (sheet->sheet_window, sheet->cursor_drag);
- }
-
-
gdk_window_get_pointer (widget->window, &x, &y, &mods);
if (! (mods & GDK_BUTTON1_MASK)) return FALSE;
{
if (PSPPIRE_SHEET_IN_SELECTION (sheet) )
{
- GdkRectangle area;
-
/* Redraw the old range */
- rectangle_from_range (sheet, &sheet->range, &area);
- area.x++;
- area.y++;
- gdk_window_invalidate_rect (sheet->sheet_window, &area, FALSE);
+ psppire_sheet_unselect_range (sheet);
sheet->range.rowi = row;
sheet->range.coli = column;
- sheet->select_status = PSPPIRE_SHEET_RANGE_SELECTED;
/* Redraw the new range */
- rectangle_from_range (sheet, &sheet->range, &area);
- area.x++;
- area.y++;
- gdk_window_invalidate_rect (sheet->sheet_window, &area, FALSE);
+ psppire_sheet_select_range (sheet, &sheet->range);
}
else
{
if ( ! GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
return;
- psppire_sheet_real_unselect_range (sheet, NULL);
+ psppire_sheet_unselect_range (sheet);
}
static void