mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-02 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into bar-bindsym

Browse source
This commit is contained in:
Ian Fan 2018-10-10 12:23:04 +00:00 • committed by GitHub
commit cd6917d4a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 63 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sway/commands.h
View file

@ -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;

8
include/sway/config.h
View file

@ -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;