Draw only visible region.

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

diff --git a/shell/ev-view.c b/shell/ev-view.c
index cd6d27ec202a98524839300783124de7b4e13f73..997d54198de85a65e490237f8e0992877e35a311 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -66,6 +66,7 @@ enum {
 enum {
        SIGNAL_BINDING_ACTIVATED,
        SIGNAL_ZOOM_INVALID,
 enum {
        SIGNAL_BINDING_ACTIVATED,
        SIGNAL_ZOOM_INVALID,

+       SIGNAL_HANDLE_LINK,

        SIGNAL_EXTERNAL_LINK,
        SIGNAL_POPUP_MENU,
        N_SIGNALS,
        SIGNAL_EXTERNAL_LINK,
        SIGNAL_POPUP_MENU,
        N_SIGNALS,


@@ -1312,7 +1313,7 @@ goto_dest (EvView *view, EvLinkDest *dest)
                                                view->current_page);
 }
 
                                                view->current_page);
 }
 

-void
+static void

 ev_view_goto_dest (EvView *view, EvLinkDest *dest)
 {
        EvLinkDestType type;
 ev_view_goto_dest (EvView *view, EvLinkDest *dest)
 {
        EvLinkDestType type;


@@ -1346,13 +1347,15 @@ ev_view_handle_link (EvView *view, EvLink *link)
        action = ev_link_get_action (link);
        if (!action)
                return;
        action = ev_link_get_action (link);
        if (!action)
                return;

-       
+

        type = ev_link_action_get_action_type (action);
 
        switch (type) {
                case EV_LINK_ACTION_TYPE_GOTO_DEST: {
                        EvLinkDest *dest;
                        
        type = ev_link_action_get_action_type (action);
 
        switch (type) {
                case EV_LINK_ACTION_TYPE_GOTO_DEST: {
                        EvLinkDest *dest;
                        

+                       g_signal_emit (view, signals[SIGNAL_HANDLE_LINK], 0, link);
+               

                        dest = ev_link_action_get_dest (action);
                        ev_view_goto_dest (view, dest);
                }
                        dest = ev_link_action_get_dest (action);
                        ev_view_goto_dest (view, dest);
                }


@@ -1366,8 +1369,8 @@ ev_view_handle_link (EvView *view, EvLink *link)
        }
 }
 
        }
 }
 

-static gchar *
-page_label_from_dest (EvView *view, EvLinkDest *dest)
+gchar *
+ev_view_page_label_from_dest (EvView *view, EvLinkDest *dest)

 {
        EvLinkDestType type;
        gchar *msg = NULL;
 {
        EvLinkDestType type;
        gchar *msg = NULL;


@@ -1390,6 +1393,10 @@ page_label_from_dest (EvView *view, EvLinkDest *dest)
                }
                        
                        break;
                }
                        
                        break;

+               case EV_LINK_DEST_TYPE_PAGE_LABEL: {
+                       msg = g_strdup (ev_link_dest_get_page_label (dest));
+               }
+                       break;

                default: 
                        msg = ev_page_cache_get_page_label (view->page_cache,
                                                            ev_link_dest_get_page (dest));
                default: 
                        msg = ev_page_cache_get_page_label (view->page_cache,
                                                            ev_link_dest_get_page (dest));


@@ -1439,8 +1446,8 @@ tip_from_link (EvView *view, EvLink *link)
 
        switch (type) {
                case EV_LINK_ACTION_TYPE_GOTO_DEST:
 
        switch (type) {
                case EV_LINK_ACTION_TYPE_GOTO_DEST:

-                       page_label = page_label_from_dest (view,
-                                                          ev_link_action_get_dest (action));
+                       page_label = ev_view_page_label_from_dest (view,
+                                                                  ev_link_action_get_dest (action));

                        msg = g_strdup_printf (_("Go to page %s"), page_label);
                        g_free (page_label);
                        break;
                        msg = g_strdup_printf (_("Go to page %s"), page_label);
                        g_free (page_label);
                        break;


@@ -1510,7 +1517,6 @@ handle_link_over_xy (EvView *view, gint x, gint y)
                    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);
        }

