X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fxo-callbacks.c;h=7c520229fbbd68c8137da2525b4d139069569eb5;hb=881e9a45693f4d724512fdc5297ba312d447851b;hp=6d38176e20afed678de470fee2602c5994b229ba;hpb=13d7457867c57ac5ac826df4d6b478fee795c0a4;p=xournal.git diff --git a/src/xo-callbacks.c b/src/xo-callbacks.c index 6d38176..7c52022 100644 --- a/src/xo-callbacks.c +++ b/src/xo-callbacks.c @@ -7,7 +7,6 @@ #include #include #include -#include #include #include @@ -54,6 +53,9 @@ on_fileNewBackground_activate (GtkMenuItem *menuitem, dialog = gtk_file_chooser_dialog_new(_("Open PDF"), GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); +#ifdef FILE_DIALOG_SIZE_BUGFIX + gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 400); +#endif filt_all = gtk_file_filter_new(); gtk_file_filter_set_name(filt_all, _("All files")); @@ -125,6 +127,9 @@ on_fileOpen_activate (GtkMenuItem *menuitem, dialog = gtk_file_chooser_dialog_new(_("Open Journal"), GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); +#ifdef FILE_DIALOG_SIZE_BUGFIX + gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 400); +#endif filt_all = gtk_file_filter_new(); gtk_file_filter_set_name(filt_all, _("All files")); @@ -203,6 +208,9 @@ on_fileSaveAs_activate (GtkMenuItem *menuitem, dialog = gtk_file_chooser_dialog_new(_("Save Journal"), GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); +#ifdef FILE_DIALOG_SIZE_BUGFIX + gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 400); +#endif if (ui.filename!=NULL) { gtk_file_chooser_set_filename(GTK_FILE_CHOOSER (dialog), ui.filename); @@ -287,87 +295,57 @@ on_filePrintOptions_activate (GtkMenuItem *menuitem, } - void on_filePrint_activate (GtkMenuItem *menuitem, gpointer user_data) { - GtkWidget *printDialog; - GnomePrintJob *gpj; +#if GTK_CHECK_VERSION(2, 10, 0) + GtkPrintOperation *print; + GtkPrintOperationResult res; + int fromPage, toPage; int response; - char *in_fn; - guchar *s; - GnomePrintConfig *config = gnome_print_config_default(); + char *in_fn, *p; end_text(); reset_focus(); - if (ui.filename!=NULL) { - if (g_str_has_suffix(ui.filename, ".xoj")) { - in_fn = g_strdup(ui.filename); - g_strlcpy(g_strrstr(in_fn, "xoj"), "pdf", 4); - } - else - in_fn = g_strdup_printf("%s.pdf", ui.filename); - gnome_print_config_set(config, (guchar *)"Printer", (guchar *)"PDF"); - gnome_print_config_set(config, (guchar *)GNOME_PRINT_KEY_OUTPUT_FILENAME, (guchar *)in_fn); - gnome_print_config_set(config, (guchar *)"Settings.Transport.Backend.FileName", (guchar *)in_fn); - g_strlcpy(g_strrstr(in_fn, "pdf"), "ps", 3); - gnome_print_config_set(config, (guchar *)"Printer", (guchar *)"GENERIC"); - gnome_print_config_set (config, (guchar *)GNOME_PRINT_KEY_OUTPUT_FILENAME, (guchar *)in_fn); - s = gnome_print_config_get(config, (guchar *)"Settings.Transport.Backend.FileName"); - if (s != NULL) { - g_free(s); - gnome_print_config_set(config, (guchar *)"Settings.Transport.Backend.FileName", (guchar *)in_fn); - } - g_free(in_fn); - } - - gpj = gnome_print_job_new(config); /* was NULL */ - gnome_print_config_unref(config); -/* end */ - printDialog = gnome_print_dialog_new(gpj, (guchar *) _("Print"), GNOME_PRINT_DIALOG_RANGE); - gnome_print_dialog_construct_range_page(GNOME_PRINT_DIALOG(printDialog), - GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_RANGE, - 1, journal.npages, (guchar *) _("Current page"), (guchar *) _("Pages")); - /* don't have "Current page" as option, else it becomes the default!! */ - - gtk_dialog_set_response_sensitive(GTK_DIALOG(printDialog), - GNOME_PRINT_DIALOG_RESPONSE_PREVIEW, FALSE); - /* the print-job-preview "feature" is completely, hopelessly broken */ - - response = gtk_dialog_run(GTK_DIALOG(printDialog)); - if (response <= 0) { - gtk_widget_destroy(printDialog); - return; - } - + if (!gtk_check_version(2, 10, 0)) { + print = gtk_print_operation_new(); /* - if (response == GNOME_PRINT_DIALOG_RESPONSE_PREVIEW) { - print_job_render(gpj, 0, journal.npages-1); - gtk_widget_destroy(printDialog); - preview = gnome_print_job_preview_new(gpj, (guchar *)"Preview"); - try_fix_print_preview_ui(preview); - gtk_window_set_modal(GTK_WINDOW(preview), TRUE); - gtk_widget_show_all(preview); - } + if (!ui.print_settings) + ui.print_settings = gtk_print_settings_new(); + if (ui.filename!=NULL) { + if (g_str_has_suffix(ui.filename, ".xoj")) { + in_fn = g_strdup(ui.filename); + g_strlcpy(g_strrstr(in_fn, "xoj"), "pdf", 4); + } + else in_fn = g_strdup_printf("%s.pdf", ui.filename); + gtk_print_settings_set(ui.print_settings, GTK_PRINT_SETTINGS_OUTPUT_URI, + g_filename_to_uri(in_fn, NULL, NULL)); + g_free(in_fn); + } */ - - if (response == GNOME_PRINT_DIALOG_RESPONSE_PRINT) { - switch(gnome_print_dialog_get_range(GNOME_PRINT_DIALOG(printDialog))) { - case GNOME_PRINT_RANGE_RANGE: - gnome_print_dialog_get_range_page(GNOME_PRINT_DIALOG(printDialog), &fromPage, &toPage); - fromPage--; - toPage--; - break; - default: - fromPage = 0; - toPage = journal.npages-1; + if (ui.print_settings!=NULL) + gtk_print_operation_set_print_settings (print, ui.print_settings); + gtk_print_operation_set_n_pages(print, journal.npages); + gtk_print_operation_set_current_page(print, ui.pageno); + gtk_print_operation_set_show_progress(print, TRUE); + if (ui.filename!=NULL) { + p = g_utf8_strrchr(ui.filename, -1, '/'); + if (p==NULL) p = ui.filename; + else p++; + gtk_print_operation_set_job_name(print, p); } - - gtk_widget_destroy(printDialog); - print_job_render(gpj, fromPage, toPage); + g_signal_connect (print, "draw_page", G_CALLBACK (print_job_render_page), NULL); + res = gtk_print_operation_run(print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, + GTK_WINDOW(winMain), NULL); + if (res == GTK_PRINT_OPERATION_RESULT_APPLY) { + if (ui.print_settings!=NULL) g_object_unref(ui.print_settings); + ui.print_settings = g_object_ref(gtk_print_operation_get_print_settings(print)); + } + g_object_unref(print); } +#endif } @@ -388,6 +366,9 @@ on_filePrintPDF_activate (GtkMenuItem *menuitem, dialog = gtk_file_chooser_dialog_new(_("Export to PDF"), GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); +#ifdef FILE_DIALOG_SIZE_BUGFIX + gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 400); +#endif if (ui.filename!=NULL) { if (g_str_has_suffix(ui.filename, ".xoj")) { @@ -1477,6 +1458,9 @@ on_journalLoadBackground_activate (GtkMenuItem *menuitem, dialog = gtk_file_chooser_dialog_new(_("Open Background"), GTK_WINDOW (winMain), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); +#ifdef FILE_DIALOG_SIZE_BUGFIX + gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 400); +#endif filt_all = gtk_file_filter_new(); gtk_file_filter_set_name(filt_all, _("All files")); @@ -1685,14 +1669,15 @@ on_toolsPen_activate (GtkMenuItem *menuitem, return; } - if (ui.cur_mapping != 0) return; - if (ui.toolno[0] == TOOL_PEN) return; + if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated + if (ui.toolno[ui.cur_mapping] == TOOL_PEN) return; + ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon) end_text(); reset_focus(); reset_selection(); - ui.toolno[0] = TOOL_PEN; - ui.cur_brush = &(ui.brushes[0][TOOL_PEN]); + ui.toolno[ui.cur_mapping] = TOOL_PEN; + ui.cur_brush = &(ui.brushes[ui.cur_mapping][TOOL_PEN]); ui.cur_brush->ruler = ui.default_brushes[TOOL_PEN].ruler; ui.cur_brush->recognizer = ui.default_brushes[TOOL_PEN].recognizer; update_mapping_linkings(TOOL_PEN); @@ -1715,14 +1700,15 @@ on_toolsEraser_activate (GtkMenuItem *menuitem, return; } - if (ui.cur_mapping != 0) return; - if (ui.toolno[0] == TOOL_ERASER) return; + if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated + if (ui.toolno[ui.cur_mapping] == TOOL_ERASER) return; + ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon) end_text(); reset_focus(); reset_selection(); - ui.toolno[0] = TOOL_ERASER; - ui.cur_brush = &(ui.brushes[0][TOOL_ERASER]); + ui.toolno[ui.cur_mapping] = TOOL_ERASER; + ui.cur_brush = &(ui.brushes[ui.cur_mapping][TOOL_ERASER]); update_mapping_linkings(TOOL_ERASER); update_tool_buttons(); update_tool_menu(); @@ -1743,14 +1729,15 @@ on_toolsHighlighter_activate (GtkMenuItem *menuitem, return; } - if (ui.cur_mapping != 0) return; // not user-generated - if (ui.toolno[0] == TOOL_HIGHLIGHTER) return; + if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated + if (ui.toolno[ui.cur_mapping] == TOOL_HIGHLIGHTER) return; + ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon) end_text(); reset_focus(); reset_selection(); - ui.toolno[0] = TOOL_HIGHLIGHTER; - ui.cur_brush = &(ui.brushes[0][TOOL_HIGHLIGHTER]); + ui.toolno[ui.cur_mapping] = TOOL_HIGHLIGHTER; + ui.cur_brush = &(ui.brushes[ui.cur_mapping][TOOL_HIGHLIGHTER]); ui.cur_brush->ruler = ui.default_brushes[TOOL_HIGHLIGHTER].ruler; ui.cur_brush->recognizer = ui.default_brushes[TOOL_HIGHLIGHTER].recognizer; update_mapping_linkings(TOOL_HIGHLIGHTER); @@ -1773,13 +1760,14 @@ on_toolsText_activate (GtkMenuItem *menuitem, return; } - if (ui.cur_mapping != 0) return; // not user-generated - if (ui.toolno[0] == TOOL_TEXT) return; + if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated + if (ui.toolno[ui.cur_mapping] == TOOL_TEXT) return; + ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon) reset_focus(); reset_selection(); - ui.toolno[0] = TOOL_TEXT; - ui.cur_brush = &(ui.brushes[0][TOOL_PEN]); + ui.toolno[ui.cur_mapping] = TOOL_TEXT; + ui.cur_brush = &(ui.brushes[ui.cur_mapping][TOOL_PEN]); update_mapping_linkings(-1); update_tool_buttons(); update_tool_menu(); @@ -1808,12 +1796,13 @@ on_toolsSelectRectangle_activate (GtkMenuItem *menuitem, return; } - if (ui.cur_mapping != 0) return; // not user-generated - if (ui.toolno[0] == TOOL_SELECTRECT) return; + if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated + if (ui.toolno[ui.cur_mapping] == TOOL_SELECTRECT) return; + ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon) end_text(); reset_focus(); - ui.toolno[0] = TOOL_SELECTRECT; + ui.toolno[ui.cur_mapping] = TOOL_SELECTRECT; update_mapping_linkings(-1); update_tool_buttons(); update_tool_menu(); @@ -1834,13 +1823,14 @@ on_toolsVerticalSpace_activate (GtkMenuItem *menuitem, return; } - if (ui.cur_mapping != 0) return; // not user-generated - if (ui.toolno[0] == TOOL_VERTSPACE) return; + if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; // not user-generated + if (ui.toolno[ui.cur_mapping] == TOOL_VERTSPACE) return; + ui.cur_mapping = 0; // don't use switch_mapping() (refreshes buttons too soon) end_text(); reset_focus(); reset_selection(); - ui.toolno[0] = TOOL_VERTSPACE; + ui.toolno[ui.cur_mapping] = TOOL_VERTSPACE; update_mapping_linkings(-1); update_tool_buttons(); update_tool_menu(); @@ -1853,7 +1843,7 @@ void on_colorBlack_activate (GtkMenuItem *menuitem, gpointer user_data) { - process_color_activate(menuitem, COLOR_BLACK); + process_color_activate(menuitem, COLOR_BLACK, predef_colors_rgba[COLOR_BLACK]); } @@ -1861,8 +1851,7 @@ void on_colorBlue_activate (GtkMenuItem *menuitem, gpointer user_data) { - process_color_activate(menuitem, COLOR_BLUE); - + process_color_activate(menuitem, COLOR_BLUE, predef_colors_rgba[COLOR_BLUE]); } @@ -1870,7 +1859,7 @@ void on_colorRed_activate (GtkMenuItem *menuitem, gpointer user_data) { - process_color_activate(menuitem, COLOR_RED); + process_color_activate(menuitem, COLOR_RED, predef_colors_rgba[COLOR_RED]); } @@ -1878,7 +1867,7 @@ void on_colorGreen_activate (GtkMenuItem *menuitem, gpointer user_data) { - process_color_activate(menuitem, COLOR_GREEN); + process_color_activate(menuitem, COLOR_GREEN, predef_colors_rgba[COLOR_GREEN]); } @@ -1886,7 +1875,7 @@ void on_colorGray_activate (GtkMenuItem *menuitem, gpointer user_data) { - process_color_activate(menuitem, COLOR_GRAY); + process_color_activate(menuitem, COLOR_GRAY, predef_colors_rgba[COLOR_GRAY]); } @@ -1894,7 +1883,7 @@ void on_colorLightBlue_activate (GtkMenuItem *menuitem, gpointer user_data) { - process_color_activate(menuitem, COLOR_LIGHTBLUE); + process_color_activate(menuitem, COLOR_LIGHTBLUE, predef_colors_rgba[COLOR_LIGHTBLUE]); } @@ -1902,7 +1891,7 @@ void on_colorLightGreen_activate (GtkMenuItem *menuitem, gpointer user_data) { - process_color_activate(menuitem, COLOR_LIGHTGREEN); + process_color_activate(menuitem, COLOR_LIGHTGREEN, predef_colors_rgba[COLOR_LIGHTGREEN]); } @@ -1910,7 +1899,7 @@ void on_colorMagenta_activate (GtkMenuItem *menuitem, gpointer user_data) { - process_color_activate(menuitem, COLOR_MAGENTA); + process_color_activate(menuitem, COLOR_MAGENTA, predef_colors_rgba[COLOR_MAGENTA]); } @@ -1918,7 +1907,7 @@ void on_colorOrange_activate (GtkMenuItem *menuitem, gpointer user_data) { - process_color_activate(menuitem, COLOR_ORANGE); + process_color_activate(menuitem, COLOR_ORANGE, predef_colors_rgba[COLOR_ORANGE]); } @@ -1926,7 +1915,7 @@ void on_colorYellow_activate (GtkMenuItem *menuitem, gpointer user_data) { - process_color_activate(menuitem, COLOR_YELLOW); + process_color_activate(menuitem, COLOR_YELLOW, predef_colors_rgba[COLOR_YELLOW]); } @@ -1934,7 +1923,7 @@ void on_colorWhite_activate (GtkMenuItem *menuitem, gpointer user_data) { - process_color_activate(menuitem, COLOR_WHITE); + process_color_activate(menuitem, COLOR_WHITE, predef_colors_rgba[COLOR_WHITE]); } @@ -1942,7 +1931,7 @@ void on_colorOther_activate (GtkMenuItem *menuitem, gpointer user_data) { - + gtk_button_clicked(GTK_BUTTON(GET_COMPONENT("buttonColorChooser"))); } @@ -2183,10 +2172,11 @@ on_toolsSetAsDefault_activate (GtkMenuItem *menuitem, { struct Item *it; - if (ui.cur_mapping!=0) return; - if (ui.toolno[0] < NUM_STROKE_TOOLS) - g_memmove(ui.default_brushes+ui.toolno[0], &(ui.brushes[0][ui.toolno[0]]), sizeof(struct Brush)); - if (ui.toolno[0] == TOOL_TEXT) { + if (ui.cur_mapping!=0 && !ui.button_switch_mapping) return; + if (ui.toolno[ui.cur_mapping] < NUM_STROKE_TOOLS) + g_memmove(ui.default_brushes+ui.toolno[ui.cur_mapping], + &(ui.brushes[ui.cur_mapping][ui.toolno[ui.cur_mapping]]), sizeof(struct Brush)); + if (ui.toolno[ui.cur_mapping] == TOOL_TEXT) { if (ui.cur_item_type == ITEM_TEXT) { g_free(ui.font_name); ui.font_name = g_strdup(ui.cur_item->font_name); @@ -2219,16 +2209,17 @@ on_toolsRuler_activate (GtkMenuItem *menuitem, else active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON (menuitem)); - if (ui.cur_mapping != 0) return; - current = (ui.toolno[0] == TOOL_PEN || ui.toolno[0] == TOOL_HIGHLIGHTER) && ui.cur_brush->ruler; + if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; + current = (ui.toolno[ui.cur_mapping] == TOOL_PEN || ui.toolno[ui.cur_mapping] == TOOL_HIGHLIGHTER) && ui.cur_brush->ruler; if (active == current) return; - + + ui.cur_mapping = 0; end_text(); reset_focus(); - if (ui.toolno[0]!=TOOL_PEN && ui.toolno[0]!=TOOL_HIGHLIGHTER) { + if (ui.toolno[ui.cur_mapping]!=TOOL_PEN && ui.toolno[ui.cur_mapping]!=TOOL_HIGHLIGHTER) { reset_selection(); - ui.toolno[0] = TOOL_PEN; - ui.cur_brush = &(ui.brushes[0][TOOL_PEN]); + ui.toolno[ui.cur_mapping] = TOOL_PEN; + ui.cur_brush = &(ui.brushes[ui.cur_mapping][TOOL_PEN]); update_color_menu(); update_tool_buttons(); update_tool_menu(); @@ -2237,7 +2228,7 @@ on_toolsRuler_activate (GtkMenuItem *menuitem, ui.cur_brush->ruler = active; if (active) ui.cur_brush->recognizer = FALSE; - update_mapping_linkings(ui.toolno[0]); + update_mapping_linkings(ui.toolno[ui.cur_mapping]); update_ruler_indicator(); } @@ -2253,16 +2244,17 @@ on_toolsReco_activate (GtkMenuItem *menuitem, else active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON (menuitem)); - if (ui.cur_mapping != 0) return; - current = (ui.toolno[0] == TOOL_PEN || ui.toolno[0] == TOOL_HIGHLIGHTER) && ui.cur_brush->recognizer; + if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; + current = (ui.toolno[ui.cur_mapping] == TOOL_PEN || ui.toolno[ui.cur_mapping] == TOOL_HIGHLIGHTER) && ui.cur_brush->recognizer; if (active == current) return; + ui.cur_mapping = 0; end_text(); reset_focus(); - if (ui.toolno[0]!=TOOL_PEN && ui.toolno[0]!=TOOL_HIGHLIGHTER) { + if (ui.toolno[ui.cur_mapping]!=TOOL_PEN && ui.toolno[ui.cur_mapping]!=TOOL_HIGHLIGHTER) { reset_selection(); - ui.toolno[0] = TOOL_PEN; - ui.cur_brush = &(ui.brushes[0][TOOL_PEN]); + ui.toolno[ui.cur_mapping] = TOOL_PEN; + ui.cur_brush = &(ui.brushes[ui.cur_mapping][TOOL_PEN]); update_color_menu(); update_tool_buttons(); update_tool_menu(); @@ -2274,7 +2266,7 @@ on_toolsReco_activate (GtkMenuItem *menuitem, ui.cur_brush->ruler = FALSE; reset_recognizer(); } - update_mapping_linkings(ui.toolno[0]); + update_mapping_linkings(ui.toolno[ui.cur_mapping]); update_ruler_indicator(); } @@ -2344,8 +2336,8 @@ void on_buttonFine_clicked (GtkToolButton *toolbutton, gpointer user_data) { - if (ui.cur_mapping != 0) return; - process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[0], THICKNESS_FINE); + if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; + process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[ui.cur_mapping], THICKNESS_FINE); } @@ -2353,8 +2345,8 @@ void on_buttonMedium_clicked (GtkToolButton *toolbutton, gpointer user_data) { - if (ui.cur_mapping != 0) return; - process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[0], THICKNESS_MEDIUM); + if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; + process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[ui.cur_mapping], THICKNESS_MEDIUM); } @@ -2362,8 +2354,8 @@ void on_buttonThick_clicked (GtkToolButton *toolbutton, gpointer user_data) { - if (ui.cur_mapping != 0) return; - process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[0], THICKNESS_THICK); + if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; + process_thickness_activate((GtkMenuItem*)toolbutton, ui.toolno[ui.cur_mapping], THICKNESS_THICK); } @@ -2379,28 +2371,57 @@ on_canvas_button_press_event (GtkWidget *widget, int mapping; gboolean is_core; struct Item *item; + GdkEvent scroll_event; +#ifdef INPUT_DEBUG + printf("DEBUG: ButtonPress (%s) (x,y)=(%.2f,%.2f), button %d, modifier %x\n", + event->device->name, event->x, event->y, event->button, event->state); +#endif + + if (ui.cur_item_type != ITEM_TEXT) // remove focus from other elements + gtk_widget_grab_focus(GTK_WIDGET(canvas)); + is_core = (event->device == gdk_device_get_core_pointer()); if (!ui.use_xinput && !is_core) return FALSE; if (ui.use_xinput && is_core && ui.discard_corepointer) return FALSE; - if (event->button > 3) return FALSE; // no painting with the mouse wheel! if (event->type != GDK_BUTTON_PRESS) return FALSE; // double-clicks may have broken axes member (free'd) due to a bug in GDK + + if (event->button > 3) { // scroll wheel events! don't paint... + if (ui.use_xinput && !gtk_check_version(2, 17, 0) && event->button <= 7) { + /* with GTK+ 2.17 and later, the entire widget hierarchy is xinput-aware, + so the core button event gets discarded and the scroll event never + gets processed by the main window. This is arguably a GTK+ bug. + We work around it. */ + scroll_event.scroll.type = GDK_SCROLL; + scroll_event.scroll.window = event->window; + scroll_event.scroll.send_event = event->send_event; + scroll_event.scroll.time = event->time; + scroll_event.scroll.x = event->x; + scroll_event.scroll.y = event->y; + scroll_event.scroll.state = event->state; + scroll_event.scroll.device = event->device; + scroll_event.scroll.x_root = event->x_root; + scroll_event.scroll.y_root = event->y_root; + if (event->button == 4) scroll_event.scroll.direction = GDK_SCROLL_UP; + else if (event->button == 5) scroll_event.scroll.direction = GDK_SCROLL_DOWN; + else if (event->button == 6) scroll_event.scroll.direction = GDK_SCROLL_LEFT; + else scroll_event.scroll.direction = GDK_SCROLL_RIGHT; + printf("sending...\n"); + gtk_widget_event(GET_COMPONENT("scrolledwindowMain"), &scroll_event); + } + return FALSE; + } + if ((event->state & (GDK_CONTROL_MASK|GDK_MOD1_MASK)) != 0) return FALSE; + // no control-clicking or alt-clicking if (!is_core) fix_xinput_coords((GdkEvent *)event); -#ifdef INPUT_DEBUG - printf("DEBUG: ButtonDown (%s) (x,y)=(%.2f,%.2f)\n", - is_core?"core":"xinput", event->x, event->y); -#endif if (!finite(event->x) || !finite(event->y)) return FALSE; // Xorg 7.3 bug if (ui.cur_item_type == ITEM_TEXT) { if (!is_event_within_textview(event)) end_text(); -/* // bugfix for GTK+ 2.17, no longer needed as XInput is disabled during text edition - else fix_extended_events(ui.cur_item->widget, (GdkEvent *)event, - gtk_text_view_get_window(GTK_TEXT_VIEW(ui.cur_item->widget), GTK_TEXT_WINDOW_TEXT)); -*/ + else return FALSE; } if (ui.cur_item_type == ITEM_STROKE && ui.is_corestroke && !is_core && ui.cur_path.num_points == 1) { @@ -2410,10 +2431,23 @@ on_canvas_button_press_event (GtkWidget *widget, } if (ui.cur_item_type != ITEM_NONE) return FALSE; // we're already doing something + // if button_switch_mapping enabled, button 2 or 3 clicks only switch mapping + if (ui.button_switch_mapping && event->button > 1) { + ui.which_unswitch_button = event->button; + switch_mapping(event->button-1); + return FALSE; + } + ui.is_corestroke = is_core; + ui.stroke_device = event->device; if (ui.use_erasertip && event->device->source == GDK_SOURCE_ERASER) - mapping = NUM_BUTTONS; + mapping = NUM_BUTTONS; + else if (ui.button_switch_mapping) { + mapping = ui.cur_mapping; + if (!mapping && (event->state & GDK_BUTTON2_MASK)) mapping = 1; + if (!mapping && (event->state & GDK_BUTTON3_MASK)) mapping = 2; + } else mapping = event->button-1; // check whether we're in a page @@ -2508,15 +2542,20 @@ on_canvas_button_release_event (GtkWidget *widget, { gboolean is_core; - if (ui.cur_item_type == ITEM_NONE) return FALSE; // not doing anything - - if (event->button != ui.which_mouse_button) return FALSE; // ignore +#ifdef INPUT_DEBUG + printf("DEBUG: ButtonRelease (%s) (x,y)=(%.2f,%.2f), button %d, modifier %x\n", + event->device->name, event->x, event->y, event->button, event->state); +#endif is_core = (event->device == gdk_device_get_core_pointer()); if (!ui.use_xinput && !is_core) return FALSE; if (ui.use_xinput && is_core && !ui.is_corestroke) return FALSE; if (!is_core) fix_xinput_coords((GdkEvent *)event); + if (event->button != ui.which_mouse_button && + event->button != ui.which_unswitch_button) + return FALSE; + if (ui.cur_item_type == ITEM_STROKE) { finalize_stroke(); if (ui.cur_brush->recognizer) recognize_patterns(); @@ -2536,8 +2575,10 @@ on_canvas_button_release_event (GtkWidget *widget, else if (ui.cur_item_type == ITEM_HAND) { ui.cur_item_type = ITEM_NONE; } + + if (!ui.which_unswitch_button || event->button == ui.which_unswitch_button) + switch_mapping(0); // will reset ui.which_unswitch_button - switch_mapping(0); return FALSE; } @@ -2582,22 +2623,54 @@ on_canvas_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data) { - // If zoomed-out and in single page mode, switch pages with PgUp/PgDn. - if (!ui.view_continuous && - (0.96 * ui.zoom * ui.cur_page->height < - GTK_WIDGET(canvas)->allocation.height)) { - if (event->keyval == GDK_Page_Down) { - end_text(); + GtkAdjustment *adj; + gint pgheight; + + // Esc leaves text edition, or leaves fullscreen mode + if (event->keyval == GDK_Escape) { + if (ui.cur_item_type == ITEM_TEXT) { + end_text(); reset_focus(); - if (ui.pageno == journal.npages-1) { return FALSE; } - do_switch_page(ui.pageno+1, TRUE, FALSE); + return TRUE; } - if (event->keyval == GDK_Page_Up) { + else if (ui.fullscreen) { + do_fullscreen(FALSE); + return TRUE; + } + else return FALSE; + } + + /* In single page mode, switch pages with PgUp/PgDn (or Up/Dn) + when there's nowhere else to go. */ + pgheight = GTK_WIDGET(canvas)->allocation.height; + adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(GET_COMPONENT("scrolledwindowMain"))); + + if (event->keyval == GDK_Page_Down || event->keyval == GDK_Down) { + if (!ui.view_continuous && + (0.96 * ui.zoom * ui.cur_page->height < pgheight || + adj->value == adj->upper-pgheight)) + { end_text(); - reset_focus(); - if (ui.pageno == 0) { return FALSE; } - do_switch_page(ui.pageno-1, TRUE, FALSE); + if (ui.pageno < journal.npages-1) + do_switch_page(ui.pageno+1, TRUE, FALSE); + return TRUE; } + if (adj->value == adj->upper-pgheight) return TRUE; // don't send focus away + } + + if (event->keyval == GDK_Page_Up || event->keyval == GDK_Up) { + if (!ui.view_continuous && + (0.96 * ui.zoom * ui.cur_page->height < pgheight || + adj->value == adj->lower)) + { + end_text(); + if (ui.pageno != 0) { + do_switch_page(ui.pageno-1, TRUE, FALSE); + gtk_adjustment_set_value(adj, adj->upper-pgheight); + } + return TRUE; + } + if (adj->value == adj->lower) return TRUE; // don't send focus away } return FALSE; @@ -2611,11 +2684,13 @@ on_canvas_motion_notify_event (GtkWidget *widget, { gboolean looks_wrong, is_core; double pt[2]; + GdkModifierType mask; /* we don't care about this event unless some operation is in progress; or if there's a selection (then we might want to change the mouse cursor to indicate the possibility of resizing) */ if (ui.cur_item_type == ITEM_NONE && ui.selection==NULL) return FALSE; + if (ui.cur_item_type == ITEM_TEXT) return FALSE; is_core = (event->device == gdk_device_get_core_pointer()); if (!ui.use_xinput && !is_core) return FALSE; @@ -2632,11 +2707,15 @@ on_canvas_motion_notify_event (GtkWidget *widget, if (!is_core) ui.is_corestroke = FALSE; #ifdef INPUT_DEBUG - printf("DEBUG: MotionNotify (%s) (x,y)=(%.2f,%.2f)\n", - is_core?"core":"xinput", event->x, event->y); + printf("DEBUG: MotionNotify (%s) (x,y)=(%.2f,%.2f), modifier %x\n", + is_core?"core":"xinput", event->x, event->y, event->state); #endif looks_wrong = !(event->state & (1<<(7+ui.which_mouse_button))); + if (looks_wrong) { + gdk_device_get_state(ui.stroke_device, event->window, NULL, &mask); + looks_wrong = !(mask & (1<<(7+ui.which_mouse_button))); + } if (looks_wrong) { /* mouse button shouldn't be up... give up */ if (ui.cur_item_type == ITEM_STROKE) { @@ -2741,12 +2820,11 @@ on_optionsUseXInput_activate (GtkMenuItem *menuitem, /* HOW THINGS USED TO BE: - We'd like ONLY the canvas window itself to receive - XInput events, while its child window in the GDK hierarchy (also - associated to the canvas widget) receives the core events. - This way on_canvas_... will get both types of events -- otherwise, - the proximity detection code in GDK is broken and we'll lose core - events. + We'd like on_canvas_... to get BOTH core and xinput events. Up to + GTK+ 2.16 this is achieved by making only the canvas's parent + GdkWindow xinput-aware, rather than the entire hierarchy. + Otherwise, the proximity detection code in GDK is broken and + we'll lose core events. Up to GTK+ 2.10, gtk_widget_set_extension_events() only sets extension events for the widget's main window itself; in GTK+ 2.11 @@ -2761,17 +2839,23 @@ on_optionsUseXInput_activate (GtkMenuItem *menuitem, non-responsive). */ - // this causes core events to be discarded... unwanted! -/* - gtk_widget_set_extension_events(GTK_WIDGET (canvas), + if (!gtk_check_version(2, 17, 0)) { + /* GTK+ 2.17 and later: everybody shares a single native window, + so we'll never get any core events, and we might as well set + extension events the way we're supposed to. Doing so helps solve + crasher bugs in 2.17, and prevents us from losing two-button + events in 2.18 */ + gtk_widget_set_extension_events(GTK_WIDGET (canvas), + ui.use_xinput?GDK_EXTENSION_EVENTS_ALL:GDK_EXTENSION_EVENTS_NONE); + } else { + /* GTK+ 2.16 and earlier: we only activate extension events on the + canvas's parent GdkWindow. This allows us to keep receiving core + events. */ + gdk_input_set_extension_events(GTK_WIDGET(canvas)->window, + GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK, ui.use_xinput?GDK_EXTENSION_EVENTS_ALL:GDK_EXTENSION_EVENTS_NONE); -*/ - - // this version only activates extension events on the canvas's parent GdkWindow - gdk_input_set_extension_events(GTK_WIDGET(canvas)->window, - GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK, - ui.use_xinput?GDK_EXTENSION_EVENTS_ALL:GDK_EXTENSION_EVENTS_NONE); - + } + update_mappings_menu(); } @@ -3014,18 +3098,7 @@ on_viewFullscreen_activate (GtkMenuItem *menuitem, active = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON (menuitem)); if (active == ui.fullscreen) return; - end_text(); - reset_focus(); - ui.fullscreen = active; - gtk_check_menu_item_set_active( - GTK_CHECK_MENU_ITEM(GET_COMPONENT("viewFullscreen")), ui.fullscreen); - gtk_toggle_tool_button_set_active( - GTK_TOGGLE_TOOL_BUTTON(GET_COMPONENT("buttonFullscreen")), ui.fullscreen); - - if (ui.fullscreen) gtk_window_fullscreen(GTK_WINDOW(winMain)); - else gtk_window_unfullscreen(GTK_WINDOW(winMain)); - - update_vbox_order(ui.vertical_order[ui.fullscreen?1:0]); + do_fullscreen(active); } @@ -3041,21 +3114,6 @@ on_optionsButtonMappings_activate (GtkMenuItem *menuitem, } -void -on_optionsAntialiasBG_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ - gboolean active; - - active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)); - if (ui.antialias_bg == active) return; - end_text(); - reset_focus(); - ui.antialias_bg = active; - rescale_bg_pixmaps(); -} - - void on_optionsProgressiveBG_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -3395,13 +3453,14 @@ on_toolsHand_activate (GtkMenuItem *menuitem, return; } - if (ui.cur_mapping != 0) return; - if (ui.toolno[0] == TOOL_HAND) return; + if (ui.cur_mapping != 0 && !ui.button_switch_mapping) return; + if (ui.toolno[ui.cur_mapping] == TOOL_HAND) return; + ui.cur_mapping = 0; end_text(); reset_focus(); reset_selection(); - ui.toolno[0] = TOOL_HAND; + ui.toolno[ui.cur_mapping] = TOOL_HAND; update_mapping_linkings(-1); update_tool_buttons(); update_tool_menu(); @@ -3525,3 +3584,27 @@ on_optionsPressureSensitive_activate (GtkMenuItem *menuitem, update_mappings_menu(); } + +void +on_buttonColorChooser_set (GtkColorButton *colorbutton, + gpointer user_data) +{ + GdkColor gdkcolor; + guint16 alpha; + + gtk_color_button_get_color(colorbutton, &gdkcolor); + alpha = gtk_color_button_get_alpha(colorbutton); + process_color_activate((GtkMenuItem*)colorbutton, COLOR_OTHER, gdkcolor_to_rgba(gdkcolor, alpha)); +} + + +void +on_optionsButtonsSwitchMappings_activate(GtkMenuItem *menuitem, + gpointer user_data) +{ + end_text(); + reset_focus(); + switch_mapping(0); + ui.button_switch_mapping = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM (menuitem)); +} +