X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtk-contrib%2Fpsppire-sheet.c;h=be4cd24323e4a33946a914908dd510326e574607;hb=5cc5058cfb4e7f3c22e7c53c7f538e73cc642c64;hp=b88b659e471bba93a402b4199193ab3287516be2;hpb=9e0e4996fad6563f0a1ce628b80db5c23ef8279e;p=pspp-builds.git diff --git a/lib/gtk-contrib/psppire-sheet.c b/lib/gtk-contrib/psppire-sheet.c index b88b659e..be4cd243 100644 --- a/lib/gtk-contrib/psppire-sheet.c +++ b/lib/gtk-contrib/psppire-sheet.c @@ -375,10 +375,10 @@ POSSIBLE_RESIZE (const PsppireSheet *sheet, gint x, gint y, ydrag = psppire_axis_start_pixel (sheet->vaxis, sheet->range.rowi) + psppire_axis_unit_size (sheet->vaxis, sheet->range.rowi); - if (sheet->state == PSPPIRE_SHEET_COLUMN_SELECTED) + if (sheet->select_status == PSPPIRE_SHEET_COLUMN_SELECTED) ydrag = psppire_axis_start_pixel (sheet->vaxis, min_visible_row (sheet)); - if (sheet->state == PSPPIRE_SHEET_ROW_SELECTED) + if (sheet->select_status == PSPPIRE_SHEET_ROW_SELECTED) xdrag = psppire_axis_start_pixel (sheet->haxis, min_visible_column (sheet)); *drag_column = column_from_xpixel (sheet, x); @@ -1135,7 +1135,7 @@ psppire_sheet_init (PsppireSheet *sheet) sheet->flags = 0; sheet->selection_mode = GTK_SELECTION_NONE; - sheet->state = PSPPIRE_SHEET_NORMAL; + sheet->select_status = PSPPIRE_SHEET_NORMAL; GTK_WIDGET_UNSET_FLAGS (sheet, GTK_NO_WINDOW); GTK_WIDGET_SET_FLAGS (sheet, GTK_CAN_FOCUS); @@ -1163,8 +1163,6 @@ psppire_sheet_init (PsppireSheet *sheet) sheet->range.col0 = 0; sheet->range.coli = 0; - sheet->state = PSPPIRE_SHEET_NORMAL; - sheet->sheet_window = NULL; sheet->entry_widget = NULL; sheet->button = NULL; @@ -1414,9 +1412,9 @@ psppire_sheet_change_entry (PsppireSheet *sheet, GtkType entry_type) g_return_if_fail (sheet != NULL); g_return_if_fail (PSPPIRE_IS_SHEET (sheet)); - state = sheet->state; + state = sheet->select_status; - if (sheet->state == PSPPIRE_SHEET_NORMAL) + if (sheet->select_status == PSPPIRE_SHEET_NORMAL) psppire_sheet_hide_entry_widget (sheet); sheet->entry_type = entry_type; @@ -1627,15 +1625,14 @@ psppire_sheet_select_row (PsppireSheet *sheet, gint row) if (row < 0 || row >= psppire_axis_unit_count (sheet->vaxis)) return; - if (sheet->state != PSPPIRE_SHEET_NORMAL) + if (sheet->select_status != PSPPIRE_SHEET_NORMAL) psppire_sheet_real_unselect_range (sheet, NULL); - sheet->state = PSPPIRE_SHEET_ROW_SELECTED; + sheet->select_status = PSPPIRE_SHEET_ROW_SELECTED; sheet->range.row0 = row; sheet->range.col0 = 0; sheet->range.rowi = row; sheet->range.coli = psppire_axis_unit_count (sheet->haxis) - 1; - sheet->active_cell.row = row; g_signal_emit (sheet, sheet_signals[SELECT_ROW], 0, row); psppire_sheet_real_select_range (sheet, NULL); @@ -1651,15 +1648,14 @@ psppire_sheet_select_column (PsppireSheet *sheet, gint column) if (column < 0 || column >= psppire_axis_unit_count (sheet->haxis)) return; - if (sheet->state != PSPPIRE_SHEET_NORMAL) + if (sheet->select_status != PSPPIRE_SHEET_NORMAL) psppire_sheet_real_unselect_range (sheet, NULL); - sheet->state = PSPPIRE_SHEET_COLUMN_SELECTED; + sheet->select_status = PSPPIRE_SHEET_COLUMN_SELECTED; sheet->range.row0 = 0; sheet->range.col0 = column; sheet->range.rowi = psppire_axis_unit_count (sheet->vaxis) - 1; sheet->range.coli = column; - sheet->active_cell.col = column; g_signal_emit (sheet, sheet_signals[SELECT_COLUMN], 0, column); psppire_sheet_real_select_range (sheet, NULL); @@ -2317,12 +2313,12 @@ draw_sheet_region (PsppireSheet *sheet, GdkRegion *region) psppire_sheet_cell_draw (sheet, i, j); } - if (sheet->state != PSPPIRE_SHEET_NORMAL && + if (sheet->select_status != PSPPIRE_SHEET_NORMAL && psppire_sheet_range_isvisible (sheet, &sheet->range)) psppire_sheet_range_draw_selection (sheet, drawing_range); - if (sheet->state == GTK_STATE_NORMAL && + if (sheet->select_status == GTK_STATE_NORMAL && sheet->active_cell.row >= drawing_range.row0 && sheet->active_cell.row <= drawing_range.rowi && sheet->active_cell.col >= drawing_range.col0 && @@ -2504,7 +2500,7 @@ psppire_sheet_cell_get_state (PsppireSheet *sheet, gint row, gint col) 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; + state = sheet->select_status; range = &sheet->range; switch (state) @@ -2662,7 +2658,7 @@ entry_load_text (PsppireSheet *sheet) PsppireSheetCellAttr attributes; if (!GTK_WIDGET_VISIBLE (sheet->entry_widget)) return; - if (sheet->state != GTK_STATE_NORMAL) return; + if (sheet->select_status != GTK_STATE_NORMAL) return; row = sheet->active_cell.row; col = sheet->active_cell.col; @@ -2709,20 +2705,20 @@ change_active_cell (PsppireSheet *sheet, gint row, gint col) || col > psppire_axis_unit_count (sheet->haxis)) return; - if (sheet->state != PSPPIRE_SHEET_NORMAL) + if (sheet->select_status != PSPPIRE_SHEET_NORMAL) { - sheet->state = PSPPIRE_SHEET_NORMAL; + sheet->select_status = PSPPIRE_SHEET_NORMAL; psppire_sheet_real_unselect_range (sheet, NULL); } old_row = sheet->active_cell.row; old_col = sheet->active_cell.col; - /* Erase the old cell */ - psppire_sheet_draw_active_cell (sheet); - entry_load_text (sheet); + /* Erase the old cell border */ + psppire_sheet_draw_active_cell (sheet); + sheet->range.row0 = row; sheet->range.col0 = col; sheet->range.rowi = row; @@ -2764,7 +2760,7 @@ psppire_sheet_show_entry_widget (PsppireSheet *sheet) return; if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return; - if (sheet->state != PSPPIRE_SHEET_NORMAL) return; + if (sheet->select_status != PSPPIRE_SHEET_NORMAL) return; if (PSPPIRE_SHEET_IN_SELECTION (sheet)) return; GTK_WIDGET_SET_FLAGS (GTK_WIDGET (sheet->entry_widget), GTK_VISIBLE); @@ -3086,6 +3082,8 @@ psppire_sheet_draw_border (PsppireSheet *sheet, PsppireSheetRange new_range) rectangle_from_range (sheet, &new_range, &area); + area.width ++; + area.height ++; gdk_gc_set_clip_rectangle (sheet->xor_gc, &area); @@ -3100,6 +3098,8 @@ psppire_sheet_draw_border (PsppireSheet *sheet, PsppireSheetRange new_range) area.y, area.width, area.height); + + gdk_gc_set_clip_rectangle (sheet->xor_gc, NULL); } @@ -3118,7 +3118,7 @@ psppire_sheet_real_select_range (PsppireSheet *sheet, if (range->row0 < 0 || range->rowi < 0) return; if (range->col0 < 0 || range->coli < 0) return; - state = sheet->state; + state = sheet->select_status; #if 0 if (range->coli != sheet->range.coli || range->col0 != sheet->range.col0 || @@ -3157,19 +3157,17 @@ psppire_sheet_select_range (PsppireSheet *sheet, const PsppireSheetRange *range) if (range->col0 < 0 || range->coli < 0) return; - if (sheet->state != PSPPIRE_SHEET_NORMAL) + if (sheet->select_status != PSPPIRE_SHEET_NORMAL) psppire_sheet_real_unselect_range (sheet, NULL); sheet->range.row0 = range->row0; sheet->range.rowi = range->rowi; sheet->range.col0 = range->col0; sheet->range.coli = range->coli; - sheet->active_cell.row = range->row0; - sheet->active_cell.col = range->col0; sheet->selection_cell.row = range->rowi; sheet->selection_cell.col = range->coli; - sheet->state = PSPPIRE_SHEET_RANGE_SELECTED; + sheet->select_status = PSPPIRE_SHEET_RANGE_SELECTED; psppire_sheet_real_select_range (sheet, NULL); } @@ -3180,10 +3178,7 @@ psppire_sheet_unselect_range (PsppireSheet *sheet) return; psppire_sheet_real_unselect_range (sheet, NULL); - sheet->state = GTK_STATE_NORMAL; - - change_active_cell (sheet, - sheet->active_cell.row, sheet->active_cell.col); + sheet->select_status = GTK_STATE_NORMAL; } @@ -3243,7 +3238,7 @@ psppire_sheet_expose (GtkWidget *widget, draw_sheet_region (sheet, event->region); #if 0 - if (sheet->state != PSPPIRE_SHEET_NORMAL) + if (sheet->select_status != PSPPIRE_SHEET_NORMAL) { if (psppire_sheet_range_isvisible (sheet, &sheet->range)) psppire_sheet_range_draw (sheet, &sheet->range); @@ -3290,7 +3285,7 @@ psppire_sheet_button_press (GtkWidget *widget, GdkModifierType mods; gint x, y; gint row, column; - gboolean veto; + g_return_val_if_fail (widget != NULL, FALSE); g_return_val_if_fail (PSPPIRE_IS_SHEET (widget), FALSE); @@ -3394,65 +3389,8 @@ psppire_sheet_button_press (GtkWidget *widget, NULL, NULL, event->time); gtk_grab_add (GTK_WIDGET (sheet)); - if (sheet->selection_mode != GTK_SELECTION_SINGLE && - sheet->selection_mode != GTK_SELECTION_NONE && - sheet->cursor_drag->type == GDK_SIZING && - !PSPPIRE_SHEET_IN_SELECTION (sheet) && !PSPPIRE_SHEET_IN_RESIZE (sheet)) - { - if (sheet->state == GTK_STATE_NORMAL) - { - row = sheet->active_cell.row; - column = sheet->active_cell.col; - sheet->active_cell.row = row; - sheet->active_cell.col = column; - sheet->drag_range = sheet->range; - sheet->state = PSPPIRE_SHEET_RANGE_SELECTED; - psppire_sheet_select_range (sheet, &sheet->drag_range); - } - sheet->x_drag = x; - sheet->y_drag = y; - if (row > sheet->range.rowi) row--; - if (column > sheet->range.coli) column--; - sheet->drag_cell.row = row; - sheet->drag_cell.col = column; - sheet->drag_range = sheet->range; - draw_xor_rectangle (sheet, sheet->drag_range); - PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_RESIZE); - } - else if (sheet->cursor_drag->type == GDK_TOP_LEFT_ARROW && - !PSPPIRE_SHEET_IN_SELECTION (sheet) - && ! PSPPIRE_SHEET_IN_DRAG (sheet) - && sheet->active_cell.row >= 0 - && sheet->active_cell.col >= 0 - ) - { - if (sheet->state == GTK_STATE_NORMAL) - { - row = sheet->active_cell.row; - column = sheet->active_cell.col; - sheet->active_cell.row = row; - sheet->active_cell.col = column; - sheet->drag_range = sheet->range; - sheet->state = PSPPIRE_SHEET_RANGE_SELECTED; - psppire_sheet_select_range (sheet, &sheet->drag_range); - } - sheet->x_drag = x; - sheet->y_drag = y; - if (row < sheet->range.row0) row++; - if (row > sheet->range.rowi) row--; - if (column < sheet->range.col0) column++; - if (column > sheet->range.coli) column--; - sheet->drag_cell.row = row; - sheet->drag_cell.col = column; - sheet->drag_range = sheet->range; - draw_xor_rectangle (sheet, sheet->drag_range); - PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_DRAG); - } - else - { - veto = psppire_sheet_click_cell (sheet, row, column); - if (veto) PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION); - } + if (psppire_sheet_click_cell (sheet, row, column)) + PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION); } if (event->window == sheet->column_title_window) @@ -3467,7 +3405,6 @@ psppire_sheet_button_press (GtkWidget *widget, if (psppire_sheet_model_get_column_sensitivity (sheet->model, column)) { - veto = psppire_sheet_click_cell (sheet, -1, column); gtk_grab_add (GTK_WIDGET (sheet)); PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION); } @@ -3484,7 +3421,6 @@ psppire_sheet_button_press (GtkWidget *widget, row = row_from_ypixel (sheet, y); if (psppire_sheet_model_get_row_sensitivity (sheet->model, row)) { - veto = psppire_sheet_click_cell (sheet, row, -1); gtk_grab_add (GTK_WIDGET (sheet)); PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION); } @@ -3515,7 +3451,7 @@ psppire_sheet_click_cell (PsppireSheet *sheet, gint row, gint column) if (forbid_move) { - if (sheet->state == GTK_STATE_NORMAL) + if (sheet->select_status == GTK_STATE_NORMAL) return FALSE; row = sheet->active_cell.row; @@ -3544,15 +3480,13 @@ psppire_sheet_click_cell (PsppireSheet *sheet, gint row, gint column) sheet->range.rowi = psppire_axis_unit_count (sheet->vaxis) - 1; sheet->range.coli = psppire_axis_unit_count (sheet->haxis) - 1; - sheet->active_cell.row = 0; - sheet->active_cell.col = 0; psppire_sheet_select_range (sheet, NULL); return TRUE; } - if (sheet->state != PSPPIRE_SHEET_NORMAL) + if (sheet->select_status != PSPPIRE_SHEET_NORMAL) { - sheet->state = PSPPIRE_SHEET_NORMAL; + sheet->select_status = PSPPIRE_SHEET_NORMAL; psppire_sheet_real_unselect_range (sheet, NULL); } else @@ -3560,15 +3494,13 @@ psppire_sheet_click_cell (PsppireSheet *sheet, gint row, gint column) change_active_cell (sheet, row, column); } - sheet->active_cell.row = row; - sheet->active_cell.col = column; sheet->selection_cell.row = row; sheet->selection_cell.col = column; sheet->range.row0 = row; sheet->range.col0 = column; sheet->range.rowi = row; sheet->range.coli = column; - sheet->state = PSPPIRE_SHEET_NORMAL; + sheet->select_status = PSPPIRE_SHEET_NORMAL; PSPPIRE_SHEET_SET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION); gtk_widget_grab_focus (GTK_WIDGET (sheet->entry_widget)); @@ -3630,10 +3562,6 @@ psppire_sheet_button_release (GtkWidget *widget, psppire_sheet_real_unselect_range (sheet, NULL); - sheet->active_cell.row = sheet->active_cell.row + - (sheet->drag_range.row0 - sheet->range.row0); - sheet->active_cell.col = sheet->active_cell.col + - (sheet->drag_range.col0 - sheet->range.col0); sheet->selection_cell.row = sheet->selection_cell.row + (sheet->drag_range.row0 - sheet->range.row0); sheet->selection_cell.col = sheet->selection_cell.col + @@ -3655,10 +3583,6 @@ psppire_sheet_button_release (GtkWidget *widget, psppire_sheet_real_unselect_range (sheet, NULL); - sheet->active_cell.row = sheet->active_cell.row + - (sheet->drag_range.row0 - sheet->range.row0); - sheet->active_cell.col = sheet->active_cell.col + - (sheet->drag_range.col0 - sheet->range.col0); if (sheet->drag_range.row0 < sheet->range.row0) sheet->selection_cell.row = sheet->drag_range.row0; if (sheet->drag_range.rowi >= sheet->range.rowi) @@ -3671,13 +3595,13 @@ psppire_sheet_button_release (GtkWidget *widget, sheet->range = sheet->drag_range; sheet->drag_range = old_range; - if (sheet->state == GTK_STATE_NORMAL) sheet->state = PSPPIRE_SHEET_RANGE_SELECTED; + if (sheet->select_status == GTK_STATE_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 (sheet->state == PSPPIRE_SHEET_NORMAL && PSPPIRE_SHEET_IN_SELECTION (sheet)) + if (sheet->select_status == PSPPIRE_SHEET_NORMAL && PSPPIRE_SHEET_IN_SELECTION (sheet)) { PSPPIRE_SHEET_UNSET_FLAGS (sheet, PSPPIRE_SHEET_IN_SELECTION); gdk_display_pointer_ungrab (display, event->time); @@ -4016,8 +3940,8 @@ psppire_sheet_motion (GtkWidget *widget, GdkEventMotion *event) PsppireSheetRange aux; column = column_from_xpixel (sheet, x)- sheet->drag_cell.col; row = row_from_ypixel (sheet, y) - sheet->drag_cell.row; - if (sheet->state == PSPPIRE_SHEET_COLUMN_SELECTED) row = 0; - if (sheet->state == PSPPIRE_SHEET_ROW_SELECTED) column = 0; + 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; @@ -4079,8 +4003,8 @@ psppire_sheet_motion (GtkWidget *widget, GdkEventMotion *event) row +=1; } - if (sheet->state == PSPPIRE_SHEET_COLUMN_SELECTED) row = 0; - if (sheet->state == PSPPIRE_SHEET_ROW_SELECTED) column = 0; + 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; @@ -4115,11 +4039,13 @@ psppire_sheet_motion (GtkWidget *widget, GdkEventMotion *event) psppire_sheet_get_pixel_info (sheet, x, y, &row, &column); - if (sheet->state == PSPPIRE_SHEET_NORMAL && row == sheet->active_cell.row && + if (sheet->select_status == PSPPIRE_SHEET_NORMAL && row == sheet->active_cell.row && column == sheet->active_cell.col) return TRUE; +#if 0 if (PSPPIRE_SHEET_IN_SELECTION (sheet) && mods&GDK_BUTTON1_MASK) psppire_sheet_extend_selection (sheet, row, column); +#endif return TRUE; } @@ -4170,9 +4096,9 @@ psppire_sheet_extend_selection (PsppireSheet *sheet, gint row, gint column) if (PSPPIRE_SHEET_IN_DRAG (sheet)) return; - state = sheet->state; + state = sheet->select_status; - switch (sheet->state) + switch (sheet->select_status) { case PSPPIRE_SHEET_ROW_SELECTED: column = psppire_axis_unit_count (sheet->haxis) - 1; @@ -4181,7 +4107,7 @@ psppire_sheet_extend_selection (PsppireSheet *sheet, gint row, gint column) row = psppire_axis_unit_count (sheet->vaxis) - 1; break; case PSPPIRE_SHEET_NORMAL: - sheet->state = PSPPIRE_SHEET_RANGE_SELECTED; + sheet->select_status = PSPPIRE_SHEET_RANGE_SELECTED; r = sheet->active_cell.row; c = sheet->active_cell.col; sheet->range.col0 = c; @@ -4190,7 +4116,7 @@ psppire_sheet_extend_selection (PsppireSheet *sheet, gint row, gint column) sheet->range.rowi = r; psppire_sheet_range_draw_selection (sheet, sheet->range); case PSPPIRE_SHEET_RANGE_SELECTED: - sheet->state = PSPPIRE_SHEET_RANGE_SELECTED; + sheet->select_status = PSPPIRE_SHEET_RANGE_SELECTED; } sheet->selection_cell.row = row;