Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make create_output more useful #8381

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Make create_output more useful #8381

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions sway/commands/create_output.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,26 @@
#if WLR_HAS_X11_BACKEND
#include <wlr/backend/x11.h>
#endif
#include <wlr/types/wlr_output.h>
#include "sway/commands.h"
#include "sway/output.h"
#include "sway/server.h"
#include "log.h"

static void create_output(struct wlr_backend *backend, void *data) {
bool *done = data;
if (*done) {
struct wlr_output **result = data;
if (*result) {
return;
}

if (wlr_backend_is_wl(backend)) {
wlr_wl_output_create(backend);
*done = true;
*result = wlr_wl_output_create(backend);
} else if (wlr_backend_is_headless(backend)) {
wlr_headless_add_output(backend, 1920, 1080);
*done = true;
*result = wlr_headless_add_output(backend, 1920, 1080);
}
#if WLR_HAS_X11_BACKEND
else if (wlr_backend_is_x11(backend)) {
wlr_x11_output_create(backend);
*done = true;
*result = wlr_x11_output_create(backend);
}
#endif
}
Expand All @@ -37,13 +36,24 @@ 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 cmd_results *error = NULL;
if ((error = checkarg(argc, "create_output", EXPECTED_AT_MOST, 1))) {
return error;
}
if (argc > 0 && all_output_by_name_or_id(argv[0])) {
return cmd_results_new(CMD_INVALID, "Output name already in use");
}
struct wlr_output *result = NULL;
wlr_multi_for_each_backend(server.backend, create_output, &result);

if (!done) {
if (!result) {
return cmd_results_new(CMD_INVALID,
"Can only create outputs for Wayland, X11 or headless backends");
}

if (argc > 0) {
wlr_output_set_name(result, argv[0]);
}

return cmd_results_new(CMD_SUCCESS, NULL);
}