X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=dvi%2Fdvi-document.c;h=81a2af273ea417779613f4f54fb288eef31162f0;hb=3f9b326b1e7351aeb08dc70ab78f4fcfda167318;hp=5bbe8f1767ee9a47d0e090ec4957369d11d207bd;hpb=c3e1500a4815225f08e1b20dd066559e8c92c280;p=evince.git diff --git a/dvi/dvi-document.c b/dvi/dvi-document.c index 5bbe8f17..81a2af27 100644 --- a/dvi/dvi-document.c +++ b/dvi/dvi-document.c @@ -21,12 +21,14 @@ #include "dvi-document.h" #include "ev-document-thumbnails.h" +#include "ev-document-misc.h" #include "mdvi.h" #include "fonts.h" #include "pixbuf-device.h" #include +#include GMutex *dvi_context_mutex = NULL; @@ -52,14 +54,14 @@ struct _DviDocument double base_width; double base_height; + + gchar *uri; }; typedef struct _DviDocumentClass DviDocumentClass; static void dvi_document_document_iface_init (EvDocumentIface *iface); -#if 0 static void dvi_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface); -#endif static void dvi_document_get_page_size (EvDocument *document, int page, double *width, @@ -69,9 +71,7 @@ G_DEFINE_TYPE_WITH_CODE (DviDocument, dvi_document, G_TYPE_OBJECT, { G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT, dvi_document_document_iface_init); -#if 0 G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS, dvi_document_document_thumbnails_iface_init) -#endif }); static gboolean @@ -84,24 +84,40 @@ 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 (); + g_free (dvi_document->uri); + dvi_document->uri = g_strdup (uri); + return TRUE; } @@ -111,8 +127,9 @@ dvi_document_save (EvDocument *document, const char *uri, GError **error) { - g_warning ("dvi_document_save not implemented"); /* FIXME */ - return TRUE; + DviDocument *dvi_document = DVI_DOCUMENT (document); + + return ev_xfer_uri_simple (dvi_document->uri, uri, error); } static int @@ -129,20 +146,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); @@ -156,14 +172,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; @@ -180,7 +196,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, 360 - rc->rotation); + g_object_unref (pixbuf); + + return rotated_pixbuf; } static void @@ -196,37 +215,12 @@ dvi_document_finalize (GObject *object) if (dvi_document->params) g_free (dvi_document->params); + + g_free (dvi_document->uri); 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) @@ -234,18 +228,22 @@ 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 +dvi_document_can_get_text (EvDocument *document) +{ + return FALSE; } -static char * -dvi_document_get_text (EvDocument *document, gint page, EvRectangle *rect) +static EvDocumentInfo * +dvi_document_get_info (EvDocument *document) { - /* FIXME this method should not be in EvDocument */ - g_warning ("dvi_document_get_text not implemented"); - return NULL; + EvDocumentInfo *info; + + info = g_new0 (EvDocumentInfo, 1); + + return info; } static void @@ -253,30 +251,83 @@ dvi_document_document_iface_init (EvDocumentIface *iface) { iface->load = dvi_document_load; iface->save = dvi_document_save; - iface->get_text = dvi_document_get_text; + iface->can_get_text = dvi_document_can_get_text; 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; } -#if 0 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; + + page_ratio = dvi_document->base_height / dvi_document->base_width; + *width = suggested_width; + *height = (gint) (suggested_width * page_ratio); + return; } static GdkPixbuf * dvi_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document, - gint page, - gint width) + 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; + + dvi_document_thumbnails_get_dimensions (document, page, width, &thumb_width, &thumb_height); + + g_mutex_lock (dvi_context_mutex); + + mdvi_setpage(dvi_document->context, page); + + mdvi_set_shrink (dvi_document->context, + (int)dvi_document->base_width * dvi_document->params->hshrink / thumb_width, + (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; + + if (border) { + mdvi_pixbuf_device_set_margins (&dvi_document->context->device, + MAX (thumb_width - proposed_width, 0) / 2, + MAX (thumb_height - proposed_height, 0) / 2); + } else { + mdvi_pixbuf_device_set_margins (&dvi_document->context->device, + MAX (thumb_width - proposed_width - 2, 0) / 2, + MAX (thumb_height - proposed_height - 2, 0) / 2); + } + + + mdvi_pixbuf_device_render (dvi_document->context); + pixbuf = mdvi_pixbuf_device_get_pixbuf (&dvi_document->context->device); + + g_mutex_unlock (dvi_context_mutex); + + rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, 360 - rotation); + g_object_unref (pixbuf); + + if (border) { + GdkPixbuf *tmp_pixbuf = rotated_pixbuf; + rotated_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, 0, tmp_pixbuf); + g_object_unref (tmp_pixbuf); + } - return NULL; + return rotated_pixbuf; } static void @@ -285,7 +336,6 @@ dvi_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface) iface->get_thumbnail = dvi_document_thumbnails_get_thumbnail; iface->get_dimensions = dvi_document_thumbnails_get_dimensions; } -#endif static void @@ -302,7 +352,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;