commit 0c1e46eb18ab48c48ce29464deb4ce5e23130c2b
author Daniel Stone <daniel@fooishbar.org> Wed May 30 16:31:59 2012 +0100
committer Kristian Høgsberg <krh@bitplanet.net> Thu May 31 15:45:20 2012 -0400
tree 7805c48c8b6c29d22e7e6b6a99cc8b1c7b248fcc
parent 325fc2d53a6885119c505c928c41b2744edada36

Use wl_fixed_t for axis bindings

In preparation for axis values being wl_fixed_t in the protocol as well.

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

src/shell.c

diff --git a/src/shell.c b/src/shell.c
index fc7f48f..40e84b6 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1617,7 +1617,7 @@
 
 static void
 surface_opacity_binding(struct wl_seat *seat, uint32_t time, uint32_t axis,
-			int32_t value, void *data)
+			wl_fixed_t value, void *data)
 {
 	float step = 0.05;
 	struct shell_surface *shsurf;
@@ -1639,7 +1639,7 @@
 			break;
 	}
 
-	surface->alpha += value * step;
+	surface->alpha += wl_fixed_to_double(value) * step;
 
 	if (surface->alpha > 1.0)
 		surface->alpha = 1.0;
@@ -1652,7 +1652,7 @@
 
 static void
 do_zoom(struct wl_seat *seat, uint32_t time, uint32_t key, uint32_t axis,
-	int32_t value)
+	wl_fixed_t value)
 {
 	struct weston_seat *ws = (struct weston_seat *) seat;
 	struct weston_compositor *compositor = ws->compositor;
@@ -1669,7 +1669,8 @@
 			else if (key == KEY_PAGEDOWN)
 				increment = -output->zoom.increment;
 			else if (axis == WL_POINTER_AXIS_VERTICAL_SCROLL)
-				increment = output->zoom.increment * value;
+				increment = output->zoom.increment *
+					    wl_fixed_to_double(value);
 			else
 				increment = 0;
 
@@ -1696,7 +1697,7 @@
 
 static void
 zoom_axis_binding(struct wl_seat *seat, uint32_t time, uint32_t axis,
-		  int32_t value, void *data)
+		  wl_fixed_t value, void *data)
 {
 	do_zoom(seat, time, 0, axis, value);
 }