Merge lp:~bratsche/oif/evince-move-gestures-into-view into lp:~oif-team/oif/evince-gestures-trunk

[Cody Russell]

This branch requires the following first:

https://code.launchpad.net/~bratsche/libgrip/event-routing/+merge/43378

This moves the gesture logic out of EvWindow and into EvView, as well as simply updating evince to work with the libgrip changes in the other merge request.

[lp:~bratsche/oif/evince-move-gestures-into-view]

4213. By Cody Russell on 2011-01-07

Set some #define constants for velocity and angle.

Unmerged revisions

=== modified file 'configure.ac'
--- configure.ac	2010-11-23 14:39:57 +0000
+++ configure.ac	2010-12-10 22:15:28 +0000
@@ -154,6 +154,8 @@
 GNOME_ICON_THEME_REQUIRED=2.17.1
 LIBXML_REQUIRED=2.5.0
 
+GRIP_REQUIRED=0.1
+
 dnl Check dependencies
 
 # LIB_CFLAGS       for helpers and generic widgets. (libdocument, cut-and-paste)
@@ -165,7 +167,7 @@
 
 
 PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
-PKG_CHECK_MODULES(LIBVIEW, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gail$GAIL_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
+PKG_CHECK_MODULES(LIBVIEW, libgrip-0.1 >= $GRIP_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gail$GAIL_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
 PKG_CHECK_MODULES(BACKEND, cairo >= $CAIRO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
 PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
 
@@ -193,7 +195,7 @@
         ;;
 esac
 
-PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED libgrip-0.1 >= 0.1 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
+PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED libgrip-0.1 >= $GRIP_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
 
 # *********
 # SM client

=== modified file 'libview/ev-view-private.h'
--- libview/ev-view-private.h	2010-09-15 15:05:36 +0000
+++ libview/ev-view-private.h	2010-12-10 22:15:28 +0000
@@ -193,6 +193,14 @@
 
 	/* Accessibility */
 	gboolean a11y_enabled;
+
+	/* Gesture state */
+	gboolean enable_gestures;
+	gdouble drag_start_x;
+	gdouble drag_start_y;
+	gdouble pinch_start_x;
+	gdouble pinch_start_y;
+	gdouble pinch_start_radius;
 };
 
 struct _EvViewClass {

=== modified file 'libview/ev-view.c'
--- libview/ev-view.c	2010-11-30 05:18:17 +0000
+++ libview/ev-view.c	2010-12-10 22:15:28 +0000
@@ -28,6 +28,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include <libgrip/gripgesturemanager.h>
+
 #include "ev-mapping-list.h"
 #include "ev-document-forms.h"
 #include "ev-document-images.h"
@@ -50,6 +52,11 @@
 #define EV_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EV_TYPE_VIEW, EvViewClass))
 
 enum {
+	PROP_0,
+	PROP_ENABLE_GESTURES
+};
+
+enum {
 	SIGNAL_BINDING_ACTIVATED,
 	SIGNAL_HANDLE_LINK,
 	SIGNAL_EXTERNAL_LINK,
@@ -142,6 +149,14 @@
 static void          hide_annotation_windows                 (EvView             *view,
 							      gint                page);
 /*** GtkWidget implementation ***/
+static void       ev_view_get_property                       (GObject    *object,
+							      guint       prop_id,
+							      GValue     *value,
+							      GParamSpec *param_spec);
+static void       ev_view_set_property                       (GObject      *object,
+							      guint         prop_id,
+							      const GValue *value,
+							      GParamSpec   *param_spec);
 static void       ev_view_size_request_continuous_dual_page  (EvView             *view,
 							      GtkRequisition     *requisition);
 static void       ev_view_size_request_continuous            (EvView             *view,
@@ -279,6 +294,12 @@
 							      gpointer            data);
 static void       ev_view_update_primary_selection           (EvView             *ev_view);
 
+/*** Gestures ***/
+static void       ev_gesture_callback                        (GtkWidget          *widget,
+							      GripTimeType        time_type,
+							      GripGestureEvent   *event,
+							      gpointer            user_data);
+
 G_DEFINE_TYPE (EvView, ev_view, GTK_TYPE_LAYOUT)
 
 /* HeightToPage cache */
@@ -2976,6 +2997,114 @@
 	return FALSE;
 }
 
+/*** Gesture implementation ***/
+static void
+ev_gesture_callback (GtkWidget        *widget,
+                     GripTimeType      time_type,
+                     GripGestureEvent *event,
+                     gpointer          user_data)
+{
+	EvView *view = EV_VIEW (widget);
+
+        if (time_type == GRIP_TIME_START) {
+                switch (event->type) {
+                case GRIP_GESTURE_DRAG: {
+                        GripEventGestureDrag *drag = (GripEventGestureDrag *)event;
+
+                        view->drag_start_x = drag->position_x;
+                        view->drag_start_y = drag->position_y;
+
+                        break;
+                }
+
+                case GRIP_GESTURE_PINCH: {
+                        GripEventGesturePinch *pinch = (GripEventGesturePinch *)event;
+
+                        view->pinch_start_x = pinch->focus_x;
+                        view->pinch_start_y = pinch->focus_y;
+                        view->pinch_start_radius = pinch->radius;
+                        break;
+                }
+
+                default:
+                        break;
+                }
+        } else if (time_type == GRIP_TIME_END) {
+                switch (event->type) {
+                case GRIP_GESTURE_DRAG: {
+                        GripEventGestureDrag *drag = (GripEventGestureDrag *)event;
+
+                        if (drag->velocity_y >= 1.0 &&
+                            drag->position_y > view->drag_start_y) {
+                                ev_view_previous_page (view);
+                        } else if (drag->velocity_y <= -1.0 &&
+                                   drag->position_y < view->drag_start_y) {
+                                ev_view_next_page (view);
+                        } else if (drag->velocity_x >= 1.0 &&
+                                   drag->position_x > view->drag_start_x) {
+                                ev_view_previous_page (view);
+                        } else if (drag->velocity_x <= -1.0 &&
+                                   drag->position_x < view->drag_start_x) {
+                                ev_view_next_page (view);
+                        }
+
+                        break;
+                }
+
+                case GRIP_GESTURE_ROTATE: {
+                        GripEventGestureRotate *rotate = (GripEventGestureRotate *)event;
+			gint rotation = ev_document_model_get_rotation (view->model);
+
+                        if (rotate->angle >= 1.0) {
+                                ev_document_model_set_rotation (view->model,
+								rotation + 90);
+                        } else if (rotate->angle <= -1.0) {
+                                ev_document_model_set_rotation (view->model,
+								rotation - 90);
+                        }
+
+                        break;
+                }
+
+                default:
+                        break;
+                }
+        } else {
+                switch (event->type) {
+                case GRIP_GESTURE_PINCH: {
+                        GripEventGesturePinch *pinch = (GripEventGesturePinch *)event;
+                        gdouble increment = pinch->radius_delta * 0.01;
+
+                        if (increment < 0.0) increment = -increment;
+                        increment += 1.0;
+
+                        if (pinch->radius_delta < 0.0) {
+                                ev_document_model_set_sizing_mode (view->model, EV_SIZING_FREE);
+                                ev_view_zoom_out_smooth (view, (1.0 / increment));
+                        } else if (pinch->radius_delta > 0.0) {
+                                ev_document_model_set_sizing_mode (view->model, EV_SIZING_FREE);
+                                ev_view_zoom_in_smooth (view, increment);
+			}
+
+                        break;
+                }
+
+                case GRIP_GESTURE_DRAG: {
+                        GripEventGestureDrag *drag = (GripEventGestureDrag *)event;
+
+                        if (drag->fingers == 1) {
+                                ev_view_drag (view,
+                                              (gdouble)-drag->delta_x,
+                                              (gdouble)-drag->delta_y);
+                        }
+                }
+
+                default:
+                        break;
+                }
+        }
+}
+
 /*** GtkWidget implementation ***/
 
 static void
@@ -4622,6 +4751,80 @@
 }
 
 static void
+ev_view_get_property (GObject    *object,
+		      guint       prop_id,
+		      GValue     *value,
+		      GParamSpec *param_spec)
+{
+	EvView *view = EV_VIEW (object);
+
+	switch (prop_id) {
+	case PROP_ENABLE_GESTURES:
+		g_value_set_boolean (value, view->enable_gestures);
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object,
+						   prop_id,
+						   param_spec);
+	}
+}
+
+static void
+ev_view_set_property (GObject      *object,
+		      guint         prop_id,
+		      const GValue *value,
+		      GParamSpec   *param_spec)
+{
+	EvView *view = EV_VIEW (object);
+	GtkWidget *widget;
+	GripGestureManager *manager;
+
+	switch (prop_id) {
+	case PROP_ENABLE_GESTURES:
+		view->enable_gestures = g_value_get_boolean (value);
+
+		widget = GTK_WIDGET (view);
+                manager = grip_gesture_manager_get ();
+
+                grip_gesture_manager_register_window (manager,
+                                                      widget,
+                                                      GRIP_GESTURE_PINCH,
+                                                      2,
+                                                      ev_gesture_callback,
+                                                      NULL, NULL);
+
+                grip_gesture_manager_register_window (manager,
+                                                      widget,
+                                                      GRIP_GESTURE_DRAG,
+                                                      2,
+                                                      ev_gesture_callback,
+                                                      NULL, NULL);
+
+                grip_gesture_manager_register_window (manager,
+                                                      widget,
+                                                      GRIP_GESTURE_DRAG,
+                                                      1,
+                                                      ev_gesture_callback,
+                                                      NULL, NULL);
+
+                grip_gesture_manager_register_window (manager,
+                                                      widget,
+                                                      GRIP_GESTURE_ROTATE,
+                                                      2,
+                                                      ev_gesture_callback,
+                                                      NULL, NULL);
+
+		break;
+
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object,
+						   prop_id,
+						   param_spec);
+	}
+}
+
+static void
 ev_view_class_init (EvViewClass *class)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