-       return;

 }
 
 /*** Images ***/
 }
 
 /*** Images ***/


@@ -1907,7 +1913,7 @@ ev_view_expose_event (GtkWidget      *widget,
                
                area.width = widget->allocation.width;
                area.height = widget->allocation.height;
                
                area.width = widget->allocation.width;
                area.height = widget->allocation.height;

-               
+

                draw_loading_text (view,
                                   &area,
                                   &(event->area));
                draw_loading_text (view,
                                   &area,
                                   &(event->area));


@@ -1975,6 +1981,9 @@ ev_view_button_press_event (GtkWidget      *widget,
                            GdkEventButton *event)
 {
        EvView *view = EV_VIEW (widget);
                            GdkEventButton *event)
 {
        EvView *view = EV_VIEW (widget);

+
+       if (!view->document)
+               return FALSE;

        
        if (!GTK_WIDGET_HAS_FOCUS (widget)) {
                gtk_widget_grab_focus (widget);
        
        if (!GTK_WIDGET_HAS_FOCUS (widget)) {
                gtk_widget_grab_focus (widget);


@@ -1994,10 +2003,14 @@ ev_view_button_press_event (GtkWidget      *widget,
                                        view->selection_info.in_drag = TRUE;
                                } else {
                                        clear_selection (view);
                                        view->selection_info.in_drag = TRUE;
                                } else {
                                        clear_selection (view);

+                                       
+                                       view->selection_info.start.x = event->x + view->scroll_x;
+                                       view->selection_info.start.y = event->y + view->scroll_y;

                                }
                                
                                gtk_widget_queue_draw (widget);
                                }
                                
                                gtk_widget_queue_draw (widget);

-                       } else if ((image = ev_view_get_image_at_location (view, event->x, event->y))) {
+                       } else if (!location_in_text (view, event->x + view->scroll_x, event->y + view->scroll_y) &&
+                                  (image = ev_view_get_image_at_location (view, event->x, event->y))) {

                                if (view->image_dnd_info.image)
                                        g_object_unref (view->image_dnd_info.image);
                                view->image_dnd_info.image = g_object_ref (image);
                                if (view->image_dnd_info.image)
                                        g_object_unref (view->image_dnd_info.image);
                                view->image_dnd_info.image = g_object_ref (image);


@@ -2005,10 +2018,10 @@ ev_view_button_press_event (GtkWidget      *widget,
 
                                view->image_dnd_info.start.x = event->x + view->scroll_x;
                                view->image_dnd_info.start.y = event->y + view->scroll_y;
 
                                view->image_dnd_info.start.x = event->x + view->scroll_x;
                                view->image_dnd_info.start.y = event->y + view->scroll_y;

+                       } else {
+                               view->selection_info.start.x = event->x + view->scroll_x;
+                               view->selection_info.start.y = event->y + view->scroll_y;

                        }
                        }

-
-                       view->selection_info.start.x = event->x + view->scroll_x;
-                       view->selection_info.start.y = event->y + view->scroll_y;

                }                       
                        return TRUE;
                case 2:
                }                       
                        return TRUE;
                case 2:


@@ -2311,7 +2324,7 @@ ev_view_button_release_event (GtkWidget      *widget,
                ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
        }
 
                ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
        }
 

