commit e5a01207579f326e13ae1be05dc4dfe31bc9a10e
author Daniel Stone <daniel@fooishbar.org> Fri May 04 11:21:57 2012 +0100
committer Kristian Høgsberg <krh@bitplanet.net> Mon May 07 13:03:48 2012 -0400
tree c384300b262ba85cf5c90ff329371edfd0d89ba7
parent 5d663717434d1a61583b948f414f848b883cc5b0

Rename 'state' in axis (or ambiguous) bindings to 'value'

Since it's usually an axis value rather than a boolean, be slightly more
explicit about it.

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

src/shell.c

diff --git a/src/shell.c b/src/shell.c
index 738f6c8..6af1d38 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1499,7 +1499,8 @@
 
 static void
 move_binding(struct wl_input_device *device, uint32_t time,
-	     uint32_t key, uint32_t button, uint32_t axis, int32_t state, void *data)
+	     uint32_t key, uint32_t button, uint32_t axis, int32_t value,
+	     void *data)
 {
 	struct weston_surface *surface =
 		(struct weston_surface *) device->pointer_focus;
@@ -1522,7 +1523,8 @@
 
 static void
 resize_binding(struct wl_input_device *device, uint32_t time,
-	       uint32_t key, uint32_t button, uint32_t axis, int32_t state, void *data)
+	       uint32_t key, uint32_t button, uint32_t axis, int32_t value,
+	       void *data)
 {
 	struct weston_surface *surface =
 		(struct weston_surface *) device->pointer_focus;
@@ -1570,7 +1572,8 @@
 
 static void
 surface_opacity_binding(struct wl_input_device *device, uint32_t time,
-	       uint32_t key, uint32_t button, uint32_t axis, int32_t value, void *data)
+			uint32_t key, uint32_t button, uint32_t axis,
+			int32_t value, void *data)
 {
 	uint32_t step = 15;
 	struct shell_surface *shsurf;
@@ -1605,7 +1608,8 @@
 
 static void
 zoom_binding(struct wl_input_device *device, uint32_t time,
-	       uint32_t key, uint32_t button, uint32_t axis, int32_t value, void *data)
+	     uint32_t key, uint32_t button, uint32_t axis, int32_t value,
+	     void *data)
 {
 	struct weston_input_device *wd = (struct weston_input_device *) device;
 	struct weston_compositor *compositor = wd->compositor;
@@ -1736,7 +1740,8 @@
 
 static void
 rotate_binding(struct wl_input_device *device, uint32_t time,
-	       uint32_t key, uint32_t button, uint32_t axis, int32_t state, void *data)
+	       uint32_t key, uint32_t button, uint32_t axis, int32_t value,
+	       void *data)
 {
 	struct weston_surface *base_surface =
 		(struct weston_surface *) device->pointer_focus;
@@ -2423,7 +2428,7 @@
 static void
 switcher_binding(struct wl_input_device *device, uint32_t time,
 		 uint32_t key, uint32_t button, uint32_t axis,
-		 int32_t state, void *data)
+		 int32_t value, void *data)
 {
 	struct desktop_shell *shell = data;
 	struct switcher *switcher;
@@ -2475,7 +2480,8 @@
 
 static void
 debug_repaint_binding(struct wl_input_device *device, uint32_t time,
-		      uint32_t key, uint32_t button, uint32_t axis, int32_t state, void *data)
+		      uint32_t key, uint32_t button, uint32_t axis,
+		      int32_t value, void *data)
 {
 	struct desktop_shell *shell = data;
 	struct weston_compositor *compositor = shell->compositor;