Updated Swedish translation.

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

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 5d7df6b3a5f1b768e50aabe3f36448a82c45d02e..6fb577fce3a6e4910482bcc2bbbc222e0c3bcece 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -37,11 +37,13 @@
 #include "ev-job-queue.h"
 #include "ev-page-cache.h"
 #include "ev-pixbuf-cache.h"
 #include "ev-job-queue.h"
 #include "ev-page-cache.h"
 #include "ev-pixbuf-cache.h"

+#include "ev-tooltip.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))
 #define EV_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EV_TYPE_VIEW, EvViewClass))
 
 
 #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))
 #define EV_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EV_TYPE_VIEW, EvViewClass))
 

+

 enum {
        PROP_0,
        PROP_STATUS,
 enum {
        PROP_0,
        PROP_STATUS,


@@ -52,6 +54,7 @@ enum {
        PROP_PRESENTATION,
        PROP_SIZING_MODE,
        PROP_ZOOM,
        PROP_PRESENTATION,
        PROP_SIZING_MODE,
        PROP_ZOOM,

+       PROP_ROTATION,

 };
 
 enum {
 };
 
 enum {


@@ -86,6 +89,11 @@ typedef enum {
        EV_VIEW_CURSOR_DRAG
 } EvViewCursor;
 
        EV_VIEW_CURSOR_DRAG
 } EvViewCursor;
 

+typedef enum {
+       EV_VIEW_FIND_NEXT,
+       EV_VIEW_FIND_PREV
+} EvViewFindDirection;
+

 #define ZOOM_IN_FACTOR  1.2
 #define ZOOM_OUT_FACTOR (1.0/ZOOM_IN_FACTOR)
 
 #define ZOOM_IN_FACTOR  1.2
 #define ZOOM_OUT_FACTOR (1.0/ZOOM_IN_FACTOR)
 


@@ -141,6 +149,8 @@ struct _EvView {
 
        int pressed_button;
        EvViewCursor cursor;
 
        int pressed_button;
        EvViewCursor cursor;

+       GtkWidget *link_tooltip;
+       EvLink *hovered_link;

 
        EvPageCache *page_cache;
        EvPixbufCache *pixbuf_cache;
 
        EvPageCache *page_cache;
        EvPixbufCache *pixbuf_cache;


@@ -230,18 +240,16 @@ static void       find_page_at_location                      (EvView
                                                              gint               *page,
                                                              gint               *x_offset,
                                                              gint               *y_offset);
                                                              gint               *page,
                                                              gint               *x_offset,
                                                              gint               *y_offset);

-static void       ev_view_queue_draw_page                    (EvView             *view,
-                                                             gint                page);

 
 /*** Hyperrefs ***/
 static EvLink*    get_link_at_location                       (EvView             *view,
                                                              gdouble             x,
                                                              gdouble             y);
 
 /*** Hyperrefs ***/
 static EvLink*    get_link_at_location                       (EvView             *view,
                                                              gdouble             x,
                                                              gdouble             y);

-static void       go_to_link                                 (EvView             *view,
+static char*      tip_from_link                              (EvView             *view,

                                                              EvLink             *link);
                                                              EvLink             *link);

-static char*      status_message_from_link                   (EvView             *view,
-                                                             EvLink             *link);
-
+static void       handle_link_over_xy                        (EvView *view, 
+                                                             gint x, 
+                                                             gint y);

 /*** GtkWidget implementation ***/
 static void       ev_view_size_request_continuous_dual_page  (EvView             *view,
                                                              GtkRequisition     *requisition);
 /*** GtkWidget implementation ***/
 static void       ev_view_size_request_continuous_dual_page  (EvView             *view,
                                                              GtkRequisition     *requisition);


@@ -267,6 +275,8 @@ static gboolean   ev_view_motion_notify_event                (GtkWidget
                                                              GdkEventMotion     *event);
 static gboolean   ev_view_button_release_event               (GtkWidget          *widget,
                                                              GdkEventButton     *event);
                                                              GdkEventMotion     *event);
 static gboolean   ev_view_button_release_event               (GtkWidget          *widget,
                                                              GdkEventButton     *event);

+static gboolean   ev_view_enter_notify_event                 (GtkWidget          *widget,
+                                                             GdkEventCrossing   *event);

 static gboolean   ev_view_leave_notify_event                 (GtkWidget          *widget,
                                                              GdkEventCrossing   *event);
 static void       ev_view_style_set                          (GtkWidget          *widget,
 static gboolean   ev_view_leave_notify_event                 (GtkWidget          *widget,
                                                              GdkEventCrossing   *event);
 static void       ev_view_style_set                          (GtkWidget          *widget,


@@ -360,7 +370,8 @@ static void       ev_view_set_find_status                    (EvView
                                                              const char         *message);
 /*** Find ***/
 static void       jump_to_find_result                        (EvView             *view);
                                                              const char         *message);
 /*** Find ***/
 static void       jump_to_find_result                        (EvView             *view);

-static void       jump_to_find_page                          (EvView             *view);
+static void       jump_to_find_page                          (EvView             *view, 
+                                                             EvViewFindDirection direction);

 
 /*** Selection ***/
 static void       compute_selections                         (EvView             *view,
 
 /*** Selection ***/
 static void       compute_selections                         (EvView             *view,


@@ -483,6 +494,9 @@ view_set_adjustment_values (EvView         *view,
 static void
 view_update_range_and_current_page (EvView *view)
 {
 static void
 view_update_range_and_current_page (EvView *view)
 {

+       if (view->pending_scroll != SCROLL_TO_KEEP_POSITION)
+               return;
+

        /* Presentation trumps all other modes */
        if (view->presentation) {
                view->start_page = view->current_page;
        /* Presentation trumps all other modes */
        if (view->presentation) {
                view->start_page = view->current_page;


@@ -530,6 +544,8 @@ view_update_range_and_current_page (EvView *view)
                                view->start_page = view->current_page;
                                if (view->current_page + 1 < ev_page_cache_get_n_pages (view->page_cache))
                                        view->end_page = view->start_page + 1;
                                view->start_page = view->current_page;
                                if (view->current_page + 1 < ev_page_cache_get_n_pages (view->page_cache))
                                        view->end_page = view->start_page + 1;

+                               else 
+                                       view->end_page = view->start_page;

                        } else {
                                view->start_page = view->current_page - 1;
                                view->end_page = view->current_page;
                        } else {
                                view->start_page = view->current_page - 1;
                                view->end_page = view->current_page;


@@ -813,8 +829,8 @@ get_page_extents (EvView       *view,
                gint max_width;
                gint x, y;
 
                gint max_width;
                gint x, y;
 

-               ev_page_cache_get_max_width (view->page_cache, view->scale,
-                                            view->rotation, &max_width);
+               ev_page_cache_get_max_width (view->page_cache, view->rotation,
+                                            view->scale, &max_width);

                max_width = max_width + border->left + border->right;
                /* Get the location of the bounding box */
                if (view->dual_page) {
                max_width = max_width + border->left + border->right;
                /* Get the location of the bounding box */
                if (view->dual_page) {


@@ -911,6 +927,44 @@ view_rect_to_doc_rect (EvView *view,
        doc_rect->y2 = doc_rect->y1 + (double) view_rect->height / view->scale;
 }
 
        doc_rect->y2 = doc_rect->y1 + (double) view_rect->height / view->scale;
 }
 

+static void
+doc_point_to_view_point (EvView       *view,
+                         int           page,
+                        EvPoint      *doc_point,
+                        GdkPoint     *view_point)
+{
+       GdkRectangle page_area;
+       GtkBorder border;
+       double x, y;
+       int width, height;
+
+       ev_page_cache_get_size (view->page_cache, page,
+                               view->rotation,
+                               1.0,
+                               &width, &height);
+
+       if (view->rotation == 0) {
+               x = doc_point->x;
+               y = doc_point->y;
+       } else if (view->rotation == 90) {
+               x = width - doc_point->y;
+               y = doc_point->x;
+       } else if (view->rotation == 180) {
+               x = width - doc_point->x;
+               y = height - doc_point->y;
+       } else if (view->rotation == 270) {
+               x = doc_point->y;
+               y = height - doc_point->x;
+       } else {
+               g_assert_not_reached ();
+       }
+
+       get_page_extents (view, page, &page_area, &border);
+
+       view_point->x = x * view->scale + page_area.x;
+       view_point->y = y * view->scale + page_area.y;
+}
+

 static void
 doc_rect_to_view_rect (EvView       *view,
                        int           page,
 static void
 doc_rect_to_view_rect (EvView       *view,
                        int           page,


@@ -997,14 +1051,6 @@ find_page_at_location (EvView  *view,
        *page = -1;
 }
 
        *page = -1;
 }
 

-static void
-ev_view_queue_draw_page (EvView *view,
-                        gint    page)
-{
-       /* FIXME: write */
-       gtk_widget_queue_draw (GTK_WIDGET (view));
-}
-

 static gboolean
 location_in_text (EvView  *view,
                  gdouble  x,
 static gboolean
 location_in_text (EvView  *view,
                  gdouble  x,


@@ -1050,9 +1096,33 @@ get_link_at_location (EvView  *view,
                return NULL;
 }
 
                return NULL;
 }
 

-/* FIXME: standardize this sometime */

 static void
 static void

-go_to_link (EvView *view, EvLink *link)
+goto_xyz_link (EvView *view, EvLink *link)
+{
+       GdkPoint view_point;
+       EvPoint doc_point;
+       int height, page;
+       double zoom;
+
+       zoom = ev_link_get_zoom (link);
+       page = ev_link_get_page (link);
+       ev_page_cache_get_size (view->page_cache, page, 0, 1.0, NULL, &height);
+
+       ev_view_set_sizing_mode (view, EV_SIZING_FREE);
+       if (zoom != 0) {
+               ev_view_set_zoom (view, zoom, FALSE);
+       }
+
+       doc_point.x = ev_link_get_left (link);
+       doc_point.y = height - ev_link_get_top (link);
+       doc_point_to_view_point (view, page, &doc_point, &view_point);
+
+       gtk_adjustment_set_value (view->hadjustment, view_point.x);
+       gtk_adjustment_set_value (view->vadjustment, view_point.y);
+}
+
+void
+ev_view_goto_link (EvView *view, EvLink *link)

 {
        EvLinkType type;
        const char *uri;
 {
        EvLinkType type;
        const char *uri;


@@ -1067,6 +1137,9 @@ go_to_link (EvView *view, EvLink *link)
                        page = ev_link_get_page (link);
                        ev_page_cache_set_current_page (view->page_cache, page);
                        break;
                        page = ev_link_get_page (link);
                        ev_page_cache_set_current_page (view->page_cache, page);
                        break;

+               case EV_LINK_TYPE_PAGE_XYZ:
+                       goto_xyz_link (view, link);
+                       break;

                case EV_LINK_TYPE_EXTERNAL_URI:
                        uri = ev_link_get_uri (link);
                        gnome_vfs_url_show (uri);
                case EV_LINK_TYPE_EXTERNAL_URI:
                        uri = ev_link_get_uri (link);
                        gnome_vfs_url_show (uri);


@@ -1075,7 +1148,7 @@ go_to_link (EvView *view, EvLink *link)
 }
 
 static char *
 }
 
 static char *

-status_message_from_link (EvView *view, EvLink *link)
+tip_from_link (EvView *view, EvLink *link)

 {
        EvLinkType type;
        char *msg = NULL;
 {
        EvLinkType type;
        char *msg = NULL;


@@ -1089,6 +1162,7 @@ status_message_from_link (EvView *view, EvLink *link)
                                msg = g_strdup (ev_link_get_title (link));
                        break;
                case EV_LINK_TYPE_PAGE:
                                msg = g_strdup (ev_link_get_title (link));
                        break;
                case EV_LINK_TYPE_PAGE:

+               case EV_LINK_TYPE_PAGE_XYZ:

                        page_label = ev_page_cache_get_page_label (view->page_cache, ev_link_get_page (link));
                        msg = g_strdup_printf (_("Go to page %s"), page_label);
                        g_free (page_label);
                        page_label = ev_page_cache_get_page_label (view->page_cache, ev_link_get_page (link));
                        msg = g_strdup_printf (_("Go to page %s"), page_label);
                        g_free (page_label);


@@ -1103,6 +1177,41 @@ status_message_from_link (EvView *view, EvLink *link)
        return msg;
 }
 
        return msg;
 }
 

+static void
+handle_link_over_xy (EvView *view, gint x, gint y)
+{
+       EvLink *link;
+
+       link = get_link_at_location (view, x + view->scroll_x, y + view->scroll_y);
+
+       if (view->link_tooltip == NULL) {
+               view->link_tooltip = ev_tooltip_new (GTK_WIDGET (view));
+       }
+
+       if (view->hovered_link != link) {
+               view->hovered_link = link;
+               ev_tooltip_deactivate (EV_TOOLTIP (view->link_tooltip));
+       }
+
+        if (link) {
+               char *msg = tip_from_link (view, link);
+
+               ev_tooltip_set_position (EV_TOOLTIP (view->link_tooltip), x, y);
+               ev_tooltip_set_text (EV_TOOLTIP (view->link_tooltip), msg);
+               ev_tooltip_activate (EV_TOOLTIP (view->link_tooltip));
+               g_free (msg);
+
+               ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK);
+       } else if (location_in_text (view, x + view->scroll_x, y + view->scroll_y)) {
+               ev_view_set_cursor (view, EV_VIEW_CURSOR_IBEAM);
+       } else {
+               ev_view_set_status (view, NULL);
+               if (view->cursor == EV_VIEW_CURSOR_LINK ||
+                   view->cursor == EV_VIEW_CURSOR_IBEAM)
+                       ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
+       }
+       return;
+}

 
 /*** GtkWidget implementation ***/
 
 
 /*** GtkWidget implementation ***/
 


@@ -1304,6 +1413,7 @@ ev_view_realize (GtkWidget *widget)
                                GDK_SCROLL_MASK |
                                GDK_KEY_PRESS_MASK |
                                GDK_POINTER_MOTION_MASK |
                                GDK_SCROLL_MASK |
                                GDK_KEY_PRESS_MASK |
                                GDK_POINTER_MOTION_MASK |

+                               GDK_ENTER_NOTIFY_MASK |

                                GDK_LEAVE_NOTIFY_MASK;
 
        widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
                                GDK_LEAVE_NOTIFY_MASK;
 
        widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),


@@ -1465,15 +1575,20 @@ ev_view_motion_notify_event (GtkWidget      *widget,
        if (!view->document)
                return FALSE;
 
        if (!view->document)
                return FALSE;
 

-       if (view->pressed_button == 1) {
+       /* For the Evince 0.4.x release, we limit selection to un-rotated
+        * documents only.
+        */
+       if (view->pressed_button == 1 &&
+           view->rotation == 0) {

                view->selection_info.in_selection = TRUE;
                view->motion_x = event->x + view->scroll_x;
                view->motion_y = event->y + view->scroll_y;
 
                /* Queue an idle to handle the motion.  We do this because
                view->selection_info.in_selection = TRUE;
                view->motion_x = event->x + view->scroll_x;
                view->motion_y = event->y + view->scroll_y;
 
                /* Queue an idle to handle the motion.  We do this because

-                * handling any selection events in the motion is probably going
-                * to be slower than new motion events reach us.  This means that */
-
+                * handling any selection events in the motion could be slower
+                * than new motion events reach us.  We always put it in the
+                * idle to make sure we catch up and don't visibly lag the
+                * mouse. */

                if (! view->selection_update_id)
                        view->selection_update_id = g_idle_add ((GSourceFunc)selection_update_idle_cb, view);
 
                if (! view->selection_update_id)
                        view->selection_update_id = g_idle_add ((GSourceFunc)selection_update_idle_cb, view);
 


@@ -1514,25 +1629,12 @@ ev_view_motion_notify_event (GtkWidget      *widget,
 
                        return TRUE;
                }
 
                        return TRUE;
                }

-       } else if (view->pressed_button <= 0) {
-               EvLink *link;
-
-               link = get_link_at_location (view, event->x + view->scroll_x, event->y + view->scroll_y);
-                if (link) {
-                       char *msg;
-
-                       msg = status_message_from_link (view, link);
-                       ev_view_set_status (view, msg);
-                       ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK);
-                       g_free (msg);
-               } else if (location_in_text (view, event->x + view->scroll_x, event->y + view->scroll_y)) {
-                       ev_view_set_cursor (view, EV_VIEW_CURSOR_IBEAM);
-               } else {
-                       ev_view_set_status (view, NULL);
-                       if (view->cursor == EV_VIEW_CURSOR_LINK ||
-                           view->cursor == EV_VIEW_CURSOR_IBEAM)
-                               ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
-               }
+       /* For the Evince 0.4.x release, we limit links to un-rotated documents
+        * only.
+        */
+       } else if (view->pressed_button <= 0 &&
+                  view->rotation == 0) {
+               handle_link_over_xy (view, event->x, event->y);

                return TRUE;
        }
 
                return TRUE;
        }
 


@@ -1559,13 +1661,35 @@ ev_view_button_release_event (GtkWidget      *widget,
 
                link = get_link_at_location (view, event->x + view->scroll_x, event->y + view->scroll_y);
                if (link) {
 
                link = get_link_at_location (view, event->x + view->scroll_x, event->y + view->scroll_y);
                if (link) {

-                       go_to_link (view, link);
+                       ev_view_goto_link (view, link);

                }
        }
 
        return FALSE;
 }
 
                }
        }
 
        return FALSE;
 }
 

+static gint
+ev_view_focus_in (GtkWidget     *widget,
+                 GdkEventFocus *event)
+{
+       if (EV_VIEW (widget)->pixbuf_cache)
+               ev_pixbuf_cache_style_changed (EV_VIEW (widget)->pixbuf_cache);
+       gtk_widget_queue_draw (widget);
+
+       return FALSE;
+}
+
+static gint
+ev_view_focus_out (GtkWidget     *widget,
+                    GdkEventFocus *event)
+{
+       if (EV_VIEW (widget)->pixbuf_cache)
+               ev_pixbuf_cache_style_changed (EV_VIEW (widget)->pixbuf_cache);
+       gtk_widget_queue_draw (widget);
+
+       return FALSE;
+}
+

 static gboolean
 ev_view_leave_notify_event (GtkWidget *widget, GdkEventCrossing   *event)
 {
 static gboolean
 ev_view_leave_notify_event (GtkWidget *widget, GdkEventCrossing   *event)
 {


@@ -1577,6 +1701,21 @@ ev_view_leave_notify_event (GtkWidget *widget, GdkEventCrossing   *event)
            view->cursor == EV_VIEW_CURSOR_IBEAM)
                ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
 
            view->cursor == EV_VIEW_CURSOR_IBEAM)
                ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
 

+       if (view->link_tooltip) {
+               view->hovered_link = NULL;
+               ev_tooltip_deactivate (EV_TOOLTIP (view->link_tooltip));
+       }
+
+       return FALSE;
+}
+
+static gboolean
+ev_view_enter_notify_event (GtkWidget *widget, GdkEventCrossing   *event)
+{
+       EvView *view = EV_VIEW (widget);
+
+       handle_link_over_xy (view, event->x, event->y);
+    

        return FALSE;
 }
 
        return FALSE;
 }
 


@@ -1663,14 +1802,58 @@ highlight_find_results (EvView *view, int page)
                        alpha = 0x20;
                }
 
                        alpha = 0x20;
                }
 

-               ev_document_find_get_result (find, page,
-                                            i, &rectangle);
+               ev_document_find_get_result (find, page, i, &rectangle);

                doc_rect_to_view_rect (view, page, &rectangle, &view_rectangle);
                draw_rubberband (GTK_WIDGET (view), GTK_WIDGET(view)->window,
                                 &view_rectangle, alpha);
         }
 }
 
                doc_rect_to_view_rect (view, page, &rectangle, &view_rectangle);
                draw_rubberband (GTK_WIDGET (view), GTK_WIDGET(view)->window,
                                 &view_rectangle, alpha);
         }
 }
 

