applications/i3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only mark a window if only one window is matched

Browse Source 
We only support unique marks, so looping over all matched windows must be prevented.
If more than one window is matched, we reject it with an error message.

fixes #1614
This commit is contained in:
Ingo Bürk 2015-03-31 20:47:22 +02:00
parent 43204b43fd
commit 2e4fac61d2
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/commands.c
View File

@ -1043,32 +1043,34 @@ void cmd_workspace_name(I3_CMD, char *name) {
void cmd_mark(I3_CMD, char *mark, char *toggle) { void cmd_mark(I3_CMD, char *mark, char *toggle) {
HANDLE_EMPTY_MATCH; HANDLE_EMPTY_MATCH;
owindow *current; owindow *current = TAILQ_FIRST(&owindows);
TAILQ_FOREACH(current, &owindows, owindows) { if (current == NULL) {
DLOG("matching: %p / %s\n", current->con, current->con->name); ysuccess(false);
current->con->mark_changed = true; return;
if (toggle != NULL && current->con->mark && strcmp(current->con->mark, mark) == 0) { }
DLOG("removing window mark %s\n", mark);
FREE(current->con->mark); /* Marks must be unique, i.e., no two windows must have the same mark. */
} else { if (current != TAILQ_LAST(&owindows, owindows_head)) {
DLOG("marking window with str %s\n", mark); yerror("A mark must not be put onto more than one window");
FREE(current->con->mark); return;
current->con->mark = sstrdup(mark); }
}
DLOG("matching: %p / %s\n", current->con, current->con->name);
current->con->mark_changed = true;
if (toggle != NULL && current->con->mark && strcmp(current->con->mark, mark) == 0) {
DLOG("removing window mark %s\n", mark);
FREE(current->con->mark);
} else {
DLOG("marking window with str %s\n", mark);
FREE(current->con->mark);
current->con->mark = sstrdup(mark);
} }
DLOG("Clearing all non-matched windows with this mark\n"); DLOG("Clearing all non-matched windows with this mark\n");
Con *con; Con *con;
TAILQ_FOREACH(con, &all_cons, all_cons) { TAILQ_FOREACH(con, &all_cons, all_cons) {
/* Skip matched windows, we took care of them already. */ /* Skip matched window, we took care of it already. */
bool matched = false; if (current->con == con)
TAILQ_FOREACH(current, &owindows, owindows) {
if (current->con == con) {
matched = true;
break;
}
}
if (matched)
continue; continue;
if (con->mark && strcmp(con->mark, mark) == 0) { if (con->mark && strcmp(con->mark, mark) == 0) {