From ab1862d68a063764f99d8591355e40807be659df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 9 Dec 2010 11:29:40 -0500 Subject: [PATCH] Move code around to keep input device interface and init function close --- compositor/compositor.c | 61 ++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/compositor/compositor.c b/compositor/compositor.c index e134ce4..0e1323f 100644 --- a/compositor/compositor.c +++ b/compositor/compositor.c @@ -1065,37 +1065,6 @@ notify_key(struct wl_input_device *device, } static void -input_device_attach(struct wl_client *client, - struct wl_input_device *device_base, - uint32_t time, - struct wl_buffer *buffer, int32_t x, int32_t y) -{ - struct wlsc_input_device *device = - (struct wlsc_input_device *) device_base; - - if (time < device->input_device.pointer_focus_time) - return; - if (device->input_device.pointer_focus == NULL) - return; - - if (device->input_device.pointer_focus->client != client) - return; - - if (buffer == NULL) { - wlsc_input_device_set_pointer_image(device, - WLSC_POINTER_LEFT_PTR); - return; - } - - wlsc_input_device_attach(device, buffer, x, y); -} - -const static struct wl_input_device_interface input_device_interface = { - input_device_attach, -}; - - -static void wl_drag_set_pointer_focus(struct wl_drag *drag, struct wl_surface *surface, uint32_t time, int32_t x, int32_t y, int32_t sx, int32_t sy) @@ -1291,6 +1260,36 @@ static const struct wl_drag_interface drag_interface = { drag_destroy, }; +static void +input_device_attach(struct wl_client *client, + struct wl_input_device *device_base, + uint32_t time, + struct wl_buffer *buffer, int32_t x, int32_t y) +{ + struct wlsc_input_device *device = + (struct wlsc_input_device *) device_base; + + if (time < device->input_device.pointer_focus_time) + return; + if (device->input_device.pointer_focus == NULL) + return; + + if (device->input_device.pointer_focus->client != client) + return; + + if (buffer == NULL) { + wlsc_input_device_set_pointer_image(device, + WLSC_POINTER_LEFT_PTR); + return; + } + + wlsc_input_device_attach(device, buffer, x, y); +} + +const static struct wl_input_device_interface input_device_interface = { + input_device_attach, +}; + void wlsc_input_device_init(struct wlsc_input_device *device, struct wlsc_compositor *ec) -- 2.7.4