mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-02 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wlroots' into split-containers

Browse source
This commit is contained in:
Tony Crisci 2018-04-02 14:06:04 -04:00
commit 2187684bd0
13 changed files with 276 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sway/output.h
View file

@ -36,4 +36,6 @@ void output_damage_whole(struct sway_output *output);
void output_damage_whole_view(struct sway_output *output,
struct sway_view *view);
struct sway_container *output_by_name(const char *name);
#endif

9
include/sway/tree/container.h
View file

@ -84,12 +84,21 @@ struct sway_container {
struct {
struct wl_signal destroy;
// Raised after the tree updates, but before arrange_windows
// Passed the previous parent
struct wl_signal reparent;
} events;
};
// TODO make private and use the container-specific create functions
struct sway_container *container_create(enum sway_container_type type);
const char *container_type_to_str(enum sway_container_type type);
// TODO only one container create function and pass the type?
struct sway_container *container_output_create(
struct sway_output *sway_output);
/**
* Create a new container container. A container container can be a a child of
* a workspace container or another container container.

12
include/sway/tree/layout.h
View file

@ -11,9 +11,6 @@ enum movement_direction {
MOVE_DOWN,
MOVE_PARENT,
MOVE_CHILD,
MOVE_NEXT,
MOVE_PREV,
MOVE_FIRST
};
struct sway_container;
@ -33,7 +30,8 @@ struct sway_root {
void layout_init(void);
// TODO move to tree.h
void container_add_child(struct sway_container *parent, struct sway_container *child);
void container_add_child(struct sway_container *parent,
struct sway_container *child);
// TODO move to tree.h
struct sway_container *container_add_sibling(struct sway_container *parent,
@ -49,8 +47,12 @@ struct sway_container *container_reap_empty(struct sway_container *container);
void container_move_to(struct sway_container* container,
struct sway_container* destination);
void container_move(struct sway_container *container,
enum movement_direction dir, int move_amt);
// TODO move to output.c
enum sway_container_layout container_get_default_layout(struct sway_container *output);
enum sway_container_layout container_get_default_layout(
struct sway_container *output);
// TODO move to output.c
void container_sort_workspaces(struct sway_container *output);