X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=dvi%2Fdvi-document.c;h=05bc5b617b27b2e405a44499c9aa399e32261840;hb=65c06150e05948eb7b056b0ec5cb9c364b652cfe;hp=b9edc9e65c4a95462c7afff94558b6cbaddbaf1d;hpb=1561766454d8a06d887da5c2955b8c4d1dddd9a3;p=evince.git diff --git a/dvi/dvi-document.c b/dvi/dvi-document.c index b9edc9e6..05bc5b61 100644 --- a/dvi/dvi-document.c +++ b/dvi/dvi-document.c @@ -28,6 +28,7 @@ #include "pixbuf-device.h" #include +#include GMutex *dvi_context_mutex = NULL; @@ -81,21 +82,34 @@ dvi_document_load (EvDocument *document, filename = g_filename_from_uri (uri, NULL, error); - if (!filename) - return FALSE; + if (!filename) { + g_set_error (error, + EV_DOCUMENT_ERROR, + EV_DOCUMENT_ERROR_INVALID, + _("File not available")); + return FALSE; + } if (dvi_document->context) mdvi_destroy_context (dvi_document->context); dvi_document->context = mdvi_init_context(dvi_document->params, dvi_document->spec, filename); + if (!dvi_document->context) { + g_set_error (error, + EV_DOCUMENT_ERROR, + EV_DOCUMENT_ERROR_INVALID, + _("DVI document has incorrect format")); + return FALSE; + } + mdvi_pixbuf_device_init (&dvi_document->context->device); dvi_document->base_width = dvi_document->context->dvi_page_w * dvi_document->context->params.conv - + 2 * unit2pix(dvi_document->params->dpi, MDVI_VMARGIN) / dvi_document->params->hshrink; + + 2 * unit2pix(dvi_document->params->dpi, MDVI_HMARGIN) / dvi_document->params->hshrink; dvi_document->base_height = dvi_document->context->dvi_page_h * dvi_document->context->params.vconv - + 2 * unit2pix(dvi_document->params->dpi, MDVI_VMARGIN) / dvi_document->params->vshrink; + + 2 * unit2pix(dvi_document->params->vdpi, MDVI_VMARGIN) / dvi_document->params->vshrink; dvi_context_mutex = g_mutex_new (); @@ -127,20 +141,19 @@ dvi_document_get_page_size (EvDocument *document, double *height) { DviDocument * dvi_document = DVI_DOCUMENT (document); - - if (width != NULL) - *width = dvi_document->base_width; - if (height != NULL) - *height = dvi_document->base_height; - + *width = dvi_document->base_width; + *height = dvi_document->base_height;; + return; } static GdkPixbuf * -dvi_document_render_pixbuf (EvDocument *document, int page, double scale) +dvi_document_render_pixbuf (EvDocument *document, + EvRenderContext *rc) { GdkPixbuf *pixbuf; + GdkPixbuf *rotated_pixbuf; DviDocument *dvi_document = DVI_DOCUMENT(document); @@ -154,14 +167,14 @@ dvi_document_render_pixbuf (EvDocument *document, int page, double scale) */ g_mutex_lock (dvi_context_mutex); - mdvi_setpage(dvi_document->context, page); + mdvi_setpage(dvi_document->context, rc->page); mdvi_set_shrink (dvi_document->context, - (int)((dvi_document->params->hshrink - 1) / scale) + 1, - (int)((dvi_document->params->vshrink - 1) / scale) + 1); + (int)((dvi_document->params->hshrink - 1) / rc->scale) + 1, + (int)((dvi_document->params->vshrink - 1) / rc->scale) + 1); - required_width = dvi_document->base_width * scale; - required_height = dvi_document->base_height * scale; + required_width = dvi_document->base_width * rc->scale; + required_height = dvi_document->base_height * rc->scale; proposed_width = dvi_document->context->dvi_page_w * dvi_document->context->params.conv; proposed_height = dvi_document->context->dvi_page_h * dvi_document->context->params.vconv; @@ -178,7 +191,10 @@ dvi_document_render_pixbuf (EvDocument *document, int page, double scale) g_mutex_unlock (dvi_context_mutex); - return pixbuf; + rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, rc->rotation); + g_object_unref (pixbuf); + + return rotated_pixbuf; } static void @@ -198,33 +214,6 @@ dvi_document_finalize (GObject *object) G_OBJECT_CLASS (dvi_document_parent_class)->finalize (object); } -static void -dvi_document_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) - { - case PROP_TITLE: - /* read only */ - break; - } -} - -static void -dvi_document_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) - { - case PROP_TITLE: - g_value_set_string (value, NULL); - break; - } -} static void dvi_document_class_init (DviDocumentClass *klass) @@ -232,10 +221,6 @@ dvi_document_class_init (DviDocumentClass *klass) GObjectClass *gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = dvi_document_finalize; - gobject_class->get_property = dvi_document_get_property; - gobject_class->set_property = dvi_document_set_property; - - g_object_class_override_property (gobject_class, PROP_TITLE, "title"); } static gboolean @@ -244,6 +229,16 @@ dvi_document_can_get_text (EvDocument *document) return FALSE; } +static EvDocumentInfo * +dvi_document_get_info (EvDocument *document) +{ + EvDocumentInfo *info; + + info = g_new0 (EvDocumentInfo, 1); + + return info; +} + static void dvi_document_document_iface_init (EvDocumentIface *iface) { @@ -253,14 +248,15 @@ dvi_document_document_iface_init (EvDocumentIface *iface) iface->get_n_pages = dvi_document_get_n_pages; iface->get_page_size = dvi_document_get_page_size; iface->render_pixbuf = dvi_document_render_pixbuf; + iface->get_info = dvi_document_get_info; } static void dvi_document_thumbnails_get_dimensions (EvDocumentThumbnails *document, - gint page, - gint suggested_width, - gint *width, - gint *height) + gint page, + gint suggested_width, + gint *width, + gint *height) { DviDocument *dvi_document = DVI_DOCUMENT (document); gdouble page_ratio; @@ -275,12 +271,14 @@ dvi_document_thumbnails_get_dimensions (EvDocumentThumbnails *document, static GdkPixbuf * dvi_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document, gint page, + gint rotation, gint width, gboolean border) { DviDocument *dvi_document = DVI_DOCUMENT (document); GdkPixbuf *pixbuf; GdkPixbuf *border_pixbuf; + GdkPixbuf *rotated_pixbuf; gint thumb_width, thumb_height; gint proposed_width, proposed_height; @@ -292,7 +290,7 @@ dvi_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document, mdvi_set_shrink (dvi_document->context, (int)dvi_document->base_width * dvi_document->params->hshrink / thumb_width, - (int)dvi_document->base_width * dvi_document->params->vshrink / thumb_height); + (int)dvi_document->base_height * dvi_document->params->vshrink / thumb_height); proposed_width = dvi_document->context->dvi_page_w * dvi_document->context->params.conv; proposed_height = dvi_document->context->dvi_page_h * dvi_document->context->params.vconv; @@ -323,7 +321,10 @@ dvi_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document, } - return pixbuf; + rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, rotation); + g_object_unref (pixbuf); + + return rotated_pixbuf; } static void @@ -348,7 +349,7 @@ dvi_document_init_params (DviDocument *dvi_document) dvi_document->params->hdrift = 0; dvi_document->params->vdrift = 0; dvi_document->params->hshrink = MDVI_SHRINK_FROM_DPI(dvi_document->params->dpi); - dvi_document->params->vshrink = MDVI_SHRINK_FROM_DPI(dvi_document->params->dpi); + dvi_document->params->vshrink = MDVI_SHRINK_FROM_DPI(dvi_document->params->vdpi); dvi_document->params->orientation = MDVI_ORIENT_TBLR; dvi_document->spec = NULL;