/*
- Copyright (C) 2006, 2008, 2009 Free Software Foundation
+ Copyright (C) 2006, 2008, 2009, 2011 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
#include <config.h>
#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <glib.h>
#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
#include <ui/gui/sheet/psppire-axis.h>
#include <libpspp/misc.h>
-#include <math.h>
-
/* sheet flags */
enum
{
of making a selection - ie while the mouse button is
depressed.
*/
- PSPPIRE_SHEET_IN_SELECTION = 1 << 4,
-
- PSPPIRE_SHEET_IN_RESIZE = 1 << 5
+ PSPPIRE_SHEET_IN_SELECTION = 1 << 4
};
#define PSPPIRE_SHEET_FLAGS(sheet) (PSPPIRE_SHEET (sheet)->flags)
#define PSPPIRE_SHEET_IN_YDRAG(sheet) (PSPPIRE_SHEET_FLAGS (sheet) & PSPPIRE_SHEET_IN_YDRAG)
#define PSPPIRE_SHEET_IN_DRAG(sheet) (PSPPIRE_SHEET_FLAGS (sheet) & PSPPIRE_SHEET_IN_DRAG)
#define PSPPIRE_SHEET_IN_SELECTION(sheet) (PSPPIRE_SHEET_FLAGS (sheet) & PSPPIRE_SHEET_IN_SELECTION)
-#define PSPPIRE_SHEET_IN_RESIZE(sheet) (PSPPIRE_SHEET_FLAGS (sheet) & PSPPIRE_SHEET_IN_RESIZE)
#define CELL_SPACING 1
static void destroy_hover_window (PsppireSheetHoverTitle *);
static PsppireSheetHoverTitle *create_hover_window (void);
-static GtkStateType psppire_sheet_cell_get_state (PsppireSheet *sheet, gint row, gint col);
-
-
static inline void
dispose_string (const PsppireSheet *sheet, gchar *text)
{
}
-static gboolean
+static void
rectangle_from_range (PsppireSheet *sheet, const PsppireSheetRange *range,
GdkRectangle *r)
{
- g_return_val_if_fail (range, FALSE);
+ 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);
- r->x = psppire_axis_start_pixel (sheet->haxis, range->col0);
+ 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, 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);
}
/* 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);
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,
/**
* 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_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));
}
-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
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);
}
psppire_sheet_cell_draw (sheet, i, j);
}
- if (sheet->select_status == GTK_STATE_NORMAL &&
+ if (sheet->select_status == PSPPIRE_SHEET_NORMAL &&
sheet->active_cell.row >= drawing_range.row0 &&
sheet->active_cell.row <= drawing_range.rowi &&
sheet->active_cell.col >= drawing_range.col0 &&
psppire_sheet_show_entry_widget (sheet);
}
-
-
-static inline gint
-safe_strcmp (const gchar *s1, const gchar *s2)
-{
- if ( !s1 && !s2) return 0;
- if ( !s1) return -1;
- if ( !s2) return +1;
- return strcmp (s1, s2);
-}
-
static void
psppire_sheet_set_cell (PsppireSheet *sheet, gint row, gint col,
GtkJustification justification,
old_text = psppire_sheet_model_get_string (model, row, col);
- if (0 != safe_strcmp (old_text, text))
+ if (0 != g_strcmp0 (old_text, text))
{
g_signal_handler_block (sheet->model, sheet->update_handler_id);
psppire_sheet_model_set_string (model, text, row, col);
}
-static GtkStateType
-psppire_sheet_cell_get_state (PsppireSheet *sheet, gint row, gint col)
-{
- PsppireSheetRange *range;
-
- g_return_val_if_fail (sheet != NULL, 0);
- g_return_val_if_fail (PSPPIRE_IS_SHEET (sheet), 0);
- if (col >= psppire_axis_unit_count (sheet->haxis) || row >= psppire_axis_unit_count (sheet->vaxis)) return 0;
- if (col < 0 || row < 0) return 0;
-
- range = &sheet->range;
-
- switch (sheet->select_status)
- {
- case PSPPIRE_SHEET_NORMAL:
- return GTK_STATE_NORMAL;
- break;
- case PSPPIRE_SHEET_ROW_SELECTED:
- if (row >= range->row0 && row <= range->rowi)
- return GTK_STATE_SELECTED;
- break;
- case PSPPIRE_SHEET_COLUMN_SELECTED:
- if (col >= range->col0 && col <= range->coli)
- return GTK_STATE_SELECTED;
- break;
- case PSPPIRE_SHEET_RANGE_SELECTED:
- if (row >= range->row0 && row <= range->rowi && \
- col >= range->col0 && col <= range->coli)
- return GTK_STATE_SELECTED;
- break;
- }
- return GTK_STATE_NORMAL;
-}
-
/* Convert X, Y (in pixels) to *ROW, *COLUMN
If the function returns FALSE, then the results will be unreliable.
*/
PsppireSheetCellAttr attributes;
if (!GTK_WIDGET_VISIBLE (sheet->entry_widget)) return;
- if (sheet->select_status != GTK_STATE_NORMAL) return;
+ if (sheet->select_status != PSPPIRE_SHEET_NORMAL) return;
row = sheet->active_cell.row;
col = sheet->active_cell.col;
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;
+ sheet->select_status = PSPPIRE_SHEET_NORMAL;
- psppire_sheet_real_unselect_range (sheet, NULL);
- sheet->select_status = GTK_STATE_NORMAL;
-}
+ 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);
+ }
-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)
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))
- {
- 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_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
- {
- sheet->select_status = PSPPIRE_SHEET_NORMAL;
- }
+ 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)
if (forbid_move)
{
- if (sheet->select_status == GTK_STATE_NORMAL)
+ if (sheet->select_status == PSPPIRE_SHEET_NORMAL)
return FALSE;
row = sheet->active_cell.row;
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;
}
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_select_range (sheet, &sheet->range);
}
- if (PSPPIRE_SHEET_IN_RESIZE (sheet))
- {
- PsppireSheetRange old_range;
- draw_xor_rectangle (sheet, 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);
-
- old_range = sheet->range;
- sheet->range = sheet->drag_range;
- sheet->drag_range = old_range;
-
- 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 (PSPPIRE_SHEET_IN_SELECTION (sheet))
{
PSPPIRE_SHEET_UNSET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION);
!POSSIBLE_DRAG (sheet, x, y, &row, &column) &&
!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);
new_cursor = GDK_TOP_LEFT_ARROW;
if ( event->window == sheet->sheet_window &&
- ! (POSSIBLE_RESIZE (sheet, x, y, &row, &column) ||
- PSPPIRE_SHEET_IN_RESIZE (sheet)) &&
+ ! (POSSIBLE_RESIZE (sheet, x, y, &row, &column) ) &&
(POSSIBLE_DRAG (sheet, x, y, &row, &column) ||
PSPPIRE_SHEET_IN_DRAG (sheet)) &&
new_cursor != sheet->cursor_drag->type)
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;
return TRUE;
}
- if (PSPPIRE_SHEET_IN_RESIZE (sheet))
- {
- PsppireSheetRange aux;
- gint v_h, current_col, current_row, col_threshold, row_threshold;
- v_h = 1;
- if (abs (x - psppire_axis_start_pixel (sheet->haxis, sheet->drag_cell.col)) >
- abs (y - psppire_axis_start_pixel (sheet->vaxis, sheet->drag_cell.row))) v_h = 2;
-
- current_col = column_from_xpixel (sheet, x);
- current_row = row_from_ypixel (sheet, y);
- column = current_col - sheet->drag_cell.col;
- row = current_row - sheet->drag_cell.row;
-
- /*use half of column width resp. row height as threshold to
- expand selection*/
- col_threshold = psppire_axis_start_pixel (sheet->haxis, current_col) +
- psppire_axis_unit_size (sheet->haxis, current_col) / 2;
- if (column > 0)
- {
- if (x < col_threshold)
- column -= 1;
- }
- else if (column < 0)
- {
- if (x > col_threshold)
- column +=1;
- }
- row_threshold = psppire_axis_start_pixel (sheet->vaxis, current_row) +
- psppire_axis_unit_size (sheet->vaxis, current_row)/2;
- if (row > 0)
- {
- if (y < row_threshold)
- row -= 1;
- }
- else if (row < 0)
- {
- if (y > row_threshold)
- row +=1;
- }
-
- 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;
-
- if (v_h == 1)
- column = 0;
- else
- row = 0;
-
- if (aux.row0 + row >= 0 && aux.rowi + row < psppire_axis_unit_count (sheet->vaxis) &&
- aux.col0 + column >= 0 && aux.coli + column < psppire_axis_unit_count (sheet->haxis))
- {
- aux = sheet->drag_range;
- sheet->drag_range = sheet->range;
-
- if (row < 0) sheet->drag_range.row0 = sheet->range.row0 + row;
- if (row > 0) sheet->drag_range.rowi = sheet->range.rowi + row;
- if (column < 0) sheet->drag_range.col0 = sheet->range.col0 + column;
- if (column > 0) sheet->drag_range.coli = sheet->range.coli + column;
-
- if (aux.row0 != sheet->drag_range.row0 ||
- aux.rowi != sheet->drag_range.rowi ||
- aux.col0 != sheet->drag_range.col0 ||
- aux.coli != sheet->drag_range.coli)
- {
- draw_xor_rectangle (sheet, aux);
- draw_xor_rectangle (sheet, sheet->drag_range);
- }
- }
- return TRUE;
- }
-
psppire_sheet_get_pixel_info (sheet, x, y, &row, &column);
if (sheet->select_status == PSPPIRE_SHEET_NORMAL && row == sheet->active_cell.row &&
{
if (PSPPIRE_SHEET_IN_SELECTION (sheet) )
{
- GdkRectangle area;
+ /* Redraw the old range */
+ psppire_sheet_unselect_range (sheet);
+
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);
+ /* Redraw the new range */
+ psppire_sheet_select_range (sheet, &sheet->range);
}
else
{
}
+/* 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,
if ( ! GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
return;
- psppire_sheet_real_unselect_range (sheet, NULL);
+ psppire_sheet_unselect_range (sheet);
}
static void
projects / pspp / blobdiff