diff options
| author | Furkan Sahin <furkan-dev@proton.me> | 2018-10-10 12:23:04 +0000 |
|---|---|---|
| committer | Furkan Sahin <furkan-dev@proton.me> | 2018-10-10 12:23:04 +0000 |
| commit | 19c4fc6d880f5e28a164bae86431a18a82d3cdc0 (patch) | |
| tree | e21f0b633212c6b8084348f08fc68cec2efece8b /include | |
| parent | c84122e83bc3e2faf29a600172eb78040956bacd (diff) | |
| parent | b8dd58d4b0214f425b7a5f0685e2237b4b4ead5f (diff) | |
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, /** * TODO: Move this function and its dependent functions to container.c. */ -bool container_resize_tiled(struct sway_container *parent, enum wlr_edges edge, +void container_resize_tiled(struct sway_container *parent, enum wlr_edges edge, int amount); 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 { WRAP_FORCE }; +enum mouse_warping_mode { + WARP_NO, + WARP_OUTPUT, + WARP_CONTAINER +}; + /** * The configuration struct. The result of loading a config file. */ @@ -372,7 +378,7 @@ struct sway_config { // Flags bool focus_follows_mouse; bool raise_floating; - bool mouse_warping; + enum mouse_warping_mode mouse_warping; enum focus_wrapping_mode focus_wrapping; bool active; bool failed; |