X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-view.c;h=70555545668d8c842508053eb82ba850b121fcfa;hb=0164b34659c495690e3629e5d7c3e71c3efe2cca;hp=07fee0d7a11ba01339bb175f467c399efa167b65;hpb=09458b5fc51b3504582e76a12b7a57cbba332ac0;p=evince.git

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 07fee0d7..70555545 100644
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -236,8 +236,6 @@ static void       find_page_at_location                      (EvView
 							      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,
@@ -1007,14 +1005,6 @@ find_page_at_location (EvView  *view,
 	*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,
@@ -1481,9 +1471,10 @@ ev_view_motion_notify_event (GtkWidget      *widget,
 		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);
 
@@ -2962,6 +2953,7 @@ compute_new_selection_text (EvView   *view,
 	GList *list = NULL;
 	EvViewSelection *selection;
 	gint width, height;
+	int start_page, end_page;
 
 	g_assert (view->selection_mode == EV_VIEW_SELECTION_TEXT);
 
@@ -2971,7 +2963,18 @@ compute_new_selection_text (EvView   *view,
 	 * 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;