X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=dvi%2Fdvi-document.c;h=6ecbc3a29503d893ef98b3f3310033f4d576c136;hb=0cded54c0376c9b38e1070b53759245d720f3cec;hp=0aff86a3afde24e7b779040444f8a207e94a20bc;hpb=1b167536f9277df8953cc30a531c1c17eab10382;p=evince.git diff --git a/dvi/dvi-document.c b/dvi/dvi-document.c index 0aff86a3..6ecbc3a2 100644 --- a/dvi/dvi-document.c +++ b/dvi/dvi-document.c @@ -29,6 +29,10 @@ #include #include +#include +#include +#include +#include GMutex *dvi_context_mutex = NULL; @@ -54,8 +58,8 @@ struct _DviDocument double base_width; double base_height; - - EvOrientation orientation; + + gchar *uri; }; typedef struct _DviDocumentClass DviDocumentClass; @@ -115,6 +119,8 @@ dvi_document_load (EvDocument *document, dvi_context_mutex = g_mutex_new (); + g_free (dvi_document->uri); + dvi_document->uri = g_strdup (uri); return TRUE; } @@ -125,7 +131,32 @@ dvi_document_save (EvDocument *document, const char *uri, GError **error) { - g_warning ("dvi_document_save not implemented"); /* FIXME */ + DviDocument *dvi_document = DVI_DOCUMENT (document); + GnomeVFSResult result; + GnomeVFSURI *source_uri; + GnomeVFSURI *target_uri; + + if (!dvi_document->uri) + return FALSE; + + source_uri = gnome_vfs_uri_new (dvi_document->uri); + target_uri = gnome_vfs_uri_new (uri); + + result = gnome_vfs_xfer_uri (source_uri, target_uri, + GNOME_VFS_XFER_DEFAULT | GNOME_VFS_XFER_FOLLOW_LINKS, + GNOME_VFS_XFER_ERROR_MODE_ABORT, + GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, + NULL, + NULL); + gnome_vfs_uri_unref (target_uri); + gnome_vfs_uri_unref (source_uri); + + if (result != GNOME_VFS_OK) + g_set_error (error, + EV_DOCUMENT_ERROR, + 0, + gnome_vfs_result_to_string (result)); + return (result == GNOME_VFS_OK); return TRUE; } @@ -136,24 +167,6 @@ dvi_document_get_n_pages (EvDocument *document) return dvi_document->context->npages; } -static EvOrientation -dvi_document_get_orientation (EvDocument *document) -{ - DviDocument *dvi_document = DVI_DOCUMENT (document); - - return dvi_document->orientation; -} - -static void -dvi_document_set_orientation (EvDocument *document, - EvOrientation orientation) -{ - DviDocument *dvi_document = DVI_DOCUMENT (document); - - dvi_document->orientation = orientation; -} - - static void dvi_document_get_page_size (EvDocument *document, int page, @@ -162,36 +175,12 @@ dvi_document_get_page_size (EvDocument *document, { DviDocument * dvi_document = DVI_DOCUMENT (document); - if (dvi_document->orientation == EV_ORIENTATION_PORTRAIT || - dvi_document->orientation == EV_ORIENTATION_UPSIDEDOWN) { - *width = dvi_document->base_width; - *height = dvi_document->base_height;; - } else { - *width = dvi_document->base_height; - *height = dvi_document->base_width; - } + *width = dvi_document->base_width; + *height = dvi_document->base_height;; return; } -static GdkPixbuf * -rotate_pixbuf (EvDocument *document, GdkPixbuf *pixbuf) -{ - DviDocument *dvi_document = DVI_DOCUMENT (document); - - switch (dvi_document->orientation) - { - case EV_ORIENTATION_LANDSCAPE: - return gdk_pixbuf_rotate_simple (pixbuf, 90); - case EV_ORIENTATION_UPSIDEDOWN: - return gdk_pixbuf_rotate_simple (pixbuf, 180); - case EV_ORIENTATION_SEASCAPE: - return gdk_pixbuf_rotate_simple (pixbuf, 270); - default: - return g_object_ref (pixbuf); - } -} - static GdkPixbuf * dvi_document_render_pixbuf (EvDocument *document, EvRenderContext *rc) @@ -235,8 +224,8 @@ dvi_document_render_pixbuf (EvDocument *document, g_mutex_unlock (dvi_context_mutex); - rotated_pixbuf = rotate_pixbuf (document, pixbuf); - g_object_unref (pixbuf); + rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, 360 - rc->rotation); + g_object_unref (pixbuf); return rotated_pixbuf; } @@ -254,6 +243,8 @@ 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); } @@ -293,16 +284,14 @@ dvi_document_document_iface_init (EvDocumentIface *iface) iface->get_page_size = dvi_document_get_page_size; iface->render_pixbuf = dvi_document_render_pixbuf; iface->get_info = dvi_document_get_info; - iface->get_orientation = dvi_document_get_orientation; - iface->set_orientation = dvi_document_set_orientation; } 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; @@ -317,12 +306,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; @@ -354,18 +345,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