mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 00:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/wlroots' into swaybar-layers

Browse source
This commit is contained in:
Drew DeVault 2018-03-30 00:02:29 -04:00
parent d8104db8f1 7162b9bea4
commit f26ecd9f58
39 changed files with 618 additions and 589 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/sway/config.h
View file

@ -8,8 +8,8 @@
#include <wlr/types/wlr_box.h>
#include <xkbcommon/xkbcommon.h>
#include "list.h"
#include "layout.h"
#include "container.h"
#include "tree/layout.h"
#include "tree/container.h"
#include "wlr-layer-shell-unstable-v1-protocol.h"
// TODO: Refactor this shit
@ -290,8 +290,8 @@ struct sway_config {
char *floating_scroll_down_cmd;
char *floating_scroll_left_cmd;
char *floating_scroll_right_cmd;
enum swayc_layouts default_orientation;
enum swayc_layouts default_layout;
enum sway_container_layout default_orientation;
enum sway_container_layout default_layout;
char *font;
int font_height;
@ -315,8 +315,8 @@ struct sway_config {
list_t *config_chain;
const char *current_config;
enum swayc_border_types border;
enum swayc_border_types floating_border;
enum sway_container_border border;
enum sway_container_border floating_border;
int border_thickness;
int floating_border_thickness;
enum edge_border_types hide_edge_borders;
@ -347,7 +347,7 @@ struct sway_config {
struct input_config *input_config;
struct seat_config *seat_config;
struct sway_seat *seat;
swayc_t *current_container;
struct sway_container *current_container;
} handler_context;
};
@ -407,7 +407,8 @@ void output_get_identifier(char *identifier, size_t len,
struct sway_output *output);
struct output_config *new_output_config(const char *name);
void merge_output_config(struct output_config *dst, struct output_config *src);
void apply_output_config(struct output_config *oc, swayc_t *output);
void apply_output_config(struct output_config *oc,
struct sway_container *output);
void free_output_config(struct output_config *oc);
int workspace_output_cmp_workspace(const void *a, const void *b);

169
include/sway/container.h
View file

@ -1,169 +0,0 @@
#ifndef _SWAY_CONTAINER_H
#define _SWAY_CONTAINER_H
#include <stdint.h>
#include <sys/types.h>
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_surface.h>
#include "list.h"
typedef struct sway_container swayc_t;
extern swayc_t root_container;
struct sway_view;
struct sway_seat;
/**
* Different kinds of containers.
*
* This enum is in order. A container will never be inside of a container below
* it on this list.
*/
enum swayc_types {
C_ROOT, /**< The root container. Only one of these ever exists. */
C_OUTPUT, /**< An output (aka monitor, head, etc). */
C_WORKSPACE, /**< A workspace. */
C_CONTAINER, /**< A manually created container. */
C_VIEW, /**< A view (aka window). */
C_TYPES,
};
/**
* Different ways to arrange a container.
*/
enum swayc_layouts {
L_NONE, /**< Used for containers that have no layout (views, root) */
L_HORIZ,
L_VERT,
L_STACKED,
L_TABBED,
L_FLOATING, /**< A psuedo-container, removed from the tree, to hold floating windows */
/* Awesome/Monad style auto layouts */
L_AUTO_LEFT,
L_AUTO_RIGHT,
L_AUTO_TOP,
L_AUTO_BOTTOM,
L_AUTO_FIRST = L_AUTO_LEFT,
L_AUTO_LAST = L_AUTO_BOTTOM,
// Keep last
L_LAYOUTS,
};
enum swayc_border_types {
B_NONE, /**< No border */
B_PIXEL, /**< 1px border */
B_NORMAL, /**< Normal border with title bar */
};
struct sway_root;
struct sway_output;
struct sway_view;
/**
* Stores information about a container.
*
* The tree is made of these. Views are containers that cannot have children.
*/
struct sway_container {
union {
// TODO: Encapsulate state for other node types as well like C_CONTAINER
struct sway_root *sway_root; // C_ROOT
struct sway_output *sway_output; // C_OUTPUT
struct sway_view *sway_view; // C_VIEW
};
/**
* A unique ID to identify this container. Primarily used in the
* get_tree JSON output.
*/
size_t id;
char *name;
enum swayc_types type;
enum swayc_layouts layout;
enum swayc_layouts prev_layout;
enum swayc_layouts workspace_layout;
/**
* The coordinates that this view appear at, relative to the output they
* are located on (output containers have absolute coordinates).
*/
double x, y;
/**
* Width and height of this container, without borders or gaps.
*/
double width, height;
list_t *children;
/**
* The parent of this container. NULL for the root container.
*/
struct sway_container *parent;
/**
* Number of master views in auto layouts.
*/
size_t nb_master;
/**
* Number of slave groups (e.g. columns) in auto layouts.
*/
size_t nb_slave_groups;
/**
* Marks applied to the container, list_t of char*.
*/
list_t *marks;
struct {
struct wl_signal destroy;
} events;
};
void swayc_descendants_of_type(swayc_t *root, enum swayc_types type,
void (*func)(swayc_t *item, void *data), void *data);
swayc_t *new_output(struct sway_output *sway_output);
swayc_t *new_workspace(swayc_t *output, const char *name);
swayc_t *new_view(swayc_t *sibling, struct sway_view *sway_view);
swayc_t *destroy_output(swayc_t *output);
swayc_t *destroy_view(swayc_t *view);
swayc_t *next_view_sibling(struct sway_seat *seat);
/**
* Finds a container based on test criteria. Returns the first container that
* passes the test.
*/
swayc_t *swayc_by_test(swayc_t *container,
bool (*test)(swayc_t *view, void *data), void *data);
/**
* Finds a parent container with the given swayc_type.
*/
swayc_t *swayc_parent_by_type(swayc_t *container, enum swayc_types type);
/**
* Maps a container's children over a function.
*/
void container_map(swayc_t *container,
void (*f)(swayc_t *view, void *data), void *data);
swayc_t *swayc_at(swayc_t *parent, double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy);
/**
* Apply the function for each child of the container breadth first.
*/
void container_for_each_bfs(swayc_t *con, void (*f)(swayc_t *con, void *data),
void *data);
swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout);
#endif

6
include/sway/criteria.h
View file

@ -1,7 +1,7 @@
#ifndef _SWAY_CRITERIA_H
#define _SWAY_CRITERIA_H
#include "container.h"
#include "tree/container.h"
#include "list.h"
/**
@ -31,12 +31,12 @@ char *extract_crit_tokens(list_t *tokens, const char *criteria);
// Returns list of criteria that match given container. These criteria have
// been set with `for_window` commands and have an associated cmdlist.
list_t *criteria_for(swayc_t *cont);
list_t *criteria_for(struct sway_container *cont);
// Returns a list of all containers that match the given list of tokens.
list_t *container_for_crit_tokens(list_t *tokens);
// Returns true if any criteria in the given list matches this container
bool criteria_any(swayc_t *cont, list_t *criteria);
bool criteria_any(struct sway_container *cont, list_t *criteria);
#endif

4
include/sway/input/input-manager.h
View file

@ -31,10 +31,10 @@ struct sway_input_manager *sway_input_manager_create(
struct sway_server *server);
bool sway_input_manager_has_focus(struct sway_input_manager *input,
swayc_t *container);
struct sway_container *container);
void sway_input_manager_set_focus(struct sway_input_manager *input,
swayc_t *container);
struct sway_container *container);
void sway_input_manager_configure_xcursor(struct sway_input_manager *input);

13
include/sway/input/seat.h
View file

@ -14,7 +14,7 @@ struct sway_seat_device {
struct sway_seat_container {
struct sway_seat *seat;
swayc_t *container;
struct sway_container *container;
struct wl_list link; // sway_seat::focus_stack
@ -54,9 +54,9 @@ void sway_seat_remove_device(struct sway_seat *seat,
void sway_seat_configure_xcursor(struct sway_seat *seat);
void sway_seat_set_focus(struct sway_seat *seat, swayc_t *container);
void sway_seat_set_focus(struct sway_seat *seat, struct sway_container *container);
swayc_t *sway_seat_get_focus(struct sway_seat *seat);
struct sway_container *sway_seat_get_focus(struct sway_seat *seat);
/**
* Return the last container to be focused for the seat (or the most recently
@ -67,10 +67,11 @@ swayc_t *sway_seat_get_focus(struct sway_seat *seat);
* is destroyed, or focus moves to a container with children and we need to
* descend into the next leaf in focus order.
*/
swayc_t *sway_seat_get_focus_inactive(struct sway_seat *seat, swayc_t *container);
struct sway_container *sway_seat_get_focus_inactive(struct sway_seat *seat,
struct sway_container *container);
swayc_t *sway_seat_get_focus_by_type(struct sway_seat *seat,
enum swayc_types type);
struct sway_container *sway_seat_get_focus_by_type(struct sway_seat *seat,
enum sway_container_type type);
void sway_seat_set_config(struct sway_seat *seat, struct seat_config *seat_config);

6
include/sway/ipc-json.h
View file

@ -1,13 +1,13 @@
#ifndef _SWAY_IPC_JSON_H
#define _SWAY_IPC_JSON_H
#include <json-c/json.h>
#include "sway/container.h"
#include "sway/tree/container.h"
#include "sway/input/input-manager.h"
json_object *ipc_json_get_version();
json_object *ipc_json_describe_container(swayc_t *c);
json_object *ipc_json_describe_container_recursive(swayc_t *c);
json_object *ipc_json_describe_container(struct sway_container *c);
json_object *ipc_json_describe_container_recursive(struct sway_container *c);
json_object *ipc_json_describe_input(struct sway_input_device *device);
json_object *ipc_json_describe_bar_config(struct bar_config *bar);

9
include/sway/ipc-server.h
View file

@ -1,17 +1,20 @@
#ifndef _SWAY_IPC_SERVER_H
#define _SWAY_IPC_SERVER_H
#include <sys/socket.h>
#include "sway/container.h"
#include "sway/tree/container.h"
#include "ipc.h"
struct sway_server;
void ipc_init(struct sway_server *server);
void ipc_terminate(void);
struct sockaddr_un *ipc_user_sockaddr(void);
void ipc_event_workspace(swayc_t *old, swayc_t *new, const char *change);
void ipc_event_window(swayc_t *window, const char *change);
void ipc_event_workspace(struct sway_container *old,
struct sway_container *new, const char *change);
void ipc_event_window(struct sway_container *window, const char *change);
void ipc_event_barconfig_update(struct bar_config *bar);
void ipc_event_mode(const char *mode);

43
include/sway/layout.h
View file

