diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-08-21 07:12:05 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-08-21 07:12:05 -0400 |
commit | 464b49eda26f6a518bda39a8d07e1d9b0f498897 (patch) | |
tree | 7d0c55221b3028c2843da88b41029abac864b4a5 /include | |
parent | Merge pull request #106 from FSMaxB/session-files (diff) | |
parent | Fixes to resizing and added in resize lock once boundaries are exceeded (diff) | |
download | sway-464b49eda26f6a518bda39a8d07e1d9b0f498897.tar.gz sway-464b49eda26f6a518bda39a8d07e1d9b0f498897.tar.zst sway-464b49eda26f6a518bda39a8d07e1d9b0f498897.zip |
Merge pull request #101 from Luminarys/master
Added in basic resizing command.
Diffstat (limited to 'include')
-rw-r--r-- | include/container.h | 4 | ||||
-rw-r--r-- | include/input_state.h | 4 | ||||
-rw-r--r-- | include/ipc.h | 12 | ||||
-rw-r--r-- | include/layout.h | 4 |
4 files changed, 15 insertions, 9 deletions
diff --git a/include/container.h b/include/container.h index fd621490..3598067c 100644 --- a/include/container.h +++ b/include/container.h | |||
@@ -33,12 +33,12 @@ struct sway_container { | |||
33 | enum swayc_layouts layout; | 33 | enum swayc_layouts layout; |
34 | 34 | ||
35 | // Not including borders or margins | 35 | // Not including borders or margins |
36 | int width, height; | 36 | double width, height; |
37 | 37 | ||
38 | // Used for setting floating geometry | 38 | // Used for setting floating geometry |
39 | int desired_width, desired_height; | 39 | int desired_width, desired_height; |
40 | 40 | ||
41 | int x, y; | 41 | double x, y; |
42 | 42 | ||
43 | bool visible; | 43 | bool visible; |
44 | bool is_floating; | 44 | bool is_floating; |
diff --git a/include/input_state.h b/include/input_state.h index a7e0c1ca..27dd6cff 100644 --- a/include/input_state.h +++ b/include/input_state.h | |||
@@ -34,6 +34,10 @@ extern struct pointer_state { | |||
34 | bool drag; | 34 | bool drag; |
35 | bool resize; | 35 | bool resize; |
36 | } floating; | 36 | } floating; |
37 | struct pointer_tiling { | ||
38 | bool resize; | ||
39 | swayc_t *init_view; | ||
40 | } tiling; | ||
37 | struct pointer_lock { | 41 | struct pointer_lock { |
38 | bool left; | 42 | bool left; |
39 | bool right; | 43 | bool right; |
diff --git a/include/ipc.h b/include/ipc.h index 0b6441f6..2d71c666 100644 --- a/include/ipc.h +++ b/include/ipc.h | |||
@@ -2,14 +2,14 @@ | |||
2 | #define _SWAY_IPC_H | 2 | #define _SWAY_IPC_H |
3 | 3 | ||
4 | enum ipc_command_type { | 4 | enum ipc_command_type { |
5 | IPC_COMMAND = 0, | 5 | IPC_COMMAND = 0, |
6 | IPC_GET_WORKSPACES = 1, | 6 | IPC_GET_WORKSPACES = 1, |
7 | IPC_SUBSCRIBE = 2, | 7 | IPC_SUBSCRIBE = 2, |
8 | IPC_GET_OUTPUTS = 3, | 8 | IPC_GET_OUTPUTS = 3, |
9 | IPC_GET_TREE = 4, | 9 | IPC_GET_TREE = 4, |
10 | IPC_GET_MARKS = 5, | 10 | IPC_GET_MARKS = 5, |
11 | IPC_GET_BAR_CONFIG = 6, | 11 | IPC_GET_BAR_CONFIG = 6, |
12 | IPC_GET_VERSION = 7, | 12 | IPC_GET_VERSION = 7, |
13 | }; | 13 | }; |
14 | 14 | ||
15 | void ipc_init(void); | 15 | void ipc_init(void); |
diff --git a/include/layout.h b/include/layout.h index 75e72d2f..20044b95 100644 --- a/include/layout.h +++ b/include/layout.h | |||
@@ -18,7 +18,7 @@ swayc_t *replace_child(swayc_t *child, swayc_t *new_child); | |||
18 | swayc_t *remove_child(swayc_t *child); | 18 | swayc_t *remove_child(swayc_t *child); |
19 | 19 | ||
20 | // Layout | 20 | // Layout |
21 | void arrange_windows(swayc_t *container, int width, int height); | 21 | void arrange_windows(swayc_t *container, double width, double height); |
22 | 22 | ||
23 | // Focus | 23 | // Focus |
24 | void unfocus_all(swayc_t *container); | 24 | void unfocus_all(swayc_t *container); |
@@ -29,4 +29,6 @@ swayc_t *get_focused_container(swayc_t *parent); | |||
29 | swayc_t *get_swayc_for_handle(wlc_handle handle, swayc_t *parent); | 29 | swayc_t *get_swayc_for_handle(wlc_handle handle, swayc_t *parent); |
30 | swayc_t *get_swayc_in_direction(swayc_t *container, enum movement_direction dir); | 30 | swayc_t *get_swayc_in_direction(swayc_t *container, enum movement_direction dir); |
31 | 31 | ||
32 | void recursive_resize(swayc_t *container, double amount, enum wlc_resize_edge edge); | ||
33 | |||
32 | #endif | 34 | #endif |