X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fmain.c;h=2a2dbda4e701a7f89364f99d5fe41c31f042fc07;hb=34dbe92edd95fbf7082c3e54f438c76355254fe5;hp=05693868fb5db9ed6493b456eea3d1ec32e84771;hpb=fd008f43f9e0848369972b0bc0e52129380e229b;p=xournal.git diff --git a/src/main.c b/src/main.c index 0569386..2a2dbda 100644 --- a/src/main.c +++ b/src/main.c @@ -1,12 +1,8 @@ -#define ENABLE_XINPUT_BUGFIX 1 -/* change the above to 0 if you are experiencing calibration problems with - XInput and want to try things differently -*/ - #ifdef HAVE_CONFIG_H # include #endif +#include #include #include #include @@ -17,6 +13,8 @@ #include "xo-callbacks.h" #include "xo-misc.h" #include "xo-file.h" +#include "xo-paint.h" +#include "xo-shapes.h" GtkWidget *winMain; GnomeCanvas *canvas; @@ -28,25 +26,6 @@ struct UndoItem *undo, *redo; // the undo and redo stacks double DEFAULT_ZOOM; -void hide_unimplemented(void) -{ - gtk_widget_hide(GET_COMPONENT("filePrintOptions")); - gtk_widget_hide(GET_COMPONENT("journalFlatten")); - gtk_widget_hide(GET_COMPONENT("papercolorOther")); - gtk_widget_hide(GET_COMPONENT("toolsText")); - gtk_widget_hide(GET_COMPONENT("buttonText")); - gtk_widget_hide(GET_COMPONENT("button2Text")); - gtk_widget_hide(GET_COMPONENT("button3Text")); - gtk_widget_hide(GET_COMPONENT("toolsSelectRegion")); - gtk_widget_hide(GET_COMPONENT("buttonSelectRegion")); - gtk_widget_hide(GET_COMPONENT("button2SelectRegion")); - gtk_widget_hide(GET_COMPONENT("button3SelectRegion")); - gtk_widget_hide(GET_COMPONENT("colorOther")); - gtk_widget_hide(GET_COMPONENT("toolsTextFont")); - gtk_widget_hide(GET_COMPONENT("toolsDefaultText")); - gtk_widget_hide(GET_COMPONENT("helpIndex")); -} - void init_stuff (int argc, char *argv[]) { GtkWidget *w; @@ -71,6 +50,9 @@ void init_stuff (int argc, char *argv[]) // initialize preferences init_config_default(); load_config_from_file(); + ui.font_name = g_strdup(ui.default_font_name); + ui.font_size = ui.default_font_size; + ui.hiliter_alpha_mask = 0xffffff00 + (guint)(255*ui.hiliter_opacity); // we need an empty canvas prior to creating the journal structures canvas = GNOME_CANVAS (gnome_canvas_new_aa ()); @@ -80,8 +62,8 @@ void init_stuff (int argc, char *argv[]) ui.layerbox_length = 0; if (argc > 2 || (argc == 2 && argv[1][0] == '-')) { - printf("Invalid command line parameters.\n" - "Usage: %s [filename.xoj]\n", argv[0]); + printf(_("Invalid command line parameters.\n" + "Usage: %s [filename.xoj]\n"), argv[0]); gtk_exit(0); } @@ -96,6 +78,8 @@ void init_stuff (int argc, char *argv[]) ui.cur_path.coords = NULL; ui.cur_path_storage_alloc = 0; ui.cur_path.ref_count = 1; + ui.cur_widths = NULL; + ui.cur_widths_storage_alloc = 0; ui.selection = NULL; ui.cursor = NULL; @@ -105,9 +89,11 @@ void init_stuff (int argc, char *argv[]) for (i=0; i < NUM_STROKE_TOOLS; i++) { b = &(ui.brushes[j][i]); b->tool_type = i; - b->color_rgba = predef_colors_rgba[b->color_no]; - if (i == TOOL_HIGHLIGHTER) { - b->color_rgba &= HILITER_ALPHA_MASK; + if (b->color_no>=0) { + b->color_rgba = predef_colors_rgba[b->color_no]; + if (i == TOOL_HIGHLIGHTER) { + b->color_rgba &= ui.hiliter_alpha_mask; + } } b->thickness = predef_thickness[i][b->thickness_no]; } @@ -115,12 +101,15 @@ void init_stuff (int argc, char *argv[]) g_memmove(ui.default_brushes+i, &(ui.brushes[0][i]), sizeof(struct Brush)); ui.cur_mapping = 0; + + reset_recognizer(); // initialize various interface elements gtk_window_set_default_size(GTK_WINDOW (winMain), ui.window_default_width, ui.window_default_height); if (ui.maximize_at_start) gtk_window_maximize(GTK_WINDOW (winMain)); update_toolbar_and_menu(); + update_font_button(); gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(GET_COMPONENT("journalApplyAllPages")), ui.bg_apply_all_pages); @@ -130,10 +119,11 @@ void init_stuff (int argc, char *argv[]) gtk_toggle_tool_button_set_active( GTK_TOGGLE_TOOL_BUTTON(GET_COMPONENT("buttonFullscreen")), TRUE); gtk_window_fullscreen(GTK_WINDOW(winMain)); - gtk_widget_hide(GET_COMPONENT("menubar")); - gtk_widget_hide(GET_COMPONENT("hbox1")); } + gtk_button_set_relief(GTK_BUTTON(GET_COMPONENT("buttonColorChooser")), GTK_RELIEF_NONE); + allow_all_accels(); + add_scroll_bindings(); // set up and initialize the canvas @@ -142,7 +132,6 @@ void init_stuff (int argc, char *argv[]) gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (canvas)); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (w), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_widget_set_events (GTK_WIDGET (canvas), GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK); - gtk_widget_set_extension_events(GTK_WIDGET (canvas), GDK_EXTENSION_EVENTS_ALL); gnome_canvas_set_pixels_per_unit (canvas, ui.zoom); gnome_canvas_set_center_scroll_region (canvas, TRUE); gtk_layout_get_hadjustment(GTK_LAYOUT (canvas))->step_increment = ui.scrollbar_step_increment; @@ -160,6 +149,9 @@ void init_stuff (int argc, char *argv[]) g_signal_connect ((gpointer) canvas, "enter_notify_event", G_CALLBACK (on_canvas_enter_notify_event), NULL); + g_signal_connect ((gpointer) canvas, "leave_notify_event", + G_CALLBACK (on_canvas_leave_notify_event), + NULL); g_signal_connect ((gpointer) canvas, "expose_event", G_CALLBACK (on_canvas_expose_event), NULL); @@ -182,46 +174,89 @@ void init_stuff (int argc, char *argv[]) dev_list = gdk_devices_list(); while (dev_list != NULL) { device = (GdkDevice *)dev_list->data; - if (device->source != GDK_SOURCE_MOUSE) { + if (device != gdk_device_get_core_pointer()) { /* get around a GDK bug: map the valuator range CORRECTLY to [0,1] */ -#if ENABLE_XINPUT_BUGFIX +#ifdef ENABLE_XINPUT_BUGFIX gdk_device_set_axis_use(device, 0, GDK_AXIS_IGNORE); gdk_device_set_axis_use(device, 1, GDK_AXIS_IGNORE); #endif gdk_device_set_mode(device, GDK_MODE_SCREEN); + if (g_str_has_suffix(device->name, "eraser")) + gdk_device_set_source(device, GDK_SOURCE_ERASER); can_xinput = TRUE; } - else gdk_device_set_mode(device, GDK_MODE_DISABLED); dev_list = dev_list->next; } if (!can_xinput) gtk_widget_set_sensitive(GET_COMPONENT("optionsUseXInput"), FALSE); ui.use_xinput = ui.allow_xinput && can_xinput; + ui.need_emergency_disable_xinput = FALSE; - gtk_check_menu_item_set_active( - GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsUseXInput")), ui.use_xinput); - gtk_check_menu_item_set_active( - GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsAntialiasBG")), ui.antialias_bg); gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsProgressiveBG")), ui.progressive_bg); gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsPrintRuling")), ui.print_ruling); - - hide_unimplemented(); + gtk_check_menu_item_set_active( + GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsLeftHanded")), ui.left_handed); + gtk_check_menu_item_set_active( + GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsShortenMenus")), ui.shorten_menus); + gtk_check_menu_item_set_active( + GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsAutoSavePrefs")), ui.auto_save_prefs); + gtk_check_menu_item_set_active( + GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsButtonSwitchMapping")), ui.button_switch_mapping); - /* config file only works with glib 2.6 */ - if (glib_minor_version<6) { - gtk_widget_hide(GET_COMPONENT("optionsSavePreferences")); - } - + hide_unimplemented(); + update_undo_redo_enabled(); update_copy_paste_enabled(); + update_vbox_order(ui.vertical_order[ui.fullscreen?1:0]); + gtk_widget_grab_focus(GTK_WIDGET(canvas)); // show everything... gtk_widget_show (winMain); update_cursor(); + + /* this will cause extension events to get enabled/disabled, but + we need the windows to be mapped first */ + gtk_check_menu_item_set_active( + GTK_CHECK_MENU_ITEM(GET_COMPONENT("optionsUseXInput")), ui.use_xinput); + + /* fix a bug in GTK+ 2.16 and beyond: scrollbars shouldn't get extended + input events from pointer motion when cursor moves into main window */ +#if GTK_CHECK_VERSION(2,14,0) + if (!gtk_check_version(2, 16, 0)) { + g_signal_connect ( + GET_COMPONENT("menubar"), + "event", G_CALLBACK (filter_extended_events), + NULL); + g_signal_connect ( + GET_COMPONENT("toolbarMain"), + "event", G_CALLBACK (filter_extended_events), + NULL); + g_signal_connect ( + GET_COMPONENT("toolbarPen"), + "event", G_CALLBACK (filter_extended_events), + NULL); + g_signal_connect ( + GET_COMPONENT("statusbar"), + "event", G_CALLBACK (filter_extended_events), + NULL); + g_signal_connect ( + (gpointer)(gtk_scrolled_window_get_vscrollbar(GTK_SCROLLED_WINDOW(w))), + "event", G_CALLBACK (filter_extended_events), + NULL); + g_signal_connect ( + (gpointer)(gtk_scrolled_window_get_hscrollbar(GTK_SCROLLED_WINDOW(w))), + "event", G_CALLBACK (filter_extended_events), + NULL); + g_signal_connect ( + GET_COMPONENT("comboLayer"), + "notify::popup-shown", G_CALLBACK (combobox_popup_disable_xinput), + NULL); + } +#endif // load the MRU @@ -244,7 +279,7 @@ void init_stuff (int argc, char *argv[]) set_cursor_busy(FALSE); if (!success) { w = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "Error opening file '%s'", argv[1]); + GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), argv[1]); gtk_dialog_run(GTK_DIALOG(w)); gtk_widget_destroy(w); } @@ -256,6 +291,12 @@ main (int argc, char *argv[]) { gchar *path, *path1, *path2; +#ifdef ENABLE_NLS + bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); +#endif + gtk_set_locale (); gtk_init (&argc, &argv); @@ -278,13 +319,14 @@ main (int argc, char *argv[]) winMain = create_winMain (); init_stuff (argc, argv); + gtk_window_set_icon(GTK_WINDOW(winMain), create_pixbuf("xournal.png")); gtk_main (); if (bgpdf.status != STATUS_NOT_INIT) shutdown_bgpdf(); - if (bgpdf.status != STATUS_NOT_INIT) end_bgpdf_shutdown(); save_mru_list(); + if (ui.auto_save_prefs) save_config_to_file(); return 0; }