+static void
+draw_loading_text (EvView       *view,
+                  GdkRectangle *page_area,
+                  GdkRectangle *expose_area)
+{
+       PangoLayout *layout;
+       PangoFontDescription *font_desc;
+       PangoRectangle logical_rect;
+       double real_scale;
+       int target_width;
+
+       const char *loading_text = _("Loading...");     
+
+       layout = gtk_widget_create_pango_layout (GTK_WIDGET (view), loading_text);
+
+       font_desc = pango_font_description_new ();
+
+
+       /* We set the font to be 10 points, get the size, and scale appropriately */
+       pango_font_description_set_size (font_desc, 10 * PANGO_SCALE);
+       pango_layout_set_font_description (layout, font_desc);
+       pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+
+       /* Make sure we fit the middle of the page */
+       target_width = MAX (page_area->width / 2, 1);
+       real_scale = ((double)target_width / (double) logical_rect.width) * (PANGO_SCALE * 10);
+       pango_font_description_set_size (font_desc, (int)real_scale);
+       pango_layout_set_font_description (layout, font_desc);
+       pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+
+       gtk_paint_layout (GTK_WIDGET (view)->style,
+                         GTK_WIDGET (view)->window,
+                         GTK_WIDGET_STATE (view),
+                         FALSE,
+                         page_area,
+                         GTK_WIDGET (view),
+                         NULL,
+                         page_area->x + (target_width/2),
+                         page_area->y + (page_area->height - logical_rect.height) / 2,
+                         layout);
+
+       pango_font_description_free (font_desc);
+       g_object_unref (layout);
+}
+

 static void
 draw_one_page (EvView          *view,
               gint             page,
 static void
 draw_one_page (EvView          *view,
               gint             page,


@@ -1754,6 +1937,10 @@ draw_one_page (EvView          *view,
                                         GDK_RGB_DITHER_NORMAL,
                                         0, 0);
                        g_object_unref (scaled_image);
                                         GDK_RGB_DITHER_NORMAL,
                                         0, 0);
                        g_object_unref (scaled_image);

+               } else {
+                       draw_loading_text (view,
+                                          &real_page_area,
+                                          expose_area);

                }
 
                if (scaled_selection) {
                }
 
                if (scaled_selection) {


@@ -1797,10 +1984,16 @@ ev_view_destroy (GtkObject *object)
                g_object_unref (view->document);
                view->document = NULL;
        }
                g_object_unref (view->document);
                view->document = NULL;
        }

