mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window.c: Rename input handlers to input_handle_*

Browse Source 
They're event handlers for the input object, not the window object.
This commit is contained in:
Kristian Høgsberg
2011-12-21 17:11:45 -05:00
parent 1f221fff71
commit 8a1d10d66c
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/window.c
+16 -16
View File
@@ -1225,7 +1225,7 @@ window_set_focus_item(struct window *window, struct item *focus)
} }
static void static void
window_handle_motion(void *data, struct wl_input_device *input_device, input_handle_motion(void *data, struct wl_input_device *input_device,
uint32_t time, uint32_t time,
int32_t x, int32_t y, int32_t sx, int32_t sy) int32_t x, int32_t y, int32_t sx, int32_t sy)
{ {
@@ -1254,7 +1254,7 @@ window_handle_motion(void *data, struct wl_input_device *input_device,
} }
static void static void
window_handle_button(void *data, input_handle_button(void *data,
struct wl_input_device *input_device, struct wl_input_device *input_device,
uint32_t time, uint32_t button, uint32_t state) uint32_t time, uint32_t button, uint32_t state)
{ {
@@ -1317,7 +1317,7 @@ window_handle_button(void *data,
} }
static void static void
window_handle_key(void *data, struct wl_input_device *input_device, input_handle_key(void *data, struct wl_input_device *input_device,
uint32_t time, uint32_t key, uint32_t state) uint32_t time, uint32_t key, uint32_t state)
{ {
struct input *input = data; struct input *input = data;
@@ -1347,7 +1347,7 @@ window_handle_key(void *data, struct wl_input_device *input_device,
} }
static void static void
remove_pointer_focus(struct input *input, uint32_t time) input_remove_pointer_focus(struct input *input, uint32_t time)
{ {
struct window *window = input->pointer_focus; struct window *window = input->pointer_focus;
@@ -1363,7 +1363,7 @@ remove_pointer_focus(struct input *input, uint32_t time)
} }
static void static void
window_handle_pointer_focus(void *data, input_handle_pointer_focus(void *data,
struct wl_input_device *input_device, struct wl_input_device *input_device,
uint32_t time, struct wl_surface *surface, uint32_t time, struct wl_surface *surface,
int32_t x, int32_t y, int32_t sx, int32_t sy) int32_t x, int32_t y, int32_t sx, int32_t sy)
@@ -1375,7 +1375,7 @@ window_handle_pointer_focus(void *data,
window = input->pointer_focus; window = input->pointer_focus;
if (window && window->surface != surface) if (window && window->surface != surface)
remove_pointer_focus(input, time); input_remove_pointer_focus(input, time);
if (surface) { if (surface) {
input->pointer_focus = wl_surface_get_user_data(surface); input->pointer_focus = wl_surface_get_user_data(surface);
@@ -1401,7 +1401,7 @@ window_handle_pointer_focus(void *data,
} }
static void static void
remove_keyboard_focus(struct input *input) input_remove_keyboard_focus(struct input *input)
{ {
struct window *window = input->keyboard_focus; struct window *window = input->keyboard_focus;
@@ -1417,7 +1417,7 @@ remove_keyboard_focus(struct input *input)
} }
static void static void
window_handle_keyboard_focus(void *data, input_handle_keyboard_focus(void *data,
struct wl_input_device *input_device, struct wl_input_device *input_device,
uint32_t time, uint32_t time,
struct wl_surface *surface, struct wl_surface *surface,
@@ -1428,7 +1428,7 @@ window_handle_keyboard_focus(void *data,
struct display *d = input->display; struct display *d = input->display;
uint32_t *k, *end; uint32_t *k, *end;
remove_keyboard_focus(input); input_remove_keyboard_focus(input);
if (surface) if (surface)
input->keyboard_focus = wl_surface_get_user_data(surface); input->keyboard_focus = wl_surface_get_user_data(surface);
@@ -1449,11 +1449,11 @@ window_handle_keyboard_focus(void *data,
} }
static const struct wl_input_device_listener input_device_listener = { static const struct wl_input_device_listener input_device_listener = {
window_handle_motion, input_handle_motion,
window_handle_button, input_handle_button,
window_handle_key, input_handle_key,
window_handle_pointer_focus, input_handle_pointer_focus,
window_handle_keyboard_focus, input_handle_keyboard_focus,
}; };
void void
@@ -2352,8 +2352,8 @@ display_add_input(struct display *d, uint32_t id)
static void static void
input_destroy(struct input *input) input_destroy(struct input *input)
{ {
remove_keyboard_focus(input); input_remove_keyboard_focus(input);
remove_pointer_focus(input, 0); input_remove_pointer_focus(input, 0);
if (input->drag_offer) if (input->drag_offer)
data_offer_destroy(input->drag_offer); data_offer_destroy(input->drag_offer);