diff options
author | 2020-12-12 00:11:58 +0100 | |
---|---|---|
committer | 2021-02-25 09:48:39 -0500 | |
commit | 1afedcb94c0517b5434e2220e63b997cf01427bd (patch) | |
tree | 3fae6d855a165e7364540a1474508caa8ae1b708 /include | |
parent | focus: beyond fullscreen when focused explicitly (diff) | |
download | sway-1afedcb94c0517b5434e2220e63b997cf01427bd.tar.gz sway-1afedcb94c0517b5434e2220e63b997cf01427bd.tar.zst sway-1afedcb94c0517b5434e2220e63b997cf01427bd.zip |
Fix for_window criteria and mouse button bindings
Previously, the special case handling of scratchpad and unmark commands
was (probably accidentally) limited to criteria directly handled in the
execute_command function. This would exclude: 1. for_window criteria, as
these are handled externally for views and 2. and mouse bindings which
select target the node currently under the mouse cursor.
As a concrete example `for_window [app_id="foobar"] move scratchpad,
scratchpad show` would show (or hide due to the toggling functionality)
another window from the scratchpad, instead of showing the window with
app_id "foobar".
This commit replaces the "using_criteria" flag with "node_overridden"
with the more general notion of signifying that the node (and
container/workspace) in the current command handler context of the sway
config is not defined by the currently focused node, but instead
overridden by other means, i.e., criteria or mouse position.
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index 59f22ae2..2a1df2b6 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -559,7 +559,7 @@ struct sway_config { | |||
559 | struct sway_node *node; | 559 | struct sway_node *node; |
560 | struct sway_container *container; | 560 | struct sway_container *container; |
561 | struct sway_workspace *workspace; | 561 | struct sway_workspace *workspace; |
562 | bool using_criteria; | 562 | bool node_overridden; // True if the node is selected by means other than focus |
563 | struct { | 563 | struct { |
564 | int argc; | 564 | int argc; |
565 | char **argv; | 565 | char **argv; |