#include <math.h>
#include <gdk/gdkx.h>
#include <X11/Xlib.h>
+#include <locale.h>
#include "xournal.h"
#include "xo-interface.h"
#include "xo-callbacks.h"
#include "xo-misc.h"
#include "xo-file.h"
+#include "xo-paint.h"
-const char *tool_names[NUM_STROKE_TOOLS] = {"pen", "eraser", "highlighter"};
+const char *tool_names[NUM_TOOLS] = {"pen", "eraser", "highlighter", "text", "", "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"};
"", "", "", "", "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
struct Layer *layer;
struct Item *item;
int i, is_clone;
- char *tmpfn;
+ char *tmpfn, *tmpstr;
gchar *pdfbuf;
gsize pdflen;
gboolean success;
f = gzopen(filename, "w");
if (f==NULL) return FALSE;
chk_attach_names();
+
+ setlocale(LC_NUMERIC, "C");
gzprintf(f, "<?xml version=\"1.0\" standalone=\"no\"?>\n"
- "<title>Xournal document - see http://math.mit.edu/~auroux/software/xournal/</title>\n"
- "<xournal version=\"" VERSION "\"/>\n");
+ "<xournal version=\"" VERSION "\">\n"
+ "<title>Xournal document - see http://math.mit.edu/~auroux/software/xournal/</title>\n");
for (pagelist = journal.pages; pagelist!=NULL; pagelist = pagelist->next) {
pg = (struct Page *)pagelist->data;
gzprintf(f, "<page width=\"%.2f\" height=\"%.2f\">\n", pg->width, pg->height);
tmpf = fopen(tmpfn, "w");
if (tmpf != NULL && fwrite(pdfbuf, 1, pdflen, tmpf) == pdflen)
success = TRUE;
+ g_free(pdfbuf);
fclose(tmpf);
}
if (!success) {
gzprintf(f, "%.2f ", item->path->coords[i]);
gzprintf(f, "\n</stroke>\n");
}
+ if (item->type == ITEM_TEXT) {
+ gzprintf(f, "<text font=\"%s\" size=\"%.2f\" x=\"%.2f\" y=\"%.2f\" color=\"",
+ item->font_name, item->font_size, item->bbox.left, item->bbox.top);
+ if (item->brush.color_no >= 0)
+ gzputs(f, color_names[item->brush.color_no]);
+ else
+ gzprintf(f, "#%08x", item->brush.color_rgba);
+ tmpstr = g_markup_escape_text(item->text, -1);
+ gzprintf(f, "\">%s</text>\n", tmpstr);
+ g_free(tmpstr);
+
+ }
}
gzprintf(f, "</layer>\n");
}
gzprintf(f, "</page>\n");
}
+ gzprintf(f, "</xournal>\n");
gzclose(f);
+ setlocale(LC_NUMERIC, "");
+
return TRUE;
}
use new_journal() to reinitialize them */
}
+// sanitize a string containing floats, in case it may have , instead of .
+
+void cleanup_numeric(char *s)
+{
+ while (*s!=0) { if (*s==',') *s='.'; s++; }
+}
+
// the XML parser functions for open_journal()
struct Journal tmpJournal;
while (*attribute_names!=NULL) {
if (!strcmp(*attribute_names, "width")) {
if (has_attr & 1) *error = xoj_invalid();
- tmpPage->width = strtod(*attribute_values, &ptr);
+ cleanup_numeric((gchar *)*attribute_values);
+ tmpPage->width = g_ascii_strtod(*attribute_values, &ptr);
if (ptr == *attribute_values) *error = xoj_invalid();
has_attr |= 1;
}
else if (!strcmp(*attribute_names, "height")) {
if (has_attr & 2) *error = xoj_invalid();
- tmpPage->height = strtod(*attribute_values, &ptr);
+ cleanup_numeric((gchar *)*attribute_values);
+ tmpPage->height = g_ascii_strtod(*attribute_values, &ptr);
if (ptr == *attribute_values) *error = xoj_invalid();
has_attr |= 2;
}
else if (!strcmp(*attribute_names, "pageno")) {
if (tmpPage->bg->type != BG_PDF || (has_attr & 32))
{ *error = xoj_invalid(); return; }
- tmpPage->bg->file_page_seq = strtod(*attribute_values, &ptr);
+ tmpPage->bg->file_page_seq = strtol(*attribute_values, &ptr, 10);
if (ptr == *attribute_values) *error = xoj_invalid();
has_attr |= 32;
}
while (*attribute_names!=NULL) {
if (!strcmp(*attribute_names, "width")) {
if (has_attr & 1) *error = xoj_invalid();
- tmpItem->brush.thickness = strtod(*attribute_values, &ptr);
+ cleanup_numeric((gchar *)*attribute_values);
+ tmpItem->brush.thickness = g_ascii_strtod(*attribute_values, &ptr);
if (ptr == *attribute_values) *error = xoj_invalid();
has_attr |= 1;
}
tmpItem->brush.tool_options = 0; // who cares ?
if (tmpItem->brush.tool_type == TOOL_HIGHLIGHTER) {
if (tmpItem->brush.color_no >= 0)
- tmpItem->brush.color_rgba &= HILITER_ALPHA_MASK;
+ tmpItem->brush.color_rgba &= ui.hiliter_alpha_mask;
}
}
+ else if (!strcmp(element_name, "text")) { // start of a text item
+ if (tmpLayer == NULL || tmpItem != NULL) {
+ *error = xoj_invalid();
+ return;
+ }
+ tmpItem = (struct Item *)g_malloc0(sizeof(struct Item));
+ tmpItem->type = ITEM_TEXT;
+ tmpItem->canvas_item = NULL;
+ tmpLayer->items = g_list_append(tmpLayer->items, tmpItem);
+ tmpLayer->nitems++;
+ // scan for font, size, x, y, and color attributes
+ has_attr = 0;
+ while (*attribute_names!=NULL) {
+ if (!strcmp(*attribute_names, "font")) {
+ if (has_attr & 1) *error = xoj_invalid();
+ tmpItem->font_name = g_strdup(*attribute_values);
+ has_attr |= 1;
+ }
+ else if (!strcmp(*attribute_names, "size")) {
+ if (has_attr & 2) *error = xoj_invalid();
+ cleanup_numeric((gchar *)*attribute_values);
+ tmpItem->font_size = g_ascii_strtod(*attribute_values, &ptr);
+ if (ptr == *attribute_values) *error = xoj_invalid();
+ has_attr |= 2;
+ }
+ else if (!strcmp(*attribute_names, "x")) {
+ if (has_attr & 4) *error = xoj_invalid();
+ cleanup_numeric((gchar *)*attribute_values);
+ tmpItem->bbox.left = g_ascii_strtod(*attribute_values, &ptr);
+ if (ptr == *attribute_values) *error = xoj_invalid();
+ has_attr |= 4;
+ }
+ else if (!strcmp(*attribute_names, "y")) {
+ if (has_attr & 8) *error = xoj_invalid();
+ cleanup_numeric((gchar *)*attribute_values);
+ tmpItem->bbox.top = g_ascii_strtod(*attribute_values, &ptr);
+ if (ptr == *attribute_values) *error = xoj_invalid();
+ has_attr |= 8;
+ }
+ else if (!strcmp(*attribute_names, "color")) {
+ if (has_attr & 16) *error = xoj_invalid();
+ tmpItem->brush.color_no = COLOR_OTHER;
+ for (i=0; i<COLOR_MAX; i++)
+ if (!strcmp(*attribute_values, color_names[i])) {
+ tmpItem->brush.color_no = i;
+ tmpItem->brush.color_rgba = predef_colors_rgba[i];
+ }
+ // there's also the case of hex (#rrggbbaa) colors
+ if (tmpItem->brush.color_no == COLOR_OTHER && **attribute_values == '#') {
+ tmpItem->brush.color_rgba = strtol(*attribute_values + 1, &ptr, 16);
+ if (*ptr!=0) *error = xoj_invalid();
+ }
+ has_attr |= 16;
+ }
+ else *error = xoj_invalid();
+ attribute_names++;
+ attribute_values++;
+ }
+ if (has_attr!=31) *error = xoj_invalid();
+ }
}
void xoj_parser_end_element(GMarkupParseContext *context,
update_item_bbox(tmpItem);
tmpItem = NULL;
}
+ if (!strcmp(element_name, "text")) {
+ if (tmpItem == NULL) {
+ *error = xoj_invalid();
+ return;
+ }
+ tmpItem = NULL;
+ }
}
void xoj_parser_text(GMarkupParseContext *context,
element_name = g_markup_parse_context_get_element(context);
if (element_name == NULL) return;
if (!strcmp(element_name, "stroke")) {
+ cleanup_numeric((gchar *)text);
ptr = text;
n = 0;
while (text_len > 0) {
realloc_cur_path(n/2 + 1);
- ui.cur_path.coords[n] = strtod(text, (char **)(&ptr));
+ ui.cur_path.coords[n] = g_ascii_strtod(text, (char **)(&ptr));
if (ptr == text) break;
text_len -= (ptr - text);
text = ptr;
tmpItem->path = gnome_canvas_points_new(n/2);
g_memmove(tmpItem->path->coords, ui.cur_path.coords, n*sizeof(double));
}
+ if (!strcmp(element_name, "text")) {
+ tmpItem->text = g_malloc(text_len+1);
+ g_memmove(tmpItem->text, text, text_len);
+ tmpItem->text[text_len]=0;
+ }
}
gboolean user_wants_second_chance(char **filename)
if (response != GTK_RESPONSE_YES) return FALSE;
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_ACCEPT, NULL);
+ GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
filt_all = gtk_file_filter_new();
gtk_file_filter_set_name(filt_all, "All files");
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_pdf);
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all);
- if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_ACCEPT) {
+ if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) {
gtk_widget_destroy(dialog);
return FALSE;
}
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);
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();
char *pipename;
int buflen, remnlen, file_pageno;
- buf = g_malloc(BUFSIZE); // a reasonable buffer size
f = fopen(filename, "r");
+ if (f == NULL) return NULL;
+ buf = g_malloc(BUFSIZE); // a reasonable buffer size
if (fread(buf, 1, 4, f) !=4 ||
(strncmp((char *)buf, "%!PS", 4) && strncmp((char *)buf, "%PDF", 4))) {
fclose(f);
struct BgPdfPage *bgpg;
gchar *ppm_name;
GdkPixbuf *pixbuf;
+ int npad, ret;
if (bgpdf.requests == NULL) return;
req = (struct BgPdfRequest *)bgpdf.requests->data;
- ppm_name = g_strdup_printf("%s/p-%06d.ppm", bgpdf.tmpdir, req->pageno);
-// printf("Child %d finished, should look for %s... \n", pid, ppm_name);
-
- if (bgpdf.status == STATUS_ABORTED || bgpdf.status == STATUS_SHUTDOWN)
- pixbuf = NULL;
- else
- pixbuf = gdk_pixbuf_new_from_file(ppm_name, NULL);
-
- unlink(ppm_name);
- g_free(ppm_name);
+ pixbuf = NULL;
+ // pdftoppm used to generate p-nnnnnn.ppm (6 digits); new versions produce variable width
+ for (npad = 6; npad>0; npad--) {
+ ppm_name = g_strdup_printf("%s/p-%0*d.ppm", bgpdf.tmpdir, npad, req->pageno);
+ if (bgpdf.status != STATUS_ABORTED && bgpdf.status != STATUS_SHUTDOWN)
+ pixbuf = gdk_pixbuf_new_from_file(ppm_name, NULL);
+ ret = unlink(ppm_name);
+ g_free(ppm_name);
+ if (pixbuf != NULL || ret == 0) break;
+ }
if (pixbuf != NULL) { // success
// printf("success\n");
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;
}
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) {
{
int i;
gboolean anyone = FALSE;
+ gchar *tmp;
for (i=0; i<MRU_SIZE; i++) {
if (ui.mru[i]!=NULL) {
- gtk_label_set_text(GTK_LABEL(gtk_bin_get_child(GTK_BIN(ui.mrumenu[i]))),
- g_basename(ui.mru[i]));
+ tmp = g_strdup_printf("_%d %s", i+1, g_basename(ui.mru[i]));
+ gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(ui.mrumenu[i]))),
+ tmp);
+ g_free(tmp);
gtk_widget_show(ui.mrumenu[i]);
anyone = TRUE;
}
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 = FALSE;
+ 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;
+ ui.default_font_name = g_strdup(DEFAULT_FONT);
+ ui.default_font_size = DEFAULT_FONT_SIZE;
+
+ // 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;
+
+ ui.hiliter_opacity = 0.5;
+}
+
+#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; i++) {
+ if (order[i]<0 || order[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("general", "highlighter_opacity",
+ " highlighter opacity (0 to 1, default 0.5)\n warning: opacity level is not saved in xoj files!",
+ g_strdup_printf("%.2f", ui.hiliter_opacity));
+
+ 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, text, 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]<NUM_STROKE_TOOLS)?
+ color_names[ui.brushes[1][ui.toolno[1]].color_no]:"white"));
+ update_keyval("tools", "btn2_thickness",
+ " button 2 brush thickness (pen, eraser, or highlighter only)",
+ g_strdup_printf("%d", (ui.toolno[1]<NUM_STROKE_TOOLS)?
+ ui.brushes[1][ui.toolno[1]].thickness_no:0));
+ update_keyval("tools", "btn2_erasermode",
+ " button 2 eraser mode (eraser only)",
+ g_strdup_printf("%d", ui.brushes[1][TOOL_ERASER].tool_options));
+ update_keyval("tools", "btn3_tool",
+ " button 3 tool (pen, eraser, highlighter, text, selectrect, vertspace, hand)",
+ g_strdup(tool_names[ui.toolno[2]]));
+ update_keyval("tools", "btn3_linked",
+ " button 3 brush linked to primary brush (true/false) (overrides all other settings)",
+ g_strdup((ui.linked_brush[2]==BRUSH_LINKED)?"true":"false"));
+ update_keyval("tools", "btn3_ruler",
+ " button 3 ruler mode (true/false) (for pen or highlighter only)",
+ g_strdup(ui.ruler[2]?"true":"false"));
+ update_keyval("tools", "btn3_color",
+ " button 3 brush color (for pen or highlighter only)",
+ g_strdup((ui.toolno[2]<NUM_STROKE_TOOLS)?
+ color_names[ui.brushes[2][ui.toolno[2]].color_no]:"white"));
+ update_keyval("tools", "btn3_thickness",
+ " button 3 brush thickness (pen, eraser, or highlighter only)",
+ g_strdup_printf("%d", (ui.toolno[2]<NUM_STROKE_TOOLS)?
+ ui.brushes[2][ui.toolno[2]].thickness_no:0));
+ update_keyval("tools", "btn3_erasermode",
+ " button 3 eraser mode (eraser only)",
+ g_strdup_printf("%d", ui.brushes[2][TOOL_ERASER].tool_options));
+
+ update_keyval("tools", "pen_thicknesses",
+ " thickness of the various pens (in points, 1 pt = 1/72 in)",
+ g_strdup_printf("%.2f;%.2f;%.2f;%.2f;%.2f",
+ predef_thickness[TOOL_PEN][0], predef_thickness[TOOL_PEN][1],
+ predef_thickness[TOOL_PEN][2], predef_thickness[TOOL_PEN][3],
+ predef_thickness[TOOL_PEN][4]));
+ update_keyval("tools", "eraser_thicknesses",
+ " thickness of the various erasers (in points, 1 pt = 1/72 in)",
+ g_strdup_printf("%.2f;%.2f;%.2f",
+ predef_thickness[TOOL_ERASER][1], predef_thickness[TOOL_ERASER][2],
+ predef_thickness[TOOL_ERASER][3]));
+ update_keyval("tools", "highlighter_thicknesses",
+ " thickness of the various highlighters (in points, 1 pt = 1/72 in)",
+ g_strdup_printf("%.2f;%.2f;%.2f",
+ predef_thickness[TOOL_HIGHLIGHTER][1], predef_thickness[TOOL_HIGHLIGHTER][2],
+ predef_thickness[TOOL_HIGHLIGHTER][3]));
+ update_keyval("tools", "default_font",
+ " name of the default font",
+ g_strdup(ui.default_font_name));
+ update_keyval("tools", "default_font_size",
+ " default font size",
+ g_strdup_printf("%.1f", ui.default_font_size));
+
+ buf = g_key_file_to_data(ui.config_data, NULL, NULL);
+ if (buf == NULL) return;
+ f = fopen(ui.configfile, "w");
+ if (f==NULL) { g_free(buf); return; }
+ fputs(buf, f);
+ fclose(f);
+ g_free(buf);
+#endif
+}
+
+#if GLIB_CHECK_VERSION(2,6,0)
+gboolean parse_keyval_float(const gchar *group, const gchar *key, double *val, double inf, double sup)
+{
+ gchar *ret, *end;
+ double conv;
+
+ ret = g_key_file_get_value(ui.config_data, group, key, NULL);
+ if (ret==NULL) return FALSE;
+ conv = g_ascii_strtod(ret, &end);
+ if (*end!=0) { g_free(ret); return FALSE; }
+ g_free(ret);
+ if (conv < inf || conv > 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<n; i++) {
+ conv[i] = g_ascii_strtod(end, &end);
+ if ((i==n-1 && *end!=0) || (i<n-1 && *end!=';') ||
+ (conv[i] < inf) || (conv[i] > sup)) { g_free(ret); return FALSE; }
+ end++;
+ }
+ g_free(ret);
+ for (i=0; i<n; i++) val[i] = conv[i];
+ return TRUE;
+}
+
+gboolean parse_keyval_int(const gchar *group, const gchar *key, int *val, int inf, int sup)
+{
+ gchar *ret, *end;
+ int conv;
+
+ ret = g_key_file_get_value(ui.config_data, group, key, NULL);
+ if (ret==NULL) return FALSE;
+ conv = strtol(ret, &end, 10);
+ if (*end!=0) { g_free(ret); return FALSE; }
+ g_free(ret);
+ if (conv < inf || conv > 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; i<n; i++) {
+ if (!names[i][0]) continue; // "" is for invalid values
+ if (!g_ascii_strcasecmp(ret, names[i]))
+ { *val = i; g_free(ret); return TRUE; }
+ }
+ return FALSE;
+}
+
+gboolean parse_keyval_boolean(const gchar *group, const gchar *key, gboolean *val)
+{
+ gchar *ret;
+
+ ret = g_key_file_get_value(ui.config_data, group, key, NULL);
+ if (ret==NULL) return FALSE;
+ if (!g_ascii_strcasecmp(ret, "true"))
+ { *val = TRUE; g_free(ret); return TRUE; }
+ if (!g_ascii_strcasecmp(ret, "false"))
+ { *val = FALSE; g_free(ret); return TRUE; }
+ g_free(ret);
+ return FALSE;
+}
+
+gboolean parse_keyval_string(const gchar *group, const gchar *key, gchar **val)
+{
+ gchar *ret;
+
+ ret = g_key_file_get_value(ui.config_data, group, key, NULL);
+ if (ret==NULL) return FALSE;
+ if (strlen(ret) == 0) {
+ *val = NULL;
+ g_free(ret);
+ }
+ else *val = ret;
+ return TRUE;
+}
+
+gboolean parse_keyval_vorderlist(const gchar *group, const gchar *key, int *order)
+{
+ gchar *ret, *p;
+ int tmp[VBOX_MAIN_NITEMS];
+ int i, n, found, l;
+
+ ret = g_key_file_get_value(ui.config_data, group, key, NULL);
+ if (ret==NULL) return FALSE;
+
+ for (i=0; i<VBOX_MAIN_NITEMS; i++) tmp[i] = -1;
+ n = 0; p = ret;
+ while (*p==' ') p++;
+ while (*p!=0) {
+ if (n>VBOX_MAIN_NITEMS) return FALSE; // too many items
+ for (i=0; i<VBOX_MAIN_NITEMS; i++) {
+ if (!g_str_has_prefix(p, vorder_usernames[i])) continue;
+ l = strlen(vorder_usernames[i]);
+ if (p[l]==' '||p[l]==0) { p+=l; break; }
+ }
+ if (i>=VBOX_MAIN_NITEMS) { g_free(ret); return FALSE; } // parse error
+ // we found item #i
+ tmp[n++] = i;
+ while (*p==' ') p++;
+ }
+
+ for (n=0; n<VBOX_MAIN_NITEMS; n++) order[n] = tmp[n];
+ g_free(ret);
+ return TRUE;
+}
+
+#endif
+
+void load_config_from_file(void)
+{
+ double f;
+ gboolean b;
+ int i, j;
+ gchar *str;
+
+#if GLIB_CHECK_VERSION(2,6,0)
+ // no support for keyval files before Glib 2.6.0
+ if (glib_minor_version<6) return;
+ ui.config_data = g_key_file_new();
+ if (!g_key_file_load_from_file(ui.config_data, ui.configfile,
+ G_KEY_FILE_KEEP_COMMENTS, NULL)) {
+ g_key_file_free(ui.config_data);
+ ui.config_data = g_key_file_new();
+ g_key_file_set_comment(ui.config_data, NULL, NULL,
+ " Xournal configuration file.\n"
+ " This file is generated automatically upon saving preferences.\n"
+ " Use caution when editing this file manually.\n", NULL);
+ return;
+ }
+
+ // parse keys from the keyfile to set defaults
+ if (parse_keyval_float("general", "display_dpi", &f, 10., 500.))
+ DEFAULT_ZOOM = f/72.0;
+ if (parse_keyval_float("general", "initial_zoom", &f,
+ MIN_ZOOM*100/DEFAULT_ZOOM, MAX_ZOOM*100/DEFAULT_ZOOM))
+ ui.zoom = ui.startup_zoom = DEFAULT_ZOOM*f/100.0;
+ parse_keyval_boolean("general", "window_maximize", &ui.maximize_at_start);
+ parse_keyval_boolean("general", "window_fullscreen", &ui.fullscreen);
+ parse_keyval_int("general", "window_width", &ui.window_default_width, 10, 5000);
+ parse_keyval_int("general", "window_height", &ui.window_default_height, 10, 5000);
+ parse_keyval_int("general", "scrollbar_speed", &ui.scrollbar_step_increment, 1, 5000);
+ parse_keyval_int("general", "zoom_dialog_increment", &ui.zoom_step_increment, 1, 500);
+ parse_keyval_float("general", "zoom_step_factor", &ui.zoom_step_factor, 1., 5.);
+ parse_keyval_boolean("general", "view_continuous", &ui.view_continuous);
+ parse_keyval_boolean("general", "use_xinput", &ui.allow_xinput);
+ parse_keyval_boolean("general", "discard_corepointer", &ui.discard_corepointer);
+ parse_keyval_boolean("general", "use_erasertip", &ui.use_erasertip);
+ parse_keyval_string("general", "default_path", &ui.default_path);
+ parse_keyval_vorderlist("general", "interface_order", ui.vertical_order[0]);
+ parse_keyval_vorderlist("general", "interface_fullscreen", ui.vertical_order[1]);
+ parse_keyval_float("general", "highlighter_opacity", &ui.hiliter_opacity, 0., 1.);
+
+ parse_keyval_float("paper", "width", &ui.default_page.width, 1., 5000.);
+ parse_keyval_float("paper", "height", &ui.default_page.height, 1., 5000.);
+ parse_keyval_enum("paper", "color", &(ui.default_page.bg->color_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]<NUM_STROKE_TOOLS)
+ parse_keyval_int("tools", "btn2_thickness", &(ui.brushes[1][ui.toolno[1]].thickness_no), 0, 4);
+ if (ui.toolno[1]==TOOL_ERASER)
+ parse_keyval_int("tools", "btn2_erasermode", &(ui.brushes[1][TOOL_ERASER].tool_options), 0, 2);
+ }
+ if (ui.linked_brush[2]!=BRUSH_LINKED) {
+ if (ui.toolno[2]==TOOL_PEN || ui.toolno[2]==TOOL_HIGHLIGHTER) {
+ parse_keyval_boolean("tools", "btn3_ruler", &(ui.ruler[2]));
+ parse_keyval_enum("tools", "btn3_color", &(ui.brushes[2][ui.toolno[2]].color_no), color_names, COLOR_MAX);
+ }
+ if (ui.toolno[2]<NUM_STROKE_TOOLS)
+ parse_keyval_int("tools", "btn3_thickness", &(ui.brushes[2][ui.toolno[2]].thickness_no), 0, 4);
+ if (ui.toolno[2]==TOOL_ERASER)
+ parse_keyval_int("tools", "btn3_erasermode", &(ui.brushes[2][TOOL_ERASER].tool_options), 0, 2);
+ }
+ parse_keyval_floatlist("tools", "pen_thicknesses", predef_thickness[TOOL_PEN], 5, 0.01, 1000.0);
+ parse_keyval_floatlist("tools", "eraser_thicknesses", predef_thickness[TOOL_ERASER]+1, 3, 0.01, 1000.0);
+ parse_keyval_floatlist("tools", "highlighter_thicknesses", predef_thickness[TOOL_HIGHLIGHTER]+1, 3, 0.01, 1000.0);
+ if (parse_keyval_string("tools", "default_font", &str))
+ if (str!=NULL) { g_free(ui.default_font_name); ui.default_font_name = str; }
+ parse_keyval_float("tools", "default_font_size", &ui.default_font_size, 1., 200.);
+#endif
+}
projects / xournal.git / blobdiff