diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-04-10 07:17:47 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-10 07:17:47 -0400 |
commit | 5d3a02a7c624bbef07b1b228eb1bb60fade5248c (patch) | |
tree | 35860f43beb1ce46de5a3d780ca33830d4bc9ba4 /include | |
parent | Add pretty printing to swaymsg (diff) | |
parent | Merge pull request #1150 from JerziKaminsky/cmake_find_libcap (diff) | |
download | sway-5d3a02a7c624bbef07b1b228eb1bb60fade5248c.tar.gz sway-5d3a02a7c624bbef07b1b228eb1bb60fade5248c.tar.zst sway-5d3a02a7c624bbef07b1b228eb1bb60fade5248c.zip |
Merge branch 'master' into pretty-print-swaymsg
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/commands.h | 6 | ||||
-rw-r--r-- | include/sway/config.h | 1 | ||||
-rw-r--r-- | include/sway/container.h | 5 | ||||
-rw-r--r-- | include/sway/criteria.h | 3 |
4 files changed, 15 insertions, 0 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index 511bee4d..91f2ae01 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h | |||
@@ -5,6 +5,9 @@ | |||
5 | #include <wlc/wlc.h> | 5 | #include <wlc/wlc.h> |
6 | #include "config.h" | 6 | #include "config.h" |
7 | 7 | ||
8 | // Container that a called command should act upon. Only valid in command functions. | ||
9 | extern swayc_t *current_container; | ||
10 | |||
8 | /** | 11 | /** |
9 | * Indicates the result of a command's execution. | 12 | * Indicates the result of a command's execution. |
10 | */ | 13 | */ |
@@ -126,6 +129,7 @@ sway_cmd cmd_ipc; | |||
126 | sway_cmd cmd_kill; | 129 | sway_cmd cmd_kill; |
127 | sway_cmd cmd_layout; | 130 | sway_cmd cmd_layout; |
128 | sway_cmd cmd_log_colors; | 131 | sway_cmd cmd_log_colors; |
132 | sway_cmd cmd_mark; | ||
129 | sway_cmd cmd_mode; | 133 | sway_cmd cmd_mode; |
130 | sway_cmd cmd_mouse_warping; | 134 | sway_cmd cmd_mouse_warping; |
131 | sway_cmd cmd_move; | 135 | sway_cmd cmd_move; |
@@ -140,12 +144,14 @@ sway_cmd cmd_resize; | |||
140 | sway_cmd cmd_scratchpad; | 144 | sway_cmd cmd_scratchpad; |
141 | sway_cmd cmd_seamless_mouse; | 145 | sway_cmd cmd_seamless_mouse; |
142 | sway_cmd cmd_set; | 146 | sway_cmd cmd_set; |
147 | sway_cmd cmd_show_marks; | ||
143 | sway_cmd cmd_smart_gaps; | 148 | sway_cmd cmd_smart_gaps; |
144 | sway_cmd cmd_split; | 149 | sway_cmd cmd_split; |
145 | sway_cmd cmd_splith; | 150 | sway_cmd cmd_splith; |
146 | sway_cmd cmd_splitt; | 151 | sway_cmd cmd_splitt; |
147 | sway_cmd cmd_splitv; | 152 | sway_cmd cmd_splitv; |
148 | sway_cmd cmd_sticky; | 153 | sway_cmd cmd_sticky; |
154 | sway_cmd cmd_unmark; | ||
149 | sway_cmd cmd_workspace; | 155 | sway_cmd cmd_workspace; |
150 | sway_cmd cmd_ws_auto_back_and_forth; | 156 | sway_cmd cmd_ws_auto_back_and_forth; |
151 | sway_cmd cmd_workspace_layout; | 157 | sway_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 | ||
170 | enum visibility_mask { | 175 | enum visibility_mask { |
diff --git a/include/sway/criteria.h b/include/sway/criteria.h index 5c71d172..022c48a8 100644 --- a/include/sway/criteria.h +++ b/include/sway/criteria.h | |||
@@ -33,4 +33,7 @@ char *extract_crit_tokens(list_t *tokens, const char *criteria); | |||
33 | // been set with `for_window` commands and have an associated cmdlist. | 33 | // been set with `for_window` commands and have an associated cmdlist. |
34 | list_t *criteria_for(swayc_t *cont); | 34 | list_t *criteria_for(swayc_t *cont); |
35 | 35 | ||
36 | // Returns a list of all containers that match the given list of tokens. | ||
37 | list_t *container_for(list_t *tokens); | ||
38 | |||
36 | #endif | 39 | #endif |