From 297354f8477285231826f6441b943188ec7d7399 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 24 Aug 2020 10:27:03 +0200 Subject: [PATCH] Remove unnecessary wl_display_dispatch calls wl_display_roundtrip already takes care of dispatching the display. --- backend/wayland/backend.c | 1 - examples/dmabuf-capture.c | 1 - examples/foreign-toplevel.c | 1 - examples/gamma-control.c | 1 - examples/idle-inhibit.c | 1 - examples/idle.c | 1 - examples/input-inhibitor.c | 1 - examples/input-method-keyboard-grab.c | 1 - examples/input-method.c | 1 - examples/keyboard-shortcuts-inhibit.c | 1 - examples/output-power-management.c | 1 - examples/pointer-constraints.c | 1 - examples/relative-pointer-unstable-v1.c | 1 - examples/screencopy-dmabuf.c | 1 - examples/screencopy.c | 1 - examples/text-input.c | 1 - examples/toplevel-decoration.c | 1 - examples/virtual-pointer.c | 2 -- 18 files changed, 19 deletions(-) diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c index 972963e0..a09126ce 100644 --- a/backend/wayland/backend.c +++ b/backend/wayland/backend.c @@ -279,7 +279,6 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display, } wl_registry_add_listener(wl->registry, ®istry_listener, wl); - wl_display_dispatch(wl->remote_display); wl_display_roundtrip(wl->remote_display); if (!wl->compositor) { diff --git a/examples/dmabuf-capture.c b/examples/dmabuf-capture.c index 203a1ac4..2a3e195c 100644 --- a/examples/dmabuf-capture.c +++ b/examples/dmabuf-capture.c @@ -754,7 +754,6 @@ static int init(struct capture_context *ctx) { wl_registry_add_listener(ctx->registry, ®istry_listener, ctx); wl_display_roundtrip(ctx->display); - wl_display_dispatch(ctx->display); if (!ctx->export_manager) { av_log(ctx, AV_LOG_ERROR, "Compositor doesn't support %s!\n", diff --git a/examples/foreign-toplevel.c b/examples/foreign-toplevel.c index 9184e737..1d41d01a 100644 --- a/examples/foreign-toplevel.c +++ b/examples/foreign-toplevel.c @@ -332,7 +332,6 @@ int main(int argc, char **argv) { struct wl_registry *registry = wl_display_get_registry(display); wl_registry_add_listener(registry, ®istry_listener, NULL); - wl_display_dispatch(display); wl_display_roundtrip(display); if (toplevel_manager == NULL) { diff --git a/examples/gamma-control.c b/examples/gamma-control.c index a060b883..9fa00ce3 100644 --- a/examples/gamma-control.c +++ b/examples/gamma-control.c @@ -162,7 +162,6 @@ int main(int argc, char *argv[]) { struct wl_registry *registry = wl_display_get_registry(display); wl_registry_add_listener(registry, ®istry_listener, NULL); - wl_display_dispatch(display); wl_display_roundtrip(display); if (gamma_control_manager == NULL) { diff --git a/examples/idle-inhibit.c b/examples/idle-inhibit.c index 348892ab..5de32dbd 100644 --- a/examples/idle-inhibit.c +++ b/examples/idle-inhibit.c @@ -177,7 +177,6 @@ int main(int argc, char **argv) { struct wl_registry *registry = wl_display_get_registry(display); wl_registry_add_listener(registry, ®istry_listener, NULL); - wl_display_dispatch(display); wl_display_roundtrip(display); if (compositor == NULL) { diff --git a/examples/idle.c b/examples/idle.c index 6faa1d7d..254f1c79 100644 --- a/examples/idle.c +++ b/examples/idle.c @@ -125,7 +125,6 @@ int main(int argc, char *argv[]) { struct wl_registry *registry = wl_display_get_registry(display); wl_registry_add_listener(registry, ®istry_listener, NULL); - wl_display_dispatch(display); wl_display_roundtrip(display); wl_registry_destroy(registry); diff --git a/examples/input-inhibitor.c b/examples/input-inhibitor.c index 25e46c73..7192b45b 100644 --- a/examples/input-inhibitor.c +++ b/examples/input-inhibitor.c @@ -150,7 +150,6 @@ int main(int argc, char **argv) { struct wl_registry *registry = wl_display_get_registry(display); assert(registry); wl_registry_add_listener(registry, ®istry_listener, NULL); - wl_display_dispatch(display); wl_display_roundtrip(display); assert(compositor && seat && wm_base && input_inhibit_manager); diff --git a/examples/input-method-keyboard-grab.c b/examples/input-method-keyboard-grab.c index 881f91a9..055abeab 100644 --- a/examples/input-method-keyboard-grab.c +++ b/examples/input-method-keyboard-grab.c @@ -191,7 +191,6 @@ int main(int argc, char **argv) { struct wl_registry *registry = wl_display_get_registry(display); wl_registry_add_listener(registry, ®istry_listener, NULL); - wl_display_dispatch(display); wl_display_roundtrip(display); if (input_method_manager == NULL) { diff --git a/examples/input-method.c b/examples/input-method.c index 9276e159..479c8761 100644 --- a/examples/input-method.c +++ b/examples/input-method.c @@ -324,7 +324,6 @@ int main(int argc, char **argv) { struct wl_registry *registry = wl_display_get_registry(display); wl_registry_add_listener(registry, ®istry_listener, NULL); - wl_display_dispatch(display); wl_display_roundtrip(display); if (compositor == NULL) { diff --git a/examples/keyboard-shortcuts-inhibit.c b/examples/keyboard-shortcuts-inhibit.c index 3d066c0e..e9a837b6 100644 --- a/examples/keyboard-shortcuts-inhibit.c +++ b/examples/keyboard-shortcuts-inhibit.c @@ -209,7 +209,6 @@ int main(int argc, char **argv) { struct wl_registry *registry = wl_display_get_registry(display); wl_registry_add_listener(registry, ®istry_listener, NULL); - wl_display_dispatch(display); wl_display_roundtrip(display); if (compositor == NULL) { diff --git a/examples/output-power-management.c b/examples/output-power-management.c index 43e7c53f..00d4122a 100644 --- a/examples/output-power-management.c +++ b/examples/output-power-management.c @@ -109,7 +109,6 @@ int main(int argc, char *argv[]) { struct wl_registry *registry = wl_display_get_registry(display); wl_registry_add_listener(registry, ®istry_listener, NULL); - wl_display_dispatch(display); wl_display_roundtrip(display); if (output_power_manager == NULL) { diff --git a/examples/pointer-constraints.c b/examples/pointer-constraints.c index 1df9f6ce..f67f1ede 100644 --- a/examples/pointer-constraints.c +++ b/examples/pointer-constraints.c @@ -198,7 +198,6 @@ int main(int argc, char **argv) { struct wl_registry *registry = wl_display_get_registry(display); wl_registry_add_listener(registry, ®istry_listener, NULL); - wl_display_dispatch(display); wl_display_roundtrip(display); struct wl_region *disjoint_region = wl_compositor_create_region(compositor); diff --git a/examples/relative-pointer-unstable-v1.c b/examples/relative-pointer-unstable-v1.c index ce671f99..02f9d1c5 100644 --- a/examples/relative-pointer-unstable-v1.c +++ b/examples/relative-pointer-unstable-v1.c @@ -412,7 +412,6 @@ int main(int argc, char **argv) { struct wl_registry *registry = wl_display_get_registry(display); wl_registry_add_listener(registry, ®istry_listener, NULL); - wl_display_dispatch(display); wl_display_roundtrip(display); /* Check that all the global interfaces were captured */ diff --git a/examples/screencopy-dmabuf.c b/examples/screencopy-dmabuf.c index 74eb8a75..2525efc5 100644 --- a/examples/screencopy-dmabuf.c +++ b/examples/screencopy-dmabuf.c @@ -315,7 +315,6 @@ int main(int argc, char *argv[]) { struct wl_registry *registry = wl_display_get_registry(display); wl_registry_add_listener(registry, ®istry_listener, NULL); - wl_display_dispatch(display); wl_display_roundtrip(display); if (dmabuf == NULL) { diff --git a/examples/screencopy.c b/examples/screencopy.c index cf4652f4..0e03a238 100644 --- a/examples/screencopy.c +++ b/examples/screencopy.c @@ -234,7 +234,6 @@ int main(int argc, char *argv[]) { struct wl_registry *registry = wl_display_get_registry(display); wl_registry_add_listener(registry, ®istry_listener, NULL); - wl_display_dispatch(display); wl_display_roundtrip(display); if (shm == NULL) { diff --git a/examples/text-input.c b/examples/text-input.c index bfdbc07b..ec75d307 100644 --- a/examples/text-input.c +++ b/examples/text-input.c @@ -344,7 +344,6 @@ int main(int argc, char **argv) { struct wl_registry *registry = wl_display_get_registry(display); wl_registry_add_listener(registry, ®istry_listener, NULL); - wl_display_dispatch(display); wl_display_roundtrip(display); if (compositor == NULL) { diff --git a/examples/toplevel-decoration.c b/examples/toplevel-decoration.c index e930c417..cb8caace 100644 --- a/examples/toplevel-decoration.c +++ b/examples/toplevel-decoration.c @@ -203,7 +203,6 @@ int main(int argc, char **argv) { struct wl_registry *registry = wl_display_get_registry(display); wl_registry_add_listener(registry, ®istry_listener, NULL); - wl_display_dispatch(display); wl_display_roundtrip(display); if (compositor == NULL) { diff --git a/examples/virtual-pointer.c b/examples/virtual-pointer.c index 84af7ffd..8fd14830 100644 --- a/examples/virtual-pointer.c +++ b/examples/virtual-pointer.c @@ -67,7 +67,6 @@ int main(int argc, char *argv[]) { struct wl_registry *registry = wl_display_get_registry(display); wl_registry_add_listener(registry, ®istry_listener, NULL); - wl_display_dispatch(display); wl_display_roundtrip(display); if (pointer_manager == NULL) { @@ -132,7 +131,6 @@ int main(int argc, char *argv[]) { zwlr_virtual_pointer_v1_frame(pointer); zwlr_virtual_pointer_v1_destroy(pointer); - wl_display_dispatch(display); return EXIT_SUCCESS; }