-       if (view->document && view->pressed_button == 1) {
+       if (view->document && view->pressed_button != 3) {

                link = ev_view_get_link_at_location (view, event->x, event->y);
        } else {
                link = NULL;
                link = ev_view_get_link_at_location (view, event->x, event->y);
        } else {
                link = NULL;


@@ -2340,7 +2353,23 @@ ev_view_button_release_event (GtkWidget      *widget,
                
                view->selection_info.in_drag = FALSE;
        } else if (link) {
                
                view->selection_info.in_drag = FALSE;
        } else if (link) {

-               ev_view_handle_link (view, link);
+               if (event->button == 2) {
+                       EvLinkAction    *action;
+                       EvLinkActionType type;
+
+                       action = ev_link_get_action (link);
+                       if (!action)
+                               return FALSE;
+
+                       type = ev_link_action_get_action_type (action);
+                       if (type == EV_LINK_ACTION_TYPE_GOTO_DEST) {
+                               g_signal_emit (view,
+                                              signals[SIGNAL_EXTERNAL_LINK],
+                                              0, action);
+                       }
+               } else {
+                       ev_view_handle_link (view, link);
+               }

        } else if (view->presentation) {
                switch (event->button) {
                        case 1:
        } else if (view->presentation) {
                switch (event->button) {
                        case 1:


@@ -2423,6 +2452,8 @@ ev_view_goto_window_key_press_event (GtkWidget   *widget,
                case GDK_Return:
                case GDK_KP_Enter:
                case GDK_ISO_Enter:
                case GDK_Return:
                case GDK_KP_Enter:
                case GDK_ISO_Enter:

+               case GDK_BackSpace:
+               case GDK_Delete:

                        return FALSE;
                default:
                        if (!key_is_numeric (event->keyval))
                        return FALSE;
                default:
                        if (!key_is_numeric (event->keyval))


@@ -2560,6 +2591,9 @@ ev_view_key_press_event (GtkWidget   *widget,
        EvView *view = EV_VIEW (widget);
        EvPresentationState current;
 
        EvView *view = EV_VIEW (widget);
        EvPresentationState current;
 

+       if (!view->document)
+               return FALSE;
+       

        if (!view->presentation ||
            view->presentation_state == EV_PRESENTATION_END)
                return gtk_bindings_activate_event (GTK_OBJECT (widget), event);
        if (!view->presentation ||
            view->presentation_state == EV_PRESENTATION_END)
                return gtk_bindings_activate_event (GTK_OBJECT (widget), event);


@@ -2742,8 +2776,6 @@ highlight_find_results (EvView *view, int page)
        EvDocumentFind *find;
        int i, results = 0;
 
        EvDocumentFind *find;
        int i, results = 0;
 

-       g_return_if_fail (EV_IS_DOCUMENT_FIND (view->document));
-

        find = EV_DOCUMENT_FIND (view->document);
 
        results = ev_document_find_get_n_results (find, page);
        find = EV_DOCUMENT_FIND (view->document);
 
        results = ev_document_find_get_n_results (find, page);


@@ -2773,7 +2805,7 @@ draw_loading_text (EvView       *view,
 {
        cairo_t *cr;
        gint     width, height;
 {
        cairo_t *cr;
        gint     width, height;

-       
+

        /* Don't annoy users with loading messages during presentations.
         * FIXME: Temporary "workaround" for
         * http://bugzilla.gnome.org/show_bug.cgi?id=320352 */
        /* Don't annoy users with loading messages during presentations.
         * FIXME: Temporary "workaround" for
         * http://bugzilla.gnome.org/show_bug.cgi?id=320352 */


@@ -2781,17 +2813,15 @@ draw_loading_text (EvView       *view,
                return;
 
        if (!view->loading_text) {
                return;
 
        if (!view->loading_text) {

-               const gchar *loading_text;
+               const gchar *loading_text = _("Loading...");

                PangoLayout *layout;
                PangoFontDescription *font_desc;
                PangoRectangle logical_rect;
                PangoLayout *layout;
                PangoFontDescription *font_desc;
                PangoRectangle logical_rect;

-               gdouble real_scale;

                gint target_width;
                gint target_width;

-               
-               loading_text = _("Loading..."); 
+               gdouble real_scale;

 
                ev_document_fc_mutex_lock ();
 
                ev_document_fc_mutex_lock ();

-               
+

                layout = gtk_widget_create_pango_layout (GTK_WIDGET (view), loading_text);
                
                font_desc = pango_font_description_new ();
                layout = gtk_widget_create_pango_layout (GTK_WIDGET (view), loading_text);
                
                font_desc = pango_font_description_new ();


@@ -2800,8 +2830,7 @@ draw_loading_text (EvView       *view,
                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);
                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);
                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);


@@ -2825,43 +2854,34 @@ draw_loading_text (EvView       *view,
                ev_document_fc_mutex_unlock ();
        }
 
                ev_document_fc_mutex_unlock ();
        }
 

-       width = cairo_image_surface_get_width (view->loading_text) / 2;
+       width = (page_area->width - cairo_image_surface_get_width (view->loading_text)) / 2;

        height = (page_area->height - cairo_image_surface_get_height (view->loading_text)) / 2;
        
        cr = gdk_cairo_create (GTK_WIDGET (view)->window);
        height = (page_area->height - cairo_image_surface_get_height (view->loading_text)) / 2;
        
        cr = gdk_cairo_create (GTK_WIDGET (view)->window);

-       cairo_set_source_surface (cr, view->loading_text,
-                                 page_area->x + width,
-                                 page_area->y + height);
+       cairo_translate (cr,
+                        page_area->x + width,
+                        page_area->y + height);
+       cairo_set_source_surface (cr, view->loading_text, 0, 0);

        cairo_paint (cr);
        cairo_destroy (cr);
 }
 
 static void
        cairo_paint (cr);
        cairo_destroy (cr);
 }
 
 static void

-draw_one_page (EvView          *view,
-              gint             page,
-              GdkRectangle    *page_area,
-              GtkBorder       *border,
-              GdkRectangle    *expose_area,
-              gboolean        *page_ready)
+draw_one_page (EvView       *view,
+              gint          page,
+              GdkRectangle *page_area,
+              GtkBorder    *border,
+              GdkRectangle *expose_area,
+              gboolean     *page_ready)

 {
 {

-       gint width, height;
-       GdkPixbuf *current_pixbuf;

        GdkRectangle overlap;
        GdkRectangle real_page_area;
        GdkRectangle overlap;
        GdkRectangle real_page_area;

-       EvViewSelection *selection;
-       gint current_page;

 
        g_assert (view->document);
 
        if (! gdk_rectangle_intersect (page_area, expose_area, &overlap))
                return;
 
        g_assert (view->document);
 
        if (! gdk_rectangle_intersect (page_area, expose_area, &overlap))
                return;

-       
-       current_page = ev_page_cache_get_current_page (view->page_cache);
-       selection = find_selection_for_page (view, page);
-       ev_page_cache_get_size (view->page_cache,
-                               page, view->rotation,
-                               view->scale,
-                               &width, &height);
+

        /* Render the document itself */
        real_page_area = *page_area;
 
        /* Render the document itself */
        real_page_area = *page_area;
 


@@ -2872,80 +2892,106 @@ draw_one_page (EvView          *view,
        *page_ready = TRUE;
 
        if (!view->presentation) {
        *page_ready = TRUE;
 
        if (!view->presentation) {

-               ev_document_misc_paint_one_page (GTK_WIDGET(view)->window,
+               gint current_page;
+
+               current_page = ev_page_cache_get_current_page (view->page_cache);
+               ev_document_misc_paint_one_page (GTK_WIDGET (view)->window,

                                                 GTK_WIDGET (view),
                                                 page_area, border, 
                                                 page == current_page);
        }
 
        if (gdk_rectangle_intersect (&real_page_area, expose_area, &overlap)) {
                                                 GTK_WIDGET (view),
                                                 page_area, border, 
                                                 page == current_page);
        }
 
        if (gdk_rectangle_intersect (&real_page_area, expose_area, &overlap)) {

-               GdkPixbuf *selection_pixbuf = NULL;
-               GdkPixbuf *scaled_image;
-               GdkPixbuf *scaled_selection;
+               gint             width, height;
+               gint             page_width, page_height;
+               cairo_surface_t *page_surface = NULL;
+               gint             selection_width, selection_height;
+               cairo_surface_t *selection_surface = NULL;
+               cairo_t         *cr = NULL;

 
 

-               current_pixbuf = ev_pixbuf_cache_get_pixbuf (view->pixbuf_cache, page);
+               page_surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, page);

 
 

-               /* Get the selection pixbuf iff we have something to draw */
-               if (current_pixbuf && view->selection_mode == EV_VIEW_SELECTION_TEXT && selection)
-                       selection_pixbuf = ev_pixbuf_cache_get_selection_pixbuf (view->pixbuf_cache,
-                                                                                page,
-                                                                                view->scale,
-                                                                                NULL);
-
-               if (current_pixbuf == NULL)
-                       scaled_image = NULL;
-               else if (width == gdk_pixbuf_get_width (current_pixbuf) &&
-                        height == gdk_pixbuf_get_height (current_pixbuf))
-                       scaled_image = g_object_ref (current_pixbuf);
-               else
-                       /* FIXME: We don't want to scale the whole area, just the right
-                        * area of it */
-                       scaled_image = gdk_pixbuf_scale_simple (current_pixbuf,
-                                                               width, height,
-                                                               GDK_INTERP_NEAREST);
-
-               if (selection_pixbuf == NULL)
-                       scaled_selection = NULL;
-               else if (width == gdk_pixbuf_get_width (selection_pixbuf) &&
-                        height == gdk_pixbuf_get_height (selection_pixbuf))
-                       scaled_selection = g_object_ref (selection_pixbuf);
-               else
-                       /* FIXME: We don't want to scale the whole area, just the right
-                        * area of it */
-                       scaled_selection = gdk_pixbuf_scale_simple (selection_pixbuf,
-                                                                   width, height,
-                                                                   GDK_INTERP_NEAREST);
-
-               if (scaled_image) {
-                       gdk_draw_pixbuf (GTK_WIDGET(view)->window,
-                                        GTK_WIDGET (view)->style->fg_gc[GTK_STATE_NORMAL],
-                                        scaled_image,
-                                        overlap.x - real_page_area.x,
-                                        overlap.y - real_page_area.y,
-                                        overlap.x, overlap.y,
-                                        overlap.width, overlap.height,
-                                        GDK_RGB_DITHER_NORMAL,
-                                        0, 0);
-                       g_object_unref (scaled_image);
-               } else {
+               if (!page_surface) {

                        draw_loading_text (view,
                                           &real_page_area,
                                           expose_area);
                        *page_ready = FALSE;
                        draw_loading_text (view,
                                           &real_page_area,
                                           expose_area);
                        *page_ready = FALSE;

+
+                       return;
+               }
+
+               ev_page_cache_get_size (view->page_cache,
+                                       page, view->rotation,
+                                       view->scale,
+                                       &width, &height);
+
+               cr = gdk_cairo_create (GTK_WIDGET (view)->window);
+               
+               cairo_save (cr);
+               
+               page_width = cairo_image_surface_get_width (page_surface);
+               page_height = cairo_image_surface_get_height (page_surface);
+               
+               cairo_rectangle (cr, overlap.x, overlap.y, overlap.width, overlap.height);
+               cairo_clip (cr);
+               
+               cairo_translate (cr, overlap.x, overlap.y);
+               
+               if (width != page_width || height != page_height) {
+                       cairo_pattern_set_filter (cairo_get_source (cr),
+                                                 CAIRO_FILTER_FAST);
+                       cairo_scale (cr,
+                                    (gdouble)width / page_width,
+                                    (gdouble)height / page_height);
+               }
+
+               cairo_surface_set_device_offset (page_surface,
+                                                overlap.x - real_page_area.x,
+                                                overlap.y - real_page_area.y);
+
+               cairo_set_source_surface (cr, page_surface, 0, 0);
+               cairo_paint (cr);
+
+               cairo_restore (cr);
+               
+               /* Get the selection pixbuf iff we have something to draw */
+               if (find_selection_for_page (view, page) &&
+                   view->selection_mode == EV_VIEW_SELECTION_TEXT) {
+                       selection_surface =
+                               ev_pixbuf_cache_get_selection_surface (view->pixbuf_cache,
+                                                                      page,
+                                                                      view->scale,
+                                                                      NULL);
+               }
+
+               if (!selection_surface) {
+                       cairo_destroy (cr);
+                       return;

                }
 
                }
 

-               if (scaled_selection) {
-                       gdk_draw_pixbuf (GTK_WIDGET(view)->window,
-                                        GTK_WIDGET (view)->style->fg_gc[GTK_STATE_NORMAL],
-                                        scaled_selection,
-                                        overlap.x - real_page_area.x,
-                                        overlap.y - real_page_area.y,
-                                        overlap.x, overlap.y,
-                                        overlap.width, overlap.height,
-                                        GDK_RGB_DITHER_NORMAL,
-                                        0, 0);
-                       g_object_unref (scaled_selection);
+               selection_width = cairo_image_surface_get_width (selection_surface);
+               selection_height = cairo_image_surface_get_height (selection_surface);
+
+               cairo_rectangle (cr, overlap.x, overlap.y, overlap.width, overlap.height);
+               cairo_clip (cr);
+               
+               cairo_translate (cr, overlap.x, overlap.y);
+
+               if (width != selection_width || height != selection_height) {
+                       cairo_pattern_set_filter (cairo_get_source (cr),
+                                                 CAIRO_FILTER_FAST);
+                       cairo_scale (cr,
+                                    (gdouble)width / selection_width,
+                                    (gdouble)height / selection_height);

                }
                }

+
+               cairo_surface_set_device_offset (selection_surface,
+                                                overlap.x - real_page_area.x,
+                                                overlap.y - real_page_area.y);
+
+               cairo_set_source_surface (cr, selection_surface, 0, 0);
+               cairo_paint (cr);
+               cairo_destroy (cr);

        }
 }
 
        }
 }
 


@@ -3191,6 +3237,14 @@ ev_view_class_init (EvViewClass *class)
                         NULL, NULL,
                         ev_marshal_VOID__VOID,
                         G_TYPE_NONE, 0, G_TYPE_NONE);
                         NULL, NULL,
                         ev_marshal_VOID__VOID,
                         G_TYPE_NONE, 0, G_TYPE_NONE);

+       signals[SIGNAL_HANDLE_LINK] = g_signal_new ("handle-link",
+                        G_TYPE_FROM_CLASS (object_class),
+                        G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                        G_STRUCT_OFFSET (EvViewClass, handle_link),
+                        NULL, NULL,
+                        g_cclosure_marshal_VOID__OBJECT,
+                        G_TYPE_NONE, 1,
+                        G_TYPE_OBJECT);

        signals[SIGNAL_EXTERNAL_LINK] = g_signal_new ("external-link",
                         G_TYPE_FROM_CLASS (object_class),
                         G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
        signals[SIGNAL_EXTERNAL_LINK] = g_signal_new ("external-link",
                         G_TYPE_FROM_CLASS (object_class),
                         G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,


@@ -3366,10 +3420,17 @@ page_changed_cb (EvPageCache *page_cache,
                 EvView      *view)
 {
        if (view->current_page != new_page) {
                 EvView      *view)
 {
        if (view->current_page != new_page) {

+               gint x, y;
+               

                view->current_page = new_page;
                view->pending_scroll = SCROLL_TO_PAGE_POSITION;
                view->current_page = new_page;
                view->pending_scroll = SCROLL_TO_PAGE_POSITION;

+

                if (view->presentation)
                        ev_view_presentation_transition_start (view);
                if (view->presentation)
                        ev_view_presentation_transition_start (view);

+               
+               gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
+               handle_link_over_xy (view, x, y);
+               

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


@@ -3381,10 +3442,12 @@ page_changed_cb (EvPageCache *page_cache,
        }
 }
 
        }
 }
 

-static void on_adjustment_value_changed (GtkAdjustment  *adjustment,
-                                        EvView *view)
+static void
+on_adjustment_value_changed (GtkAdjustment *adjustment,
+                            EvView        *view)

 {
        int dx = 0, dy = 0;
 {
        int dx = 0, dy = 0;

+       gint x, y;

 
        if (! GTK_WIDGET_REALIZED (view))
                return;
 
        if (! GTK_WIDGET_REALIZED (view))
                return;


@@ -3403,12 +3466,13 @@ static void on_adjustment_value_changed (GtkAdjustment  *adjustment,
                view->scroll_y = 0;
        }
 
                view->scroll_y = 0;
        }
 

-

        if (view->pending_resize)
                gtk_widget_queue_draw (GTK_WIDGET (view));
        else
                gdk_window_scroll (GTK_WIDGET (view)->window, dx, dy);
        if (view->pending_resize)
                gtk_widget_queue_draw (GTK_WIDGET (view));
        else
                gdk_window_scroll (GTK_WIDGET (view)->window, dx, dy);

-
+               
+       gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
+       handle_link_over_xy (view, x, y);

 
        if (view->document)
                view_update_range_and_current_page (view);
 
        if (view->document)
                view_update_range_and_current_page (view);


@@ -3431,6 +3495,9 @@ setup_caches (EvView *view)
        g_signal_connect (view->page_cache, "page-changed", G_CALLBACK (page_changed_cb), view);
        view->pixbuf_cache = ev_pixbuf_cache_new (GTK_WIDGET (view), view->document);
        g_signal_connect (view->pixbuf_cache, "job-finished", G_CALLBACK (job_finished_cb), view);
        g_signal_connect (view->page_cache, "page-changed", G_CALLBACK (page_changed_cb), view);
        view->pixbuf_cache = ev_pixbuf_cache_new (GTK_WIDGET (view), view->document);
        g_signal_connect (view->pixbuf_cache, "job-finished", G_CALLBACK (job_finished_cb), view);

+       page_changed_cb (view->page_cache,
+                        ev_page_cache_get_current_page (view->page_cache),
+                        view);

 }
 
 static void
 }
 
 static void


@@ -3517,7 +3584,7 @@ ev_view_set_zoom (EvView   *view,
                cairo_surface_destroy (view->loading_text);
                view->loading_text = NULL;
        }
                cairo_surface_destroy (view->loading_text);
                view->loading_text = NULL;
        }

-       
+

        view->scale = scale;
        view->pending_resize = TRUE;
 
        view->scale = scale;
        view->pending_resize = TRUE;
 


@@ -3750,6 +3817,9 @@ ev_view_zoom_in (EvView *view)
 {
        g_return_if_fail (view->sizing_mode == EV_SIZING_FREE);
 
 {
        g_return_if_fail (view->sizing_mode == EV_SIZING_FREE);
 

+       if (view->presentation)
+               return;
+       

        view->pending_scroll = SCROLL_TO_CENTER;
        ev_view_set_zoom (view, ZOOM_IN_FACTOR, TRUE);
 }
        view->pending_scroll = SCROLL_TO_CENTER;
        ev_view_set_zoom (view, ZOOM_IN_FACTOR, TRUE);
 }


@@ -3759,6 +3829,9 @@ ev_view_zoom_out (EvView *view)
 {
        g_return_if_fail (view->sizing_mode == EV_SIZING_FREE);
 
 {
        g_return_if_fail (view->sizing_mode == EV_SIZING_FREE);
 

+       if (view->presentation)
+               return;
+       

        view->pending_scroll = SCROLL_TO_CENTER;
        ev_view_set_zoom (view, ZOOM_OUT_FACTOR, TRUE);
 }
        view->pending_scroll = SCROLL_TO_CENTER;
        ev_view_set_zoom (view, ZOOM_OUT_FACTOR, TRUE);
 }


@@ -4395,8 +4468,6 @@ compute_new_selection_text (EvView   *view,
 
        }
 
 
        }
 

-
-

        /* Now create a list of EvViewSelection's for the affected
         * pages.  This could be an empty list, a list of just one
         * page or a number of pages.*/
        /* Now create a list of EvViewSelection's for the affected
         * pages.  This could be an empty list, a list of just one
         * page or a number of pages.*/


@@ -4503,10 +4574,12 @@ merge_selection_region (EvView *view,
                 * region too. */
                if (new_sel) {
                        GdkRegion *tmp_region = NULL;
                 * region too. */
                if (new_sel) {
                        GdkRegion *tmp_region = NULL;

-                       ev_pixbuf_cache_get_selection_pixbuf (view->pixbuf_cache,
-                                                             cur_page,
-                                                             view->scale,
-                                                             &tmp_region);
+
+                       ev_pixbuf_cache_get_selection_surface (view->pixbuf_cache,
+                                                              cur_page,
+                                                              view->scale,
+                                                              &tmp_region);
+

                        if (tmp_region) {
                                new_sel->covered_region = gdk_region_copy (tmp_region);
                        }
                        if (tmp_region) {
                                new_sel->covered_region = gdk_region_copy (tmp_region);
                        }


@@ -4514,8 +4587,7 @@ merge_selection_region (EvView *view,
 
                /* Now we figure out what needs redrawing */
                if (old_sel && new_sel) {
 
                /* Now we figure out what needs redrawing */
                if (old_sel && new_sel) {

-                       if (old_sel->covered_region &&
-                           new_sel->covered_region) {
+                       if (old_sel->covered_region && new_sel->covered_region) {

                                /* We only want to redraw the areas that have
                                 * changed, so we xor the old and new regions
                                 * and redraw if it's different */
                                /* We only want to redraw the areas that have
                                 * changed, so we xor the old and new regions
                                 * and redraw if it's different */


@@ -4547,6 +4619,12 @@ merge_selection_region (EvView *view,
                        GdkRectangle page_area;
                        GtkBorder border;
 
                        GdkRectangle page_area;
                        GtkBorder border;
 

+                       /* I don't know why but the region is smaller
+                        * than expected. This hack fixes it, I guess
+                        * 10 pixels more won't hurt
+                        */
+                       gdk_region_shrink (region, -5, -5);
+

                        get_page_extents (view, cur_page, &page_area, &border);
                        gdk_region_offset (region,
                                           page_area.x + border.left - view->scroll_x,
                        get_page_extents (view, cur_page, &page_area, &border);
                        gdk_region_offset (region,
                                           page_area.x + border.left - view->scroll_x,


@@ -4642,6 +4720,7 @@ get_selected_text (EvView *ev_view)
 {
        GString *text;
        GList *l;
 {
        GString *text;
        GList *l;

+       gchar *normalized_text;

 
        text = g_string_new (NULL);
 
 
        text = g_string_new (NULL);
 


@@ -4660,7 +4739,9 @@ get_selected_text (EvView *ev_view)
 
        ev_document_doc_mutex_unlock ();
 
 
        ev_document_doc_mutex_unlock ();
 

-       return g_string_free (text, FALSE);
+       normalized_text = g_utf8_normalize (text->str, text->len, G_NORMALIZE_NFKC);
+       g_string_free (text, TRUE);
+       return normalized_text;

 }
 
 void
 }
 
 void


@@ -4694,8 +4775,10 @@ ev_view_primary_get_cb (GtkClipboard     *clipboard,
        }
 
        text = get_selected_text (ev_view);
        }
 
        text = get_selected_text (ev_view);

-       gtk_selection_data_set_text (selection_data, text, -1);
-       g_free (text);
+       if (text) {
+               gtk_selection_data_set_text (selection_data, text, -1);
+               g_free (text);
+       }

 }
 
 static void
 }
 
 static void