+

        if (view->pixbuf_cache) {
                g_object_unref (view->pixbuf_cache);
                view->pixbuf_cache = NULL;
        }
        if (view->pixbuf_cache) {
                g_object_unref (view->pixbuf_cache);
                view->pixbuf_cache = NULL;
        }

+
+       if (view->link_tooltip) {
+               gtk_widget_destroy (view->link_tooltip);
+       }
+

        ev_view_set_scroll_adjustments (view, NULL, NULL);
 
        GTK_OBJECT_CLASS (ev_view_parent_class)->destroy (object);
        ev_view_set_scroll_adjustments (view, NULL, NULL);
 
        GTK_OBJECT_CLASS (ev_view_parent_class)->destroy (object);


@@ -1834,6 +2027,9 @@ ev_view_set_property (GObject      *object,
        case PROP_ZOOM:
                ev_view_set_zoom (view, g_value_get_double (value), FALSE);
                break;
        case PROP_ZOOM:
                ev_view_set_zoom (view, g_value_get_double (value), FALSE);
                break;

+       case PROP_ROTATION:
+               ev_view_set_rotation (view, g_value_get_int (value));
+               break;

        default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        }
        default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        }


@@ -1873,6 +2069,9 @@ ev_view_get_property (GObject *object,
        case PROP_ZOOM:
                g_value_set_double (value, view->scale);
                break;
        case PROP_ZOOM:
                g_value_set_double (value, view->scale);
                break;

+       case PROP_ROTATION:
+               g_value_set_int (value, view->rotation);
+               break;

        default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        }
        default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        }


