hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-26 14:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

backend/wayland: handle WL_EVENT_WRITABLE for Wayland socket

Browse source 
We need to flush when the connection is writable again. This is important in
case the write buffer becomes full. This is also what Weston does [1].

[1]: https://gitlab.freedesktop.org/wayland/weston/blob/master/libweston/compositor-wayland.c#L2593
This commit is contained in:
emersion 2018-11-11 21:11:15 +01:00
parent aaff4b8c00
commit 180151ed09
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
backend/wayland/backend.c
View file

@ -27,7 +27,6 @@ struct wlr_wl_backend *get_wl_backend_from_backend(struct wlr_backend *backend)
static int dispatch_events(int fd, uint32_t mask, void *data) { static int dispatch_events(int fd, uint32_t mask, void *data) {
struct wlr_wl_backend *wl = data; struct wlr_wl_backend *wl = data;
int count = 0;
if ((mask & WL_EVENT_HANGUP) || (mask & WL_EVENT_ERROR)) { if ((mask & WL_EVENT_HANGUP) || (mask & WL_EVENT_ERROR)) {
wl_display_terminate(wl->local_display); wl_display_terminate(wl->local_display);
@ -35,15 +34,21 @@ static int dispatch_events(int fd, uint32_t mask, void *data) {
} }
if (mask & WL_EVENT_READABLE) { if (mask & WL_EVENT_READABLE) {
count = wl_display_dispatch(wl->remote_display); return wl_display_dispatch(wl->remote_display);
}
if (mask & WL_EVENT_WRITABLE) {
wl_display_flush(wl->remote_display);
return 0;
} }
if (mask == 0) { if (mask == 0) {
count = wl_display_dispatch_pending(wl->remote_display); int count = wl_display_dispatch_pending(wl->remote_display);
wl_display_flush(wl->remote_display); wl_display_flush(wl->remote_display);
}
return count; return count;
} }
return 0;
}
static void xdg_shell_handle_ping(void *data, struct zxdg_shell_v6 *shell, static void xdg_shell_handle_ping(void *data, struct zxdg_shell_v6 *shell,
uint32_t serial) { uint32_t serial) {
zxdg_shell_v6_pong(shell, serial); zxdg_shell_v6_pong(shell, serial);