nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Respect match criteria for exec command 

We currently do not evaluate match criteria for the exec command
since generally executing the same command multiple times is
unlikely to make sense.

However, it does make sense when the match is empty and this should
prevent the command from running, which currently does not happen.

For consisteny we execute the command as many times as there are
matched criteria, but print a warning if it matches more than one
container.

fixes #3903
This commit is contained in:
Ingo Bürk 2020-01-12 23:35:46 +01:00
parent d21c3a09f4
commit f002584509
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/commands.c
View File

@ -1207,10 +1207,26 @@ void cmd_kill(I3_CMD, const char *kill_mode_str) {
void cmd_exec(I3_CMD, const char *nosn, const char *command) { void cmd_exec(I3_CMD, const char *nosn, const char *command) {
bool no_startup_id = (nosn != NULL); bool no_startup_id = (nosn != NULL);
DLOG("should execute %s, no_startup_id = %d\n", command, no_startup_id); HANDLE_EMPTY_MATCH;
start_application(command, no_startup_id);
ysuccess(true); int count = 0;
owindow *current;
TAILQ_FOREACH(current, &owindows, owindows) {
count++;
}
if (count > 1) {
LOG("WARNING: Your criteria for the exec command match %d containers, "
"so the command will execute this many times.\n",
count);
}
TAILQ_FOREACH(current, &owindows, owindows) {
DLOG("should execute %s, no_startup_id = %d\n", command, no_startup_id);
start_application(command, no_startup_id);
}
ysuccess(count > 0);
} }
#define CMD_FOCUS_WARN_CHILDREN \ #define CMD_FOCUS_WARN_CHILDREN \