@@ -1894,11 +2093,14 @@ ev_view_class_init (EvViewClass *class)
        widget_class->button_press_event = ev_view_button_press_event;
        widget_class->motion_notify_event = ev_view_motion_notify_event;
        widget_class->button_release_event = ev_view_button_release_event;
        widget_class->button_press_event = ev_view_button_press_event;
        widget_class->motion_notify_event = ev_view_motion_notify_event;
        widget_class->button_release_event = ev_view_button_release_event;

+       widget_class->focus_in_event = ev_view_focus_in;
+       widget_class->focus_out_event = ev_view_focus_out;

        widget_class->size_request = ev_view_size_request;
        widget_class->size_allocate = ev_view_size_allocate;
        widget_class->realize = ev_view_realize;
        widget_class->unrealize = ev_view_unrealize;
        widget_class->scroll_event = ev_view_scroll_event;
        widget_class->size_request = ev_view_size_request;
        widget_class->size_allocate = ev_view_size_allocate;
        widget_class->realize = ev_view_realize;
        widget_class->unrealize = ev_view_unrealize;
        widget_class->scroll_event = ev_view_scroll_event;

+       widget_class->enter_notify_event = ev_view_enter_notify_event;

        widget_class->leave_notify_event = ev_view_leave_notify_event;
        widget_class->style_set = ev_view_style_set;
        gtk_object_class->destroy = ev_view_destroy;
        widget_class->leave_notify_event = ev_view_leave_notify_event;
        widget_class->style_set = ev_view_style_set;
        gtk_object_class->destroy = ev_view_destroy;


