From c8a64305fd746ab1b33367d3ffcc9fa054221717 Mon Sep 17 00:00:00 2001 From: David Eklov Date: Tue, 5 Jul 2016 01:21:56 -0500 Subject: [PATCH] Enable windows to register to get notified of pointer button events --- include/client/window.h | 10 ++++++++++ wayland/window.c | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/include/client/window.h b/include/client/window.h index e48ec4f3..b5cc1880 100644 --- a/include/client/window.h +++ b/include/client/window.h @@ -9,6 +9,8 @@ #include "list.h" #include "client/registry.h" +struct window; + struct buffer { struct wl_buffer *buffer; cairo_surface_t *surface; @@ -25,6 +27,13 @@ struct cursor { struct wl_poitner *pointer; }; +struct pointer_input { + wl_fixed_t last_x; + wl_fixed_t last_y; + + void (*notify)(struct window *window, wl_fixed_t x, wl_fixed_t y, uint32_t button); +}; + struct window { struct registry *registry; struct buffer buffers[2]; @@ -36,6 +45,7 @@ struct window { uint32_t width, height; char *font; cairo_t *cairo; + struct pointer_input pointer_input; }; struct window *window_setup(struct registry *registry, uint32_t width, uint32_t height, bool shell_surface); diff --git a/wayland/window.c b/wayland/window.c index 7ca9e4ec..e055e244 100644 --- a/wayland/window.c +++ b/wayland/window.c @@ -30,10 +30,20 @@ static void pointer_handle_leave(void *data, struct wl_pointer *pointer, static void pointer_handle_motion(void *data, struct wl_pointer *pointer, uint32_t time, wl_fixed_t sx_w, wl_fixed_t sy_w) { + struct window *window = data; + + window->pointer_input.last_x = sx_w; + window->pointer_input.last_y = sy_w; } static void pointer_handle_button(void *data, struct wl_pointer *pointer, uint32_t serial, uint32_t time, uint32_t button, uint32_t state_w) { + struct window *window = data; + struct pointer_input *input = &window->pointer_input; + + if (window->pointer_input.notify) { + window->pointer_input.notify(window, input->last_x, input->last_y, button); + } } static void pointer_handle_axis(void *data, struct wl_pointer *pointer,