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

Fullscreen fixes.

Browse Source
This commit is contained in:
Ryan Dwyer 2018-04-18 00:10:32 +10:00
parent cc4da245a8
commit 72beae209b
6 changed files with 170 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sway/tree/view.h
View File

@ -112,6 +112,7 @@ struct sway_wl_shell_view {
struct wl_listener request_resize; struct wl_listener request_resize;
struct wl_listener request_maximize; struct wl_listener request_maximize;
struct wl_listener request_fullscreen; struct wl_listener request_fullscreen;
struct wl_listener set_state;
struct wl_listener destroy; struct wl_listener destroy;
int pending_width, pending_height; int pending_width, pending_height;

7
sway/commands/fullscreen.c
View File

@ -6,8 +6,11 @@
#include "sway/tree/view.h" #include "sway/tree/view.h"
#include "sway/tree/layout.h" #include "sway/tree/layout.h"
// fullscreen toggle|enable|disable
struct cmd_results *cmd_fullscreen(int argc, char **argv) { struct cmd_results *cmd_fullscreen(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "fullscreen", EXPECTED_LESS_THAN, 2))) {
return error;
}
struct sway_container *container = struct sway_container *container =
config->handler_context.current_container; config->handler_context.current_container;
if (container->type != C_VIEW) { if (container->type != C_VIEW) {
@ -25,7 +28,7 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) {
wants_fullscreen = false; wants_fullscreen = false;
} else { } else {
return cmd_results_new(CMD_INVALID, "fullscreen", return cmd_results_new(CMD_INVALID, "fullscreen",
"Expected 'fullscreen' or fullscreen <enable|disable|toggle>'"); "Expected 'fullscreen' or 'fullscreen <enable|disable|toggle>'");
} }
view_set_fullscreen(view, wants_fullscreen); view_set_fullscreen(view, wants_fullscreen);

31
sway/desktop/wl_shell.c
View File

