gint row, gint col);
static void gtk_sheet_draw_active_cell (GtkSheet *sheet);
static void gtk_sheet_show_active_cell (GtkSheet *sheet);
-static void gtk_sheet_click_cell (GtkSheet *sheet,
+static gboolean gtk_sheet_click_cell (GtkSheet *sheet,
gint row,
- gint column,
- gboolean *veto);
+ gint column);
/* Backing Pixmap */
-
static void gtk_sheet_make_backing_pixmap (GtkSheet *sheet);
static void gtk_sheet_draw_backing_pixmap (GtkSheet *sheet,
/* Signals */
-
-extern void
-_gtkextra_signal_emit (GtkObject *object, guint signal_id, ...);
-
enum
{
SELECT_ROW,
sheet->row_title_area.width = DEFAULT_COLUMN_WIDTH;
sheet->column_titles_visible = TRUE;
- sheet->autoscroll = TRUE;
- sheet->justify_entry = TRUE;
/* create sheet entry */
}
-void
-gtk_sheet_set_autoscroll (GtkSheet *sheet, gboolean autoscroll)
-{
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (GTK_IS_SHEET (sheet));
-
- sheet->autoscroll = autoscroll;
-}
-
-gboolean
-gtk_sheet_autoscroll (GtkSheet *sheet)
-{
- g_return_val_if_fail (sheet != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_SHEET (sheet), FALSE);
-
- return sheet->autoscroll;
-}
-
-
-void
-gtk_sheet_set_justify_entry (GtkSheet *sheet, gboolean justify)
-{
- g_return_if_fail (sheet != NULL);
- g_return_if_fail (GTK_IS_SHEET (sheet));
-
- sheet->justify_entry = justify;
-}
-
-gboolean
-gtk_sheet_justify_entry (GtkSheet *sheet)
-{
- g_return_val_if_fail (sheet != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_SHEET (sheet), FALSE);
-
- return sheet->justify_entry;
-}
-
void
gtk_sheet_set_row_titles_width (GtkSheet *sheet, guint width)
static void
global_button_clicked (GtkWidget *widget, gpointer data)
{
- gboolean veto;
-
- gtk_sheet_click_cell (GTK_SHEET (data), - 1, - 1, &veto);
+ gtk_sheet_click_cell (GTK_SHEET (data), -1, -1);
gtk_widget_grab_focus (GTK_WIDGET (data));
}
if (!gtk_sheet_activate_cell (sheet, row, column)) return FALSE;
- if (gtk_sheet_autoscroll (sheet))
- gtk_sheet_move_query (sheet, row, column);
return TRUE;
}
G_CALLBACK (gtk_sheet_entry_changed),
sheet);
- _gtkextra_signal_emit (GTK_OBJECT (sheet), sheet_signals [ACTIVATE], row, col, &veto);
+ g_signal_emit (sheet, sheet_signals [ACTIVATE], 0, row, col, &veto);
return TRUE;
}
justification = GTK_JUSTIFY_LEFT;
- if (gtk_sheet_justify_entry (sheet))
- justification = attributes.justification;
text = gtk_sheet_cell_get_text (sheet, row, col);
if ( ! text )
}
else
{
- gtk_sheet_click_cell (sheet, row, column, &veto);
+ veto = gtk_sheet_click_cell (sheet, row, column);
if (veto) GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
}
}
if (g_sheet_column_get_sensitivity (sheet->column_geometry, column))
{
- gtk_sheet_click_cell (sheet, - 1, column, &veto);
+ veto = gtk_sheet_click_cell (sheet, -1, column);
gtk_grab_add (GTK_WIDGET (sheet));
gtk_widget_grab_focus (GTK_WIDGET (sheet));
GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
row = yyy_row_ypixel_to_row (sheet, y);
if (g_sheet_row_get_sensitivity (sheet->row_geometry, row))
{
- gtk_sheet_click_cell (sheet, row, - 1, &veto);
+ veto = gtk_sheet_click_cell (sheet, row, -1);
gtk_grab_add (GTK_WIDGET (sheet));
gtk_widget_grab_focus (GTK_WIDGET (sheet));
GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
return TRUE;
}
-static void
-gtk_sheet_click_cell (GtkSheet *sheet, gint row, gint column, gboolean *veto)
+static gboolean
+gtk_sheet_click_cell (GtkSheet *sheet, gint row, gint column)
{
- *veto = TRUE;
+ gboolean forbid_move;
- if (row >= g_sheet_row_get_row_count (sheet->row_geometry) || column >= g_sheet_column_get_column_count (sheet->column_geometry))
+ if (row >= g_sheet_row_get_row_count (sheet->row_geometry)
+ || column >= g_sheet_column_get_column_count (sheet->column_geometry))
{
- *veto = FALSE;
- return;
+ return FALSE;
}
if (column >= 0 && row >= 0)
if (! g_sheet_column_get_visibility (sheet->column_geometry, column)
|| !g_sheet_row_get_visibility (sheet->row_geometry, row))
{
- *veto = FALSE;
- return;
+ return FALSE;
}
}
- _gtkextra_signal_emit (GTK_OBJECT (sheet), sheet_signals[TRAVERSE],
- sheet->active_cell.row, sheet->active_cell.col,
- &row, &column, veto);
+ g_signal_emit (sheet, sheet_signals[TRAVERSE], 0,
+ sheet->active_cell.row, sheet->active_cell.col,
+ &row, &column, &forbid_move);
- if (!*veto)
+ if (forbid_move)
{
- if (sheet->state == GTK_STATE_NORMAL) return;
+ if (sheet->state == GTK_STATE_NORMAL)
+ return FALSE;
row = sheet->active_cell.row;
column = sheet->active_cell.col;
gtk_sheet_activate_cell (sheet, row, column);
- return;
+ return FALSE;
}
if (row == -1 && column >= 0)
{
- if (gtk_sheet_autoscroll (sheet))
- gtk_sheet_move_query (sheet, row, column);
gtk_sheet_select_column (sheet, column);
- return;
+ return TRUE;
}
+
if (column == -1 && row >= 0)
{
- if (gtk_sheet_autoscroll (sheet))
- gtk_sheet_move_query (sheet, row, column);
gtk_sheet_select_row (sheet, row);
- return;
+ return TRUE;
}
if (row == - 1 && column == - 1)
sheet->range.row0 = 0;
sheet->range.col0 = 0;
sheet->range.rowi = g_sheet_row_get_row_count (sheet->row_geometry) - 1;
- sheet->range.coli = g_sheet_column_get_column_count (sheet->column_geometry) - 1;
+ sheet->range.coli =
+ g_sheet_column_get_column_count (sheet->column_geometry) - 1;
sheet->active_cell.row = 0;
sheet->active_cell.col = 0;
gtk_sheet_select_range (sheet, NULL);
- return;
+ return TRUE;
}
if (row != -1 && column != -1)
gtk_sheet_activate_cell (sheet, row, column);
}
- if (gtk_sheet_autoscroll (sheet))
- gtk_sheet_move_query (sheet, row, column);
sheet->active_cell.row = row;
sheet->active_cell.col = column;
sheet->selection_cell.row = row;
sheet->state = GTK_SHEET_NORMAL;
GTK_SHEET_SET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
gtk_sheet_draw_active_cell (sheet);
- return;
+ return TRUE;
}
g_assert_not_reached ();
- gtk_sheet_activate_cell (sheet, sheet->active_cell.row,
- sheet->active_cell.col);
}
static gint
}
+static void
+step_horizontal (GtkSheet *sheet, GtkScrollType dir)
+{
+ switch ( dir)
+ {
+ case GTK_SCROLL_STEP_RIGHT:
+
+ gtk_sheet_activate_cell (sheet,
+ sheet->active_cell.row,
+ sheet->active_cell.col + 1);
+ break;
+ case GTK_SCROLL_STEP_LEFT:
+
+ gtk_sheet_activate_cell (sheet,
+ sheet->active_cell.row,
+ sheet->active_cell.col - 1);
+ break;
+
+ default:
+ g_assert_not_reached ();
+ break;
+ }
+
+ if ( sheet->active_cell.col >= max_visible_column (sheet))
+ {
+ glong hpos =
+ g_sheet_column_start_pixel (sheet->column_geometry,
+ sheet->active_cell.col + 1);
+ hpos -= sheet->hadjustment->page_size;
+
+ gtk_adjustment_set_value (sheet->hadjustment,
+ hpos);
+ }
+ else if ( sheet->active_cell.col <= min_visible_column (sheet))
+ {
+ glong hpos =
+ g_sheet_column_start_pixel (sheet->column_geometry,
+ sheet->active_cell.col);
+
+ gtk_adjustment_set_value (sheet->hadjustment,
+ hpos);
+ }
+}
+
static gboolean
gtk_sheet_key_press (GtkWidget *widget,
GdkEventKey *key)
GTK_SHEET_UNSET_FLAGS (sheet, GTK_SHEET_IN_SELECTION);
-
switch (key->keyval)
{
+ case GDK_Tab:
case GDK_Right:
- /*
- gtk_adjustment_set_value (sheet->hadjustment,
- sheet->hadjustment->value +
- sheet->hadjustment->step_increment);
- */
-
- gtk_sheet_activate_cell (sheet,
- sheet->active_cell.row,
- sheet->active_cell.col + 1);
+ step_horizontal (sheet, GTK_SCROLL_STEP_RIGHT);
break;
+ case GDK_ISO_Left_Tab:
case GDK_Left:
- gtk_sheet_activate_cell (sheet,
- sheet->active_cell.row,
- sheet->active_cell.col - 1);
+ step_horizontal (sheet, GTK_SCROLL_STEP_LEFT);
break;
+ case GDK_Return:
case GDK_Down:
- gtk_adjustment_set_value (sheet->vadjustment,
- sheet->vadjustment->value +
- sheet->vadjustment->step_increment);
-
gtk_sheet_activate_cell (sheet,
sheet->active_cell.row + ROWS_PER_STEP,
sheet->active_cell.col);
-
+ if ( sheet->active_cell.row >= max_visible_row (sheet))
+ gtk_adjustment_set_value (sheet->vadjustment,
+ sheet->vadjustment->value +
+ sheet->vadjustment->step_increment);
break;
case GDK_Up:
- gtk_adjustment_set_value (sheet->vadjustment,
- sheet->vadjustment->value -
- sheet->vadjustment->step_increment);
-
gtk_sheet_activate_cell (sheet,
sheet->active_cell.row - ROWS_PER_STEP,
sheet->active_cell.col);
+ if ( sheet->active_cell.row < min_visible_row (sheet))
+ gtk_adjustment_set_value (sheet->vadjustment,
+ sheet->vadjustment->value -
+ sheet->vadjustment->step_increment);
break;
case GDK_Page_Down:
page_vertical (sheet, GTK_SCROLL_PAGE_UP);
break;
+ case GDK_Home:
+ gtk_adjustment_set_value (sheet->vadjustment,
+ sheet->vadjustment->lower);
+
+ gtk_sheet_activate_cell (sheet, 0,
+ sheet->active_cell.col);
+
+ break;
+
+ case GDK_End:
+ gtk_adjustment_set_value (sheet->vadjustment,
+ sheet->vadjustment->upper -
+ sheet->vadjustment->page_size -
+ sheet->vadjustment->page_increment);
+
+ /*
+ gtk_sheet_activate_cell (sheet,
+ g_sheet_row_get_row_count (sheet->row_geometry) - 1,
+ sheet->active_cell.col);
+ */
+ break;
default:
+ return FALSE;
break;
}
sheet->vadjustment->lower = 0;
sheet->vadjustment->page_size = sheet->sheet_window_height;
-#if 0
- {
- GtkAdjustment *adj = sheet->vadjustment;
- g_print ("Lower: %g; Upper: %g\n", adj->lower, adj->upper);
- g_print ("Step: %g; Page %g\n", adj->step_increment,
- adj->page_increment);
- g_print ("Current: %g\n", adj->value);
- }
-#endif
g_signal_emit_by_name (sheet->vadjustment, "changed");
}