diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/container.h | 4 | ||||
-rw-r--r-- | include/input_state.h | 5 | ||||
-rw-r--r-- | include/ipc.h | 12 | ||||
-rw-r--r-- | include/layout.h | 4 |
4 files changed, 16 insertions, 9 deletions
diff --git a/include/container.h b/include/container.h index 79e023fe..4e21461c 100644 --- a/include/container.h +++ b/include/container.h | |||
@@ -34,12 +34,12 @@ struct sway_container { | |||
34 | enum swayc_layouts layout; | 34 | enum swayc_layouts layout; |
35 | 35 | ||
36 | // Not including borders or margins | 36 | // Not including borders or margins |
37 | int width, height; | 37 | double width, height; |
38 | 38 | ||
39 | // Used for setting floating geometry | 39 | // Used for setting floating geometry |
40 | int desired_width, desired_height; | 40 | int desired_width, desired_height; |
41 | 41 | ||
42 | int x, y; | 42 | double x, y; |
43 | 43 | ||
44 | bool visible; | 44 | bool visible; |
45 | bool is_floating; | 45 | bool is_floating; |
diff --git a/include/input_state.h b/include/input_state.h index 782b4b19..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; |
@@ -44,6 +48,7 @@ extern struct pointer_state { | |||
44 | 48 | ||
45 | void start_floating(swayc_t *view); | 49 | void start_floating(swayc_t *view); |
46 | void reset_floating(swayc_t *view); | 50 | void reset_floating(swayc_t *view); |
51 | void input_init(void); | ||
47 | 52 | ||
48 | #endif | 53 | #endif |
49 | 54 | ||
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 5c73af99..55bb6709 100644 --- a/include/layout.h +++ b/include/layout.h | |||
@@ -21,7 +21,7 @@ void move_container(swayc_t* container,swayc_t* root,enum movement_direction dir | |||
21 | 21 | ||
22 | 22 | ||
23 | // Layout | 23 | // Layout |
24 | void arrange_windows(swayc_t *container, int width, int height); | 24 | void arrange_windows(swayc_t *container, double width, double height); |
25 | 25 | ||
26 | // Focus | 26 | // Focus |
27 | void unfocus_all(swayc_t *container); | 27 | void unfocus_all(swayc_t *container); |
@@ -32,4 +32,6 @@ swayc_t *get_focused_container(swayc_t *parent); | |||
32 | swayc_t *get_swayc_for_handle(wlc_handle handle, swayc_t *parent); | 32 | swayc_t *get_swayc_for_handle(wlc_handle handle, swayc_t *parent); |
33 | swayc_t *get_swayc_in_direction(swayc_t *container, enum movement_direction dir); | 33 | swayc_t *get_swayc_in_direction(swayc_t *container, enum movement_direction dir); |
34 | 34 | ||
35 | void recursive_resize(swayc_t *container, double amount, enum wlc_resize_edge edge); | ||
36 | |||
35 | #endif | 37 | #endif |