mirror of
https://github.com/swaywm/sway.git
synced 2026-02-23 01:40:27 -05:00
sway/cmd/create_output: Add create_result struct
This commit is contained in:
parent
055be4ec35
commit
4c75571175
1 changed files with 16 additions and 11 deletions
|
|
@ -9,23 +9,28 @@
|
|||
#include "sway/server.h"
|
||||
#include "log.h"
|
||||
|
||||
struct create_result {
|
||||
bool done;
|
||||
struct wlr_output *new_output;
|
||||
};
|
||||
|
||||
static void create_output(struct wlr_backend *backend, void *data) {
|
||||
bool *done = data;
|
||||
if (*done) {
|
||||
struct create_result *result = data;
|
||||
if (result->done) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (wlr_backend_is_wl(backend)) {
|
||||
wlr_wl_output_create(backend);
|
||||
*done = true;
|
||||
result->new_output = wlr_wl_output_create(backend);
|
||||
result->done = true;
|
||||
} else if (wlr_backend_is_headless(backend)) {
|
||||
wlr_headless_add_output(backend, 1920, 1080);
|
||||
*done = true;
|
||||
result->new_output = wlr_headless_add_output(backend, 1920, 1080);
|
||||
result->done = true;
|
||||
}
|
||||
#if WLR_HAS_X11_BACKEND
|
||||
else if (wlr_backend_is_x11(backend)) {
|
||||
wlr_x11_output_create(backend);
|
||||
*done = true;
|
||||
result->new_output = wlr_x11_output_create(backend);
|
||||
result->done = true;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
@ -37,10 +42,10 @@ struct cmd_results *cmd_create_output(int argc, char **argv) {
|
|||
sway_assert(wlr_backend_is_multi(server.backend),
|
||||
"Expected a multi backend");
|
||||
|
||||
bool done = false;
|
||||
wlr_multi_for_each_backend(server.backend, create_output, &done);
|
||||
struct create_result result = { false, NULL };
|
||||
wlr_multi_for_each_backend(server.backend, create_output, &result);
|
||||
|
||||
if (!done) {
|
||||
if (!result.done) {
|
||||
return cmd_results_new(CMD_INVALID,
|
||||
"Can only create outputs for Wayland, X11 or headless backends");
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue