X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fxo-file.c;h=ba2fad0f3b6390e821a6ebe5b88804fdada6e7c8;hb=64fbee630efe4a6a731bcc7b68855d933946b050;hp=a241df396e81d7f4819d473c2bfd507fc7d7a05b;hpb=78c2f8fa93f7adcb9157699c92b1498d878f66b2;p=xournal.git diff --git a/src/xo-file.c b/src/xo-file.c index a241df3..ba2fad0 100644 --- a/src/xo-file.c +++ b/src/xo-file.c @@ -22,7 +22,7 @@ #include "xo-misc.h" #include "xo-file.h" -const char *tool_names[NUM_STROKE_TOOLS] = {"pen", "eraser", "highlighter"}; +const char *tool_names[NUM_TOOLS] = {"pen", "eraser", "highlighter", "", "", "selectrect", "vertspace", "hand"}; const char *color_names[COLOR_MAX] = {"black", "blue", "red", "green", "gray", "lightblue", "lightgreen", "magenta", "orange", "yellow", "white"}; const char *bgtype_names[3] = {"solid", "pixmap", "pdf"}; @@ -30,6 +30,8 @@ const char *bgcolor_names[COLOR_MAX] = {"", "blue", "pink", "green", "", "", "", "", "orange", "yellow", "white"}; const char *bgstyle_names[4] = {"plain", "lined", "ruled", "graph"}; const char *file_domain_names[3] = {"absolute", "attach", "clone"}; +const char *unit_names[4] = {"cm", "in", "px", "pt"}; +int PDFTOPPM_PRINTING_DPI, GS_BITMAP_DPI; // creates a new empty journal @@ -617,7 +619,7 @@ gboolean open_journal(char *filename) close_journal(); while (bgpdf.status != STATUS_NOT_INIT) gtk_main_iteration(); new_journal(); - ui.zoom = DEFAULT_ZOOM; + ui.zoom = ui.startup_zoom; gnome_canvas_set_pixels_per_unit(canvas, ui.zoom); update_page_stuff(); return init_bgpdf(filename, TRUE, DOMAIN_ABSOLUTE); @@ -662,7 +664,7 @@ gboolean open_journal(char *filename) ui.layerno = ui.cur_page->nlayers-1; ui.cur_layer = (struct Layer *)(g_list_last(ui.cur_page->layers)->data); ui.saved = TRUE; - ui.zoom = DEFAULT_ZOOM; + ui.zoom = ui.startup_zoom; update_file_name(g_strdup(filename)); gnome_canvas_set_pixels_per_unit(canvas, ui.zoom); make_canvas_items(); @@ -1064,7 +1066,7 @@ gboolean init_bgpdf(char *pdfname, gboolean create_pages, int file_domain) bgpdf.requests = NULL; bgpdf.create_pages = create_pages; bgpdf.has_failed = FALSE; - add_bgpdf_request(-1, DEFAULT_ZOOM, FALSE); // request all pages + add_bgpdf_request(-1, ui.startup_zoom, FALSE); // request all pages return TRUE; } @@ -1089,7 +1091,7 @@ void bgpdf_create_page_with_bg(int pageno, struct BgPdfPage *bgpg) bg->filename = refstring_ref(bgpdf.filename); bg->file_domain = bgpdf.file_domain; bg->file_page_seq = pageno; - bg->pixbuf_scale = DEFAULT_ZOOM; + bg->pixbuf_scale = ui.startup_zoom; bg->pixbuf_dpi = bgpg->dpi; if (journal.npages < pageno) { @@ -1214,3 +1216,524 @@ void save_mru_list(void) if (ui.mru[i]!=NULL) fprintf(f, "%s\n", ui.mru[i]); fclose(f); } + +void init_config_default(void) +{ + int i, j; + + DEFAULT_ZOOM = DISPLAY_DPI_DEFAULT/72.0; + ui.zoom = ui.startup_zoom = 1.0*DEFAULT_ZOOM; + ui.default_page.height = 792.0; + ui.default_page.width = 612.0; + ui.default_page.bg->type = BG_SOLID; + ui.default_page.bg->color_no = COLOR_WHITE; + ui.default_page.bg->color_rgba = predef_bgcolors_rgba[COLOR_WHITE]; + ui.default_page.bg->ruling = RULING_LINED; + ui.view_continuous = TRUE; + ui.allow_xinput = TRUE; + ui.discard_corepointer = TRUE; + ui.bg_apply_all_pages = FALSE; + ui.use_erasertip = FALSE; + ui.window_default_width = 720; + ui.window_default_height = 480; + ui.maximize_at_start = FALSE; + ui.fullscreen = FALSE; + ui.scrollbar_step_increment = 30; + ui.zoom_step_increment = 1; + ui.zoom_step_factor = 1.5; + ui.antialias_bg = TRUE; + ui.progressive_bg = TRUE; + ui.print_ruling = TRUE; + ui.default_unit = UNIT_CM; + ui.default_path = NULL; + + // the default UI vertical order + ui.vertical_order[0][0] = 1; + ui.vertical_order[0][1] = 2; + ui.vertical_order[0][2] = 3; + ui.vertical_order[0][3] = 0; + ui.vertical_order[0][4] = 4; + ui.vertical_order[1][0] = 2; + ui.vertical_order[1][1] = 3; + ui.vertical_order[1][2] = 0; + ui.vertical_order[1][3] = ui.vertical_order[1][4] = -1; + + ui.toolno[0] = ui.startuptool = TOOL_PEN; + ui.ruler[0] = ui.startupruler = FALSE; + for (i=1; i<=NUM_BUTTONS; i++) { + ui.toolno[i] = TOOL_ERASER; + ui.ruler[i] = FALSE; + } + for (i=0; i<=NUM_BUTTONS; i++) + ui.linked_brush[i] = BRUSH_LINKED; + ui.brushes[0][TOOL_PEN].color_no = COLOR_BLACK; + ui.brushes[0][TOOL_ERASER].color_no = COLOR_WHITE; + ui.brushes[0][TOOL_HIGHLIGHTER].color_no = COLOR_YELLOW; + for (i=0; i < NUM_STROKE_TOOLS; i++) { + ui.brushes[0][i].thickness_no = THICKNESS_MEDIUM; + ui.brushes[0][i].tool_options = 0; + } + for (i=0; i< NUM_STROKE_TOOLS; i++) + for (j=1; j<=NUM_BUTTONS; j++) + g_memmove(&(ui.brushes[j][i]), &(ui.brushes[0][i]), sizeof(struct Brush)); + + // predef_thickness is already initialized as a global variable + GS_BITMAP_DPI = 144; + PDFTOPPM_PRINTING_DPI = 150; +} + +#if GLIB_CHECK_VERSION(2,6,0) + +void update_keyval(const gchar *group_name, const gchar *key, + const gchar *comment, gchar *value) +{ + gboolean has_it = g_key_file_has_key(ui.config_data, group_name, key, NULL); + cleanup_numeric(value); + g_key_file_set_value(ui.config_data, group_name, key, value); + g_free(value); + if (!has_it) g_key_file_set_comment(ui.config_data, group_name, key, comment, NULL); +} + +#endif + +const char *vorder_usernames[VBOX_MAIN_NITEMS+1] = + {"drawarea", "menu", "main_toolbar", "pen_toolbar", "statusbar", NULL}; + +gchar *verbose_vertical_order(int *order) +{ + gchar buf[80], *p; // longer than needed + int i; + + p = buf; + for (i=0; i=VBOX_MAIN_NITEMS) continue; + if (p!=buf) *(p++) = ' '; + p = g_stpcpy(p, vorder_usernames[order[i]]); + } + return g_strdup(buf); +} + +void save_config_to_file(void) +{ + gchar *buf; + FILE *f; + +#if GLIB_CHECK_VERSION(2,6,0) + // no support for keyval files before Glib 2.6.0 + if (glib_minor_version<6) return; + + // save some data... + ui.maximize_at_start = (gdk_window_get_state(winMain->window) & GDK_WINDOW_STATE_MAXIMIZED); + if (!ui.maximize_at_start && !ui.fullscreen) + gdk_drawable_get_size(winMain->window, + &ui.window_default_width, &ui.window_default_height); + + update_keyval("general", "display_dpi", + " the display resolution, in pixels per inch", + g_strdup_printf("%.2f", DEFAULT_ZOOM*72)); + update_keyval("general", "initial_zoom", + " the initial zoom level, in percent", + g_strdup_printf("%.2f", 100*ui.zoom/DEFAULT_ZOOM)); + update_keyval("general", "window_maximize", + " maximize the window at startup (true/false)", + g_strdup(ui.maximize_at_start?"true":"false")); + update_keyval("general", "window_fullscreen", + " start in full screen mode (true/false)", + g_strdup(ui.fullscreen?"true":"false")); + update_keyval("general", "window_width", + " the window width in pixels (when not maximized)", + g_strdup_printf("%d", ui.window_default_width)); + update_keyval("general", "window_height", + " the window height in pixels", + g_strdup_printf("%d", ui.window_default_height)); + update_keyval("general", "scrollbar_speed", + " scrollbar step increment (in pixels)", + g_strdup_printf("%d", ui.scrollbar_step_increment)); + update_keyval("general", "zoom_dialog_increment", + " the step increment in the zoom dialog box", + g_strdup_printf("%d", ui.zoom_step_increment)); + update_keyval("general", "zoom_step_factor", + " the multiplicative factor for zoom in/out", + g_strdup_printf("%.3f", ui.zoom_step_factor)); + update_keyval("general", "view_continuous", + " document view (true = continuous, false = single page)", + g_strdup(ui.view_continuous?"true":"false")); + update_keyval("general", "use_xinput", + " use XInput extensions (true/false)", + g_strdup(ui.allow_xinput?"true":"false")); + update_keyval("general", "discard_corepointer", + " discard Core Pointer events in XInput mode (true/false)", + g_strdup(ui.discard_corepointer?"true":"false")); + update_keyval("general", "use_erasertip", + " always map eraser tip to eraser (true/false)", + g_strdup(ui.use_erasertip?"true":"false")); + update_keyval("general", "default_path", + " default path for open/save (leave blank for current directory)", + g_strdup((ui.default_path!=NULL)?ui.default_path:"")); + update_keyval("general", "interface_order", + " interface components from top to bottom\n valid values: drawarea menu main_toolbar pen_toolbar statusbar", + verbose_vertical_order(ui.vertical_order[0])); + update_keyval("general", "interface_fullscreen", + " interface components in fullscreen mode, from top to bottom", + verbose_vertical_order(ui.vertical_order[1])); + + update_keyval("paper", "width", + " the default page width, in points (1/72 in)", + g_strdup_printf("%.2f", ui.default_page.width)); + update_keyval("paper", "height", + " the default page height, in points (1/72 in)", + g_strdup_printf("%.2f", ui.default_page.height)); + update_keyval("paper", "color", + " the default paper color", + g_strdup(bgcolor_names[ui.default_page.bg->color_no])); + update_keyval("paper", "style", + " the default paper style (plain, lined, ruled, or graph)", + g_strdup(bgstyle_names[ui.default_page.bg->ruling])); + update_keyval("paper", "apply_all", + " apply paper style changes to all pages (true/false)", + g_strdup(ui.bg_apply_all_pages?"true":"false")); + update_keyval("paper", "default_unit", + " preferred unit (cm, in, px, pt)", + g_strdup(unit_names[ui.default_unit])); + update_keyval("paper", "print_ruling", + " include paper ruling when printing or exporting to PDF (true/false)", + g_strdup(ui.print_ruling?"true":"false")); + update_keyval("paper", "antialias_bg", + " antialiased bitmap backgrounds (true/false)", + g_strdup(ui.antialias_bg?"true":"false")); + update_keyval("paper", "progressive_bg", + " progressive scaling of bitmap backgrounds (true/false)", + g_strdup(ui.progressive_bg?"true":"false")); + update_keyval("paper", "gs_bitmap_dpi", + " bitmap resolution of PS/PDF backgrounds rendered using ghostscript (dpi)", + g_strdup_printf("%d", GS_BITMAP_DPI)); + update_keyval("paper", "pdftoppm_printing_dpi", + " bitmap resolution of PDF backgrounds when printing with libgnomeprint (dpi)", + g_strdup_printf("%d", PDFTOPPM_PRINTING_DPI)); + + update_keyval("tools", "startup_tool", + " selected tool at startup (pen, eraser, highlighter, selectrect, vertspace, hand)", + g_strdup(tool_names[ui.startuptool])); + update_keyval("tools", "startup_ruler", + " ruler mode at startup (true/false) (for pen or highlighter only)", + g_strdup(ui.startupruler?"true":"false")); + update_keyval("tools", "pen_color", + " default pen color", + g_strdup(color_names[ui.default_brushes[TOOL_PEN].color_no])); + update_keyval("tools", "pen_thickness", + " default pen thickness (fine = 1, medium = 2, thick = 3)", + g_strdup_printf("%d", ui.default_brushes[TOOL_PEN].thickness_no)); + update_keyval("tools", "eraser_thickness", + " default eraser thickness (fine = 1, medium = 2, thick = 3)", + g_strdup_printf("%d", ui.default_brushes[TOOL_ERASER].thickness_no)); + update_keyval("tools", "eraser_mode", + " default eraser mode (standard = 0, whiteout = 1, strokes = 2)", + g_strdup_printf("%d", ui.default_brushes[TOOL_ERASER].tool_options)); + update_keyval("tools", "highlighter_color", + " default highlighter color", + g_strdup(color_names[ui.default_brushes[TOOL_HIGHLIGHTER].color_no])); + update_keyval("tools", "highlighter_thickness", + " default highlighter thickness (fine = 1, medium = 2, thick = 3)", + g_strdup_printf("%d", ui.default_brushes[TOOL_HIGHLIGHTER].thickness_no)); + update_keyval("tools", "btn2_tool", + " button 2 tool (pen, eraser, highlighter, selectrect, vertspace, hand)", + g_strdup(tool_names[ui.toolno[1]])); + update_keyval("tools", "btn2_linked", + " button 2 brush linked to primary brush (true/false) (overrides all other settings)", + g_strdup((ui.linked_brush[1]==BRUSH_LINKED)?"true":"false")); + update_keyval("tools", "btn2_ruler", + " button 2 ruler mode (true/false) (for pen or highlighter only)", + g_strdup(ui.ruler[1]?"true":"false")); + update_keyval("tools", "btn2_color", + " button 2 brush color (for pen or highlighter only)", + g_strdup((ui.toolno[1] sup) return FALSE; + *val = conv; + return TRUE; +} + +gboolean parse_keyval_floatlist(const gchar *group, const gchar *key, double *val, int n, double inf, double sup) +{ + gchar *ret, *end; + double conv[5]; + int i; + + if (n>5) return FALSE; + ret = g_key_file_get_value(ui.config_data, group, key, NULL); + if (ret==NULL) return FALSE; + end = ret; + for (i=0; i sup)) { g_free(ret); return FALSE; } + end++; + } + g_free(ret); + for (i=0; i sup) return FALSE; + *val = conv; + return TRUE; +} + +gboolean parse_keyval_enum(const gchar *group, const gchar *key, int *val, const char **names, int n) +{ + gchar *ret; + int i; + + ret = g_key_file_get_value(ui.config_data, group, key, NULL); + if (ret==NULL) return FALSE; + for (i=0; iVBOX_MAIN_NITEMS) return FALSE; // too many items + for (i=0; i=VBOX_MAIN_NITEMS) { g_free(ret); return FALSE; } // parse error + // we found item #i + tmp[n++] = i; + while (*p==' ') p++; + } + + for (n=0; ncolor_no), bgcolor_names, COLOR_MAX); + ui.default_page.bg->color_rgba = predef_bgcolors_rgba[ui.default_page.bg->color_no]; + parse_keyval_enum("paper", "style", &(ui.default_page.bg->ruling), bgstyle_names, 4); + parse_keyval_boolean("paper", "apply_all", &ui.bg_apply_all_pages); + parse_keyval_enum("paper", "default_unit", &ui.default_unit, unit_names, 4); + parse_keyval_boolean("paper", "antialias_bg", &ui.antialias_bg); + parse_keyval_boolean("paper", "progressive_bg", &ui.progressive_bg); + parse_keyval_boolean("paper", "print_ruling", &ui.print_ruling); + parse_keyval_int("paper", "gs_bitmap_dpi", &GS_BITMAP_DPI, 1, 1200); + parse_keyval_int("paper", "pdftoppm_printing_dpi", &PDFTOPPM_PRINTING_DPI, 1, 1200); + + parse_keyval_enum("tools", "startup_tool", &ui.startuptool, tool_names, NUM_TOOLS); + ui.toolno[0] = ui.startuptool; + if (ui.startuptool == TOOL_PEN || ui.startuptool == TOOL_HIGHLIGHTER) { + parse_keyval_boolean("tools", "startup_ruler", &ui.startupruler); + ui.ruler[0] = ui.startupruler; + } + parse_keyval_enum("tools", "pen_color", &(ui.brushes[0][TOOL_PEN].color_no), color_names, COLOR_MAX); + parse_keyval_int("tools", "pen_thickness", &(ui.brushes[0][TOOL_PEN].thickness_no), 0, 4); + parse_keyval_int("tools", "eraser_thickness", &(ui.brushes[0][TOOL_ERASER].thickness_no), 1, 3); + parse_keyval_int("tools", "eraser_mode", &(ui.brushes[0][TOOL_ERASER].tool_options), 0, 2); + parse_keyval_enum("tools", "highlighter_color", &(ui.brushes[0][TOOL_HIGHLIGHTER].color_no), color_names, COLOR_MAX); + parse_keyval_int("tools", "highlighter_thickness", &(ui.brushes[0][TOOL_HIGHLIGHTER].thickness_no), 0, 4); + for (i=0; i< NUM_STROKE_TOOLS; i++) + for (j=1; j<=NUM_BUTTONS; j++) + g_memmove(&(ui.brushes[j][i]), &(ui.brushes[0][i]), sizeof(struct Brush)); + + parse_keyval_enum("tools", "btn2_tool", &(ui.toolno[1]), tool_names, NUM_TOOLS); + if (parse_keyval_boolean("tools", "btn2_linked", &b)) + ui.linked_brush[1] = b?BRUSH_LINKED:BRUSH_STATIC; + parse_keyval_enum("tools", "btn3_tool", &(ui.toolno[2]), tool_names, NUM_TOOLS); + if (parse_keyval_boolean("tools", "btn3_linked", &b)) + ui.linked_brush[2] = b?BRUSH_LINKED:BRUSH_STATIC; + for (i=1; i<=NUM_BUTTONS; i++) + if (ui.toolno[i]==TOOL_PEN || ui.toolno[i]==TOOL_HIGHLIGHTER) + ui.ruler[i] = ui.ruler[0]; + if (ui.linked_brush[1]!=BRUSH_LINKED) { + if (ui.toolno[1]==TOOL_PEN || ui.toolno[1]==TOOL_HIGHLIGHTER) { + parse_keyval_boolean("tools", "btn2_ruler", &(ui.ruler[1])); + parse_keyval_enum("tools", "btn2_color", &(ui.brushes[1][ui.toolno[1]].color_no), color_names, COLOR_MAX); + } + if (ui.toolno[1]