@@ -1999,6 +2201,15 @@ ev_view_class_init (EvViewClass *class)
                                                               MAX_SCALE,
                                                               1.0,
                                                               G_PARAM_READWRITE));
                                                               MAX_SCALE,
                                                               1.0,
                                                               G_PARAM_READWRITE));

+       g_object_class_install_property (object_class,
+                                        PROP_ROTATION,
+                                        g_param_spec_double ("rotation",
+                                                             "Rotation",
+                                                              "Rotation",
+                                                              0,
+                                                              360,
+                                                              0,
+                                                              G_PARAM_READWRITE));

 
        binding_set = gtk_binding_set_by_class (class);
 
 
        binding_set = gtk_binding_set_by_class (class);
 


@@ -2020,7 +2231,6 @@ ev_view_init (EvView *view)
        view->cursor = EV_VIEW_CURSOR_NORMAL;
        view->drag_info.in_drag = FALSE;
        view->selection_info.in_selection = FALSE;
        view->cursor = EV_VIEW_CURSOR_NORMAL;
        view->drag_info.in_drag = FALSE;
        view->selection_info.in_selection = FALSE;

-

        view->selection_mode = EV_VIEW_SELECTION_TEXT;
        view->continuous = TRUE;
        view->dual_page = FALSE;
        view->selection_mode = EV_VIEW_SELECTION_TEXT;
        view->continuous = TRUE;
        view->dual_page = FALSE;


