summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLibravatar Calvin Lee <cyrus296@gmail.com>2017-04-02 14:38:33 -0600
committerLibravatar Calvin Lee <cyrus296@gmail.com>2017-04-03 11:48:37 -0600
commit2445d279604d7be38c00db60ffde4279a3c75459 (patch)
tree030844d9fb13be7814dd760a6ffedbec8f5264cd /include
parentUpdate man page (diff)
downloadsway-2445d279604d7be38c00db60ffde4279a3c75459.tar.gz
sway-2445d279604d7be38c00db60ffde4279a3c75459.tar.zst
sway-2445d279604d7be38c00db60ffde4279a3c75459.zip
Impliment i3-style marks
This commit adds three commands to sway: `show_marks`, `mark` and `unmark`. Marks are displayed right-aligned in the window border as i3 does. Marks may be found using criteria. Fixes #1007
Diffstat (limited to 'include')
-rw-r--r--include/sway/commands.h3
-rw-r--r--include/sway/config.h1
-rw-r--r--include/sway/container.h5
3 files changed, 9 insertions, 0 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h
index 511bee4d..35a2f92a 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -126,6 +126,7 @@ sway_cmd cmd_ipc;
126sway_cmd cmd_kill; 126sway_cmd cmd_kill;
127sway_cmd cmd_layout; 127sway_cmd cmd_layout;
128sway_cmd cmd_log_colors; 128sway_cmd cmd_log_colors;
129sway_cmd cmd_mark;
129sway_cmd cmd_mode; 130sway_cmd cmd_mode;
130sway_cmd cmd_mouse_warping; 131sway_cmd cmd_mouse_warping;
131sway_cmd cmd_move; 132sway_cmd cmd_move;
@@ -140,12 +141,14 @@ sway_cmd cmd_resize;
140sway_cmd cmd_scratchpad; 141sway_cmd cmd_scratchpad;
141sway_cmd cmd_seamless_mouse; 142sway_cmd cmd_seamless_mouse;
142sway_cmd cmd_set; 143sway_cmd cmd_set;
144sway_cmd cmd_show_marks;
143sway_cmd cmd_smart_gaps; 145sway_cmd cmd_smart_gaps;
144sway_cmd cmd_split; 146sway_cmd cmd_split;
145sway_cmd cmd_splith; 147sway_cmd cmd_splith;
146sway_cmd cmd_splitt; 148sway_cmd cmd_splitt;
147sway_cmd cmd_splitv; 149sway_cmd cmd_splitv;
148sway_cmd cmd_sticky; 150sway_cmd cmd_sticky;
151sway_cmd cmd_unmark;
149sway_cmd cmd_workspace; 152sway_cmd cmd_workspace;
150sway_cmd cmd_ws_auto_back_and_forth; 153sway_cmd cmd_ws_auto_back_and_forth;
151sway_cmd cmd_workspace_layout; 154sway_cmd cmd_workspace_layout;
diff --git a/include/sway/config.h b/include/sway/config.h
index d77fbd51..2de90434 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -275,6 +275,7 @@ struct sway_config {
275 bool reading; 275 bool reading;
276 bool auto_back_and_forth; 276 bool auto_back_and_forth;
277 bool seamless_mouse; 277 bool seamless_mouse;
278 bool show_marks;
278 279
279 bool edge_gaps; 280 bool edge_gaps;
280 bool smart_gaps; 281 bool smart_gaps;
diff --git a/include/sway/container.h b/include/sway/container.h
index 46925589..37192ce3 100644
--- a/include/sway/container.h
+++ b/include/sway/container.h
@@ -165,6 +165,11 @@ struct sway_container {
165 * Number of slave groups (e.g. columns) in auto layouts. 165 * Number of slave groups (e.g. columns) in auto layouts.
166 */ 166 */
167 size_t nb_slave_groups; 167 size_t nb_slave_groups;
168
169 /**
170 * Marks applied to the container, list_t of char*.
171 */
172 list_t *marks;
168}; 173};
169 174
170enum visibility_mask { 175enum visibility_mask {