X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fxo-file.c;h=6a1a659750ec5d6bdad3885817a97cc4b4d1f03e;hb=9c25532eb22532c2766b5a894ccd73c6cb8b407a;hp=1ae30fc15317551b3e140f3aba780223a1ebc5f7;hpb=881e9a45693f4d724512fdc5297ba312d447851b;p=xournal.git diff --git a/src/xo-file.c b/src/xo-file.c index 1ae30fc..6a1a659 100644 --- a/src/xo-file.c +++ b/src/xo-file.c @@ -11,13 +11,16 @@ #include #include #include -#include -#include #include #include #include #include +#ifndef WIN32 + #include + #include +#endif + #include "xournal.h" #include "xo-interface.h" #include "xo-support.h" @@ -83,7 +86,7 @@ gboolean save_journal(const char *filename) GList *pagelist, *layerlist, *itemlist, *list; GtkWidget *dialog; - f = gzopen(filename, "w"); + f = gzopen(filename, "wb"); if (f==NULL) return FALSE; chk_attach_names(); @@ -143,7 +146,7 @@ gboolean save_journal(const char *filename) 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); @@ -196,7 +199,9 @@ gboolean save_journal(const char *filename) else gzprintf(f, "#%08x", item->brush.color_rgba); tmpstr = g_markup_escape_text(item->text, -1); - gzprintf(f, "\">%s\n", tmpstr); + gzputs(f, "\">"); + gzputs(f, tmpstr); // gzprintf() can't handle > 4095 bytes + gzputs(f, "\n"); g_free(tmpstr); } } @@ -219,6 +224,7 @@ gboolean close_journal(void) // free everything... reset_selection(); + reset_recognizer(); clear_redo_stack(); clear_undo_stack(); @@ -664,7 +670,10 @@ gboolean user_wants_second_chance(char **filename) 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, "*"); @@ -674,6 +683,8 @@ gboolean user_wants_second_chance(char **filename) 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; @@ -696,11 +707,25 @@ gboolean open_journal(char *filename) 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; @@ -755,7 +780,21 @@ gboolean open_journal(char *filename) 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); @@ -830,7 +869,7 @@ GList *attempt_load_gv_bg(char *filename) 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 || @@ -842,7 +881,7 @@ GList *attempt_load_gv_bg(char *filename) 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; @@ -888,6 +927,7 @@ GList *attempt_load_gv_bg(char *filename) struct Background *attempt_screenshot_bg(void) { +#ifndef WIN32 struct Background *bg; GdkPixbuf *pix; XEvent x_event; @@ -924,6 +964,10 @@ struct Background *attempt_screenshot_bg(void) bg->filename = new_refstring(NULL); bg->file_domain = DOMAIN_ATTACH; return bg; +#else + // not implemented under WIN32 + return FALSE; +#endif } /************** pdf annotation ***************/ @@ -952,6 +996,8 @@ gboolean bgpdf_scheduler_callback(gpointer data) 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; } @@ -969,11 +1015,26 @@ gboolean bgpdf_scheduler_callback(gpointer data) 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); } @@ -1011,13 +1072,13 @@ gboolean bgpdf_scheduler_callback(gpointer data) /* 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; @@ -1033,6 +1094,7 @@ void add_bgpdf_request(int pageno, double 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 */ @@ -1081,6 +1143,7 @@ gboolean init_bgpdf(char *pdfname, gboolean create_pages, int file_domain) struct Page *pg; PopplerPage *pdfpage; gdouble width, height; + gchar *uri; if (bgpdf.status != STATUS_NOT_INIT) return FALSE; @@ -1100,8 +1163,17 @@ gboolean init_bgpdf(char *pdfname, gboolean create_pages, int file_domain) 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); @@ -1299,6 +1371,8 @@ void init_config_default(void) 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; @@ -1431,6 +1505,9 @@ void save_config_to_file(void) 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:"")); @@ -1464,6 +1541,9 @@ void save_config_to_file(void) 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)"), @@ -1814,6 +1894,7 @@ void load_config_from_file(void) 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.); @@ -1827,6 +1908,7 @@ void load_config_from_file(void) 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.);