@@ -4631,6 +4834,8 @@
 	GtkBindingSet *binding_set;
 
 	object_class->finalize = ev_view_finalize;
+	object_class->get_property = ev_view_get_property;
+	object_class->set_property = ev_view_set_property;
 
 	widget_class->expose_event = ev_view_expose_event;
 	widget_class->button_press_event = ev_view_button_press_event;
@@ -4724,6 +4929,15 @@
 		         G_TYPE_NONE, 0,
 			 G_TYPE_NONE);
 
+	g_object_class_install_property (object_class,
+					 PROP_ENABLE_GESTURES,
+					 g_param_spec_boolean ("enable-gestures",
+							       "Enable gestures",
+							       "Whether to enable gestures",
+							       FALSE,
+							       G_PARAM_WRITABLE |
+							       G_PARAM_CONSTRUCT_ONLY));
+
 	binding_set = gtk_binding_set_by_class (class);
 
 	add_scroll_binding_keypad (binding_set, GDK_Left,  0, GTK_SCROLL_STEP_BACKWARD, TRUE);
@@ -4775,6 +4989,7 @@
 	gtk_layout_set_vadjustment (GTK_LAYOUT (view), NULL);
 }
 
+
 /*** Callbacks ***/
 
 static void
@@ -4911,11 +5126,13 @@
 }
 
 GtkWidget*