@ -61,14 +61,21 @@ static void destroy(struct sway_view *view) {
} }
wl_list_remove(&wl_shell_view->commit.link); wl_list_remove(&wl_shell_view->commit.link);
wl_list_remove(&wl_shell_view->destroy.link); wl_list_remove(&wl_shell_view->destroy.link);
wl_list_remove(&wl_shell_view->request_fullscreen.link);
wl_list_remove(&wl_shell_view->set_state.link);
free(wl_shell_view); free(wl_shell_view);
} }
static void set_fullscreen(struct sway_view *view, bool fullscreen) {
// TODO
}
static const struct sway_view_impl view_impl = { static const struct sway_view_impl view_impl = {
.get_prop = get_prop, .get_prop = get_prop,
.configure = configure, .configure = configure,
.close = _close, .close = _close,
.destroy = destroy, .destroy = destroy,
.set_fullscreen = set_fullscreen,
}; };
static void handle_commit(struct wl_listener *listener, void *data) { static void handle_commit(struct wl_listener *listener, void *data) {
@ -88,6 +95,23 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
view_destroy(&wl_shell_view->view); view_destroy(&wl_shell_view->view);
} }
static void handle_request_fullscreen(struct wl_listener *listener, void *data) {
struct sway_wl_shell_view *wl_shell_view =
wl_container_of(listener, wl_shell_view, request_fullscreen);
view_set_fullscreen(&wl_shell_view->view, true);
}
static void handle_set_state(struct wl_listener *listener, void *data) {
struct sway_wl_shell_view *wl_shell_view =
wl_container_of(listener, wl_shell_view, set_state);
struct sway_view *view = &wl_shell_view->view;
struct wlr_wl_shell_surface *surface = view->wlr_wl_shell_surface;
if (view->is_fullscreen &&
surface->state != WLR_WL_SHELL_SURFACE_STATE_FULLSCREEN) {
view_set_fullscreen(view, false);
}
}
void handle_wl_shell_surface(struct wl_listener *listener, void *data) { void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
struct sway_server *server = wl_container_of(listener, server, struct sway_server *server = wl_container_of(listener, server,
wl_shell_surface); wl_shell_surface);
@ -127,6 +151,13 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
wl_shell_view->destroy.notify = handle_destroy; wl_shell_view->destroy.notify = handle_destroy;
wl_signal_add(&shell_surface->events.destroy, &wl_shell_view->destroy); wl_signal_add(&shell_surface->events.destroy, &wl_shell_view->destroy);
wl_shell_view->request_fullscreen.notify = handle_request_fullscreen;
wl_signal_add(&shell_surface->events.request_fullscreen,
&wl_shell_view->request_fullscreen);
wl_shell_view->set_state.notify = handle_set_state;
wl_signal_add(&shell_surface->events.set_state, &wl_shell_view->set_state);
view_map(&wl_shell_view->view, shell_surface->surface); view_map(&wl_shell_view->view, shell_surface->surface);
if (shell_surface->state == WLR_WL_SHELL_SURFACE_STATE_FULLSCREEN) { if (shell_surface->state == WLR_WL_SHELL_SURFACE_STATE_FULLSCREEN) {

4
sway/desktop/xdg_shell_v6.c
View File

@ -229,7 +229,9 @@ static void handle_request_fullscreen(struct wl_listener *listener, void *data)
wl_container_of(listener, xdg_shell_v6_view, request_fullscreen); wl_container_of(listener, xdg_shell_v6_view, request_fullscreen);
struct wlr_xdg_toplevel_v6_set_fullscreen_event *e = data; struct wlr_xdg_toplevel_v6_set_fullscreen_event *e = data;
if (xdg_shell_v6_view->view.wlr_xdg_surface_v6->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) { if (!sway_assert(xdg_shell_v6_view->view.wlr_xdg_surface_v6->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL,
"xdg_shell_v6 requested fullscreen of surface with role %i",
xdg_shell_v6_view->view.wlr_xdg_surface_v6->role)) {
return; return;
} }

124
sway/tree/layout.c
View File

@ -82,6 +82,37 @@ static int index_child(const struct sway_container *child) {
return i; return i;
} }
static void container_handle_fullscreen_reparent(struct sway_container *viewcon,
struct sway_container *old_parent) {
if (viewcon->type != C_VIEW || !viewcon->sway_view->is_fullscreen) {
return;
}
struct sway_view *view = viewcon->sway_view;
struct sway_container *old_workspace = old_parent;
if (old_workspace && old_workspace->type != C_WORKSPACE) {
old_workspace = container_parent(old_workspace, C_WORKSPACE);
}
struct sway_container *new_workspace = container_parent(view->swayc,
C_WORKSPACE);
if (old_workspace == new_workspace) {
return;
}
// Unmark the old workspace as fullscreen
if (old_workspace) {
old_workspace->sway_workspace->fullscreen = NULL;
}
// Mark the new workspace as fullscreen
if (new_workspace->sway_workspace->fullscreen) {
view_set_fullscreen(new_workspace->sway_workspace->fullscreen, false);
}
new_workspace->sway_workspace->fullscreen = view;
// Resize view to new output dimensions
struct sway_output *output = new_workspace->parent->sway_output;
view_configure(view, 0, 0,
output->wlr_output->width, output->wlr_output->height);
}
void container_insert_child(struct sway_container *parent, void container_insert_child(struct sway_container *parent,
struct sway_container *child, int i) { struct sway_container *child, int i) {
struct sway_container *old_parent = child->parent; struct sway_container *old_parent = child->parent;
@ -91,6 +122,7 @@ void container_insert_child(struct sway_container *parent,
wlr_log(L_DEBUG, "Inserting id:%zd at index %d", child->id, i); wlr_log(L_DEBUG, "Inserting id:%zd at index %d", child->id, i);
list_insert(parent->children, i, child); list_insert(parent->children, i, child);
child->parent = parent; child->parent = parent;
container_handle_fullscreen_reparent(child, old_parent);
wl_signal_emit(&child->events.reparent, old_parent); wl_signal_emit(&child->events.reparent, old_parent);
} }
@ -106,6 +138,7 @@ struct sway_container *container_add_sibling(struct sway_container *fixed,
int i = index_child(fixed); int i = index_child(fixed);
list_insert(parent->children, i + 1, active); list_insert(parent->children, i + 1, active);
active->parent = parent; active->parent = parent;
container_handle_fullscreen_reparent(active, old_parent);
wl_signal_emit(&active->events.reparent, old_parent); wl_signal_emit(&active->events.reparent, old_parent);
return active->parent; return active->parent;
} }
@ -115,11 +148,18 @@ void container_add_child(struct sway_container *parent,
wlr_log(L_DEBUG, "Adding %p (%d, %fx%f) to %p (%d, %fx%f)", wlr_log(L_DEBUG, "Adding %p (%d, %fx%f) to %p (%d, %fx%f)",
child, child->type, child->width, child->height, child, child->type, child->width, child->height,
parent, parent->type, parent->width, parent->height); parent, parent->type, parent->width, parent->height);
struct sway_container *old_parent = child->parent;
list_add(parent->children, child); list_add(parent->children, child);
container_handle_fullscreen_reparent(child, old_parent);
child->parent = parent; child->parent = parent;
} }
struct sway_container *container_remove_child(struct sway_container *child) { struct sway_container *container_remove_child(struct sway_container *child) {
if (child->type == C_VIEW && child->sway_view->is_fullscreen) {
struct sway_container *workspace = container_parent(child, C_WORKSPACE);
workspace->sway_workspace->fullscreen = NULL;
}
struct sway_container *parent = child->parent; struct sway_container *parent = child->parent;
for (int i = 0; i < parent->children->length; ++i) { for (int i = 0; i < parent->children->length; ++i) {
if (parent->children->items[i] == child) { if (parent->children->items[i] == child) {
@ -137,21 +177,6 @@ void container_move_to(struct sway_container *container,
|| container_has_anscestor(container, destination)) { || container_has_anscestor(container, destination)) {
return; return;
} }
if (container->type == C_VIEW && container->sway_view->is_fullscreen) {
struct sway_container *old_workspace = container;
if (old_workspace->type != C_WORKSPACE) {
old_workspace = container_parent(old_workspace, C_WORKSPACE);
}
struct sway_container *new_workspace = destination;
if (new_workspace->type != C_WORKSPACE) {
new_workspace = container_parent(new_workspace, C_WORKSPACE);
}
if (old_workspace != new_workspace) {
view_set_fullscreen(container->sway_view, false);
}
}
struct sway_container *old_parent = container_remove_child(container); struct sway_container *old_parent = container_remove_child(container);
container->width = container->height = 0; container->width = container->height = 0;
struct sway_container *new_parent; struct sway_container *new_parent;
@ -179,6 +204,26 @@ void container_move_to(struct sway_container *container,
arrange_windows(old_parent, -1, -1); arrange_windows(old_parent, -1, -1);
} }
arrange_windows(new_parent, -1, -1); arrange_windows(new_parent, -1, -1);
// If view was moved to a fullscreen workspace, refocus the fullscreen view
struct sway_container *new_workspace = container;
if (new_workspace->type != C_WORKSPACE) {
new_workspace = container_parent(new_workspace, C_WORKSPACE);
}
if (new_workspace->sway_workspace->fullscreen) {
struct sway_seat *seat;
struct sway_container *focus, *focus_ws;
wl_list_for_each(seat, &input_manager->seats, link) {
focus = seat_get_focus(seat);
focus_ws = focus;
if (focus_ws->type != C_WORKSPACE) {
focus_ws = container_parent(focus_ws, C_WORKSPACE);
}
seat_set_focus(seat, new_workspace->sway_workspace->fullscreen->swayc);
if (focus_ws != new_workspace) {
seat_set_focus(seat, focus);
}
}
}
} }
static bool sway_dir_to_wlr(enum movement_direction dir, static bool sway_dir_to_wlr(enum movement_direction dir,
@ -283,6 +328,11 @@ void container_move(struct sway_container *container,
struct sway_container *current = container; struct sway_container *current = container;
struct sway_container *parent = current->parent; struct sway_container *parent = current->parent;
// If moving a fullscreen view, only consider outputs
if (container->type == C_VIEW && container->sway_view->is_fullscreen) {
current = container_parent(container, C_OUTPUT);
}
if (parent != container_flatten(parent)) { if (parent != container_flatten(parent)) {
// Special case: we were the last one in this container, so flatten it // Special case: we were the last one in this container, so flatten it
// and leave // and leave
@ -546,6 +596,14 @@ void arrange_windows(struct sway_container *container,
container->name, container->width, container->height, container->x, container->name, container->width, container->height, container->x,
container->y); container->y);
if (container->type == C_WORKSPACE
&& container->sway_workspace->fullscreen) {
struct wlr_output *wlr_output
= container->parent->sway_output->wlr_output;
view_configure(container->sway_workspace->fullscreen, 0, 0,
wlr_output->width, wlr_output->height);
}
double x = 0, y = 0; double x = 0, y = 0;
switch (container->type) { switch (container->type) {
case C_ROOT: case C_ROOT:
@ -831,14 +889,21 @@ static struct sway_container *sway_output_from_wlr(struct wlr_output *output) {
return NULL; return NULL;
} }
struct sway_container *container_get_in_direction( static struct sway_container *container_get_in_direction_naive(
struct sway_container *container, struct sway_seat *seat, struct sway_container *container, struct sway_seat *seat,
enum movement_direction dir) { enum movement_direction dir) {
struct sway_container *parent = container->parent;
if (container->type == C_VIEW && container->sway_view->is_fullscreen) {
if (dir == MOVE_PARENT || dir == MOVE_CHILD) {
return NULL;
}
container = container_parent(container, C_OUTPUT);
parent = container->parent;
} else {
if (dir == MOVE_CHILD) { if (dir == MOVE_CHILD) {
return seat_get_focus_inactive(seat, container); return seat_get_focus_inactive(seat, container);
} }
struct sway_container *parent = container->parent;
if (dir == MOVE_PARENT) { if (dir == MOVE_PARENT) {
if (parent->type == C_OUTPUT) { if (parent->type == C_OUTPUT) {
return NULL; return NULL;
@ -846,6 +911,7 @@ struct sway_container *container_get_in_direction(
return parent; return parent;
} }
} }
}
struct sway_container *wrap_candidate = NULL; struct sway_container *wrap_candidate = NULL;
while (true) { while (true) {
@ -932,6 +998,28 @@ struct sway_container *container_get_in_direction(
} }
} }
struct sway_container *container_get_in_direction(
struct sway_container *container, struct sway_seat *seat,
enum movement_direction dir) {
struct sway_container *result = container_get_in_direction_naive(container,
seat, dir);
if (!result) {
return NULL;
}
struct sway_container *old_workspace = container;
if (old_workspace->type != C_WORKSPACE) {
old_workspace = container_parent(old_workspace, C_WORKSPACE);
}
struct sway_container *new_workspace = result;
if (new_workspace->type != C_WORKSPACE) {
new_workspace = container_parent(new_workspace, C_WORKSPACE);
}
if (old_workspace != new_workspace && new_workspace->sway_workspace->fullscreen) {
result = new_workspace->sway_workspace->fullscreen->swayc;
}
return result;
}
struct sway_container *container_replace_child(struct sway_container *child, struct sway_container *container_replace_child(struct sway_container *child,
struct sway_container *new_child) { struct sway_container *new_child) {
struct sway_container *parent = child->parent; struct sway_container *parent = child->parent;

20
sway/tree/view.c
View File

@ -91,13 +91,29 @@ void view_set_fullscreen(struct sway_view *view, bool fullscreen) {
view->is_fullscreen = fullscreen; view->is_fullscreen = fullscreen;
if (fullscreen) { if (fullscreen) {
if (workspace->sway_workspace->fullscreen) {
view_set_fullscreen(workspace->sway_workspace->fullscreen, false);
}
workspace->sway_workspace->fullscreen = view; workspace->sway_workspace->fullscreen = view;
view_configure(view, 0, 0, output->wlr_output->width, output->wlr_output->height);
struct sway_seat *seat;
struct sway_container *focus, *focus_ws;
wl_list_for_each(seat, &input_manager->seats, link) {
focus = seat_get_focus(seat);
focus_ws = focus;
if (focus_ws->type != C_WORKSPACE) {
focus_ws = container_parent(focus_ws, C_WORKSPACE);
}
seat_set_focus(seat, view->swayc);
if (focus_ws != workspace) {
seat_set_focus(seat, focus);
}
}
} else { } else {
workspace->sway_workspace->fullscreen = NULL; workspace->sway_workspace->fullscreen = NULL;
arrange_windows(workspace, -1, -1);
} }
arrange_windows(workspace, -1, -1);
output_damage_whole(output); output_damage_whole(output);
ipc_event_window(view->swayc, "fullscreen_mode"); ipc_event_window(view->swayc, "fullscreen_mode");