mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-21 06:46:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

more renaming things

Browse source
This commit is contained in:
Tony Crisci 2018-03-29 17:06:29 -04:00
parent b90099b4b7
commit eca029f218
16 changed files with 115 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sway/desktop/layer_shell.c
View file

@ -172,7 +172,7 @@ void arrange_layers(struct sway_output *output) {
if (memcmp(&usable_area_before,
&usable_area, sizeof(struct wlr_box)) != 0) {
wlr_log(L_DEBUG, "arrange");
arrange_windows(output->swayc, -1, -1);
container_arrange_windows(output->swayc, -1, -1);
}
// Arrange non-exlusive surfaces from top->bottom

12
sway/desktop/output.c
View file

@ -221,13 +221,13 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
struct sway_container *focus = sway_seat_get_focus_inactive(seat, soutput->swayc);
struct sway_container *workspace = (focus->type == C_WORKSPACE ?
focus :
sway_container_parent(focus, C_WORKSPACE));
container_parent(focus, C_WORKSPACE));
struct render_data rdata = {
.output = soutput,
.now = &now,
};
sway_container_descendents(workspace, C_VIEW, output_frame_view, &rdata);
container_descendents(workspace, C_VIEW, output_frame_view, &rdata);
// render unmanaged views on top
struct sway_view *view;
@ -258,13 +258,13 @@ 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);
sway_container_output_destroy(output->swayc);
container_output_destroy(output->swayc);
}
static void handle_output_mode(struct wl_listener *listener, void *data) {
struct sway_output *output = wl_container_of(listener, output, mode);
arrange_layers(output);
arrange_windows(output->swayc, -1, -1);
container_arrange_windows(output->swayc, -1, -1);
}
void handle_new_output(struct wl_listener *listener, void *data) {
@ -286,7 +286,7 @@ void handle_new_output(struct wl_listener *listener, void *data) {
wlr_output_set_mode(wlr_output, mode);
}
output->swayc = sway_container_output_create(output);
output->swayc = container_output_create(output);
if (!output->swayc) {
free(output);
return;
@ -307,5 +307,5 @@ void handle_new_output(struct wl_listener *listener, void *data) {
output->mode.notify = handle_output_mode;
arrange_layers(output);
arrange_windows(&root_container, -1, -1);
container_arrange_windows(&root_container, -1, -1);
}

8
sway/desktop/wl_shell.c
View file

@ -74,10 +74,10 @@ 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);
struct sway_container *parent = sway_container_view_destroy(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);
container_arrange_windows(parent, -1, -1);
}
void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
@ -133,9 +133,9 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container);
struct sway_container *cont = sway_container_view_create(focus, sway_view);
struct sway_container *cont = container_view_create(focus, sway_view);
sway_view->swayc = cont;
arrange_windows(cont->parent, -1, -1);
container_arrange_windows(cont->parent, -1, -1);
sway_input_manager_set_focus(input_manager, cont);
}

8
sway/desktop/xdg_shell_v6.c
View file

@ -83,10 +83,10 @@ 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);
struct sway_container *parent = sway_container_view_destroy(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);
container_arrange_windows(parent, -1, -1);
}
void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
@ -137,10 +137,10 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container);
struct sway_container *cont = sway_container_view_create(focus, sway_view);
struct sway_container *cont = container_view_create(focus, sway_view);
sway_view->swayc = cont;
arrange_windows(cont->parent, -1, -1);
container_arrange_windows(cont->parent, -1, -1);
sway_input_manager_set_focus(input_manager, cont);
}

22
sway/desktop/xwayland.c
View file

@ -49,11 +49,11 @@ static void set_position(struct sway_view *view, double ox, double oy) {
if (!assert_xwayland(view)) {
return;
}
struct sway_container *output = sway_container_parent(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;
}
struct sway_container *root = sway_container_parent(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,9 +114,9 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
}
}
struct sway_container *parent = sway_container_view_destroy(sway_surface->view->swayc);
struct sway_container *parent = container_view_destroy(sway_surface->view->swayc);
if (parent) {
arrange_windows(parent, -1, -1);
container_arrange_windows(parent, -1, -1);
}
free(sway_surface->view);
@ -132,9 +132,9 @@ static void handle_unmap_notify(struct wl_listener *listener, void *data) {
}
// take it out of the tree
struct sway_container *parent = sway_container_view_destroy(sway_surface->view->swayc);
struct sway_container *parent = container_view_destroy(sway_surface->view->swayc);
if (parent) {
arrange_windows(parent, -1, -1);
container_arrange_windows(parent, -1, -1);
}
sway_surface->view->swayc = NULL;
@ -155,15 +155,15 @@ 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;
sway_container_view_destroy(view->swayc);
container_view_destroy(view->swayc);
struct sway_container *parent = root_container.children->items[0];
parent = parent->children->items[0]; // workspace
struct sway_container *cont = sway_container_view_create(parent, view);
struct sway_container *cont = container_view_create(parent, view);
view->swayc = cont;
arrange_windows(cont->parent, -1, -1);
container_arrange_windows(cont->parent, -1, -1);
sway_input_manager_set_focus(input_manager, cont);
}
}
@ -239,9 +239,9 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container);
struct sway_container *cont = sway_container_view_create(focus, sway_view);
struct sway_container *cont = container_view_create(focus, sway_view);
sway_view->swayc = cont;
arrange_windows(cont->parent, -1, -1);
container_arrange_windows(cont->parent, -1, -1);
sway_input_manager_set_focus(input_manager, cont);
}