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

simple-touch: Update to enter/leave changes

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-02-23 16:20:38 -05:00
parent 5e7e6f2a22
commit dd631c1c36
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/simple-touch.c
+21 -4
View File
@@ -118,7 +118,7 @@ input_device_handle_key(void *data, struct wl_input_device *input_device,
} }
static void static void
input_device_handle_pointer_focus(void *data, input_device_handle_pointer_enter(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 sx, int32_t sy) int32_t sx, int32_t sy)
@@ -126,7 +126,14 @@ input_device_handle_pointer_focus(void *data,
} }
static void static void
input_device_handle_keyboard_focus(void *data, input_device_handle_pointer_leave(void *data,
struct wl_input_device *input_device,
uint32_t time, struct wl_surface *surface)
{
}
static void
input_device_handle_keyboard_enter(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,
@@ -134,6 +141,14 @@ input_device_handle_keyboard_focus(void *data,
{ {
} }
static void
input_device_handle_keyboard_leave(void *data,
struct wl_input_device *input_device,
uint32_t time,
struct wl_surface *surface)
{
}
static void static void
touch_paint(struct touch *touch, int32_t x, int32_t y, int32_t id) touch_paint(struct touch *touch, int32_t x, int32_t y, int32_t id)
{ {
@@ -213,8 +228,10 @@ static const struct wl_input_device_listener input_device_listener = {
input_device_handle_motion, input_device_handle_motion,
input_device_handle_button, input_device_handle_button,
input_device_handle_key, input_device_handle_key,
input_device_handle_pointer_focus, input_device_handle_pointer_enter,
input_device_handle_keyboard_focus, input_device_handle_pointer_leave,
input_device_handle_keyboard_enter,
input_device_handle_keyboard_leave,
input_device_handle_touch_down, input_device_handle_touch_down,
input_device_handle_touch_up, input_device_handle_touch_up,
input_device_handle_touch_motion, input_device_handle_touch_motion,
src/compositor.c
+1 -1
View File
@@ -631,7 +631,7 @@ destroy_surface(struct wl_resource *resource)
pixman_region32_fini(&surface->transform.boundingbox); pixman_region32_fini(&surface->transform.boundingbox);
pixman_region32_fini(&surface->damage); pixman_region32_fini(&surface->damage);
pixman_region32_fini(&surface->opaque); pixman_region32_fini(&surface->opaque);
if (!region_is_undefined(&surface->input) if (!region_is_undefined(&surface->input))
pixman_region32_fini(&surface->input); pixman_region32_fini(&surface->input);
free(surface); free(surface);