X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fmain.c;h=f22125e51b49103536be8f65f7575b2ecb6e4253;hb=dcbb0ab8521a5e166f257d86884407eb98ef63f0;hp=4ff98dbc132934dd90c84df332f9b73528c93bdb;hpb=64fbee630efe4a6a731bcc7b68855d933946b050;p=xournal.git diff --git a/src/main.c b/src/main.c index 4ff98db..f22125e 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 ()); @@ -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; @@ -107,7 +91,7 @@ void init_stuff (int argc, char *argv[]) b->tool_type = i; b->color_rgba = predef_colors_rgba[b->color_no]; if (i == TOOL_HIGHLIGHTER) { - b->color_rgba &= HILITER_ALPHA_MASK; + b->color_rgba &= ui.hiliter_alpha_mask; } b->thickness = predef_thickness[i][b->thickness_no]; } @@ -115,12 +99,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); @@ -132,6 +119,8 @@ void init_stuff (int argc, char *argv[]) gtk_window_fullscreen(GTK_WINDOW(winMain)); } + allow_all_accels(); + add_scroll_bindings(); // set up and initialize the canvas @@ -140,7 +129,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; @@ -182,7 +170,7 @@ void init_stuff (int argc, char *argv[]) device = (GdkDevice *)dev_list->data; 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 @@ -196,30 +184,35 @@ void init_stuff (int argc, char *argv[]) ui.use_xinput = ui.allow_xinput && can_xinput; - 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); - /* 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); // load the MRU @@ -284,6 +277,7 @@ main (int argc, char *argv[]) if (bgpdf.status != STATUS_NOT_INIT) end_bgpdf_shutdown(); save_mru_list(); + if (ui.auto_save_prefs) save_config_to_file(); return 0; }