aboutsummaryrefslogtreecommitdiffstats
path: root/include/sway
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <RyanDwyer@users.noreply.github.com>2018-08-19 16:16:32 +1000
committerLibravatar GitHub <noreply@github.com>2018-08-19 16:16:32 +1000
commit389d159c81502aa8b951895de11c3720bbd5ba7d (patch)
treec5d96041e3270b1d1d50f8a42d91652d615c9938 /include/sway
parentMerge pull request #2466 from RyanDwyer/geometry (diff)
parentMerge branch 'master' into commands (diff)
downloadsway-389d159c81502aa8b951895de11c3720bbd5ba7d.tar.gz
sway-389d159c81502aa8b951895de11c3720bbd5ba7d.tar.zst
sway-389d159c81502aa8b951895de11c3720bbd5ba7d.zip
Merge pull request #2453 from ianyfan/commands
More commands
Diffstat (limited to 'include/sway')
-rw-r--r--include/sway/commands.h1
-rw-r--r--include/sway/criteria.h9
2 files changed, 6 insertions, 4 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h
index 545b21e6..8e91c158 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -136,6 +136,7 @@ sway_cmd cmd_mark;
136sway_cmd cmd_mode; 136sway_cmd cmd_mode;
137sway_cmd cmd_mouse_warping; 137sway_cmd cmd_mouse_warping;
138sway_cmd cmd_move; 138sway_cmd cmd_move;
139sway_cmd cmd_nop;
139sway_cmd cmd_opacity; 140sway_cmd cmd_opacity;
140sway_cmd cmd_new_float; 141sway_cmd cmd_new_float;
141sway_cmd cmd_new_window; 142sway_cmd cmd_new_window;
diff --git a/include/sway/criteria.h b/include/sway/criteria.h
index b4ff7d49..7a1e547b 100644
--- a/include/sway/criteria.h
+++ b/include/sway/criteria.h
@@ -7,10 +7,11 @@
7#include "tree/view.h" 7#include "tree/view.h"
8 8
9enum criteria_type { 9enum criteria_type {
10 CT_COMMAND = 1 << 0, 10 CT_COMMAND = 1 << 0,
11 CT_ASSIGN_OUTPUT = 1 << 1, 11 CT_ASSIGN_OUTPUT = 1 << 1,
12 CT_ASSIGN_WORKSPACE = 1 << 2, 12 CT_ASSIGN_WORKSPACE = 1 << 2,
13 CT_NO_FOCUS = 1 << 3, 13 CT_ASSIGN_WORKSPACE_NUMBER = 1 << 3,
14 CT_NO_FOCUS = 1 << 4,
14}; 15};
15 16
16struct criteria { 17struct criteria {