From: Daniel Stone <daniel@fooishbar.org>
Date: Wed, 30 May 2012 15:32:00 +0000 (+0100)
Subject: Convert wl_pointer::axis to wl_fixed_t
X-Git-Tag: 20120702.1049~49
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2fce4028d6dd5c29649bd2ce25df4c3d4e400a92;p=profile%2Fivi%2Fweston.git

Convert wl_pointer::axis to wl_fixed_t

To go with the matching protocol change.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
---

diff --git a/clients/simple-egl.c b/clients/simple-egl.c
index 831f6af..5dd44f9 100644
--- a/clients/simple-egl.c
+++ b/clients/simple-egl.c
@@ -385,7 +385,7 @@ pointer_handle_button(void *data, struct wl_pointer *wl_pointer,
 
 static void
 pointer_handle_axis(void *data, struct wl_pointer *wl_pointer,
-		    uint32_t time, uint32_t axis, int32_t value)
+		    uint32_t time, uint32_t axis, wl_fixed_t value)
 {
 }
 
diff --git a/clients/window.c b/clients/window.c
index f1f9176..9147da2 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -1813,7 +1813,7 @@ pointer_handle_button(void *data, struct wl_pointer *pointer, uint32_t serial,
 
 static void
 pointer_handle_axis(void *data, struct wl_pointer *pointer,
-		    uint32_t time, uint32_t axis, int32_t value)
+		    uint32_t time, uint32_t axis, wl_fixed_t value)
 {
 }
 
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 0615f95..4f763ff 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -559,12 +559,12 @@ input_handle_button(void *data, struct wl_pointer *pointer,
 
 static void
 input_handle_axis(void *data, struct wl_pointer *pointer,
-		  uint32_t time, uint32_t axis, int32_t value)
+		  uint32_t time, uint32_t axis, wl_fixed_t value)
 {
 	struct wayland_input *input = data;
 	struct wayland_compositor *c = input->compositor;
 
-	notify_axis(&c->base.seat->seat, time, axis, wl_fixed_from_int(value));
+	notify_axis(&c->base.seat->seat, time, axis, value);
 }
 
 static const struct wl_pointer_listener pointer_listener = {
diff --git a/src/compositor.c b/src/compositor.c
index 037c2c0..e7ae968 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1728,7 +1728,7 @@ notify_axis(struct wl_seat *seat, uint32_t time, uint32_t axis,
 
 	if (seat->pointer->focus_resource)
 		wl_pointer_send_axis(seat->pointer->focus_resource, time, axis,
-				     wl_fixed_to_int(value));
+				     value);
 }
 
 static int
diff --git a/tests/test-client.c b/tests/test-client.c
index 7c8f3fe..60ba051 100644
--- a/tests/test-client.c
+++ b/tests/test-client.c
@@ -107,7 +107,7 @@ pointer_handle_button(void *data, struct wl_pointer *pointer,
 
 static void
 pointer_handle_axis(void *data, struct wl_pointer *pointer,
-		    uint32_t time, uint32_t axis, int32_t value)
+		    uint32_t time, uint32_t axis, wl_fixed_t value)
 {
 }