More thrashing, now it prints 'Hello': wow.

diff --git a/pdf/xpdf/ChangeLog b/pdf/xpdf/ChangeLog
index 8197e5afabddd72d23a3123913f1fe9148523e07..e9d17154e44655793f386cd6f35aa8405fdf1678 100644 (file)
--- a/pdf/xpdf/ChangeLog
+++ b/pdf/xpdf/ChangeLog
@@ -1,3 +1,9 @@
+1999-07-29  Michael Meeks  <michael@edenproject.org>
+
+       * gpdf.cc (doc_redraw_event): Messing around.
+
+       * GOutputDev.cc (drawChar): Fix char printed as string.
+
 1999-06-09  Michael Meeks  <michael@edenproject.org>
 
        * gpdf.cc (main): Add error init.

diff --git a/pdf/xpdf/gpdf.cc b/pdf/xpdf/gpdf.cc
index 4ff49ea18e96207dcfdb28cfbf0880dd5487036c..ea32eb674a55639292834a97a512a70d01dd4f48 100644 (file)
--- a/pdf/xpdf/gpdf.cc
+++ b/pdf/xpdf/gpdf.cc
@@ -141,15 +141,18 @@ doc_redraw_event (GtkWidget *widget, GdkEventExpose *event)
   if (doc->out && doc->pdf) {
     printf ("There are %d pages\n", doc->pdf->getNumPages());
 
-//    doc->pdf->displayPage(doc->out, 1, 86, 0, gTrue);
     gdk_draw_line (doc->pixmap,
                   widget->style->black_gc,
                   event->area.x, event->area.y,
                   event->area.width, event->area.height);
+    doc->pdf->displayPage(doc->out, 1, 1, 0, gTrue); /* 86 zoom */
+    printf ("Draw pixmap %p\n", doc->pixmap);
+    gdk_draw_string (doc->pixmap, widget->style->font, widget->style->black_gc,
+                    10, 10, "Hello");
     gdk_draw_pixmap(widget->window,
                    widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
                    doc->pixmap,
-                   event->area.x, event->area.y,
+                   0, 0,
                    event->area.x, event->area.y,
                    event->area.width, event->area.height);
   } else