of making a selection - ie while the mouse button is
depressed.
*/
- PSPPIRE_SHEET_IN_SELECTION = 1 << 4,
-
- PSPPIRE_SHEET_IN_RESIZE = 1 << 5
+ PSPPIRE_SHEET_IN_SELECTION = 1 << 4
};
#define PSPPIRE_SHEET_FLAGS(sheet) (PSPPIRE_SHEET (sheet)->flags)
#define PSPPIRE_SHEET_IN_YDRAG(sheet) (PSPPIRE_SHEET_FLAGS (sheet) & PSPPIRE_SHEET_IN_YDRAG)
#define PSPPIRE_SHEET_IN_DRAG(sheet) (PSPPIRE_SHEET_FLAGS (sheet) & PSPPIRE_SHEET_IN_DRAG)
#define PSPPIRE_SHEET_IN_SELECTION(sheet) (PSPPIRE_SHEET_FLAGS (sheet) & PSPPIRE_SHEET_IN_SELECTION)
-#define PSPPIRE_SHEET_IN_RESIZE(sheet) (PSPPIRE_SHEET_FLAGS (sheet) & PSPPIRE_SHEET_IN_RESIZE)
#define CELL_SPACING 1
/**
* PsppireSheet::select-row
* @sheet: the sheet widget that emitted the signal
- * @row: the newly selected row index
+ * @row: the newly selected row index, or -1 if no row is selected.
*
* A row has been selected.
*/
/**
* PsppireSheet::select - column
* @sheet: the sheet widget that emitted the signal
- * @column: the newly selected column index
+ * @column: the newly selected column index, or -1 if no column is selected.
*
* A column has been selected.
*/
sheet->vaxis = NULL;
sheet->flags = 0;
- sheet->selection_mode = GTK_SELECTION_NONE;
sheet->select_status = PSPPIRE_SHEET_NORMAL;
GTK_WIDGET_UNSET_FLAGS (sheet, GTK_NO_WINDOW);
area.y++;
gdk_window_invalidate_rect (sheet->sheet_window, &area, FALSE);
+
+ g_signal_emit (sheet, sheet_signals [SELECT_ROW], 0, row);
}
void
area.y++;
gdk_window_invalidate_rect (sheet->sheet_window, &area, FALSE);
+
+ g_signal_emit (sheet, sheet_signals [SELECT_COLUMN], 0, column);
}
rectangle_from_range (sheet, &sheet->range, &area);
area.x++;
area.y++;
- gdk_window_invalidate_rect (sheet->sheet_window, &area, FALSE);
-}
-
-static void
-psppire_sheet_real_select_range (PsppireSheet *sheet,
- const PsppireSheetRange *range)
-{
- g_return_if_fail (sheet != NULL);
-
- if (range == NULL) range = &sheet->range;
-
- memcpy (&sheet->range, range, sizeof (*range));
+ gdk_window_invalidate_rect (sheet->sheet_window, &area, FALSE);
- if (range->row0 < 0 || range->rowi < 0) return;
- if (range->col0 < 0 || range->coli < 0) return;
-
- psppire_sheet_update_primary_selection (sheet);
-
- g_signal_emit (sheet, sheet_signals[SELECT_RANGE], 0, &sheet->range);
+ g_signal_emit (sheet, sheet_signals [SELECT_COLUMN], 0, -1);
+ g_signal_emit (sheet, sheet_signals [SELECT_ROW], 0, -1);
}
-
void
psppire_sheet_get_selected_range (PsppireSheet *sheet, PsppireSheetRange *range)
{
psppire_sheet_select_range (sheet, &sheet->range);
}
- if (PSPPIRE_SHEET_IN_RESIZE (sheet))
- {
- PsppireSheetRange old_range;
- draw_xor_rectangle (sheet, sheet->drag_range);
- PSPPIRE_SHEET_UNSET_FLAGS (sheet, PSPPIRE_SHEET_IN_RESIZE);
- gdk_display_pointer_ungrab (display, event->time);
-
- psppire_sheet_unselect_range (sheet);
-
- old_range = sheet->range;
- sheet->range = sheet->drag_range;
- sheet->drag_range = old_range;
-
- if (sheet->select_status == PSPPIRE_SHEET_NORMAL)
- sheet->select_status = PSPPIRE_SHEET_RANGE_SELECTED;
-
- g_signal_emit (sheet, sheet_signals[RESIZE_RANGE], 0,
- &sheet->drag_range, &sheet->range);
- psppire_sheet_select_range (sheet, &sheet->range);
- }
-
if (PSPPIRE_SHEET_IN_SELECTION (sheet))
{
PSPPIRE_SHEET_UNSET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION);
!POSSIBLE_DRAG (sheet, x, y, &row, &column) &&
!PSPPIRE_SHEET_IN_DRAG (sheet) &&
!POSSIBLE_RESIZE (sheet, x, y, &row, &column) &&
- !PSPPIRE_SHEET_IN_RESIZE (sheet) &&
new_cursor != sheet->cursor_drag->type)
{
gdk_cursor_unref (sheet->cursor_drag);
new_cursor = GDK_TOP_LEFT_ARROW;
if ( event->window == sheet->sheet_window &&
- ! (POSSIBLE_RESIZE (sheet, x, y, &row, &column) ||
- PSPPIRE_SHEET_IN_RESIZE (sheet)) &&
+ ! (POSSIBLE_RESIZE (sheet, x, y, &row, &column) ) &&
(POSSIBLE_DRAG (sheet, x, y, &row, &column) ||
PSPPIRE_SHEET_IN_DRAG (sheet)) &&
new_cursor != sheet->cursor_drag->type)
gdk_window_set_cursor (sheet->sheet_window, sheet->cursor_drag);
}
- new_cursor = GDK_SIZING;
- if ( event->window == sheet->sheet_window &&
- sheet->selection_mode != GTK_SELECTION_NONE &&
- !PSPPIRE_SHEET_IN_DRAG (sheet) &&
- (POSSIBLE_RESIZE (sheet, x, y, &row, &column) ||
- PSPPIRE_SHEET_IN_RESIZE (sheet)) &&
- new_cursor != sheet->cursor_drag->type)
- {
- gdk_cursor_unref (sheet->cursor_drag);
- sheet->cursor_drag = gdk_cursor_new_for_display (display, GDK_SIZING);
- gdk_window_set_cursor (sheet->sheet_window, sheet->cursor_drag);
- }
-
-
gdk_window_get_pointer (widget->window, &x, &y, &mods);
if (! (mods & GDK_BUTTON1_MASK)) return FALSE;
return TRUE;
}
- if (PSPPIRE_SHEET_IN_RESIZE (sheet))
- {
- PsppireSheetRange aux;
- gint v_h, current_col, current_row, col_threshold, row_threshold;
- v_h = 1;
- if (abs (x - psppire_axis_start_pixel (sheet->haxis, sheet->drag_cell.col)) >
- abs (y - psppire_axis_start_pixel (sheet->vaxis, sheet->drag_cell.row))) v_h = 2;
-
- current_col = column_from_xpixel (sheet, x);
- current_row = row_from_ypixel (sheet, y);
- column = current_col - sheet->drag_cell.col;
- row = current_row - sheet->drag_cell.row;
-
- /*use half of column width resp. row height as threshold to
- expand selection*/
- col_threshold = psppire_axis_start_pixel (sheet->haxis, current_col) +
- psppire_axis_unit_size (sheet->haxis, current_col) / 2;
- if (column > 0)
- {
- if (x < col_threshold)
- column -= 1;
- }
- else if (column < 0)
- {
- if (x > col_threshold)
- column +=1;
- }
- row_threshold = psppire_axis_start_pixel (sheet->vaxis, current_row) +
- psppire_axis_unit_size (sheet->vaxis, current_row)/2;
- if (row > 0)
- {
- if (y < row_threshold)
- row -= 1;
- }
- else if (row < 0)
- {
- if (y > row_threshold)
- row +=1;
- }
-
- if (sheet->select_status == PSPPIRE_SHEET_COLUMN_SELECTED) row = 0;
- if (sheet->select_status == PSPPIRE_SHEET_ROW_SELECTED) column = 0;
- sheet->x_drag = x;
- sheet->y_drag = y;
- aux = sheet->range;
-
- if (v_h == 1)
- column = 0;
- else
- row = 0;
-
- if (aux.row0 + row >= 0 && aux.rowi + row < psppire_axis_unit_count (sheet->vaxis) &&
- aux.col0 + column >= 0 && aux.coli + column < psppire_axis_unit_count (sheet->haxis))
- {
- aux = sheet->drag_range;
- sheet->drag_range = sheet->range;
-
- if (row < 0) sheet->drag_range.row0 = sheet->range.row0 + row;
- if (row > 0) sheet->drag_range.rowi = sheet->range.rowi + row;
- if (column < 0) sheet->drag_range.col0 = sheet->range.col0 + column;
- if (column > 0) sheet->drag_range.coli = sheet->range.coli + column;
-
- if (aux.row0 != sheet->drag_range.row0 ||
- aux.rowi != sheet->drag_range.rowi ||
- aux.col0 != sheet->drag_range.col0 ||
- aux.coli != sheet->drag_range.coli)
- {
- draw_xor_rectangle (sheet, aux);
- draw_xor_rectangle (sheet, sheet->drag_range);
- }
- }
- return TRUE;
- }
-
psppire_sheet_get_pixel_info (sheet, x, y, &row, &column);
if (sheet->select_status == PSPPIRE_SHEET_NORMAL && row == sheet->active_cell.row &&
projects / pspp-builds.git / blobdiff