diff options
author | Ian Fan <ianfan0@gmail.com> | 2018-10-10 12:23:04 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-10 12:23:04 +0000 |
commit | cd6917d4a821fe904a2c242dff673967aa3ad4b2 (patch) | |
tree | e21f0b633212c6b8084348f08fc68cec2efece8b /include | |
parent | bar-bindsym: address ianyfan's comments (diff) | |
parent | Merge pull request #2814 from Emantor/mouse-warping-container (diff) | |
download | sway-cd6917d4a821fe904a2c242dff673967aa3ad4b2.tar.gz sway-cd6917d4a821fe904a2c242dff673967aa3ad4b2.tar.zst sway-cd6917d4a821fe904a2c242dff673967aa3ad4b2.zip |
Merge branch 'master' into bar-bindsym
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/commands.h | 2 | ||||
-rw-r--r-- | include/sway/config.h | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index 48228a98..ab2da1a9 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h | |||
@@ -95,7 +95,7 @@ struct cmd_results *add_color(const char *name, | |||
95 | /** | 95 | /** |
96 | * TODO: Move this function and its dependent functions to container.c. | 96 | * TODO: Move this function and its dependent functions to container.c. |
97 | */ | 97 | */ |
98 | bool container_resize_tiled(struct sway_container *parent, enum wlr_edges edge, | 98 | void container_resize_tiled(struct sway_container *parent, enum wlr_edges edge, |
99 | int amount); | 99 | int amount); |
100 | 100 | ||
101 | sway_cmd cmd_assign; | 101 | sway_cmd cmd_assign; |
diff --git a/include/sway/config.h b/include/sway/config.h index 549d2677..bc02c0fd 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -331,6 +331,12 @@ enum focus_wrapping_mode { | |||
331 | WRAP_FORCE | 331 | WRAP_FORCE |
332 | }; | 332 | }; |
333 | 333 | ||
334 | enum mouse_warping_mode { | ||
335 | WARP_NO, | ||
336 | WARP_OUTPUT, | ||
337 | WARP_CONTAINER | ||
338 | }; | ||
339 | |||
334 | /** | 340 | /** |
335 | * The configuration struct. The result of loading a config file. | 341 | * The configuration struct. The result of loading a config file. |
336 | */ | 342 | */ |
@@ -372,7 +378,7 @@ struct sway_config { | |||
372 | // Flags | 378 | // Flags |
373 | bool focus_follows_mouse; | 379 | bool focus_follows_mouse; |
374 | bool raise_floating; | 380 | bool raise_floating; |
375 | bool mouse_warping; | 381 | enum mouse_warping_mode mouse_warping; |
376 | enum focus_wrapping_mode focus_wrapping; | 382 | enum focus_wrapping_mode focus_wrapping; |
377 | bool active; | 383 | bool active; |
378 | bool failed; | 384 | bool failed; |