From 250ddc66c672f62a3c7f44db73b5c4d0661093ba Mon Sep 17 00:00:00 2001 From: David Eklov Date: Mon, 11 Jul 2016 22:51:50 -0500 Subject: [PATCH] Rename pointer_input::notify to indicate that is called on button clicks --- include/client/window.h | 2 +- swaybar/bar.c | 2 +- wayland/window.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/client/window.h b/include/client/window.h index 55a122252..98d19a2b9 100644 --- a/include/client/window.h +++ b/include/client/window.h @@ -31,7 +31,7 @@ struct pointer_input { int last_x; int last_y; - void (*notify)(struct window *window, int x, int y, uint32_t button); + void (*notify_button)(struct window *window, int x, int y, uint32_t button); }; struct window { diff --git a/swaybar/bar.c b/swaybar/bar.c index 4f8063ac8..c0aa85c7b 100644 --- a/swaybar/bar.c +++ b/swaybar/bar.c @@ -124,7 +124,7 @@ void bar_setup(struct bar *bar, const char *socket_path, const char *bar_id) { bar_output->window->font = bar->config->font; /* set font */ - bar_output->window->pointer_input.notify = mouse_button_notify; + bar_output->window->pointer_input.notify_button = mouse_button_notify; /* set window height */ set_window_height(bar_output->window, bar->config->height); diff --git a/wayland/window.c b/wayland/window.c index 9b6e5b00e..2a76654b7 100644 --- a/wayland/window.c +++ b/wayland/window.c @@ -41,8 +41,8 @@ static void pointer_handle_button(void *data, struct wl_pointer *pointer, uint32 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); + if (window->pointer_input.notify_button) { + window->pointer_input.notify_button(window, input->last_x, input->last_y, button); } }