[PATCH weston 2/2] protocol: remove absolute coordinates from pointer
Pekka Paalanen
ppaalanen at gmail.com
Wed Feb 15 06:49:45 PST 2012
This change depens on the Wayland core commit:
"protocol: remove absolute coordinates from pointer".
Remove the absolute coordinates from pointer motion and pointer_focus
events.
Signed-off-by: Pekka Paalanen <ppaalanen at gmail.com>
---
clients/simple-touch.c | 5 ++---
clients/window.c | 5 ++---
src/compositor-wayland.c | 9 ++++-----
src/shell.c | 19 +++++++------------
4 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/clients/simple-touch.c b/clients/simple-touch.c
index c1a0899..b45cba5 100644
--- a/clients/simple-touch.c
+++ b/clients/simple-touch.c
@@ -100,8 +100,7 @@ struct wl_shm_listener shm_listenter = {
static void
input_device_handle_motion(void *data, struct wl_input_device *input_device,
- uint32_t time,
- int32_t x, int32_t y, int32_t sx, int32_t sy)
+ uint32_t time, int32_t sx, int32_t sy)
{
}
@@ -122,7 +121,7 @@ static void
input_device_handle_pointer_focus(void *data,
struct wl_input_device *input_device,
uint32_t time, struct wl_surface *surface,
- int32_t x, int32_t y, int32_t sx, int32_t sy)
+ int32_t sx, int32_t sy)
{
}
diff --git a/clients/window.c b/clients/window.c
index a38c99e..df4522b 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -1468,8 +1468,7 @@ input_set_focus_widget(struct input *input, struct widget *focus,
static void
input_handle_motion(void *data, struct wl_input_device *input_device,
- uint32_t time,
- int32_t x, int32_t y, int32_t sx, int32_t sy)
+ uint32_t time, int32_t sx, int32_t sy)
{
struct input *input = data;
struct window *window = input->pointer_focus;
@@ -1587,7 +1586,7 @@ static void
input_handle_pointer_focus(void *data,
struct wl_input_device *input_device,
uint32_t time, struct wl_surface *surface,
- int32_t x, int32_t y, int32_t sx, int32_t sy)
+ int32_t sx, int32_t sy)
{
struct input *input = data;
struct window *window;
diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 5199622..d6757f0 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -500,8 +500,7 @@ static const struct wl_output_listener output_listener = {
/* parent input interface */
static void
input_handle_motion(void *data, struct wl_input_device *input_device,
- uint32_t time,
- int32_t x, int32_t y, int32_t sx, int32_t sy)
+ uint32_t time, int32_t sx, int32_t sy)
{
struct wayland_input *input = data;
struct wayland_compositor *c = input->compositor;
@@ -533,9 +532,9 @@ input_handle_key(void *data, struct wl_input_device *input_device,
static void
input_handle_pointer_focus(void *data,
- struct wl_input_device *input_device,
- uint32_t time, struct wl_surface *surface,
- int32_t x, int32_t y, int32_t sx, int32_t sy)
+ struct wl_input_device *input_device,
+ uint32_t time, struct wl_surface *surface,
+ int32_t sx, int32_t sy)
{
struct wayland_input *input = data;
struct wayland_output *output;
diff --git a/src/shell.c b/src/shell.c
index 66c4f01..4a7dc27 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -207,8 +207,7 @@ weston_surface_move(struct weston_surface *es,
wl_input_device_start_grab(&wd->input_device, &move->grab, time);
- wl_input_device_set_pointer_focus(&wd->input_device,
- NULL, time, 0, 0, 0, 0);
+ wl_input_device_set_pointer_focus(&wd->input_device, NULL, time, 0, 0);
return 0;
}
@@ -316,8 +315,7 @@ weston_surface_resize(struct shell_surface *shsurf,
wl_input_device_start_grab(&wd->input_device, &resize->grab, time);
- wl_input_device_set_pointer_focus(&wd->input_device,
- NULL, time, 0, 0, 0, 0);
+ wl_input_device_set_pointer_focus(&wd->input_device, NULL, time, 0, 0);
return 0;
}
@@ -451,27 +449,24 @@ popup_grab_focus(struct wl_grab *grab, uint32_t time,
struct wl_client *client = priv->surface->surface.resource.client;
if (surface && surface->resource.client == client) {
- wl_input_device_set_pointer_focus(device, surface, time,
- device->x, device->y, x, y);
+ wl_input_device_set_pointer_focus(device, surface, time, x, y);
grab->focus = surface;
} else {
- wl_input_device_set_pointer_focus(device, NULL,
- time, 0, 0, 0, 0);
+ wl_input_device_set_pointer_focus(device, NULL, time, 0, 0);
grab->focus = NULL;
}
}
static void
popup_grab_motion(struct wl_grab *grab,
- uint32_t time, int32_t x, int32_t y)
+ uint32_t time, int32_t sx, int32_t sy)
{
- struct wl_input_device *device = grab->input_device;
struct wl_resource *resource;
resource = grab->input_device->pointer_focus_resource;
if (resource)
wl_resource_post_event(resource, WL_INPUT_DEVICE_MOTION,
- time, device->x, device->y, x, y);
+ time, sx, sy);
}
static void
@@ -1106,7 +1101,7 @@ rotate_binding(struct wl_input_device *device, uint32_t time,
weston_matrix_init(&rotate->rotation);
}
- wl_input_device_set_pointer_focus(device, NULL, time, 0, 0, 0, 0);
+ wl_input_device_set_pointer_focus(device, NULL, time, 0, 0);
}
static void
--
1.7.3.4
More information about the wayland-devel
mailing list