@ -1,43 +0,0 @@
#ifndef _SWAY_LAYOUT_H
#define _SWAY_LAYOUT_H
#include <wlr/types/wlr_output_layout.h>
#include "sway/container.h"
enum movement_direction {
MOVE_LEFT,
MOVE_RIGHT,
MOVE_UP,
MOVE_DOWN,
MOVE_PARENT,
MOVE_CHILD,
MOVE_NEXT,
MOVE_PREV,
MOVE_FIRST
};
struct sway_container;
struct sway_root {
struct wlr_output_layout *output_layout;
struct wl_listener output_layout_change;
struct wl_list unmanaged_views; // sway_view::unmanaged_view_link
struct {
struct wl_signal new_container;
} events;
};
void init_layout(void);
void add_child(struct sway_container *parent, struct sway_container *child);
swayc_t *add_sibling(swayc_t *parent, swayc_t *child);
struct sway_container *remove_child(struct sway_container *child);
enum swayc_layouts default_layout(struct sway_container *output);
void sort_workspaces(struct sway_container *output);
void arrange_windows(struct sway_container *container, double width, double height);
swayc_t *get_swayc_in_direction(swayc_t *container,
struct sway_seat *seat, enum movement_direction dir);
#endif

143
include/sway/tree/container.h Normal file
View file

@ -0,0 +1,143 @@
#ifndef _SWAY_CONTAINER_H
#define _SWAY_CONTAINER_H
#include <stdint.h>
#include <sys/types.h>
#include <wlr/types/wlr_box.h>
#include <wlr/types/wlr_surface.h>
#include "list.h"
extern struct sway_container root_container;
struct sway_view;
struct sway_seat;
/**
* Different kinds of containers.
*
* This enum is in order. A container will never be inside of a container below
* it on this list.
*/
enum sway_container_type {
C_ROOT,
C_OUTPUT,
C_WORKSPACE,
C_CONTAINER,
C_VIEW,
C_TYPES,
};
enum sway_container_layout {
L_NONE,
L_HORIZ,
L_VERT,
L_STACKED,
L_TABBED,
L_FLOATING,
// Keep last
L_LAYOUTS,
};
enum sway_container_border {
B_NONE,
B_PIXEL,
B_NORMAL,
};
struct sway_root;
struct sway_output;
struct sway_view;
struct sway_container {
union {
// TODO: Encapsulate state for other node types as well like C_CONTAINER
struct sway_root *sway_root;
struct sway_output *sway_output;
struct sway_view *sway_view;
};
/**
* A unique ID to identify this container. Primarily used in the
* get_tree JSON output.
*/
size_t id;
char *name;
enum sway_container_type type;
enum sway_container_layout layout;
enum sway_container_layout prev_layout;
enum sway_container_layout workspace_layout;
// TODO convert to layout coordinates
double x, y;
// does not include borders or gaps.
double width, height;
list_t *children;
struct sway_container *parent;
list_t *marks; // list of char*
struct {
struct wl_signal destroy;
} events;
};
// TODO only one container create function and pass the type?
struct sway_container *container_output_create(
struct sway_output *sway_output);
struct sway_container *container_workspace_create(
struct sway_container *output, const char *name);
struct sway_container *container_view_create(
struct sway_container *sibling, struct sway_view *sway_view);
struct sway_container *container_output_destroy(struct sway_container *output);
struct sway_container *container_view_destroy(struct sway_container *view);
struct sway_container *container_set_layout(struct sway_container *container,
enum sway_container_layout layout);
void container_descendants(struct sway_container *root,
enum sway_container_type type,
void (*func)(struct sway_container *item, void *data), void *data);
/**
* Finds a container based on test criteria. Returns the first container that
* passes the test.
*/
struct sway_container *container_find(struct sway_container *container,
bool (*test)(struct sway_container *view, void *data), void *data);
/**
* Finds a parent container with the given struct sway_containerype.
*/
struct sway_container *container_parent(struct sway_container *container,
enum sway_container_type type);
/**
* Find a container at the given coordinates.
*/
struct sway_container *container_at(struct sway_container *parent,
double lx, double ly, struct wlr_surface **surface,
double *sx, double *sy);
/**
* Apply the function for each child of the container breadth first.
*/
void container_for_each_descendant_bfs(struct sway_container *container,
void (*f)(struct sway_container *container, void *data), void *data);
/**
* Apply the function for each child of the container depth first.
*/
void container_for_each_descendant_dfs(struct sway_container *container,
void (*f)(struct sway_container *container, void *data), void *data);
#endif

52
include/sway/tree/layout.h Normal file
View file

@ -0,0 +1,52 @@
#ifndef _SWAY_LAYOUT_H
#define _SWAY_LAYOUT_H
#include <wlr/types/wlr_output_layout.h>
#include "sway/tree/container.h"
enum movement_direction {
MOVE_LEFT,
MOVE_RIGHT,
MOVE_UP,
MOVE_DOWN,
MOVE_PARENT,
MOVE_CHILD,
MOVE_NEXT,
MOVE_PREV,
MOVE_FIRST
};
struct sway_container;
struct sway_root {
struct wlr_output_layout *output_layout;
struct wl_listener output_layout_change;
struct wl_list unmanaged_views; // sway_view::unmanaged_view_link
struct {
struct wl_signal new_container;
} events;
};
void layout_init(void);
void container_add_child(struct sway_container *parent, struct sway_container *child);
struct sway_container *container_add_sibling(struct sway_container *parent,
struct sway_container *child);
struct sway_container *container_remove_child(struct sway_container *child);
enum sway_container_layout container_get_default_layout(struct sway_container *output);
void container_sort_workspaces(struct sway_container *output);
void arrange_windows(struct sway_container *container,
double width, double height);
struct sway_container *container_get_in_direction(struct sway_container
*container, struct sway_seat *seat, enum movement_direction dir);
#endif

4
include/sway/view.h → include/sway/tree/view.h
View file

