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

[Cody Russell]

[lp:~bratsche/oif/evince-libgrip]

4208. By Cody Russell on 2010-11-23

Merge from trunk, resolve conflicts.

[Duncan McGreggor (oubiwann)]

Hey Cody,

I tried building this but autogen fails since there's no package for libgrip... how do I work around that? (Or do you want to push a libgrip package into the PPA?).

review: Needs Information

[Cody Russell (bratsche)]

Need to package libgrip still. :/

[lp:~bratsche/oif/evince-libgrip]

4209. By Cody Russell on 2010-11-29

Fix warnings, resolve conflict.

[Cody Russell (bratsche)]

libgrip is packaged now and is in the PPA. I found a couple issues and fixed them in revno 4209.

[Mohamed IKBEL Boulabiar (boulabiar)]

I liked the factorization of ev_(pinch||drag||rotate)_gesture_(start||update||end) functions into one: ev_gesture_callback

Fully tested and works fine.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2010-09-21 18:17:40 +0000
+++ configure.ac	2010-11-29 17:47:48 +0000
@@ -193,7 +193,7 @@
         ;;
 esac
 
-PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED libido-0.1 >= 0.2 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 >= 0.1 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
 
 # *********
 # SM client
 
=== modified file 'shell/ev-window.c'
--- shell/ev-window.c	2010-11-23 14:45:21 +0000
+++ shell/ev-window.c	2010-11-29 17:47:48 +0000
@@ -41,7 +41,7 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#include <libido/idogesturemanager.h>
+#include <libgrip/gripgesturemanager.h>
 
 #include "egg-editable-toolbar.h"
 #include "egg-toolbar-editor.h"
@@ -5433,104 +5433,96 @@
 }
 
 static void
-ev_pinch_gesture_start (GtkWindow       *window,
-			IdoGestureEvent *event)
-{
-	EvWindowPrivate *priv = EV_WINDOW (window)->priv;
-	IdoEventGesturePinch *pinch = (IdoEventGesturePinch *)event;
-
-	priv->pinch_start_x = pinch->focus_x;
-	priv->pinch_start_y = pinch->focus_y;
-	priv->pinch_start_radius = pinch->radius;
-}
-
-static void
-ev_pinch_gesture_update (GtkWindow       *window,
-			 IdoGestureEvent *event)
-{
-	IdoEventGesturePinch *pinch = (IdoEventGesturePinch *)event;
-	EvWindowPrivate *priv = EV_WINDOW (window)->priv;
-	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 (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 (priv->view, increment);
-	}
-}
-
-static void
-ev_pinch_gesture_end (GtkWindow       *window,
-		      IdoGestureEvent *event)
-{
-}
-
-static void
-ev_drag_gesture_start (GtkWindow       *window,
-		       IdoGestureEvent *event)
-{
-	EvWindowPrivate *priv = EV_WINDOW (window)->priv;
-	IdoEventGestureDrag *drag = (IdoEventGestureDrag *)event;
-
-	priv->drag_start_x = drag->position_x;
-	priv->drag_start_y = drag->position_y;
-}
-
-static void
-ev_drag_gesture_update (GtkWindow       *window,
-			IdoGestureEvent *event)
-{
-}
-
-static void
-ev_drag_gesture_end (GtkWindow       *window,
-		     IdoGestureEvent *event)
-{
-	EvWindowPrivate *priv = EV_WINDOW (window)->priv;
-	IdoEventGestureDrag *drag = (IdoEventGestureDrag *)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));
-	}
-}
-
-static void
-ev_rotate_gesture_start (GtkWindow       *window,
-			 IdoGestureEvent *event)
-{
-}
-
-static void
-ev_rotate_gesture_update (GtkWindow       *window,
-			  IdoGestureEvent *event)
-{
-}
-
-static void
-ev_rotate_gesture_end (GtkWindow       *window,
-		       IdoGestureEvent *event)
-{
-	IdoEventGestureRotate *rotate = (IdoEventGestureRotate *)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));
+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_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));
+			}
+
+			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;
+		}
+
+		default:
+			break;
+		}
 	}
 }
 
@@ -5538,36 +5530,33 @@
 on_window_mapped (GtkWidget *widget)
 {
 	GtkWindow *window;
-	IdoGestureManager *manager;
+	GripGestureManager *manager;
 
 	window = GTK_WINDOW (widget);
 
 	if (ev_application_get_gestures_enabled (EV_APP)) {
-		manager = ido_gesture_manager_get ();
-
-		ido_gesture_manager_register_window (manager,
-						     window,
-						     IDO_GESTURE_PINCH,
-						     2,
-						     ev_pinch_gesture_start,
-						     ev_pinch_gesture_update,
-						     ev_pinch_gesture_end);
-
-		ido_gesture_manager_register_window (manager,
-						     window,
-						     IDO_GESTURE_DRAG,
-						     2,
-						     ev_drag_gesture_start,
-						     ev_drag_gesture_update,
-						     ev_drag_gesture_end);
-
-		ido_gesture_manager_register_window (manager,
-						     window,
-						     IDO_GESTURE_ROTATE,
-						     2,
-						     ev_rotate_gesture_start,
-						     ev_rotate_gesture_update,
-						     ev_rotate_gesture_end);
+		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_ROTATE,
+						      2,
+						      ev_gesture_callback,
+						      NULL, NULL);
 	}
 }