-ev_view_new (void)
+ev_view_new (gboolean enable_gestures)
 {
 	GtkWidget *view;
 
-	view = g_object_new (EV_TYPE_VIEW, NULL);
+	view = g_object_new (EV_TYPE_VIEW,
+			     "enable-gestures", enable_gestures,
+			     NULL);
 
 	return view;
 }

=== modified file 'libview/ev-view.h'
--- libview/ev-view.h	2010-11-30 05:18:17 +0000
+++ libview/ev-view.h	2010-12-10 22:15:28 +0000
@@ -46,7 +46,7 @@
 
 GType		ev_view_get_type	    (void) G_GNUC_CONST;
 
-GtkWidget*	ev_view_new		    (void);
+GtkWidget*	ev_view_new		    (gboolean         enable_gestures);
 void		ev_view_set_model	    (EvView          *view,
 					     EvDocumentModel *model);
 void 		ev_view_set_loading         (EvView 	     *view,

=== modified file 'previewer/ev-previewer-window.c'
--- previewer/ev-previewer-window.c	2010-07-26 13:34:18 +0000
+++ previewer/ev-previewer-window.c	2010-12-10 22:15:28 +0000
@@ -607,7 +607,7 @@
 					GTK_POLICY_AUTOMATIC,
 					GTK_POLICY_AUTOMATIC);
 
-	window->view = EV_VIEW (ev_view_new ());
+	window->view = EV_VIEW (ev_view_new (FALSE));
 	g_signal_connect_object (window->view, "focus_in_event",
 				 G_CALLBACK (view_focus_changed),
 				 window, 0);

=== modified file 'shell/ev-window.c'
--- shell/ev-window.c	2010-12-07 08:43:18 +0000
+++ shell/ev-window.c	2010-12-10 22:15:28 +0000
@@ -41,8 +41,6 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#include <libgrip/gripgesturemanager.h>
-
 #include "egg-editable-toolbar.h"
 #include "egg-toolbar-editor.h"
 #include "egg-toolbars-model.h"
@@ -218,13 +216,6 @@
 	guint  dbus_object_id;
 	gchar *dbus_object_path;
 #endif
-
-	gdouble drag_start_x;
-	gdouble drag_start_y;
-
-	gdouble pinch_start_x;
-	gdouble pinch_start_y;
-	gdouble pinch_start_radius;
 };
 
 #define EV_WINDOW_GET_PRIVATE(object) \
@@ -5433,151 +5424,6 @@
 }
 
 static void
