aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backend/libinput/backend.c2
-rw-r--r--backend/wayland/output.c2
-rw-r--r--backend/wayland/registry.c4
-rw-r--r--xwayland/xwm.c2
4 files changed, 6 insertions, 4 deletions
diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c
index 7e4d5700..07c6da13 100644
--- a/backend/libinput/backend.c
+++ b/backend/libinput/backend.c
@@ -101,7 +101,7 @@ static void wlr_libinput_backend_destroy(struct wlr_backend *_backend) {
for (size_t i = 0; i < backend->wlr_device_lists->length; i++) {
struct wl_list *wlr_devices = backend->wlr_device_lists->items[i];
struct wlr_input_device *wlr_dev, *next;
- wl_list_for_each_safe(wlr_dev, next, wlr_devices, link) {
+ wl_list_for_each_safe(wlr_dev, next, wlr_devices, link) {
wl_signal_emit(&backend->backend.events.input_remove, wlr_dev);
wlr_input_device_destroy(wlr_dev);
}
diff --git a/backend/wayland/output.c b/backend/wayland/output.c
index fd20b3e3..90f8b39a 100644
--- a/backend/wayland/output.c
+++ b/backend/wayland/output.c
@@ -223,7 +223,7 @@ static void xdg_toplevel_handle_configure(void *data, struct zxdg_toplevel_v6 *x
static void xdg_toplevel_handle_close(void *data, struct zxdg_toplevel_v6 *xdg_toplevel) {
struct wlr_wl_backend_output *output = data;
- assert(output && output->xdg_toplevel == xdg_toplevel);
+ assert(output && output->xdg_toplevel == xdg_toplevel);
wl_display_terminate(output->backend->local_display);
}
diff --git a/backend/wayland/registry.c b/backend/wayland/registry.c
index d6f61aa7..0dec0ec5 100644
--- a/backend/wayland/registry.c
+++ b/backend/wayland/registry.c
@@ -9,11 +9,11 @@
static void xdg_shell_handle_ping(void *data, struct zxdg_shell_v6 *shell,
uint32_t serial) {
- zxdg_shell_v6_pong(shell, serial);
+ zxdg_shell_v6_pong(shell, serial);
}
static const struct zxdg_shell_v6_listener xdg_shell_listener = {
- xdg_shell_handle_ping,
+ xdg_shell_handle_ping,
};
diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index 15a23797..4930d45c 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -1027,6 +1027,8 @@ void wlr_xwayland_surface_close(struct wlr_xwayland *wlr_xwayland,
} else {
xcb_kill_client(xwm->xcb_conn, xsurface->window_id);
}
+
+ xcb_flush(xwm->xcb_conn);
}
void xwm_destroy(struct wlr_xwm *xwm) {