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 | cc5713aee6525fd1783c1a9280079f7e9abcd882 (diff) | |
| parent | 96ab21b2766096bdb42d79a0169d42b9ff00e2fb (diff) | |
| download | sway-464b49eda26f6a518bda39a8d07e1d9b0f498897.tar.xz | |
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 { enum swayc_layouts layout; // Not including borders or margins - int width, height; + double width, height; // Used for setting floating geometry int desired_width, desired_height; - int x, y; + double x, y; bool visible; 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 { bool drag; bool resize; } floating; + struct pointer_tiling { + bool resize; + swayc_t *init_view; + } tiling; struct pointer_lock { bool left; 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 @@ #define _SWAY_IPC_H enum ipc_command_type { - IPC_COMMAND = 0, + IPC_COMMAND = 0, IPC_GET_WORKSPACES = 1, - IPC_SUBSCRIBE = 2, - IPC_GET_OUTPUTS = 3, - IPC_GET_TREE = 4, - IPC_GET_MARKS = 5, + IPC_SUBSCRIBE = 2, + IPC_GET_OUTPUTS = 3, + IPC_GET_TREE = 4, + IPC_GET_MARKS = 5, IPC_GET_BAR_CONFIG = 6, - IPC_GET_VERSION = 7, + IPC_GET_VERSION = 7, }; 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); swayc_t *remove_child(swayc_t *child); // Layout -void arrange_windows(swayc_t *container, int width, int height); +void arrange_windows(swayc_t *container, double width, double height); // Focus void unfocus_all(swayc_t *container); @@ -29,4 +29,6 @@ swayc_t *get_focused_container(swayc_t *parent); swayc_t *get_swayc_for_handle(wlc_handle handle, swayc_t *parent); swayc_t *get_swayc_in_direction(swayc_t *container, enum movement_direction dir); +void recursive_resize(swayc_t *container, double amount, enum wlc_resize_edge edge); + #endif |