/*
- Copyright (C) 2006, 2008, 2009 Free Software Foundation
+ Copyright (C) 2006, 2008, 2009, 2011, 2012 Free Software Foundation
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
}
-static gboolean
-rectangle_from_range (PsppireSheet *sheet, const PsppireSheetRange *input,
+static void
+rectangle_from_range (PsppireSheet *sheet, const PsppireSheetRange *range,
GdkRectangle *r)
{
- PsppireSheetRange range = *input;
+ gint col0 = MIN (range->col0, range->coli);
+ gint coli = MAX (range->col0, range->coli);
+ gint row0 = MIN (range->row0, range->rowi);
+ gint rowi = MAX (range->row0, range->rowi);
- 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);
+ if ( row0 == -1 ) row0 = min_visible_row (sheet);
+ if ( rowi == -1 ) rowi = max_visible_row (sheet);
+ if ( col0 == -1 ) col0 = min_visible_column (sheet);
+ if ( coli == -1 ) coli = max_visible_column (sheet);
- r->x = psppire_axis_start_pixel (sheet->haxis, range.col0);
+ r->x = psppire_axis_start_pixel (sheet->haxis, 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, 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, coli) -
+ psppire_axis_start_pixel (sheet->haxis, col0) +
+ psppire_axis_unit_size (sheet->haxis, 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, rowi) -
+ psppire_axis_start_pixel (sheet->vaxis, row0) +
+ psppire_axis_unit_size (sheet->vaxis, rowi);
if ( sheet->column_titles_visible)
{
{
r->x += sheet->row_title_area.width;
}
-
- return TRUE;
}
-static gboolean
+static void
rectangle_from_cell (PsppireSheet *sheet, gint row, gint col,
GdkRectangle *r)
{
PsppireSheetRange range;
- g_return_val_if_fail (row >= 0, FALSE);
- g_return_val_if_fail (col >= 0, FALSE);
+ g_return_if_fail (row >= 0);
+ g_return_if_fail (col >= 0);
range.row0 = range.rowi = row;
range.col0 = range.coli = col;
- return rectangle_from_range (sheet, &range, r);
+ rectangle_from_range (sheet, &range, r);
}
static void psppire_sheet_class_init (PsppireSheetClass *klass);
static void psppire_sheet_init (PsppireSheet *sheet);
static void psppire_sheet_dispose (GObject *object);
-static void psppire_sheet_finalize (GObject *object);
static void psppire_sheet_style_set (GtkWidget *widget,
GtkStyle *previous_style);
static void psppire_sheet_realize (GtkWidget *widget);
static void size_allocate_global_button (PsppireSheet *sheet);
-static void psppire_sheet_button_size_request (PsppireSheet *sheet,
- const PsppireSheetButton *button,
- GtkRequisition *requisition);
static void psppire_sheet_real_cell_clear (PsppireSheet *sheet,
gint row,
container_class->set_focus_child = NULL;
object_class->dispose = psppire_sheet_dispose;
- object_class->finalize = psppire_sheet_finalize;
cell_padding_spec =
g_param_spec_boxed ("cell-padding",
void
-psppire_sheet_change_entry (PsppireSheet *sheet, GtkType entry_type)
+psppire_sheet_change_entry (PsppireSheet *sheet, GType entry_type)
{
g_return_if_fail (sheet != NULL);
g_return_if_fail (PSPPIRE_IS_SHEET (sheet));
return TRUE;
}
-static void
-psppire_sheet_finalize (GObject *object)
-{
- PsppireSheet *sheet;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (PSPPIRE_IS_SHEET (object));
-
- sheet = PSPPIRE_SHEET (object);
-
- if (G_OBJECT_CLASS (parent_class)->finalize)
- (*G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
static void
psppire_sheet_dispose (GObject *object)
{
void
psppire_sheet_unselect_range (PsppireSheet *sheet)
{
- 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);
+ if (sheet->sheet_window != NULL)
+ {
+ GdkRectangle area;
+
+ rectangle_from_range (sheet, &sheet->range, &area);
+ area.x++;
+ area.y++;
+ gdk_window_invalidate_rect (sheet->sheet_window, &area, FALSE);
+ }
g_signal_emit (sheet, sheet_signals [SELECT_COLUMN], 0, -1);
g_signal_emit (sheet, sheet_signals [SELECT_ROW], 0, -1);
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
-
- {
- GdkRectangle area;
+ GdkRectangle area;
- rectangle_from_range (sheet, &sheet->range, &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
+ gdk_draw_rectangle (sheet->sheet_window,
+ sheet->xor_gc,
+ TRUE,
+ area.x + 1, area.y + 1,
+ area.width, area.height);
}
sheet->range.row0 = 0;
sheet->range.col0 = 0;
sheet->range.rowi = psppire_axis_unit_count (sheet->vaxis) - 1;
- sheet->range.coli =
- psppire_axis_unit_count (sheet->haxis) - 1;
- psppire_sheet_select_range (sheet, NULL);
+ sheet->range.coli = psppire_axis_unit_count (sheet->haxis) - 1;
return TRUE;
}
}
+/* Move to row 0 keeping the current column */
+static void
+row0 (PsppireSheet *sheet)
+{
+ gtk_adjustment_set_value (sheet->vadjustment,
+ sheet->vadjustment->lower);
+
+ change_active_cell (sheet, 0, sheet->active_cell.col);
+}
+
+/* Move to column 0 keeping the current row */
+static void
+col0 (PsppireSheet *sheet)
+{
+ gtk_adjustment_set_value (sheet->hadjustment,
+ sheet->hadjustment->lower);
+
+ change_active_cell (sheet, sheet->active_cell.row, 0);
+}
+
+/* Move to last column keeping the current row */
+static void
+col_last (PsppireSheet *sheet)
+{
+ glong last_col = psppire_axis_unit_count (sheet->haxis) - 1;
+
+ gtk_adjustment_set_value (sheet->hadjustment,
+ sheet->hadjustment->upper - sheet->hadjustment->page_size);
+
+ change_active_cell (sheet, sheet->active_cell.row,
+ last_col);
+}
+
+
+/* Move to last row keeping the current column */
+static void
+row_last (PsppireSheet *sheet)
+{
+ glong last_row = psppire_axis_unit_count (sheet->vaxis) - 1;
+
+ gtk_adjustment_set_value (sheet->vadjustment,
+ sheet->vadjustment->upper- sheet->vadjustment->page_size);
+
+ change_active_cell (sheet,
+ last_row,
+ sheet->active_cell.col);
+}
+
+
+
static gboolean
psppire_sheet_key_press (GtkWidget *widget,
GdkEventKey *key)
case GDK_Tab:
step_sheet (sheet, GTK_SCROLL_STEP_FORWARD);
break;
+
case GDK_Right:
- step_sheet (sheet, GTK_SCROLL_STEP_RIGHT);
+ if (key->state & GDK_CONTROL_MASK)
+ col_last (sheet);
+ else
+ step_sheet (sheet, GTK_SCROLL_STEP_RIGHT);
break;
+
case GDK_ISO_Left_Tab:
step_sheet (sheet, GTK_SCROLL_STEP_BACKWARD);
break;
+
case GDK_Left:
- step_sheet (sheet, GTK_SCROLL_STEP_LEFT);
+ if (key->state & GDK_CONTROL_MASK)
+ col0 (sheet);
+ else
+ step_sheet (sheet, GTK_SCROLL_STEP_LEFT);
break;
+
case GDK_Return:
- case GDK_Down:
step_sheet (sheet, GTK_SCROLL_STEP_DOWN);
break;
+
+ case GDK_Down:
+ if (key->state & GDK_CONTROL_MASK)
+ row_last (sheet);
+ else
+ step_sheet (sheet, GTK_SCROLL_STEP_DOWN);
+ break;
+
case GDK_Up:
- step_sheet (sheet, GTK_SCROLL_STEP_UP);
+ if (key->state & GDK_CONTROL_MASK)
+ row0 (sheet);
+ else
+ step_sheet (sheet, GTK_SCROLL_STEP_UP);
break;
case GDK_Page_Down:
break;
case GDK_Home:
- gtk_adjustment_set_value (sheet->vadjustment,
- sheet->vadjustment->lower);
-
- change_active_cell (sheet, 0,
- sheet->active_cell.col);
-
+ col0 (sheet);
break;
case GDK_End:
- gtk_adjustment_set_value (sheet->vadjustment,
- sheet->vadjustment->upper -
- sheet->vadjustment->page_size -
- sheet->vadjustment->page_increment);
-
- /*
- change_active_cellx (sheet,
- psppire_axis_unit_count (sheet->vaxis) - 1,
- sheet->active_cell.col);
- */
+ col_last (sheet);
break;
+
case GDK_Delete:
psppire_sheet_real_cell_clear (sheet, sheet->active_cell.row, sheet->active_cell.col);
break;
+
default:
return FALSE;
break;
GdkRectangle allocation)
{
GtkShadowType shadow_type;
- gint text_width = 0, text_height = 0;
+ gint text_width = 0;
PangoAlignment align = PANGO_ALIGN_LEFT;
gboolean rtl ;
if (button->label_visible)
{
- text_height = DEFAULT_ROW_HEIGHT -
- 2 * COLUMN_TITLES_HEIGHT;
-
gdk_gc_set_clip_rectangle (GTK_WIDGET (sheet)->style->fg_gc[button->state],
&allocation);
gdk_gc_set_clip_rectangle (GTK_WIDGET (sheet)->style->white_gc,
return TRUE;
}
-static void
-psppire_sheet_button_size_request (PsppireSheet *sheet,
- const PsppireSheetButton *button,
- GtkRequisition *button_requisition)
-{
- GtkRequisition requisition;
- GtkRequisition label_requisition;
-
- label_requisition.height = DEFAULT_ROW_HEIGHT;
- label_requisition.width = COLUMN_MIN_WIDTH;
-
- requisition.height = DEFAULT_ROW_HEIGHT;
- requisition.width = COLUMN_MIN_WIDTH;
-
-
- *button_requisition = requisition;
- button_requisition->width = MAX (requisition.width, label_requisition.width);
- button_requisition->height = MAX (requisition.height, label_requisition.height);
-
-}
-
static void
psppire_sheet_forall (GtkContainer *container,
gboolean include_internals,
projects / pspp / blobdiff