+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <libgnomecanvas/libgnomecanvas.h>
#include <zlib.h>
#include <math.h>
-#include <gdk/gdkx.h>
-#include <X11/Xlib.h>
#include <locale.h>
#include <glib.h>
#include <glib/gstdio.h>
#include <poppler/glib/poppler.h>
+#ifndef WIN32
+ #include <gdk/gdkx.h>
+ #include <X11/Xlib.h>
+#endif
+
#include "xournal.h"
#include "xo-interface.h"
#include "xo-support.h"
GList *pagelist, *layerlist, *itemlist, *list;
GtkWidget *dialog;
- f = gzopen(filename, "w");
+ f = gzopen(filename, "wb");
if (f==NULL) return FALSE;
chk_attach_names();
success = FALSE;
if (bgpdf.status != STATUS_NOT_INIT && bgpdf.file_contents != NULL)
{
- tmpf = fopen(tmpfn, "w");
+ tmpf = fopen(tmpfn, "wb");
if (tmpf != NULL && fwrite(bgpdf.file_contents, 1, bgpdf.file_length, tmpf) == bgpdf.file_length)
success = TRUE;
fclose(tmpf);
else
gzprintf(f, "#%08x", item->brush.color_rgba);
tmpstr = g_markup_escape_text(item->text, -1);
- gzprintf(f, "\">%s</text>\n", tmpstr);
+ gzputs(f, "\">");
+ gzputs(f, tmpstr); // gzprintf() can't handle > 4095 bytes
+ gzputs(f, "</text>\n");
g_free(tmpstr);
}
}
// free everything...
reset_selection();
+ reset_recognizer();
clear_redo_stack();
clear_undo_stack();
}
// sanitize a string containing floats, in case it may have , instead of .
+// also replace Windows-produced 1.#J by inf
void cleanup_numeric(char *s)
{
- while (*s!=0) { if (*s==',') *s='.'; s++; }
+ while (*s!=0) {
+ if (*s==',') *s='.';
+ if (*s=='1' && s[1]=='.' && s[2]=='#' && s[3]=='J')
+ { *s='i'; s[1]='n'; s[2]='f'; s[3]=' '; }
+ s++;
+ }
}
// the XML parser functions for open_journal()
}
// there's also the case of hex (#rrggbbaa) colors
if (tmpPage->bg->color_no == COLOR_OTHER && **attribute_values == '#') {
- tmpPage->bg->color_rgba = strtol(*attribute_values + 1, &ptr, 16);
+ tmpPage->bg->color_rgba = strtoul(*attribute_values + 1, &ptr, 16);
if (*ptr!=0) *error = xoj_invalid();
}
has_attr |= 2;
}
// 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);
+ tmpItem->brush.color_rgba = strtoul(*attribute_values + 1, &ptr, 16);
if (*ptr!=0) *error = xoj_invalid();
}
has_attr |= 2;
}
// 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);
+ tmpItem->brush.color_rgba = strtoul(*attribute_values + 1, &ptr, 16);
if (*ptr!=0) *error = xoj_invalid();
}
has_attr |= 16;
if (ptr == text) break;
text_len -= (ptr - text);
text = ptr;
- if (!finite(ui.cur_path.coords[n])) {
+ if (!finite_sized(ui.cur_path.coords[n])) {
if (n>=2) ui.cur_path.coords[n] = ui.cur_path.coords[n-2];
else ui.cur_path.coords[n] = 0;
}
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"));
gtk_file_filter_add_pattern(filt_all, "*");
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_pdf);
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (dialog), filt_all);
+ if (ui.default_path!=NULL) gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (dialog), ui.default_path);
+
if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) {
gtk_widget_destroy(dialog);
return FALSE;
gzFile f;
char buffer[1000];
int len;
- gchar *tmpfn;
+ gchar *tmpfn, *tmpfn2, *p, *q;
gboolean maybe_pdf;
- f = gzopen(filename, "r");
+ tmpfn = g_strdup_printf("%s.xoj", filename);
+ if (ui.autoload_pdf_xoj && g_file_test(tmpfn, G_FILE_TEST_EXISTS) &&
+ (g_str_has_suffix(filename, ".pdf") || g_str_has_suffix(filename, ".PDF")))
+ {
+ valid = open_journal(tmpfn);
+ g_free(tmpfn);
+ return valid;
+ }
+ g_free(tmpfn);
+
+ f = gzopen(filename, "rb");
if (f==NULL) return FALSE;
+ if (filename[0]=='/') {
+ if (ui.default_path != NULL) g_free(ui.default_path);
+ ui.default_path = g_path_get_dirname(filename);
+ }
context = g_markup_parse_context_new(&parser, 0, NULL, NULL);
valid = TRUE;
else
tmpfn = g_strdup(tmpBg_pdf->filename->s);
valid = init_bgpdf(tmpfn, FALSE, tmpBg_pdf->file_domain);
- // in case the file name became invalid
+ // if file name is invalid: first try in xoj file's directory
+ if (!valid && tmpBg_pdf->file_domain != DOMAIN_ATTACH) {
+ p = g_path_get_dirname(filename);
+ q = g_path_get_basename(tmpfn);
+ tmpfn2 = g_strdup_printf("%s/%s", p, q);
+ g_free(p); g_free(q);
+ valid = init_bgpdf(tmpfn2, FALSE, tmpBg_pdf->file_domain);
+ if (valid) { // change the file name...
+ printf("substituting %s -> %s\n", tmpfn, tmpfn2);
+ g_free(tmpBg_pdf->filename->s);
+ tmpBg_pdf->filename->s = tmpfn2;
+ }
+ else g_free(tmpfn2);
+ }
+ // if file name is invalid: next prompt user
if (!valid && tmpBg_pdf->file_domain != DOMAIN_ATTACH)
if (user_wants_second_chance(&tmpfn)) {
valid = init_bgpdf(tmpfn, FALSE, tmpBg_pdf->file_domain);
char *pipename;
int buflen, remnlen, file_pageno;
- f = fopen(filename, "r");
+ f = fopen(filename, "rb");
if (f == NULL) return NULL;
buf = g_malloc(BUFSIZE); // a reasonable buffer size
if (fread(buf, 1, 4, f) !=4 ||
fclose(f);
pipename = g_strdup_printf(GS_CMDLINE, (double)GS_BITMAP_DPI, filename);
- gs_pipe = popen(pipename, "r");
+ gs_pipe = popen(pipename, "rb");
g_free(pipename);
bg_list = NULL;
struct Background *attempt_screenshot_bg(void)
{
+#ifndef WIN32
struct Background *bg;
GdkPixbuf *pix;
XEvent x_event;
bg->filename = new_refstring(NULL);
bg->file_domain = DOMAIN_ATTACH;
return bg;
+#else
+ // not implemented under WIN32
+ return FALSE;
+#endif
}
/************** pdf annotation ***************/
PopplerPage *pdfpage;
gdouble height, width;
int scaled_height, scaled_width;
+ GdkPixmap *pixmap;
+ cairo_t *cr;
// if all requests have been cancelled, remove ourselves from main loop
if (bgpdf.requests == NULL) { bgpdf.pid = 0; return FALSE; }
poppler_page_get_size(pdfpage, &width, &height);
scaled_width = (int) (req->dpi * width/72);
scaled_height = (int) (req->dpi * height/72);
- pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
- FALSE, 8, scaled_width, scaled_height);
- poppler_page_render_to_pixbuf(
+
+ if (ui.poppler_force_cairo) { // poppler -> cairo -> pixmap -> pixbuf
+ pixmap = gdk_pixmap_new(GTK_WIDGET(canvas)->window, scaled_width, scaled_height, -1);
+ cr = gdk_cairo_create(pixmap);
+ cairo_set_source_rgb(cr, 1., 1., 1.);
+ cairo_paint(cr);
+ cairo_scale(cr, scaled_width/width, scaled_height/height);
+ poppler_page_render(pdfpage, cr);
+ cairo_destroy(cr);
+ pixbuf = gdk_pixbuf_get_from_drawable(NULL, GDK_DRAWABLE(pixmap),
+ NULL, 0, 0, 0, 0, scaled_width, scaled_height);
+ g_object_unref(pixmap);
+ }
+ else { // directly poppler -> pixbuf: faster, but bitmap font bug
+ pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
+ FALSE, 8, scaled_width, scaled_height);
+ wrapper_poppler_page_render_to_pixbuf(
pdfpage, 0, 0, scaled_width, scaled_height,
req->dpi/72, 0, pixbuf);
+ }
g_object_unref(pdfpage);
set_cursor_busy(FALSE);
}
/* make a request */
-void add_bgpdf_request(int pageno, double zoom)
+gboolean add_bgpdf_request(int pageno, double zoom)
{
struct BgPdfRequest *req, *cmp_req;
GList *list;
-
+
if (bgpdf.status == STATUS_NOT_INIT)
- return; // don't accept requests
+ return FALSE; // don't accept requests
req = g_new(struct BgPdfRequest, 1);
req->pageno = pageno;
req->dpi = 72*zoom;
// make the request
bgpdf.requests = g_list_append(bgpdf.requests, req);
if (!bgpdf.pid) bgpdf.pid = g_idle_add(bgpdf_scheduler_callback, NULL);
+ return TRUE;
}
/* shutdown the PDF reader */
struct Page *pg;
PopplerPage *pdfpage;
gdouble width, height;
+ gchar *uri;
if (bgpdf.status != STATUS_NOT_INIT) return FALSE;
bgpdf.pid = 0;
bgpdf.has_failed = FALSE;
- bgpdf.document = poppler_document_new_from_data(bgpdf.file_contents, bgpdf.file_length, NULL, NULL);
- if (bgpdf.document == NULL) shutdown_bgpdf();
+/* poppler_document_new_from_data() starts at 0.6.1, but we want to
+ be compatible with poppler 0.5.4 = latest in CentOS as of sept 2009 */
+ uri = g_filename_to_uri(pdfname, NULL, NULL);
+ if (!uri) uri = g_strdup_printf("file://%s", pdfname);
+ bgpdf.document = poppler_document_new_from_file(uri, NULL, NULL);
+ g_free(uri);
+/* with poppler 0.6.1 or later, can replace the above 4 lines by:
+ bgpdf.document = poppler_document_new_from_data(bgpdf.file_contents,
+ bgpdf.file_length, NULL, NULL);
+*/
+ if (bgpdf.document == NULL) { shutdown_bgpdf(); return FALSE; }
+
+ if (pdfname[0]=='/' && ui.filename == NULL) {
+ if (ui.default_path!=NULL) g_free(ui.default_path);
+ ui.default_path = g_path_get_dirname(pdfname);
+ }
if (!create_pages) return TRUE; // we're done
for (i=0; i<MRU_SIZE; i++) {
if (ui.mru[i]!=NULL) {
- tmp = g_strdup_printf("_%d %s", i+1, g_basename(ui.mru[i]));
+ tmp = g_strdup_printf("_%d %s", i+1,
+ g_strjoinv("__", g_strsplit_set(g_basename(ui.mru[i]),"_",-1)));
gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(ui.mrumenu[i]))),
tmp);
g_free(tmp);
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.pressure_sensitivity = FALSE;
ui.width_minimum_multiplier = 0.0;
ui.width_maximum_multiplier = 1.25;
+ ui.button_switch_mapping = FALSE;
+ ui.autoload_pdf_xoj = FALSE;
+ ui.poppler_force_cairo = FALSE;
// the default UI vertical order
ui.vertical_order[0][0] = 1;
update_keyval("general", "use_erasertip",
_(" always map eraser tip to eraser (true/false)"),
g_strdup(ui.use_erasertip?"true":"false"));
+ update_keyval("general", "buttons_switch_mappings",
+ _(" buttons 2 and 3 switch mappings instead of drawing (useful for some tablets) (true/false)"),
+ g_strdup(ui.button_switch_mapping?"true":"false"));
+ update_keyval("general", "autoload_pdf_xoj",
+ _(" automatically load filename.pdf.xoj instead of filename.pdf (true/false)"),
+ g_strdup(ui.autoload_pdf_xoj?"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", "autosave_prefs",
_(" auto-save preferences on exit (true/false)"),
g_strdup(ui.auto_save_prefs?"true":"false"));
+ update_keyval("general", "poppler_force_cairo",
+ _(" force PDF rendering through cairo (slower but nicer) (true/false)"),
+ g_strdup(ui.poppler_force_cairo?"true":"false"));
update_keyval("paper", "width",
_(" the default page width, 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]));
+ (ui.default_page.bg->color_no>=0)?
+ g_strdup(bgcolor_names[ui.default_page.bg->color_no]):
+ g_strdup_printf("#%08x", ui.default_page.bg->color_rgba));
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", "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",
_(" just-in-time update of page backgrounds (true/false)"),
g_strdup(ui.progressive_bg?"true":"false"));
g_strdup(tool_names[ui.startuptool]));
update_keyval("tools", "pen_color",
_(" default pen color"),
- g_strdup(color_names[ui.default_brushes[TOOL_PEN].color_no]));
+ (ui.default_brushes[TOOL_PEN].color_no>=0)?
+ g_strdup(color_names[ui.default_brushes[TOOL_PEN].color_no]):
+ g_strdup_printf("#%08x", ui.default_brushes[TOOL_PEN].color_rgba));
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));
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]));
+ (ui.default_brushes[TOOL_HIGHLIGHTER].color_no>=0)?
+ g_strdup(color_names[ui.default_brushes[TOOL_HIGHLIGHTER].color_no]):
+ g_strdup_printf("#%08x", ui.default_brushes[TOOL_HIGHLIGHTER].color_rgba));
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));
g_strdup((ui.linked_brush[1]==BRUSH_LINKED)?"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"));
+ (ui.toolno[1]<NUM_STROKE_TOOLS)?
+ ((ui.brushes[1][ui.toolno[1]].color_no>=0)?
+ g_strdup(color_names[ui.brushes[1][ui.toolno[1]].color_no]):
+ g_strdup_printf("#%08x", ui.brushes[1][ui.toolno[1]].color_rgba)):
+ g_strdup("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)?
g_strdup((ui.linked_brush[2]==BRUSH_LINKED)?"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"));
+ (ui.toolno[2]<NUM_STROKE_TOOLS)?
+ ((ui.brushes[2][ui.toolno[2]].color_no>=0)?
+ g_strdup(color_names[ui.brushes[2][ui.toolno[2]].color_no]):
+ g_strdup_printf("#%08x", ui.brushes[2][ui.toolno[2]].color_rgba)):
+ g_strdup("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)?
return FALSE;
}
+gboolean parse_keyval_enum_color(const gchar *group, const gchar *key, int *val, guint *val_rgba,
+ const char **names, const guint *predef_rgba, 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; *val_rgba = predef_rgba[i]; g_free(ret); return TRUE; }
+ }
+ if (ret[0]=='#') {
+ *val = COLOR_OTHER;
+ *val_rgba = strtoul(ret+1, NULL, 16);
+ g_free(ret);
+ return TRUE;
+ }
+ return FALSE;
+}
+
gboolean parse_keyval_boolean(const gchar *group, const gchar *key, gboolean *val)
{
gchar *ret;
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_boolean("general", "buttons_switch_mappings", &ui.button_switch_mapping);
+ parse_keyval_boolean("general", "autoload_pdf_xoj", &ui.autoload_pdf_xoj);
parse_keyval_string("general", "default_path", &ui.default_path);
parse_keyval_boolean("general", "pressure_sensitivity", &ui.pressure_sensitivity);
parse_keyval_float("general", "width_minimum_multiplier", &ui.width_minimum_multiplier, 0., 10.);
if (str!=NULL) { g_free(ui.shorten_menu_items); ui.shorten_menu_items = str; }
parse_keyval_float("general", "highlighter_opacity", &ui.hiliter_opacity, 0., 1.);
parse_keyval_boolean("general", "autosave_prefs", &ui.auto_save_prefs);
+ parse_keyval_boolean("general", "poppler_force_cairo", &ui.poppler_force_cairo);
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_color("paper", "color",
+ &(ui.default_page.bg->color_no), &(ui.default_page.bg->color_rgba),
+ bgcolor_names, predef_bgcolors_rgba, COLOR_MAX);
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_enum("tools", "startup_tool", &ui.startuptool, tool_names, NUM_TOOLS);
ui.toolno[0] = ui.startuptool;
- parse_keyval_enum("tools", "pen_color", &(ui.brushes[0][TOOL_PEN].color_no), color_names, COLOR_MAX);
+ parse_keyval_enum_color("tools", "pen_color",
+ &(ui.brushes[0][TOOL_PEN].color_no), &(ui.brushes[0][TOOL_PEN].color_rgba),
+ color_names, predef_colors_rgba, COLOR_MAX);
parse_keyval_int("tools", "pen_thickness", &(ui.brushes[0][TOOL_PEN].thickness_no), 0, 4);
parse_keyval_boolean("tools", "pen_ruler", &(ui.brushes[0][TOOL_PEN].ruler));
parse_keyval_boolean("tools", "pen_recognizer", &(ui.brushes[0][TOOL_PEN].recognizer));
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_enum_color("tools", "highlighter_color",
+ &(ui.brushes[0][TOOL_HIGHLIGHTER].color_no), &(ui.brushes[0][TOOL_HIGHLIGHTER].color_rgba),
+ color_names, predef_colors_rgba, COLOR_MAX);
parse_keyval_int("tools", "highlighter_thickness", &(ui.brushes[0][TOOL_HIGHLIGHTER].thickness_no), 0, 4);
parse_keyval_boolean("tools", "highlighter_ruler", &(ui.brushes[0][TOOL_HIGHLIGHTER].ruler));
parse_keyval_boolean("tools", "highlighter_recognizer", &(ui.brushes[0][TOOL_HIGHLIGHTER].recognizer));
if (ui.toolno[1]==TOOL_PEN || ui.toolno[1]==TOOL_HIGHLIGHTER) {
parse_keyval_boolean("tools", "btn2_ruler", &(ui.brushes[1][ui.toolno[1]].ruler));
parse_keyval_boolean("tools", "btn2_recognizer", &(ui.brushes[1][ui.toolno[1]].recognizer));
- parse_keyval_enum("tools", "btn2_color", &(ui.brushes[1][ui.toolno[1]].color_no), color_names, COLOR_MAX);
+ parse_keyval_enum_color("tools", "btn2_color",
+ &(ui.brushes[1][ui.toolno[1]].color_no), &(ui.brushes[1][ui.toolno[1]].color_rgba),
+ color_names, predef_colors_rgba, 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[2]==TOOL_PEN || ui.toolno[2]==TOOL_HIGHLIGHTER) {
parse_keyval_boolean("tools", "btn3_ruler", &(ui.brushes[2][ui.toolno[2]].ruler));
parse_keyval_boolean("tools", "btn3_recognizer", &(ui.brushes[2][ui.toolno[2]].recognizer));
- parse_keyval_enum("tools", "btn3_color", &(ui.brushes[2][ui.toolno[2]].color_no), color_names, COLOR_MAX);
+ parse_keyval_enum_color("tools", "btn3_color",
+ &(ui.brushes[2][ui.toolno[2]].color_no), &(ui.brushes[2][ui.toolno[2]].color_rgba),
+ color_names, predef_colors_rgba, 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);
projects / xournal.git / blobdiff