TAILQ_INIT(&(new->nodes_head));
TAILQ_INIT(&(new->focus_head));
TAILQ_INIT(&(new->swallow_head));
+ TAILQ_INIT(&(new->marks_head));
if (parent != NULL)
con_attach(new, parent, false);
Con *con_by_mark(const char *mark) {
Con *con;
TAILQ_FOREACH(con, &all_cons, all_cons) {
- if (con->mark != NULL && strcmp(con->mark, mark) == 0)
+ if (con_has_mark(con, mark))
return con;
}
return NULL;
}
+/*
+ * Returns true if and only if the given containers holds the mark.
+ *
+ */
+bool con_has_mark(Con *con, const char *mark) {
+ mark_t *current;
+ TAILQ_FOREACH(current, &(con->marks_head), marks) {
+ if (strcmp(current->name, mark) == 0)
+ return true;
+ }
+
+ return false;
+}
+
/*
* Toggles the mark on a container.
* If the container already has this mark, the mark is removed.
* Otherwise, the mark is assigned to the container.
*
*/
-void con_mark_toggle(Con *con, const char *mark) {
+void con_mark_toggle(Con *con, const char *mark, mark_mode_t mode) {
assert(con != NULL);
DLOG("Toggling mark \"%s\" on con = %p.\n", mark, con);
- if (con->mark != NULL && strcmp(con->mark, mark) == 0) {
- con_unmark(mark);
+ if (con_has_mark(con, mark)) {
+ con_unmark(con, mark);
} else {
- con_mark(con, mark);
+ con_mark(con, mark, mode);
}
}
* Assigns a mark to the container.
*
*/
-void con_mark(Con *con, const char *mark) {
+void con_mark(Con *con, const char *mark, mark_mode_t mode) {
assert(con != NULL);
DLOG("Setting mark \"%s\" on con = %p.\n", mark, con);
- FREE(con->mark);
- con->mark = sstrdup(mark);
- con->mark_changed = true;
-
- DLOG("Clearing the mark from all other windows.\n");
- Con *other;
- TAILQ_FOREACH(other, &all_cons, all_cons) {
- /* Skip the window we actually handled since we took care of it already. */
- if (con == other)
- continue;
+ con_unmark(NULL, mark);
+ if (mode == MM_REPLACE) {
+ DLOG("Removing all existing marks on con = %p.\n", con);
- if (other->mark != NULL && strcmp(other->mark, mark) == 0) {
- FREE(other->mark);
- other->mark_changed = true;
+ mark_t *current;
+ TAILQ_FOREACH(current, &(con->marks_head), marks) {
+ con_unmark(con, current->name);
}
}
+
+ mark_t *new = scalloc(1, sizeof(mark_t));
+ new->name = sstrdup(mark);
+ TAILQ_INSERT_TAIL(&(con->marks_head), new, marks);
+
+ con->mark_changed = true;
}
/*
- * If mark is NULL, this removes all existing marks.
+ * Removes marks from containers.
+ * If con is NULL, all containers are considered.
+ * If name is NULL, this removes all existing marks.
* Otherwise, it will only remove the given mark (if it is present).
*
*/
-void con_unmark(const char *mark) {
- Con *con;
- if (mark == NULL) {
+void con_unmark(Con *con, const char *name) {
+ Con *current;
+ if (name == NULL) {
DLOG("Unmarking all containers.\n");
- TAILQ_FOREACH(con, &all_cons, all_cons) {
- if (con->mark == NULL)
+ TAILQ_FOREACH(current, &all_cons, all_cons) {
+ if (con != NULL && current != con)
continue;
- FREE(con->mark);
- con->mark_changed = true;
+ if (TAILQ_EMPTY(&(current->marks_head)))
+ continue;
+
+ mark_t *mark;
+ while (!TAILQ_EMPTY(&(current->marks_head))) {
+ mark = TAILQ_FIRST(&(current->marks_head));
+ FREE(mark->name);
+ TAILQ_REMOVE(&(current->marks_head), mark, marks);
+ FREE(mark);
+ }
+
+ current->mark_changed = true;
}
} else {
- DLOG("Removing mark \"%s\".\n", mark);
- con = con_by_mark(mark);
- if (con == NULL) {
+ DLOG("Removing mark \"%s\".\n", name);
+ current = (con == NULL) ? con_by_mark(name) : con;
+ if (current == NULL) {
DLOG("No container found with this mark, so there is nothing to do.\n");
return;
}
- DLOG("Found mark on con = %p. Removing it now.\n", con);
- FREE(con->mark);
- con->mark_changed = true;
+ DLOG("Found mark on con = %p. Removing it now.\n", current);
+ current->mark_changed = true;
+
+ mark_t *mark;
+ TAILQ_FOREACH(mark, &(current->marks_head), marks) {
+ if (strcmp(mark->name, name) != 0)
+ continue;
+
+ FREE(mark->name);
+ TAILQ_REMOVE(&(current->marks_head), mark, marks);
+ FREE(mark);
+ break;
+ }
}
}