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/sway | |
| parent | 60ce81e06adc9ea133e8cfd030465e94295a95ff (diff) | |
| parent | 7fee555a462b001748352da1339c9bcc0e154a3b (diff) | |
Merge branch 'master' into pretty-print-swaymsg
Diffstat (limited to 'include/sway')
| -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 @@ #include <wlc/wlc.h> #include "config.h" +// Container that a called command should act upon. Only valid in command functions. +extern swayc_t *current_container; + /** * Indicates the result of a command's execution. */ @@ -126,6 +129,7 @@ sway_cmd cmd_ipc; sway_cmd cmd_kill; sway_cmd cmd_layout; sway_cmd cmd_log_colors; +sway_cmd cmd_mark; sway_cmd cmd_mode; sway_cmd cmd_mouse_warping; sway_cmd cmd_move; @@ -140,12 +144,14 @@ sway_cmd cmd_resize; sway_cmd cmd_scratchpad; sway_cmd cmd_seamless_mouse; sway_cmd cmd_set; +sway_cmd cmd_show_marks; sway_cmd cmd_smart_gaps; sway_cmd cmd_split; sway_cmd cmd_splith; sway_cmd cmd_splitt; sway_cmd cmd_splitv; sway_cmd cmd_sticky; +sway_cmd cmd_unmark; sway_cmd cmd_workspace; sway_cmd cmd_ws_auto_back_and_forth; 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 { bool reading; bool auto_back_and_forth; bool seamless_mouse; + bool show_marks; bool edge_gaps; 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 { * Number of slave groups (e.g. columns) in auto layouts. */ size_t nb_slave_groups; + + /** + * Marks applied to the container, list_t of char*. + */ + list_t *marks; }; 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); // been set with `for_window` commands and have an associated cmdlist. list_t *criteria_for(swayc_t *cont); +// Returns a list of all containers that match the given list of tokens. +list_t *container_for(list_t *tokens); + #endif |