Text search in djvu. Fix for the bug #303415.

[evince.git] / dvi / dvi-document.c

diff --git a/dvi/dvi-document.c b/dvi/dvi-document.c
index 0aff86a3afde24e7b779040444f8a207e94a20bc..81a2af273ea417779613f4f54fb288eef31162f0 100644 (file)
--- a/dvi/dvi-document.c
+++ b/dvi/dvi-document.c
@@ -54,8 +54,8 @@ struct _DviDocument
        
        double base_width;
        double base_height;
-
-       EvOrientation orientation;
+       
+       gchar *uri;
 };
 
 typedef struct _DviDocumentClass DviDocumentClass;
@@ -115,6 +115,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,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
@@ -136,24 +139,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 +147,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 +196,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 +215,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 +256,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 +278,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 +317,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