@ -62,10 +62,6 @@ enum sway_view_prop {
VIEW_PROP_INSTANCE,
};
/**
* sway_view is a state container for surfaces that are arranged in the sway
* tree (shell surfaces).
*/
struct sway_view {
enum sway_view_type type;
struct sway_container *swayc;

26
include/sway/tree/workspace.h Normal file
View file

@ -0,0 +1,26 @@
#ifndef _SWAY_WORKSPACE_H
#define _SWAY_WORKSPACE_H
#include "sway/tree/container.h"
extern char *prev_workspace_name;
char *workspace_next_name(const char *output_name);
struct sway_container *workspace_create(const char *name);
bool workspace_switch(struct sway_container *workspace);
struct sway_container *workspace_by_number(const char* name);
struct sway_container *workspace_by_name(const char*);
struct sway_container *workspace_output_next(struct sway_container *current);
struct sway_container *workspace_next(struct sway_container *current);
struct sway_container *workspace_output_prev(struct sway_container *current);
struct sway_container *workspace_prev(struct sway_container *current);
#endif

20
include/sway/workspace.h
View file

@ -1,20 +0,0 @@
#ifndef _SWAY_WORKSPACE_H
#define _SWAY_WORKSPACE_H
#include "sway/container.h"
extern char *prev_workspace_name;
char *workspace_next_name(const char *output_name);
swayc_t *workspace_create(const char *name);
bool workspace_switch(swayc_t *workspace);
struct sway_container *workspace_by_number(const char* name);
swayc_t *workspace_by_name(const char*);
struct sway_container *workspace_output_next(swayc_t *current);
struct sway_container *workspace_next(swayc_t *current);
struct sway_container *workspace_output_prev(swayc_t *current);
struct sway_container *workspace_prev(swayc_t *current);
#endif

4
sway/commands/exec_always.c
View file

@ -6,8 +6,8 @@
#include <unistd.h>
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/container.h"
#include "sway/workspace.h"
#include "sway/tree/container.h"
#include "sway/tree/workspace.h"
#include "log.h"
#include "stringop.h"

9
sway/commands/focus.c
View file

@ -3,10 +3,11 @@
#include "log.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "sway/commands.h"
static bool parse_movement_direction(const char *name, enum movement_direction *out) {
static bool parse_movement_direction(const char *name,
enum movement_direction *out) {
if (strcasecmp(name, "left") == 0) {
*out = MOVE_LEFT;
} else if (strcasecmp(name, "right") == 0) {
@ -31,7 +32,7 @@ static bool parse_movement_direction(const char *name, enum movement_direction *
}
struct cmd_results *cmd_focus(int argc, char **argv) {
swayc_t *con = config->handler_context.current_container;
struct sway_container *con = config->handler_context.current_container;
struct sway_seat *seat = config->handler_context.seat;
if (con->type < C_WORKSPACE) {
return cmd_results_new(CMD_FAILURE, "focus",
@ -50,7 +51,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
"Expected 'focus <direction|parent|child|mode_toggle>' or 'focus output <direction|name>'");
}
swayc_t *next_focus = get_swayc_in_direction(con, seat, direction);
struct sway_container *next_focus = container_get_in_direction(con, seat, direction);
if (next_focus) {
sway_seat_set_focus(seat, next_focus);
}

4
sway/commands/kill.c
View file

@ -2,11 +2,11 @@
#include "log.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "sway/commands.h"
struct cmd_results *cmd_kill(int argc, char **argv) {
enum swayc_types type = config->handler_context.current_container->type;
enum sway_container_type type = config->handler_context.current_container->type;
if (type != C_VIEW && type != C_CONTAINER) {
return cmd_results_new(CMD_INVALID, NULL,
"Can only kill views and containers with this command");

20
sway/commands/layout.c
View file

@ -1,8 +1,8 @@
#include <string.h>
#include <strings.h>
#include "sway/commands.h"
#include "sway/container.h"
#include "sway/layout.h"
#include "sway/tree/container.h"
#include "sway/tree/layout.h"
#include "log.h"
struct cmd_results *cmd_layout(int argc, char **argv) {
@ -10,7 +10,7 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
if ((error = checkarg(argc, "layout", EXPECTED_MORE_THAN, 0))) {
return error;
}
swayc_t *parent = config->handler_context.current_container;
struct sway_container *parent = config->handler_context.current_container;
// TODO: floating
/*
@ -26,10 +26,10 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
// TODO: stacks and tabs
if (strcasecmp(argv[0], "default") == 0) {
swayc_change_layout(parent, parent->prev_layout);
container_set_layout(parent, parent->prev_layout);
if (parent->layout == L_NONE) {
swayc_t *output = swayc_parent_by_type(parent, C_OUTPUT);
swayc_change_layout(parent, default_layout(output));
struct sway_container *output = container_parent(parent, C_OUTPUT);
container_set_layout(parent, container_get_default_layout(output));
}
} else {
if (parent->layout != L_TABBED && parent->layout != L_STACKED) {
@ -37,15 +37,15 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
}
if (strcasecmp(argv[0], "splith") == 0) {
swayc_change_layout(parent, L_HORIZ);
container_set_layout(parent, L_HORIZ);
} else if (strcasecmp(argv[0], "splitv") == 0) {
swayc_change_layout(parent, L_VERT);
container_set_layout(parent, L_VERT);
} else if (strcasecmp(argv[0], "toggle") == 0 && argc == 2 && strcasecmp(argv[1], "split") == 0) {
if (parent->layout == L_HORIZ && (parent->workspace_layout == L_NONE
|| parent->workspace_layout == L_HORIZ)) {
swayc_change_layout(parent, L_VERT);
container_set_layout(parent, L_VERT);
} else {
swayc_change_layout(parent, L_HORIZ);
container_set_layout(parent, L_HORIZ);
}
}
}

2
sway/commands/output.c
View file

@ -296,7 +296,7 @@ struct cmd_results *cmd_output(int argc, char **argv) {
char identifier[128];
bool all = strcmp(output->name, "*") == 0;
for (int i = 0; i < root_container.children->length; ++i) {
swayc_t *cont = root_container.children->items[i];
struct sway_container *cont = root_container.children->items[i];
if (cont->type != C_OUTPUT) {
continue;
}

2
sway/commands/reload.c
View file

@ -1,6 +1,6 @@
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/layout.h"
#include "sway/tree/layout.h"
struct cmd_results *cmd_reload(int argc, char **argv) {
struct cmd_results *error = NULL;

14
sway/commands/workspace.c
View file

@ -4,7 +4,7 @@
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/input/seat.h"
#include "sway/workspace.h"
#include "sway/tree/workspace.h"
#include "list.h"
#include "log.h"
#include "stringop.h"
@ -17,15 +17,15 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
int output_location = -1;
swayc_t *current_container = config->handler_context.current_container;
swayc_t *old_workspace = NULL, *old_output = NULL;
struct sway_container *current_container = config->handler_context.current_container;
struct sway_container *old_workspace = NULL, *old_output = NULL;
if (current_container) {
if (current_container->type == C_WORKSPACE) {
old_workspace = current_container;
} else {
old_workspace = swayc_parent_by_type(current_container, C_WORKSPACE);
old_workspace = container_parent(current_container, C_WORKSPACE);
}
old_output = swayc_parent_by_type(current_container, C_OUTPUT);
old_output = container_parent(current_container, C_OUTPUT);
}
for (int i = 0; i < argc; ++i) {
@ -57,7 +57,7 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
if (config->reading || !config->active) {
return cmd_results_new(CMD_DEFER, "workspace", NULL);
}
swayc_t *ws = NULL;
struct sway_container *ws = NULL;
if (strcasecmp(argv[0], "number") == 0) {
if (!(ws = workspace_by_number(argv[1]))) {
char *name = join_args(argv + 1, argc - 1);
@ -92,7 +92,7 @@ struct cmd_results *cmd_workspace(int argc, char **argv) {
workspace_switch(ws);
current_container =
sway_seat_get_focus(config->handler_context.seat);
swayc_t *new_output = swayc_parent_by_type(current_container, C_OUTPUT);
struct sway_container *new_output = container_parent(current_container, C_OUTPUT);
if (config->mouse_warping && old_output != new_output) {
// TODO: Warp mouse

2
sway/config.c
View file

@ -24,7 +24,7 @@
#include "sway/input/seat.h"
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/layout.h"
#include "sway/tree/layout.h"
#include "readline.h"
#include "stringop.h"
#include "list.h"

2
sway/config/bar.c
View file

@ -202,7 +202,7 @@ void invoke_swaybar(struct bar_config *bar) {
}
static bool active_output(const char *name) {
swayc_t *cont = NULL;
struct sway_container *cont = NULL;
for (int i = 0; i < root_container.children->length; ++i) {
cont = root_container.children->items[i];
if (cont->type == C_OUTPUT && strcasecmp(name, cont->name) == 0) {

4
sway/config/output.c
View file

@ -120,14 +120,14 @@ void terminate_swaybg(pid_t pid) {
}
}
void apply_output_config(struct output_config *oc, swayc_t *output) {
void apply_output_config(struct output_config *oc, struct sway_container *output) {
assert(output->type == C_OUTPUT);
struct wlr_output *wlr_output = output->sway_output->wlr_output;
if (oc && oc->enabled == 0) {
wlr_output_layout_remove(root_container.sway_root->output_layout,
wlr_output);
destroy_output(output);
container_output_destroy(output);
return;
}

16
sway/criteria.c
View file

@ -4,9 +4,9 @@
#include <stdbool.h>
#include <pcre.h>
#include "sway/criteria.h"
#include "sway/container.h"
#include "sway/tree/container.h"
#include "sway/config.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "stringop.h"
#include "list.h"
#include "log.h"
@ -272,7 +272,7 @@ static int regex_cmp(const char *item, const pcre *regex) {
}
// test a single view if it matches list of criteria tokens (all of them).
static bool criteria_test(swayc_t *cont, list_t *tokens) {
static bool criteria_test(struct sway_container *cont, list_t *tokens) {
if (cont->type != C_VIEW) {
return false;
}
@ -398,7 +398,7 @@ void free_criteria(struct criteria *crit) {
free(crit);
}
bool criteria_any(swayc_t *cont, list_t *criteria) {
bool criteria_any(struct sway_container *cont, list_t *criteria) {
for (int i = 0; i < criteria->length; i++) {
struct criteria *bc = criteria->items[i];
if (criteria_test(cont, bc->tokens)) {
@ -408,7 +408,7 @@ bool criteria_any(swayc_t *cont, list_t *criteria) {
return false;
}
list_t *criteria_for(swayc_t *cont) {
list_t *criteria_for(struct sway_container *cont) {
list_t *criteria = config->criteria, *matches = create_list();
for (int i = 0; i < criteria->length; i++) {
struct criteria *bc = criteria->items[i];
@ -424,7 +424,7 @@ struct list_tokens {
list_t *tokens;
};
static void container_match_add(swayc_t *container,
static void container_match_add(struct sway_container *container,
struct list_tokens *list_tokens) {
if (criteria_test(container, list_tokens->tokens)) {
list_add(list_tokens->list, container);
@ -435,8 +435,8 @@ list_t *container_for_crit_tokens(list_t *tokens) {
struct list_tokens list_tokens =
(struct list_tokens){create_list(), tokens};
container_map(&root_container,
(void (*)(swayc_t *, void *))container_match_add,
container_for_each_descendant_dfs(&root_container,
(void (*)(struct sway_container *, void *))container_match_add,
&list_tokens);
// TODO look in the scratchpad

2
sway/desktop/layer_shell.c
View file

@ -7,7 +7,7 @@
#include <wlr/types/wlr_output.h>
#include <wlr/util/log.h>
#include "sway/layers.h"
#include "sway/layout.h"
#include "sway/tree/layout.h"
#include "sway/output.h"
#include "sway/server.h"

20
sway/desktop/output.c
View file

@ -11,14 +11,14 @@
#include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_wl_shell.h>
#include "log.h"
#include "sway/container.h"
#include "sway/tree/container.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
#include "sway/layers.h"
#include "sway/layout.h"
#include "sway/tree/layout.h"
#include "sway/output.h"
#include "sway/server.h"
#include "sway/view.h"
#include "sway/tree/view.h"
/**
* Rotate a child's position relative to a parent. The parent size is (pw, ph),
@ -145,7 +145,7 @@ struct render_data {
struct timespec *now;
};
static void output_frame_view(swayc_t *view, void *data) {
static void output_frame_view(struct sway_container *view, void *data) {
struct render_data *rdata = data;
struct sway_output *output = rdata->output;
struct timespec *now = rdata->now;
@ -219,16 +219,16 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
&soutput->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]);
struct sway_seat *seat = input_manager_current_seat(input_manager);
swayc_t *focus = sway_seat_get_focus_inactive(seat, soutput->swayc);
swayc_t *workspace = (focus->type == C_WORKSPACE ?
struct sway_container *focus = sway_seat_get_focus_inactive(seat, soutput->swayc);
struct sway_container *workspace = (focus->type == C_WORKSPACE ?
focus :
swayc_parent_by_type(focus, C_WORKSPACE));
container_parent(focus, C_WORKSPACE));
struct render_data rdata = {
.output = soutput,
.now = &now,
};
swayc_descendants_of_type(workspace, C_VIEW, output_frame_view, &rdata);
container_descendants(workspace, C_VIEW, output_frame_view, &rdata);
// render unmanaged views on top
struct sway_view *view;
@ -259,7 +259,7 @@ static void handle_output_destroy(struct wl_listener *listener, void *data) {
struct wlr_output *wlr_output = data;
wlr_log(L_DEBUG, "Output %p %s removed", wlr_output, wlr_output->name);
destroy_output(output->swayc);
container_output_destroy(output->swayc);
}
static void handle_output_mode(struct wl_listener *listener, void *data) {
@ -293,7 +293,7 @@ void handle_new_output(struct wl_listener *listener, void *data) {
wlr_output_set_mode(wlr_output, mode);
}
output->swayc = new_output(output);
output->swayc = container_output_create(output);
if (!output->swayc) {
free(output);
return;

12
sway/desktop/wl_shell.c
View file

@ -3,10 +3,10 @@
#include <stdlib.h>
#include <wayland-server.h>
#include <wlr/types/wlr_wl_shell.h>
#include "sway/container.h"
#include "sway/layout.h"
#include "sway/tree/container.h"
#include "sway/tree/layout.h"
#include "sway/server.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "sway/input/seat.h"
#include "sway/input/input-manager.h"
#include "log.h"
@ -74,7 +74,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_container_of(listener, sway_surface, destroy);
wl_list_remove(&sway_surface->commit.link);
wl_list_remove(&sway_surface->destroy.link);
swayc_t *parent = destroy_view(sway_surface->view->swayc);
struct sway_container *parent = container_view_destroy(sway_surface->view->swayc);
free(sway_surface->view);
free(sway_surface);
arrange_windows(parent, -1, -1);
@ -132,8 +132,8 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
wl_signal_add(&shell_surface->events.destroy, &sway_surface->destroy);
struct sway_seat *seat = input_manager_current_seat(input_manager);
swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
swayc_t *cont = new_view(focus, sway_view);
struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container);
struct sway_container *cont = container_view_create(focus, sway_view);
sway_view->swayc = cont;
arrange_windows(cont->parent, -1, -1);

12
sway/desktop/xdg_shell_v6.c
View file

@ -3,10 +3,10 @@
#include <stdlib.h>
#include <wayland-server.h>
#include <wlr/types/wlr_xdg_shell_v6.h>
#include "sway/container.h"
#include "sway/layout.h"
#include "sway/tree/container.h"
#include "sway/tree/layout.h"
#include "sway/server.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "sway/input/seat.h"
#include "sway/input/input-manager.h"
#include "log.h"
@ -83,7 +83,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_container_of(listener, sway_xdg_surface, destroy);
wl_list_remove(&sway_xdg_surface->commit.link);
wl_list_remove(&sway_xdg_surface->destroy.link);
swayc_t *parent = destroy_view(sway_xdg_surface->view->swayc);
struct sway_container *parent = container_view_destroy(sway_xdg_surface->view->swayc);
free(sway_xdg_surface->view);
free(sway_xdg_surface);
arrange_windows(parent, -1, -1);
@ -137,8 +137,8 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
wl_signal_add(&xdg_surface->events.destroy, &sway_surface->destroy);
struct sway_seat *seat = input_manager_current_seat(input_manager);
swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
swayc_t *cont = new_view(focus, sway_view);
struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container);
struct sway_container *cont = container_view_create(focus, sway_view);
sway_view->swayc = cont;
arrange_windows(cont->parent, -1, -1);

24
sway/desktop/xwayland.c
View file

@ -5,10 +5,10 @@
#include <wlr/xwayland.h>
#include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_output.h>
#include "sway/container.h"
#include "sway/layout.h"
#include "sway/tree/container.h"
#include "sway/tree/layout.h"
#include "sway/server.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "sway/output.h"
#include "sway/input/seat.h"
#include "sway/input/input-manager.h"
@ -49,11 +49,11 @@ static void set_position(struct sway_view *view, double ox, double oy) {
if (!assert_xwayland(view)) {
return;
}
swayc_t *output = swayc_parent_by_type(view->swayc, C_OUTPUT);
struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
if (!sway_assert(output, "view must be within tree to set position")) {
return;
}
swayc_t *root = swayc_parent_by_type(output, C_ROOT);
struct sway_container *root = container_parent(output, C_ROOT);
if (!sway_assert(root, "output must be within tree to set position")) {
return;
}
@ -114,7 +114,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
}
}
swayc_t *parent = destroy_view(sway_surface->view->swayc);
struct sway_container *parent = container_view_destroy(sway_surface->view->swayc);
if (parent) {
arrange_windows(parent, -1, -1);
}
@ -132,7 +132,7 @@ static void handle_unmap_notify(struct wl_listener *listener, void *data) {
}
// take it out of the tree
swayc_t *parent = destroy_view(sway_surface->view->swayc);
struct sway_container *parent = container_view_destroy(sway_surface->view->swayc);
if (parent) {
arrange_windows(parent, -1, -1);
}
@ -155,12 +155,12 @@ static void handle_map_notify(struct wl_listener *listener, void *data) {
&sway_surface->view->unmanaged_view_link);
} else {
struct sway_view *view = sway_surface->view;
destroy_view(view->swayc);
container_view_destroy(view->swayc);
swayc_t *parent = root_container.children->items[0];
struct sway_container *parent = root_container.children->items[0];
parent = parent->children->items[0]; // workspace
swayc_t *cont = new_view(parent, view);
struct sway_container *cont = container_view_create(parent, view);
view->swayc = cont;
arrange_windows(cont->parent, -1, -1);
@ -238,8 +238,8 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
}
struct sway_seat *seat = input_manager_current_seat(input_manager);
swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
swayc_t *cont = new_view(focus, sway_view);
struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container);
struct sway_container *cont = container_view_create(focus, sway_view);
sway_view->swayc = cont;
arrange_windows(cont->parent, -1, -1);

10
sway/input/cursor.c
View file

@ -7,7 +7,7 @@
#include <wlr/types/wlr_cursor.h>
#include <wlr/types/wlr_xcursor_manager.h>
#include "sway/input/cursor.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "list.h"
#include "log.h"
@ -49,8 +49,8 @@ static void cursor_send_pointer_motion(struct sway_cursor *cursor,
}
}
swayc_t *swayc =
swayc_at(&root_container, cursor->x, cursor->y, &surface, &sx, &sy);
struct sway_container *swayc =
container_at(&root_container, cursor->x, cursor->y, &surface, &sx, &sy);
if (swayc) {
wlr_seat_pointer_notify_enter(seat, surface, sx, sy);
wlr_seat_pointer_notify_motion(seat, time, sx, sy);
@ -87,8 +87,8 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) {
if (event->button == BTN_LEFT) {
struct wlr_surface *surface = NULL;
double sx, sy;
swayc_t *swayc =
swayc_at(&root_container, cursor->x, cursor->y, &surface, &sx, &sy);
struct sway_container *swayc =
container_at(&root_container, cursor->x, cursor->y, &surface, &sx, &sy);
sway_seat_set_focus(cursor->seat, swayc);
}

4
sway/input/input-manager.c
View file

@ -278,7 +278,7 @@ struct sway_input_manager *sway_input_manager_create(
}
bool sway_input_manager_has_focus(struct sway_input_manager *input,
swayc_t *container) {
struct sway_container *container) {
struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input->seats, link) {
if (sway_seat_get_focus(seat) == container) {
@ -290,7 +290,7 @@ bool sway_input_manager_has_focus(struct sway_input_manager *input,
}
void sway_input_manager_set_focus(struct sway_input_manager *input,
swayc_t *container) {
struct sway_container *container) {
struct sway_seat *seat ;
wl_list_for_each(seat, &input->seats, link) {
sway_seat_set_focus(seat, container);

43
sway/input/seat.c
View file

@ -1,14 +1,14 @@
#define _XOPEN_SOURCE 700
#include <wlr/types/wlr_cursor.h>
#include <wlr/types/wlr_xcursor_manager.h>
#include "sway/container.h"
#include "sway/tree/container.h"
#include "sway/input/seat.h"
#include "sway/input/cursor.h"
#include "sway/input/input-manager.h"
#include "sway/input/keyboard.h"
#include "sway/ipc-server.h"
#include "sway/output.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "log.h"
static void seat_device_destroy(struct sway_seat_device *seat_device) {
@ -38,7 +38,7 @@ static void handle_seat_container_destroy(struct wl_listener *listener,
struct sway_seat_container *seat_con =
wl_container_of(listener, seat_con, destroy);
struct sway_seat *seat = seat_con->seat;
swayc_t *con = seat_con->container;
struct sway_container *con = seat_con->container;
bool is_focus = (sway_seat_get_focus(seat) == con);
@ -47,7 +47,7 @@ static void handle_seat_container_destroy(struct wl_listener *listener,
if (is_focus) {
// pick next focus
sway_seat_set_focus(seat, NULL);
swayc_t *next = sway_seat_get_focus_inactive(seat, con->parent);
struct sway_container *next = sway_seat_get_focus_inactive(seat, con->parent);
if (next == NULL) {
next = con->parent;
}
@ -60,7 +60,7 @@ static void handle_seat_container_destroy(struct wl_listener *listener,
}
static struct sway_seat_container *seat_container_from_container(
struct sway_seat *seat, swayc_t *con) {
struct sway_seat *seat, struct sway_container *con) {
if (con->type < C_WORKSPACE) {
// these don't get seat containers ever
return NULL;
@ -90,11 +90,11 @@ static struct sway_seat_container *seat_container_from_container(
static void handle_new_container(struct wl_listener *listener, void *data) {
struct sway_seat *seat = wl_container_of(listener, seat, new_container);
swayc_t *con = data;
struct sway_container *con = data;
seat_container_from_container(seat, con);
}
static void collect_focus_iter(swayc_t *con, void *data) {
static void collect_focus_iter(struct sway_container *con, void *data) {
struct sway_seat *seat = data;
if (con->type > C_WORKSPACE) {
return;
@ -131,7 +131,7 @@ struct sway_seat *sway_seat_create(struct sway_input_manager *input,
// init the focus stack
wl_list_init(&seat->focus_stack);
container_for_each_bfs(&root_container, collect_focus_iter, seat);
container_for_each_descendant_dfs(&root_container, collect_focus_iter, seat);
wl_signal_add(&root_container.sway_root->events.new_container,
&seat->new_container);
@ -167,7 +167,7 @@ static void seat_configure_keyboard(struct sway_seat *seat,
sway_keyboard_configure(seat_device->keyboard);
wlr_seat_set_keyboard(seat->wlr_seat,
seat_device->input_device->wlr_device);
swayc_t *focus = sway_seat_get_focus(seat);
struct sway_container *focus = sway_seat_get_focus(seat);
if (focus && focus->type == C_VIEW) {
// force notify reenter to pick up the new configuration
wlr_seat_keyboard_clear_focus(seat->wlr_seat);
@ -271,7 +271,7 @@ void sway_seat_configure_xcursor(struct sway_seat *seat) {
}
for (int i = 0; i < root_container.children->length; ++i) {
swayc_t *output_container = root_container.children->items[i];
struct sway_container *output_container = root_container.children->items[i];
struct wlr_output *output =
output_container->sway_output->wlr_output;
bool result =
@ -290,8 +290,8 @@ void sway_seat_configure_xcursor(struct sway_seat *seat) {
seat->cursor->cursor->y);
}
void sway_seat_set_focus(struct sway_seat *seat, swayc_t *container) {
swayc_t *last_focus = sway_seat_get_focus(seat);
void sway_seat_set_focus(struct sway_seat *seat, struct sway_container *container) {
struct sway_container *last_focus = sway_seat_get_focus(seat);
if (container && last_focus == container) {
return;
@ -324,10 +324,9 @@ void sway_seat_set_focus(struct sway_seat *seat, swayc_t *container) {
}
if (last_focus) {
swayc_t *last_ws = last_focus;
struct sway_container *last_ws = last_focus;
if (last_ws && last_ws->type != C_WORKSPACE) {
last_ws = swayc_parent_by_type(
last_focus, C_WORKSPACE);
last_ws = container_parent(last_focus, C_WORKSPACE);
}
if (last_ws) {
wlr_log(L_DEBUG, "sending workspace event");
@ -344,9 +343,9 @@ void sway_seat_set_focus(struct sway_seat *seat, swayc_t *container) {
seat->has_focus = (container != NULL);
}
swayc_t *sway_seat_get_focus_inactive(struct sway_seat *seat, swayc_t *container) {
struct sway_container *sway_seat_get_focus_inactive(struct sway_seat *seat, struct sway_container *container) {
struct sway_seat_container *current = NULL;
swayc_t *parent = NULL;
struct sway_container *parent = NULL;
wl_list_for_each(current, &seat->focus_stack, link) {
parent = current->container->parent;
@ -365,21 +364,21 @@ swayc_t *sway_seat_get_focus_inactive(struct sway_seat *seat, swayc_t *container
return NULL;
}
swayc_t *sway_seat_get_focus(struct sway_seat *seat) {
struct sway_container *sway_seat_get_focus(struct sway_seat *seat) {
if (!seat->has_focus) {
return NULL;
}
return sway_seat_get_focus_inactive(seat, &root_container);
}
swayc_t *sway_seat_get_focus_by_type(struct sway_seat *seat,
enum swayc_types type) {
swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
struct sway_container *sway_seat_get_focus_by_type(struct sway_seat *seat,
enum sway_container_type type) {
struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container);
if (focus->type == type) {
return focus;
}
return swayc_parent_by_type(focus, type);
return container_parent(focus, type);
}
void sway_seat_set_config(struct sway_seat *seat,

16
sway/ipc-json.c
View file

@ -3,7 +3,7 @@
#include <ctype.h>
#include "log.h"
#include "sway/ipc-json.h"
#include "sway/container.h"
#include "sway/tree/container.h"
#include "sway/output.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
@ -26,7 +26,7 @@ json_object *ipc_json_get_version() {
return version;
}
static json_object *ipc_json_create_rect(swayc_t *c) {
static json_object *ipc_json_create_rect(struct sway_container *c) {
json_object *rect = json_object_new_object();
json_object_object_add(rect, "x", json_object_new_int((int32_t)c->x));
@ -37,7 +37,7 @@ static json_object *ipc_json_create_rect(swayc_t *c) {
return rect;
}
static void ipc_json_describe_root(swayc_t *root, json_object *object) {
static void ipc_json_describe_root(struct sway_container *root, json_object *object) {
json_object_object_add(object, "type", json_object_new_string("root"));
json_object_object_add(object, "layout", json_object_new_string("splith"));
}
@ -64,7 +64,7 @@ static const char *ipc_json_get_output_transform(enum wl_output_transform transf
return NULL;
}
static void ipc_json_describe_output(swayc_t *container, json_object *object) {
static void ipc_json_describe_output(struct sway_container *container, json_object *object) {
struct wlr_output *wlr_output = container->sway_output->wlr_output;
json_object_object_add(object, "type", json_object_new_string("output"));
json_object_object_add(object, "active", json_object_new_boolean(true));
@ -95,7 +95,7 @@ static void ipc_json_describe_output(swayc_t *container, json_object *object) {
json_object_object_add(object, "modes", modes_array);
}
static void ipc_json_describe_workspace(swayc_t *workspace, json_object *object) {
static void ipc_json_describe_workspace(struct sway_container *workspace, json_object *object) {
int num = (isdigit(workspace->name[0])) ? atoi(workspace->name) : -1;
json_object_object_add(object, "num", json_object_new_int(num));
@ -103,11 +103,11 @@ static void ipc_json_describe_workspace(swayc_t *workspace, json_object *object)
json_object_object_add(object, "type", json_object_new_string("workspace"));
}
static void ipc_json_describe_view(swayc_t *c, json_object *object) {
static void ipc_json_describe_view(struct sway_container *c, json_object *object) {
json_object_object_add(object, "name", (c->name) ? json_object_new_string(c->name) : NULL);
}
json_object *ipc_json_describe_container(swayc_t *c) {
json_object *ipc_json_describe_container(struct sway_container *c) {
if (!(sway_assert(c, "Container must not be null."))) {
return NULL;
}
@ -148,7 +148,7 @@ json_object *ipc_json_describe_container(swayc_t *c) {
return object;
}
json_object *ipc_json_describe_container_recursive(swayc_t *c) {
json_object *ipc_json_describe_container_recursive(struct sway_container *c) {
json_object *object = ipc_json_describe_container(c);
int i;

17
sway/ipc-server.c
View file

@ -257,7 +257,8 @@ static void ipc_send_event(const char *json_string, enum ipc_command_type event)
}
}
void ipc_event_workspace(swayc_t *old, swayc_t *new, const char *change) {
void ipc_event_workspace(struct sway_container *old,
struct sway_container *new, const char *change) {
wlr_log(L_DEBUG, "Sending workspace::%s event", change);
json_object *obj = json_object_new_object();
json_object_object_add(obj, "change", json_object_new_string(change));
@ -282,7 +283,7 @@ void ipc_event_workspace(swayc_t *old, swayc_t *new, const char *change) {
json_object_put(obj);
}
void ipc_event_window(swayc_t *window, const char *change) {
void ipc_event_window(struct sway_container *window, const char *change) {
wlr_log(L_DEBUG, "Sending window::%s event", change);
json_object *obj = json_object_new_object();
json_object_object_add(obj, "change", json_object_new_string(change));
@ -378,7 +379,8 @@ void ipc_client_disconnect(struct ipc_client *client) {
free(client);
}
static void ipc_get_workspaces_callback(swayc_t *workspace, void *data) {
static void ipc_get_workspaces_callback(struct sway_container *workspace,
void *data) {
if (workspace->type != C_WORKSPACE) {
return;
}
@ -387,9 +389,9 @@ static void ipc_get_workspaces_callback(swayc_t *workspace, void *data) {
// it's set differently for the get_workspaces reply
struct sway_seat *seat =
sway_input_manager_get_default_seat(input_manager);
swayc_t *focused_ws = sway_seat_get_focus(seat);
struct sway_container *focused_ws = sway_seat_get_focus(seat);
if (focused_ws->type != C_WORKSPACE) {
focused_ws = swayc_parent_by_type(focused_ws, C_WORKSPACE);
focused_ws = container_parent(focused_ws, C_WORKSPACE);
}
bool focused = workspace == focused_ws;
json_object_object_del(workspace_json, "focused");
@ -441,7 +443,7 @@ void ipc_client_handle_command(struct ipc_client *client) {
{
json_object *outputs = json_object_new_array();
for (int i = 0; i < root_container.children->length; ++i) {
swayc_t *container = root_container.children->items[i];
struct sway_container *container = root_container.children->items[i];
if (container->type == C_OUTPUT) {
json_object_array_add(outputs,
ipc_json_describe_container(container));
@ -456,7 +458,8 @@ void ipc_client_handle_command(struct ipc_client *client) {
case IPC_GET_WORKSPACES:
{
json_object *workspaces = json_object_new_array();
container_map(&root_container, ipc_get_workspaces_callback, workspaces);
container_for_each_descendant_dfs(&root_container,
ipc_get_workspaces_callback, workspaces);
const char *json_string = json_object_to_json_string(workspaces);
ipc_send_reply(client, json_string, (uint32_t) strlen(json_string));
json_object_put(workspaces); // free

4
sway/main.c
View file

@ -18,7 +18,7 @@
#include <wlr/util/log.h>
#include "sway/config.h"
#include "sway/server.h"
#include "sway/layout.h"
#include "sway/tree/layout.h"
#include "sway/ipc-server.h"
#include "ipc-client.h"
#include "readline.h"
@ -382,7 +382,7 @@ int main(int argc, char **argv) {
wlr_log(L_INFO, "Starting sway version " SWAY_VERSION);
init_layout();
layout_init();
if (!server_init(&server)) {
return 1;

220
sway/tree/container.c
View file

@ -7,14 +7,14 @@
#include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_wl_shell.h>
#include "sway/config.h"
#include "sway/container.h"
#include "sway/tree/container.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
#include "sway/layout.h"
#include "sway/tree/layout.h"
#include "sway/output.h"
#include "sway/server.h"
#include "sway/view.h"
#include "sway/workspace.h"
#include "sway/tree/view.h"
#include "sway/tree/workspace.h"
#include "sway/ipc-server.h"
#include "log.h"
@ -33,48 +33,15 @@ static list_t *get_bfs_queue() {
return bfs_queue;
}
static void notify_new_container(swayc_t *container) {
static void notify_new_container(struct sway_container *container) {
wl_signal_emit(&root_container.sway_root->events.new_container, container);
ipc_event_window(container, "new");
}
swayc_t *swayc_by_test(swayc_t *container,
bool (*test)(swayc_t *view, void *data), void *data) {
if (!container->children) {
return NULL;
}
// TODO: floating windows
for (int i = 0; i < container->children->length; ++i) {
swayc_t *child = container->children->items[i];
if (test(child, data)) {
return child;
} else {
swayc_t *res = swayc_by_test(child, test, data);
if (res) {
return res;
}
}
}
return NULL;
}
void swayc_descendants_of_type(swayc_t *root, enum swayc_types type,
void (*func)(swayc_t *item, void *data), void *data) {
for (int i = 0; i < root->children->length; ++i) {
swayc_t *item = root->children->items[i];
if (item->type == type) {
func(item, data);
}
if (item->children && item->children->length) {
swayc_descendants_of_type(item, type, func, data);
}
}
}
static swayc_t *new_swayc(enum swayc_types type) {
static struct sway_container *container_create(enum sway_container_type type) {
// next id starts at 1 because 0 is assigned to root_container in layout.c
static size_t next_id = 1;
swayc_t *c = calloc(1, sizeof(swayc_t));
struct sway_container *c = calloc(1, sizeof(struct sway_container));
if (!c) {
return NULL;
}
@ -82,8 +49,6 @@ static swayc_t *new_swayc(enum swayc_types type) {
c->layout = L_NONE;
c->workspace_layout = L_NONE;
c->type = type;
c->nb_master = 1;
c->nb_slave_groups = 1;
if (type != C_VIEW) {
c->children = create_list();
}
@ -93,18 +58,18 @@ static swayc_t *new_swayc(enum swayc_types type) {
return c;
}
static void free_swayc(swayc_t *cont) {
if (!sway_assert(cont, "free_swayc passed NULL")) {
static void container_destroy(struct sway_container *cont) {
if (cont == NULL) {
return;
}
wl_signal_emit(&cont->events.destroy, cont);
if (cont->children) {
// remove children until there are no more, free_swayc calls
// remove_child, which removes child from this container
// remove children until there are no more, container_destroy calls
// container_remove_child, which removes child from this container
while (cont->children->length) {
free_swayc(cont->children->items[0]);
container_destroy(cont->children->items[0]);
}
list_free(cont->children);
}
@ -113,7 +78,7 @@ static void free_swayc(swayc_t *cont) {
list_free(cont->marks);
}
if (cont->parent) {
remove_child(cont);
container_remove_child(cont);
}
if (cont->name) {
free(cont->name);
@ -121,7 +86,8 @@ static void free_swayc(swayc_t *cont) {
free(cont);
}
swayc_t *new_output(struct sway_output *sway_output) {
struct sway_container *container_output_create(
struct sway_output *sway_output) {
struct wlr_box size;
wlr_output_effective_resolution(sway_output->wlr_output, &size.width,
&size.height);
@ -156,22 +122,22 @@ swayc_t *new_output(struct sway_output *sway_output) {
return NULL;
}
swayc_t *output = new_swayc(C_OUTPUT);
struct sway_container *output = container_create(C_OUTPUT);
output->sway_output = sway_output;
output->name = strdup(name);
if (output->name == NULL) {
free_swayc(output);
container_destroy(output);
return NULL;
}
apply_output_config(oc, output);
add_child(&root_container, output);
container_add_child(&root_container, output);
load_swaybars();
// Create workspace
char *ws_name = workspace_next_name(output->name);
wlr_log(L_DEBUG, "Creating default workspace %s", ws_name);
swayc_t *ws = new_workspace(output, ws_name);
struct sway_container *ws = container_workspace_create(output, ws_name);
// Set each seat's focus if not already set
struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input_manager->seats, link) {
@ -185,12 +151,14 @@ swayc_t *new_output(struct sway_output *sway_output) {
return output;
}
swayc_t *new_workspace(swayc_t *output, const char *name) {
if (!sway_assert(output, "new_workspace called with null output")) {
struct sway_container *container_workspace_create(
struct sway_container *output, const char *name) {
if (!sway_assert(output,
"container_workspace_create called with null output")) {
return NULL;
}
wlr_log(L_DEBUG, "Added workspace %s for output %s", name, output->name);
swayc_t *workspace = new_swayc(C_WORKSPACE);
struct sway_container *workspace = container_create(C_WORKSPACE);
workspace->x = output->x;
workspace->y = output->y;
@ -198,21 +166,23 @@ swayc_t *new_workspace(swayc_t *output, const char *name) {
workspace->height = output->height;
workspace->name = !name ? NULL : strdup(name);
workspace->prev_layout = L_NONE;
workspace->layout = default_layout(output);
workspace->workspace_layout = default_layout(output);
workspace->layout = container_get_default_layout(output);
workspace->workspace_layout = container_get_default_layout(output);
add_child(output, workspace);
sort_workspaces(output);
container_add_child(output, workspace);
container_sort_workspaces(output);
notify_new_container(workspace);
return workspace;
}
swayc_t *new_view(swayc_t *sibling, struct sway_view *sway_view) {
if (!sway_assert(sibling, "new_view called with NULL sibling/parent")) {
struct sway_container *container_view_create(struct sway_container *sibling,
struct sway_view *sway_view) {
if (!sway_assert(sibling,
"container_view_create called with NULL sibling/parent")) {
return NULL;
}
const char *title = view_get_title(sway_view);
swayc_t *swayc = new_swayc(C_VIEW);
struct sway_container *swayc = container_create(C_VIEW);
wlr_log(L_DEBUG, "Adding new view %p:%s to container %p %d %s",
swayc, title, sibling, sibling ? sibling->type : 0, sibling->name);
// Setup values
@ -223,17 +193,18 @@ swayc_t *new_view(swayc_t *sibling, struct sway_view *sway_view) {
if (sibling->type == C_WORKSPACE) {
// Case of focused workspace, just create as child of it
add_child(sibling, swayc);
container_add_child(sibling, swayc);
} else {
// Regular case, create as sibling of current container
add_sibling(sibling, swayc);
container_add_sibling(sibling, swayc);
}
notify_new_container(swayc);
return swayc;
}
swayc_t *destroy_output(swayc_t *output) {
if (!sway_assert(output, "null output passed to destroy_output")) {
struct sway_container *container_output_destroy(struct sway_container *output) {
if (!sway_assert(output,
"null output passed to container_output_destroy")) {
return NULL;
}
@ -245,12 +216,13 @@ swayc_t *destroy_output(swayc_t *output) {
int p = root_container.children->items[0] == output;
// Move workspace from this output to another output
while (output->children->length) {
swayc_t *child = output->children->items[0];
remove_child(child);
add_child(root_container.children->items[p], child);
struct sway_container *child = output->children->items[0];
container_remove_child(child);
container_add_child(root_container.children->items[p], child);
}
sort_workspaces(root_container.children->items[p]);
arrange_windows(root_container.children->items[p], -1, -1);
container_sort_workspaces(root_container.children->items[p]);
arrange_windows(root_container.children->items[p],
-1, -1);
}
}
@ -259,18 +231,18 @@ swayc_t *destroy_output(swayc_t *output) {
wl_list_remove(&output->sway_output->mode.link);
wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name);
free_swayc(output);
container_destroy(output);
return &root_container;
}
swayc_t *destroy_view(swayc_t *view) {
struct sway_container *container_view_destroy(struct sway_container *view) {
if (!view) {
return NULL;
}
wlr_log(L_DEBUG, "Destroying view '%s'", view->name);
swayc_t *parent = view->parent;
free_swayc(view);
struct sway_container *parent = view->parent;
container_destroy(view);
// TODO WLR: Destroy empty containers
/*
@ -281,7 +253,55 @@ swayc_t *destroy_view(swayc_t *view) {
return parent;
}
swayc_t *swayc_parent_by_type(swayc_t *container, enum swayc_types type) {
struct sway_container *container_set_layout(struct sway_container *container,
enum sway_container_layout layout) {
if (container->type == C_WORKSPACE) {
container->workspace_layout = layout;
if (layout == L_HORIZ || layout == L_VERT) {
container->layout = layout;
}
} else {
container->layout = layout;
}
return container;
}
void container_descendants(struct sway_container *root,
enum sway_container_type type,
void (*func)(struct sway_container *item, void *data), void *data) {
for (int i = 0; i < root->children->length; ++i) {
struct sway_container *item = root->children->items[i];
if (item->type == type) {
func(item, data);
}
if (item->children && item->children->length) {
container_descendants(item, type, func, data);
}
}
}
struct sway_container *container_find(struct sway_container *container,
bool (*test)(struct sway_container *view, void *data), void *data) {
if (!container->children) {
return NULL;
}
// TODO: floating windows
for (int i = 0; i < container->children->length; ++i) {
struct sway_container *child = container->children->items[i];
if (test(child, data)) {
return child;
} else {
struct sway_container *res = container_find(child, test, data);
if (res) {
return res;
}
}
}
return NULL;
}
struct sway_container *container_parent(struct sway_container *container,
enum sway_container_type type) {
if (!sway_assert(container, "container is NULL")) {
return NULL;
}
@ -294,7 +314,8 @@ swayc_t *swayc_parent_by_type(swayc_t *container, enum swayc_types type) {
return container;
}
swayc_t *swayc_at(swayc_t *parent, double lx, double ly,
struct sway_container *container_at(struct sway_container *parent,
double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) {
list_t *queue = get_bfs_queue();
if (!queue) {
@ -303,13 +324,13 @@ swayc_t *swayc_at(swayc_t *parent, double lx, double ly,
list_add(queue, parent);
swayc_t *swayc = NULL;
struct sway_container *swayc = NULL;
while (queue->length) {
swayc = queue->items[0];
list_del(queue, 0);
if (swayc->type == C_VIEW) {
struct sway_view *sview = swayc->sway_view;
swayc_t *soutput = swayc_parent_by_type(swayc, C_OUTPUT);
struct sway_container *soutput = container_parent(swayc, C_OUTPUT);
struct wlr_box *output_box =
wlr_output_layout_get_box(
root_container.sway_root->output_layout,
@ -379,30 +400,23 @@ swayc_t *swayc_at(swayc_t *parent, double lx, double ly,
return NULL;
}
void container_map(swayc_t *container, void (*f)(swayc_t *view, void *data), void *data) {
void container_for_each_descendant_dfs(struct sway_container *container,
void (*f)(struct sway_container *container, void *data),
void *data) {
if (container) {
int i;
if (container->children) {
for (i = 0; i < container->children->length; ++i) {
swayc_t *child = container->children->items[i];
container_map(child, f, data);
for (int i = 0; i < container->children->length; ++i) {
struct sway_container *child =
container->children->items[i];
container_for_each_descendant_dfs(child, f, data);
}
}
// TODO
/*
if (container->floating) {
for (i = 0; i < container->floating->length; ++i) {
swayc_t *child = container->floating->items[i];
container_map(child, f, data);
}
}
*/
f(container, data);
}
}
void container_for_each_bfs(swayc_t *con, void (*f)(swayc_t *con, void *data),
void *data) {
void container_for_each_descendant_bfs(struct sway_container *con,
void (*f)(struct sway_container *con, void *data), void *data) {
list_t *queue = get_bfs_queue();
if (!queue) {
return;
@ -415,7 +429,7 @@ void container_for_each_bfs(swayc_t *con, void (*f)(swayc_t *con, void *data),
list_add(queue, con);
swayc_t *current = NULL;
struct sway_container *current = NULL;
while (queue->length) {
current = queue->items[0];
list_del(queue, 0);
@ -424,15 +438,3 @@ void container_for_each_bfs(swayc_t *con, void (*f)(swayc_t *con, void *data),
list_cat(queue, current->children);
}
}
swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout) {
if (container->type == C_WORKSPACE) {
container->workspace_layout = layout;
if (layout == L_HORIZ || layout == L_VERT) {
container->layout = layout;
}
} else {
container->layout = layout;
}
return container;
}

133
sway/tree/layout.c
View file

@ -6,24 +6,26 @@
#include <string.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_output_layout.h>
#include "sway/container.h"
#include "sway/layout.h"
#include "sway/tree/container.h"
#include "sway/tree/layout.h"
#include "sway/output.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "sway/input/seat.h"
#include "list.h"
#include "log.h"
swayc_t root_container;
struct sway_container root_container;
static void output_layout_change_notify(struct wl_listener *listener, void *data) {
static void output_layout_change_notify(struct wl_listener *listener,
void *data) {
struct wlr_box *layout_box = wlr_output_layout_get_box(
root_container.sway_root->output_layout, NULL);
root_container.width = layout_box->width;
root_container.height = layout_box->height;
for (int i = 0 ; i < root_container.children->length; ++i) {
swayc_t *output_container = root_container.children->items[i];
struct sway_container *output_container =
root_container.children->items[i];
if (output_container->type != C_OUTPUT) {
continue;
}
@ -43,7 +45,7 @@ static void output_layout_change_notify(struct wl_listener *listener, void *data
arrange_windows(&root_container, -1, -1);
}
void init_layout(void) {
void layout_init(void) {
root_container.id = 0; // normally assigned in new_swayc()
root_container.type = C_ROOT;
root_container.layout = L_NONE;
@ -62,9 +64,9 @@ void init_layout(void) {
&root_container.sway_root->output_layout_change);
}
static int index_child(const swayc_t *child) {
static int index_child(const struct sway_container *child) {
// TODO handle floating
swayc_t *parent = child->parent;
struct sway_container *parent = child->parent;
int i, len;
len = parent->children->length;
for (i = 0; i < len; ++i) {
@ -79,16 +81,18 @@ static int index_child(const swayc_t *child) {
return i;
}
swayc_t *add_sibling(swayc_t *fixed, swayc_t *active) {
struct sway_container *container_add_sibling(struct sway_container *fixed,
struct sway_container *active) {
// TODO handle floating
swayc_t *parent = fixed->parent;
struct sway_container *parent = fixed->parent;
int i = index_child(fixed);
list_insert(parent->children, i + 1, active);
active->parent = parent;
return active->parent;
}
void add_child(swayc_t *parent, swayc_t *child) {
void container_add_child(struct sway_container *parent,
struct sway_container *child) {
wlr_log(L_DEBUG, "Adding %p (%d, %fx%f) to %p (%d, %fx%f)",
child, child->type, child->width, child->height,
parent, parent->type, parent->width, parent->height);
@ -96,15 +100,17 @@ void add_child(swayc_t *parent, swayc_t *child) {
child->parent = parent;
// set focus for this container
/* TODO WLR
if (parent->type == C_WORKSPACE && child->type == C_VIEW && (parent->workspace_layout == L_TABBED || parent->workspace_layout == L_STACKED)) {
if (parent->type == C_WORKSPACE && child->type == C_VIEW &&
(parent->workspace_layout == L_TABBED || parent->workspace_layout ==
L_STACKED)) {
child = new_container(child, parent->workspace_layout);
}
*/
}
swayc_t *remove_child(swayc_t *child) {
struct sway_container *container_remove_child(struct sway_container *child) {
int i;
swayc_t *parent = child->parent;
struct sway_container *parent = child->parent;
for (i = 0; i < parent->children->length; ++i) {
if (parent->children->items[i] == child) {
list_del(parent->children, i);
@ -115,7 +121,8 @@ swayc_t *remove_child(swayc_t *child) {
return parent;
}
enum swayc_layouts default_layout(swayc_t *output) {
enum sway_container_layout container_get_default_layout(
struct sway_container *output) {
/* TODO WLR
if (config->default_layout != L_NONE) {
//return config->default_layout;
@ -129,8 +136,8 @@ enum swayc_layouts default_layout(swayc_t *output) {
}
static int sort_workspace_cmp_qsort(const void *_a, const void *_b) {
swayc_t *a = *(void **)_a;
swayc_t *b = *(void **)_b;
struct sway_container *a = *(void **)_a;
struct sway_container *b = *(void **)_b;
int retval = 0;
if (isdigit(a->name[0]) && isdigit(b->name[0])) {
@ -146,21 +153,22 @@ static int sort_workspace_cmp_qsort(const void *_a, const void *_b) {
return retval;
}
void sort_workspaces(swayc_t *output) {
void container_sort_workspaces(struct sway_container *output) {
list_stable_sort(output->children, sort_workspace_cmp_qsort);
}
static void apply_horiz_layout(swayc_t *container, const double x,
static void apply_horiz_layout(struct sway_container *container, const double x,
const double y, const double width,
const double height, const int start,
const int end);
static void apply_vert_layout(swayc_t *container, const double x,
static void apply_vert_layout(struct sway_container *container, const double x,
const double y, const double width,
const double height, const int start,
const int end);
void arrange_windows(swayc_t *container, double width, double height) {
void arrange_windows(struct sway_container *container,
double width, double height) {
int i;
if (width == -1 || height == -1) {
width = container->width;
@ -181,7 +189,7 @@ void arrange_windows(swayc_t *container, double width, double height) {
case C_ROOT:
// TODO: wlr_output_layout probably
for (i = 0; i < container->children->length; ++i) {
swayc_t *output = container->children->items[i];
struct sway_container *output = container->children->items[i];
wlr_log(L_DEBUG, "Arranging output '%s' at %f,%f",
output->name, output->x, output->y);
arrange_windows(output, -1, -1);
@ -197,13 +205,14 @@ void arrange_windows(swayc_t *container, double width, double height) {
}
// arrange all workspaces:
for (i = 0; i < container->children->length; ++i) {
swayc_t *child = container->children->items[i];
struct sway_container *child = container->children->items[i];
arrange_windows(child, -1, -1);
}
return;
case C_WORKSPACE:
{
swayc_t *output = swayc_parent_by_type(container, C_OUTPUT);
struct sway_container *output =
container_parent(container, C_OUTPUT);
struct wlr_box *area = &output->sway_output->usable_area;
wlr_log(L_DEBUG, "Usable area for ws: %dx%d@%d,%d",
area->width, area->height, area->x, area->y);
@ -252,14 +261,15 @@ void arrange_windows(swayc_t *container, double width, double height) {
}
}
static void apply_horiz_layout(swayc_t *container,
static void apply_horiz_layout(struct sway_container *container,
const double x, const double y,
const double width, const double height,
const int start, const int end) {
double scale = 0;
// Calculate total width
for (int i = start; i < end; ++i) {
double *old_width = &((swayc_t *)container->children->items[i])->width;
double *old_width =
&((struct sway_container *)container->children->items[i])->width;
if (*old_width <= 0) {
if (end - start > 1) {
*old_width = width / (end - start - 1);
@ -276,7 +286,7 @@ static void apply_horiz_layout(swayc_t *container,
if (scale > 0.1) {
wlr_log(L_DEBUG, "Arranging %p horizontally", container);
for (int i = start; i < end; ++i) {
swayc_t *child = container->children->items[i];
struct sway_container *child = container->children->items[i];
wlr_log(L_DEBUG,
"Calculating arrangement for %p:%d (will scale %f by %f)",
child, child->type, width, scale);
@ -301,7 +311,7 @@ static void apply_horiz_layout(swayc_t *container,
}
}
void apply_vert_layout(swayc_t *container,
void apply_vert_layout(struct sway_container *container,
const double x, const double y,
const double width, const double height, const int start,
const int end) {
@ -309,7 +319,8 @@ void apply_vert_layout(swayc_t *container,
double scale = 0;
// Calculate total height
for (i = start; i < end; ++i) {
double *old_height = &((swayc_t *)container->children->items[i])->height;
double *old_height =
&((struct sway_container *)container->children->items[i])->height;
if (*old_height <= 0) {
if (end - start > 1) {
*old_height = height / (end - start - 1);
@ -326,7 +337,7 @@ void apply_vert_layout(swayc_t *container,
if (scale > 0.1) {
wlr_log(L_DEBUG, "Arranging %p vertically", container);
for (i = start; i < end; ++i) {
swayc_t *child = container->children->items[i];
struct sway_container *child = container->children->items[i];
wlr_log(L_DEBUG,
"Calculating arrangement for %p:%d (will scale %f by %f)",
child, child->type, height, scale);
@ -354,15 +365,16 @@ void apply_vert_layout(swayc_t *container,
/**
* Get swayc in the direction of newly entered output.
*/
static swayc_t *get_swayc_in_output_direction(swayc_t *output,
enum movement_direction dir, struct sway_seat *seat) {
static struct sway_container *get_swayc_in_output_direction(
struct sway_container *output, enum movement_direction dir,
struct sway_seat *seat) {
if (!output) {
return NULL;
}
swayc_t *ws = sway_seat_get_focus_inactive(seat, output);
struct sway_container *ws = sway_seat_get_focus_inactive(seat, output);
if (ws->type != C_WORKSPACE) {
ws = swayc_parent_by_type(ws, C_WORKSPACE);
ws = container_parent(ws, C_WORKSPACE);
}
if (ws == NULL) {
@ -380,13 +392,15 @@ static swayc_t *get_swayc_in_output_direction(swayc_t *output,
return ws->children->items[0];
case MOVE_UP:
case MOVE_DOWN: {
swayc_t *focused = sway_seat_get_focus_inactive(seat, ws);
struct sway_container *focused =
sway_seat_get_focus_inactive(seat, ws);
if (focused && focused->parent) {
swayc_t *parent = focused->parent;
struct sway_container *parent = focused->parent;
if (parent->layout == L_VERT) {
if (dir == MOVE_UP) {
// get child furthest down on new output
return parent->children->items[parent->children->length-1];
int idx = parent->children->length - 1;
return parent->children->items[idx];
} else if (dir == MOVE_DOWN) {
// get child furthest up on new output
return parent->children->items[0];
@ -404,13 +418,14 @@ static swayc_t *get_swayc_in_output_direction(swayc_t *output,
return ws;
}
static void get_layout_center_position(swayc_t *container, int *x, int *y) {
static void get_layout_center_position(struct sway_container *container,
int *x, int *y) {
// FIXME view coords are inconsistently referred to in layout/output systems
if (container->type == C_OUTPUT) {
*x = container->x + container->width/2;
*y = container->y + container->height/2;
} else {
swayc_t *output = swayc_parent_by_type(container, C_OUTPUT);
struct sway_container *output = container_parent(container, C_OUTPUT);
if (container->type == C_WORKSPACE) {
// Workspace coordinates are actually wrong/arbitrary, but should
// be same as output.
@ -423,7 +438,8 @@ static void get_layout_center_position(swayc_t *container, int *x, int *y) {
}
}
static bool sway_dir_to_wlr(enum movement_direction dir, enum wlr_direction *out) {
static bool sway_dir_to_wlr(enum movement_direction dir,
enum wlr_direction *out) {
switch (dir) {
case MOVE_UP:
*out = WLR_DIRECTION_UP;
@ -444,12 +460,12 @@ static bool sway_dir_to_wlr(enum movement_direction dir, enum wlr_direction *out
return true;
}
static swayc_t *sway_output_from_wlr(struct wlr_output *output) {
static struct sway_container *sway_output_from_wlr(struct wlr_output *output) {
if (output == NULL) {
return NULL;
}
for (int i = 0; i < root_container.children->length; ++i) {
swayc_t *o = root_container.children->items[i];
struct sway_container *o = root_container.children->items[i];
if (o->type == C_OUTPUT && o->sway_output->wlr_output == output) {
return o;
}
@ -457,13 +473,14 @@ static swayc_t *sway_output_from_wlr(struct wlr_output *output) {
return NULL;
}
static swayc_t *get_swayc_in_direction_under(swayc_t *container,
enum movement_direction dir, struct sway_seat *seat, swayc_t *limit) {
static struct sway_container *get_swayc_in_direction_under(
struct sway_container *container, enum movement_direction dir,
struct sway_seat *seat, struct sway_container *limit) {
if (dir == MOVE_CHILD) {
return sway_seat_get_focus_inactive(seat, container);
}
swayc_t *parent = container->parent;
struct sway_container *parent = container->parent;
if (dir == MOVE_PARENT) {
if (parent->type == C_OUTPUT) {
return NULL;
@ -496,9 +513,10 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
/*
if (container->type == C_VIEW && swayc_is_fullscreen(container)) {
wlr_log(L_DEBUG, "Moving from fullscreen view, skipping to output");
container = swayc_parent_by_type(container, C_OUTPUT);
container = container_parent(container, C_OUTPUT);
get_layout_center_position(container, &abs_pos);
swayc_t *output = swayc_adjacent_output(container, dir, &abs_pos, true);
struct sway_container *output =
swayc_adjacent_output(container, dir, &abs_pos, true);
return get_swayc_in_output_direction(output, dir);
}
if (container->type == C_WORKSPACE && container->fullscreen) {
@ -507,7 +525,7 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
}
*/
swayc_t *wrap_candidate = NULL;
struct sway_container *wrap_candidate = NULL;
while (true) {
// Test if we can even make a difference here
bool can_move = false;
@ -521,16 +539,19 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
}
int lx, ly;
get_layout_center_position(container, &lx, &ly);
struct wlr_output_layout *layout = root_container.sway_root->output_layout;
struct wlr_output_layout *layout =
root_container.sway_root->output_layout;
struct wlr_output *wlr_adjacent =
wlr_output_layout_adjacent_output(layout, wlr_dir,
container->sway_output->wlr_output, lx, ly);
swayc_t *adjacent = sway_output_from_wlr(wlr_adjacent);
struct sway_container *adjacent =
sway_output_from_wlr(wlr_adjacent);
if (!adjacent || adjacent == container) {
return wrap_candidate;
}
swayc_t *next = get_swayc_in_output_direction(adjacent, dir, seat);
struct sway_container *next =
get_swayc_in_output_direction(adjacent, dir, seat);
if (next == NULL) {
return NULL;
}
@ -570,8 +591,9 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
}
}
} else {
wlr_log(L_DEBUG, "%s cont %d-%p dir %i sibling %d: %p", __func__,
idx, container, dir, desired, parent->children->items[desired]);
wlr_log(L_DEBUG,
"cont %d-%p dir %i sibling %d: %p", idx,
container, dir, desired, parent->children->items[desired]);
return parent->children->items[desired];
}
}
@ -587,7 +609,8 @@ static swayc_t *get_swayc_in_direction_under(swayc_t *container,
}
}
swayc_t *get_swayc_in_direction(swayc_t *container, struct sway_seat *seat,
struct sway_container *container_get_in_direction(
struct sway_container *container, struct sway_seat *seat,
enum movement_direction dir) {
return get_swayc_in_direction_under(container, dir, seat, NULL);
}

7
sway/tree/view.c
View file

@ -1,8 +1,8 @@
#include <wayland-server.h>
#include <wlr/types/wlr_output_layout.h>
#include "sway/container.h"
#include "sway/layout.h"
#include "sway/view.h"
#include "sway/tree/container.h"
#include "sway/tree/layout.h"
#include "sway/tree/view.h"
const char *view_get_title(struct sway_view *view) {
if (view->iface.get_prop) {
@ -45,6 +45,7 @@ void view_set_size(struct sway_view *view, int width, int height) {
}
}
// TODO make view coordinates in layout coordinates
void view_set_position(struct sway_view *view, double ox, double oy) {
if (view->iface.set_position) {
struct wlr_box box = {

92
sway/tree/workspace.c
View file

@ -3,10 +3,10 @@
#include <stdlib.h>
#include <stdio.h>
#include <strings.h>
#include "sway/container.h"
#include "sway/tree/container.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
#include "sway/workspace.h"
#include "sway/tree/workspace.h"
#include "log.h"
#include "util.h"
@ -17,7 +17,7 @@ struct workspace_by_number_data {
const char *name;
};
void next_name_map(swayc_t *ws, void *data) {
void next_name_map(struct sway_container *ws, void *data) {
int *count = data;
++count;
}
@ -37,7 +37,7 @@ char *workspace_next_name(const char *output_name) {
return name;
}
static bool _workspace_by_number(swayc_t *view, void *data) {
static bool _workspace_by_number(struct sway_container *view, void *data) {
if (view->type != C_WORKSPACE) {
return false;
}
@ -46,27 +46,28 @@ static bool _workspace_by_number(swayc_t *view, void *data) {
return a == wbnd->len && strncmp(view->name, wbnd->name, a) == 0;
}
swayc_t *workspace_by_number(const char* name) {
struct sway_container *workspace_by_number(const char* name) {
struct workspace_by_number_data wbnd = {0, "1234567890", name};
wbnd.len = strspn(name, wbnd.cset);
if (wbnd.len <= 0) {
return NULL;
}
return swayc_by_test(&root_container, _workspace_by_number, (void *) &wbnd);
return container_find(&root_container,
_workspace_by_number, (void *) &wbnd);
}
static bool _workspace_by_name(swayc_t *view, void *data) {
static bool _workspace_by_name(struct sway_container *view, void *data) {
return (view->type == C_WORKSPACE) &&
(strcasecmp(view->name, (char *) data) == 0);
}
swayc_t *workspace_by_name(const char *name) {
struct sway_container *workspace_by_name(const char *name) {
struct sway_seat *seat = input_manager_current_seat(input_manager);
swayc_t *current_workspace = NULL, *current_output = NULL;
swayc_t *focus = sway_seat_get_focus(seat);
struct sway_container *current_workspace = NULL, *current_output = NULL;
struct sway_container *focus = sway_seat_get_focus(seat);
if (focus) {
current_workspace = swayc_parent_by_type(focus, C_WORKSPACE);
current_output = swayc_parent_by_type(focus, C_OUTPUT);
current_workspace = container_parent(focus, C_WORKSPACE);
current_output = container_parent(focus, C_OUTPUT);
}
if (strcmp(name, "prev") == 0) {
return workspace_prev(current_workspace);
@ -79,12 +80,13 @@ swayc_t *workspace_by_name(const char *name) {
} else if (strcmp(name, "current") == 0) {
return current_workspace;
} else {
return swayc_by_test(&root_container, _workspace_by_name, (void *) name);
return container_find(&root_container, _workspace_by_name,
(void *)name);
}
}
swayc_t *workspace_create(const char *name) {
swayc_t *parent;
struct sway_container *workspace_create(const char *name) {
struct sway_container *parent;
// Search for workspace<->output pair
int i, e = config->workspace_outputs->length;
for (i = 0; i < e; ++i) {
@ -95,7 +97,7 @@ swayc_t *workspace_create(const char *name) {
for (i = 0; i < e; ++i) {
parent = root_container.children->items[i];
if (strcmp(parent->name, wso->output) == 0) {
return new_workspace(parent, name);
return container_workspace_create(parent, name);
}
}
break;
@ -103,10 +105,11 @@ swayc_t *workspace_create(const char *name) {
}
// Otherwise create a new one
struct sway_seat *seat = input_manager_current_seat(input_manager);
swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
struct sway_container *focus =
sway_seat_get_focus_inactive(seat, &root_container);
parent = focus;
parent = swayc_parent_by_type(parent, C_OUTPUT);
return new_workspace(parent, name);
parent = container_parent(parent, C_OUTPUT);
return container_workspace_create(parent, name);
}
/**
@ -114,17 +117,18 @@ swayc_t *workspace_create(const char *name) {
* the end and beginning. If next is false, the previous workspace is returned,
* otherwise the next one is returned.
*/
swayc_t *workspace_output_prev_next_impl(swayc_t *output, bool next) {
struct sway_container *workspace_output_prev_next_impl(
struct sway_container *output, bool next) {
if (!sway_assert(output->type == C_OUTPUT,
"Argument must be an output, is %d", output->type)) {
return NULL;
}
struct sway_seat *seat = input_manager_current_seat(input_manager);
swayc_t *focus = sway_seat_get_focus_inactive(seat, output);
swayc_t *workspace = (focus->type == C_WORKSPACE ?
struct sway_container *focus = sway_seat_get_focus_inactive(seat, output);
struct sway_container *workspace = (focus->type == C_WORKSPACE ?
focus :
swayc_parent_by_type(focus, C_WORKSPACE));
container_parent(focus, C_WORKSPACE));
int i;
for (i = 0; i < output->children->length; i++) {
@ -134,7 +138,8 @@ swayc_t *workspace_output_prev_next_impl(swayc_t *output, bool next) {
}
}
// Doesn't happen, at worst the for loop returns the previously active workspace
// Doesn't happen, at worst the for loop returns the previously active
// workspace
return NULL;
}
@ -144,13 +149,14 @@ swayc_t *workspace_output_prev_next_impl(swayc_t *output, bool next) {
* next is false, the previous workspace is returned, otherwise the next one is
* returned.
*/
swayc_t *workspace_prev_next_impl(swayc_t *workspace, bool next) {
struct sway_container *workspace_prev_next_impl(
struct sway_container *workspace, bool next) {
if (!sway_assert(workspace->type == C_WORKSPACE,
"Argument must be a workspace, is %d", workspace->type)) {
return NULL;
}
swayc_t *current_output = workspace->parent;
struct sway_container *current_output = workspace->parent;
int offset = next ? 1 : -1;
int start = next ? 0 : 1;
int end;
@ -166,54 +172,57 @@ swayc_t *workspace_prev_next_impl(swayc_t *workspace, bool next) {
}
}
// Given workspace is the first/last on the output, jump to the previous/next output
// Given workspace is the first/last on the output, jump to the
// previous/next output
int num_outputs = root_container.children->length;
for (i = 0; i < num_outputs; i++) {
if (root_container.children->items[i] == current_output) {
swayc_t *next_output = root_container.children->items[
struct sway_container *next_output = root_container.children->items[
wrap(i + offset, num_outputs)];
return workspace_output_prev_next_impl(next_output, next);
}
}
// Doesn't happen, at worst the for loop returns the previously active workspace on the active output
// Doesn't happen, at worst the for loop returns the previously active
// workspace on the active output
return NULL;
}
swayc_t *workspace_output_next(swayc_t *current) {
struct sway_container *workspace_output_next(struct sway_container *current) {
return workspace_output_prev_next_impl(current, true);
}
swayc_t *workspace_next(swayc_t *current) {
struct sway_container *workspace_next(struct sway_container *current) {
return workspace_prev_next_impl(current, true);
}
swayc_t *workspace_output_prev(swayc_t *current) {
struct sway_container *workspace_output_prev(struct sway_container *current) {
return workspace_output_prev_next_impl(current, false);
}
swayc_t *workspace_prev(swayc_t *current) {
struct sway_container *workspace_prev(struct sway_container *current) {
return workspace_prev_next_impl(current, false);
}
bool workspace_switch(swayc_t *workspace) {
bool workspace_switch(struct sway_container *workspace) {
if (!workspace) {
return false;
}
struct sway_seat *seat = input_manager_current_seat(input_manager);
swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
struct sway_container *focus =
sway_seat_get_focus_inactive(seat, &root_container);
if (!seat || !focus) {
return false;
}
swayc_t *active_ws = focus;
struct sway_container *active_ws = focus;
if (active_ws->type != C_WORKSPACE) {
swayc_parent_by_type(focus, C_WORKSPACE);
container_parent(focus, C_WORKSPACE);
}
if (config->auto_back_and_forth
&& active_ws == workspace
&& prev_workspace_name) {
swayc_t *new_ws = workspace_by_name(prev_workspace_name);
struct sway_container *new_ws = workspace_by_name(prev_workspace_name);
workspace = new_ws ? new_ws : workspace_create(prev_workspace_name);
}
@ -230,13 +239,14 @@ bool workspace_switch(swayc_t *workspace) {
// TODO: Deal with sticky containers
wlr_log(L_DEBUG, "Switching to workspace %p:%s", workspace, workspace->name);
swayc_t *next = sway_seat_get_focus_inactive(seat, workspace);
wlr_log(L_DEBUG, "Switching to workspace %p:%s",
workspace, workspace->name);
struct sway_container *next = sway_seat_get_focus_inactive(seat, workspace);
if (next == NULL) {
next = workspace;
}
sway_seat_set_focus(seat, next);
swayc_t *output = swayc_parent_by_type(workspace, C_OUTPUT);
struct sway_container *output = container_parent(workspace, C_OUTPUT);
arrange_windows(output, -1, -1);
return true;
}