}
static void
-ps_document_class_init(PSDocumentClass * klass)
+ps_document_class_init(PSDocumentClass *klass)
{
GObjectClass *object_class;
object_class = (GObjectClass *) klass;
- parent_class = gtk_type_class(gtk_widget_get_type());
+ parent_class = g_type_class_peek_parent (klass);
gs_class = klass;
object_class->finalize = ps_document_finalize;
g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_GS (object));
- LOG ("Finalize")
+ LOG ("Finalize");
gs = PS_DOCUMENT (object);
GdkColor white = { 0, 0xFFFF, 0xFFFF, 0xFFFF }; /* pixel, r, g, b */
GdkColormap *colormap;
- LOG ("Setup the page")
+ LOG ("Setup the page");
#ifdef HAVE_LOCALE_H
char *savelocale;
gs->bpixmap = NULL;
}
- LOG ("Create our internal pixmap")
+ LOG ("Create our internal pixmap");
gs->bpixmap = gdk_pixmap_new(gs->pstarget, gs->width, gs->height, -1);
gdk_draw_rectangle(gs->bpixmap, fill, TRUE,
gs->left_margin,
gs->bottom_margin, gs->right_margin, gs->top_margin);
+ LOG ("GS property %s", buf);
+
#ifdef HAVE_LOCALE_H
setlocale(LC_NUMERIC, savelocale);
#endif
int std_out[2]; /* pipe from interp stdout */
int std_err[2]; /* pipe from interp stderr */
- LOG ("Start the interpreter")
+ LOG ("Start the interpreter");
#define NUM_ARGS 100
#define NUM_GS_ARGS (NUM_ARGS - 20)
return -1;
}
+ gv_env = g_strdup_printf("GHOSTVIEW=%ld %ld",
+ gdk_x11_drawable_get_xid(gs->pstarget),
+ gdk_x11_drawable_get_xid(gs->bpixmap));
+
+ LOG ("Launching ghostview with env %s", gv_env);
+
gs->busy = TRUE;
gs->interpreter_pid = fork();
switch (gs->interpreter_pid) {
}
}
- gv_env = g_strdup_printf("GHOSTVIEW=%ld %ld",
- gdk_x11_drawable_get_xid(gs->pstarget),
- gdk_x11_drawable_get_xid(gs->bpixmap));
putenv(gv_env);
- LOG ("Launching ghostview with env %s", gv_env)
-
/* change to directory where the input file is. This helps
* with postscript-files which include other files using
* a relative path */
{
if(gs->interpreter_pid > 0) {
int status = 0;
- LOG ("Stop the interpreter")
+ LOG ("Stop the interpreter");
kill(gs->interpreter_pid, SIGTERM);
while((wait(&status) == -1) && (errno == EINTR)) ;
gs->interpreter_pid = -1;
g_return_val_if_fail(gs != NULL, FALSE);
g_return_val_if_fail(GTK_IS_GS(gs), FALSE);
- LOG ("Load the document")
+ LOG ("Load the document");
/* clean up previous document */
ps_document_cleanup(gs);
{
XEvent event;
- LOG ("Make ghostscript render next page")
+ LOG ("Make ghostscript render next page");
g_return_val_if_fail(gs != NULL, FALSE);
g_return_val_if_fail(GTK_IS_GS(gs), FALSE);
g_return_val_if_fail(gs != NULL, FALSE);
g_return_val_if_fail(GTK_IS_GS(gs), FALSE);
- LOG ("Go to page %d", page)
+ LOG ("Go to page %d", page);
if(!gs->gs_filename) {
return FALSE;
if(gs->structured_doc && gs->doc) {
- LOG ("It's a structured document, let's send one page to gs")
+ LOG ("It's a structured document, let's send one page to gs");
if(page >= gs->doc->numpages)
page = gs->doc->numpages - 1;
case, ggv restarts GS again and the first page is displayed.
*/
- LOG ("It's an unstructured document, gs will just read the file")
+ LOG ("It's an unstructured document, gs will just read the file");
if(page == gs->current_page && !gs->changed)
return TRUE;
gint new_ury = 0;
GtkGSPaperSize *papersizes = gtk_gs_defaults_get_paper_sizes();
- LOG ("Set the page size")
+ LOG ("Set the page size");
g_return_val_if_fail(gs != NULL, FALSE);
g_return_val_if_fail(GTK_IS_GS(gs), FALSE);
set_up_page(gs);
gs->changed = TRUE;
}
-
+
+ gs->scaling = TRUE;
ps_document_goto_page(gs, gs->current_page);
}
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);
+ }
g_free (filename);
ps_document_set_page (EvDocument *document,
int page)
{
- ps_document_goto_page (PS_DOCUMENT (document), page);
+ ps_document_goto_page (PS_DOCUMENT (document), page - 1);
}
static int
g_return_val_if_fail (ps != NULL, -1);
- return ps->current_page;
+ return ps->current_page + 1;
}
static gboolean
gs->message_window = event->client.data.l[0];
if (event->client.message_type == gs_class->page_atom) {
- LOG ("GS rendered the document")
+ LOG ("GS rendered the document");
gs->busy = FALSE;
- ev_document_changed (EV_DOCUMENT (gs));
+
+ if (gs->scaling) {
+ ev_document_scale_changed (EV_DOCUMENT (gs));
+ gs->scaling = FALSE;
+ } else {
+ ev_document_page_changed (EV_DOCUMENT (gs));
+ }
}
return TRUE;
LOG ("Copy the internal pixmap: %d %d %d %d %d %d",
draw.x - page.x, draw.y - page.y,
- draw.x, draw.y, draw.width, draw.height)
+ draw.x, draw.y, draw.width, draw.height);
g_object_unref (gc);
}