@@ -2035,7 +2245,7 @@ ev_view_init (EvView *view)
 static void
 find_changed_cb (EvDocument *document, int page, EvView *view)
 {
 static void
 find_changed_cb (EvDocument *document, int page, EvView *view)
 {

-       jump_to_find_page (view);
+       jump_to_find_page (view, EV_VIEW_FIND_NEXT);

        jump_to_find_result (view);
        update_find_status_message (view);
 
        jump_to_find_result (view);
        update_find_status_message (view);
 


@@ -2130,7 +2340,6 @@ clear_caches (EvView *view)
        }
 
        if (view->page_cache) {
        }
 
        if (view->page_cache) {

-               g_object_unref (view->page_cache);

                view->page_cache = NULL;
        }
 }
                view->page_cache = NULL;
        }
 }


@@ -2375,15 +2584,6 @@ ev_view_zoom_out (EvView *view)
        ev_view_set_zoom (view, ZOOM_OUT_FACTOR, TRUE);
 }
 
        ev_view_set_zoom (view, ZOOM_OUT_FACTOR, TRUE);
 }
 

-static void
-ev_view_set_rotation (EvView *view, int rotation)
-{
-       view->rotation = rotation;
-
-       ev_pixbuf_cache_clear (view->pixbuf_cache);
-       gtk_widget_queue_resize (GTK_WIDGET (view));
-}
-

 void
 ev_view_rotate_right (EvView *view)
 {
 void
 ev_view_rotate_right (EvView *view)
 {


@@ -2408,6 +2608,28 @@ ev_view_rotate_left (EvView *view)
        ev_view_set_rotation (view, rotation);
 }
 
        ev_view_set_rotation (view, rotation);
 }
 

