+/*
+ * 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"
#include "xo-misc.h"
#include "xo-file.h"
#include "xo-paint.h"
+#include "xo-image.h"
-const char *tool_names[NUM_TOOLS] = {"pen", "eraser", "highlighter", "text", "", "selectrect", "vertspace", "hand"};
+const char *tool_names[NUM_TOOLS] = {"pen", "eraser", "highlighter", "text", "", "selectrect", "vertspace", "hand", "image"};
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"};
}
}
+/* Write image to file: returns true on success, false on error.
+ The image is written as a base64 encoded PNG. */
+
+gboolean write_image(gzFile f, Item *item)
+{
+ gchar *base64_str;
+
+ if (item->image_png == NULL) {
+ if (!gdk_pixbuf_save_to_buffer(item->image, &item->image_png, &item->image_png_len, "png", NULL, NULL)) {
+ item->image_png_len = 0; // failed for some reason, so forget it
+ return FALSE;
+ }
+ }
+
+ base64_str = g_base64_encode(item->image_png, item->image_png_len);
+ gzputs(f, base64_str);
+ g_free(base64_str);
+ return TRUE;
+}
+
+// create pixbuf from base64 encoded PNG, or return NULL on failure
+
+GdkPixbuf *read_pixbuf(const gchar *base64_str, gsize base64_strlen)
+{
+ gchar *base64_str2;
+ gchar *png_buf;
+ gsize png_buflen;
+ GdkPixbuf *pixbuf;
+
+ // We have to copy the string in order to null terminate it, sigh.
+ base64_str2 = g_memdup(base64_str, base64_strlen+1);
+ base64_str2[base64_strlen] = 0;
+ png_buf = g_base64_decode(base64_str2, &png_buflen);
+
+ pixbuf = pixbuf_from_buffer(png_buf, png_buflen);
+
+ g_free(png_buf);
+ g_free(base64_str2);
+ return pixbuf;
+}
+
// saves the journal to a file: returns true on success, false on error
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();
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);
}
+ if (item->type == ITEM_IMAGE) {
+ gzprintf(f, "<image left=\"%.2f\" top=\"%.2f\" right=\"%.2f\" bottom=\"%.2f\">",
+ item->bbox.left, item->bbox.top, item->bbox.right, item->bbox.bottom);
+ if (!write_image(f, item)) success = FALSE;
+ gzprintf(f, "</image>\n");
+ }
}
gzprintf(f, "</layer>\n");
}
// 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()
}
if (has_attr!=31) *error = xoj_invalid();
}
+ else if (!strcmp(element_name, "image")) { // start of a image item
+ if (tmpLayer == NULL || tmpItem != NULL) {
+ *error = xoj_invalid();
+ return;
+ }
+ tmpItem = (struct Item *)g_malloc0(sizeof(struct Item));
+ tmpItem->type = ITEM_IMAGE;
+ tmpItem->canvas_item = NULL;
+ tmpItem->image=NULL;
+ tmpItem->image_png = NULL;
+ tmpItem->image_png_len = 0;
+ tmpLayer->items = g_list_append(tmpLayer->items, tmpItem);
+ tmpLayer->nitems++;
+ // scan for x, y
+ has_attr = 0;
+ while (*attribute_names!=NULL) {
+ if (!strcmp(*attribute_names, "left")) {
+ if (has_attr & 1) *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 |= 1;
+ }
+ else if (!strcmp(*attribute_names, "top")) {
+ if (has_attr & 2) *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 |= 2;
+ }
+ else if (!strcmp(*attribute_names, "right")) {
+ if (has_attr & 4) *error = xoj_invalid();
+ cleanup_numeric((gchar *)*attribute_values);
+ tmpItem->bbox.right = g_ascii_strtod(*attribute_values, &ptr);
+ if (ptr == *attribute_values) *error = xoj_invalid();
+ has_attr |= 4;
+ }
+ else if (!strcmp(*attribute_names, "bottom")) {
+ if (has_attr & 8) *error = xoj_invalid();
+ cleanup_numeric((gchar *)*attribute_values);
+ tmpItem->bbox.bottom = g_ascii_strtod(*attribute_values, &ptr);
+ if (ptr == *attribute_values) *error = xoj_invalid();
+ has_attr |= 8;
+ }
+ else *error = xoj_invalid();
+ attribute_names++;
+ attribute_values++;
+ }
+ if (has_attr!=15) *error = xoj_invalid();
+ }
}
void xoj_parser_end_element(GMarkupParseContext *context,
}
tmpItem = NULL;
}
+ if (!strcmp(element_name, "image")) {
+ if (tmpItem == NULL) {
+ *error = xoj_invalid();
+ return;
+ }
+ tmpItem = NULL;
+ }
}
void xoj_parser_text(GMarkupParseContext *context,
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;
}
g_memmove(tmpItem->text, text, text_len);
tmpItem->text[text_len]=0;
}
+ if (!strcmp(element_name, "image")) {
+ tmpItem->image = read_pixbuf(text, text_len);
+ }
}
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, "*");
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.print_ruling = TRUE;
ui.default_unit = UNIT_CM;
ui.default_path = NULL;
+ ui.default_image = NULL;
ui.default_font_name = g_strdup(DEFAULT_FONT);
ui.default_font_size = DEFAULT_FONT_SIZE;
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", "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)"),
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.);
projects / xournal.git / blobdiff