projects
/
profile
/
ivi
/
weston.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b186847
)
Also fix compositor-wayland event handler
author
Kristian Høgsberg
<krh@bitplanet.net>
Fri, 22 Apr 2011 17:01:26 +0000
(13:01 -0400)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Fri, 22 Apr 2011 17:01:26 +0000
(13:01 -0400)
compositor/compositor-wayland.c
patch
|
blob
|
history
diff --git
a/compositor/compositor-wayland.c
b/compositor/compositor-wayland.c
index
d4ae9d5
..
4093f2a
100644
(file)
--- a/
compositor/compositor-wayland.c
+++ b/
compositor/compositor-wayland.c
@@
-446,7
+446,7
@@
update_event_mask(uint32_t mask, void *data)
return 0;
}
-static
void
+static
int
wayland_compositor_handle_event(int fd, uint32_t mask, void *data)
{
struct wayland_compositor *c = data;
@@
-455,6
+455,8
@@
wayland_compositor_handle_event(int fd, uint32_t mask, void *data)
wl_display_iterate(c->parent.display, WL_DISPLAY_READABLE);
if (mask & WL_EVENT_WRITEABLE)
wl_display_iterate(c->parent.display, WL_DISPLAY_WRITABLE);
+
+ return 1;
}
static void