Merge lp:~bratsche/oif/evince-drag-selection into lp:~oif-team/oif/evince-gestures-trunk

[Cody Russell]

[Duncan McGreggor (oubiwann)]

I think that boulabiar mentioned this in another review, but the drag goes the wrong way for touch screen -- dragging left pans the substrate right, and vice versa.

Also, I noted that during pinch, one can't move the substrate, so we didn't get that for free. I'll update the related ticket.

review: Needs Fixing

[Duncan McGreggor (oubiwann)]

I'm trying to tap the icons in the tool bar (e.g., the previous and next buttons) and there's no response. Has that branch been merged yet? If not, disregard. If so, then there's a problem, 'case tap on the toolbar isn't working...

review: Needs Fixing

[Duncan McGreggor (oubiwann)]

Now, for the actual functionality implemented in this branch. I'm getting inaccurate selections of text. Here are the steps I'm taking:

 1. double tap to get selection mode
 2. drag my finger down to select text
 3. text selection is off by a little over a line in some areas, a few words in other areas, and several lines in others.

I thought this might be due to the finger overlapping the width of a line, so I zoomed in very large and tried it. In some instances, this actually made the results worse (the selection would jump several lines from where I actually touched).

review: Needs Fixing

[Mohamed IKBEL Boulabiar (boulabiar)]

> I think that boulabiar mentioned this in another review, but the drag goes the
> wrong way for touch screen -- dragging left pans the substrate right, and vice
> versa.

For this issue, it is corrected in this branch
https://code.launchpad.net/~boulabiar/evince/evince-drag-fixes

[Duncan McGreggor (oubiwann)]

Thanks, Ikbel. I'm assuming that even though you put this in the evince namespace, you actually branched from Cody's work, yes?

Cody, if you end up using this, please don't patch. Please merge Ikbel's branch to yours. This will preserve his contributions and history.

Thanks!

Unmerged revisions

4213. By Cody Russell on 2010-12-02

Remove unused commented code.

4212. By Cody Russell on 2010-12-02

Selection clearing on tap.

4211. By Cody Russell on 2010-12-02

Tap-and-drag selection

=== modified file 'libview/ev-view.c'
--- libview/ev-view.c	2010-11-30 05:18:17 +0000
+++ libview/ev-view.c	2010-12-02 20:20:11 +0000
@@ -267,7 +267,6 @@
 							      EvSelectionStyle    style,
 							      GdkPoint           *start,
 							      GdkPoint           *stop);
-static void       clear_selection                            (EvView             *view);
 static void       clear_link_selected                        (EvView             *view);
 static void       selection_free                             (EvViewSelection    *selection);
 static char*      get_selected_text                          (EvView             *ev_view);
