X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtk-contrib%2Fpsppire-sheet.c;h=6703f0b67e0806e101d3a751b2c2f1bfd758f8ab;hb=627d9064e04c3e76fcddf033cb2a47d13d40a98e;hp=7c6d57d9a94d0d7688e3095fb4b023a16816afe9;hpb=6031f8577a5da51976e29219a6222278cd70b9d2;p=pspp-builds.git diff --git a/lib/gtk-contrib/psppire-sheet.c b/lib/gtk-contrib/psppire-sheet.c index 7c6d57d9..6703f0b6 100644 --- a/lib/gtk-contrib/psppire-sheet.c +++ b/lib/gtk-contrib/psppire-sheet.c @@ -54,8 +54,6 @@ #include #include -#include -#include #include #include #include @@ -72,8 +70,6 @@ #include #include -#include - /* sheet flags */ enum { @@ -85,9 +81,7 @@ enum 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) @@ -98,7 +92,6 @@ enum #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 @@ -394,30 +387,33 @@ POSSIBLE_RESIZE (const PsppireSheet *sheet, gint x, gint y, } -static gboolean -rectangle_from_range (PsppireSheet *sheet, const PsppireSheetRange *input, +static void +rectangle_from_range (PsppireSheet *sheet, const PsppireSheetRange *range, GdkRectangle *r) { - PsppireSheetRange range = *input; + gint col0 = MIN (range->col0, range->coli); + gint coli = MAX (range->col0, range->coli); + gint row0 = MIN (range->row0, range->rowi); + gint rowi = MAX (range->row0, range->rowi); - if ( range.row0 == -1 ) range.row0 = min_visible_row (sheet); - if ( range.rowi == -1 ) range.rowi = max_visible_row (sheet); - if ( range.col0 == -1 ) range.col0 = min_visible_column (sheet); - if ( range.coli == -1 ) range.coli = max_visible_column (sheet); + if ( row0 == -1 ) row0 = min_visible_row (sheet); + if ( rowi == -1 ) rowi = max_visible_row (sheet); + if ( col0 == -1 ) col0 = min_visible_column (sheet); + if ( coli == -1 ) coli = max_visible_column (sheet); - r->x = psppire_axis_start_pixel (sheet->haxis, range.col0); + r->x = psppire_axis_start_pixel (sheet->haxis, col0); r->x -= round (sheet->hadjustment->value); - r->y = psppire_axis_start_pixel (sheet->vaxis, range.row0); + r->y = psppire_axis_start_pixel (sheet->vaxis, row0); r->y -= round (sheet->vadjustment->value); - r->width = psppire_axis_start_pixel (sheet->haxis, range.coli) - - psppire_axis_start_pixel (sheet->haxis, range.col0) + - psppire_axis_unit_size (sheet->haxis, range.coli); + r->width = psppire_axis_start_pixel (sheet->haxis, coli) - + psppire_axis_start_pixel (sheet->haxis, col0) + + psppire_axis_unit_size (sheet->haxis, coli); - r->height = psppire_axis_start_pixel (sheet->vaxis, range.rowi) - - psppire_axis_start_pixel (sheet->vaxis, range.row0) + - psppire_axis_unit_size (sheet->vaxis, range.rowi); + r->height = psppire_axis_start_pixel (sheet->vaxis, rowi) - + psppire_axis_start_pixel (sheet->vaxis, row0) + + psppire_axis_unit_size (sheet->vaxis, rowi); if ( sheet->column_titles_visible) { @@ -428,22 +424,20 @@ rectangle_from_range (PsppireSheet *sheet, const PsppireSheetRange *input, { r->x += sheet->row_title_area.width; } - - return TRUE; } -static gboolean +static void rectangle_from_cell (PsppireSheet *sheet, gint row, gint col, GdkRectangle *r) { PsppireSheetRange range; - g_return_val_if_fail (row >= 0, FALSE); - g_return_val_if_fail (col >= 0, FALSE); + g_return_if_fail (row >= 0); + g_return_if_fail (col >= 0); range.row0 = range.rowi = row; range.col0 = range.coli = col; - return rectangle_from_range (sheet, &range, r); + rectangle_from_range (sheet, &range, r); } @@ -855,7 +849,7 @@ psppire_sheet_class_init (PsppireSheetClass *klass) /** * 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. */ @@ -874,7 +868,7 @@ psppire_sheet_class_init (PsppireSheetClass *klass) /** * 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. */ @@ -1129,7 +1123,6 @@ psppire_sheet_init (PsppireSheet *sheet) 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); @@ -2261,17 +2254,6 @@ draw_sheet_region (PsppireSheet *sheet, GdkRegion *region) psppire_sheet_show_entry_widget (sheet); } - - -static inline gint -safe_strcmp (const gchar *s1, const gchar *s2) -{ - if ( !s1 && !s2) return 0; - if ( !s1) return -1; - if ( !s2) return +1; - return strcmp (s1, s2); -} - static void psppire_sheet_set_cell (PsppireSheet *sheet, gint row, gint col, GtkJustification justification, @@ -2293,7 +2275,7 @@ psppire_sheet_set_cell (PsppireSheet *sheet, gint row, gint col, old_text = psppire_sheet_model_get_string (model, row, col); - if (0 != safe_strcmp (old_text, text)) + if (0 != g_strcmp0 (old_text, text)) { g_signal_handler_block (sheet->model, sheet->update_handler_id); psppire_sheet_model_set_string (model, text, row, col); @@ -2701,6 +2683,8 @@ psppire_sheet_select_row (PsppireSheet *sheet, gint row) area.y++; gdk_window_invalidate_rect (sheet->sheet_window, &area, FALSE); + + g_signal_emit (sheet, sheet_signals [SELECT_ROW], 0, row); } void @@ -2717,6 +2701,8 @@ psppire_sheet_select_column (PsppireSheet *sheet, gint column) area.y++; gdk_window_invalidate_rect (sheet->sheet_window, &area, FALSE); + + g_signal_emit (sheet, sheet_signals [SELECT_COLUMN], 0, column); } @@ -2744,28 +2730,12 @@ psppire_sheet_unselect_range (PsppireSheet *sheet) 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) { @@ -2898,7 +2868,8 @@ psppire_sheet_button_press (GtkWidget *widget, GdkEventButton *event) sheet_signals[DOUBLE_CLICK_COLUMN], 0, column); } } - else if (event->window == sheet->row_title_window) + + if (event->window == sheet->row_title_window) { g_signal_emit (sheet, sheet_signals[BUTTON_EVENT_ROW], 0, @@ -2969,18 +2940,16 @@ psppire_sheet_button_press (GtkWidget *widget, GdkEventButton *event) NULL, NULL, event->time); gtk_grab_add (GTK_WIDGET (sheet)); - if (psppire_sheet_click_cell (sheet, row, column)) + if ( sheet->select_status == PSPPIRE_SHEET_NORMAL) { - if ( sheet->select_status == PSPPIRE_SHEET_NORMAL) - { - sheet->range.row0 = row; - sheet->range.col0 = column; - } - else - { - psppire_sheet_unselect_range (sheet); - } + sheet->range.row0 = row; + sheet->range.col0 = column; + } + else + { + psppire_sheet_unselect_range (sheet); } + psppire_sheet_click_cell (sheet, row, column); } if (event->window == sheet->column_title_window) @@ -3144,27 +3113,6 @@ psppire_sheet_button_release (GtkWidget *widget, 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); @@ -3437,7 +3385,6 @@ psppire_sheet_motion (GtkWidget *widget, GdkEventMotion *event) !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); @@ -3447,8 +3394,7 @@ psppire_sheet_motion (GtkWidget *widget, GdkEventMotion *event) 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) @@ -3458,20 +3404,6 @@ psppire_sheet_motion (GtkWidget *widget, GdkEventMotion *event) 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; @@ -3527,80 +3459,6 @@ psppire_sheet_motion (GtkWidget *widget, GdkEventMotion *event) 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 &&