make search find stuff on other pages, sort of (only returns one result on

[evince.git] / shell / ev-view.c

diff --git a/shell/ev-view.c b/shell/ev-view.c
index a928ed3033e22a485304fb02a2ddfb750510f7d0..d0950936b434ee7da14b65c2857fbc83a92c5739 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -22,6 +22,7 @@
 
 #include "ev-marshal.h"
 #include "ev-view.h"
+#include "ev-document-find.h"
 
 #define EV_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EV_TYPE_VIEW, EvViewClass))
 #define EV_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EV_TYPE_VIEW))
@@ -41,6 +42,8 @@ struct _EvView {
        GtkAdjustment *vadjustment;
 
         GArray *find_results;
+
+       double scale;
 };
 
 struct _EvViewClass {
@@ -292,32 +295,36 @@ expose_bin_window (GtkWidget      *widget,
 {
        EvView *view = EV_VIEW (widget);
         int i;
+       int current_page;
         const EvFindResult *results;
+
+       if (view->document == NULL)
+               return;
        
-       if (view->document)
-               ev_document_render (view->document,
-                                   event->area.x, event->area.y,
-                                   event->area.width, event->area.height);
+       ev_document_render (view->document,
+                           event->area.x, event->area.y,
+                           event->area.width, event->area.height);
 
         results = (EvFindResult*) view->find_results->data;
+       current_page = ev_document_get_page (view->document);
         i = 0;
         while (i < view->find_results->len) {
 #if 0
-                g_printerr ("highlighting result %d at %d,%d %dx%d\n",
-                            i,
+                g_printerr ("highlighting result %d page %d at %d,%d %dx%d\n",
+                            i, results[i].page_num,
                             results[i].highlight_area.x,
                             results[i].highlight_area.y,
                             results[i].highlight_area.width,
                             results[i].highlight_area.height);
-#endif                       
-                // if (results[i].page_num == current_page) FIXME
-                gdk_draw_rectangle (view->bin_window,
-                                    widget->style->base_gc[GTK_STATE_SELECTED],
-                                    FALSE,
-                                    results[i].highlight_area.x,
-                                    results[i].highlight_area.y,
-                                    results[i].highlight_area.width,
-                                    results[i].highlight_area.height);
+#endif
+               if (results[i].page_num == current_page)
+                       gdk_draw_rectangle (view->bin_window,
+                                           widget->style->base_gc[GTK_STATE_SELECTED],
+                                           FALSE,
+                                           results[i].highlight_area.x,
+                                           results[i].highlight_area.y,
+                                           results[i].highlight_area.width,
+                                           results[i].highlight_area.height);
                 ++i;
         }
 }
@@ -457,6 +464,8 @@ static void
 ev_view_init (EvView *view)
 {
        static const GdkColor white = { 0, 0xffff, 0xffff, 0xffff };
+
+       view->scale = 1.0;
        
        gtk_widget_modify_bg (GTK_WIDGET (view), GTK_STATE_NORMAL, &white);
 
@@ -480,6 +489,20 @@ found_results_callback (EvDocument         *document,
   if (n_results > 0)
           g_array_append_vals (view->find_results,
                                results, n_results);
+
+#if 0
+  {
+         int i;
+
+         g_printerr ("%d results: ", n_results);
+         i = 0;
+         while (i < n_results) {
+                 g_printerr ("%d ", results[i].page_num);
+                 ++i;
+         }
+         g_printerr ("\n");
+  }
+#endif
   
   gtk_widget_queue_draw (GTK_WIDGET (view));
 }
@@ -552,3 +575,84 @@ ev_view_get_page (EvView *view)
        else
                return 1;
 }
+
+#define ZOOM_IN_FACTOR  1.2
+#define ZOOM_OUT_FACTOR (1.0/ZOOM_IN_FACTOR)
+
+#define MIN_SCALE 0.05409
+#define MAX_SCALE 18.4884
+
+static void
+ev_view_zoom (EvView   *view,
+             double    factor,
+             gboolean  relative)
+{
+       double scale;
+
+       if (relative)
+               scale = view->scale * factor;
+       else
+               scale = factor;
+
+       view->scale = CLAMP (scale, MIN_SCALE, MAX_SCALE);
+
+       ev_document_set_scale (view->document, view->scale);
+
+       gtk_widget_queue_draw (GTK_WIDGET (view));
+}
+
+void
+ev_view_zoom_in (EvView *view)
+{
+       ev_view_zoom (view, ZOOM_IN_FACTOR, TRUE);
+}
+
+void
+ev_view_zoom_out (EvView *view)
+{
+       ev_view_zoom (view, ZOOM_OUT_FACTOR, TRUE);
+}
+
+void
+ev_view_normal_size (EvView *view)
+{
+       ev_view_zoom (view, 1.0, FALSE);
+}
+
+void
+ev_view_best_fit (EvView *view)
+{
+       double scale;
+       int width, height;
+
+       width = height = 0;
+       ev_document_get_page_size (view->document, &width, &height);
+
+       scale = 1.0;
+       if (width != 0 && height != 0) {
+               double scale_w, scale_h;
+
+               scale_w = (double)GTK_WIDGET (view)->allocation.width * view->scale / width;
+               scale_h = (double)GTK_WIDGET (view)->allocation.height * view->scale / height;
+
+               scale = (scale_w < scale_h) ? scale_w : scale_h;
+       }
+
+       ev_view_zoom (view, scale, FALSE);
+}
+
+void
+ev_view_fit_width (EvView *view)
+{
+       double scale = 1.0;
+       int width;
+
+       width = 0;
+       ev_document_get_page_size (view->document, &width, NULL);
+
+       scale = 1.0;
+       if (width != 0)
+               scale = (double)GTK_WIDGET (view)->allocation.width * view->scale / width;
+
+       ev_view_zoom (view, scale, FALSE);
+}