koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added a --toggle switch to "mark [--toggle] <mark>"

Browse Source 
This option allows toggling marks on a window without knowing whether the mark is already set or not.
It behaves as follows:
1) If the matched window has no mark, the new mark is set.
2) If the matched window has another mark, the old mark is removed and the new mark is set.
3) If the matched window already has the mark, the mark is removed.

The behavior that all non-matched windows have this mark removed is kept.

fixes #1463
This commit is contained in:
Ingo Bürk
2015-03-28 19:12:25 +01:00
parent dfefb10d36
commit d51d6d730e
3 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/commands.c
View File

@ -1037,26 +1037,40 @@ void cmd_workspace_name(I3_CMD, char *name) {
}
/*
* Implementation of 'mark <mark>'
* Implementation of 'mark [--toggle] <mark>'
*
*/
void cmd_mark(I3_CMD, char *mark) {
DLOG("Clearing all windows which have that mark first\n");
Con *con;
TAILQ_FOREACH(con, &all_cons, all_cons) {
if (con->mark && strcmp(con->mark, mark) == 0)
FREE(con->mark);
}
DLOG("marking window with str %s\n", mark);
owindow *current;
void cmd_mark(I3_CMD, char *mark, char *toggle) {
HANDLE_EMPTY_MATCH;
owindow *current;
TAILQ_FOREACH(current, &owindows, owindows) {
DLOG("matching: %p / %s\n", current->con, current->con->name);
current->con->mark = sstrdup(mark);
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");
Con *con;
TAILQ_FOREACH(con, &all_cons, all_cons) {
/* Skip matched windows, we took care of them already. */
bool matched = false;
TAILQ_FOREACH(current, &owindows, owindows)
if (current->con == con) {
matched = true;
break;
}
if (matched)
continue;
if (con->mark && strcmp(con->mark, mark) == 0)
FREE(con->mark);
}
cmd_output->needs_tree_render = true;