+void
+ev_view_set_rotation (EvView *view, int rotation)
+{
+       view->rotation = rotation;
+
+       if (view->pixbuf_cache) {
+               ev_pixbuf_cache_clear (view->pixbuf_cache);
+               gtk_widget_queue_resize (GTK_WIDGET (view));
+       }
+
+       if (rotation != 0)
+               clear_selection (view);
+
+       g_object_notify (G_OBJECT (view), "rotation");
+}
+
+int
+ev_view_get_rotation (EvView *view)
+{
+       return view->rotation;
+}
+

 static double
 zoom_for_size_fit_width (int doc_width,
                         int doc_height,
 static double
 zoom_for_size_fit_width (int doc_width,
                         int doc_height,


@@ -2738,7 +2960,7 @@ jump_to_find_result (EvView *view)
 
        n_results = ev_document_find_get_n_results (find, page);
 
 
        n_results = ev_document_find_get_n_results (find, page);
 

-       if (n_results > view->find_result) {
+       if (n_results > 0  && view->find_result < n_results) {

                ev_document_find_get_result
                        (find, page, view->find_result, &rect);
 
                ev_document_find_get_result
                        (find, page, view->find_result, &rect);
 


@@ -2748,7 +2970,7 @@ jump_to_find_result (EvView *view)
 }
 
 static void
 }
 
 static void

-jump_to_find_page (EvView *view)
+jump_to_find_page (EvView *view, EvViewFindDirection direction)

 {
        int n_pages, i;
 
 {
        int n_pages, i;
 


@@ -2757,12 +2979,19 @@ jump_to_find_page (EvView *view)
        for (i = 0; i < n_pages; i++) {
                int has_results;
                int page;
        for (i = 0; i < n_pages; i++) {
                int has_results;
                int page;

+               
+               if (direction == EV_VIEW_FIND_NEXT)
+                       page = view->find_page + i;
+               else
+                       page = view->find_page - i;
+

 
 

-               page = i + view->find_page;

                if (page >= n_pages) {
                        page = page - n_pages;
                }
                if (page >= n_pages) {
                        page = page - n_pages;
                }

-
+               if (page < 0) 
+                       page = page + n_pages;
+               

                has_results = ev_document_find_page_has_results
                                (EV_DOCUMENT_FIND (view->document), page);
                if (has_results == -1) {
                has_results = ev_document_find_page_has_results
                                (EV_DOCUMENT_FIND (view->document), page);
                if (has_results == -1) {


@@ -2770,7 +2999,6 @@ jump_to_find_page (EvView *view)
                        break;
                } else if (has_results == 1) {
                        ev_page_cache_set_current_page (view->page_cache, page);
                        break;
                } else if (has_results == 1) {
                        ev_page_cache_set_current_page (view->page_cache, page);

-                       jump_to_find_result (view);

                        break;
                }
        }
                        break;
                }
        }


@@ -2803,14 +3031,15 @@ ev_view_find_next (EvView *view)
        view->find_result++;
 
        if (view->find_result >= n_results) {
        view->find_result++;
 
        if (view->find_result >= n_results) {

+

                view->find_result = 0;
                view->find_page++;
                view->find_result = 0;
                view->find_page++;

-

                if (view->find_page >= n_pages) {
                        view->find_page = 0;
                }
 
                if (view->find_page >= n_pages) {
                        view->find_page = 0;
                }
 

-               jump_to_find_page (view);
+               jump_to_find_page (view, EV_VIEW_FIND_NEXT);
+               jump_to_find_result (view);

        } else {
                jump_to_find_result (view);
                gtk_widget_queue_draw (GTK_WIDGET (view));
        } else {
                jump_to_find_result (view);
                gtk_widget_queue_draw (GTK_WIDGET (view));


@@ -2833,14 +3062,15 @@ ev_view_find_previous (EvView *view)
        view->find_result--;
 
        if (view->find_result < 0) {
        view->find_result--;
 
        if (view->find_result < 0) {

-               view->find_result = 0;
-               view->find_page--;

 
 

+               view->find_page--;

                if (view->find_page < 0) {
                        view->find_page = n_pages - 1;
                }
 
                if (view->find_page < 0) {
                        view->find_page = n_pages - 1;
                }
 

-               jump_to_find_page (view);
+               jump_to_find_page (view, EV_VIEW_FIND_PREV);
+               view->find_result = ev_document_find_get_n_results (find, view->current_page) - 1;
+               jump_to_find_result (view);

        } else {
                jump_to_find_result (view);
                gtk_widget_queue_draw (GTK_WIDGET (view));
        } else {
                jump_to_find_result (view);
                gtk_widget_queue_draw (GTK_WIDGET (view));


@@ -2912,6 +3142,7 @@ compute_new_selection_text (EvView   *view,
        GList *list = NULL;
        EvViewSelection *selection;
        gint width, height;
        GList *list = NULL;
        EvViewSelection *selection;
        gint width, height;

+       int start_page, end_page;

 
        g_assert (view->selection_mode == EV_VIEW_SELECTION_TEXT);
 
 
        g_assert (view->selection_mode == EV_VIEW_SELECTION_TEXT);
 


@@ -2921,7 +3152,18 @@ compute_new_selection_text (EvView   *view,
         * affects. */
        first = n_pages;
        last = 0;
         * affects. */
        first = n_pages;
        last = 0;

-       for (i = 0; i < n_pages; i++) {
+       if (view->continuous) {
+               start_page = 0;
+               end_page = n_pages;
+       } else if (view->dual_page) {
+               start_page = view->start_page;
+               end_page = view->end_page + 1;
+       } else {
+               start_page = view->current_page;
+               end_page = view->current_page + 1;
+       }
+
+       for (i = start_page; i < end_page; i++) {

                GdkRectangle page_area;
                GtkBorder border;
                
                GdkRectangle page_area;
                GtkBorder border;
                


@@ -3137,6 +3379,10 @@ ev_view_select_all (EvView *view)
 {
        int n_pages, i;
 
 {
        int n_pages, i;
 

+       /* Disable selection on rotated pages for the 0.4.0 series */
+       if (view->rotation != 0)
+               return;
+

        clear_selection (view);
 
        n_pages = ev_page_cache_get_n_pages (view->page_cache);
        clear_selection (view);
 
        n_pages = ev_page_cache_get_n_pages (view->page_cache);


@@ -3145,8 +3391,9 @@ ev_view_select_all (EvView *view)
                EvViewSelection *selection;
 
                ev_page_cache_get_size (view->page_cache,
                EvViewSelection *selection;
 
                ev_page_cache_get_size (view->page_cache,

+                                       i,

                                        view->rotation,
                                        view->rotation,

-                                       i, 1.0, &width, &height);
+                                       1.0, &width, &height);

 
                selection = g_new0 (EvViewSelection, 1);
                selection->page = i;
 
                selection = g_new0 (EvViewSelection, 1);
                selection->page = i;