@@ -3526,7 +3525,7 @@
 start_selection_for_event (EvView         *view,
 			   GdkEventButton *event)
 {
-	clear_selection (view);
+	ev_view_clear_selection (view);
 
 	view->selection_info.start.x = event->x + view->scroll_x;
 	view->selection_info.start.y = event->y + view->scroll_y;
@@ -4085,7 +4084,7 @@
 		ev_view_update_primary_selection (view);
 		
 		if (view->selection_info.in_drag) {
-			clear_selection (view);
+			ev_view_clear_selection (view);
 			gtk_widget_queue_draw (widget);
 		}
 		
@@ -4511,7 +4510,7 @@
 {
 	EvView *view = EV_VIEW (object);
 
-	clear_selection (view);
+	ev_view_clear_selection (view);
 	clear_link_selected (view);
 
 	if (view->synctex_result) {
@@ -5137,7 +5136,7 @@
 	ev_view_remove_all (view);
 
 	if (rotation != 0)
-		clear_selection (view);
+		ev_view_clear_selection (view);
 }
 
 static void
@@ -6056,8 +6055,8 @@
 	g_free (selection);
 }
 
-static void
-clear_selection (EvView *view)
+void
+ev_view_clear_selection (EvView *view)
 {
 	if (view->selection_info.selections) {
 		g_list_foreach (view->selection_info.selections, (GFunc)selection_free, NULL);
@@ -6081,7 +6080,7 @@
 	if (view->rotation != 0)
 		return;
 
-	clear_selection (view);
+	ev_view_clear_selection (view);
 	
 	n_pages = ev_document_get_n_pages (view->document);
 	for (i = 0; i < n_pages; i++) {
@@ -6104,6 +6103,129 @@
 	gtk_widget_queue_draw (GTK_WIDGET (view));
 }
 
+void
+ev_view_begin_selection (EvView  *view,
+			 gdouble  x,
+			 gdouble  y)
+{
+	GtkWidget *widget = GTK_WIDGET (view);
+
+	if (!view->document)
+		return;
+
+	if (!gtk_widget_has_focus (widget))
+		gtk_widget_grab_focus (widget);
+
+	if (view->window_child_focus) {
+		EvAnnotationWindow *window;
+		EvAnnotation       *annot;
+
+		window = EV_ANNOTATION_WINDOW (view->window_child_focus->window);
+		annot  = ev_annotation_window_get_annotation (window);
+		ev_annotation_window_ungrab_focus (window);
+		view->window_child_focus = NULL;
+	}
+
+	view->selection_info.in_drag = FALSE;
+	view->selection_info.in_selection = TRUE;
+
+	if (EV_IS_SELECTION (view->document) && !view->selection_info.selections) {
+		ev_view_clear_selection (view);
+
+		view->selection_info.start.x = x + view->scroll_x;
+		view->selection_info.start.y = y + view->scroll_y;
+		view->selection_info.style = EV_SELECTION_STYLE_GLYPH;
+
+		compute_selections (view,
+				    view->selection_info.style,
+				    &(view->selection_info.start),
+				    &(view->selection_info.start));
+	}
+}
+
+void
+ev_view_update_selection (EvView  *view,
+			  gdouble  x,
+			  gdouble  y)
+{
+	GdkWindow *bin_window;
+
+	if (!view->document)
+		return;
+
+	bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (view));
+
+	/* TODO: Handle DND stuff here. */
+
+	if (!view->selection_scroll_id)
+		view->selection_scroll_id = g_timeout_add (SCROLL_TIME,
+							   (GSourceFunc)selection_scroll_timeout_cb,
+							   view);
+	else
+		selection_scroll_timeout_cb (view);
+
+	view->selection_info.in_selection = TRUE;
+	view->motion.x = x + view->scroll_x;
+	view->motion.y = y + view->scroll_y;
+
+	if (!view->selection_update_id)
+		view->selection_update_id = g_idle_add ((GSourceFunc)selection_update_idle_cb, view);
+}
+
+void
+ev_view_end_selection (EvView  *view,
+		       gdouble  x,
+		       gdouble  y)
+{
+	view->image_dnd_info.in_drag = FALSE;
+
+	if (view->scroll_info.autoscrolling) {
+		ev_view_autoscroll_stop (view);
+		return;
+	}
+
+	if (view->drag_info.in_drag) {
+		view->drag_info.release_timeout_id = g_timeout_add (20,
+								    (GSourceFunc)ev_view_scroll_drag_release, view);
+	}
+
+	view->drag_info.in_drag = FALSE;
+
+	if (view->adding_annot) {
+		view->adding_annot = FALSE;
+		ev_view_handle_cursor_over_xy (view, x, y);
+
+		ev_view_create_annotation (view,
+					   view->adding_annot_type,
+					   x + view->scroll_x,
+					   y + view->scroll_y);
+
+		return;
+	}
+
+	if (view->selection_scroll_id) {
+		g_source_remove (view->selection_scroll_id);
+		view->selection_scroll_id = 0;
+	}
+
+	if (view->selection_update_id) {
+		g_source_remove (view->selection_update_id);
+		view->selection_update_id = 0;
+	}
+
+	if (view->selection_info.selections) {
+		clear_link_selected (view);
+		ev_view_update_primary_selection (view);
+
+		if (view->selection_info.in_drag) {
+			ev_view_clear_selection (view);
+			gtk_widget_queue_draw (GTK_WIDGET (view));
+		}
+
+		view->selection_info.in_drag = FALSE;
+	}
+}
+
 gboolean
 ev_view_get_has_selection (EvView *view)
 {
@@ -6196,7 +6318,7 @@
 {
 	EvView *view = EV_VIEW (data);
 
-	clear_selection (view);
+	ev_view_clear_selection (view);
 	clear_link_selected (view);
 }
 

=== modified file 'libview/ev-view.h'
--- libview/ev-view.h	2010-11-30 05:18:17 +0000
+++ libview/ev-view.h	2010-12-02 20:20:11 +0000
@@ -62,6 +62,17 @@
 void		ev_view_select_all	  (EvView         *view);
 gboolean        ev_view_get_has_selection (EvView         *view);
 
+void            ev_view_begin_selection   (EvView         *view,
+                                           gdouble         x,
+                                           gdouble         y);
+void            ev_view_update_selection  (EvView         *view,
+                                           gdouble         x,
+                                           gdouble         y);
+void            ev_view_end_selection     (EvView         *view,
+                                           gdouble         x,
+                                           gdouble         y);
+void            ev_view_clear_selection   (EvView         *view);
+
 /* Page size */
 gboolean	ev_view_can_zoom_in       (EvView         *view);
 void		ev_view_zoom_in		  (EvView         *view);

=== modified file 'shell/ev-window.c'
--- shell/ev-window.c	2010-11-30 15:09:59 +0000
+++ shell/ev-window.c	2010-12-02 20:20:11 +0000
@@ -225,6 +225,9 @@
 	gdouble pinch_start_x;
 	gdouble pinch_start_y;
 	gdouble pinch_start_radius;
+
+	guint32  last_tap;
+	gboolean in_selection;
 };
 
 #define EV_WINDOW_GET_PRIVATE(object) \
@@ -5448,6 +5451,15 @@
 			priv->drag_start_x = drag->position_x;
 			priv->drag_start_y = drag->position_y;
 
+
+			if (drag->timestamp - priv->last_tap < 500 &&
+			    drag->fingers == 1) {
+				priv->in_selection = TRUE;
+				ev_view_begin_selection (EV_VIEW (priv->view),
+							 drag->focus_x,
+							 drag->focus_y);
+			}
+
 			break;
 		}
 
@@ -5468,18 +5480,26 @@
 		case GRIP_GESTURE_DRAG: {
 			GripEventGestureDrag *drag = (GripEventGestureDrag *)event;
 
-			if (drag->velocity_y >= 1.0 &&
-			    drag->position_y > priv->drag_start_y) {
-				ev_window_cmd_go_next_page (NULL, EV_WINDOW (window));
-			} else if (drag->velocity_y <= -1.0 &&
-				   drag->position_y < priv->drag_start_y) {
-				ev_window_cmd_go_previous_page (NULL, EV_WINDOW (window));
-			} else if (drag->velocity_x >= 1.0 &&
-				   drag->position_x > priv->drag_start_x) {
-				ev_window_cmd_go_next_page (NULL, EV_WINDOW (window));
-			} else if (drag->velocity_x <= -1.0 &&
-				   drag->position_x < priv->drag_start_x) {
-				ev_window_cmd_go_previous_page (NULL, EV_WINDOW (window));
+			if (!priv->in_selection) {
+				if (drag->velocity_y >= 1.0 &&
+				    drag->position_y > priv->drag_start_y) {
+					ev_window_cmd_go_next_page (NULL, EV_WINDOW (window));
+				} else if (drag->velocity_y <= -1.0 &&
+					   drag->position_y < priv->drag_start_y) {
+					ev_window_cmd_go_previous_page (NULL, EV_WINDOW (window));
+				} else if (drag->velocity_x >= 1.0 &&
+					   drag->position_x > priv->drag_start_x) {
+					ev_window_cmd_go_next_page (NULL, EV_WINDOW (window));
+				} else if (drag->velocity_x <= -1.0 &&
+					   drag->position_x < priv->drag_start_x) {
+					ev_window_cmd_go_previous_page (NULL, EV_WINDOW (window));
+				}
+			} else {
+				priv->in_selection = FALSE;
+
+				ev_view_end_selection (EV_VIEW (priv->view),
+						       drag->focus_x,
+						       drag->focus_y);
 			}
 
 			break;
@@ -5524,12 +5544,31 @@
 			GripEventGestureDrag *drag = (GripEventGestureDrag *)event;
 
 			if (drag->fingers == 1) {
-				ev_view_drag (EV_VIEW (priv->view),
-					      (gdouble)drag->delta_x,
-					      (gdouble)-drag->delta_y);
+				if (priv->in_selection) {
+					ev_view_update_selection (EV_VIEW (priv->view),
+								  drag->position_x + drag->delta_x,
+								  drag->position_y + drag->delta_y);
+				} else {
+					ev_view_drag (EV_VIEW (priv->view),
+						      (gdouble)drag->delta_x,
+						      (gdouble)-drag->delta_y);
+				}
 			}
 		}
 
+			break;
+
+		case GRIP_GESTURE_TAP: {
+			GripEventGestureTap *tap = (GripEventGestureTap *)event;
+
+			priv->last_tap = tap->timestamp;
+
+			ev_view_clear_selection (EV_VIEW (priv->view));
+			gtk_widget_queue_draw (GTK_WIDGET (priv->view));
+
+			break;
+		}
+
 		default:
 			break;
 		}
@@ -5574,6 +5613,13 @@
 						      2,
 						      ev_gesture_callback,
 						      NULL, NULL);
+
+		grip_gesture_manager_register_window (manager,
+						      window,
+						      GRIP_GESTURE_TAP,
+						      1,
+						      ev_gesture_callback,
+						      NULL, NULL);
 	}
 }