#include "ev-ps-exporter.h"
#include "ev-async-renderer.h"
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
-/* if POSIX O_NONBLOCK is not available, use O_NDELAY */
-#if !defined(O_NONBLOCK) && defined(O_NDELAY)
-# define O_NONBLOCK O_NDELAY
-#endif
-
#define MAX_BUFSIZE 1024
-#define PS_DOCUMENT_IS_COMPRESSED(gs) (PS_DOCUMENT(gs)->gs_filename_unc != NULL)
-#define PS_DOCUMENT_GET_PS_FILE(gs) (PS_DOCUMENT_IS_COMPRESSED(gs) ? \
- PS_DOCUMENT(gs)->gs_filename_unc : \
- PS_DOCUMENT(gs)->gs_filename)
+#define PS_DOCUMENT_IS_COMPRESSED(gs) (PS_DOCUMENT(gs)->gs_filename_unc != NULL)
+#define PS_DOCUMENT_GET_PS_FILE(gs) (PS_DOCUMENT_IS_COMPRESSED(gs) ? \
+ PS_DOCUMENT(gs)->gs_filename_unc : \
+ PS_DOCUMENT(gs)->gs_filename)
/* structure to describe section of file to send to ghostscript */
-struct record_list {
- FILE *fp;
- long begin;
- guint len;
- gboolean seek_needed;
- gboolean close;
- struct record_list *next;
+struct record_list
+{
+ FILE *fp;
+ long begin;
+ guint len;
+ gboolean seek_needed;
+ gboolean close;
+ struct record_list *next;
};
-typedef struct {
- int page;
- double scale;
- PSDocument *document;
-} PSRenderJob;
-
static gboolean broken_pipe = FALSE;
/* Forward declarations */
-static void ps_document_init(PSDocument * gs);
-static void ps_document_class_init(PSDocumentClass * klass);
-static void send_ps(PSDocument * gs, long begin, unsigned int len, gboolean close);
-static void close_pipe(int p[2]);
-static void output(gpointer data, gint source, GdkInputCondition condition);
-static void input(gpointer data, gint source, GdkInputCondition condition);
-static void stop_interpreter(PSDocument * gs);
-static gint start_interpreter(PSDocument * gs);
-static void ps_document_document_iface_init (EvDocumentIface *iface);
-static void ps_document_ps_exporter_iface_init (EvPSExporterIface *iface);
-static void ps_async_renderer_iface_init (EvAsyncRendererIface *iface);
-static gboolean ps_document_widget_event (GtkWidget *widget, GdkEvent *event, gpointer data);
+static void ps_document_init (PSDocument *gs);
+static void ps_document_class_init (PSDocumentClass *klass);
+static void send_ps (PSDocument *gs,
+ long begin,
+ unsigned int len,
+ gboolean close);
+static void output (gpointer data,
+ gint source,
+ GdkInputCondition condition);
+static void input (gpointer data,
+ gint source,
+ GdkInputCondition condition);
+static void stop_interpreter (PSDocument *gs);
+static gint start_interpreter (PSDocument *gs);
+static void ps_document_document_iface_init (EvDocumentIface *iface);
+static void ps_document_ps_exporter_iface_init (EvPSExporterIface *iface);
+static void ps_async_renderer_iface_init (EvAsyncRendererIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (PSDocument, ps_document, G_TYPE_OBJECT,
+ {
+ G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT,
+ ps_document_document_iface_init);
+ G_IMPLEMENT_INTERFACE (EV_TYPE_PS_EXPORTER,
+ ps_document_ps_exporter_iface_init);
+ G_IMPLEMENT_INTERFACE (EV_TYPE_ASYNC_RENDERER,
+ ps_async_renderer_iface_init);
+ });
static GObjectClass *parent_class = NULL;
-
static PSDocumentClass *gs_class = NULL;
static void
gs->send_filename_to_gs = FALSE;
gs->doc = NULL;
- gs->loaded = FALSE;
gs->interpreter_input = -1;
gs->interpreter_output = -1;
gs->input_buffer = NULL;
}
+ if (gs->target_window) {
+ gtk_widget_destroy (gs->target_window);
+ gs->target_window = NULL;
+ gs->pstarget = NULL;
+ }
+
stop_interpreter (gs);
G_OBJECT_CLASS (parent_class)->dispose (object);
cmap = gdk_window_get_colormap (gs->pstarget);
gdk_drawable_get_size (gs->bpixmap, &width, &height);
+ LOG ("Get from drawable\n");
pixbuf = gdk_pixbuf_get_from_drawable (NULL, gs->bpixmap, cmap,
0, 0, 0, 0,
width, height);
+ LOG ("Get from drawable done\n");
g_signal_emit_by_name (gs, "render_finished", pixbuf);
g_object_unref (pixbuf);
}
gs->busy = FALSE;
push_pixbuf (gs);
+ LOG ("Pixbuf pushed");
}
return TRUE;
}
static void
-send_ps(PSDocument * gs, long begin, unsigned int len, gboolean close)
+send_ps (PSDocument *gs, long begin, unsigned int len, gboolean close)
{
- struct record_list *ps_new;
-
- if(gs->interpreter_input < 0) {
- g_critical("No pipe to gs: error in send_ps().");
- return;
- }
-
- ps_new = (struct record_list *) g_malloc(sizeof(struct record_list));
- ps_new->fp = gs->gs_psfile;
- ps_new->begin = begin;
- ps_new->len = len;
- ps_new->seek_needed = TRUE;
- ps_new->close = close;
- ps_new->next = NULL;
-
- if(gs->input_buffer == NULL) {
- gs->input_buffer = g_malloc(MAX_BUFSIZE);
- }
-
- if(gs->ps_input == NULL) {
- gs->input_buffer_ptr = gs->input_buffer;
- gs->bytes_left = len;
- gs->buffer_bytes_left = 0;
- gs->ps_input = ps_new;
- gs->interpreter_input_id =
- gdk_input_add(gs->interpreter_input, GDK_INPUT_WRITE, input, gs);
- }
- else {
- struct record_list *p = gs->ps_input;
- while(p->next != NULL) {
- p = p->next;
- }
- p->next = ps_new;
- }
+ struct record_list *ps_new;
+
+ if (gs->interpreter_input < 0) {
+ g_critical("No pipe to gs: error in send_ps().");
+ return;
+ }
+
+ ps_new = g_new0 (struct record_list, 1);
+ ps_new->fp = gs->gs_psfile;
+ ps_new->begin = begin;
+ ps_new->len = len;
+ ps_new->seek_needed = TRUE;
+ ps_new->close = close;
+ ps_new->next = NULL;
+
+ if (gs->input_buffer == NULL) {
+ gs->input_buffer = g_malloc(MAX_BUFSIZE);
+ }
+
+ if (gs->ps_input == NULL) {
+ gs->input_buffer_ptr = gs->input_buffer;
+ gs->bytes_left = len;
+ gs->buffer_bytes_left = 0;
+ gs->ps_input = ps_new;
+ gs->interpreter_input_id = gdk_input_add
+ (gs->interpreter_input, GDK_INPUT_WRITE, input, gs);
+ } else {
+ struct record_list *p = gs->ps_input;
+ while (p->next != NULL) {
+ p = p->next;
+ }
+ p->next = ps_new;
+ }
}
static float
}
static void
-setup_pixmap (PSDocument *gs, int page, double scale)
+setup_pixmap (PSDocument *gs, int page, double scale, int rotation)
{
GdkGC *fill;
GdkColor white = { 0, 0xFFFF, 0xFFFF, 0xFFFF }; /* pixel, r, g, b */
int pixmap_width, pixmap_height;
ev_document_get_page_size (EV_DOCUMENT (gs), page, &width, &height);
- pixmap_width = width * scale + 0.5;
- pixmap_height = height * scale + 0.5;
+
+ if (rotation == 90 || rotation == 270) {
+ pixmap_height = width * scale + 0.5;
+ pixmap_width = height * scale + 0.5;
+ } else {
+ pixmap_width = width * scale + 0.5;
+ pixmap_height = height * scale + 0.5;
+ }
if(gs->bpixmap) {
int w, h;
static void
get_page_box (PSDocument *gs, int page, int *urx, int *ury, int *llx, int *lly)
{
- gint new_llx = 0;
- gint new_lly = 0;
- gint new_urx = 0;
- gint new_ury = 0;
- GtkGSPaperSize *papersizes = gtk_gs_defaults_get_paper_sizes();
- int new_pagesize = -1;
-
- g_return_if_fail(PS_IS_DOCUMENT(gs));
-
- if(new_pagesize == -1) {
- new_pagesize = DEFAULT_PAGE_SIZE;
- if(gs->doc) {
- /* If we have a document:
- We use -- the page size (if specified)
- or the doc. size (if specified)
- or the page bbox (if specified)
- or the bounding box
- */
- if((page >= 0) && (gs->doc->numpages > page) &&
- (gs->doc->pages) && (gs->doc->pages[page].size)) {
- new_pagesize = gs->doc->pages[page].size - gs->doc->size;
- }
- else if(gs->doc->default_page_size != NULL) {
- new_pagesize = gs->doc->default_page_size - gs->doc->size;
- }
- else if((page >= 0) &&
- (gs->doc->numpages > page) &&
- (gs->doc->pages) &&
- (gs->doc->pages[page].boundingbox[URX] >
- gs->doc->pages[page].boundingbox[LLX]) &&
- (gs->doc->pages[page].boundingbox[URY] >
- gs->doc->pages[page].boundingbox[LLY])) {
- new_pagesize = -1;
- }
- else if((gs->doc->boundingbox[URX] > gs->doc->boundingbox[LLX]) &&
- (gs->doc->boundingbox[URY] > gs->doc->boundingbox[LLY])) {
- new_pagesize = -1;
- }
- }
- }
-
- /* Compute bounding box */
- if(gs->doc && (gs->doc->epsf || new_pagesize == -1)) { /* epsf or bbox */
- if((page >= 0) &&
- (gs->doc->pages) &&
- (gs->doc->pages[page].boundingbox[URX] >
- gs->doc->pages[page].boundingbox[LLX])
- && (gs->doc->pages[page].boundingbox[URY] >
- gs->doc->pages[page].boundingbox[LLY])) {
- /* use page bbox */
- new_llx = gs->doc->pages[page].boundingbox[LLX];
- new_lly = gs->doc->pages[page].boundingbox[LLY];
- new_urx = gs->doc->pages[page].boundingbox[URX];
- new_ury = gs->doc->pages[page].boundingbox[URY];
- }
- else if((gs->doc->boundingbox[URX] > gs->doc->boundingbox[LLX]) &&
- (gs->doc->boundingbox[URY] > gs->doc->boundingbox[LLY])) {
- /* use doc bbox */
- new_llx = gs->doc->boundingbox[LLX];
- new_lly = gs->doc->boundingbox[LLY];
- new_urx = gs->doc->boundingbox[URX];
- new_ury = gs->doc->boundingbox[URY];
- }
- }
- else {
- if(new_pagesize < 0)
- new_pagesize = DEFAULT_PAGE_SIZE;
- new_llx = new_lly = 0;
- if(gs->doc && gs->doc->size &&
- (new_pagesize < gs->doc->numsizes)) {
- new_urx = gs->doc->size[new_pagesize].width;
- new_ury = gs->doc->size[new_pagesize].height;
- }
- else {
- new_urx = papersizes[new_pagesize].width;
- new_ury = papersizes[new_pagesize].height;
- }
- }
-
- if(new_urx <= new_llx)
- new_urx = papersizes[12].width;
- if(new_ury <= new_lly)
- new_ury = papersizes[12].height;
-
- *urx = new_urx;
- *ury = new_ury;
- *llx = new_llx;
- *lly = new_lly;
-}
-
-static int
-get_page_orientation (PSDocument *gs, int page)
-{
- int orientation;
-
- orientation = GTK_GS_ORIENTATION_NONE;
-
- if (gs->structured_doc) {
- orientation = gs->doc->pages[page].orientation;
- }
- if (orientation == GTK_GS_ORIENTATION_NONE) {
- orientation = gs->doc->default_page_orientation;
- }
- if (orientation == GTK_GS_ORIENTATION_NONE) {
- orientation = gs->doc->orientation;
+ gint new_llx = 0;
+ gint new_lly = 0;
+ gint new_urx = 0;
+ gint new_ury = 0;
+ GtkGSPaperSize *papersizes = gtk_gs_defaults_get_paper_sizes ();
+ int new_pagesize = -1;
+
+ g_return_if_fail (PS_IS_DOCUMENT (gs));
+
+ if (new_pagesize == -1) {
+ new_pagesize = DEFAULT_PAGE_SIZE;
+ if (gs->doc) {
+ /* If we have a document:
+ * We use -- the page size (if specified)
+ * or the doc. size (if specified)
+ * or the page bbox (if specified)
+ * or the bounding box
+ */
+ if ((page >= 0) && (gs->doc->numpages > page) &&
+ (gs->doc->pages) && (gs->doc->pages[page].size)) {
+ new_pagesize = gs->doc->pages[page].size - gs->doc->size;
+ } else if (gs->doc->default_page_size != NULL) {
+ new_pagesize = gs->doc->default_page_size - gs->doc->size;
+ } else if ((page >= 0) &&
+ (gs->doc->numpages > page) &&
+ (gs->doc->pages) &&
+ (gs->doc->pages[page].boundingbox[URX] >
+ gs->doc->pages[page].boundingbox[LLX]) &&
+ (gs->doc->pages[page].boundingbox[URY] >
+ gs->doc->pages[page].boundingbox[LLY])) {
+ new_pagesize = -1;
+ } else if ((gs->doc->boundingbox[URX] > gs->doc->boundingbox[LLX]) &&
+ (gs->doc->boundingbox[URY] > gs->doc->boundingbox[LLY])) {
+ new_pagesize = -1;
+ }
+ }
}
- if (orientation == GTK_GS_ORIENTATION_NONE) {
- orientation = GTK_GS_ORIENTATION_PORTRAIT;
+
+ /* Compute bounding box */
+ if (gs->doc && (gs->doc->epsf || new_pagesize == -1)) { /* epsf or bbox */
+ if ((page >= 0) &&
+ (gs->doc->pages) &&
+ (gs->doc->pages[page].boundingbox[URX] >
+ gs->doc->pages[page].boundingbox[LLX]) &&
+ (gs->doc->pages[page].boundingbox[URY] >
+ gs->doc->pages[page].boundingbox[LLY])) {
+ /* use page bbox */
+ new_llx = gs->doc->pages[page].boundingbox[LLX];
+ new_lly = gs->doc->pages[page].boundingbox[LLY];
+ new_urx = gs->doc->pages[page].boundingbox[URX];
+ new_ury = gs->doc->pages[page].boundingbox[URY];
+ } else if ((gs->doc->boundingbox[URX] > gs->doc->boundingbox[LLX]) &&
+ (gs->doc->boundingbox[URY] > gs->doc->boundingbox[LLY])) {
+ /* use doc bbox */
+ new_llx = gs->doc->boundingbox[LLX];
+ new_lly = gs->doc->boundingbox[LLY];
+ new_urx = gs->doc->boundingbox[URX];
+ new_ury = gs->doc->boundingbox[URY];
+ }
+ } else {
+ if (new_pagesize < 0)
+ new_pagesize = DEFAULT_PAGE_SIZE;
+ new_llx = new_lly = 0;
+ if (gs->doc && gs->doc->size &&
+ (new_pagesize < gs->doc->numsizes)) {
+ new_urx = gs->doc->size[new_pagesize].width;
+ new_ury = gs->doc->size[new_pagesize].height;
+ } else {
+ new_urx = papersizes[new_pagesize].width;
+ new_ury = papersizes[new_pagesize].height;
+ }
}
- return orientation;
+ if (new_urx <= new_llx)
+ new_urx = papersizes[12].width;
+ if (new_ury <= new_lly)
+ new_ury = papersizes[12].height;
+
+ *urx = new_urx;
+ *ury = new_ury;
+ *llx = new_llx;
+ *lly = new_lly;
}
static void
-setup_page (PSDocument *gs, int page, double scale)
+setup_page (PSDocument *gs, int page, double scale, int rotation)
{
- char buf[1024];
- int urx, ury, llx, lly, orientation;
-#ifdef HAVE_LOCALE_H
- char *savelocale;
-#endif
+ gchar *buf;
+ char scaled_xdpi[G_ASCII_DTOSTR_BUF_SIZE];
+ char scaled_ydpi[G_ASCII_DTOSTR_BUF_SIZE];
+ int urx, ury, llx, lly;
LOG ("Setup the page");
-#ifdef HAVE_LOCALE_H
- /* gs needs floating point parameters with '.' as decimal point
- * while some (european) locales use ',' instead, so we set the
- * locale for this snprintf to "C".
- */
- savelocale = setlocale (LC_NUMERIC, "C");
-#endif
get_page_box (gs, page, &urx, &ury, &llx, &lly);
- orientation = get_page_orientation (gs, page);
+ g_ascii_dtostr (scaled_xdpi, G_ASCII_DTOSTR_BUF_SIZE, get_xdpi (gs) * scale);
+ g_ascii_dtostr (scaled_ydpi, G_ASCII_DTOSTR_BUF_SIZE, get_ydpi (gs) * scale);
- g_snprintf (buf, 1024, "%ld %d %d %d %d %d %f %f %d %d %d %d",
- 0L, orientation * 90, llx, lly, urx, ury,
- get_xdpi (gs) * scale,
- get_ydpi (gs) * scale,
- 0, 0, 0, 0);
+ buf = g_strdup_printf ("%ld %d %d %d %d %d %s %s %d %d %d %d",
+ 0L, rotation, llx, lly, urx, ury,
+ scaled_xdpi, scaled_ydpi,
+ 0, 0, 0, 0);
LOG ("GS property %s", buf);
-#ifdef HAVE_LOCALE_H
- setlocale(LC_NUMERIC, savelocale);
-#endif
gdk_property_change (gs->pstarget, gs_class->gs_atom, gs_class->string_atom,
8, GDK_PROP_MODE_REPLACE, (guchar *)buf, strlen(buf));
+ g_free (buf);
+
gdk_flush ();
}
}
static void
-output(gpointer data, gint source, GdkInputCondition condition)
+output (gpointer data, gint source, GdkInputCondition condition)
{
- char buf[MAX_BUFSIZE + 1];
- guint bytes = 0;
- PSDocument *gs = PS_DOCUMENT(data);
-
- if(source == gs->interpreter_output) {
- bytes = read(gs->interpreter_output, buf, MAX_BUFSIZE);
- if(bytes == 0) { /* EOF occurred */
- close(gs->interpreter_output);
- gs->interpreter_output = -1;
- gdk_input_remove(gs->interpreter_output_id);
- return;
- }
- else if(bytes == -1) {
- /* trouble... */
- interpreter_failed(gs, NULL);
- return;
- }
- if(gs->interpreter_err == -1) {
- interpreter_failed(gs, NULL);
- }
- }
- else if(source == gs->interpreter_err) {
- bytes = read(gs->interpreter_err, buf, MAX_BUFSIZE);
- if(bytes == 0) { /* EOF occurred */
- close(gs->interpreter_err);
- gs->interpreter_err = -1;
- gdk_input_remove(gs->interpreter_error_id);
- return;
- }
- else if(bytes == -1) {
- /* trouble... */
- interpreter_failed(gs, NULL);
- return;
- }
- if(gs->interpreter_output == -1) {
- interpreter_failed(gs, NULL);
- }
- }
- if(bytes > 0) {
- buf[bytes] = '\0';
- printf("%s", buf);
- }
+ char buf[MAX_BUFSIZE + 1];
+ guint bytes = 0;
+ PSDocument *gs = PS_DOCUMENT(data);
+
+ if (source == gs->interpreter_output) {
+ bytes = read(gs->interpreter_output, buf, MAX_BUFSIZE);
+ if (bytes == 0) { /* EOF occurred */
+ close (gs->interpreter_output);
+ gs->interpreter_output = -1;
+ gdk_input_remove (gs->interpreter_output_id);
+ return;
+ } else if (bytes == -1) {
+ /* trouble... */
+ interpreter_failed (gs, NULL);
+ return;
+ }
+ if (gs->interpreter_err == -1) {
+ interpreter_failed (gs, NULL);
+ }
+ } else if (source == gs->interpreter_err) {
+ bytes = read (gs->interpreter_err, buf, MAX_BUFSIZE);
+ if (bytes == 0) { /* EOF occurred */
+ close (gs->interpreter_err);
+ gs->interpreter_err = -1;
+ gdk_input_remove (gs->interpreter_error_id);
+ return;
+ } else if (bytes == -1) {
+ /* trouble... */
+ interpreter_failed (gs, NULL);
+ return;
+ }
+ if (gs->interpreter_output == -1) {
+ interpreter_failed(gs, NULL);
+ }
+ }
+
+ if (bytes > 0) {
+ buf[bytes] = '\0';
+ printf ("%s", buf);
+ }
}
static void
-catchPipe(int i)
+catchPipe (int i)
{
- broken_pipe = True;
+ broken_pipe = True;
}
static void
input(gpointer data, gint source, GdkInputCondition condition)
{
- PSDocument *gs = PS_DOCUMENT(data);
- int bytes_written;
- void (*oldsig) (int);
- oldsig = signal(SIGPIPE, catchPipe);
-
- LOG ("Input");
-
- do {
- if(gs->buffer_bytes_left == 0) {
- /* Get a new section if required */
- if(gs->ps_input && gs->bytes_left == 0) {
- struct record_list *ps_old = gs->ps_input;
- gs->ps_input = ps_old->next;
- if(ps_old->close && NULL != ps_old->fp)
- fclose(ps_old->fp);
- g_free((char *) ps_old);
- }
- /* Have to seek at the beginning of each section */
- if(gs->ps_input && gs->ps_input->seek_needed) {
- fseek(gs->ps_input->fp, gs->ps_input->begin, SEEK_SET);
- gs->ps_input->seek_needed = FALSE;
- gs->bytes_left = gs->ps_input->len;
- }
-
- if(gs->bytes_left > MAX_BUFSIZE) {
- gs->buffer_bytes_left =
- fread(gs->input_buffer, sizeof(char), MAX_BUFSIZE, gs->ps_input->fp);
- }
- else if(gs->bytes_left > 0) {
- gs->buffer_bytes_left =
- fread(gs->input_buffer,
- sizeof(char), gs->bytes_left, gs->ps_input->fp);
- }
- else {
- gs->buffer_bytes_left = 0;
- }
- if(gs->bytes_left > 0 && gs->buffer_bytes_left == 0) {
- interpreter_failed (gs, NULL); /* Error occurred */
- }
- gs->input_buffer_ptr = gs->input_buffer;
- gs->bytes_left -= gs->buffer_bytes_left;
- }
-
- if(gs->buffer_bytes_left > 0) {
- bytes_written = write(gs->interpreter_input,
- gs->input_buffer_ptr, gs->buffer_bytes_left);
-
- if(broken_pipe) {
- interpreter_failed (gs, g_strdup(_("Broken pipe.")));
- broken_pipe = FALSE;
- interpreter_failed (gs, NULL);
- }
- else if(bytes_written == -1) {
- if((errno != EWOULDBLOCK) && (errno != EAGAIN)) {
- interpreter_failed (gs, NULL); /* Something bad happened */
- }
- }
- else {
- gs->buffer_bytes_left -= bytes_written;
- gs->input_buffer_ptr += bytes_written;
- }
- }
- }
- while(gs->ps_input && gs->buffer_bytes_left == 0);
-
- signal(SIGPIPE, oldsig);
-
- if(gs->ps_input == NULL && gs->buffer_bytes_left == 0) {
- if(gs->interpreter_input_id != 0) {
- gdk_input_remove(gs->interpreter_input_id);
- gs->interpreter_input_id = 0;
- }
- }
+ PSDocument *gs = PS_DOCUMENT(data);
+ int bytes_written;
+ void (*oldsig) (int);
+ oldsig = signal(SIGPIPE, catchPipe);
+
+ LOG ("Input");
+
+ do {
+ if (gs->buffer_bytes_left == 0) {
+ /* Get a new section if required */
+ if (gs->ps_input && gs->bytes_left == 0) {
+ struct record_list *ps_old = gs->ps_input;
+ gs->ps_input = ps_old->next;
+ if (ps_old->close && NULL != ps_old->fp)
+ fclose (ps_old->fp);
+ g_free (ps_old);
+ }
+
+ /* Have to seek at the beginning of each section */
+ if (gs->ps_input && gs->ps_input->seek_needed) {
+ fseek (gs->ps_input->fp, gs->ps_input->begin, SEEK_SET);
+ gs->ps_input->seek_needed = FALSE;
+ gs->bytes_left = gs->ps_input->len;
+ }
+
+ if (gs->bytes_left > MAX_BUFSIZE) {
+ gs->buffer_bytes_left = fread (gs->input_buffer, sizeof(char),
+ MAX_BUFSIZE, gs->ps_input->fp);
+ } else if (gs->bytes_left > 0) {
+ gs->buffer_bytes_left = fread (gs->input_buffer, sizeof(char),
+ gs->bytes_left, gs->ps_input->fp);
+ } else {
+ gs->buffer_bytes_left = 0;
+ }
+ if (gs->bytes_left > 0 && gs->buffer_bytes_left == 0) {
+ interpreter_failed (gs, NULL); /* Error occurred */
+ }
+ gs->input_buffer_ptr = gs->input_buffer;
+ gs->bytes_left -= gs->buffer_bytes_left;
+ }
+
+ if (gs->buffer_bytes_left > 0) {
+ bytes_written = write (gs->interpreter_input,
+ gs->input_buffer_ptr, gs->buffer_bytes_left);
+
+ if (broken_pipe) {
+ interpreter_failed (gs, g_strdup(_("Broken pipe.")));
+ broken_pipe = FALSE;
+ interpreter_failed (gs, NULL);
+ } else if (bytes_written == -1) {
+ if ((errno != EWOULDBLOCK) && (errno != EAGAIN)) {
+ interpreter_failed (gs, NULL); /* Something bad happened */
+ }
+ } else {
+ gs->buffer_bytes_left -= bytes_written;
+ gs->input_buffer_ptr += bytes_written;
+ }
+ }
+ } while (gs->ps_input && gs->buffer_bytes_left == 0);
+
+ signal (SIGPIPE, oldsig);
+
+ if (gs->ps_input == NULL && gs->buffer_bytes_left == 0) {
+ if (gs->interpreter_input_id != 0) {
+ gdk_input_remove (gs->interpreter_input_id);
+ gs->interpreter_input_id = 0;
+ }
+ }
}
static int
#define NUM_GS_ARGS (NUM_ARGS - 20)
#define NUM_ALPHA_ARGS 10
- char *argv[NUM_ARGS], *dir, *gv_env;
+ char *argv[NUM_ARGS], *dir, *gv_env, *gs_path;
char **gs_args, **alpha_args = NULL;
int argc = 0, i;
stop_interpreter(gs);
/* set up the args... */
- gs_args = g_strsplit (gtk_gs_defaults_get_interpreter_cmd (), " ", NUM_GS_ARGS);
+ gs_path = g_find_program_in_path ("gs");
+ gs_args = g_strsplit (gs_path, " ", NUM_GS_ARGS);
+ g_free (gs_path);
for(i = 0; i < NUM_GS_ARGS && gs_args[i]; i++, argc++) {
argv[argc] = gs_args[i];
}
static void
stop_interpreter(PSDocument * gs)
{
- if(gs->interpreter_pid > 0) {
- int status = 0;
- LOG ("Stop the interpreter");
- kill(gs->interpreter_pid, SIGTERM);
- while((wait(&status) == -1) && (errno == EINTR)) ;
- gs->interpreter_pid = -1;
- if(status == 1) {
- gs->gs_status = _("Interpreter failed.");
- }
- }
-
- if(gs->interpreter_input >= 0) {
- close(gs->interpreter_input);
- gs->interpreter_input = -1;
- if(gs->interpreter_input_id != 0) {
- gdk_input_remove(gs->interpreter_input_id);
- gs->interpreter_input_id = 0;
- }
- while(gs->ps_input) {
- struct record_list *ps_old = gs->ps_input;
- gs->ps_input = gs->ps_input->next;
- if(ps_old->close && NULL != ps_old->fp)
- fclose(ps_old->fp);
- g_free((char *) ps_old);
- }
- }
-
- if(gs->interpreter_output >= 0) {
- close(gs->interpreter_output);
- gs->interpreter_output = -1;
- if(gs->interpreter_output_id) {
- gdk_input_remove(gs->interpreter_output_id);
- gs->interpreter_output_id = 0;
- }
- }
-
- if(gs->interpreter_err >= 0) {
- close(gs->interpreter_err);
- gs->interpreter_err = -1;
- if(gs->interpreter_error_id) {
- gdk_input_remove(gs->interpreter_error_id);
- gs->interpreter_error_id = 0;
- }
- }
-
- gs->busy = FALSE;
+ if (gs->interpreter_pid > 0) {
+ int status = 0;
+ LOG ("Stop the interpreter");
+ kill (gs->interpreter_pid, SIGTERM);
+ while ((wait(&status) == -1) && (errno == EINTR));
+ gs->interpreter_pid = -1;
+ if (status == 1) {
+ gs->gs_status = _("Interpreter failed.");
+ }
+ }
+
+ if (gs->interpreter_input >= 0) {
+ close (gs->interpreter_input);
+ gs->interpreter_input = -1;
+ if (gs->interpreter_input_id != 0) {
+ gdk_input_remove(gs->interpreter_input_id);
+ gs->interpreter_input_id = 0;
+ }
+ while (gs->ps_input) {
+ struct record_list *ps_old = gs->ps_input;
+ gs->ps_input = gs->ps_input->next;
+ if (ps_old->close && NULL != ps_old->fp)
+ fclose (ps_old->fp);
+ g_free (ps_old);
+ }
+ }
+
+ if (gs->interpreter_output >= 0) {
+ close (gs->interpreter_output);
+ gs->interpreter_output = -1;
+ if (gs->interpreter_output_id) {
+ gdk_input_remove (gs->interpreter_output_id);
+ gs->interpreter_output_id = 0;
+ }
+ }
+
+ if (gs->interpreter_err >= 0) {
+ close (gs->interpreter_err);
+ gs->interpreter_err = -1;
+ if (gs->interpreter_error_id) {
+ gdk_input_remove (gs->interpreter_error_id);
+ gs->interpreter_error_id = 0;
+ }
+ }
+
+ gs->busy = FALSE;
}
/* If file exists and is a regular file then return its length, else -1 */
static gint
-file_length(const gchar * filename)
+file_length (const gchar * filename)
{
- struct stat stat_rec;
+ struct stat stat_rec;
- if(filename && (stat(filename, &stat_rec) == 0)
- && S_ISREG(stat_rec.st_mode))
- return stat_rec.st_size;
- else
- return -1;
+ if (filename && (stat (filename, &stat_rec) == 0) && S_ISREG (stat_rec.st_mode))
+ return stat_rec.st_size;
+ else
+ return -1;
}
/* Test if file exists, is a regular file and its length is > 0 */
static gboolean
file_readable(const char *filename)
{
- return (file_length(filename) > 0);
+ return (file_length (filename) > 0);
}
/*
* Return name of input file to use or NULL on error..
*/
static gchar *
-check_filecompressed(PSDocument * gs)
+check_filecompressed (PSDocument * gs)
{
- FILE *file;
- gchar buf[1024];
- gchar *filename, *filename_unc, *filename_err, *cmdline;
- const gchar *cmd;
- int fd;
-
- cmd = NULL;
-
- if((file = fopen(gs->gs_filename, "r"))
- && (fread(buf, sizeof(gchar), 3, file) == 3)) {
- if((buf[0] == '\037') && ((buf[1] == '\235') || (buf[1] == '\213'))) {
- /* file is gzipped or compressed */
- cmd = gtk_gs_defaults_get_ungzip_cmd();
- }
- else if(strncmp(buf, "BZh", 3) == 0) {
- /* file is compressed with bzip2 */
- cmd = gtk_gs_defaults_get_unbzip2_cmd();
- }
- }
- if(NULL != file)
- fclose(file);
-
- if(!cmd)
- return gs->gs_filename;
-
- /* do the decompression */
- filename = g_shell_quote(gs->gs_filename);
- filename_unc = g_strconcat(g_get_tmp_dir(), "/ggvXXXXXX", NULL);
- if((fd = mkstemp(filename_unc)) < 0) {
- g_free(filename_unc);
- g_free(filename);
- return NULL;
- }
- close(fd);
- filename_err = g_strconcat(g_get_tmp_dir(), "/ggvXXXXXX", NULL);
- if((fd = mkstemp(filename_err)) < 0) {
- g_free(filename_err);
- g_free(filename_unc);
- g_free(filename);
- return NULL;
- }
- close(fd);
- cmdline = g_strdup_printf("%s %s >%s 2>%s", cmd,
- filename, filename_unc, filename_err);
- if((system(cmdline) == 0)
- && file_readable(filename_unc)
- && (file_length(filename_err) == 0)) {
- /* sucessfully uncompressed file */
- gs->gs_filename_unc = filename_unc;
- }
- else {
- /* report error */
- g_snprintf(buf, 1024, _("Error while decompressing file %s:\n"),
- gs->gs_filename);
- interpreter_failed (gs, buf);
- unlink(filename_unc);
- g_free(filename_unc);
- filename_unc = NULL;
- }
- unlink(filename_err);
- g_free(filename_err);
- g_free(cmdline);
- g_free(filename);
- return filename_unc;
-}
+ FILE *file;
+ gchar buf[1024];
+ gchar *filename, *filename_unc, *filename_err, *cmdline;
+ const gchar *cmd;
+ int fd;
+
+ cmd = NULL;
+
+ if ((file = fopen(gs->gs_filename, "r")) &&
+ (fread (buf, sizeof(gchar), 3, file) == 3)) {
+ if ((buf[0] == '\037') && ((buf[1] == '\235') || (buf[1] == '\213'))) {
+ /* file is gzipped or compressed */
+ cmd = gtk_gs_defaults_get_ungzip_cmd ();
+ } else if (strncmp (buf, "BZh", 3) == 0) {
+ /* file is compressed with bzip2 */
+ cmd = gtk_gs_defaults_get_unbzip2_cmd ();
+ }
+ }
-static gint
-ps_document_enable_interpreter(PSDocument * gs)
-{
- g_return_val_if_fail(gs != NULL, FALSE);
- g_return_val_if_fail(PS_IS_DOCUMENT(gs), FALSE);
+ if (NULL != file)
+ fclose(file);
- if(!gs->gs_filename)
- return 0;
+ if (!cmd)
+ return gs->gs_filename;
- return start_interpreter(gs);
-}
+ /* do the decompression */
+ filename = g_shell_quote (gs->gs_filename);
+ filename_unc = g_strconcat (g_get_tmp_dir (), "/evinceXXXXXX", NULL);
+ if ((fd = mkstemp (filename_unc)) < 0) {
+ g_free (filename_unc);
+ g_free (filename);
+ return NULL;
+ }
+ close (fd);
+
+ filename_err = g_strconcat (g_get_tmp_dir (), "/evinceXXXXXX", NULL);
+ if ((fd = mkstemp(filename_err)) < 0) {
+ g_free (filename_err);
+ g_free (filename_unc);
+ g_free (filename);
+ return NULL;
+ }
+ close (fd);
+
+ cmdline = g_strdup_printf ("%s %s >%s 2>%s", cmd,
+ filename, filename_unc, filename_err);
+ if (system (cmdline) == 0 &&
+ file_readable (filename_unc) &&
+ file_length (filename_err) == 0) {
+ /* sucessfully uncompressed file */
+ gs->gs_filename_unc = filename_unc;
+ } else {
+ gchar *filename_dsp;
+ gchar *msg;
+
+ /* report error */
+ filename_dsp = g_filename_display_name (gs->gs_filename);
+ msg = g_strdup_printf (_("Error while decompressing file %s:\n"), filename_dsp);
+ g_free (filename_dsp);
+
+ interpreter_failed (gs, msg);
+ g_free (msg);
+ unlink (filename_unc);
+ g_free (filename_unc);
+ filename_unc = NULL;
+ }
+
+ unlink (filename_err);
+ g_free (filename_err);
+ g_free (cmdline);
+ g_free (filename);
-/* publicly accessible functions */
+ return filename_unc;
+}
-GType
-ps_document_get_type(void)
+static gint
+ps_document_enable_interpreter(PSDocument *gs)
{
- static GType gs_type = 0;
- if(!gs_type) {
- GTypeInfo gs_info = {
- sizeof(PSDocumentClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) ps_document_class_init,
- (GClassFinalizeFunc) NULL,
- NULL, /* class_data */
- sizeof(PSDocument),
- 0, /* n_preallocs */
- (GInstanceInitFunc) ps_document_init
- };
-
- static const GInterfaceInfo document_info =
- {
- (GInterfaceInitFunc) ps_document_document_iface_init,
- NULL,
- NULL
- };
-
- static const GInterfaceInfo ps_exporter_info =
- {
- (GInterfaceInitFunc) ps_document_ps_exporter_iface_init,
- NULL,
- NULL
- };
-
- static const GInterfaceInfo async_renderer_info =
- {
- (GInterfaceInitFunc) ps_async_renderer_iface_init,
- NULL,
- NULL
- };
-
- gs_type = g_type_register_static(G_TYPE_OBJECT,
- "PSDocument", &gs_info, 0);
-
- g_type_add_interface_static (gs_type,
- EV_TYPE_DOCUMENT,
- &document_info);
- g_type_add_interface_static (gs_type,
- EV_TYPE_PS_EXPORTER,
- &ps_exporter_info);
- g_type_add_interface_static (gs_type,
- EV_TYPE_ASYNC_RENDERER,
- &async_renderer_info);
- }
- return gs_type;
+ g_return_val_if_fail (PS_IS_DOCUMENT (gs), FALSE);
+ if (!gs->gs_filename)
+ return 0;
+ return start_interpreter (gs);
}
static gboolean
-document_load(PSDocument * gs, const gchar * fname)
+document_load (PSDocument *gs, const gchar *fname)
{
- g_return_val_if_fail(gs != NULL, FALSE);
- g_return_val_if_fail(PS_IS_DOCUMENT(gs), FALSE);
-
- LOG ("Load the document");
-
- if(fname == NULL) {
- gs->gs_status = "";
- return FALSE;
- }
-
- /* prepare this document */
- gs->structured_doc = FALSE;
- gs->send_filename_to_gs = TRUE;
- gs->loaded = FALSE;
- if(*fname == '/') {
- /* an absolute path */
- gs->gs_filename = g_strdup(fname);
- }
- else {
- /* path relative to our cwd: make it absolute */
- gchar *cwd = g_get_current_dir();
- gs->gs_filename = g_strconcat(cwd, "/", fname, NULL);
- g_free(cwd);
- }
-
- if((gs->reading_from_pipe = (strcmp(fname, "-") == 0))) {
- gs->send_filename_to_gs = FALSE;
- }
- else {
- /*
- * We need to make sure that the file is loadable/exists!
- * otherwise we want to exit without loading new stuff...
- */
- gchar *filename = NULL;
-
- if(!file_readable(fname)) {
- gchar buf[1024];
- g_snprintf(buf, 1024, _("Cannot open file %s.\n"), fname);
- interpreter_failed (gs, buf);
- gs->gs_status = _("File is not readable.");
- }
- else {
- filename = check_filecompressed(gs);
- }
-
- if(!filename || (gs->gs_psfile = fopen(filename, "r")) == NULL) {
- interpreter_failed (gs, NULL);
- return FALSE;
- }
-
- /* we grab the vital statistics!!! */
- gs->doc = psscan(gs->gs_psfile, TRUE, filename);
-
- if(gs->doc == NULL) {
- /* File does not seem to be a Postscript one */
- gchar buf[1024];
- g_snprintf(buf, 1024, _("Error while scanning file %s\n"), fname);
- interpreter_failed (gs, buf);
- gs->gs_status = _("The file is not a PostScript document.");
- return FALSE;
- }
-
- if((!gs->doc->epsf && gs->doc->numpages > 0) ||
- (gs->doc->epsf && gs->doc->numpages > 1)) {
- gs->structured_doc = TRUE;
- gs->send_filename_to_gs = FALSE;
- }
- }
- gs->loaded = TRUE;
-
- gs->gs_status = _("Document loaded.");
-
- return gs->loaded;
-}
+ g_return_val_if_fail (PS_IS_DOCUMENT(gs), FALSE);
+
+ LOG ("Load the document");
+
+ if (fname == NULL) {
+ gs->gs_status = "";
+ return FALSE;
+ }
+ /* prepare this document */
+ gs->structured_doc = FALSE;
+ gs->send_filename_to_gs = TRUE;
+ gs->gs_filename = g_strdup (fname);
+
+ if ((gs->reading_from_pipe = (strcmp (fname, "-") == 0))) {
+ gs->send_filename_to_gs = FALSE;
+ } else {
+ /*
+ * We need to make sure that the file is loadable/exists!
+ * otherwise we want to exit without loading new stuff...
+ */
+ gchar *filename = NULL;
+
+ if (!file_readable(fname)) {
+ gchar *filename_dsp;
+ gchar *msg;
+
+ filename_dsp = g_filename_display_name (fname);
+ msg = g_strdup_printf (_("Cannot open file %s.\n"), filename_dsp);
+ g_free (filename_dsp);
+
+ interpreter_failed (gs, msg);
+ g_free (msg);
+ gs->gs_status = _("File is not readable.");
+ } else {
+ filename = check_filecompressed(gs);
+ }
+
+ if (!filename || (gs->gs_psfile = fopen(filename, "r")) == NULL) {
+ interpreter_failed (gs, NULL);
+ return FALSE;
+ }
+
+ /* we grab the vital statistics!!! */
+ gs->doc = psscan(gs->gs_psfile, TRUE, filename);
+
+ if ((!gs->doc->epsf && gs->doc->numpages > 0) ||
+ (gs->doc->epsf && gs->doc->numpages > 1)) {
+ gs->structured_doc = TRUE;
+ gs->send_filename_to_gs = FALSE;
+ }
+ }
+
+ gs->gs_status = _("Document loaded.");
+
+ return TRUE;
+}
static gboolean
ps_document_next_page (PSDocument *gs)
const char *uri,
GError **error)
{
- gboolean result;
char *filename;
+ char *gs_path;
+ gboolean result;
filename = g_filename_from_uri (uri, NULL, error);
if (!filename)
return FALSE;
- result = document_load (PS_DOCUMENT (document), filename);
- if (!result) {
- g_set_error (error, G_FILE_ERROR,
- G_FILE_ERROR_FAILED,
- "Failed to load document '%s'\n",
- uri);
+ gs_path = g_find_program_in_path ("gs");
+ if (!gs_path) {
+ gchar *filename_dsp;
+ filename_dsp = g_filename_display_name (filename);
+ g_set_error(error,
+ G_FILE_ERROR,
+ G_FILE_ERROR_NOENT,
+ _("Failed to load document '%s'. Ghostscript interpreter was not found in path"),
+ filename);
+ g_free (filename_dsp);
+ result = FALSE;
+ } else {
+ result = document_load (PS_DOCUMENT (document), filename);
+ if (!result) {
+ gchar *filename_dsp;
+ filename_dsp = g_filename_display_name (filename);
+
+ g_set_error (error, G_FILE_ERROR,
+ G_FILE_ERROR_FAILED,
+ _("Failed to load document '%s'"),
+ filename_dsp);
+ g_free (filename_dsp);
+ }
+ g_free (gs_path);
}
-
g_free (filename);
return result;
}
+static gboolean
+save_document (PSDocument *document, const char *filename)
+{
+ gboolean result = TRUE;
+ GtkGSDocSink *sink = gtk_gs_doc_sink_new ();
+ FILE *f, *src_file;
+ gchar *buf;
+
+ src_file = fopen (PS_DOCUMENT_GET_PS_FILE(document), "r");
+ if (src_file) {
+ struct stat stat_rec;
+
+ if (stat (PS_DOCUMENT_GET_PS_FILE(document), &stat_rec) == 0) {
+ pscopy (src_file, sink, 0, stat_rec.st_size - 1);
+ }
+
+ fclose (src_file);
+ }
+
+ buf = gtk_gs_doc_sink_get_buffer (sink);
+ if (buf == NULL) {
+ return FALSE;
+ }
+
+ f = fopen (filename, "w");
+ if (f) {
+ fputs (buf, f);
+ fclose (f);
+ } else {
+ result = FALSE;
+ }
+
+ g_free (buf);
+ gtk_gs_doc_sink_free (sink);
+ g_free (sink);
+
+ return result;
+}
+
static gboolean
save_page_list (PSDocument *document, int *page_list, const char *filename)
{
FILE *f;
gchar *buf;
- pscopydoc (sink, document->gs_filename, document->doc, page_list);
+ pscopydoc (sink, PS_DOCUMENT_GET_PS_FILE(document),
+ document->doc, page_list);
buf = gtk_gs_doc_sink_get_buffer (sink);
GError **error)
{
PSDocument *ps = PS_DOCUMENT (document);
- int *page_list;
gboolean result;
- int i;
char *filename;
filename = g_filename_from_uri (uri, NULL, error);
if (!filename)
return FALSE;
- page_list = g_new0 (int, ps->doc->numpages);
- for (i = 0; i < ps->doc->numpages; i++) {
- page_list[i] = 1;
- }
-
- result = save_page_list (ps, page_list, filename);
+ result = save_document (ps, filename);
- g_free (page_list);
g_free (filename);
return result;
double *height)
{
PSDocument *gs = PS_DOCUMENT (document);
- int w, h;
- int urx, ury, llx, lly, orientation;
+ int urx, ury, llx, lly;
get_page_box (PS_DOCUMENT (document), page, &urx, &ury, &llx, &lly);
- orientation = get_page_orientation (PS_DOCUMENT (document), page);
-
- switch (orientation) {
- case GTK_GS_ORIENTATION_PORTRAIT:
- case GTK_GS_ORIENTATION_UPSIDEDOWN:
- w = (urx - llx) / 72.0 * get_xdpi (gs) + 0.5;
- h = (ury - lly) / 72.0 * get_ydpi (gs) + 0.5;
- break;
- case GTK_GS_ORIENTATION_LANDSCAPE:
- case GTK_GS_ORIENTATION_SEASCAPE:
- w = (ury - lly) / 72.0 * get_xdpi (gs) + 0.5;
- h = (urx - llx) / 72.0 * get_ydpi (gs) + 0.5;
- break;
- default:
- w = h = 0;
- g_assert_not_reached ();
- break;
- }
if (width) {
- *width = w;
+ *width = (urx - llx) / 72.0 * get_xdpi (gs) + 0.5;
}
if (height) {
- *height = h;
+ *height = (ury - lly) / 72.0 * get_ydpi (gs) + 0.5;
}
}
return FALSE;
}
-static gboolean
-render_pixbuf_idle (PSRenderJob *job)
+static void
+ps_async_renderer_render_pixbuf (EvAsyncRenderer *renderer, int page, double scale, int rotation)
{
- PSDocument *gs = job->document;
+ PSDocument *gs = PS_DOCUMENT (renderer);
if (gs->pstarget == NULL) {
- GtkWidget *widget;
-
- widget = gtk_window_new (GTK_WINDOW_POPUP);
- gtk_widget_realize (widget);
- gs->pstarget = widget->window;
+ gs->target_window = gtk_window_new (GTK_WINDOW_POPUP);
+ gtk_widget_realize (gs->target_window);
+ gs->pstarget = gs->target_window->window;
g_assert (gs->pstarget != NULL);
- g_signal_connect (widget, "event",
+ g_signal_connect (gs->target_window, "event",
G_CALLBACK (ps_document_widget_event),
gs);
}
- setup_pixmap (gs, job->page, job->scale);
- setup_page (gs, job->page, job->scale);
-
- render_page (gs, job->page);
+ setup_pixmap (gs, page, scale, rotation);
+ setup_page (gs, page, scale, rotation);
- return FALSE;
-}
-
-static void
-ps_async_renderer_render_pixbuf (EvAsyncRenderer *renderer, int page, double scale)
-{
- PSRenderJob job;
-
- job.page = page;
- job.scale = scale;
- job.document = PS_DOCUMENT (renderer);
- render_pixbuf_idle (&job);
+ render_page (gs, page);
}
static EvDocumentInfo *
info = g_new0 (EvDocumentInfo, 1);
info->fields_mask = EV_DOCUMENT_INFO_TITLE |
+ EV_DOCUMENT_INFO_FORMAT |
+ EV_DOCUMENT_INFO_CREATOR |
EV_DOCUMENT_INFO_N_PAGES;
info->title = g_strdup (ps->doc->title);
+ info->format = ps->doc->epsf ? g_strdup (_("Encapsulated PostScript"))
+ : g_strdup (_("PostScript"));
+ info->creator = g_strdup (ps->doc->creator);
info->n_pages = ev_document_get_n_pages (document);
return info;
static void
ps_document_ps_export_begin (EvPSExporter *exporter, const char *filename,
- int first_page, int last_page)
+ int first_page, int last_page,
+ double width, double height, gboolean duplex)
{
PSDocument *document = PS_DOCUMENT (exporter);
- g_free (document->ps_export_pagelist);
+ if (document->structured_doc) {
+ g_free (document->ps_export_pagelist);
- document->ps_export_pagelist = g_new0 (int, document->doc->numpages);
+ document->ps_export_pagelist = g_new0 (int, document->doc->numpages);
+ }
+
document->ps_export_filename = g_strdup (filename);
}
static void
-ps_document_ps_export_do_page (EvPSExporter *exporter, int page)
+ps_document_ps_export_do_page (EvPSExporter *exporter, EvRenderContext *rc)
{
PSDocument *document = PS_DOCUMENT (exporter);
- document->ps_export_pagelist[page] = 1;
+ if (document->structured_doc) {
+ document->ps_export_pagelist[rc->page] = 1;
+ }
}
static void
{
PSDocument *document = PS_DOCUMENT (exporter);
- save_page_list (document, document->ps_export_pagelist,
- document->ps_export_filename);
-
- g_free (document->ps_export_pagelist);
- g_free (document->ps_export_filename);
- document->ps_export_pagelist = NULL;
- document->ps_export_filename = NULL;
+ if (!document->structured_doc) {
+ save_document (document, document->ps_export_filename);
+ } else {
+ save_page_list (document, document->ps_export_pagelist,
+ document->ps_export_filename);
+ g_free (document->ps_export_pagelist);
+ g_free (document->ps_export_filename);
+ document->ps_export_pagelist = NULL;
+ document->ps_export_filename = NULL;
+ }
}
static void
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff