sway/cmd/create_output: Add create_result struct

This commit is contained in:
Hendrik Wolff 2025-11-04 14:09:50 +01:00
parent 055be4ec35
commit 4c75571175
No known key found for this signature in database
GPG key ID: 9E4B651FC15418E0

View file

@ -9,23 +9,28 @@
#include "sway/server.h" #include "sway/server.h"
#include "log.h" #include "log.h"
struct create_result {
bool done;
struct wlr_output *new_output;
};
static void create_output(struct wlr_backend *backend, void *data) { static void create_output(struct wlr_backend *backend, void *data) {
bool *done = data; struct create_result *result = data;
if (*done) { if (result->done) {
return; return;
} }
if (wlr_backend_is_wl(backend)) { if (wlr_backend_is_wl(backend)) {
wlr_wl_output_create(backend); result->new_output = wlr_wl_output_create(backend);
*done = true; result->done = true;
} else if (wlr_backend_is_headless(backend)) { } else if (wlr_backend_is_headless(backend)) {
wlr_headless_add_output(backend, 1920, 1080); result->new_output = wlr_headless_add_output(backend, 1920, 1080);
*done = true; result->done = true;
} }
#if WLR_HAS_X11_BACKEND #if WLR_HAS_X11_BACKEND
else if (wlr_backend_is_x11(backend)) { else if (wlr_backend_is_x11(backend)) {
wlr_x11_output_create(backend); result->new_output = wlr_x11_output_create(backend);
*done = true; result->done = true;
} }
#endif #endif
} }
@ -37,10 +42,10 @@ struct cmd_results *cmd_create_output(int argc, char **argv) {
sway_assert(wlr_backend_is_multi(server.backend), sway_assert(wlr_backend_is_multi(server.backend),
"Expected a multi backend"); "Expected a multi backend");
bool done = false; struct create_result result = { false, NULL };
wlr_multi_for_each_backend(server.backend, create_output, &done); wlr_multi_for_each_backend(server.backend, create_output, &result);
if (!done) { if (!result.done) {
return cmd_results_new(CMD_INVALID, return cmd_results_new(CMD_INVALID,
"Can only create outputs for Wayland, X11 or headless backends"); "Can only create outputs for Wayland, X11 or headless backends");
} }