mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-17 06:46:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

exec: export matched container id if present

Browse source 
Provides matched container id to each command execution via
handler_context, if --matched-container-id is given with exec
or exec_always. If there is no matched node, the handler_context has
the focused node. The idea is that this can simplify scripting.

Relates to PR 6160 at i3
This commit is contained in:
Rene D. Obermueller 2025-04-14 08:20:34 +02:00
parent 909a2ddb5f
commit fb0fc6a542
2 changed files with 43 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

41
sway/commands/exec_always.c
View file

@ -28,13 +28,22 @@ struct cmd_results *cmd_exec_validate(int argc, char **argv) {
struct cmd_results *cmd_exec_process(int argc, char **argv) { struct cmd_results *cmd_exec_process(int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
char *cmd = NULL; char *cmd = NULL;
bool no_matched_container_id = false;
bool no_startup_id = false; bool no_startup_id = false;
if (strcmp(argv[0], "--no-startup-id") == 0) { int argv_counter = -1;
no_startup_id = true; while (argc > 0 && has_prefix(*argv, "--")) {
--argc; ++argv; if (strcmp(argv[0], "--no-matched-container-id") == 0) {
if ((error = checkarg(argc, argv[-1], EXPECTED_AT_LEAST, 1))) { no_matched_container_id = true;
return error; } else if (strcmp(argv[0], "--no-startup-id") == 0) {
no_startup_id = true;
} else {
return cmd_results_new(CMD_INVALID, "Unrecognized argument '%s'", *argv);
} }
--argc; ++argv; --argv_counter;
}
if ((error = checkarg(argc, argv[argv_counter], EXPECTED_AT_LEAST, 1))) {
return error;
} }
if (argc == 1 && (argv[0][0] == '\'' || argv[0][0] == '"')) { if (argc == 1 && (argv[0][0] == '\'' || argv[0][0] == '"')) {
@ -61,6 +70,28 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
} }
} }
if (no_matched_container_id || config->handler_context.node == NULL) {
goto no_con_id_export;
}
size_t con_id = config->handler_context.node->id;
int con_id_len = snprintf(NULL, 0, "%zu", con_id);
if (con_id_len < 0) {
sway_log(SWAY_ERROR, "Unable to determine buffer length for SWAY_EXEC_CON_ID");
goto no_con_id_export;
}
// accommodate \0
con_id_len++;
char* con_id_str = malloc(con_id_len);
if (!con_id_str) {
sway_log(SWAY_ERROR, "Unable to allocate buffer for SWAY_EXEC_CON_ID");
goto no_con_id_export;
}
snprintf(con_id_str, con_id_len, "%zu", con_id);
setenv("SWAY_EXEC_CON_ID", con_id_str, 1);
setenv("I3_WINDOW_ID", con_id_str, 1);
free(con_id_str);
no_con_id_export:
execlp("sh", "sh", "-c", cmd, (void*)NULL); execlp("sh", "sh", "-c", cmd, (void*)NULL);
sway_log_errno(SWAY_ERROR, "execve failed"); sway_log_errno(SWAY_ERROR, "execve failed");
_exit(0); // Close child process _exit(0); // Close child process

10
sway/sway.5.scd
View file

@ -704,10 +704,14 @@ The default colors are:
windows that are spawned in floating mode, not windows that become floating windows that are spawned in floating mode, not windows that become floating
afterwards. afterwards.
*exec* <shell command> *exec* [--matched-container-id] [--no-startup-id] <shell command>
Executes _shell command_ with sh. Executes _shell command_ with sh. It exports the matched container id to env
variables I3_WINDOW_ID and SWAY_EXEC_CON_ID in case of a criteria match or
the focused node otherwise, unless the _--no-matched-container-id_ option
is set. The _--no_startup_id_ option prevents exporting of
DESKTOP_STARTUP_ID.
*exec_always* <shell command> *exec_always* [--matched-container-id] [--no-startup-id] <shell command>
Like *exec*, but the shell command will be executed _again_ after *reload*. Like *exec*, but the shell command will be executed _again_ after *reload*.
*floating_maximum_size* <width> x <height> *floating_maximum_size* <width> x <height>