mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-24 00:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

commands/create_output: Add name argument

Browse source 
Allow specifying a name to be set for the newly created output, which
avoids the need for traversing the output list to find out what was
created. This is particularly useful for reusing configuration.
This commit is contained in:
Kenny Levinsen 2024-10-11 00:13:47 +02:00
parent dd063a0ef7
commit 1c4d905920
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
sway/commands/create_output.c
View file

@ -5,27 +5,26 @@
#if WLR_HAS_X11_BACKEND #if WLR_HAS_X11_BACKEND
#include <wlr/backend/x11.h> #include <wlr/backend/x11.h>
#endif #endif
#include <wlr/types/wlr_output.h>
#include "sway/commands.h" #include "sway/commands.h"
#include "sway/output.h"
#include "sway/server.h" #include "sway/server.h"
#include "log.h" #include "log.h"
static void create_output(struct wlr_backend *backend, void *data) { static void create_output(struct wlr_backend *backend, void *data) {
bool *done = data; struct wlr_output **result = data;
if (*done) { if (*result) {
return; return;
} }
if (wlr_backend_is_wl(backend)) { if (wlr_backend_is_wl(backend)) {
wlr_wl_output_create(backend); *result = wlr_wl_output_create(backend);
*done = true;
} else if (wlr_backend_is_headless(backend)) { } else if (wlr_backend_is_headless(backend)) {
wlr_headless_add_output(backend, 1920, 1080); *result = wlr_headless_add_output(backend, 1920, 1080);
*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 = wlr_x11_output_create(backend);
*done = true;
} }
#endif #endif
} }
@ -37,13 +36,24 @@ 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 cmd_results *error = NULL;
wlr_multi_for_each_backend(server.backend, create_output, &done); 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, 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");
} }
if (argc > 0) {
wlr_output_set_name(result, argv[0]);
}
return cmd_results_new(CMD_SUCCESS, NULL); return cmd_results_new(CMD_SUCCESS, NULL);
} }