X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=pdf%2Fxpdf%2Fgpdf.cc;h=aea6586e70f202a8046a15003f48d89f4da29fc0;hb=3da3c2213362ae1c553de577579023d37692d554;hp=4ff49ea18e96207dcfdb28cfbf0880dd5487036c;hpb=d2af08d817420cd9cf59b28de23944c1afa138ba;p=evince.git diff --git a/pdf/xpdf/gpdf.cc b/pdf/xpdf/gpdf.cc index 4ff49ea1..aea6586e 100644 --- a/pdf/xpdf/gpdf.cc +++ b/pdf/xpdf/gpdf.cc @@ -130,6 +130,9 @@ doc_config_event (GtkWidget *widget, void *ugly) return TRUE; } +GdkFont *magic_font; +GdkGC *magic_black; + static gint doc_redraw_event (GtkWidget *widget, GdkEventExpose *event) { @@ -139,17 +142,23 @@ doc_redraw_event (GtkWidget *widget, GdkEventExpose *event) g_return_val_if_fail (doc->magic == DOC_ROOT_MAGIC, FALSE); if (doc->out && doc->pdf) { + GtkStyle *style = gtk_widget_get_default_style(); printf ("There are %d pages\n", doc->pdf->getNumPages()); -// doc->pdf->displayPage(doc->out, 1, 86, 0, gTrue); + magic_font = widget->style->font; + magic_black = widget->style->black_gc; 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, 86, 0, gTrue); /* 86 zoom */ + printf ("Draw pixmap %p\n", doc->pixmap); + gdk_draw_string (doc->pixmap, magic_font, magic_black, + 300, 300, "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