summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-08-08 08:13:22 -0400
committerLibravatar GitHub <noreply@github.com>2018-08-08 08:13:22 -0400
commitc8a8216629cd56a510255f6ead3eaba9508b6544 (patch)
tree2f70bd11f025791a2970850771baa2062413f00c /include
parentMerge pull request #2432 from RyanDwyer/fix-move-crash (diff)
parentDeny moving a sticky container to workspace if it's the same output (diff)
downloadsway-c8a8216629cd56a510255f6ead3eaba9508b6544.tar.gz
sway-c8a8216629cd56a510255f6ead3eaba9508b6544.tar.zst
sway-c8a8216629cd56a510255f6ead3eaba9508b6544.zip
Merge pull request #2420 from RyanDwyer/floating-move-to-workspace
Implement move to workspace on a floating container
Diffstat (limited to 'include')
-rw-r--r--include/sway/tree/container.h11
-rw-r--r--include/sway/tree/workspace.h2
2 files changed, 13 insertions, 0 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 16a180f8..4d0e6003 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -323,12 +323,23 @@ void container_floating_translate(struct sway_container *con,
323 double x_amount, double y_amount); 323 double x_amount, double y_amount);
324 324
325/** 325/**
326 * Choose an output for the floating container's new position.
327 */
328struct sway_container *container_floating_find_output(
329 struct sway_container *con);
330
331/**
326 * Move a floating container to a new layout-local position. 332 * Move a floating container to a new layout-local position.
327 */ 333 */
328void container_floating_move_to(struct sway_container *con, 334void container_floating_move_to(struct sway_container *con,
329 double lx, double ly); 335 double lx, double ly);
330 336
331/** 337/**
338 * Move a floating container to the center of the workspace.
339 */
340void container_floating_move_to_center(struct sway_container *con);
341
342/**
332 * Mark a container as dirty if it isn't already. Dirty containers will be 343 * Mark a container as dirty if it isn't already. Dirty containers will be
333 * included in the next transaction then unmarked as dirty. 344 * included in the next transaction then unmarked as dirty.
334 */ 345 */
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h
index 239cbbdb..056f2329 100644
--- a/include/sway/tree/workspace.h
+++ b/include/sway/tree/workspace.h
@@ -16,6 +16,8 @@ struct sway_workspace {
16 16
17extern char *prev_workspace_name; 17extern char *prev_workspace_name;
18 18
19struct sway_container *workspace_get_initial_output(const char *name);
20
19char *workspace_next_name(const char *output_name); 21char *workspace_next_name(const char *output_name);
20 22
21bool workspace_switch(struct sway_container *workspace, 23bool workspace_switch(struct sway_container *workspace,