From 0e0776fb62aedac115a460232da7abc6f5a02836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Fri, 22 Apr 2011 12:27:57 -0400 Subject: [PATCH] Update return types of event handler functions Missed this in previous commit. --- compositor/evdev.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/compositor/evdev.c b/compositor/evdev.c index 6ff7b699..de482257 100644 --- a/compositor/evdev.c +++ b/compositor/evdev.c @@ -42,7 +42,8 @@ struct evdev_input_device { int min_x, max_x, min_y, max_y; }; -static void evdev_input_device_data(int fd, uint32_t mask, void *data) +static int +evdev_input_device_data(int fd, uint32_t mask, void *data) { struct wlsc_compositor *ec; struct evdev_input_device *device = data; @@ -58,7 +59,7 @@ static void evdev_input_device_data(int fd, uint32_t mask, void *data) ec = (struct wlsc_compositor *) device->master->base.input_device.compositor; if (!ec->focus) - return; + return 1; dx = 0; dy = 0; @@ -69,7 +70,7 @@ static void evdev_input_device_data(int fd, uint32_t mask, void *data) len = read(fd, &ev, sizeof ev); if (len < 0 || len % sizeof e[0] != 0) { /* FIXME: handle error... reopen device? */; - return; + return 1; } e = ev; @@ -149,6 +150,8 @@ static void evdev_input_device_data(int fd, uint32_t mask, void *data) time, x + dx, y + dy); if (absolute_event) notify_motion(&device->master->base.input_device, time, x, y); + + return 1; } #define TEST_BIT(b, i) (b[(i) / 32] & (1 << (i & 31)))