diff options
| author | Ryan Dwyer <[email protected]> | 2018-08-03 23:06:01 +1000 |
|---|---|---|
| committer | Ryan Dwyer <[email protected]> | 2018-08-04 14:01:20 +1000 |
| commit | 04489ff4209dc073027419d90961367cfb998fe8 (patch) | |
| tree | d6f6213d2374e10a875e8ced872511e6e656ae3e /sway/commands/move.c | |
| parent | 5de2223c6df480759ee6d8f4422c2643491595d0 (diff) | |
Separate root-related code
This creates a root.c and moves bits and pieces from elsewhere into it.
* layout_init has been renamed to root_create and moved into root.c
* root_destroy has been created and is called on shutdown
* scratchpad code has been moved into root.c, because hidden scratchpad
containers are stored in the root struct
Diffstat (limited to 'sway/commands/move.c')
| -rw-r--r-- | sway/commands/move.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index 1e8b76f9..841da4c4 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -9,10 +9,9 @@ #include "sway/input/cursor.h" #include "sway/input/seat.h" #include "sway/output.h" -#include "sway/scratchpad.h" #include "sway/tree/arrange.h" #include "sway/tree/container.h" -#include "sway/tree/layout.h" +#include "sway/tree/root.h" #include "sway/tree/workspace.h" #include "stringop.h" #include "list.h" @@ -324,7 +323,7 @@ static struct cmd_results *move_to_scratchpad(struct sway_container *con) { return cmd_results_new(CMD_INVALID, "move", "Container is already in the scratchpad"); } - scratchpad_add_container(con); + root_scratchpad_add_container(con); return cmd_results_new(CMD_SUCCESS, NULL, NULL); } |