diff options
author | Zandr Martin <zandrmartin@users.noreply.github.com> | 2016-07-04 13:53:49 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-04 13:53:49 -0500 |
commit | e07b8c8d7cfaaf6667a766c9d42d59fc14e98872 (patch) | |
tree | 93c374e26425460bfa7ad1bc1528a1b9b5725a8e /include | |
parent | fix typo in ipc-json.c (diff) | |
parent | Merge pull request #734 from jplatte/patch-1 (diff) | |
download | sway-e07b8c8d7cfaaf6667a766c9d42d59fc14e98872.tar.gz sway-e07b8c8d7cfaaf6667a766c9d42d59fc14e98872.tar.zst sway-e07b8c8d7cfaaf6667a766c9d42d59fc14e98872.zip |
Merge branch 'master' into get-tree-command
Diffstat (limited to 'include')
-rw-r--r-- | include/focus.h | 4 | ||||
-rw-r--r-- | include/resize.h | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/include/focus.h b/include/focus.h index 10d5182b..4abd6080 100644 --- a/include/focus.h +++ b/include/focus.h | |||
@@ -21,6 +21,10 @@ swayc_t *get_focused_container(swayc_t *parent); | |||
21 | swayc_t *get_focused_view(swayc_t *parent); | 21 | swayc_t *get_focused_view(swayc_t *parent); |
22 | swayc_t *get_focused_float(swayc_t *ws); | 22 | swayc_t *get_focused_float(swayc_t *ws); |
23 | 23 | ||
24 | // a special-case function to get the focused view, regardless | ||
25 | // of whether it's tiled or floating | ||
26 | swayc_t *get_focused_view_include_floating(swayc_t *parent); | ||
27 | |||
24 | bool set_focused_container(swayc_t *container); | 28 | bool set_focused_container(swayc_t *container); |
25 | bool set_focused_container_for(swayc_t *ancestor, swayc_t *container); | 29 | bool set_focused_container_for(swayc_t *ancestor, swayc_t *container); |
26 | 30 | ||
diff --git a/include/resize.h b/include/resize.h index d49cc74a..0d382994 100644 --- a/include/resize.h +++ b/include/resize.h | |||
@@ -2,7 +2,13 @@ | |||
2 | #define _SWAY_RESIZE_H | 2 | #define _SWAY_RESIZE_H |
3 | #include <stdbool.h> | 3 | #include <stdbool.h> |
4 | 4 | ||
5 | bool set_size_tiled(int amount, bool use_width); | 5 | enum resize_dim_types { |
6 | bool resize_tiled(int amount, bool use_width); | 6 | RESIZE_DIM_PX, |
7 | RESIZE_DIM_PPT, | ||
8 | RESIZE_DIM_DEFAULT, | ||
9 | }; | ||
10 | |||
11 | bool set_size(int dimension, bool use_width); | ||
12 | bool resize(int dimension, bool use_width, enum resize_dim_types dim_type); | ||
7 | 13 | ||
8 | #endif | 14 | #endif |