-ev_gesture_callback (GtkWindow        *window,
-		     GripTimeType      time_type,
-		     GripGestureEvent *event,
-		     gpointer          user_data)
-{
-	EvWindowPrivate *priv = EV_WINDOW (window)->priv;
-
-	if (time_type == GRIP_TIME_START) {
-		switch (event->type) {
-		case GRIP_GESTURE_DRAG: {
-			GripEventGestureDrag *drag = (GripEventGestureDrag *)event;
-
-			priv->drag_start_x = drag->position_x;
-			priv->drag_start_y = drag->position_y;
-
-			break;
-		}
-
-		case GRIP_GESTURE_PINCH: {
-			GripEventGesturePinch *pinch = (GripEventGesturePinch *)event;
-
-			priv->pinch_start_x = pinch->focus_x;
-			priv->pinch_start_y = pinch->focus_y;
-			priv->pinch_start_radius = pinch->radius;
-			break;
-		}
-
-		default:
-			break;
-		}
-	} else if (time_type == GRIP_TIME_END) {
-		switch (event->type) {
-		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_previous_page (NULL, EV_WINDOW (window));
-			} else 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_x >= 1.0 &&
-				   drag->position_x > priv->drag_start_x) {
-				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));
-			}
-
-			break;
-		}
-
-		case GRIP_GESTURE_ROTATE: {
-			GripEventGestureRotate *rotate = (GripEventGestureRotate *)event;
-
-			if (rotate->angle >= 1.0) {
-				ev_window_cmd_edit_rotate_right (NULL, EV_WINDOW (window));
-			} else if (rotate->angle <= -1.0) {
-				ev_window_cmd_edit_rotate_left (NULL, EV_WINDOW (window));
-			}
-
-			break;
-		}
-
-		default:
-			break;
-		}
-	} else {
-		switch (event->type) {
-		case GRIP_GESTURE_PINCH: {
-			GripEventGesturePinch *pinch = (GripEventGesturePinch *)event;
-			gdouble increment = pinch->radius_delta * 0.01;
-
-			if (increment < 0.0) increment = -increment;
-			increment += 1.0;
-
-			if (pinch->radius_delta < 0.0) {
-				ev_document_model_set_sizing_mode (priv->model, EV_SIZING_FREE);
-				ev_view_zoom_out_smooth (EV_VIEW (priv->view), (1.0 / increment));
-			} else if (pinch->radius_delta > 0.0) {
-				ev_document_model_set_sizing_mode (priv->model, EV_SIZING_FREE);
-				ev_view_zoom_in_smooth (EV_VIEW (priv->view), increment);
-			}
-
-			break;
-		}
-
-		case GRIP_GESTURE_DRAG: {
-			GripEventGestureDrag *drag = (GripEventGestureDrag *)event;
-
-			if (drag->fingers == 1) {
-				ev_view_drag (EV_VIEW (priv->view),
-					      (gdouble)-drag->delta_x,
-					      (gdouble)-drag->delta_y);
-			}
-		}
-
-		default:
-			break;
-		}
-	}
-}
-
-static void
-on_window_mapped (GtkWidget *widget)
-{
-	GtkWindow *window;
-	GripGestureManager *manager;
-
-	window = GTK_WINDOW (widget);
-
-	if (ev_application_get_gestures_enabled (EV_APP)) {
-		manager = grip_gesture_manager_get ();
-
-		grip_gesture_manager_register_window (manager,
-						      window,
-						      GRIP_GESTURE_PINCH,
-						      2,
-						      ev_gesture_callback,
-						      NULL, NULL);
-
-		grip_gesture_manager_register_window (manager,
-						      window,
-						      GRIP_GESTURE_DRAG,
-						      2,
-						      ev_gesture_callback,
-						      NULL, NULL);
-
-                grip_gesture_manager_register_window (manager,
-                                                      window,
-                                                      GRIP_GESTURE_DRAG,
-                                                      1,
-                                                      ev_gesture_callback,
-                                                      NULL, NULL);
-
-		grip_gesture_manager_register_window (manager,
-						      window,
-						      GRIP_GESTURE_ROTATE,
-						      2,
-						      ev_gesture_callback,
-						      NULL, NULL);
-	}
-}
-
-static void
 ev_window_class_init (EvWindowClass *ev_window_class)
 {
 	GObjectClass *g_object_class = G_OBJECT_CLASS (ev_window_class);
@@ -6914,9 +6760,6 @@
 	g_signal_connect (ev_window, "window_state_event",
 			  G_CALLBACK (window_state_event_cb), NULL);
 
-	g_signal_connect (ev_window, "show",
-			  G_CALLBACK (on_window_mapped), NULL);
-
 	ev_window->priv = EV_WINDOW_GET_PRIVATE (ev_window);
 
 #ifdef ENABLE_DBUS
@@ -7142,7 +6985,7 @@
 			ev_window->priv->view_box);
 	gtk_widget_show (ev_window->priv->view_box);
 
-	ev_window->priv->view = ev_view_new ();
+	ev_window->priv->view = ev_view_new (ev_application_get_gestures_enabled (EV_APP));
 	ev_view_set_page_cache_size (EV_VIEW (ev_window->priv->view), PAGE_CACHE_SIZE);
 	ev_view_set_model (EV_VIEW (ev_window->priv->view), ev_window->priv->model);