From: Ingo Bürk <ingo.buerk@tngtech.com>
Date: Mon, 30 Mar 2015 20:16:05 +0000 (+0200)
Subject: Changed the default for show_marks from "no" to "yes"
X-Git-Tag: 4.11~155^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=refs%2Fpull%2F1601%2Fhead;p=i3%2Fi3

Changed the default for show_marks from "no" to "yes"
---

diff --git a/docs/userguide b/docs/userguide
index 921a8628..2e42493c 100644
--- a/docs/userguide
+++ b/docs/userguide
@@ -1012,7 +1012,7 @@ If activated, marks on windows are drawn in their window decoration. However,
 any mark starting with an underscore in its name (+_+) will not be drawn even if
 this option is activated.
 
-The default for this option is +no+.
+The default for this option is +yes+.
 
 *Syntax*:
 -------------------
@@ -1904,7 +1904,7 @@ The additional +--toggle+ option will remove the mark if the window already has
 this mark, add it if the window has none or replace the current mark if it has
 another mark.
 
-Refer to +show_marks+ if you want marks to be shown in the window decoration.
+Refer to +show_marks+ if you don't want marks to be shown in the window decoration.
 
 *Syntax*:
 ------------------------------
diff --git a/src/commands.c b/src/commands.c
index 6c24e24d..dc60e974 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -1046,7 +1046,7 @@ void cmd_mark(I3_CMD, char *mark, char *toggle) {
     owindow *current;
     TAILQ_FOREACH(current, &owindows, owindows) {
         DLOG("matching: %p / %s\n", current->con, current->con->name);
-        current->con->mark_changed=true;
+        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);
diff --git a/src/config.c b/src/config.c
index 36b7a163..8a1cb99c 100644
--- a/src/config.c
+++ b/src/config.c
@@ -190,6 +190,8 @@ void load_configuration(xcb_connection_t *conn, const char *override_configpath,
     INIT_COLOR(config.bar.unfocused, "#333333", "#222222", "#888888", "#000000");
     INIT_COLOR(config.bar.urgent, "#2f343a", "#900000", "#ffffff", "#000000");
 
+    config.show_marks = true;
+
     config.default_border = BS_NORMAL;
     config.default_floating_border = BS_NORMAL;
     config.default_border_width = logical_px(2);