X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=dvi%2Fdvi-document.c;h=4de5e64eddc74457ccbcb405063abf2abd8f9cf9;hb=592bc46cb8c4d56dd04c39ac87d287a0abcf6fa6;hp=61526d2d54e9d54ab3faf4ed4f9b173daf2db77a;hpb=1a9dc517d24c563078b45a9d1a0c82ef3c710fef;p=evince.git diff --git a/dvi/dvi-document.c b/dvi/dvi-document.c index 61526d2d..4de5e64e 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; @@ -53,6 +54,8 @@ struct _DviDocument double base_width; double base_height; + + gchar *uri; }; typedef struct _DviDocumentClass DviDocumentClass; @@ -81,24 +84,39 @@ 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; + } + g_mutex_lock (dvi_context_mutex); if (dvi_document->context) mdvi_destroy_context (dvi_document->context); dvi_document->context = mdvi_init_context(dvi_document->params, dvi_document->spec, filename); + g_mutex_unlock (dvi_context_mutex); + + 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; - - dvi_context_mutex = g_mutex_new (); + + 2 * unit2pix(dvi_document->params->vdpi, MDVI_VMARGIN) / dvi_document->params->vshrink; + g_free (dvi_document->uri); + dvi_document->uri = g_strdup (uri); return TRUE; } @@ -109,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 @@ -127,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); @@ -154,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; @@ -178,22 +196,29 @@ 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 dvi_document_finalize (GObject *object) { DviDocument *dvi_document = DVI_DOCUMENT(object); - + + g_mutex_lock (dvi_context_mutex); if (dvi_document->context) { mdvi_pixbuf_device_free (&dvi_document->context->device); mdvi_destroy_context (dvi_document->context); } + g_mutex_unlock (dvi_context_mutex); if (dvi_document->params) g_free (dvi_document->params); + + g_free (dvi_document->uri); G_OBJECT_CLASS (dvi_document_parent_class)->finalize (object); } @@ -205,6 +230,11 @@ dvi_document_class_init (DviDocumentClass *klass) GObjectClass *gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = dvi_document_finalize; + + mdvi_init_kpathsea("evince", MDVI_MFMODE, MDVI_FALLBACK_FONT, MDVI_DPI); + mdvi_register_fonts (); + + dvi_context_mutex = g_mutex_new (); } static gboolean @@ -237,10 +267,10 @@ dvi_document_document_iface_init (EvDocumentIface *iface) 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; @@ -255,12 +285,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; @@ -272,7 +304,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; @@ -292,18 +324,17 @@ dvi_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document, pixbuf = mdvi_pixbuf_device_get_pixbuf (&dvi_document->context->device); g_mutex_unlock (dvi_context_mutex); - - if (border) { - border_pixbuf = ev_document_misc_get_thumbnail_frame (thumb_width, thumb_height, NULL); - gdk_pixbuf_copy_area (pixbuf, 0, 0, - thumb_width - 2, thumb_height - 2, - border_pixbuf, 2, 2); - g_object_unref (pixbuf); - pixbuf = border_pixbuf; - } + rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, 360 - rotation); + g_object_unref (pixbuf); - return 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 rotated_pixbuf; } static void @@ -328,17 +359,13 @@ 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; dvi_document->params->bg = 0xffffffff; dvi_document->params->fg = 0xff000000; - - mdvi_init_kpathsea("evince", MDVI_MFMODE, MDVI_FALLBACK_FONT, MDVI_DPI); - - mdvi_register_fonts (); } static void