From 2445d279604d7be38c00db60ffde4279a3c75459 Mon Sep 17 00:00:00 2001 From: Calvin Lee Date: Sun, 2 Apr 2017 14:38:33 -0600 Subject: 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 --- include/sway/commands.h | 3 +++ include/sway/config.h | 1 + include/sway/container.h | 5 +++++ 3 files changed, 9 insertions(+) (limited to 'include') 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; 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 +141,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 { -- cgit v1.2.3 From 069d37f987c4e323cdb9396f0d80ac83d00566ff Mon Sep 17 00:00:00 2001 From: Calvin Lee Date: Tue, 4 Apr 2017 21:20:27 -0600 Subject: Improve criteria handling This commit changes how commands decide what container to act on. Commands get the current container though `current_container`, a global defined in sway/commands.c. If a criteria is given before a command, then the following command will be run once for every container the criteria matches with a reference to the matching container in 'current_container'. Commands should use this instead of `get_focused_container()` from now on. This commit also fixes a few (minor) mistakes made in implementing marks such as non-escaped arrows in sway(5) and calling the "mark" command "floating" by accident. It also cleans up `criteria.c` in a few places. --- include/sway/commands.h | 3 +++ include/sway/criteria.h | 3 +++ 2 files changed, 6 insertions(+) (limited to 'include') diff --git a/include/sway/commands.h b/include/sway/commands.h index 35a2f92a..91f2ae01 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h @@ -5,6 +5,9 @@ #include #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. */ 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 -- cgit v1.2.3