-#define GLIB_DISABLE_DEPRECATED 1
-#define GDK_DISABLE_DEPRECATED 1
-#define GTK_DISABLE_DEPRECATED 1
/*
* Copyright (C) 2006, 2008 Free Software Foundation
*
#include "gtksheet.h"
#include "gtkextra-marshal.h"
#include "gsheetmodel.h"
+#include <libpspp/misc.h>
+#include <math.h>
/* sheet flags */
enum
{
- GTK_SHEET_REDRAW_PENDING = 1 << 0,
GTK_SHEET_IN_XDRAG = 1 << 1,
GTK_SHEET_IN_YDRAG = 1 << 2,
GTK_SHEET_IN_DRAG = 1 << 3,
#define GTK_SHEET_IN_DRAG(sheet) (GTK_SHEET_FLAGS (sheet) & GTK_SHEET_IN_DRAG)
#define GTK_SHEET_IN_SELECTION(sheet) (GTK_SHEET_FLAGS (sheet) & GTK_SHEET_IN_SELECTION)
#define GTK_SHEET_IN_RESIZE(sheet) (GTK_SHEET_FLAGS (sheet) & GTK_SHEET_IN_RESIZE)
-#define GTK_SHEET_REDRAW_PENDING(sheet) (GTK_SHEET_FLAGS (sheet) & GTK_SHEET_REDRAW_PENDING)
#define CELL_SPACING 1
#define COLUMN_MIN_WIDTH 10
#define COLUMN_TITLES_HEIGHT 4
#define DEFAULT_COLUMN_WIDTH 80
+#define DEFAULT_ROW_HEIGHT 25
static void gtk_sheet_update_primary_selection (GtkSheet *sheet);
static void gtk_sheet_column_title_button_draw (GtkSheet *sheet, gint column);
g_free (text);
}
-static guint
-default_row_height (const GtkSheet *sheet)
-{
- GtkWidget *widget = GTK_WIDGET (sheet);
-
- if (!widget->style->font_desc) return 25;
- else
- {
- PangoContext *context = gtk_widget_get_pango_context (widget);
- PangoFontMetrics *metrics =
- pango_context_get_metrics (context,
- widget->style->font_desc,
- pango_context_get_language (context));
-
- guint val = pango_font_metrics_get_descent (metrics) +
- pango_font_metrics_get_ascent (metrics);
-
- pango_font_metrics_unref (metrics);
-
- return PANGO_PIXELS (val) + 2 * COLUMN_TITLES_HEIGHT;
- }
-}
-
static
guint STRING_WIDTH (GtkWidget *widget,
const PangoFontDescription *font, const gchar *text)
{
GSheetRow *geo = sheet->row_geometry;
- if (y < 0)
- {
- g_error ("This shouldnt happen");
- return -1;
- }
+ g_return_val_if_fail (y >= 0, -1);
return g_sheet_row_pixel_to_row (geo, y);
}
-
+/* Return the lowest row number which is wholly or partially on
+ the visible range of the sheet */
static inline glong
min_visible_row (const GtkSheet *sheet)
{
return yyy_row_ypixel_to_row (sheet, sheet->vadjustment->value);
}
+static inline glong
+min_fully_visible_row (const GtkSheet *sheet)
+{
+ glong row = yyy_row_ypixel_to_row (sheet, sheet->vadjustment->value);
+
+ if ( g_sheet_row_start_pixel (sheet->row_geometry, row) < sheet->vadjustment->value)
+ row++;
+
+ return row;
+}
+
+
static inline glong
max_visible_row (const GtkSheet *sheet)
}
+static inline glong
+max_fully_visible_row (const GtkSheet *sheet)
+{
+ glong row = max_visible_row (sheet);
+
+ if ( g_sheet_row_start_pixel (sheet->row_geometry, row)
+ +
+ g_sheet_row_get_height (sheet->row_geometry, row)
+ > sheet->vadjustment->value)
+ row--;
+
+ return row;
+}
+
+
/* returns the column index from a x pixel location */
static inline gint
column_from_xpixel (const GtkSheet *sheet, gint x)
}
+/* Returns the lowest column number which is wholly or partially
+ on the sheet */
static inline glong
min_visible_column (const GtkSheet *sheet)
{
return column_from_xpixel (sheet, sheet->hadjustment->value);
}
+static inline glong
+min_fully_visible_column (const GtkSheet *sheet)
+{
+ glong col = min_visible_column (sheet);
+
+ if ( g_sheet_column_start_pixel (sheet->column_geometry, col) < sheet->hadjustment->value)
+ col++;
+
+ return col;
+}
+
+/* Returns the highest column number which is wholly or partially
+ on the sheet */
static inline glong
max_visible_column (const GtkSheet *sheet)
{
sheet->hadjustment->page_size);
}
+static inline glong
+max_fully_visible_column (const GtkSheet *sheet)
+{
+ glong col = max_visible_column (sheet);
+
+ if ( g_sheet_column_start_pixel (sheet->column_geometry, col)
+ +
+ g_sheet_column_get_width (sheet->column_geometry, col)
+ > sheet->hadjustment->value)
+ col--;
+
+ return col;
+}
+
+
/* The size of the region (in pixels) around the row/column boundaries
where the height/width may be grabbed to change size */
g_return_val_if_fail (range, FALSE);
r->x = g_sheet_column_start_pixel (sheet->column_geometry, range->col0);
- r->x -= sheet->hadjustment->value;
+ r->x -= round (sheet->hadjustment->value);
if ( sheet->row_titles_visible)
r->x += sheet->row_title_area.width;
r->y = g_sheet_row_start_pixel (sheet->row_geometry, range->row0);
- r->y -= sheet->vadjustment->value;
+ r->y -= round (sheet->vadjustment->value);
if ( sheet->column_titles_visible)
r->y += sheet->column_title_area.height;
/* Selection */
-static gboolean gtk_sheet_move_query (GtkSheet *sheet,
- gint row, gint column);
static void gtk_sheet_real_select_range (GtkSheet *sheet,
const GtkSheetRange *range);
static void gtk_sheet_real_unselect_range (GtkSheet *sheet,
static void gtk_sheet_entry_changed (GtkWidget *widget,
gpointer data);
-static void gtk_sheet_deactivate_cell (GtkSheet *sheet);
static void gtk_sheet_hide_active_cell (GtkSheet *sheet);
-static gboolean gtk_sheet_activate_cell (GtkSheet *sheet,
- gint row, gint col);
+static void change_active_cell (GtkSheet *sheet,
+ gint row, gint col);
static void gtk_sheet_draw_active_cell (GtkSheet *sheet);
static void gtk_sheet_show_active_cell (GtkSheet *sheet);
static gboolean gtk_sheet_click_cell (GtkSheet *sheet,
RESIZE_RANGE,
MOVE_RANGE,
TRAVERSE,
- DEACTIVATE,
ACTIVATE,
CHANGED,
LAST_SIGNAL
return sheet_type;
}
+\f
+
static GtkSheetRange*
gtk_sheet_range_copy (const GtkSheetRange *range)
{
return sheet_range_type;
}
+static GtkSheetCell*
+gtk_sheet_cell_copy (const GtkSheetCell *cell)
+{
+ GtkSheetCell *new_cell;
+
+ g_return_val_if_fail (cell != NULL, NULL);
+
+ new_cell = g_new (GtkSheetCell, 1);
+
+ *new_cell = *cell;
+
+ return new_cell;
+}
+
+static void
+gtk_sheet_cell_free (GtkSheetCell *cell)
+{
+ g_return_if_fail (cell != NULL);
+
+ g_free (cell);
+}
+
+GType
+gtk_sheet_cell_get_type (void)
+{
+ static GType sheet_cell_type = 0;
+
+ if (!sheet_cell_type)
+ {
+ sheet_cell_type =
+ g_boxed_type_register_static ("GtkSheetCell",
+ (GBoxedCopyFunc) gtk_sheet_cell_copy,
+ (GBoxedFreeFunc) gtk_sheet_cell_free);
+ }
+
+ return sheet_cell_type;
+}
+\f
static void column_titles_changed (GtkWidget *w, gint first, gint n_columns,
gpointer data);
G_SIGNAL_RUN_LAST,
offsetof (GtkSheetClass, traverse),
NULL, NULL,
- gtkextra_BOOLEAN__INT_INT_POINTER_POINTER,
- G_TYPE_BOOLEAN, 4, G_TYPE_INT, G_TYPE_INT,
- G_TYPE_POINTER, G_TYPE_POINTER);
-
+ gtkextra_BOOLEAN__BOXED_POINTER,
+ G_TYPE_BOOLEAN, 2,
+ GTK_TYPE_SHEET_CELL,
+ G_TYPE_POINTER);
- sheet_signals[DEACTIVATE] =
- g_signal_new ("deactivate",
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST,
- offsetof (GtkSheetClass, deactivate),
- NULL, NULL,
- gtkextra_VOID__INT_INT,
- G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
sheet_signals[ACTIVATE] =
g_signal_new ("activate",
G_SIGNAL_RUN_LAST,
offsetof (GtkSheetClass, activate),
NULL, NULL,
- gtkextra_BOOLEAN__INT_INT,
- G_TYPE_BOOLEAN, 2, G_TYPE_INT, G_TYPE_INT);
+ gtkextra_VOID__INT_INT_INT_INT,
+ G_TYPE_NONE, 4,
+ G_TYPE_INT, G_TYPE_INT,
+ G_TYPE_INT, G_TYPE_INT);
sheet_signals[CHANGED] =
g_signal_new ("changed",
klass->resize_range = NULL;
klass->move_range = NULL;
klass->traverse = NULL;
- klass->deactivate = NULL;
klass->activate = NULL;
klass->changed = NULL;
}
sheet->column_title_area.x = 0;
sheet->column_title_area.y = 0;
sheet->column_title_area.width = 0;
- sheet->column_title_area.height = default_row_height (sheet);
+ sheet->column_title_area.height = DEFAULT_ROW_HEIGHT;
sheet->row_title_window = NULL;
sheet->row_title_area.x = 0;
sheet->sheet_window = NULL;
sheet->entry_widget = NULL;
sheet->entry_container = NULL;
+ sheet->entry_handler_id = 0;
sheet->button = NULL;
sheet->hadjustment = NULL;
adjust_scrollbars (sheet);
if (sheet->active_cell.col >= model_columns)
- gtk_sheet_activate_cell (sheet, sheet->active_cell.row, model_columns - 1);
+ change_active_cell (sheet, sheet->active_cell.row, model_columns - 1);
for (i = first_column; i <= max_visible_column (sheet); i++)
gtk_sheet_column_title_button_draw (sheet, i);
adjust_scrollbars (sheet);
if (sheet->active_cell.row >= model_rows)
- gtk_sheet_activate_cell (sheet, model_rows - 1, sheet->active_cell.col);
+ change_active_cell (sheet, model_rows - 1, sheet->active_cell.col);
for (i = first_row; i <= max_visible_row (sheet); i++)
gtk_sheet_row_title_button_draw (sheet, i);
range.rowi = rowi;
range.coli = coli;
- if ( max_visible_row (sheet) >
- g_sheet_model_get_row_count (sheet->model)
+ if ( !GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
+ return;
+
+ if ( max_visible_row (sheet) > g_sheet_model_get_row_count (sheet->model)
||
- max_visible_column (sheet) >
- g_sheet_model_get_column_count (sheet->model))
+ max_visible_column (sheet) > g_sheet_model_get_column_count (sheet->model))
{
- gtk_sheet_move_query (sheet, 0, 0);
+ gtk_sheet_moveto (sheet, 0, 0, 0, 0);
}
if ( ( row0 < 0 && col0 < 0 ) || ( rowi < 0 && coli < 0 ) )
if (state == GTK_SHEET_NORMAL)
{
gtk_sheet_show_active_cell (sheet);
- g_signal_connect (gtk_sheet_get_entry (sheet),
- "changed",
- G_CALLBACK (gtk_sheet_entry_changed),
- sheet);
}
+
}
void
if (text_width > g_sheet_column_get_width (sheet->column_geometry, column) )
{
gtk_sheet_set_column_width (sheet, column, text_width);
- GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_REDRAW_PENDING);
}
}
}
+/* Scroll the sheet so that the cell ROW, COLUMN is visible.
+ If {ROW,COL}_ALIGN is zero, then the cell will be placed
+ at the {top,left} of the sheet. If it's 1, then it'll
+ be placed at the {bottom,right}.
+ ROW or COL may be -1, in which case scrolling in that dimension
+ does not occur.
+ */
void
gtk_sheet_moveto (GtkSheet *sheet,
gint row,
- gint column,
+ gint col,
gfloat row_align,
gfloat col_align)
{
- gint x, y;
gint width, height;
- gint adjust;
- gint min_row, min_col;
-
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (GTK_IS_SHEET (sheet));
- g_return_if_fail (sheet->hadjustment != NULL);
- g_return_if_fail (sheet->vadjustment != NULL);
- if (row < 0 || row >= g_sheet_row_get_row_count (sheet->row_geometry))
- return;
- if (column < 0 || column >= g_sheet_column_get_column_count (sheet->column_geometry))
- return;
-
- gdk_drawable_get_size (sheet->sheet_window, &width, &height);
-
- /* adjust vertical scrollbar */
- if (row >= 0 && row_align >= 0.0)
- {
- y = g_sheet_row_start_pixel (sheet->row_geometry, row)
- - (gint) ( row_align * height + (1.0 - row_align)
- * g_sheet_row_get_height (sheet->row_geometry, row));
-
- /* This forces the sheet to scroll when you don't see the entire cell */
- min_row = row;
- adjust = 0;
- if (row_align >= 1.0)
- {
- while (min_row >= 0 && min_row > min_visible_row (sheet))
- {
- adjust += g_sheet_row_get_height (sheet->row_geometry, min_row);
-
- if (adjust >= height)
- {
- break;
- }
- min_row--;
- }
- min_row = MAX (min_row, 0);
+ g_return_if_fail (row_align >= 0);
+ g_return_if_fail (col_align >= 0);
- min_row ++;
+ g_return_if_fail (row_align <= 1);
+ g_return_if_fail (col_align <= 1);
- y = g_sheet_row_start_pixel (sheet->row_geometry, min_row) +
- g_sheet_row_get_height (sheet->row_geometry, min_row) - 1;
- }
+ g_return_if_fail (col <
+ g_sheet_column_get_column_count (sheet->column_geometry));
+ g_return_if_fail (row <
+ g_sheet_row_get_row_count (sheet->row_geometry));
- if (y < 0)
- sheet->vadjustment->value = 0.0;
- else
- sheet->vadjustment->value = y;
+ gdk_drawable_get_size (sheet->sheet_window, &width, &height);
- g_signal_emit_by_name (sheet->vadjustment,
- "value_changed");
- }
+ if (row >= 0)
+ {
+ gint y = g_sheet_row_start_pixel (sheet->row_geometry, row);
- /* adjust horizontal scrollbar */
- if (column >= 0 && col_align >= 0.0)
- {
- x = g_sheet_column_start_pixel (sheet->column_geometry, column)
- - (gint) ( col_align*width + (1.0 - col_align)*
- g_sheet_column_get_width (sheet->column_geometry, column));
-
- /* This forces the sheet to scroll when you don't see the entire cell */
- min_col = column;
- adjust = 0;
- if (col_align == 1.0)
- {
- while (min_col >= 0 && min_col > min_visible_column (sheet))
- {
- adjust += g_sheet_column_get_width (sheet->column_geometry, min_col);
+ gtk_adjustment_set_value (sheet->vadjustment, y - height * row_align);
+ }
- if (adjust >= width)
- {
- break;
- }
- min_col--;
- }
- min_col = MAX (min_col, 0);
- x = g_sheet_column_start_pixel (sheet->column_geometry, min_col) +
- g_sheet_column_get_width (sheet->column_geometry, min_col) - 1;
- }
- if (x < 0)
- sheet->hadjustment->value = 0.0;
- else
- sheet->hadjustment->value = x;
+ if (col >= 0)
+ {
+ gint x = g_sheet_column_start_pixel (sheet->column_geometry, col);
- g_signal_emit_by_name (sheet->hadjustment,
- "value_changed");
- }
+ gtk_adjustment_set_value (sheet->hadjustment, x - width * col_align);
+ }
}
if (sheet->state != GTK_SHEET_NORMAL)
gtk_sheet_real_unselect_range (sheet, NULL);
- else
- gtk_sheet_deactivate_cell (sheet);
sheet->state = GTK_SHEET_ROW_SELECTED;
sheet->range.row0 = row;
if (sheet->state != GTK_SHEET_NORMAL)
gtk_sheet_real_unselect_range (sheet, NULL);
- else
- gtk_sheet_deactivate_cell (sheet);
-
sheet->state = GTK_SHEET_COLUMN_SELECTED;
sheet->range.row0 = 0;
gtk_widget_map (GTK_BIN (sheet->button)->child);
gtk_sheet_range_draw (sheet, NULL);
- gtk_sheet_activate_cell (sheet,
- sheet->active_cell.row,
- sheet->active_cell.col);
+ change_active_cell (sheet,
+ sheet->active_cell.row,
+ sheet->active_cell.col);
}
}
old_text = g_sheet_model_get_string (model, row, col);
if (0 != safe_strcmp (old_text, text))
- changed = g_sheet_model_set_string (model, text, row, col);
+ {
+ changed = g_sheet_model_set_string (model, text, row, col);
+ }
if ( g_sheet_model_free_strings (model))
g_free (old_text);
return TRUE;
}
-gboolean
+void
gtk_sheet_set_active_cell (GtkSheet *sheet, gint row, gint col)
{
- g_return_val_if_fail (sheet != NULL, 0);
- g_return_val_if_fail (GTK_IS_SHEET (sheet), 0);
+ g_return_if_fail (sheet != NULL);
+ g_return_if_fail (GTK_IS_SHEET (sheet));
+
+ if (row < -1 || col < -1)
+ return;
- if (row < -1 || col < -1) return FALSE;
if (row >= g_sheet_row_get_row_count (sheet->row_geometry)
||
col >= g_sheet_column_get_column_count (sheet->column_geometry))
- return FALSE;
+ return;
sheet->active_cell.row = row;
sheet->active_cell.col = col;
if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
- return TRUE;
-
- gtk_sheet_deactivate_cell (sheet);
+ return;
if ( row == -1 || col == -1)
{
gtk_sheet_hide_active_cell (sheet);
- return TRUE;
+ return;
}
- return gtk_sheet_activate_cell (sheet, row, col);
+ change_active_cell (sheet, row, col);
}
void
}
-static void
-gtk_sheet_deactivate_cell (GtkSheet *sheet)
-{
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (GTK_IS_SHEET (sheet));
-
- if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return ;
- if (sheet->state != GTK_SHEET_NORMAL) return ;
-
-
- if ( sheet->active_cell.row == -1 || sheet->active_cell.col == -1 )
- return ;
-
- /*
- g_print ("%s\n", __FUNCTION__);
-
-
- GtkSheetRange r;
- r.col0 = r.coli = sheet->active_cell.col;
- r.row0 = r.rowi = sheet->active_cell.row;
- gtk_sheet_range_draw (sheet, &r);
- */
-
-
- g_signal_emit (sheet, sheet_signals[DEACTIVATE], 0,
- sheet->active_cell.row,
- sheet->active_cell.col);
-
-
- g_signal_handlers_disconnect_by_func (gtk_sheet_get_entry (sheet),
- G_CALLBACK (gtk_sheet_entry_changed),
- sheet);
-
- gtk_sheet_hide_active_cell (sheet);
- sheet->active_cell.row = -1;
- sheet->active_cell.col = -1;
-
-#if 0
- if (GTK_SHEET_REDRAW_PENDING (sheet))
- {
- GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_REDRAW_PENDING);
- gtk_sheet_range_draw (sheet, NULL);
- }
-#endif
-}
-
-
-
static void
gtk_sheet_hide_active_cell (GtkSheet *sheet)
{
GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (sheet->entry_widget), GTK_VISIBLE);
}
-static gboolean
-gtk_sheet_activate_cell (GtkSheet *sheet, gint row, gint col)
+static void
+change_active_cell (GtkSheet *sheet, gint row, gint col)
{
- gboolean veto = TRUE;
+ gint old_row, old_col;
+ glong old_handler_id = sheet->entry_handler_id;
- g_return_val_if_fail (sheet != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_SHEET (sheet), FALSE);
+ g_return_if_fail (GTK_IS_SHEET (sheet));
- if (row < 0 || col < 0) return FALSE;
+ if (row < 0 || col < 0)
+ return;
if ( row > g_sheet_row_get_row_count (sheet->row_geometry)
|| col > g_sheet_column_get_column_count (sheet->column_geometry))
- return FALSE;
+ return;
- if (!veto) return FALSE;
if (sheet->state != GTK_SHEET_NORMAL)
{
sheet->state = GTK_SHEET_NORMAL;
gtk_sheet_real_unselect_range (sheet, NULL);
}
+ g_signal_handler_block (sheet->entry_widget, sheet->entry_handler_id);
+
+ old_row = sheet->active_cell.row;
+ old_col = sheet->active_cell.col;
+
sheet->range.row0 = row;
sheet->range.col0 = col;
sheet->range.rowi = row;
gtk_sheet_show_active_cell (sheet);
- g_signal_connect (gtk_sheet_get_entry (sheet),
- "changed",
- G_CALLBACK (gtk_sheet_entry_changed),
- sheet);
- g_signal_emit (sheet, sheet_signals [ACTIVATE], 0, row, col, &veto);
+ g_signal_emit (sheet, sheet_signals [ACTIVATE], 0,
+ row, col, old_row, old_col);
- return TRUE;
+ if ( old_handler_id == sheet->entry_handler_id)
+ g_signal_handler_unblock (sheet->entry_widget, sheet->entry_handler_id);
}
static void
gtk_widget_grab_focus (GTK_WIDGET (sheet_entry));
dispose_string (sheet, text);
+
}
static void
if (sheet->state != GTK_SHEET_NORMAL)
gtk_sheet_real_unselect_range (sheet, NULL);
- else
- gtk_sheet_deactivate_cell (sheet);
sheet->range.row0 = range->row0;
sheet->range.rowi = range->rowi;
gtk_sheet_real_unselect_range (sheet, NULL);
sheet->state = GTK_STATE_NORMAL;
- gtk_sheet_activate_cell (sheet,
- sheet->active_cell.row, sheet->active_cell.col);
+ change_active_cell (sheet,
+ sheet->active_cell.row, sheet->active_cell.col);
}
sheet_signals[BUTTON_EVENT_COLUMN], 0,
column, event);
- if ( event->type == GDK_2BUTTON_PRESS && event->button == 1)
- g_signal_emit (sheet,
- sheet_signals[DOUBLE_CLICK_COLUMN], 0, column);
-
+ if (g_sheet_column_get_sensitivity (sheet->column_geometry, column))
+ {
+ if ( event->type == GDK_2BUTTON_PRESS && event->button == 1)
+ g_signal_emit (sheet,
+ sheet_signals[DOUBLE_CLICK_COLUMN], 0, column);
+ }
}
else if (event->window == sheet->row_title_window)
{
sheet_signals[BUTTON_EVENT_ROW], 0,
row, event);
- if ( event->type == GDK_2BUTTON_PRESS && event->button == 1)
- g_signal_emit (sheet,
- sheet_signals[DOUBLE_CLICK_ROW], 0, row);
- }
+ if (g_sheet_row_get_sensitivity (sheet->row_geometry, row))
+ {
+ if ( event->type == GDK_2BUTTON_PRESS && event->button == 1)
+ g_signal_emit (sheet,
+ sheet_signals[DOUBLE_CLICK_ROW], 0, row);
+ }
+ }
gdk_window_get_pointer (widget->window, NULL, NULL, &mods);
{
row = sheet->active_cell.row;
column = sheet->active_cell.col;
- gtk_sheet_deactivate_cell (sheet);
sheet->active_cell.row = row;
sheet->active_cell.col = column;
sheet->drag_range = sheet->range;
{
row = sheet->active_cell.row;
column = sheet->active_cell.col;
- gtk_sheet_deactivate_cell (sheet);
sheet->active_cell.row = row;
sheet->active_cell.col = column;
sheet->drag_range = sheet->range;
static gboolean
gtk_sheet_click_cell (GtkSheet *sheet, gint row, gint column)
{
+ GtkSheetCell cell;
gboolean forbid_move;
+ cell.row = row;
+ cell.col = column;
+
if (row >= g_sheet_row_get_row_count (sheet->row_geometry)
|| column >= g_sheet_column_get_column_count (sheet->column_geometry))
{
return FALSE;
}
+
g_signal_emit (sheet, sheet_signals[TRAVERSE], 0,
- sheet->active_cell.row, sheet->active_cell.col,
- &row, &column, &forbid_move);
+ sheet->active_cell,
+ &cell,
+ &forbid_move);
if (forbid_move)
{
row = sheet->active_cell.row;
column = sheet->active_cell.col;
- gtk_sheet_activate_cell (sheet, row, column);
+ change_active_cell (sheet, row, column);
return FALSE;
}
}
else
{
- gtk_sheet_deactivate_cell (sheet);
- gtk_sheet_activate_cell (sheet, row, column);
+ change_active_cell (sheet, row, column);
}
sheet->active_cell.row = row;
{
GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
gdk_display_pointer_ungrab (display, event->time);
- gtk_sheet_activate_cell (sheet, sheet->active_cell.row,
+ change_active_cell (sheet, sheet->active_cell.row,
sheet->active_cell.col);
}
return TRUE;
}
-
-static gboolean
-gtk_sheet_move_query (GtkSheet *sheet, gint row, gint column)
-{
- gint height, width;
- gint new_row = row;
- gint new_col = column;
-
- gint row_move = FALSE;
- gint column_move = FALSE;
- gfloat row_align = -1.0;
- gfloat col_align = -1.0;
-
- if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
- return FALSE;
-
- gdk_drawable_get_size (sheet->sheet_window, &width, &height);
-
- if (row >= max_visible_row (sheet) &&
- sheet->state != GTK_SHEET_COLUMN_SELECTED)
- {
- row_align = 1.;
- new_row = MIN (g_sheet_row_get_row_count (sheet->row_geometry) - 1, row + 1);
- row_move = TRUE;
- if (max_visible_row (sheet) == g_sheet_row_get_row_count (sheet->row_geometry) - 1 &&
- g_sheet_row_start_pixel (sheet->row_geometry, g_sheet_row_get_row_count (sheet->row_geometry) - 1) +
- g_sheet_row_get_height (sheet->row_geometry, g_sheet_row_get_row_count (sheet->row_geometry) - 1) < height)
- {
- row_move = FALSE;
- row_align = -1.;
- }
- }
-
- if (row < min_visible_row (sheet) && sheet->state != GTK_SHEET_COLUMN_SELECTED)
- {
- row_align= 0.;
- row_move = TRUE;
- }
- if (column >= max_visible_column (sheet) && sheet->state != GTK_SHEET_ROW_SELECTED)
- {
- col_align = 1.;
- new_col = MIN (g_sheet_column_get_column_count (sheet->column_geometry) - 1, column + 1);
- column_move = TRUE;
- if (max_visible_column (sheet) == (g_sheet_column_get_column_count (sheet->column_geometry) - 1) &&
- g_sheet_column_start_pixel (sheet->column_geometry, g_sheet_column_get_column_count (sheet->column_geometry) - 1) +
- g_sheet_column_get_width (sheet->column_geometry, g_sheet_column_get_column_count (sheet->column_geometry) - 1) < width)
- {
- column_move = FALSE;
- col_align = -1.;
- }
- }
- if (column < min_visible_column (sheet) && sheet->state != GTK_SHEET_ROW_SELECTED)
- {
- col_align = 0.0;
- column_move = TRUE;
- }
-
- if (row_move || column_move)
- {
- gtk_sheet_moveto (sheet, new_row, new_col, row_align, col_align);
- }
-
- return (row_move || column_move);
-}
-
static void
gtk_sheet_extend_selection (GtkSheet *sheet, gint row, gint column)
{
if (sheet->selection_mode == GTK_SELECTION_SINGLE) return;
- gtk_sheet_move_query (sheet, row, column);
gtk_widget_grab_focus (GTK_WIDGET (sheet));
if (GTK_SHEET_IN_DRAG (sheet)) return;
new_row = yyy_row_ypixel_to_row (sheet, vpixel);
- gtk_sheet_activate_cell (sheet, new_row,
+ change_active_cell (sheet, new_row,
sheet->active_cell.col);
}
static void
-step_horizontal (GtkSheet *sheet, GtkScrollType dir)
+step_sheet (GtkSheet *sheet, GtkScrollType dir)
{
+ gint current_row = sheet->active_cell.row;
+ gint current_col = sheet->active_cell.col;
+ GtkSheetCell new_cell ;
+ gboolean forbidden = FALSE;
+
+ new_cell.row = current_row;
+ new_cell.col = current_col;
+
switch ( dir)
{
+ case GTK_SCROLL_STEP_DOWN:
+ new_cell.row++;
+ break;
+ case GTK_SCROLL_STEP_UP:
+ new_cell.row--;
+ break;
case GTK_SCROLL_STEP_RIGHT:
-
- gtk_sheet_activate_cell (sheet,
- sheet->active_cell.row,
- sheet->active_cell.col + 1);
+ new_cell.col++;
break;
case GTK_SCROLL_STEP_LEFT:
-
- gtk_sheet_activate_cell (sheet,
- sheet->active_cell.row,
- sheet->active_cell.col - 1);
+ new_cell.col--;
break;
-
default:
g_assert_not_reached ();
break;
}
- if ( sheet->active_cell.col >= max_visible_column (sheet))
+
+ maximize_int (&new_cell.row, 0);
+ maximize_int (&new_cell.col, 0);
+
+ minimize_int (&new_cell.row,
+ g_sheet_row_get_row_count (sheet->row_geometry) - 1);
+
+ minimize_int (&new_cell.col,
+ g_sheet_column_get_column_count (sheet->column_geometry) - 1);
+
+ g_signal_emit (sheet, sheet_signals[TRAVERSE], 0,
+ &sheet->active_cell,
+ &new_cell,
+ &forbidden);
+
+ if (forbidden)
+ return;
+
+ change_active_cell (sheet, new_cell.row, new_cell.col);
+
+ if ( new_cell.col > max_fully_visible_column (sheet))
{
glong hpos =
g_sheet_column_start_pixel (sheet->column_geometry,
- sheet->active_cell.col + 1);
+ new_cell.col + 1);
hpos -= sheet->hadjustment->page_size;
gtk_adjustment_set_value (sheet->hadjustment,
hpos);
}
- else if ( sheet->active_cell.col <= min_visible_column (sheet))
+ else if ( new_cell.col < min_fully_visible_column (sheet))
{
glong hpos =
g_sheet_column_start_pixel (sheet->column_geometry,
- sheet->active_cell.col);
+ new_cell.col);
gtk_adjustment_set_value (sheet->hadjustment,
hpos);
}
+
+
+ if ( new_cell.row > max_fully_visible_row (sheet))
+ {
+ glong vpos =
+ g_sheet_row_start_pixel (sheet->row_geometry,
+ new_cell.row + 1);
+ vpos -= sheet->vadjustment->page_size;
+
+ gtk_adjustment_set_value (sheet->vadjustment,
+ vpos);
+ }
+ else if ( new_cell.row < min_fully_visible_row (sheet))
+ {
+ glong vpos =
+ g_sheet_row_start_pixel (sheet->row_geometry,
+ new_cell.row);
+
+ gtk_adjustment_set_value (sheet->vadjustment,
+ vpos);
+ }
}
+
static gboolean
gtk_sheet_key_press (GtkWidget *widget,
GdkEventKey *key)
{
case GDK_Tab:
case GDK_Right:
- step_horizontal (sheet, GTK_SCROLL_STEP_RIGHT);
+ step_sheet (sheet, GTK_SCROLL_STEP_RIGHT);
break;
case GDK_ISO_Left_Tab:
case GDK_Left:
- step_horizontal (sheet, GTK_SCROLL_STEP_LEFT);
+ step_sheet (sheet, GTK_SCROLL_STEP_LEFT);
break;
-
case GDK_Return:
case GDK_Down:
- gtk_sheet_activate_cell (sheet,
- sheet->active_cell.row + ROWS_PER_STEP,
- sheet->active_cell.col);
-
- if ( sheet->active_cell.row >= max_visible_row (sheet))
- gtk_adjustment_set_value (sheet->vadjustment,
- sheet->vadjustment->value +
- sheet->vadjustment->step_increment);
+ step_sheet (sheet, GTK_SCROLL_STEP_DOWN);
break;
case GDK_Up:
- gtk_sheet_activate_cell (sheet,
- sheet->active_cell.row - ROWS_PER_STEP,
- sheet->active_cell.col);
-
- if ( sheet->active_cell.row < min_visible_row (sheet))
- gtk_adjustment_set_value (sheet->vadjustment,
- sheet->vadjustment->value -
- sheet->vadjustment->step_increment);
+ step_sheet (sheet, GTK_SCROLL_STEP_UP);
break;
case GDK_Page_Down:
gtk_adjustment_set_value (sheet->vadjustment,
sheet->vadjustment->lower);
- gtk_sheet_activate_cell (sheet, 0,
+ change_active_cell (sheet, 0,
sheet->active_cell.col);
break;
sheet->vadjustment->page_increment);
/*
- gtk_sheet_activate_cell (sheet,
+ change_active_cellx (sheet,
g_sheet_row_get_row_count (sheet->row_geometry) - 1,
sheet->active_cell.col);
*/
sheet = GTK_SHEET (widget);
requisition->width = 3 * DEFAULT_COLUMN_WIDTH;
- requisition->height = 3 * default_row_height (sheet);
+ requisition->height = 3 * DEFAULT_ROW_HEIGHT;
/* compute the size of the column title area */
if (sheet->column_titles_visible)
G_CALLBACK (gtk_sheet_entry_key_press),
sheet);
+ sheet->entry_handler_id =
+ g_signal_connect (sheet->entry_widget,
+ "changed",
+ G_CALLBACK (gtk_sheet_entry_changed),
+ sheet);
+
gtk_widget_show (sheet->entry_widget);
}
if (button->label_visible)
{
- text_height = default_row_height (sheet) -
+ text_height = DEFAULT_ROW_HEIGHT -
2 * COLUMN_TITLES_HEIGHT;
gdk_gc_set_clip_rectangle (GTK_WIDGET (sheet)->style->fg_gc[button->state],
gdk_drawable_get_size (sheet->sheet_window, &width, &height);
+ if ( sheet->row_titles_visible)
+ width -= sheet->row_title_area.width;
+
+ if (sheet->column_titles_visible)
+ height -= sheet->column_title_area.height;
+
if (sheet->vadjustment)
{
glong last_row = g_sheet_row_get_row_count (sheet->row_geometry) - 1;
g_sheet_row_get_height (sheet->row_geometry, last_row)
;
- if (sheet->column_titles_visible)
- sheet->vadjustment->upper += sheet->column_title_area.height;
-
sheet->vadjustment->lower = 0;
sheet->vadjustment->page_size = height;
g_sheet_column_get_width (sheet->column_geometry, last_col)
;
- if (sheet->row_titles_visible)
- sheet->hadjustment->upper += sheet->row_title_area.width;
-
sheet->hadjustment->lower = 0;
sheet->hadjustment->page_size = width;
GtkRequisition requisition;
GtkRequisition label_requisition;
- label_requisition.height = default_row_height (sheet);
+ label_requisition.height = DEFAULT_ROW_HEIGHT;
label_requisition.width = COLUMN_MIN_WIDTH;
- requisition.height = default_row_height (sheet);
+ requisition.height = DEFAULT_ROW_HEIGHT;
requisition.width = COLUMN_MIN_WIDTH;
projects / pspp-builds.git / blobdiff