Make frontends depend on just libev. Rework and group CFLAGS/LIBS

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

diff --git a/dvi/dvi-document.c b/dvi/dvi-document.c
index 61526d2d54e9d54ab3faf4ed4f9b173daf2db77a..0aff86a3afde24e7b779040444f8a207e94a20bc 100644 (file)
--- a/dvi/dvi-document.c
+++ b/dvi/dvi-document.c
@@ -28,6 +28,7 @@
 #include "pixbuf-device.h"
 
 #include <gtk/gtk.h>
+#include <glib/gi18n.h>
 
 GMutex *dvi_context_mutex = NULL;
 
@@ -53,6 +54,8 @@ struct _DviDocument
        
        double base_width;
        double base_height;
+
+       EvOrientation orientation;
 };
 
 typedef struct _DviDocumentClass DviDocumentClass;
@@ -81,21 +84,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 ();
 
@@ -120,6 +136,24 @@ 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,
@@ -127,20 +161,43 @@ 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;
-                           
+       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;
+       }
+                                   
        return;
 }
 
 static GdkPixbuf *
-dvi_document_render_pixbuf (EvDocument  *document, int page, double scale)
+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)
 {
        GdkPixbuf *pixbuf;
+       GdkPixbuf *rotated_pixbuf;
 
        DviDocument *dvi_document = DVI_DOCUMENT(document);
 
@@ -154,14 +211,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 +235,10 @@ dvi_document_render_pixbuf (EvDocument  *document, int page, double scale)
 
        g_mutex_unlock (dvi_context_mutex);
 
-       return pixbuf;
+        rotated_pixbuf = rotate_pixbuf (document, pixbuf);
+        g_object_unref (pixbuf);
+
+       return rotated_pixbuf;
 }
 
 static void
@@ -233,6 +293,8 @@ 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
@@ -272,7 +334,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;
@@ -328,7 +390,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;