#include <gtk/gtkcontainer.h>
#include <pango/pango.h>
#include "gtksheet.h"
-#include "gtkextra-marshal.h"
+#include <gtksheet/psppire-marshal.h>
#include "gsheetmodel.h"
#include <libpspp/misc.h>
#include <math.h>
g_free (text);
}
-static
-guint STRING_WIDTH (GtkWidget *widget,
- const PangoFontDescription *font, const gchar *text)
-{
- PangoRectangle rect;
- PangoLayout *layout;
-
- layout = gtk_widget_create_pango_layout (widget, text);
- pango_layout_set_font_description (layout, font);
- pango_layout_get_extents (layout, NULL, &rect);
+/* FIXME: Why bother with these two ? */
- g_object_unref (layout);
- return PANGO_PIXELS (rect.width);
+/* returns the column index from a pixel location */
+static inline gint
+column_from_xpixel (const GtkSheet *sheet, gint pixel)
+{
+ return psppire_axis_get_unit_at_pixel (sheet->haxis, pixel);
}
-/* Return the row containing pixel Y */
-static gint
-yyy_row_ypixel_to_row (const GtkSheet *sheet, gint y)
+static inline gint
+row_from_ypixel (const GtkSheet *sheet, gint pixel)
{
- GSheetRow *geo = sheet->row_geometry;
-
- g_return_val_if_fail (y >= 0, -1);
-
- return g_sheet_row_pixel_to_row (geo, y);
+ return psppire_axis_get_unit_at_pixel (sheet->vaxis, pixel);
}
+
/* 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);
+ return row_from_ypixel (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);
+ glong row = min_visible_row (sheet);
- if ( g_sheet_row_start_pixel (sheet->row_geometry, row) < sheet->vadjustment->value)
+ if ( psppire_axis_pixel_start (sheet->vaxis, row) < sheet->vadjustment->value)
row++;
- return row;
+ return row;
}
-
-
static inline glong
max_visible_row (const GtkSheet *sheet)
{
- return yyy_row_ypixel_to_row (sheet,
- sheet->vadjustment->value +
- sheet->vadjustment->page_size);
+ return row_from_ypixel (sheet,
+ sheet->vadjustment->value +
+ sheet->vadjustment->page_size);
}
{
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)
+ if ( psppire_axis_pixel_start (sheet->vaxis, row)
+ +
+ psppire_axis_unit_size (sheet->vaxis, row)
> sheet->vadjustment->value)
row--;
}
-/* returns the column index from a x pixel location */
-static inline gint
-column_from_xpixel (const GtkSheet *sheet, gint x)
-{
- gint i;
- gint cx = 0;
-
- if (x < 0) return -1;
- for (i = 0;
- i < g_sheet_column_get_column_count (sheet->column_geometry); i++)
- {
- if (x >= cx &&
- x <= (cx + g_sheet_column_get_width (sheet->column_geometry, i)))
- return i;
-
- cx += g_sheet_column_get_width (sheet->column_geometry, i);
- }
-
- /* no match */
- return g_sheet_column_get_column_count (sheet->column_geometry) - 1;
-}
-
-
/* Returns the lowest column number which is wholly or partially
on the sheet */
static inline glong
{
glong col = min_visible_column (sheet);
- if ( g_sheet_column_start_pixel (sheet->column_geometry, col) < sheet->hadjustment->value)
+ if ( psppire_axis_pixel_start (sheet->haxis, col) < sheet->hadjustment->value)
col++;
return col;
{
glong col = max_visible_column (sheet);
- if ( g_sheet_column_start_pixel (sheet->column_geometry, col)
+ if ( psppire_axis_pixel_start (sheet->haxis, col)
+
- g_sheet_column_get_width (sheet->column_geometry, col)
+ psppire_axis_unit_size (sheet->haxis, col)
> sheet->hadjustment->value)
col--;
return FALSE;
}
-static inline gboolean
-POSSIBLE_YDRAG (const GtkSheet *sheet, gint y, gint *drag_row)
-{
- gint row, ydrag;
-
- y += sheet->vadjustment->value;
- row = yyy_row_ypixel_to_row (sheet, y);
- *drag_row = row;
-
- ydrag = g_sheet_row_start_pixel (sheet->row_geometry, row) + CELL_SPACING;
- if (y <= ydrag + DRAG_WIDTH / 2 && row != 0)
- {
- *drag_row = row - 1;
- return g_sheet_row_get_sensitivity (sheet->row_geometry, row - 1);
- }
-
- ydrag += g_sheet_row_get_height (sheet->row_geometry, row);
-
- if (y >= ydrag - DRAG_WIDTH / 2 && y <= ydrag + DRAG_WIDTH / 2)
- return g_sheet_row_get_sensitivity (sheet->row_geometry, row);
-
- return FALSE;
-}
-
static inline gboolean
POSSIBLE_DRAG (const GtkSheet *sheet, gint x, gint y,
gint *drag_row, gint *drag_column)
return FALSE;
*drag_column = column_from_xpixel (sheet, x);
- *drag_row = yyy_row_ypixel_to_row (sheet, y);
+ *drag_row = row_from_ypixel (sheet, y);
- if (x >= g_sheet_column_start_pixel (sheet->column_geometry, sheet->range.col0) - DRAG_WIDTH / 2 &&
- x <= g_sheet_column_start_pixel (sheet->column_geometry, sheet->range.coli) +
- g_sheet_column_get_width (sheet->column_geometry, sheet->range.coli) + DRAG_WIDTH / 2)
+ if (x >= psppire_axis_pixel_start (sheet->haxis, sheet->range.col0) - DRAG_WIDTH / 2 &&
+ x <= psppire_axis_pixel_start (sheet->haxis, sheet->range.coli) +
+ psppire_axis_unit_size (sheet->haxis, sheet->range.coli) + DRAG_WIDTH / 2)
{
- ydrag = g_sheet_row_start_pixel (sheet->row_geometry, sheet->range.row0);
+ ydrag = psppire_axis_pixel_start (sheet->vaxis, sheet->range.row0);
if (y >= ydrag - DRAG_WIDTH / 2 && y <= ydrag + DRAG_WIDTH / 2)
{
*drag_row = sheet->range.row0;
return TRUE;
}
- ydrag = g_sheet_row_start_pixel (sheet->row_geometry, sheet->range.rowi) +
- g_sheet_row_get_height (sheet->row_geometry, sheet->range.rowi);
+ ydrag = psppire_axis_pixel_start (sheet->vaxis, sheet->range.rowi) +
+ psppire_axis_unit_size (sheet->vaxis, sheet->range.rowi);
if (y >= ydrag - DRAG_WIDTH / 2 && y <= ydrag + DRAG_WIDTH / 2)
{
*drag_row = sheet->range.rowi;
}
}
- if (y >= g_sheet_row_start_pixel (sheet->row_geometry, sheet->range.row0) - DRAG_WIDTH / 2 &&
- y <= g_sheet_row_start_pixel (sheet->row_geometry, sheet->range.rowi) +
- g_sheet_row_get_height (sheet->row_geometry, sheet->range.rowi) + DRAG_WIDTH / 2)
+ if (y >= psppire_axis_pixel_start (sheet->vaxis, sheet->range.row0) - DRAG_WIDTH / 2 &&
+ y <= psppire_axis_pixel_start (sheet->vaxis, sheet->range.rowi) +
+ psppire_axis_unit_size (sheet->vaxis, sheet->range.rowi) + DRAG_WIDTH / 2)
{
- xdrag = g_sheet_column_start_pixel (sheet->column_geometry, sheet->range.col0);
+ xdrag = psppire_axis_pixel_start (sheet->haxis, sheet->range.col0);
if (x >= xdrag - DRAG_WIDTH / 2 && x <= xdrag + DRAG_WIDTH / 2)
{
*drag_column = sheet->range.col0;
return TRUE;
}
- xdrag = g_sheet_column_start_pixel (sheet->column_geometry, sheet->range.coli) +
- g_sheet_column_get_width (sheet->column_geometry, sheet->range.coli);
+ xdrag = psppire_axis_pixel_start (sheet->haxis, sheet->range.coli) +
+ psppire_axis_unit_size (sheet->haxis, sheet->range.coli);
if (x >= xdrag - DRAG_WIDTH / 2 && x <= xdrag + DRAG_WIDTH / 2)
{
*drag_column = sheet->range.coli;
sheet->range.col0 < 0 || sheet->range.coli < 0 )
return FALSE;
- xdrag = g_sheet_column_start_pixel (sheet->column_geometry, sheet->range.coli)+
- g_sheet_column_get_width (sheet->column_geometry, sheet->range.coli);
+ xdrag = psppire_axis_pixel_start (sheet->haxis, sheet->range.coli)+
+ psppire_axis_unit_size (sheet->haxis, sheet->range.coli);
- ydrag = g_sheet_row_start_pixel (sheet->row_geometry, sheet->range.rowi) +
- g_sheet_row_get_height (sheet->row_geometry, sheet->range.rowi);
+ ydrag = psppire_axis_pixel_start (sheet->vaxis, sheet->range.rowi) +
+ psppire_axis_unit_size (sheet->vaxis, sheet->range.rowi);
if (sheet->state == GTK_SHEET_COLUMN_SELECTED)
- ydrag = g_sheet_row_start_pixel (sheet->row_geometry, min_visible_row (sheet));
+ ydrag = psppire_axis_pixel_start (sheet->vaxis, min_visible_row (sheet));
if (sheet->state == GTK_SHEET_ROW_SELECTED)
- xdrag = g_sheet_column_start_pixel (sheet->column_geometry, min_visible_column (sheet));
+ xdrag = psppire_axis_pixel_start (sheet->haxis, min_visible_column (sheet));
*drag_column = column_from_xpixel (sheet, x);
- *drag_row = yyy_row_ypixel_to_row (sheet, y);
+ *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;
{
g_return_val_if_fail (range, FALSE);
- r->x = g_sheet_column_start_pixel (sheet->column_geometry, range->col0);
+ r->x = psppire_axis_pixel_start (sheet->haxis, range->col0);
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 = psppire_axis_pixel_start (sheet->vaxis, range->row0);
r->y -= round (sheet->vadjustment->value);
if ( sheet->column_titles_visible)
r->y += sheet->column_title_area.height;
- r->width = g_sheet_column_start_pixel (sheet->column_geometry, range->coli) -
- g_sheet_column_start_pixel (sheet->column_geometry, range->col0) +
- g_sheet_column_get_width (sheet->column_geometry, range->coli);
+ r->width = psppire_axis_pixel_start (sheet->haxis, range->coli) -
+ psppire_axis_pixel_start (sheet->haxis, range->col0) +
+ psppire_axis_unit_size (sheet->haxis, range->coli);
- r->height = g_sheet_row_start_pixel (sheet->row_geometry, range->rowi) -
- g_sheet_row_start_pixel (sheet->row_geometry, range->row0) +
- g_sheet_row_get_height (sheet->row_geometry, range->rowi);
+ r->height = psppire_axis_pixel_start (sheet->vaxis, range->rowi) -
+ psppire_axis_pixel_start (sheet->vaxis, range->row0) +
+ psppire_axis_unit_size (sheet->vaxis, range->rowi);
return TRUE;
}
enum
{
PROP_0,
- PROP_ROW_GEO,
- PROP_COL_GEO,
+ PROP_VAXIS,
+ PROP_HAXIS,
PROP_MODEL
};
static void
-gtk_sheet_set_row_geometry (GtkSheet *sheet, GSheetRow *geo)
+gtk_sheet_set_horizontal_axis (GtkSheet *sheet, PsppireAxis *a)
{
- if ( sheet->row_geometry ) g_object_unref (sheet->row_geometry);
+ if ( sheet->haxis )
+ g_object_unref (sheet->haxis);
- sheet->row_geometry = geo;
+ sheet->haxis = a;
- if ( sheet->row_geometry ) g_object_ref (sheet->row_geometry);
+ if ( sheet->haxis )
+ g_object_ref (sheet->haxis);
}
static void
-gtk_sheet_set_column_geometry (GtkSheet *sheet, GSheetColumn *geo)
+gtk_sheet_set_vertical_axis (GtkSheet *sheet, PsppireAxis *a)
{
- if ( sheet->column_geometry ) g_object_unref (sheet->column_geometry);
+ if ( sheet->vaxis )
+ g_object_unref (sheet->vaxis);
- sheet->column_geometry = geo;
+ sheet->vaxis = a;
- if ( sheet->column_geometry ) g_object_ref (sheet->column_geometry);
+ if ( sheet->vaxis )
+ g_object_ref (sheet->vaxis);
}
switch (prop_id)
{
- case PROP_ROW_GEO:
- gtk_sheet_set_row_geometry (sheet, g_value_get_pointer (value));
+ case PROP_VAXIS:
+ gtk_sheet_set_vertical_axis (sheet, g_value_get_pointer (value));
break;
- case PROP_COL_GEO:
- gtk_sheet_set_column_geometry (sheet, g_value_get_pointer (value));
+ case PROP_HAXIS:
+ gtk_sheet_set_horizontal_axis (sheet, g_value_get_pointer (value));
break;
case PROP_MODEL:
gtk_sheet_set_model (sheet, g_value_get_pointer (value));
switch (prop_id)
{
- case PROP_ROW_GEO:
- g_value_set_pointer (value, sheet->row_geometry);
+ case PROP_VAXIS:
+ g_value_set_pointer (value, sheet->vaxis);
break;
- case PROP_COL_GEO:
- g_value_set_pointer (value, sheet->column_geometry);
+ case PROP_HAXIS:
+ g_value_set_pointer (value, sheet->haxis);
break;
case PROP_MODEL:
g_value_set_pointer (value, sheet->model);
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GParamSpec *row_geo_spec ;
- GParamSpec *col_geo_spec ;
+ GParamSpec *haxis_spec ;
+ GParamSpec *vaxis_spec ;
GParamSpec *model_spec ;
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- gtkextra_VOID__INT_POINTER,
+ psppire_marshal_VOID__INT_POINTER,
G_TYPE_NONE,
2,
G_TYPE_INT,
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- gtkextra_VOID__INT_POINTER,
+ psppire_marshal_VOID__INT_POINTER,
G_TYPE_NONE,
2,
G_TYPE_INT,
G_SIGNAL_RUN_LAST,
offsetof (GtkSheetClass, resize_range),
NULL, NULL,
- gtkextra_VOID__BOXED_BOXED,
+ psppire_marshal_VOID__BOXED_BOXED,
G_TYPE_NONE,
2,
GTK_TYPE_SHEET_RANGE, GTK_TYPE_SHEET_RANGE
G_SIGNAL_RUN_LAST,
offsetof (GtkSheetClass, move_range),
NULL, NULL,
- gtkextra_VOID__BOXED_BOXED,
+ psppire_marshal_VOID__BOXED_BOXED,
G_TYPE_NONE,
2,
GTK_TYPE_SHEET_RANGE, GTK_TYPE_SHEET_RANGE
G_SIGNAL_RUN_LAST,
offsetof (GtkSheetClass, traverse),
NULL, NULL,
- gtkextra_BOOLEAN__BOXED_POINTER,
+ psppire_marshal_BOOLEAN__BOXED_POINTER,
G_TYPE_BOOLEAN, 2,
GTK_TYPE_SHEET_CELL,
G_TYPE_POINTER);
G_SIGNAL_RUN_LAST,
offsetof (GtkSheetClass, activate),
NULL, NULL,
- gtkextra_VOID__INT_INT_INT_INT,
+ psppire_marshal_VOID__INT_INT_INT_INT,
G_TYPE_NONE, 4,
G_TYPE_INT, G_TYPE_INT,
G_TYPE_INT, G_TYPE_INT);
G_SIGNAL_RUN_LAST,
offsetof (GtkSheetClass, set_scroll_adjustments),
NULL, NULL,
- gtkextra_VOID__OBJECT_OBJECT,
+ psppire_marshal_VOID__OBJECT_OBJECT,
G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
object_class->finalize = gtk_sheet_finalize;
- row_geo_spec =
- g_param_spec_pointer ("row-geometry",
- "Row Geometry",
- "A pointer to the model of the row geometry",
+ vaxis_spec =
+ g_param_spec_pointer ("vertical-axis",
+ "Vertical Axis",
+ "A pointer to the PsppireAxis object for the rows",
G_PARAM_READABLE | G_PARAM_WRITABLE );
- col_geo_spec =
- g_param_spec_pointer ("column-geometry",
- "Column Geometry",
- "A pointer to the model of the column geometry",
+ haxis_spec =
+ g_param_spec_pointer ("horizontal-axis",
+ "Horizontal Axis",
+ "A pointer to the PsppireAxis object for the columns",
G_PARAM_READABLE | G_PARAM_WRITABLE );
model_spec =
object_class->get_property = gtk_sheet_get_property;
g_object_class_install_property (object_class,
- PROP_ROW_GEO,
- row_geo_spec);
+ PROP_VAXIS,
+ vaxis_spec);
g_object_class_install_property (object_class,
- PROP_COL_GEO,
- col_geo_spec);
+ PROP_HAXIS,
+ haxis_spec);
g_object_class_install_property (object_class,
PROP_MODEL,
gtk_sheet_init (GtkSheet *sheet)
{
sheet->model = NULL;
- sheet->column_geometry = NULL;
- sheet->row_geometry = NULL;
+ sheet->haxis = NULL;
+ sheet->vaxis = NULL;
sheet->flags = 0;
sheet->selection_mode = GTK_SELECTION_NONE;
sheet->sheet_window = NULL;
sheet->entry_widget = NULL;
- sheet->entry_container = NULL;
sheet->entry_handler_id = 0;
sheet->button = NULL;
/* create sheet entry */
- sheet->entry_type = 0;
+ sheet->entry_type = GTK_TYPE_ENTRY;
create_sheet_entry (sheet);
/* create global selection button */
*/
range.col0 = first_column;
range.row0 = 0;
- range.coli = g_sheet_column_get_column_count (sheet->column_geometry) - 1;
- range.rowi = g_sheet_row_get_row_count (sheet->row_geometry) - 1;
+ range.coli = psppire_axis_unit_count (sheet->haxis) - 1;
+ range.rowi = psppire_axis_unit_count (sheet->vaxis) - 1;
adjust_scrollbars (sheet);
*/
range.row0 = first_row;
range.col0 = 0;
- range.rowi = g_sheet_row_get_row_count (sheet->row_geometry) - 1;
- range.coli = g_sheet_column_get_column_count (sheet->column_geometry) - 1;
+ range.rowi = psppire_axis_unit_count (sheet->vaxis) - 1;
+ range.coli = psppire_axis_unit_count (sheet->haxis) - 1;
adjust_scrollbars (sheet);
* Returns: the new sheet widget
*/
GtkWidget *
-gtk_sheet_new (GSheetRow *vgeo, GSheetColumn *hgeo, GSheetModel *model)
+gtk_sheet_new (GSheetModel *model)
{
GtkWidget *widget = g_object_new (GTK_TYPE_SHEET,
- "row-geometry", vgeo,
- "column-geometry", hgeo,
"model", model,
NULL);
return widget;
g_return_val_if_fail (sheet != NULL, 0);
g_return_val_if_fail (GTK_IS_SHEET (sheet), 0);
- return g_sheet_column_get_column_count (sheet->column_geometry);
+ return psppire_axis_unit_count (sheet->haxis);
}
static void
guint width);
-static void
-gtk_sheet_autoresize_column (GtkSheet *sheet, gint column)
-{
- gint text_width = 0;
- gint row;
-
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (GTK_IS_SHEET (sheet));
- if (column >= g_sheet_column_get_column_count (sheet->column_geometry) || column < 0) return;
-
- for (row = 0; row < g_sheet_row_get_row_count (sheet->row_geometry); row++)
- {
- gchar *text = gtk_sheet_cell_get_text (sheet, row, column);
- if (text && strlen (text) > 0)
- {
- GtkSheetCellAttr attributes;
-
- gtk_sheet_get_attributes (sheet, row, column, &attributes);
- if (attributes.is_visible)
- {
- gint width = STRING_WIDTH (GTK_WIDGET (sheet),
- attributes.font_desc,
- text)
- + 2 * COLUMN_TITLES_HEIGHT + attributes.border.width;
- text_width = MAX (text_width, width);
- }
- }
- dispose_string (sheet, text);
- }
-
- if (text_width > g_sheet_column_get_width (sheet->column_geometry, column) )
- {
- gtk_sheet_set_column_width (sheet, column, text_width);
- }
-}
-
void
gtk_sheet_show_column_titles (GtkSheet *sheet)
{
g_return_if_fail (col_align <= 1);
g_return_if_fail (col <
- g_sheet_column_get_column_count (sheet->column_geometry));
+ psppire_axis_unit_count (sheet->haxis));
g_return_if_fail (row <
- g_sheet_row_get_row_count (sheet->row_geometry));
+ psppire_axis_unit_count (sheet->vaxis));
gdk_drawable_get_size (sheet->sheet_window, &width, &height);
if (row >= 0)
{
- gint y = g_sheet_row_start_pixel (sheet->row_geometry, row);
+ gint y = psppire_axis_pixel_start (sheet->vaxis, row);
gtk_adjustment_set_value (sheet->vadjustment, y - height * row_align);
}
if (col >= 0)
{
- gint x = g_sheet_column_start_pixel (sheet->column_geometry, col);
+ gint x = psppire_axis_pixel_start (sheet->haxis, col);
gtk_adjustment_set_value (sheet->hadjustment, x - width * col_align);
}
g_return_if_fail (sheet != NULL);
g_return_if_fail (GTK_IS_SHEET (sheet));
- if (row < 0 || row >= g_sheet_row_get_row_count (sheet->row_geometry))
+ if (row < 0 || row >= psppire_axis_unit_count (sheet->vaxis))
return;
if (sheet->state != GTK_SHEET_NORMAL)
sheet->range.row0 = row;
sheet->range.col0 = 0;
sheet->range.rowi = row;
- sheet->range.coli = g_sheet_column_get_column_count (sheet->column_geometry) - 1;
+ sheet->range.coli = psppire_axis_unit_count (sheet->haxis) - 1;
sheet->active_cell.row = row;
sheet->active_cell.col = 0;
g_return_if_fail (sheet != NULL);
g_return_if_fail (GTK_IS_SHEET (sheet));
- if (column < 0 || column >= g_sheet_column_get_column_count (sheet->column_geometry))
+ if (column < 0 || column >= psppire_axis_unit_count (sheet->haxis))
return;
if (sheet->state != GTK_SHEET_NORMAL)
sheet->state = GTK_SHEET_COLUMN_SELECTED;
sheet->range.row0 = 0;
sheet->range.col0 = column;
- sheet->range.rowi = g_sheet_row_get_row_count (sheet->row_geometry) - 1;
+ sheet->range.rowi = psppire_axis_unit_count (sheet->vaxis) - 1;
sheet->range.coli = column;
sheet->active_cell.row = 0;
sheet->active_cell.col = column;
{
g_return_val_if_fail (sheet != NULL, FALSE);
- if (range.row0 < 0 || range.row0 >= g_sheet_row_get_row_count (sheet->row_geometry))
+ if (range.row0 < 0 || range.row0 >= psppire_axis_unit_count (sheet->vaxis))
return FALSE;
- if (range.rowi < 0 || range.rowi >= g_sheet_row_get_row_count (sheet->row_geometry))
+ if (range.rowi < 0 || range.rowi >= psppire_axis_unit_count (sheet->vaxis))
return FALSE;
- if (range.col0 < 0 || range.col0 >= g_sheet_column_get_column_count (sheet->column_geometry))
+ if (range.col0 < 0 || range.col0 >= psppire_axis_unit_count (sheet->haxis))
return FALSE;
- if (range.coli < 0 || range.coli >= g_sheet_column_get_column_count (sheet->column_geometry))
+ if (range.coli < 0 || range.coli >= psppire_axis_unit_count (sheet->haxis))
return FALSE;
if (range.rowi < min_visible_row (sheet))
sheet->dispose_has_run = TRUE;
if (sheet->model) g_object_unref (sheet->model);
- if (sheet->row_geometry) g_object_unref (sheet->row_geometry);
- if (sheet->column_geometry) g_object_unref (sheet->column_geometry);
-
- g_object_unref (sheet->entry_container);
- sheet->entry_container = NULL;
+ if (sheet->vaxis) g_object_unref (sheet->vaxis);
+ if (sheet->haxis) g_object_unref (sheet->haxis);
g_object_unref (sheet->button);
sheet->button = NULL;
}
+#define BORDER_WIDTH 4
+
static void
gtk_sheet_realize (GtkWidget *widget)
{
const gint attributes_mask =
GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_CURSOR;
- GdkGCValues values, auxvalues;
+ GdkGCValues values;
GdkColormap *colormap;
GdkDisplay *display;
sheet->fg_gc = gdk_gc_new (widget->window);
sheet->bg_gc = gdk_gc_new (widget->window);
- gdk_gc_get_values (sheet->fg_gc, &auxvalues);
-
values.foreground = widget->style->white;
values.function = GDK_INVERT;
values.subwindow_mode = GDK_INCLUDE_INFERIORS;
- values.line_width = 3;
+ values.line_width = BORDER_WIDTH;
sheet->xor_gc = gdk_gc_new_with_values (widget->window,
&values,
if (!GTK_WIDGET_DRAWABLE (sheet)) return;
if (row < 0 ||
- row >= g_sheet_row_get_row_count (sheet->row_geometry))
+ row >= psppire_axis_unit_count (sheet->vaxis))
return;
if (col < 0 ||
- col >= g_sheet_column_get_column_count (sheet->column_geometry))
+ col >= psppire_axis_unit_count (sheet->haxis))
return;
gtk_sheet_get_attributes (sheet, row, col, &attributes);
area.width, area.height);
}
- // gtk_sheet_cell_draw_label (sheet, row, col);
-
label = gtk_sheet_cell_get_text (sheet, row, col);
if (NULL == label)
drawing_range.row0 = min_visible_row (sheet);
drawing_range.col0 = min_visible_column (sheet);
drawing_range.rowi = MIN (max_visible_row (sheet),
- g_sheet_row_get_row_count (sheet->row_geometry) - 1);
+ psppire_axis_unit_count (sheet->vaxis) - 1);
drawing_range.coli = max_visible_column (sheet);
gdk_drawable_get_size (sheet->sheet_window, &area.width, &area.height);
area.x = area.y = 0;
gtk_sheet_draw_border (sheet, sheet->range);
}
-static void gtk_sheet_set_cell (GtkSheet *sheet, gint row, gint col,
- GtkJustification justification,
- const gchar *text);
-
-
static inline gint
safe_strcmp (const gchar *s1, const gchar *s2)
{
if ( !s1 && !s2) return 0;
- if ( !s1) return - 1;
+ if ( !s1) return -1;
if ( !s2) return +1;
return strcmp (s1, s2);
}
g_return_if_fail (sheet != NULL);
g_return_if_fail (GTK_IS_SHEET (sheet));
- if (col >= g_sheet_column_get_column_count (sheet->column_geometry)
- || row >= g_sheet_row_get_row_count (sheet->row_geometry))
+ if (col >= psppire_axis_unit_count (sheet->haxis)
+ || row >= psppire_axis_unit_count (sheet->vaxis))
return;
if (col < 0 || row < 0) return;
old_text = g_sheet_model_get_string (model, row, col);
+ if (0 != safe_strcmp (old_text, text))
+ g_sheet_model_set_string (model, text, row, col);
+
if ( g_sheet_model_free_strings (model))
g_free (old_text);
}
g_return_if_fail (sheet != NULL);
g_return_if_fail (GTK_IS_SHEET (sheet));
- if (column >= g_sheet_column_get_column_count (sheet->column_geometry) ||
- row >= g_sheet_row_get_row_count (sheet->row_geometry)) return;
+ if (column >= psppire_axis_unit_count (sheet->haxis) ||
+ row >= psppire_axis_unit_count (sheet->vaxis)) return;
if (column < 0 || row < 0) return;
g_return_val_if_fail (sheet != NULL, NULL);
g_return_val_if_fail (GTK_IS_SHEET (sheet), NULL);
- if (col >= g_sheet_column_get_column_count (sheet->column_geometry) || row >= g_sheet_row_get_row_count (sheet->row_geometry))
+ if (col >= psppire_axis_unit_count (sheet->haxis) || row >= psppire_axis_unit_count (sheet->vaxis))
return NULL;
if (col < 0 || row < 0) return NULL;
g_return_val_if_fail (sheet != NULL, 0);
g_return_val_if_fail (GTK_IS_SHEET (sheet), 0);
- if (col >= g_sheet_column_get_column_count (sheet->column_geometry) || row >= g_sheet_row_get_row_count (sheet->row_geometry)) return 0;
+ if (col >= psppire_axis_unit_count (sheet->haxis) || row >= psppire_axis_unit_count (sheet->vaxis)) return 0;
if (col < 0 || row < 0) return 0;
state = sheet->state;
}
else
{
- trow = yyy_row_ypixel_to_row (sheet, y);
- if (trow > g_sheet_row_get_row_count (sheet->row_geometry))
+ trow = row_from_ypixel (sheet, y);
+ if (trow > psppire_axis_unit_count (sheet->vaxis))
return FALSE;
}
else
{
tcol = column_from_xpixel (sheet, x);
- if (tcol > g_sheet_column_get_column_count (sheet->column_geometry))
+ if (tcol > psppire_axis_unit_count (sheet->haxis))
return FALSE;
}
g_return_val_if_fail (sheet != NULL, 0);
g_return_val_if_fail (GTK_IS_SHEET (sheet), 0);
- if (row >= g_sheet_row_get_row_count (sheet->row_geometry) || column >= g_sheet_column_get_column_count (sheet->column_geometry))
+ if (row >= psppire_axis_unit_count (sheet->vaxis) || column >= psppire_axis_unit_count (sheet->haxis))
return FALSE;
- area->x = (column == -1) ? 0 : g_sheet_column_start_pixel (sheet->column_geometry, column);
- area->y = (row == -1) ? 0 : g_sheet_row_start_pixel (sheet->row_geometry, row);
+ area->x = (column == -1) ? 0 : psppire_axis_pixel_start (sheet->haxis, column);
+ area->y = (row == -1) ? 0 : psppire_axis_pixel_start (sheet->vaxis, row);
area->width= (column == -1) ? sheet->row_title_area.width
- : g_sheet_column_get_width (sheet->column_geometry, column);
+ : psppire_axis_unit_size (sheet->haxis, column);
area->height= (row == -1) ? sheet->column_title_area.height
- : g_sheet_row_get_height (sheet->row_geometry, row);
+ : psppire_axis_unit_size (sheet->vaxis, row);
return TRUE;
}
if (row < -1 || col < -1)
return;
- if (row >= g_sheet_row_get_row_count (sheet->row_geometry)
+ if (row >= psppire_axis_unit_count (sheet->vaxis)
||
- col >= g_sheet_column_get_column_count (sheet->column_geometry))
+ col >= psppire_axis_unit_count (sheet->haxis))
return;
sheet->active_cell.row = row;
sheet->active_cell.row = -1;
sheet->active_cell.col = -1;
- text = gtk_entry_get_text (GTK_ENTRY (gtk_sheet_get_entry (sheet)));
+ text = gtk_entry_get_text (gtk_sheet_get_entry (sheet));
if (text && strlen (text) > 0)
{
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))
+ if ( row > psppire_axis_unit_count (sheet->vaxis)
+ || col > psppire_axis_unit_count (sheet->haxis))
return;
if (sheet->state != GTK_SHEET_NORMAL)
GTK_WIDGET_SET_FLAGS (GTK_WIDGET (sheet->entry_widget), GTK_VISIBLE);
- sheet_entry = GTK_ENTRY (gtk_sheet_get_entry (sheet));
+ sheet_entry = gtk_sheet_get_entry (sheet);
gtk_sheet_get_attributes (sheet, row, col, &attributes);
if ( ! text )
text = g_strdup ("");
- gtk_entry_set_visibility (GTK_ENTRY (sheet_entry), attributes.is_visible);
-
-
if ( GTK_IS_ENTRY (sheet_entry))
{
const gchar *old_text = gtk_entry_get_text (GTK_ENTRY (sheet_entry));
if (strcmp (old_text, text) != 0)
- gtk_entry_set_text (GTK_ENTRY (sheet_entry), text);
+ gtk_entry_set_text (sheet_entry, text);
switch (attributes.justification)
{
gtk_sheet_size_allocate_entry (sheet);
+ gtk_widget_set_sensitive (GTK_WIDGET (sheet_entry),
+ g_sheet_model_is_editable (sheet->model,
+ row, col));
gtk_widget_map (sheet->entry_widget);
gtk_widget_grab_focus (GTK_WIDGET (sheet_entry));
dispose_string (sheet, text);
-
}
static void
if (mask1 != mask2)
{
- x = g_sheet_column_start_pixel (sheet->column_geometry, j);
- y = g_sheet_row_start_pixel (sheet->row_geometry, i);
- width = g_sheet_column_start_pixel (sheet->column_geometry, j)- x+
- g_sheet_column_get_width (sheet->column_geometry, j);
- height = g_sheet_row_start_pixel (sheet->row_geometry, i) - y + g_sheet_row_get_height (sheet->row_geometry, i);
+ x = psppire_axis_pixel_start (sheet->haxis, j);
+ y = psppire_axis_pixel_start (sheet->vaxis, i);
+ width = psppire_axis_pixel_start (sheet->haxis, j)- x+
+ psppire_axis_unit_size (sheet->haxis, j);
+ height = psppire_axis_pixel_start (sheet->vaxis, i) - y + psppire_axis_unit_size (sheet->vaxis, i);
if (i == sheet->range.row0)
{
if (i != sheet->active_cell.row || j != sheet->active_cell.col)
{
- x = g_sheet_column_start_pixel (sheet->column_geometry, j);
- y = g_sheet_row_start_pixel (sheet->row_geometry, i);
- width = g_sheet_column_start_pixel (sheet->column_geometry, j)- x+
- g_sheet_column_get_width (sheet->column_geometry, j);
+ x = psppire_axis_pixel_start (sheet->haxis, j);
+ y = psppire_axis_pixel_start (sheet->vaxis, i);
+ width = psppire_axis_pixel_start (sheet->haxis, j)- x+
+ psppire_axis_unit_size (sheet->haxis, j);
- height = g_sheet_row_start_pixel (sheet->row_geometry, i) - y + g_sheet_row_get_height (sheet->row_geometry, i);
+ height = psppire_axis_pixel_start (sheet->vaxis, i) - y + psppire_axis_unit_size (sheet->vaxis, i);
if (i == new_range.row0)
{
if (state == GTK_STATE_SELECTED && !selected)
{
- x = g_sheet_column_start_pixel (sheet->column_geometry, j);
- y = g_sheet_row_start_pixel (sheet->row_geometry, i);
- width = g_sheet_column_start_pixel (sheet->column_geometry, j) - x + g_sheet_column_get_width (sheet->column_geometry, j);
- height = g_sheet_row_start_pixel (sheet->row_geometry, i) - y + g_sheet_row_get_height (sheet->row_geometry, i);
+ x = psppire_axis_pixel_start (sheet->haxis, j);
+ y = psppire_axis_pixel_start (sheet->vaxis, i);
+ width = psppire_axis_pixel_start (sheet->haxis, j) - x + psppire_axis_unit_size (sheet->haxis, j);
+ height = psppire_axis_pixel_start (sheet->vaxis, i) - y + psppire_axis_unit_size (sheet->vaxis, i);
if (i == sheet->range.row0)
{
(i != sheet->active_cell.row || j != sheet->active_cell.col))
{
- x = g_sheet_column_start_pixel (sheet->column_geometry, j);
- y = g_sheet_row_start_pixel (sheet->row_geometry, i);
- width = g_sheet_column_start_pixel (sheet->column_geometry, j) - x + g_sheet_column_get_width (sheet->column_geometry, j);
- height = g_sheet_row_start_pixel (sheet->row_geometry, i) - y + g_sheet_row_get_height (sheet->row_geometry, i);
+ x = psppire_axis_pixel_start (sheet->haxis, j);
+ y = psppire_axis_pixel_start (sheet->vaxis, i);
+ width = psppire_axis_pixel_start (sheet->haxis, j) - x + psppire_axis_unit_size (sheet->haxis, j);
+ height = psppire_axis_pixel_start (sheet->vaxis, i) - y + psppire_axis_unit_size (sheet->vaxis, i);
if (i == new_range.row0)
{
mask2 = j == new_range.coli ? mask2 + 8 : mask2;
if (mask2 != mask1 || (mask2 == mask1 && state != GTK_STATE_SELECTED))
{
- x = g_sheet_column_start_pixel (sheet->column_geometry, j);
- y = g_sheet_row_start_pixel (sheet->row_geometry, i);
- width = g_sheet_column_get_width (sheet->column_geometry, j);
- height = g_sheet_row_get_height (sheet->row_geometry, i);
+ x = psppire_axis_pixel_start (sheet->haxis, j);
+ y = psppire_axis_pixel_start (sheet->vaxis, i);
+ width = psppire_axis_unit_size (sheet->haxis, j);
+ height = psppire_axis_unit_size (sheet->vaxis, i);
if (mask2 & 1)
gdk_draw_rectangle (sheet->sheet_window,
sheet->xor_gc,
*range = new_range;
}
+
+
static void
gtk_sheet_draw_border (GtkSheet *sheet, GtkSheetRange new_range)
{
gdk_draw_rectangle (sheet->sheet_window,
sheet->xor_gc,
FALSE,
- area.x + 1,
- area.y + 1,
- area.width - 2,
- area.height - 2);
+ area.x - BORDER_WIDTH / 2,
+ area.y - BORDER_WIDTH / 2,
+ area.width + BORDER_WIDTH,
+ area.height + BORDER_WIDTH);
}
range.row0 =
- yyy_row_ypixel_to_row (sheet,
+ row_from_ypixel (sheet,
event->area.y + sheet->vadjustment->value);
range.row0--;
range.rowi =
- yyy_row_ypixel_to_row (sheet,
+ row_from_ypixel (sheet,
event->area.y +
event->area.height + sheet->vadjustment->value);
range.rowi++;
sheet_signals[BUTTON_EVENT_COLUMN], 0,
column, event);
- if (g_sheet_column_get_sensitivity (sheet->column_geometry, column))
+ if (g_sheet_model_get_column_sensitivity (sheet->model, column))
{
if ( event->type == GDK_2BUTTON_PRESS && event->button == 1)
g_signal_emit (sheet,
sheet_signals[BUTTON_EVENT_ROW], 0,
row, event);
-
- if (g_sheet_row_get_sensitivity (sheet->row_geometry, row))
+ if (g_sheet_model_get_row_sensitivity (sheet->model, row))
{
if ( event->type == GDK_2BUTTON_PRESS && event->button == 1)
g_signal_emit (sheet,
if (on_column_boundary (sheet, sheet->x_drag, &sheet->drag_cell.col))
{
guint req;
- if (event->type == GDK_2BUTTON_PRESS)
- {
- gtk_sheet_autoresize_column (sheet, sheet->drag_cell.col);
- GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_XDRAG);
- return TRUE;
- }
gtk_sheet_column_size_request (sheet, sheet->drag_cell.col, &req);
GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_XDRAG);
gdk_pointer_grab (sheet->column_title_window, FALSE,
{
gtk_widget_get_pointer (widget, NULL, &sheet->y_drag);
+#if AXIS_TRANSITION
if (POSSIBLE_YDRAG (sheet, sheet->y_drag, &sheet->drag_cell.row))
{
guint req;
draw_xor_hline (sheet);
return TRUE;
}
+#endif
}
/* the sheet itself does not handle other than single click events */
column = column_from_xpixel (sheet, x);
- if (g_sheet_column_get_sensitivity (sheet->column_geometry, column))
+ if (g_sheet_model_get_column_sensitivity (sheet->model, column))
{
veto = gtk_sheet_click_cell (sheet, -1, column);
gtk_grab_add (GTK_WIDGET (sheet));
y += sheet->vadjustment->value;
- row = yyy_row_ypixel_to_row (sheet, y);
- if (g_sheet_row_get_sensitivity (sheet->row_geometry, row))
+ row = row_from_ypixel (sheet, y);
+ if (g_sheet_model_get_row_sensitivity (sheet->model, row))
{
veto = gtk_sheet_click_cell (sheet, row, -1);
gtk_grab_add (GTK_WIDGET (sheet));
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))
+ if (row >= psppire_axis_unit_count (sheet->vaxis)
+ || column >= psppire_axis_unit_count (sheet->haxis))
{
return FALSE;
}
{
sheet->range.row0 = 0;
sheet->range.col0 = 0;
- sheet->range.rowi = g_sheet_row_get_row_count (sheet->row_geometry) - 1;
+ sheet->range.rowi = psppire_axis_unit_count (sheet->vaxis) - 1;
sheet->range.coli =
- g_sheet_column_get_column_count (sheet->column_geometry) - 1;
+ psppire_axis_unit_count (sheet->haxis) - 1;
sheet->active_cell.row = 0;
sheet->active_cell.col = 0;
gtk_sheet_select_range (sheet, NULL);
{
if (sheet->row_title_under)
{
- GSheetRow *row_geo = sheet->row_geometry;
- gchar *text;
-
- text = g_sheet_row_get_subtitle (row_geo, row);
+ gchar *text = g_sheet_model_get_row_subtitle (sheet->model, row);
show_subtitle (sheet, row, -1, text);
g_free (text);
if (sheet->column_title_under)
{
- GSheetColumn *col_geo = sheet->column_geometry;
- gchar *text;
-
- text = g_sheet_column_get_subtitle (col_geo, column);
+ gchar *text = g_sheet_model_get_column_subtitle (sheet->model,
+ column);
show_subtitle (sheet, -1, column, text);
if (event->window == sheet->row_title_window &&
gtk_sheet_rows_resizable (sheet))
{
+#if AXIS_TRANSITION
if (!GTK_SHEET_IN_SELECTION (sheet) && POSSIBLE_YDRAG (sheet, y, &column))
{
new_cursor = GDK_SB_V_DOUBLE_ARROW;
}
}
else
+#endif
{
new_cursor = GDK_TOP_LEFT_ARROW;
if (!GTK_SHEET_IN_YDRAG (sheet) &&
{
GtkSheetRange aux;
column = column_from_xpixel (sheet, x)- sheet->drag_cell.col;
- row = yyy_row_ypixel_to_row (sheet, y) - sheet->drag_cell.row;
+ 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;
sheet->y_drag = y;
aux = sheet->range;
- if (aux.row0 + row >= 0 && aux.rowi + row < g_sheet_row_get_row_count (sheet->row_geometry) &&
- aux.col0 + column >= 0 && aux.coli + column < g_sheet_column_get_column_count (sheet->column_geometry))
+ if (aux.row0 + row >= 0 && aux.rowi + row < psppire_axis_unit_count (sheet->vaxis) &&
+ aux.col0 + column >= 0 && aux.coli + column < psppire_axis_unit_count (sheet->haxis))
{
aux = sheet->drag_range;
sheet->drag_range.row0 = sheet->range.row0 + row;
GtkSheetRange aux;
gint v_h, current_col, current_row, col_threshold, row_threshold;
v_h = 1;
- if (abs (x - g_sheet_column_start_pixel (sheet->column_geometry, sheet->drag_cell.col)) >
- abs (y - g_sheet_row_start_pixel (sheet->row_geometry, sheet->drag_cell.row))) v_h = 2;
+ if (abs (x - psppire_axis_pixel_start (sheet->haxis, sheet->drag_cell.col)) >
+ abs (y - psppire_axis_pixel_start (sheet->vaxis, sheet->drag_cell.row))) v_h = 2;
current_col = column_from_xpixel (sheet, x);
- current_row = yyy_row_ypixel_to_row (sheet, y);
+ 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 = g_sheet_column_start_pixel (sheet->column_geometry, current_col) +
- g_sheet_column_get_width (sheet->column_geometry, current_col) / 2;
+ col_threshold = psppire_axis_pixel_start (sheet->haxis, current_col) +
+ psppire_axis_unit_size (sheet->haxis, current_col) / 2;
if (column > 0)
{
if (x < col_threshold)
if (x > col_threshold)
column +=1;
}
- row_threshold = g_sheet_row_start_pixel (sheet->row_geometry, current_row) +
- g_sheet_row_get_height (sheet->row_geometry, current_row)/2;
+ row_threshold = psppire_axis_pixel_start (sheet->vaxis, current_row) +
+ psppire_axis_unit_size (sheet->vaxis, current_row)/2;
if (row > 0)
{
if (y < row_threshold)
else
row = 0;
- if (aux.row0 + row >= 0 && aux.rowi + row < g_sheet_row_get_row_count (sheet->row_geometry) &&
- aux.col0 + column >= 0 && aux.coli + column < g_sheet_column_get_column_count (sheet->column_geometry))
+ if (aux.row0 + row >= 0 && aux.rowi + row < psppire_axis_unit_count (sheet->vaxis) &&
+ aux.col0 + column >= 0 && aux.coli + column < psppire_axis_unit_count (sheet->haxis))
{
aux = sheet->drag_range;
sheet->drag_range = sheet->range;
switch (sheet->state)
{
case GTK_SHEET_ROW_SELECTED:
- column = g_sheet_column_get_column_count (sheet->column_geometry) - 1;
+ column = psppire_axis_unit_count (sheet->haxis) - 1;
break;
case GTK_SHEET_COLUMN_SELECTED:
- row = g_sheet_row_get_row_count (sheet->row_geometry) - 1;
+ row = psppire_axis_unit_count (sheet->vaxis) - 1;
break;
case GTK_SHEET_NORMAL:
sheet->state = GTK_SHEET_RANGE_SELECTED;
page_vertical (GtkSheet *sheet, GtkScrollType dir)
{
gint old_row = sheet->active_cell.row ;
- glong vpixel = g_sheet_row_start_pixel (sheet->row_geometry, old_row);
+ glong vpixel = psppire_axis_pixel_start (sheet->vaxis, old_row);
gint new_row;
- vpixel -= g_sheet_row_start_pixel (sheet->row_geometry,
+ vpixel -= psppire_axis_pixel_start (sheet->vaxis,
min_visible_row (sheet));
switch ( dir)
}
- vpixel += g_sheet_row_start_pixel (sheet->row_geometry,
+ vpixel += psppire_axis_pixel_start (sheet->vaxis,
min_visible_row (sheet));
- new_row = yyy_row_ypixel_to_row (sheet, vpixel);
+ new_row = row_from_ypixel (sheet, vpixel);
change_active_cell (sheet, new_row,
sheet->active_cell.col);
maximize_int (&new_cell.col, 0);
minimize_int (&new_cell.row,
- g_sheet_row_get_row_count (sheet->row_geometry) - 1);
+ psppire_axis_unit_count (sheet->vaxis) - 1);
minimize_int (&new_cell.col,
- g_sheet_column_get_column_count (sheet->column_geometry) - 1);
+ psppire_axis_unit_count (sheet->haxis) - 1);
g_signal_emit (sheet, sheet_signals[TRAVERSE], 0,
&sheet->active_cell,
if ( new_cell.col > max_fully_visible_column (sheet))
{
glong hpos =
- g_sheet_column_start_pixel (sheet->column_geometry,
+ psppire_axis_pixel_start (sheet->haxis,
new_cell.col + 1);
hpos -= sheet->hadjustment->page_size;
else if ( new_cell.col < min_fully_visible_column (sheet))
{
glong hpos =
- g_sheet_column_start_pixel (sheet->column_geometry,
+ psppire_axis_pixel_start (sheet->haxis,
new_cell.col);
gtk_adjustment_set_value (sheet->hadjustment,
if ( new_cell.row > max_fully_visible_row (sheet))
{
glong vpos =
- g_sheet_row_start_pixel (sheet->row_geometry,
+ psppire_axis_pixel_start (sheet->vaxis,
new_cell.row + 1);
vpos -= sheet->vadjustment->page_size;
else if ( new_cell.row < min_fully_visible_row (sheet))
{
glong vpos =
- g_sheet_row_start_pixel (sheet->row_geometry,
+ psppire_axis_pixel_start (sheet->vaxis,
new_cell.row);
gtk_adjustment_set_value (sheet->vadjustment,
/*
change_active_cellx (sheet,
- g_sheet_row_get_row_count (sheet->row_geometry) - 1,
+ psppire_axis_unit_count (sheet->vaxis) - 1,
sheet->active_cell.col);
*/
break;
allocation->width - 2 * border_width,
allocation->height - 2 * border_width);
- /* use internal allocation structure for all the math
- * because it's easier than always subtracting the container
- * border width */
- sheet->internal_allocation.x = 0;
- sheet->internal_allocation.y = 0;
- sheet->internal_allocation.width = allocation->width - 2 * border_width;
- sheet->internal_allocation.height = allocation->height - 2 * border_width;
-
sheet_allocation.x = 0;
sheet_allocation.y = 0;
sheet_allocation.width = allocation->width - 2 * border_width;
/* position the window which holds the column title buttons */
sheet->column_title_area.x = 0;
sheet->column_title_area.y = 0;
+ sheet->column_title_area.width = sheet_allocation.width ;
+
+
+ /* position the window which holds the row title buttons */
+ sheet->row_title_area.x = 0;
+ sheet->row_title_area.y = 0;
+ sheet->row_title_area.height = sheet_allocation.height;
if (sheet->row_titles_visible)
- {
- sheet->column_title_area.x = sheet->row_title_area.width;
- }
+ sheet->column_title_area.x += sheet->row_title_area.width;
- sheet->column_title_area.width = sheet_allocation.width ;
+ if (sheet->column_titles_visible)
+ sheet->row_title_area.y += sheet->column_title_area.height;
if (GTK_WIDGET_REALIZED (widget) && sheet->column_titles_visible)
sheet->column_title_area.height);
- /* column button allocation */
- draw_column_title_buttons (sheet);
-
- /* position the window which holds the row title buttons */
- sheet->row_title_area.x = 0;
- sheet->row_title_area.y = 0;
- if (sheet->column_titles_visible)
- {
- sheet->row_title_area.y = sheet->column_title_area.height;
- }
-
- sheet->row_title_area.height = sheet_allocation.height -
- sheet->row_title_area.y;
-
if (GTK_WIDGET_REALIZED (widget) && sheet->row_titles_visible)
gdk_window_move_resize (sheet->row_title_window,
sheet->row_title_area.x,
sheet->row_title_area.width,
sheet->row_title_area.height);
+ if (sheet->haxis)
+ {
+ gint width = sheet->column_title_area.width;
+
+ if ( sheet->row_titles_visible)
+ width -= sheet->row_title_area.width;
+
+ g_object_set (sheet->haxis,
+ "minimum-extent", width,
+ NULL);
+ }
+
+
+ if (sheet->vaxis)
+ {
+ gint height = sheet->row_title_area.height;
+
+ if ( sheet->column_titles_visible)
+ height -= sheet->column_title_area.height;
+
+ g_object_set (sheet->vaxis,
+ "minimum-extent", height,
+ NULL);
+ }
- /* row button allocation */
- draw_row_title_buttons (sheet);
- draw_column_title_buttons (sheet);
/* set the scrollbars adjustments */
adjust_scrollbars (sheet);
}
if (max_visible_column (sheet) ==
- g_sheet_column_get_column_count (sheet->column_geometry) - 1)
+ psppire_axis_unit_count (sheet->haxis) - 1)
gdk_window_clear_area (sheet->column_title_window,
0, 0,
sheet->column_title_area.width,
sheet->row_title_area.height);
}
- if (max_visible_row (sheet) == g_sheet_row_get_row_count (sheet->row_geometry) - 1)
+ if (max_visible_row (sheet) == psppire_axis_unit_count (sheet->vaxis) - 1)
gdk_window_clear_area (sheet->row_title_window,
0, 0,
sheet->row_title_area.width,
GtkSheetCellAttr attributes = { 0 };
GtkEntry *sheet_entry;
-
if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
if (!GTK_WIDGET_MAPPED (GTK_WIDGET (sheet))) return;
- sheet_entry = GTK_ENTRY (gtk_sheet_get_entry (sheet));
+ sheet_entry = gtk_sheet_get_entry (sheet);
if ( ! gtk_sheet_get_attributes (sheet, sheet->active_cell.row,
sheet->active_cell.col,
&attributes) )
return ;
- gtk_widget_ensure_style (GTK_WIDGET (sheet_entry));
-
if ( GTK_WIDGET_REALIZED (sheet->entry_widget) )
{
GtkStyle *style = GTK_WIDGET (sheet_entry)->style;
style->bg[GTK_STATE_ACTIVE] = attributes.background;
style->fg[GTK_STATE_ACTIVE] = attributes.foreground;
style->text[GTK_STATE_ACTIVE] = attributes.foreground;
-
- pango_font_description_free (style->font_desc);
- g_assert (attributes.font_desc);
- style->font_desc = pango_font_description_copy (attributes.font_desc);
}
rectangle_from_cell (sheet, sheet->active_cell.row,
gtk_widget_unparent (sheet->entry_widget);
}
- if (sheet->entry_type)
- {
- sheet->entry_container = g_object_new (sheet->entry_type, NULL);
- g_object_ref_sink (sheet->entry_container);
- sheet->entry_widget = gtk_sheet_get_entry (sheet);
-
- if ( NULL == sheet->entry_widget)
- {
- g_warning ("Entry type is %s. It must be GtkEntry subclass, or a widget containing one. "
- "Using default", g_type_name (sheet->entry_type));
- g_object_unref (sheet->entry_container);
- sheet->entry_widget = sheet->entry_container = gtk_entry_new ();
- }
- else
- {
- sheet->entry_widget = sheet->entry_container ;
- }
- }
- else
- {
- sheet->entry_widget = sheet->entry_container = gtk_entry_new ();
- g_object_ref_sink (sheet->entry_container);
- }
+ sheet->entry_widget = g_object_new (sheet->entry_type, NULL);
+ g_object_ref_sink (sheet->entry_widget);
gtk_widget_size_request (sheet->entry_widget, NULL);
}
}
-GtkWidget *
+
+GtkEntry *
gtk_sheet_get_entry (GtkSheet *sheet)
{
- GtkWidget *parent;
- GtkWidget *entry = NULL;
+ GtkWidget *w = sheet->entry_widget;
g_return_val_if_fail (sheet != NULL, NULL);
g_return_val_if_fail (GTK_IS_SHEET (sheet), NULL);
g_return_val_if_fail (sheet->entry_widget != NULL, NULL);
- if (GTK_IS_ENTRY (sheet->entry_container))
- return (sheet->entry_container);
-
- parent = sheet->entry_container;
-
- if (GTK_IS_CONTAINER (parent))
+ while (! GTK_IS_ENTRY (w))
{
- gtk_container_forall (GTK_CONTAINER (parent), find_entry, &entry);
-
- if (GTK_IS_ENTRY (entry))
- return entry;
- }
+ GtkWidget *entry = NULL;
- if (!GTK_IS_ENTRY (entry)) return NULL;
-
- return (entry);
+ if (GTK_IS_CONTAINER (w))
+ {
+ gtk_container_forall (GTK_CONTAINER (w), find_entry, &entry);
-}
+ if (NULL == entry)
+ break;
-GtkWidget *
-gtk_sheet_get_entry_widget (GtkSheet *sheet)
-{
- g_return_val_if_fail (sheet != NULL, NULL);
- g_return_val_if_fail (GTK_IS_SHEET (sheet), NULL);
- g_return_val_if_fail (sheet->entry_widget != NULL, NULL);
+ w = entry;
+ }
+ }
- return (sheet->entry_widget);
+ return GTK_ENTRY (w);
}
gboolean rtl ;
gint state = 0;
- gint len = 0;
- gchar *line = 0;
g_return_if_fail (sheet != NULL);
g_return_if_fail (button != NULL);
if (button->label_visible)
{
-
- text_height = DEFAULT_ROW_HEIGHT -
+ text_height = DEFAULT_ROW_HEIGHT -
2 * COLUMN_TITLES_HEIGHT;
gdk_gc_set_clip_rectangle (GTK_WIDGET (sheet)->style->fg_gc[button->state],
allocation.y += 2 * sheet->button->style->ythickness;
-
if (button->label && strlen (button->label)>0)
{
- gchar *words = 0;
+ PangoRectangle rect;
+ gchar *line = button->label;
+
PangoLayout *layout = NULL;
- gint real_x = allocation.x, real_y = allocation.y;
+ gint real_x = allocation.x;
+ gint real_y = allocation.y;
- words = button->label;
- line = g_new (gchar, 1);
- line[0]='\0';
+ layout = gtk_widget_create_pango_layout (GTK_WIDGET (sheet), line);
+ pango_layout_get_extents (layout, NULL, &rect);
- while (words && *words != '\0')
+ text_width = PANGO_PIXELS (rect.width);
+ switch (button->justification)
{
- if (*words != '\n')
- {
- len = strlen (line);
- line = g_realloc (line, len + 2);
- line[len]=*words;
- line[len + 1]='\0';
- }
- if (*words == '\n' || * (words + 1) == '\0')
- {
- text_width = STRING_WIDTH (GTK_WIDGET (sheet), GTK_WIDGET (sheet)->style->font_desc, line);
-
- layout = gtk_widget_create_pango_layout (GTK_WIDGET (sheet), line);
- switch (button->justification)
- {
- case GTK_JUSTIFY_LEFT:
- real_x = allocation.x + COLUMN_TITLES_HEIGHT;
- align = rtl ? PANGO_ALIGN_RIGHT : PANGO_ALIGN_LEFT;
- break;
- case GTK_JUSTIFY_RIGHT:
- real_x = allocation.x + allocation.width - text_width - COLUMN_TITLES_HEIGHT;
- align = rtl ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT;
- break;
- case GTK_JUSTIFY_CENTER:
- default:
- real_x = allocation.x + (allocation.width - text_width)/2;
- align = rtl ? PANGO_ALIGN_RIGHT : PANGO_ALIGN_LEFT;
- pango_layout_set_justify (layout, TRUE);
- }
- pango_layout_set_alignment (layout, align);
- gtk_paint_layout (GTK_WIDGET (sheet)->style,
- window,
- state,
- FALSE,
- &allocation,
- GTK_WIDGET (sheet),
- "label",
- real_x, real_y,
- layout);
- g_object_unref (layout);
-
- real_y += text_height + 2;
-
- g_free (line);
- line = g_new (gchar, 1);
- line[0]='\0';
- }
- words++;
+ case GTK_JUSTIFY_LEFT:
+ real_x = allocation.x + COLUMN_TITLES_HEIGHT;
+ align = rtl ? PANGO_ALIGN_RIGHT : PANGO_ALIGN_LEFT;
+ break;
+ case GTK_JUSTIFY_RIGHT:
+ real_x = allocation.x + allocation.width - text_width - COLUMN_TITLES_HEIGHT;
+ align = rtl ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT;
+ break;
+ case GTK_JUSTIFY_CENTER:
+ default:
+ real_x = allocation.x + (allocation.width - text_width)/2;
+ align = rtl ? PANGO_ALIGN_RIGHT : PANGO_ALIGN_LEFT;
+ pango_layout_set_justify (layout, TRUE);
}
- g_free (line);
+ pango_layout_set_alignment (layout, align);
+ gtk_paint_layout (GTK_WIDGET (sheet)->style,
+ window,
+ state,
+ FALSE,
+ &allocation,
+ GTK_WIDGET (sheet),
+ "label",
+ real_x, real_y,
+ layout);
+ g_object_unref (layout);
}
gdk_gc_set_clip_rectangle (GTK_WIDGET (sheet)->style->fg_gc[button->state],
gboolean is_sensitive = FALSE;
GtkSheetButton *
- button = g_sheet_column_get_button (sheet->column_geometry, col);
+ button = g_sheet_model_get_column_button (sheet->model, col);
allocation.y = 0;
- allocation.x =
- g_sheet_column_start_pixel (sheet->column_geometry, col)
+ allocation.x = psppire_axis_pixel_start (sheet->haxis, col)
+ CELL_SPACING;
allocation.x -= sheet->hadjustment->value;
allocation.height = sheet->column_title_area.height;
- allocation.width =
- g_sheet_column_get_width (sheet->column_geometry, col);
- is_sensitive =
- g_sheet_column_get_sensitivity (sheet->column_geometry, col);
+ allocation.width = psppire_axis_unit_size (sheet->haxis, col);
+ is_sensitive = g_sheet_model_get_column_sensitivity (sheet->model, col);
draw_button (sheet, sheet->column_title_window,
button, is_sensitive, allocation);
gboolean is_sensitive = FALSE;
GtkSheetButton *button =
- g_sheet_row_get_button (sheet->row_geometry, row);
+ g_sheet_model_get_row_button (sheet->model, row);
allocation.x = 0;
- allocation.y = g_sheet_row_start_pixel (sheet->row_geometry, row)
+ allocation.y = psppire_axis_pixel_start (sheet->vaxis, row)
+ CELL_SPACING;
allocation.y -= sheet->vadjustment->value;
allocation.width = sheet->row_title_area.width;
- allocation.height = g_sheet_row_get_height (sheet->row_geometry, row);
- is_sensitive = g_sheet_row_get_sensitivity (sheet->row_geometry, row);
+ allocation.height = psppire_axis_unit_size (sheet->vaxis, row);
+ is_sensitive = g_sheet_model_get_row_sensitivity (sheet->model, row);
draw_button (sheet, sheet->row_title_window,
button, is_sensitive, allocation);
if (sheet->vadjustment)
{
- glong last_row = g_sheet_row_get_row_count (sheet->row_geometry) - 1;
+ glong last_row = psppire_axis_unit_count (sheet->vaxis) - 1;
sheet->vadjustment->step_increment =
ROWS_PER_STEP *
- g_sheet_row_get_height (sheet->row_geometry, last_row);
+ psppire_axis_unit_size (sheet->vaxis, last_row);
sheet->vadjustment->page_increment =
height -
sheet->column_title_area.height -
- g_sheet_row_get_height (sheet->row_geometry, last_row);
+ psppire_axis_unit_size (sheet->vaxis, last_row);
sheet->vadjustment->upper =
- g_sheet_row_start_pixel (sheet->row_geometry, last_row)
+ psppire_axis_pixel_start (sheet->vaxis, last_row)
+
- g_sheet_row_get_height (sheet->row_geometry, last_row)
+ psppire_axis_unit_size (sheet->vaxis, last_row)
;
sheet->vadjustment->lower = 0;
sheet->hadjustment->page_increment = width;
- last_col = g_sheet_column_get_column_count (sheet->column_geometry) - 1;
+ last_col = psppire_axis_unit_count (sheet->haxis) - 1;
sheet->hadjustment->upper =
- g_sheet_column_start_pixel (sheet->column_geometry, last_col)
+ psppire_axis_pixel_start (sheet->haxis, last_col)
+
- g_sheet_column_get_width (sheet->column_geometry, last_col)
+ psppire_axis_unit_size (sheet->haxis, last_col)
;
sheet->hadjustment->lower = 0;
GdkRectangle clip_area, area;
GdkGCValues values;
- area.x = g_sheet_column_start_pixel (sheet->column_geometry, range.col0);
- area.y = g_sheet_row_start_pixel (sheet->row_geometry, range.row0);
- area.width = g_sheet_column_start_pixel (sheet->column_geometry, range.coli)- area.x+
- g_sheet_column_get_width (sheet->column_geometry, range.coli);
- area.height = g_sheet_row_start_pixel (sheet->row_geometry, range.rowi)- area.y +
- g_sheet_row_get_height (sheet->row_geometry, range.rowi);
+ area.x = psppire_axis_pixel_start (sheet->haxis, range.col0);
+ area.y = psppire_axis_pixel_start (sheet->vaxis, range.row0);
+ area.width = psppire_axis_pixel_start (sheet->haxis, range.coli)- area.x+
+ psppire_axis_unit_size (sheet->haxis, range.coli);
+ area.height = psppire_axis_pixel_start (sheet->vaxis, range.rowi)- area.y +
+ psppire_axis_unit_size (sheet->vaxis, range.rowi);
clip_area.x = sheet->row_title_area.width;
clip_area.y = sheet->column_title_area.height;
static guint
new_column_width (GtkSheet *sheet, gint column, gint *x)
{
- gint left_pos = g_sheet_column_start_pixel (sheet->column_geometry, column)
+ gint left_pos = psppire_axis_pixel_start (sheet->haxis, column)
- sheet->hadjustment->value;
gint width = *x - left_pos;
*x = left_pos + width;
}
+#if AXIS_TRANSITION
g_sheet_column_set_width (sheet->column_geometry, column, width);
+#endif
draw_column_title_buttons (sheet);
min_height = sheet->row_requisition;
/* you can't shrink a row to less than its minimum height */
- if (cy < g_sheet_row_start_pixel (sheet->row_geometry, row) + min_height)
+ if (cy < psppire_axis_pixel_start (sheet->vaxis, row) + min_height)
{
- *y = cy = g_sheet_row_start_pixel (sheet->row_geometry, row) + min_height;
+ *y = cy = psppire_axis_pixel_start (sheet->vaxis, row) + min_height;
}
/* calculate new row height making sure it doesn't end up
* less than the minimum height */
- height = (cy - g_sheet_row_start_pixel (sheet->row_geometry, row));
+ height = (cy - psppire_axis_pixel_start (sheet->vaxis, row));
if (height < min_height)
height = min_height;
+#if AXIS_TRANSITION
g_sheet_row_set_height (sheet->row_geometry, row, height);
+#endif
draw_row_title_buttons (sheet);
return height;
g_return_if_fail (sheet != NULL);
g_return_if_fail (GTK_IS_SHEET (sheet));
- if (column < 0 || column >= g_sheet_column_get_column_count (sheet->column_geometry))
+ if (column < 0 || column >= psppire_axis_unit_count (sheet->haxis))
return;
gtk_sheet_column_size_request (sheet, column, &min_width);
if (width < min_width) return;
+#if AXIS_TRANSITION
g_sheet_column_set_width (sheet->column_geometry, column, width);
+#endif
if (GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)))
{
g_return_if_fail (sheet != NULL);
g_return_if_fail (GTK_IS_SHEET (sheet));
- if (row < 0 || row >= g_sheet_row_get_row_count (sheet->row_geometry))
+ if (row < 0 || row >= psppire_axis_unit_count (sheet->vaxis))
return;
gtk_sheet_row_size_request (sheet, row, &min_height);
if (height < min_height) return;
+#if AXIS_TRANSITION
g_sheet_row_set_height (sheet->row_geometry, row, height);
+#endif
if (GTK_WIDGET_REALIZED (GTK_WIDGET (sheet)) )
{
if (row < 0 || col < 0) return FALSE;
-
attr->foreground = GTK_WIDGET (sheet)->style->black;
attr->background = sheet->color[BG_COLOR];
attr->font_desc = GTK_WIDGET (sheet)->style->font_desc;
attr->is_editable = g_sheet_model_is_editable (sheet->model, row, col);
- attr->is_visible = g_sheet_model_is_visible (sheet->model, row, col);
-
colormap = gtk_widget_get_colormap (GTK_WIDGET (sheet));
fg = g_sheet_model_get_foreground (sheet->model, row, col);
}
attr->justification =
- g_sheet_column_get_justification (sheet->column_geometry, col);
+ g_sheet_model_get_column_justification (sheet->model, col);
j = g_sheet_model_get_justification (sheet->model, row, col);
if (j)
GtkRequisition button_requisition;
gtk_sheet_button_size_request (sheet,
- g_sheet_row_get_button (sheet->row_geometry, row),
+ g_sheet_model_get_row_button (sheet->model, row),
&button_requisition);
*requisition = button_requisition.height;
{
GtkRequisition button_requisition;
- GtkSheetButton *button = g_sheet_column_get_button (sheet->column_geometry, col);
+ GtkSheetButton *button = g_sheet_model_get_column_button (sheet->model, col);
gtk_sheet_button_size_request (sheet,
button,
if (sheet->button && sheet->button->parent)
(* callback) (sheet->button, callback_data);
- if (sheet->entry_container && GTK_IS_CONTAINER (sheet->entry_container))
- (* callback) (sheet->entry_container, callback_data);
+ if (sheet->entry_widget && GTK_IS_CONTAINER (sheet->entry_widget))
+ (* callback) (sheet->entry_widget, callback_data);
}
g_free (button);
}
-
static void
append_cell_text (GString *string, const GtkSheet *sheet, gint r, gint c)
{
projects / pspp-builds.git / blobdiff