-/* This version of GtkSheet has been *heavily* modified, for the specific
- requirements of PSPPIRE. */
+/*
+ * Copyright (C) 2006, 2008 Free Software Foundation
+ *
+ * This version of GtkSheet has been *heavily* modified, for the specific
+ * requirements of PSPPIRE. The changes are copyright by the
+ * Free Software Foundation. The copyright notice for the original work is
+ * below.
+*/
/* GtkSheet widget for Gtk+.
* Copyright (C) 1999-2001 Adrian E. Feiguin <adrian@ifir.ifir.edu.ar>
/* sheet flags */
enum
{
- GTK_SHEET_IS_LOCKED = 1 << 0,
GTK_SHEET_IS_FROZEN = 1 << 1,
GTK_SHEET_IN_XDRAG = 1 << 2,
GTK_SHEET_IN_YDRAG = 1 << 3,
GTK_SHEET_IN_DRAG = 1 << 4,
GTK_SHEET_IN_SELECTION = 1 << 5,
GTK_SHEET_IN_RESIZE = 1 << 6,
- GTK_SHEET_IN_CLIP = 1 << 7,
- GTK_SHEET_REDRAW_PENDING = 1 << 8,
+ GTK_SHEET_REDRAW_PENDING = 1 << 7,
};
#define GTK_SHEET_FLAGS(sheet) (GTK_SHEET (sheet)->flags)
#define GTK_SHEET_SET_FLAGS(sheet,flag) (GTK_SHEET_FLAGS (sheet) |= (flag))
#define GTK_SHEET_UNSET_FLAGS(sheet,flag) (GTK_SHEET_FLAGS (sheet) &= ~ (flag))
-#define GTK_SHEET_IS_LOCKED(sheet) (GTK_SHEET_FLAGS (sheet) & GTK_SHEET_IS_LOCKED)
-
-
#define GTK_SHEET_IS_FROZEN(sheet) (GTK_SHEET_FLAGS (sheet) & GTK_SHEET_IS_FROZEN)
#define GTK_SHEET_IN_XDRAG(sheet) (GTK_SHEET_FLAGS (sheet) & GTK_SHEET_IN_XDRAG)
#define GTK_SHEET_IN_YDRAG(sheet) (GTK_SHEET_FLAGS (sheet) & GTK_SHEET_IN_YDRAG)
#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_IN_CLIP(sheet) (GTK_SHEET_FLAGS (sheet) & GTK_SHEET_IN_CLIP)
#define GTK_SHEET_REDRAW_PENDING(sheet) (GTK_SHEET_FLAGS (sheet) & GTK_SHEET_REDRAW_PENDING)
#define CELL_SPACING 1
#define DRAG_WIDTH 6
-#define TIMEOUT_FLASH 200
#define TIMEOUT_HOVER 300
#define TIME_INTERVAL 8
#define COLUMN_MIN_WIDTH 10
#define DEFAULT_COLUMN_WIDTH 80
+static void gtk_sheet_update_primary_selection (GtkSheet *sheet);
+
+
static void gtk_sheet_column_title_button_draw (GtkSheet *sheet, gint column);
static void gtk_sheet_row_title_button_draw (GtkSheet *sheet, gint row);
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 * CELLOFFSET;
+
+ return PANGO_PIXELS (val) + 2 * CELLOFFSET;
}
}
pango_layout_get_extents (layout, NULL, &rect);
- g_object_unref (G_OBJECT (layout));
+ g_object_unref (layout);
return PANGO_PIXELS (rect.width);
}
/* returns the total width of the sheet */
static inline gint SHEET_WIDTH (GtkSheet *sheet)
{
- gint i,cx;
+ gint i, cx;
cx = ( sheet->row_titles_visible ? sheet->row_title_area.width : 0);
return cx;
}
-#define MIN_VISIBLE_ROW(sheet) sheet->view.row0
-#define MAX_VISIBLE_ROW(sheet) sheet->view.rowi
-#define MIN_VISIBLE_COLUMN(sheet) sheet->view.col0
-#define MAX_VISIBLE_COLUMN(sheet) sheet->view.coli
+#define MIN_VISIBLE_ROW(sheet) \
+ ROW_FROM_YPIXEL (sheet, sheet->column_title_area.height + 1)
+
+#define MAX_VISIBLE_ROW(sheet) \
+ ROW_FROM_YPIXEL (sheet, sheet->sheet_window_height - 1)
+
+#define MIN_VISIBLE_COLUMN(sheet) \
+ COLUMN_FROM_XPIXEL (sheet, sheet->row_title_area.width + 1)
+
+#define MAX_VISIBLE_COLUMN(sheet) \
+ COLUMN_FROM_XPIXEL (sheet, sheet->sheet_window_width)
+
static inline gboolean
row = ROW_FROM_YPIXEL (sheet, y);
*drag_row = row;
- ydrag = ROW_TOP_YPIXEL (sheet,row)+CELL_SPACING;
+ ydrag = ROW_TOP_YPIXEL (sheet, row)+CELL_SPACING;
if (y <= ydrag + DRAG_WIDTH / 2 && row != 0)
{
while (!yyy_row_is_visible (sheet, row - 1) && row > 0) row--;
x <= COLUMN_LEFT_XPIXEL (sheet, sheet->range.coli) +
xxx_column_width (sheet, sheet->range.coli) + DRAG_WIDTH / 2)
{
- ydrag = ROW_TOP_YPIXEL (sheet,sheet->range.row0);
+ ydrag = ROW_TOP_YPIXEL (sheet, sheet->range.row0);
if (y >= ydrag - DRAG_WIDTH / 2 && y <= ydrag + DRAG_WIDTH / 2)
{
*drag_row = sheet->range.row0;
sheet->range.col0 < 0 || sheet->range.coli < 0 )
return FALSE;
- xdrag = COLUMN_LEFT_XPIXEL (sheet,sheet->range.coli)+
+ xdrag = COLUMN_LEFT_XPIXEL (sheet, sheet->range.coli)+
xxx_column_width (sheet, sheet->range.coli);
- ydrag = ROW_TOP_YPIXEL (sheet,sheet->range.rowi)+
+ ydrag = ROW_TOP_YPIXEL (sheet, sheet->range.rowi)+
yyy_row_height (sheet, sheet->range.rowi);
if (sheet->state == GTK_SHEET_COLUMN_SELECTED)
- ydrag = ROW_TOP_YPIXEL (sheet, sheet->view.row0);
+ ydrag = ROW_TOP_YPIXEL (sheet, MIN_VISIBLE_ROW (sheet));
if (sheet->state == GTK_SHEET_ROW_SELECTED)
- xdrag = COLUMN_LEFT_XPIXEL (sheet, sheet->view.col0);
+ xdrag = COLUMN_LEFT_XPIXEL (sheet, MIN_VISIBLE_COLUMN (sheet));
- *drag_column = COLUMN_FROM_XPIXEL (sheet,x);
- *drag_row = ROW_FROM_YPIXEL (sheet,y);
+ *drag_column = COLUMN_FROM_XPIXEL (sheet, x);
+ *drag_row = ROW_FROM_YPIXEL (sheet, y);
if (x >= xdrag - DRAG_WIDTH / 2 && x <= xdrag + DRAG_WIDTH / 2 &&
y >= ydrag - DRAG_WIDTH / 2 && y <= ydrag + DRAG_WIDTH / 2) return TRUE;
/* Sheet queries */
-static gint gtk_sheet_range_isvisible (GtkSheet * sheet,
- GtkSheetRange range);
-static gint gtk_sheet_cell_isvisible (GtkSheet * sheet,
- gint row, gint column);
-/* Clipped Range */
-
-static gint gtk_sheet_flash (gpointer data);
-
+static gboolean gtk_sheet_range_isvisible (const GtkSheet * sheet,
+ GtkSheetRange range);
+static gboolean gtk_sheet_cell_isvisible (GtkSheet * sheet,
+ gint row, gint column);
/* Drawing Routines */
/* draw cell background and frame */
/* Scrollbars */
static void adjust_scrollbars (GtkSheet * sheet);
-static void vadjustment_changed (GtkAdjustment * adjustment,
- gpointer data);
-static void hadjustment_changed (GtkAdjustment * adjustment,
- gpointer data);
static void vadjustment_value_changed (GtkAdjustment * adjustment,
gpointer data);
static void hadjustment_value_changed (GtkAdjustment * adjustment,
static void draw_xor_hline (GtkSheet * sheet);
static void draw_xor_rectangle (GtkSheet *sheet,
GtkSheetRange range);
-static void gtk_sheet_draw_flashing_range (GtkSheet *sheet,
- GtkSheetRange range);
+
static guint new_column_width (GtkSheet * sheet,
gint column,
gint * x);
/* Memory allocation routines */
static void gtk_sheet_real_range_clear (GtkSheet *sheet,
- const GtkSheetRange *range,
- gboolean delete);
+ const GtkSheetRange *range);
+
static void gtk_sheet_real_cell_clear (GtkSheet *sheet,
gint row,
- gint column,
- gboolean delete);
+ gint column);
/* Container Functions */
SELECT_COLUMN,
DOUBLE_CLICK_ROW,
DOUBLE_CLICK_COLUMN,
+ BUTTON_EVENT_ROW,
+ BUTTON_EVENT_COLUMN,
SELECT_RANGE,
- CLIP_RANGE,
RESIZE_RANGE,
MOVE_RANGE,
TRAVERSE,
* A row has been selected.
*/
sheet_signals[SELECT_ROW] =
- gtk_signal_new ("select-row",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkSheetClass, select_row),
- gtkextra_VOID__INT,
- GTK_TYPE_NONE, 1, GTK_TYPE_INT);
+ g_signal_new ("select-row",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ offsetof (GtkSheetClass, select_row),
+ NULL, NULL,
+ gtkextra_VOID__INT,
+ G_TYPE_NONE,
+ 1,
+ G_TYPE_INT);
+
/**
* GtkSheet::select - column
* A column has been selected.
*/
sheet_signals[SELECT_COLUMN] =
- gtk_signal_new ("select-column",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkSheetClass, select_column),
- gtkextra_VOID__INT,
- GTK_TYPE_NONE, 1, GTK_TYPE_INT);
+ g_signal_new ("select-column",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ offsetof (GtkSheetClass, select_column),
+ NULL, NULL,
+ gtkextra_VOID__INT,
+ G_TYPE_NONE,
+ 1,
+ G_TYPE_INT);
/**
- * GtkSheet::double - click - row
+ * GtkSheet::double-click-row
* @sheet: the sheet widget that emitted the signal
* @row: the row that was double clicked.
*
* A row's title button has been double clicked
*/
sheet_signals[DOUBLE_CLICK_ROW] =
- gtk_signal_new ("double-click-row",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- 0,
- gtkextra_VOID__INT,
- GTK_TYPE_NONE, 1, GTK_TYPE_INT);
+ g_signal_new ("double-click-row",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ gtkextra_VOID__INT,
+ G_TYPE_NONE,
+ 1,
+ G_TYPE_INT);
/**
- * GtkSheet::double - click - column
+ * GtkSheet::double-click-column
* @sheet: the sheet widget that emitted the signal
* @column: the column that was double clicked.
*
* A column's title button has been double clicked
*/
sheet_signals[DOUBLE_CLICK_COLUMN] =
- gtk_signal_new ("double-click-column",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- 0,
- gtkextra_VOID__INT,
- GTK_TYPE_NONE, 1, GTK_TYPE_INT);
+ g_signal_new ("double-click-column",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ gtkextra_VOID__INT,
+ G_TYPE_NONE,
+ 1,
+ G_TYPE_INT);
+
+
+ /**
+ * GtkSheet::button-event-column
+ * @sheet: the sheet widget that emitted the signal
+ * @column: the column on which the event occured.
+ *
+ * A button event occured on a column title button
+ */
+ sheet_signals[BUTTON_EVENT_COLUMN] =
+ g_signal_new ("button-event-column",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ gtkextra_VOID__INT_POINTER,
+ G_TYPE_NONE,
+ 2,
+ G_TYPE_INT,
+ G_TYPE_POINTER
+ );
+
+
+ /**
+ * GtkSheet::button-event-row
+ * @sheet: the sheet widget that emitted the signal
+ * @column: the column on which the event occured.
+ *
+ * A button event occured on a row title button
+ */
+ sheet_signals[BUTTON_EVENT_ROW] =
+ g_signal_new ("button-event-row",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ gtkextra_VOID__INT_POINTER,
+ G_TYPE_NONE,
+ 2,
+ G_TYPE_INT,
+ G_TYPE_POINTER
+ );
+
sheet_signals[SELECT_RANGE] =
- gtk_signal_new ("select-range",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkSheetClass, select_range),
- gtkextra_VOID__BOXED,
- GTK_TYPE_NONE, 1, GTK_TYPE_SHEET_RANGE);
-
- sheet_signals[CLIP_RANGE] =
- gtk_signal_new ("clip-range",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkSheetClass, clip_range),
- gtkextra_VOID__BOXED,
- GTK_TYPE_NONE, 1, GTK_TYPE_SHEET_RANGE);
+ g_signal_new ("select-range",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ offsetof (GtkSheetClass, select_range),
+ NULL, NULL,
+ gtkextra_VOID__BOXED,
+ G_TYPE_NONE,
+ 1,
+ GTK_TYPE_SHEET_RANGE);
+
sheet_signals[RESIZE_RANGE] =
- gtk_signal_new ("resize-range",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkSheetClass, resize_range),
- gtkextra_VOID__BOXED_BOXED,
- GTK_TYPE_NONE, 2, GTK_TYPE_SHEET_RANGE, GTK_TYPE_SHEET_RANGE);
+ g_signal_new ("resize-range",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ offsetof (GtkSheetClass, resize_range),
+ NULL, NULL,
+ gtkextra_VOID__BOXED_BOXED,
+ G_TYPE_NONE,
+ 2,
+ GTK_TYPE_SHEET_RANGE, GTK_TYPE_SHEET_RANGE
+ );
+
sheet_signals[MOVE_RANGE] =
- gtk_signal_new ("move-range",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkSheetClass, move_range),
- gtkextra_VOID__BOXED_BOXED,
- GTK_TYPE_NONE, 2, GTK_TYPE_SHEET_RANGE, GTK_TYPE_SHEET_RANGE);
+ g_signal_new ("move-range",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ offsetof (GtkSheetClass, move_range),
+ NULL, NULL,
+ gtkextra_VOID__BOXED_BOXED,
+ G_TYPE_NONE,
+ 2,
+ GTK_TYPE_SHEET_RANGE, GTK_TYPE_SHEET_RANGE
+ );
+
sheet_signals[TRAVERSE] =
- gtk_signal_new ("traverse",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkSheetClass, traverse),
- gtkextra_BOOLEAN__INT_INT_POINTER_POINTER,
- GTK_TYPE_BOOL, 4, GTK_TYPE_INT, GTK_TYPE_INT,
- GTK_TYPE_POINTER, GTK_TYPE_POINTER);
+ g_signal_new ("traverse",
+ G_TYPE_FROM_CLASS (object_class),
+ 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);
+
sheet_signals[DEACTIVATE] =
- gtk_signal_new ("deactivate",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkSheetClass, deactivate),
- gtkextra_BOOLEAN__INT_INT,
- GTK_TYPE_BOOL, 2, GTK_TYPE_INT, GTK_TYPE_INT);
+ g_signal_new ("deactivate",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ offsetof (GtkSheetClass, deactivate),
+ NULL, NULL,
+ gtkextra_BOOLEAN__INT_INT,
+ G_TYPE_BOOLEAN, 2, G_TYPE_INT, G_TYPE_INT);
sheet_signals[ACTIVATE] =
- gtk_signal_new ("activate",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkSheetClass, activate),
- gtkextra_BOOLEAN__INT_INT,
- GTK_TYPE_BOOL, 2, GTK_TYPE_INT, GTK_TYPE_INT);
+ g_signal_new ("activate",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ offsetof (GtkSheetClass, activate),
+ NULL, NULL,
+ gtkextra_BOOLEAN__INT_INT,
+ G_TYPE_BOOLEAN, 2, G_TYPE_INT, G_TYPE_INT);
sheet_signals[SET_CELL] =
- gtk_signal_new ("set-cell",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkSheetClass, set_cell),
- gtkextra_VOID__INT_INT,
- GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
+ g_signal_new ("set-cell",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ offsetof (GtkSheetClass, set_cell),
+ NULL, NULL,
+ gtkextra_VOID__INT_INT,
+ G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
+
sheet_signals[CLEAR_CELL] =
- gtk_signal_new ("clear-cell",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkSheetClass, clear_cell),
- gtkextra_VOID__INT_INT,
- GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
+ g_signal_new ("clear-cell",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ offsetof (GtkSheetClass, clear_cell),
+ NULL, NULL,
+ gtkextra_VOID__INT_INT,
+ G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
sheet_signals[CHANGED] =
- gtk_signal_new ("changed",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkSheetClass, changed),
- gtkextra_VOID__INT_INT,
- GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
+ g_signal_new ("changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ offsetof (GtkSheetClass, changed),
+ NULL, NULL,
+ gtkextra_VOID__INT_INT,
+ G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
sheet_signals[NEW_COL_WIDTH] =
- gtk_signal_new ("new-column-width",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkSheetClass, changed),
- gtkextra_VOID__INT_INT,
- GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
+ g_signal_new ("new-column-width",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ offsetof (GtkSheetClass, new_column_width), /*!!!! */
+ NULL, NULL,
+ gtkextra_VOID__INT_INT,
+ G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
sheet_signals[NEW_ROW_HEIGHT] =
- gtk_signal_new ("new-row-height",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkSheetClass, changed),
- gtkextra_VOID__INT_INT,
- GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
+ g_signal_new ("new-row-height",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ offsetof (GtkSheetClass, new_row_height), /*!!!! */
+ NULL, NULL,
+ gtkextra_VOID__INT_INT,
+ G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
widget_class->set_scroll_adjustments_signal =
- gtk_signal_new ("set-scroll-adjustments",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkSheetClass, set_scroll_adjustments),
- gtkextra_VOID__OBJECT_OBJECT,
- GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
+ g_signal_new ("set-scroll-adjustments",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ offsetof (GtkSheetClass, set_scroll_adjustments),
+ NULL, NULL,
+ gtkextra_VOID__OBJECT_OBJECT,
+ G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
container_class->add = NULL;
klass->select_row = NULL;
klass->select_column = NULL;
klass->select_range = NULL;
- klass->clip_range = NULL;
klass->resize_range = NULL;
klass->move_range = NULL;
klass->traverse = NULL;
GTK_WIDGET_UNSET_FLAGS (sheet, GTK_NO_WINDOW);
GTK_WIDGET_SET_FLAGS (sheet, GTK_CAN_FOCUS);
- sheet->view.row0 = 0;
- sheet->view.col0 = 0;
- sheet->view.rowi = 0;
- sheet->view.coli = 0;
-
sheet->column_title_window = NULL;
sheet->column_title_area.x = 0;
sheet->column_title_area.y = 0;
gdk_color_alloc (gdk_colormap_get_system (), &sheet->grid_color);
sheet->show_grid = TRUE;
- sheet->motion_events = 0;
+ sheet->motion_timer = 0;
}
range.coli = xxx_column_count (sheet) - 1;
range.rowi = yyy_row_count (sheet) - 1;
- sheet->view.col0 =
- COLUMN_FROM_XPIXEL (sheet, sheet->row_title_area.width + 1);
-
- sheet->view.coli =
- COLUMN_FROM_XPIXEL (sheet, sheet->sheet_window_width);
-
- if ( sheet->view.coli > range.coli)
- sheet->view.coli = range.coli;
-
adjust_scrollbars (sheet);
if (sheet->active_cell.col >= model_columns)
range.rowi = yyy_row_count (sheet) - 1;
range.coli = xxx_column_count (sheet) - 1;
- sheet->view.row0 =
- ROW_FROM_YPIXEL (sheet, sheet->column_title_area.height + 1);
- sheet->view.rowi =
- ROW_FROM_YPIXEL (sheet, sheet->sheet_window_height - 1);
-
- if ( sheet->view.rowi > range.rowi)
- sheet->view.rowi = range.rowi;
-
adjust_scrollbars (sheet);
if (sheet->active_cell.row >= model_rows)
range.rowi = rowi;
range.coli = coli;
+ 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))
+ {
+ gtk_sheet_move_query (sheet, 0, 0);
+ }
+
if ( ( row0 < 0 && col0 < 0 ) || ( rowi < 0 && coli < 0 ) )
{
+ gint i;
gtk_sheet_range_draw (sheet, NULL);
+ adjust_scrollbars (sheet);
+
+ for (i = MIN_VISIBLE_ROW (sheet); i <= MAX_VISIBLE_ROW (sheet); i++)
+ gtk_sheet_row_title_button_draw (sheet, i);
+
+ for (i = MIN_VISIBLE_COLUMN (sheet);
+ i <= MAX_VISIBLE_COLUMN (sheet); i++)
+ gtk_sheet_column_title_button_draw (sheet, i);
+
return;
}
else if ( row0 < 0 || rowi < 0 )
gtk_sheet_new (GSheetRow *vgeo, GSheetColumn *hgeo, const gchar *title,
GSheetModel *model)
{
- GtkWidget *widget;
-
- widget = gtk_type_new (gtk_sheet_get_type ());
+ GtkWidget *widget = g_object_new (GTK_TYPE_SHEET, NULL);
gtk_sheet_construct (GTK_SHEET (widget), vgeo, hgeo, title);
for ( i = first ; i <= first + n_columns ; ++i )
{
gtk_sheet_column_title_button_draw (sheet, i);
- gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[CHANGED], -1, i);
+ g_signal_emit (sheet, sheet_signals[CHANGED], 0, -1, i);
}
}
gtk_sheet_new_with_custom_entry (GSheetRow *rows, GSheetColumn *columns,
const gchar *title, GtkType entry_type)
{
- GtkWidget *widget;
-
- widget = gtk_type_new (gtk_sheet_get_type ());
+ GtkWidget *widget = g_object_new (GTK_TYPE_SHEET, NULL);
gtk_sheet_construct_with_custom_entry (GTK_SHEET (widget),
rows, columns, title, entry_type);
if (state == GTK_SHEET_NORMAL)
{
gtk_sheet_show_active_cell (sheet);
- g_signal_connect (G_OBJECT (gtk_sheet_get_entry (sheet)),
+ g_signal_connect (gtk_sheet_get_entry (sheet),
"changed",
G_CALLBACK (gtk_sheet_entry_changed),
sheet);
return sheet->autoscroll;
}
-void
-gtk_sheet_set_clip_text (GtkSheet *sheet, gboolean clip_text)
-{
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (GTK_IS_SHEET (sheet));
-
- sheet->clip_text = clip_text;
-}
-
-gboolean
-gtk_sheet_clip_text (GtkSheet *sheet)
-{
- g_return_val_if_fail (sheet != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_SHEET (sheet), FALSE);
-
- return sheet->clip_text;
-}
void
gtk_sheet_set_justify_entry (GtkSheet *sheet, gboolean justify)
return sheet->justify_entry;
}
-void
-gtk_sheet_set_locked (GtkSheet *sheet, gboolean locked)
-{
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (GTK_IS_SHEET (sheet));
-
- if ( locked )
- {
- GTK_SHEET_SET_FLAGS (sheet,GTK_SHEET_IS_LOCKED);
- gtk_widget_hide (sheet->sheet_entry);
- gtk_widget_unmap (sheet->sheet_entry);
- }
- else
- {
- GTK_SHEET_UNSET_FLAGS (sheet,GTK_SHEET_IS_LOCKED);
- if (GTK_WIDGET_MAPPED (GTK_WIDGET (sheet)))
- {
- gtk_widget_show (sheet->sheet_entry);
- gtk_widget_map (sheet->sheet_entry);
- }
- }
-
- gtk_entry_set_editable (GTK_ENTRY (sheet->sheet_entry), locked);
-
-}
-
-gboolean
-gtk_sheet_locked (const GtkSheet *sheet)
-{
- g_return_val_if_fail (sheet != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_SHEET (sheet), FALSE);
-
- return GTK_SHEET_IS_LOCKED (sheet);
-}
/* This routine has problems with gtk+- 1.2 related with the
label / button drawing - I think it's a bug in gtk+- 1.2 */
sheet->old_hadjustment = -1.;
if (sheet->hadjustment)
- gtk_signal_emit_by_name (GTK_OBJECT (sheet->hadjustment),
- "value_changed");
+ g_signal_emit_by_name (sheet->hadjustment,
+ "value_changed");
if (sheet->vadjustment)
- gtk_signal_emit_by_name (GTK_OBJECT (sheet->vadjustment),
- "value_changed");
+ g_signal_emit_by_name (sheet->vadjustment,
+ "value_changed");
if (sheet->state == GTK_STATE_NORMAL)
if (sheet->sheet_entry && GTK_WIDGET_MAPPED (sheet->sheet_entry))
if (width < COLUMN_MIN_WIDTH) return;
sheet->row_title_area.width = width;
- sheet->view.col0 = COLUMN_FROM_XPIXEL (sheet, sheet->row_title_area.width + 1);
- sheet->view.coli = COLUMN_FROM_XPIXEL (sheet, sheet->sheet_window_width);
-
adjust_scrollbars (sheet);
sheet->old_hadjustment = -1.;
if (sheet->hadjustment)
- gtk_signal_emit_by_name (GTK_OBJECT (sheet->hadjustment),
- "value_changed");
+ g_signal_emit_by_name (sheet->hadjustment,
+ "value_changed");
size_allocate_global_button (sheet);
}
if (height < DEFAULT_ROW_HEIGHT (GTK_WIDGET (sheet))) return;
sheet->column_title_area.height = height;
- sheet->view.row0 = ROW_FROM_YPIXEL (sheet,
- sheet->column_title_area.height + 1);
- sheet->view.rowi = ROW_FROM_YPIXEL (sheet, sheet->sheet_window_height - 1);
adjust_scrollbars (sheet);
sheet->old_vadjustment = -1.;
if (sheet->vadjustment)
- gtk_signal_emit_by_name (GTK_OBJECT (sheet->vadjustment),
- "value_changed");
+ g_signal_emit_by_name (sheet->vadjustment,
+ "value_changed");
size_allocate_global_button (sheet);
}
sheet->old_vadjustment = -1.;
if (sheet->vadjustment)
- gtk_signal_emit_by_name (GTK_OBJECT (sheet->vadjustment),
- "value_changed");
+ g_signal_emit_by_name (sheet->vadjustment,
+ "value_changed");
size_allocate_global_button (sheet);
}
sheet->old_hadjustment = -1.;
if (sheet->hadjustment)
- gtk_signal_emit_by_name (GTK_OBJECT (sheet->hadjustment),
- "value_changed");
+ g_signal_emit_by_name (sheet->hadjustment,
+ "value_changed");
size_allocate_global_button (sheet);
}
sheet->old_vadjustment = -1.;
if (sheet->vadjustment)
- gtk_signal_emit_by_name (GTK_OBJECT (sheet->vadjustment),
- "value_changed");
+ g_signal_emit_by_name (sheet->vadjustment,
+ "value_changed");
}
void
sheet->old_hadjustment = -1.;
if (sheet->hadjustment)
- gtk_signal_emit_by_name (GTK_OBJECT (sheet->hadjustment),
- "value_changed");
+ g_signal_emit_by_name (sheet->hadjustment,
+ "value_changed");
}
gboolean
width = sheet->sheet_window_width;
/* adjust vertical scrollbar */
- if (row >= 0 && row_align >= 0.)
+ if (row >= 0 && row_align >= 0.0)
{
y = ROW_TOP_YPIXEL (sheet, row) - sheet->voffset
- - (gint) ( row_align*height + (1. - row_align)
+ - (gint) ( row_align * height + (1.0 - row_align)
* yyy_row_height (sheet, row));
/* This forces the sheet to scroll when you don't see the entire cell */
min_row = row;
adjust = 0;
- if (row_align == 1.)
+ if (row_align >= 1.0)
{
while (min_row >= 0 && min_row > MIN_VISIBLE_ROW (sheet))
{
if (yyy_row_is_visible (sheet, min_row))
adjust += yyy_row_height (sheet, min_row);
+
if (adjust >= height)
{
break;
min_row--;
}
min_row = MAX (min_row, 0);
+
+ min_row ++;
+
y = ROW_TOP_YPIXEL (sheet, min_row) - sheet->voffset +
yyy_row_height (sheet, min_row) - 1;
}
sheet->vadjustment->value = y;
sheet->old_vadjustment = -1.;
- gtk_signal_emit_by_name (GTK_OBJECT (sheet->vadjustment),
- "value_changed");
+ g_signal_emit_by_name (sheet->vadjustment,
+ "value_changed");
}
/* adjust horizontal scrollbar */
- if (column >= 0 && col_align >= 0.)
+ if (column >= 0 && col_align >= 0.0)
{
x = COLUMN_LEFT_XPIXEL (sheet, column) - sheet->hoffset
- - (gint) ( col_align*width + (1.- col_align)*
+ - (gint) ( col_align*width + (1.0 - col_align)*
xxx_column_width (sheet, column));
-
/* This forces the sheet to scroll when you don't see the entire cell */
min_col = column;
adjust = 0;
- if (col_align == 1.)
+ if (col_align == 1.0)
{
while (min_col >= 0 && min_col > MIN_VISIBLE_COLUMN (sheet))
{
sheet->hadjustment->value = x;
sheet->old_vadjustment = -1.;
- gtk_signal_emit_by_name (GTK_OBJECT (sheet->hadjustment),
- "value_changed");
-
+ g_signal_emit_by_name (sheet->hadjustment,
+ "value_changed");
}
}
sheet->active_cell.row = row;
sheet->active_cell.col = 0;
- gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[SELECT_ROW], row);
+ g_signal_emit (sheet, sheet_signals[SELECT_ROW], 0, row);
gtk_sheet_real_select_range (sheet, NULL);
}
sheet->active_cell.row = 0;
sheet->active_cell.col = column;
- gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[SELECT_COLUMN], column);
+ g_signal_emit (sheet, sheet_signals[SELECT_COLUMN], 0, column);
gtk_sheet_real_select_range (sheet, NULL);
}
-void
-gtk_sheet_clip_range (GtkSheet *sheet, const GtkSheetRange *range)
-{
-
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (GTK_IS_SHEET (sheet));
-
- if (GTK_SHEET_IN_CLIP (sheet)) return;
-
- GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_CLIP);
-
- if (range == NULL)
- sheet->clip_range = sheet->range;
- else
- sheet->clip_range=*range;
-
- sheet->interval = 0;
- sheet->clip_timer = gtk_timeout_add (TIMEOUT_FLASH, gtk_sheet_flash, sheet);
-
- gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[CLIP_RANGE],
- &sheet->clip_range);
-
-}
-
-void
-gtk_sheet_unclip_range (GtkSheet *sheet)
-{
-
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (GTK_IS_SHEET (sheet));
-
- if (!GTK_SHEET_IN_CLIP (sheet)) return;
-
- GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_CLIP);
-
- gtk_timeout_remove (sheet->clip_timer);
- gtk_sheet_range_draw (sheet, &sheet->clip_range);
-
- if (gtk_sheet_range_isvisible (sheet, sheet->range))
- gtk_sheet_range_draw (sheet, &sheet->range);
-}
-
-gboolean
-gtk_sheet_in_clip (GtkSheet *sheet)
-{
- g_return_val_if_fail (sheet != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_SHEET (sheet), FALSE);
-
- return GTK_SHEET_IN_CLIP (sheet);
-}
-
-static gint
-gtk_sheet_flash (gpointer data)
-{
- GtkSheet *sheet;
- gint x,y,width,height;
- GdkRectangle clip_area;
-
- sheet = GTK_SHEET (data);
-
- if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return TRUE;
- if (!GTK_WIDGET_DRAWABLE (GTK_WIDGET (sheet))) return TRUE;
- if (!gtk_sheet_range_isvisible (sheet, sheet->clip_range)) return TRUE;
- if (GTK_SHEET_IN_XDRAG (sheet)) return TRUE;
- if (GTK_SHEET_IN_YDRAG (sheet)) return TRUE;
- GDK_THREADS_ENTER ();
- x = COLUMN_LEFT_XPIXEL (sheet,sheet->clip_range.col0)+1;
- y = ROW_TOP_YPIXEL (sheet,sheet->clip_range.row0)+1;
- width = COLUMN_LEFT_XPIXEL (sheet,sheet->clip_range.coli)- x+
- xxx_column_width (sheet, sheet->clip_range.coli) - 1;
- height = ROW_TOP_YPIXEL (sheet,sheet->clip_range.rowi)- y+
- yyy_row_height (sheet, sheet->clip_range.rowi)- 1;
-
- clip_area.x = COLUMN_LEFT_XPIXEL (sheet, MIN_VISIBLE_COLUMN (sheet));
- clip_area.y = ROW_TOP_YPIXEL (sheet, MIN_VISIBLE_ROW (sheet));
- clip_area.width = sheet->sheet_window_width;
- clip_area.height = sheet->sheet_window_height;
-
- if (x < 0)
- {
- width += x + 1;
- x =- 1;
- }
- if (width > clip_area.width) width = clip_area.width + 10;
- if (y < 0)
- {
- height += y + 1;
- y =- 1;
- }
- if (height > clip_area.height) height = clip_area.height + 10;
-
- gdk_draw_pixmap (sheet->sheet_window,
- GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL],
- sheet->pixmap,
- x, y,
- x, y,
- 1, height);
- gdk_draw_pixmap (sheet->sheet_window,
- GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL],
- sheet->pixmap,
- x, y,
- x, y,
- width, 1);
-
- gdk_draw_pixmap (sheet->sheet_window,
- GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL],
- sheet->pixmap,
- x, y + height,
- x, y + height,
- width, 1);
-
- gdk_draw_pixmap (sheet->sheet_window,
- GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL],
- sheet->pixmap,
- x + width, y,
- x + width, y,
- 1, height);
-
-
- sheet->interval = sheet->interval + 1;
- if (sheet->interval == TIME_INTERVAL) sheet->interval = 0;
-
- gdk_gc_set_dashes (sheet->xor_gc, sheet->interval, (gint8*)"\4\4", 2);
- gtk_sheet_draw_flashing_range (sheet,sheet->clip_range);
- gdk_gc_set_dashes (sheet->xor_gc, 0, (gint8*)"\4\4", 2);
-
- GDK_THREADS_LEAVE ();
-
- return TRUE;
-}
-
-static void
-gtk_sheet_draw_flashing_range (GtkSheet *sheet, GtkSheetRange range)
-{
- GdkRectangle clip_area;
- gint x,y,width,height;
-
- if (!gtk_sheet_range_isvisible (sheet, sheet->clip_range)) return;
-
- clip_area.x = COLUMN_LEFT_XPIXEL (sheet, MIN_VISIBLE_COLUMN (sheet));
- clip_area.y = ROW_TOP_YPIXEL (sheet, MIN_VISIBLE_ROW (sheet));
- clip_area.width = sheet->sheet_window_width;
- clip_area.height = sheet->sheet_window_height;
-
- gdk_gc_set_clip_rectangle (sheet->xor_gc, &clip_area);
-
- x = COLUMN_LEFT_XPIXEL (sheet,sheet->clip_range.col0)+1;
- y = ROW_TOP_YPIXEL (sheet,sheet->clip_range.row0)+1;
- width = COLUMN_LEFT_XPIXEL (sheet,sheet->clip_range.coli)- x+
- xxx_column_width (sheet, sheet->clip_range.coli) - 1;
- height = ROW_TOP_YPIXEL (sheet,sheet->clip_range.rowi)- y+
- yyy_row_height (sheet, sheet->clip_range.rowi)- 1;
-
- if (x < 0)
- {
- width += x + 1;
- x =- 1;
- }
- if (width > clip_area.width) width = clip_area.width + 10;
- if (y < 0)
- {
- height += y + 1;
- y =- 1;
- }
- if (height > clip_area.height) height = clip_area.height + 10;
-
- gdk_gc_set_line_attributes (sheet->xor_gc, 1, 1, 0, 0 );
-
- gdk_draw_rectangle (sheet->sheet_window, sheet->xor_gc, FALSE,
- x, y,
- width, height);
-
- gdk_gc_set_line_attributes (sheet->xor_gc, 1, 0, 0, 0);
-
- gdk_gc_set_clip_rectangle (sheet->xor_gc, NULL);
-}
-
-static gint
-gtk_sheet_range_isvisible (GtkSheet * sheet,
+static gboolean
+gtk_sheet_range_isvisible (const GtkSheet * sheet,
GtkSheetRange range)
{
g_return_val_if_fail (sheet != NULL, FALSE);
return TRUE;
}
-static gint
+static gboolean
gtk_sheet_cell_isvisible (GtkSheet * sheet,
gint row, gint column)
{
if (sheet->vadjustment)
{
- gtk_signal_disconnect_by_data (GTK_OBJECT (sheet->vadjustment), sheet);
- gtk_object_unref (GTK_OBJECT (sheet->vadjustment));
+ g_signal_handlers_disconnect_matched (sheet->vadjustment,
+ G_SIGNAL_MATCH_DATA,
+ 0, 0, 0, 0,
+ sheet);
+ g_object_unref (sheet->vadjustment);
}
sheet->vadjustment = adjustment;
if (sheet->vadjustment)
{
- gtk_object_ref (GTK_OBJECT (sheet->vadjustment));
- gtk_object_sink (GTK_OBJECT (sheet->vadjustment));
+ g_object_ref (sheet->vadjustment);
+ g_object_ref_sink (sheet->vadjustment);
- gtk_signal_connect (GTK_OBJECT (sheet->vadjustment), "changed",
- (GtkSignalFunc) vadjustment_changed,
- (gpointer) sheet);
- gtk_signal_connect (GTK_OBJECT (sheet->vadjustment), "value_changed",
- (GtkSignalFunc) vadjustment_value_changed,
- (gpointer) sheet);
+ g_signal_connect (sheet->vadjustment, "value_changed",
+ G_CALLBACK (vadjustment_value_changed),
+ sheet);
}
if (!sheet->vadjustment || !old_adjustment)
if (sheet->hadjustment)
{
- gtk_signal_disconnect_by_data (GTK_OBJECT (sheet->hadjustment), sheet);
- gtk_object_unref (GTK_OBJECT (sheet->hadjustment));
+ g_signal_handlers_disconnect_matched (sheet->hadjustment,
+ G_SIGNAL_MATCH_DATA,
+ 0, 0, 0, 0,
+ sheet);
+ g_object_unref (sheet->hadjustment);
}
sheet->hadjustment = adjustment;
if (sheet->hadjustment)
{
- gtk_object_ref (GTK_OBJECT (sheet->hadjustment));
- gtk_object_sink (GTK_OBJECT (sheet->hadjustment));
+ g_object_ref (sheet->hadjustment);
+ g_object_ref_sink (sheet->hadjustment);
- gtk_signal_connect (GTK_OBJECT (sheet->hadjustment), "changed",
- (GtkSignalFunc) hadjustment_changed,
- (gpointer) sheet);
- gtk_signal_connect (GTK_OBJECT (sheet->hadjustment), "value_changed",
- (GtkSignalFunc) hadjustment_value_changed,
- (gpointer) sheet);
+ g_signal_connect (sheet->hadjustment, "value_changed",
+ G_CALLBACK (hadjustment_value_changed),
+ sheet);
}
if (!sheet->hadjustment || !old_adjustment)
sheet = GTK_SHEET (object);
- /* get rid of all the cells */
- gtk_sheet_range_clear (sheet, NULL);
- gtk_sheet_range_delete (sheet, NULL);
-
if (sheet->name)
{
g_free (sheet->name);
sheet->button = NULL;
}
- if (sheet->clip_timer)
- {
- gtk_timeout_remove (sheet->clip_timer);
- sheet->clip_timer = 0;
- }
-
/* unref adjustments */
if (sheet->hadjustment)
{
- gtk_signal_disconnect_by_data (GTK_OBJECT (sheet->hadjustment), sheet);
- gtk_object_unref (GTK_OBJECT (sheet->hadjustment));
+ g_signal_handlers_disconnect_matched (sheet->hadjustment,
+ G_SIGNAL_MATCH_DATA,
+ 0, 0, 0, 0,
+ sheet);
+
+ g_object_unref (sheet->hadjustment);
sheet->hadjustment = NULL;
}
+
if (sheet->vadjustment)
{
- gtk_signal_disconnect_by_data (GTK_OBJECT (sheet->vadjustment), sheet);
- gtk_object_unref (GTK_OBJECT (sheet->vadjustment));
+ g_signal_handlers_disconnect_matched (sheet->vadjustment,
+ G_SIGNAL_MATCH_DATA,
+ 0, 0, 0, 0,
+ sheet);
+
+ g_object_unref (sheet->vadjustment);
+
sheet->vadjustment = NULL;
}
gtk_sheet_realize_child (sheet, child);
}
+
+ gtk_sheet_update_primary_selection (sheet);
}
static void
{
sheet->button = gtk_button_new_with_label (" ");
- gtk_signal_connect (GTK_OBJECT (sheet->button),
- "pressed",
- (GtkSignalFunc) global_button_clicked,
- (gpointer) sheet);
+ g_signal_connect (sheet->button,
+ "pressed",
+ G_CALLBACK (global_button_clicked),
+ sheet);
}
static void
}
if (!GTK_WIDGET_MAPPED (sheet->sheet_entry)
- && ! gtk_sheet_locked (sheet)
&& sheet->active_cell.row >= 0
&& sheet->active_cell.col >= 0 )
{
fg_gc = sheet->fg_gc;
bg_gc = sheet->bg_gc;
- area.x = COLUMN_LEFT_XPIXEL (sheet,col);
- area.y = ROW_TOP_YPIXEL (sheet,row);
+ area.x = COLUMN_LEFT_XPIXEL (sheet, col);
+ area.y = ROW_TOP_YPIXEL (sheet, row);
area.width= xxx_column_width (sheet, col);
area.height = yyy_row_height (sheet, row);
gtk_sheet_cell_draw_label (GtkSheet *sheet, gint row, gint col)
{
GtkWidget *widget;
- GdkRectangle area, clip_area;
+ GdkRectangle area;
gint i;
gint text_width, text_height, y;
gint xoffset = 0;
fg_gc = sheet->fg_gc;
bg_gc = sheet->bg_gc;
- area.x = COLUMN_LEFT_XPIXEL (sheet,col);
- area.y = ROW_TOP_YPIXEL (sheet,row);
+ area.x = COLUMN_LEFT_XPIXEL (sheet, col);
+ area.y = ROW_TOP_YPIXEL (sheet, row);
area.width = xxx_column_width (sheet, col);
area.height = yyy_row_height (sheet, row);
- clip_area = area;
layout = gtk_widget_create_pango_layout (GTK_WIDGET (sheet), label);
dispose_string (sheet, label);
case GTK_JUSTIFY_RIGHT:
size = area.width;
area.x +=area.width;
- if (!gtk_sheet_clip_text (sheet))
{
for (i = col - 1; i >= MIN_VISIBLE_COLUMN (sheet); i--)
{
sizel = area.width / 2;
sizer = area.width / 2;
area.x += area.width / 2;
- if (!gtk_sheet_clip_text (sheet))
{
for (i = col + 1; i <= MAX_VISIBLE_COLUMN (sheet); i++)
{
case GTK_JUSTIFY_LEFT:
default:
size = area.width;
- if (!gtk_sheet_clip_text (sheet))
{
for (i = col + 1; i <= MAX_VISIBLE_COLUMN (sheet); i++)
{
break;
}
- if (!gtk_sheet_clip_text (sheet)) clip_area = area;
- gdk_gc_set_clip_rectangle (fg_gc, &clip_area);
+ gdk_gc_set_clip_rectangle (fg_gc, &area);
gdk_draw_layout (sheet->pixmap, fg_gc,
layout);
gdk_gc_set_clip_rectangle (fg_gc, NULL);
- g_object_unref (G_OBJECT (layout));
+ g_object_unref (layout);
gdk_draw_pixmap (sheet->sheet_window,
GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL],
static void
gtk_sheet_range_draw (GtkSheet *sheet, const GtkSheetRange *range)
{
- gint i,j;
+ gint i, j;
GtkSheetRange drawing_range;
GdkRectangle area;
{
drawing_range.row0 = MIN_VISIBLE_ROW (sheet);
drawing_range.col0 = MIN_VISIBLE_COLUMN (sheet);
- drawing_range.rowi = MIN (MAX_VISIBLE_ROW (sheet), yyy_row_count (sheet) - 1);
+ drawing_range.rowi = MIN (MAX_VISIBLE_ROW (sheet),
+ yyy_row_count (sheet) - 1);
drawing_range.coli = MAX_VISIBLE_COLUMN (sheet);
gdk_draw_rectangle (sheet->pixmap,
GTK_WIDGET (sheet)->style->white_gc,
TRUE,
- 0,0,
+ 0, 0,
sheet->sheet_window_width,
sheet->sheet_window_height);
}
drawing_range.coli = MIN (range->coli, MAX_VISIBLE_COLUMN (sheet));
}
-
if (drawing_range.coli == xxx_column_count (sheet) - 1)
{
area.x = COLUMN_LEFT_XPIXEL (sheet,
gdk_draw_rectangle (sheet->pixmap,
sheet->fg_gc,
TRUE,
- area.x,area.y,
+ area.x, area.y,
sheet->sheet_window_width - area.x,
sheet->sheet_window_height);
gdk_draw_rectangle (sheet->pixmap,
sheet->fg_gc,
TRUE,
- area.x,area.y,
+ area.x, area.y,
sheet->sheet_window_width,
sheet->sheet_window_height - area.y);
gtk_sheet_range_draw_selection (GtkSheet *sheet, GtkSheetRange range)
{
GdkRectangle area;
- gint i,j;
+ gint i, j;
GtkSheetRange aux;
if (range.col0 > sheet->range.coli || range.coli < sheet->range.col0 ||
xxx_column_is_visible (sheet, j) && yyy_row_is_visible (sheet, i))
{
- area.x = COLUMN_LEFT_XPIXEL (sheet,j);
- area.y = ROW_TOP_YPIXEL (sheet,i);
+ area.x = COLUMN_LEFT_XPIXEL (sheet, j);
+ area.y = ROW_TOP_YPIXEL (sheet, i);
area.width= xxx_column_width (sheet, j);
area.height = yyy_row_height (sheet, i);
}
if (j == sheet->range.coli) area.width = area.width - 3;
- if (i!=sheet->active_cell.row || j!=sheet->active_cell.col)
+ 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);
+ area.x + 1, area.y + 1,
+ area.width, area.height);
}
}
static void
gtk_sheet_draw_backing_pixmap (GtkSheet *sheet, GtkSheetRange range)
{
- gint x,y,width,height;
+ gint x, y, width, height;
if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
- x = COLUMN_LEFT_XPIXEL (sheet,range.col0);
+ x = COLUMN_LEFT_XPIXEL (sheet, range.col0);
y = ROW_TOP_YPIXEL (sheet, range.row0);
width = COLUMN_LEFT_XPIXEL (sheet, range.coli) - x +
xxx_column_width (sheet, range.coli);
range.row0 = row;
range.rowi = row;
- range.col0 = sheet->view.col0;
- range.coli = sheet->view.coli;
+ range.col0 = MIN_VISIBLE_COLUMN (sheet);
+ range.coli = MAX_VISIBLE_COLUMN (sheet);
if (gtk_sheet_autoresize (sheet) &&
text_width > xxx_column_width (sheet, col) -
}
if ( changed )
- gtk_signal_emit (GTK_OBJECT (sheet),sheet_signals[CHANGED], row, col);
+ g_signal_emit (sheet, sheet_signals[CHANGED], 0, row, col);
}
range.row0 = row;
range.rowi = row;
- range.col0 = sheet->view.col0;
- range.coli = sheet->view.coli;
+ range.col0 = MIN_VISIBLE_COLUMN (sheet);
+ range.coli = MAX_VISIBLE_COLUMN (sheet);
- gtk_sheet_real_cell_clear (sheet, row, column, FALSE);
-
- if (!GTK_SHEET_IS_FROZEN (sheet))
- {
- gtk_sheet_range_draw (sheet, &range);
- }
-}
-
-void
-gtk_sheet_cell_delete (GtkSheet *sheet, gint row, gint column)
-{
- GtkSheetRange range;
-
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (GTK_IS_SHEET (sheet));
- if (column >= xxx_column_count (sheet) || row >= yyy_row_count (sheet)) return;
- if (column < 0 || row < 0) return;
-
- range.row0 = row;
- range.rowi = row;
- range.col0 = sheet->view.col0;
- range.coli = sheet->view.coli;
-
- gtk_sheet_real_cell_clear (sheet, row, column, TRUE);
+ gtk_sheet_real_cell_clear (sheet, row, column);
if (!GTK_SHEET_IS_FROZEN (sheet))
{
}
static void
-gtk_sheet_real_cell_clear (GtkSheet *sheet, gint row, gint column, gboolean delete)
+gtk_sheet_real_cell_clear (GtkSheet *sheet, gint row, gint column)
{
GSheetModel *model = gtk_sheet_get_model (sheet);
{
g_sheet_model_datum_clear (model, row, column);
- if (GTK_IS_OBJECT (sheet) && G_OBJECT (sheet)->ref_count > 0)
- gtk_signal_emit (GTK_OBJECT (sheet),sheet_signals[CLEAR_CELL],
- row, column);
+ if (G_OBJECT (sheet)->ref_count > 0)
+ g_signal_emit (sheet, sheet_signals[CLEAR_CELL], 0,
+ row, column);
}
dispose_string (sheet, old_text);
g_return_if_fail (sheet != NULL);
g_return_if_fail (GTK_IS_SHEET (sheet));
- gtk_sheet_real_range_clear (sheet, range, FALSE);
-}
-
-void
-gtk_sheet_range_delete (GtkSheet *sheet, const GtkSheetRange *range)
-{
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (GTK_IS_SHEET (sheet));
-
- gtk_sheet_real_range_clear (sheet, range, TRUE);
+ gtk_sheet_real_range_clear (sheet, range);
}
-
static void
-gtk_sheet_real_range_clear (GtkSheet *sheet, const GtkSheetRange *range,
- gboolean delete)
+gtk_sheet_real_range_clear (GtkSheet *sheet, const GtkSheetRange *range)
{
gint i, j;
GtkSheetRange clear;
for (i = clear.row0; i <= clear.rowi; i++)
for (j = clear.col0; j <= clear.coli; j++)
{
- gtk_sheet_real_cell_clear (sheet, i, j, delete);
+ gtk_sheet_real_cell_clear (sheet, i, j);
}
gtk_sheet_range_draw (sheet, NULL);
g_return_if_fail (sheet != NULL);
g_return_if_fail (GTK_IS_SHEET (sheet));
- *row = sheet->active_cell.row;
- *column = sheet->active_cell.col;
+ if ( row ) *row = sheet->active_cell.row;
+ if (column) *column = sheet->active_cell.col;
}
static void
gtk_sheet_entry_changed (GtkWidget *widget, gpointer data)
{
GtkSheet *sheet;
- gint row,col;
+ gint row, col;
const char *text;
GtkJustification justification;
GtkSheetCellAttr attributes;
if (row < 0 || col < 0) return;
- sheet->active_cell.row =- 1;
- sheet->active_cell.col =- 1;
+ sheet->active_cell.row = -1;
+ sheet->active_cell.col = -1;
text = gtk_entry_get_text (GTK_ENTRY (gtk_sheet_get_entry (sheet)));
if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return FALSE;
if (sheet->state != GTK_SHEET_NORMAL) return FALSE;
- _gtkextra_signal_emit (GTK_OBJECT (sheet),sheet_signals[DEACTIVATE],
+ _gtkextra_signal_emit (GTK_OBJECT (sheet), sheet_signals[DEACTIVATE],
sheet->active_cell.row,
sheet->active_cell.col, &veto);
if ( sheet->active_cell.row == -1 || sheet->active_cell.col == -1 )
return TRUE;
- gtk_signal_disconnect_by_func (GTK_OBJECT (gtk_sheet_get_entry (sheet)),
- (GtkSignalFunc) gtk_sheet_entry_changed,
- GTK_OBJECT (GTK_WIDGET (sheet)));
+ 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;
gtk_sheet_hide_active_cell (GtkSheet *sheet)
{
const char *text;
- gint row,col;
+ gint row, col;
GtkJustification justification;
GtkSheetCellAttr attributes;
gtk_sheet_get_attributes (sheet, row, col, &attributes);
justification = attributes.justification;
- if (text && strlen (text) != 0)
- {
- gtk_sheet_set_cell (sheet, row, col, justification, text);
- gtk_signal_emit (GTK_OBJECT (sheet),sheet_signals[SET_CELL], row, col);
- }
- else
- {
- gtk_sheet_cell_clear (sheet, row, col);
- }
-
row = sheet->active_cell.row;
col = sheet->active_cell.col;
gdk_draw_pixmap (sheet->sheet_window,
GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL],
sheet->pixmap,
- COLUMN_LEFT_XPIXEL (sheet,col)- 1,
- ROW_TOP_YPIXEL (sheet,row)- 1,
- COLUMN_LEFT_XPIXEL (sheet,col)- 1,
- ROW_TOP_YPIXEL (sheet,row)- 1,
+ COLUMN_LEFT_XPIXEL (sheet, col)- 1,
+ ROW_TOP_YPIXEL (sheet, row)- 1,
+ COLUMN_LEFT_XPIXEL (sheet, col)- 1,
+ ROW_TOP_YPIXEL (sheet, row)- 1,
xxx_column_width (sheet, col) + 4,
yyy_row_height (sheet, row)+4);
g_return_val_if_fail (GTK_IS_SHEET (sheet), FALSE);
if (row < 0 || col < 0) return FALSE;
- if (row >= yyy_row_count (sheet) || col >= xxx_column_count (sheet))
- return FALSE;
- /* _gtkextra_signal_emit (GTK_OBJECT (sheet),sheet_signals[ACTIVATE], row, col, &veto);
- if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return veto;
- */
+ if ( row > yyy_row_count (sheet) || col > xxx_column_count (sheet))
+ return FALSE;
if (!veto) return FALSE;
if (sheet->state != GTK_SHEET_NORMAL)
gtk_sheet_show_active_cell (sheet);
-
- g_signal_connect (G_OBJECT (gtk_sheet_get_entry (sheet)),
+ g_signal_connect (gtk_sheet_get_entry (sheet),
"changed",
G_CALLBACK (gtk_sheet_entry_changed),
sheet);
- _gtkextra_signal_emit (GTK_OBJECT (sheet),sheet_signals[ACTIVATE], row, col, &veto);
+ _gtkextra_signal_emit (GTK_OBJECT (sheet), sheet_signals [ACTIVATE], row, col, &veto);
return TRUE;
}
gtk_entry_set_visibility (GTK_ENTRY (sheet_entry), attributes.is_visible);
- if (gtk_sheet_locked (sheet) || !attributes.is_editable)
- gtk_entry_set_editable (GTK_ENTRY (sheet_entry), FALSE);
- else
- gtk_entry_set_editable (GTK_ENTRY (sheet_entry), TRUE);
/*** Added by John Gotts. Mar 25, 2005 *********/
old_text = gtk_entry_get_text (GTK_ENTRY (sheet_entry));
gtk_sheet_draw_active_cell (GtkSheet *sheet)
{
gint row, col;
+ GtkSheetRange range;
if (!GTK_WIDGET_DRAWABLE (GTK_WIDGET (sheet))) return;
if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
if (!gtk_sheet_cell_isvisible (sheet, row, col)) return;
- gtk_sheet_draw_border (sheet, sheet->range);
+ range.col0 = range.coli = col;
+ range.row0 = range.rowi = row;
+
+ gtk_sheet_draw_border (sheet, range);
}
static void
gtk_sheet_new_selection (GtkSheet *sheet, GtkSheetRange *range)
{
- gint i,j, mask1, mask2;
+ gint i, j, mask1, mask2;
gint state, selected;
- gint x,y,width,height;
+ gint x, y, width, height;
GtkSheetRange new_range, aux_range;
g_return_if_fail (sheet != NULL);
if (mask1 != mask2)
{
- x = COLUMN_LEFT_XPIXEL (sheet,j);
+ x = COLUMN_LEFT_XPIXEL (sheet, j);
y = ROW_TOP_YPIXEL (sheet, i);
width = COLUMN_LEFT_XPIXEL (sheet, j)- x+
xxx_column_width (sheet, j);
if (i != sheet->active_cell.row || j != sheet->active_cell.col)
{
- x = COLUMN_LEFT_XPIXEL (sheet,j);
+ x = COLUMN_LEFT_XPIXEL (sheet, j);
y = ROW_TOP_YPIXEL (sheet, i);
width = COLUMN_LEFT_XPIXEL (sheet, j)- x+
xxx_column_width (sheet, j);
gdk_draw_rectangle (sheet->sheet_window,
sheet->xor_gc,
TRUE,
- x + 1,y + 1,
- width,height);
+ x + 1, y + 1,
+ width, height);
}
}
}
xxx_column_is_visible (sheet, j) && yyy_row_is_visible (sheet, i))
{
- x = COLUMN_LEFT_XPIXEL (sheet,j);
+ x = COLUMN_LEFT_XPIXEL (sheet, j);
y = ROW_TOP_YPIXEL (sheet, i);
width = COLUMN_LEFT_XPIXEL (sheet, j)- x+ xxx_column_width (sheet, j);
height = ROW_TOP_YPIXEL (sheet, i)- y + yyy_row_height (sheet, i);
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 &&
+ if (state != GTK_STATE_SELECTED && selected &&
xxx_column_is_visible (sheet, j) && yyy_row_is_visible (sheet, i) &&
(i != sheet->active_cell.row || j != sheet->active_cell.col))
{
- x = COLUMN_LEFT_XPIXEL (sheet,j);
+ x = COLUMN_LEFT_XPIXEL (sheet, j);
y = ROW_TOP_YPIXEL (sheet, i);
width = COLUMN_LEFT_XPIXEL (sheet, j)- x+ xxx_column_width (sheet, j);
height = ROW_TOP_YPIXEL (sheet, i)- y + yyy_row_height (sheet, i);
gdk_draw_rectangle (sheet->sheet_window,
sheet->xor_gc,
TRUE,
- x + 1,y + 1,
- width,height);
+ x + 1, y + 1,
+ width, height);
}
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))
+ if (mask2 != mask1 || (mask2 == mask1 && state != GTK_STATE_SELECTED))
{
- x = COLUMN_LEFT_XPIXEL (sheet,j);
+ x = COLUMN_LEFT_XPIXEL (sheet, j);
y = ROW_TOP_YPIXEL (sheet, i);
width = xxx_column_width (sheet, j);
height = yyy_row_height (sheet, i);
gdk_draw_rectangle (sheet->sheet_window,
sheet->xor_gc,
TRUE,
- x + 1,y - 1,
- width,3);
+ 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);
+ 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);
+ 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);
+ x + width - 1, y + 1,
+ 3, height);
widget = GTK_WIDGET (sheet);
- x = COLUMN_LEFT_XPIXEL (sheet,new_range.col0);
- y = ROW_TOP_YPIXEL (sheet,new_range.row0);
+ x = COLUMN_LEFT_XPIXEL (sheet, new_range.col0);
+ y = ROW_TOP_YPIXEL (sheet, new_range.row0);
width = COLUMN_LEFT_XPIXEL (sheet, new_range.coli) - x +
xxx_column_width (sheet, new_range.coli);
gdk_gc_set_clip_rectangle (sheet->xor_gc, &area);
- for (i =- 1; i <= 1; ++i)
+ for (i = -1; i <= 1; ++i)
gdk_draw_rectangle (sheet->sheet_window,
sheet->xor_gc,
FALSE,
static void
gtk_sheet_draw_corners (GtkSheet *sheet, GtkSheetRange range)
{
- gint x,y;
+ gint x, y;
guint width = 1;
if (gtk_sheet_cell_isvisible (sheet, range.row0, range.col0))
{
- x = COLUMN_LEFT_XPIXEL (sheet,range.col0);
- y = ROW_TOP_YPIXEL (sheet,range.row0);
+ x = COLUMN_LEFT_XPIXEL (sheet, range.col0);
+ y = ROW_TOP_YPIXEL (sheet, range.row0);
gdk_draw_pixmap (sheet->sheet_window,
GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL],
sheet->pixmap,
gdk_draw_rectangle (sheet->sheet_window,
sheet->xor_gc,
TRUE,
- x - 1,y - 1,
- 3,3);
+ x - 1, y - 1,
+ 3, 3);
}
if (gtk_sheet_cell_isvisible (sheet, range.row0, range.coli) ||
sheet->state == GTK_SHEET_COLUMN_SELECTED)
{
- x = COLUMN_LEFT_XPIXEL (sheet,range.coli)+
+ x = COLUMN_LEFT_XPIXEL (sheet, range.coli)+
xxx_column_width (sheet, range.coli);
- y = ROW_TOP_YPIXEL (sheet,range.row0);
+ y = ROW_TOP_YPIXEL (sheet, range.row0);
width = 1;
if (sheet->state == GTK_SHEET_COLUMN_SELECTED)
{
- y = ROW_TOP_YPIXEL (sheet, sheet->view.row0)+3;
+ y = ROW_TOP_YPIXEL (sheet, MIN_VISIBLE_ROW (sheet))+3;
width = 3;
}
gdk_draw_pixmap (sheet->sheet_window,
gdk_draw_rectangle (sheet->sheet_window,
sheet->xor_gc,
TRUE,
- x - width + width / 2,y - width + width / 2,
- 2 + width,2 + width);
+ x - width + width / 2, y - width + width / 2,
+ 2 + width, 2 + width);
}
if (gtk_sheet_cell_isvisible (sheet, range.rowi, range.col0) ||
sheet->state == GTK_SHEET_ROW_SELECTED)
{
- x = COLUMN_LEFT_XPIXEL (sheet,range.col0);
- y = ROW_TOP_YPIXEL (sheet,range.rowi)+
+ x = COLUMN_LEFT_XPIXEL (sheet, range.col0);
+ y = ROW_TOP_YPIXEL (sheet, range.rowi)+
yyy_row_height (sheet, range.rowi);
width = 1;
if (sheet->state == GTK_SHEET_ROW_SELECTED)
{
- x = COLUMN_LEFT_XPIXEL (sheet, sheet->view.col0)+3;
+ x = COLUMN_LEFT_XPIXEL (sheet, MIN_VISIBLE_COLUMN (sheet))+3;
width = 3;
}
gdk_draw_pixmap (sheet->sheet_window,
gdk_draw_rectangle (sheet->sheet_window,
sheet->xor_gc,
TRUE,
- x - width + width / 2,y - width + width / 2,
- 2 + width,2 + width);
+ x - width + width / 2, y - width + width / 2,
+ 2 + width, 2 + width);
}
if (gtk_sheet_cell_isvisible (sheet, range.rowi, range.coli))
{
- x = COLUMN_LEFT_XPIXEL (sheet,range.coli)+
+ x = COLUMN_LEFT_XPIXEL (sheet, range.coli)+
xxx_column_width (sheet, range.coli);
- y = ROW_TOP_YPIXEL (sheet,range.rowi)+
+ y = ROW_TOP_YPIXEL (sheet, range.rowi)+
yyy_row_height (sheet, range.rowi);
width = 1;
if (sheet->state == GTK_SHEET_RANGE_SELECTED) width = 3;
gdk_draw_rectangle (sheet->sheet_window,
sheet->xor_gc,
TRUE,
- x - width + width / 2,y - width + width / 2,
- 2 + width,2 + width);
+ x - width + width / 2, y - width + width / 2,
+ 2 + width, 2 + width);
}
gtk_sheet_range_draw_selection (sheet, sheet->range);
}
- gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[SELECT_RANGE], &sheet->range);
+ gtk_sheet_update_primary_selection (sheet);
+
+ g_signal_emit (sheet, sheet_signals[SELECT_RANGE], 0, &sheet->range);
}
+
+void
+gtk_sheet_get_selected_range (GtkSheet *sheet,
+ GtkSheetRange *range)
+{
+ g_return_if_fail (sheet != NULL);
+ *range = sheet->range;
+}
+
+
void
gtk_sheet_select_range (GtkSheet * sheet, const GtkSheetRange *range)
{
if (range->col0 < 0 || range->coli < 0) return;
- if ( gtk_sheet_locked (sheet)) return ;
-
if (sheet->state != GTK_SHEET_NORMAL)
gtk_sheet_real_unselect_range (sheet, NULL);
else
{
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);
}
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);
+
if (gtk_sheet_range_isvisible (sheet, *range))
gtk_sheet_draw_backing_pixmap (sheet, *range);
sheet = GTK_SHEET (widget);
- if ( event->type == GDK_2BUTTON_PRESS)
+ /* Cancel any pending tooltips */
+ if (sheet->motion_timer)
{
- gtk_widget_get_pointer (widget, &x, &y);
- gtk_sheet_get_pixel_info (sheet, x, y, &row, &column);
+ g_source_remove (sheet->motion_timer);
+ sheet->motion_timer = 0;
+ }
- if (event->window == sheet->column_title_window)
- {
- gtk_signal_emit (GTK_OBJECT (sheet),
- sheet_signals[DOUBLE_CLICK_COLUMN], column);
- }
- else if (event->window == sheet->row_title_window)
- {
- gtk_signal_emit (GTK_OBJECT (sheet),
- sheet_signals[DOUBLE_CLICK_ROW], row);
- }
+ gtk_widget_get_pointer (widget, &x, &y);
+ gtk_sheet_get_pixel_info (sheet, x, y, &row, &column);
+
+
+ if (event->window == sheet->column_title_window)
+ {
+ g_signal_emit (sheet,
+ 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);
+
+ }
+ else if (event->window == sheet->row_title_window)
+ {
+ g_signal_emit (sheet,
+ 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);
}
else if (sheet->cursor_drag->type == GDK_TOP_LEFT_ARROW &&
!GTK_SHEET_IN_SELECTION (sheet)
&& ! GTK_SHEET_IN_DRAG (sheet)
- && ! gtk_sheet_locked (sheet)
&& sheet->active_cell.row >= 0
&& sheet->active_cell.col >= 0
)
return TRUE;
}
-#if 0
-static gint
-gtk_sheet_scroll (gpointer data)
-{
- GtkSheet *sheet;
- gint x,y,row,column;
- gint move;
-
- sheet = GTK_SHEET (data);
-
- GDK_THREADS_ENTER ();
-
- gtk_widget_get_pointer (GTK_WIDGET (sheet), &x, &y);
- gtk_sheet_get_pixel_info (sheet, x, y, &row, &column);
-
- move = TRUE;
-
- if (GTK_SHEET_IN_SELECTION (sheet))
- gtk_sheet_extend_selection (sheet, row, column);
-
- if (GTK_SHEET_IN_DRAG (sheet) || GTK_SHEET_IN_RESIZE (sheet))
- {
- move = gtk_sheet_move_query (sheet, row, column);
- if (move) draw_xor_rectangle (sheet, sheet->drag_range);
- }
-
- GDK_THREADS_LEAVE ();
-
- return TRUE;
-}
-#endif
-
static void
gtk_sheet_click_cell (GtkSheet *sheet, gint row, gint column, gboolean *veto)
{
return;
}
- if (row == - 1 && column == - 1)
+ if (row == -1 && column == -1)
{
sheet->range.row0 = 0;
sheet->range.col0 = 0;
*veto = FALSE;
return;
}
+ gtk_sheet_activate_cell (sheet, row, column);
}
if (gtk_sheet_autoscroll (sheet))
GdkEventButton * event)
{
GtkSheet *sheet;
- gint x,y;
+ gint x, y;
sheet = GTK_SHEET (widget);
gtk_sheet_set_column_width (sheet, sheet->drag_cell.col,
new_column_width (sheet, sheet->drag_cell.col, &x));
sheet->old_hadjustment = -1.;
- gtk_signal_emit_by_name (GTK_OBJECT (sheet->hadjustment), "value_changed");
+ g_signal_emit_by_name (sheet->hadjustment, "value_changed");
return TRUE;
}
gtk_sheet_set_row_height (sheet, sheet->drag_cell.row, new_row_height (sheet, sheet->drag_cell.row, &y));
sheet->old_vadjustment = -1.;
- gtk_signal_emit_by_name (GTK_OBJECT (sheet->vadjustment), "value_changed");
+ g_signal_emit_by_name (sheet->vadjustment, "value_changed");
return TRUE;
}
old_range = sheet->range;
sheet->range = sheet->drag_range;
sheet->drag_range = old_range;
- gtk_signal_emit (GTK_OBJECT (sheet),sheet_signals[MOVE_RANGE],
- &sheet->drag_range, &sheet->range);
+ g_signal_emit (sheet, sheet_signals[MOVE_RANGE], 0,
+ &sheet->drag_range, &sheet->range);
gtk_sheet_select_range (sheet, &sheet->range);
}
sheet->drag_range = old_range;
if (sheet->state == GTK_STATE_NORMAL) sheet->state = GTK_SHEET_RANGE_SELECTED;
- gtk_signal_emit (GTK_OBJECT (sheet),sheet_signals[RESIZE_RANGE],
- &sheet->drag_range, &sheet->range);
+ g_signal_emit (sheet, sheet_signals[RESIZE_RANGE], 0,
+ &sheet->drag_range, &sheet->range);
gtk_sheet_select_range (sheet, &sheet->range);
}
motion_timeout_callback (gpointer data)
{
GtkSheet *sheet = GTK_SHEET (data);
- if ( --sheet->motion_events == 0 )
+ gint x, y;
+ gint row, column;
+ gtk_widget_get_pointer (GTK_WIDGET (sheet), &x, &y);
+
+ if ( gtk_sheet_get_pixel_info (sheet, x, y, &row, &column) )
{
- gint x, y;
- gint row, column;
- gtk_widget_get_pointer (GTK_WIDGET (sheet), &x, &y);
+ if ( column == -1 && row == -1 )
+ return FALSE;
- if ( gtk_sheet_get_pixel_info (sheet, x, y, &row, &column) )
+ if ( column == -1)
{
- if ( column == -1 && row == -1 )
- return FALSE;
-
- if ( column == -1)
- {
- GSheetRow *row_geo = sheet->row_geometry;
- gchar *text;
+ GSheetRow *row_geo = sheet->row_geometry;
+ gchar *text;
- text = g_sheet_row_get_subtitle (row_geo, row);
+ text = g_sheet_row_get_subtitle (row_geo, row);
- show_subtitle (sheet, row, column, text);
- g_free (text);
- }
+ show_subtitle (sheet, row, column, text);
+ g_free (text);
+ }
- if ( row == -1)
- {
- GSheetColumn *col_geo = sheet->column_geometry;
- gchar *text;
+ if ( row == -1)
+ {
+ GSheetColumn *col_geo = sheet->column_geometry;
+ gchar *text;
- text = g_sheet_column_get_subtitle (col_geo, column);
+ text = g_sheet_column_get_subtitle (col_geo, column);
- show_subtitle (sheet, row, column, text );
+ show_subtitle (sheet, row, column, text );
- g_free (text);
- }
+ g_free (text);
}
}
if (!sheet->hover_window || ! GTK_WIDGET_VISIBLE (sheet->hover_window->window))
{
- sheet->motion_events++;
- g_timeout_add (TIMEOUT_HOVER, motion_timeout_callback, sheet);
+ if ( sheet->motion_timer > 0 )
+ g_source_remove (sheet->motion_timer);
+ sheet->motion_timer = g_timeout_add (TIMEOUT_HOVER, motion_timeout_callback, sheet);
}
else
{
gtk_sheet_rows_resizable (sheet))
{
gtk_widget_get_pointer (widget, &x, &y);
- if (!GTK_SHEET_IN_SELECTION (sheet) && POSSIBLE_YDRAG (sheet,y, &column))
+ if (!GTK_SHEET_IN_SELECTION (sheet) && POSSIBLE_YDRAG (sheet, y, &column))
{
new_cursor = GDK_SB_V_DOUBLE_ARROW;
if (new_cursor != sheet->cursor_drag->type)
new_cursor = GDK_TOP_LEFT_ARROW;
if ( event->window == sheet->sheet_window &&
- ! (POSSIBLE_RESIZE (sheet,x,y,&row,&column) || GTK_SHEET_IN_RESIZE (sheet)) && (POSSIBLE_DRAG (sheet, x,y,&row,&column) || GTK_SHEET_IN_DRAG (sheet)) &&
+ ! (POSSIBLE_RESIZE (sheet, x, y, &row, &column) || GTK_SHEET_IN_RESIZE (sheet)) && (POSSIBLE_DRAG (sheet, x, y, &row, &column) || GTK_SHEET_IN_DRAG (sheet)) &&
new_cursor != sheet->cursor_drag->type)
{
gdk_cursor_destroy (sheet->cursor_drag);
sheet->cursor_drag = gdk_cursor_new (GDK_TOP_LEFT_ARROW);
- gdk_window_set_cursor (sheet->sheet_window,sheet->cursor_drag);
+ gdk_window_set_cursor (sheet->sheet_window, sheet->cursor_drag);
}
new_cursor = GDK_SIZING;
{
gdk_cursor_destroy (sheet->cursor_drag);
sheet->cursor_drag = gdk_cursor_new (GDK_SIZING);
- gdk_window_set_cursor (sheet->sheet_window,sheet->cursor_drag);
+ gdk_window_set_cursor (sheet->sheet_window, sheet->cursor_drag);
}
if (GTK_SHEET_IN_DRAG (sheet))
{
GtkSheetRange aux;
- column = COLUMN_FROM_XPIXEL (sheet,x)- sheet->drag_cell.col;
- row = ROW_FROM_YPIXEL (sheet,y)- sheet->drag_cell.row;
+ column = COLUMN_FROM_XPIXEL (sheet, x)- sheet->drag_cell.col;
+ row = ROW_FROM_YPIXEL (sheet, y)- sheet->drag_cell.row;
if (sheet->state == GTK_SHEET_COLUMN_SELECTED) row = 0;
if (sheet->state == GTK_SHEET_ROW_SELECTED) column = 0;
sheet->x_drag = x;
gint v_h, current_col, current_row, col_threshold, row_threshold;
v_h = 1;
- if (abs (x - COLUMN_LEFT_XPIXEL (sheet,sheet->drag_cell.col)) >
- abs (y - ROW_TOP_YPIXEL (sheet,sheet->drag_cell.row))) v_h = 2;
+ if (abs (x - COLUMN_LEFT_XPIXEL (sheet, sheet->drag_cell.col)) >
+ abs (y - ROW_TOP_YPIXEL (sheet, sheet->drag_cell.row))) v_h = 2;
- current_col = COLUMN_FROM_XPIXEL (sheet,x);
- current_row = ROW_FROM_YPIXEL (sheet,y);
+ 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 = COLUMN_LEFT_XPIXEL (sheet,current_col) +
- xxx_column_width (sheet,current_col) / 2;
+ col_threshold = COLUMN_LEFT_XPIXEL (sheet, current_col) +
+ xxx_column_width (sheet, current_col) / 2;
if (column > 0)
{
if (x < col_threshold)
if (x > col_threshold)
column +=1;
}
- row_threshold = ROW_TOP_YPIXEL (sheet,current_row) +
+ row_threshold = ROW_TOP_YPIXEL (sheet, current_row) +
yyy_row_height (sheet, current_row)/2;
if (row > 0)
{
row_move = FALSE;
column_move = FALSE;
- row_align =- 1.;
- col_align =- 1.;
+ row_align = -1.;
+ col_align = -1.;
height = sheet->sheet_window_height;
width = sheet->sheet_window_width;
- if (row >= MAX_VISIBLE_ROW (sheet) && sheet->state!=GTK_SHEET_COLUMN_SELECTED)
+ if (row >= MAX_VISIBLE_ROW (sheet) && sheet->state != GTK_SHEET_COLUMN_SELECTED)
{
row_align = 1.;
- new_row = MIN (yyy_row_count (sheet), row + 1);
+ new_row = MIN (yyy_row_count (sheet) - 1, row + 1);
row_move = TRUE;
if (MAX_VISIBLE_ROW (sheet) == yyy_row_count (sheet) - 1 &&
ROW_TOP_YPIXEL (sheet, yyy_row_count (sheet)- 1) +
row_align = -1.;
}
}
- if (row < MIN_VISIBLE_ROW (sheet) && sheet->state!=GTK_SHEET_COLUMN_SELECTED)
+ 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)
+ if (column >= MAX_VISIBLE_COLUMN (sheet) && sheet->state != GTK_SHEET_ROW_SELECTED)
{
col_align = 1.;
new_col = MIN (xxx_column_count (sheet) - 1, column + 1);
col_align = -1.;
}
}
- if (column < MIN_VISIBLE_COLUMN (sheet) && sheet->state!=GTK_SHEET_ROW_SELECTED)
+ if (column < MIN_VISIBLE_COLUMN (sheet) && sheet->state != GTK_SHEET_ROW_SELECTED)
{
col_align = 0.;
column_move = TRUE;
{
GtkSheetRange range;
gint state;
- gint r,c;
+ gint r, c;
if (row == sheet->selection_cell.row && column == sheet->selection_cell.col)
return;
gdk_draw_pixmap (sheet->sheet_window,
GTK_WIDGET (sheet)->style->fg_gc[GTK_STATE_NORMAL],
sheet->pixmap,
- COLUMN_LEFT_XPIXEL (sheet,c)- 1,
- ROW_TOP_YPIXEL (sheet,r)- 1,
- COLUMN_LEFT_XPIXEL (sheet,c)- 1,
- ROW_TOP_YPIXEL (sheet,r)- 1,
+ COLUMN_LEFT_XPIXEL (sheet, c)- 1,
+ ROW_TOP_YPIXEL (sheet, r)- 1,
+ COLUMN_LEFT_XPIXEL (sheet, c)- 1,
+ ROW_TOP_YPIXEL (sheet, r)- 1,
xxx_column_width (sheet, c)+4,
yyy_row_height (sheet, r)+4);
gtk_sheet_range_draw_selection (sheet, sheet->range);
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);
+ 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 ||
GdkEventKey *key)
{
gboolean focus;
- gtk_signal_emit_by_name (GTK_OBJECT (widget), "key_press_event", key, &focus);
+ g_signal_emit_by_name (widget, "key_press_event", key, &focus);
return focus;
}
case GDK_Return: case GDK_KP_Enter:
if (sheet->state == GTK_SHEET_NORMAL &&
!GTK_SHEET_IN_SELECTION (sheet))
- gtk_signal_emit_stop_by_name (GTK_OBJECT (gtk_sheet_get_entry (sheet)),
- "key_press_event");
+ g_signal_stop_emission_by_name (gtk_sheet_get_entry (sheet),
+ "key-press-event");
row = sheet->active_cell.row;
col = sheet->active_cell.col;
if (sheet->state == GTK_SHEET_COLUMN_SELECTED)
col = MIN_VISIBLE_COLUMN (sheet);
row = row - scroll;
while (!yyy_row_is_visible (sheet, row) && row > 0) row--;
- row = MAX (0,row);
+ row = MAX (0, row);
gtk_sheet_click_cell (sheet, row, col, &veto);
extend_selection = FALSE;
break;
break;
case GDK_Home:
row = 0;
- while (!yyy_row_is_visible (sheet, row) && row < yyy_row_count (sheet)- 1) row++;
+ while (!yyy_row_is_visible (sheet, row) && row < yyy_row_count (sheet) - 1) row++;
gtk_sheet_click_cell (sheet, row, sheet->active_cell.col, &veto);
extend_selection = FALSE;
break;
case GDK_End:
- row = yyy_row_count (sheet)- 1;
+ row = yyy_row_count (sheet) - 1;
while (!yyy_row_is_visible (sheet, row) && row > 0) row--;
gtk_sheet_click_cell (sheet, row, sheet->active_cell.col, &veto);
extend_selection = FALSE;
if (sheet->row_titles_visible)
requisition->width += sheet->row_title_area.width;
- sheet->view.row0 = ROW_FROM_YPIXEL (sheet, sheet->column_title_area.height + 1);
- sheet->view.rowi = ROW_FROM_YPIXEL (sheet, sheet->sheet_window_height - 1);
- sheet->view.col0 = COLUMN_FROM_XPIXEL (sheet, sheet->row_title_area.width + 1);
- sheet->view.coli = COLUMN_FROM_XPIXEL (sheet, sheet->sheet_window_width);
-
- if (!sheet->column_titles_visible)
- sheet->view.row0 = ROW_FROM_YPIXEL (sheet, 1);
-
- if (!sheet->row_titles_visible)
- sheet->view.col0 = COLUMN_FROM_XPIXEL (sheet, 1);
-
children = sheet->children;
while (children)
{
/* row button allocation */
size_allocate_row_title_buttons (sheet);
-
- sheet->view.row0 = ROW_FROM_YPIXEL (sheet, sheet->column_title_area.height + 1);
- sheet->view.rowi = ROW_FROM_YPIXEL (sheet, sheet->sheet_window_height - 1);
- sheet->view.col0 = COLUMN_FROM_XPIXEL (sheet, sheet->row_title_area.width + 1);
- sheet->view.coli = COLUMN_FROM_XPIXEL (sheet, sheet->sheet_window_width);
-
- if (!sheet->column_titles_visible)
- sheet->view.row0 = ROW_FROM_YPIXEL (sheet, 1);
-
- if (!sheet->row_titles_visible)
- sheet->view.col0 = COLUMN_FROM_XPIXEL (sheet, 1);
-
size_allocate_column_title_buttons (sheet);
- size_allocate_row_title_buttons (sheet);
/* re - scale backing pixmap */
gtk_sheet_make_backing_pixmap (sheet, 0, 0);
size_allocate_column_title_buttons (GtkSheet * sheet)
{
gint i;
- gint x,width;
+ gint x, width;
if (!sheet->column_titles_visible) return;
if (!GTK_WIDGET_REALIZED (sheet))
if (MAX_VISIBLE_COLUMN (sheet) == xxx_column_count (sheet) - 1)
gdk_window_clear_area (sheet->column_title_window,
- 0,0,
+ 0, 0,
sheet->column_title_area.width,
sheet->column_title_area.height);
}
if (MAX_VISIBLE_ROW (sheet) == yyy_row_count (sheet)- 1)
gdk_window_clear_area (sheet->row_title_window,
- 0,0,
+ 0, 0,
sheet->row_title_area.width,
sheet->row_title_area.height);
style->fg[GTK_STATE_ACTIVE] = previous_style->fg[GTK_STATE_ACTIVE];
}
gtk_widget_set_style (GTK_WIDGET (sheet_entry), style);
+ g_object_unref (style);
}
}
column_width = xxx_column_width (sheet, sheet->active_cell.col);
size = MIN (text_size, max_size);
- size = MAX (size,column_width - 2 * CELLOFFSET);
+ size = MAX (size, column_width - 2 * CELLOFFSET);
row = sheet->active_cell.row;
col = sheet->active_cell.col;
- shentry_allocation.x = COLUMN_LEFT_XPIXEL (sheet,sheet->active_cell.col);
- shentry_allocation.y = ROW_TOP_YPIXEL (sheet,sheet->active_cell.row);
+ shentry_allocation.x = COLUMN_LEFT_XPIXEL (sheet, sheet->active_cell.col);
+ shentry_allocation.y = ROW_TOP_YPIXEL (sheet, sheet->active_cell.row);
shentry_allocation.width = column_width;
shentry_allocation.height = yyy_row_height (sheet, sheet->active_cell.row);
{
shentry_allocation.height -= 2 * CELLOFFSET;
shentry_allocation.y += CELLOFFSET;
- if (gtk_sheet_clip_text (sheet))
- shentry_allocation.width = column_width - 2 * CELLOFFSET;
- else
- shentry_allocation.width = size;
+ shentry_allocation.width = size;
switch (GTK_ITEM_ENTRY (sheet_entry)->justification)
{
gtk_widget_size_allocate (sheet->sheet_entry, &shentry_allocation);
- if (previous_style == style) gtk_style_unref (previous_style);
+ if (previous_style == style) g_object_unref (previous_style);
}
static void
gint i;
gint size = 0;
gint sizel = 0, sizer = 0;
- gint row,col;
+ gint row, col;
GtkJustification justification;
gchar *s = NULL;
row = sheet->active_cell.row;
col = sheet->active_cell.col;
- if ( ! GTK_IS_ITEM_ENTRY (sheet->sheet_entry) || gtk_sheet_clip_text (sheet))
+ if ( ! GTK_IS_ITEM_ENTRY (sheet->sheet_entry) )
return;
justification = GTK_ITEM_ENTRY (sheet->sheet_entry)->justification;
GTK_ITEM_ENTRY (sheet->sheet_entry)->text_max_size = size;
}
+
static void
create_sheet_entry (GtkSheet *sheet)
{
{
if (!g_type_is_a (sheet->entry_type, GTK_TYPE_ENTRY))
{
- parent = GTK_WIDGET (gtk_type_new (sheet->entry_type));
+ parent = g_object_new (sheet->entry_type, NULL);
sheet->sheet_entry = parent;
}
else
{
- parent = GTK_WIDGET (gtk_type_new (sheet->entry_type));
+ parent = g_object_new (sheet->entry_type, NULL);
entry = parent;
found_entry = TRUE;
}
gtk_widget_realize (sheet->sheet_entry);
}
- gtk_signal_connect_object (GTK_OBJECT (entry),"key_press_event",
- (GtkSignalFunc) gtk_sheet_entry_key_press,
- GTK_OBJECT (sheet));
+ g_signal_connect_swapped (entry, "key_press_event",
+ G_CALLBACK (gtk_sheet_entry_key_press),
+ sheet);
gtk_widget_show (sheet->sheet_entry);
}
"label",
real_x, real_y,
layout);
- g_object_unref (G_OBJECT (layout));
+ g_object_unref (layout);
real_y += text_height + 2;
{
GdkWindow *window = NULL;
GdkRectangle allocation;
- GtkSheetButton *button = NULL;
+
gboolean is_sensitive = FALSE;
if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
}
else
{
- button = xxx_column_button (sheet, column);
+ GtkSheetButton *button = xxx_column_button (sheet, column);
allocation.x = COLUMN_LEFT_XPIXEL (sheet, column) + CELL_SPACING;
if (sheet->row_titles_visible)
allocation.x -= sheet->row_title_area.width;
is_sensitive = xxx_column_is_sensitive (sheet, column);
gtk_sheet_button_draw (sheet, window, button,
is_sensitive, allocation);
+
+ /* FIXME: Not freeing this button is correct (sort of),
+ because in PSPP the model always returns a static copy */
+
+ /* gtk_sheet_button_free (button); */
+
}
}
*
* functions:
* adjust_scrollbars
- * vadjustment_changed
- * hadjustment_changed
* vadjustment_value_changed
* hadjustment_value_changed */
static void
adjust_scrollbars (GtkSheet * sheet)
{
-
if (sheet->vadjustment)
{
sheet->vadjustment->page_size = sheet->sheet_window_height;
sheet->vadjustment->step_increment = DEFAULT_ROW_HEIGHT (GTK_WIDGET (sheet));
sheet->vadjustment->lower = 0;
sheet->vadjustment->upper = SHEET_HEIGHT (sheet) + 80;
- gtk_signal_emit_by_name (GTK_OBJECT (sheet->vadjustment), "changed");
+ g_signal_emit_by_name (sheet->vadjustment, "changed");
}
sheet->hadjustment->step_increment = DEFAULT_COLUMN_WIDTH;
sheet->hadjustment->lower = 0;
sheet->hadjustment->upper = SHEET_WIDTH (sheet)+ 80;
- gtk_signal_emit_by_name (GTK_OBJECT (sheet->hadjustment), "changed");
+ g_signal_emit_by_name (sheet->hadjustment, "changed");
}
}
-
-static void
-vadjustment_changed (GtkAdjustment * adjustment,
- gpointer data)
-{
- GtkSheet *sheet;
-
- g_return_if_fail (adjustment != NULL);
- g_return_if_fail (data != NULL);
-
- sheet = GTK_SHEET (data);
-
-}
-
-static void
-hadjustment_changed (GtkAdjustment * adjustment,
- gpointer data)
-{
- GtkSheet *sheet;
-
- g_return_if_fail (adjustment != NULL);
- g_return_if_fail (data != NULL);
-
- sheet = GTK_SHEET (data);
-}
-
-
static void
vadjustment_value_changed (GtkAdjustment * adjustment,
gpointer data)
if (GTK_SHEET_IS_FROZEN (sheet)) return;
- row = ROW_FROM_YPIXEL (sheet,sheet->column_title_area.height + CELL_SPACING);
+ row = ROW_FROM_YPIXEL (sheet, sheet->column_title_area.height + CELL_SPACING);
if (!sheet->column_titles_visible)
row = ROW_FROM_YPIXEL (sheet, CELL_SPACING);
old_value = - sheet->voffset;
new_row = g_sheet_row_pixel_to_row (sheet->row_geometry,
- adjustment->value,sheet);
+ adjustment->value, sheet);
y = g_sheet_row_start_pixel (sheet->row_geometry, new_row, sheet);
sheet->voffset = - value;
- sheet->view.row0 = ROW_FROM_YPIXEL (sheet, sheet->column_title_area.height + 1);
- sheet->view.rowi = ROW_FROM_YPIXEL (sheet, sheet->sheet_window_height - 1);
- if (!sheet->column_titles_visible)
- sheet->view.row0 = ROW_FROM_YPIXEL (sheet, 1);
-
if (GTK_WIDGET_REALIZED (sheet->sheet_entry) &&
sheet->state == GTK_SHEET_NORMAL &&
sheet->active_cell.row >= 0 && sheet->active_cell.col >= 0 &&
if (GTK_SHEET_IS_FROZEN (sheet)) return;
- column = COLUMN_FROM_XPIXEL (sheet,sheet->row_title_area.width + CELL_SPACING);
+ column = COLUMN_FROM_XPIXEL (sheet, sheet->row_title_area.width + CELL_SPACING);
if (!sheet->row_titles_visible)
column = COLUMN_FROM_XPIXEL (sheet, CELL_SPACING);
}
sheet->hoffset = - value;
-
- sheet->view.col0 = COLUMN_FROM_XPIXEL (sheet, sheet->row_title_area.width + 1);
- sheet->view.coli = COLUMN_FROM_XPIXEL (sheet, sheet->sheet_window_width);
- if (!sheet->row_titles_visible)
- sheet->view.col0 = COLUMN_FROM_XPIXEL (sheet, 1);
-
if (GTK_WIDGET_REALIZED (sheet->sheet_entry) &&
sheet->state == GTK_SHEET_NORMAL &&
sheet->active_cell.row >= 0 && sheet->active_cell.col >= 0 &&
gdk_gc_set_clip_rectangle (sheet->xor_gc, &clip_area);
- for (i =- 1; i <= 1; ++i)
+ for (i = -1; i <= 1; ++i)
gdk_draw_rectangle (sheet->sheet_window,
sheet->xor_gc,
FALSE,
width = min_width;
xxx_set_column_width (sheet, column, width);
- sheet->view.coli = COLUMN_FROM_XPIXEL (sheet, sheet->sheet_window_width);
size_allocate_column_title_buttons (sheet);
return width;
height = min_height;
yyy_set_row_height (sheet, row, height);
- sheet->view.rowi = ROW_FROM_YPIXEL (sheet, sheet->sheet_window_height - 1);
size_allocate_row_title_buttons (sheet);
return height;
gtk_sheet_range_draw (sheet, NULL);
}
- gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[CHANGED], - 1, column);
- gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[NEW_COL_WIDTH],
- column, width);
+ g_signal_emit (sheet, sheet_signals[CHANGED], 0, -1, column);
+ g_signal_emit (sheet, sheet_signals[NEW_COL_WIDTH], 0,
+ column, width);
}
gtk_sheet_range_draw (sheet, NULL);
}
- gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[CHANGED], row, - 1);
- gtk_signal_emit (GTK_OBJECT (sheet), sheet_signals[NEW_ROW_HEIGHT], row, height);
+ g_signal_emit (sheet, sheet_signals[CHANGED], 0, row, - 1);
+ g_signal_emit (sheet, sheet_signals[NEW_ROW_HEIGHT], 0,
+ row, height);
}
return;
}
- gtk_sheet_attach (sheet, widget, row, col, GTK_EXPAND|GTK_FILL, GTK_EXPAND|GTK_FILL, 0, 0);
+ gtk_sheet_attach (sheet, widget, row, col,
+ GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
}
void
{
GtkRequisition button_requisition;
GList *children;
+ GtkSheetButton *button = xxx_column_button (sheet, col);
gtk_sheet_button_size_request (sheet,
- xxx_column_button (sheet, col),
+ button,
&button_requisition);
+ gtk_sheet_button_free (button);
+
*requisition = button_requisition.width;
children = sheet->children;
g_free (button->label);
g_free (button);
}
+
+
+static GString *
+range_to_text (const GtkSheet *sheet)
+{
+ gchar *celltext = NULL;
+ gint r, c;
+ GString *string;
+
+ if ( !gtk_sheet_range_isvisible (sheet, sheet->range))
+ return NULL;
+
+ string = g_string_sized_new (80);
+
+ for (r = sheet->range.row0; r <= sheet->range.rowi; ++r)
+ {
+ for (c = sheet->range.col0; c < sheet->range.coli; ++c)
+ {
+ celltext = gtk_sheet_cell_get_text (sheet, r, c);
+ g_string_append (string, celltext);
+ g_string_append (string, "\t");
+ g_free (celltext);
+ }
+ celltext = gtk_sheet_cell_get_text (sheet, r, c);
+ g_string_append (string, celltext);
+ if ( r < sheet->range.rowi)
+ g_string_append (string, "\n");
+ g_free (celltext);
+ }
+
+ return string;
+}
+
+static GString *
+range_to_html (const GtkSheet *sheet)
+{
+ gchar *celltext = NULL;
+ gint r, c;
+ GString *string;
+
+ if ( !gtk_sheet_range_isvisible (sheet, sheet->range))
+ return NULL;
+
+ string = g_string_sized_new (480);
+
+ g_string_append (string, "<html>\n");
+ g_string_append (string, "<body>\n");
+ g_string_append (string, "<table>\n");
+ for (r = sheet->range.row0; r <= sheet->range.rowi; ++r)
+ {
+ g_string_append (string, "<tr>\n");
+ for (c = sheet->range.col0; c <= sheet->range.coli; ++c)
+ {
+ g_string_append (string, "<td>");
+ celltext = gtk_sheet_cell_get_text (sheet, r, c);
+ g_string_append (string, celltext);
+ g_string_append (string, "</td>\n");
+ g_free (celltext);
+ }
+ g_string_append (string, "</tr>\n");
+ }
+ g_string_append (string, "</table>\n");
+ g_string_append (string, "</body>\n");
+ g_string_append (string, "</html>\n");
+
+ return string;
+}
+
+enum {
+ SELECT_FMT_NULL,
+ SELECT_FMT_TEXT,
+ SELECT_FMT_HTML
+};
+
+static void
+primary_get_cb (GtkClipboard *clipboard,
+ GtkSelectionData *selection_data,
+ guint info,
+ gpointer data)
+{
+ GtkSheet *sheet = GTK_SHEET (data);
+ GString *string = NULL;
+
+ switch (info)
+ {
+ case SELECT_FMT_TEXT:
+ string = range_to_text (sheet);
+ break;
+ case SELECT_FMT_HTML:
+ string = range_to_html (sheet);
+ break;
+ default:
+ g_assert_not_reached ();
+ }
+
+ gtk_selection_data_set (selection_data, selection_data->target,
+ 8,
+ (const guchar *) string->str, string->len);
+ g_string_free (string, TRUE);
+}
+
+static void
+primary_clear_cb (GtkClipboard *clipboard,
+ gpointer data)
+{
+ GtkSheet *sheet = GTK_SHEET (data);
+ gtk_sheet_real_unselect_range (sheet, NULL);
+}
+
+static void
+gtk_sheet_update_primary_selection (GtkSheet *sheet)
+{
+ static const GtkTargetEntry targets[] = {
+ { "UTF8_STRING", 0, SELECT_FMT_TEXT },
+ { "STRING", 0, SELECT_FMT_TEXT },
+ { "TEXT", 0, SELECT_FMT_TEXT },
+ { "COMPOUND_TEXT", 0, SELECT_FMT_TEXT },
+ { "text/plain;charset=utf-8", 0, SELECT_FMT_TEXT },
+ { "text/plain", 0, SELECT_FMT_TEXT },
+ { "text/html", 0, SELECT_FMT_HTML }
+ };
+
+ GtkClipboard *clipboard;
+
+ if (!GTK_WIDGET_REALIZED (sheet))
+ return;
+
+ clipboard = gtk_widget_get_clipboard (GTK_WIDGET (sheet),
+ GDK_SELECTION_PRIMARY);
+
+ if (gtk_sheet_range_isvisible (sheet, sheet->range))
+ {
+ if (!gtk_clipboard_set_with_owner (clipboard, targets,
+ G_N_ELEMENTS (targets),
+ primary_get_cb, primary_clear_cb,
+ G_OBJECT (sheet)))
+ primary_clear_cb (clipboard, sheet);
+ }
+ else
+ {
+ if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (sheet))
+ gtk_clipboard_clear (clipboard);
+ }
+}
+
projects / pspp-builds.git / blobdiff