From b04a9a248d4cf3d0e93e1b39ee9eedc9da359173 Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 20 Nov 2017 17:27:36 +0100 Subject: [PATCH 01/13] Initial fullscreen support --- include/rootston/view.h | 6 +++ include/wlr/types/wlr_output.h | 6 +++ include/wlr/types/wlr_xdg_shell_v6.h | 7 +++ rootston/desktop.c | 69 ++++++++++++++++++++++++--- rootston/output.c | 7 +++ rootston/wl_shell.c | 20 ++++++++ rootston/xdg_shell_v6.c | 29 ++++++++++++ types/wlr_output.c | 67 ++++++++++++++++++++++++++ types/wlr_xdg_shell_v6.c | 71 ++++++++++++++++------------ 9 files changed, 244 insertions(+), 38 deletions(-) diff --git a/include/rootston/view.h b/include/rootston/view.h index 69034d60..e1397b89 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -13,6 +13,7 @@ struct roots_wl_shell_surface { struct wl_listener request_move; struct wl_listener request_resize; struct wl_listener request_set_maximized; + struct wl_listener request_set_fullscreen; struct wl_listener set_state; struct wl_listener surface_commit; @@ -26,6 +27,7 @@ struct roots_xdg_surface_v6 { struct wl_listener request_move; struct wl_listener request_resize; struct wl_listener request_maximize; + struct wl_listener request_fullscreen; }; struct roots_xwayland_surface { @@ -54,6 +56,7 @@ struct roots_view { float rotation; bool maximized; + struct wlr_output *fullscreen_output; struct { double x, y; uint32_t width, height; @@ -93,6 +96,7 @@ struct roots_view { void (*move_resize)(struct roots_view *view, double x, double y, uint32_t width, uint32_t height); void (*maximize)(struct roots_view *view, bool maximized); + void (*set_fullscreen)(struct roots_view *view, bool fullscreen); void (*close)(struct roots_view *view); }; @@ -103,6 +107,8 @@ void view_resize(struct roots_view *view, uint32_t width, uint32_t height); void view_move_resize(struct roots_view *view, double x, double y, uint32_t width, uint32_t height); void view_maximize(struct roots_view *view, bool maximized); +void view_set_fullscreen(struct roots_view *view, bool fullscreen, + struct wlr_output *output); void view_close(struct roots_view *view); bool view_center(struct roots_view *view); void view_setup(struct roots_view *view); diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index cf000019..d382b593 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -64,6 +64,10 @@ struct wlr_output { struct wl_signal destroy; } events; + struct wlr_surface *fullscreen_surface; + struct wl_listener fullscreen_surface_commit; + struct wl_listener fullscreen_surface_destroy; + struct wl_list cursors; // wlr_output_cursor::link struct wlr_output_cursor *hardware_cursor; @@ -89,6 +93,8 @@ void wlr_output_swap_buffers(struct wlr_output *output); void wlr_output_set_gamma(struct wlr_output *output, uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b); uint32_t wlr_output_get_gamma_size(struct wlr_output *output); +void wlr_output_set_fullscreen_surface(struct wlr_output *output, + struct wlr_surface *surface); struct wlr_output_cursor *wlr_output_cursor_create(struct wlr_output *output); bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor, diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h index e3982003..7940deef 100644 --- a/include/wlr/types/wlr_xdg_shell_v6.h +++ b/include/wlr/types/wlr_xdg_shell_v6.h @@ -152,6 +152,13 @@ struct wlr_xdg_toplevel_v6_resize_event { uint32_t edges; }; +struct wlr_xdg_toplevel_v6_set_fullscreen_event { + struct wl_client *client; + struct wlr_xdg_surface_v6 *surface; + bool fullscreen; + struct wlr_output *output; +}; + struct wlr_xdg_toplevel_v6_show_window_menu_event { struct wl_client *client; struct wlr_xdg_surface_v6 *surface; diff --git a/rootston/desktop.c b/rootston/desktop.c index cf5a8cdc..be74b619 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -89,6 +89,19 @@ void view_move_resize(struct roots_view *view, double x, double y, view_resize(view, width, height); } +static struct wlr_output *view_get_output(struct roots_view *view) { + struct wlr_box view_box; + view_get_box(view, &view_box); + + double output_x, output_y; + wlr_output_layout_closest_point(view->desktop->layout, NULL, + view->x + (double)view_box.width/2, + view->y + (double)view_box.height/2, + &output_x, &output_y); + return wlr_output_layout_output_at(view->desktop->layout, output_x, + output_y); +} + void view_maximize(struct roots_view *view, bool maximized) { if (view->maximized == maximized) { return; @@ -109,13 +122,7 @@ void view_maximize(struct roots_view *view, bool maximized) { view->saved.width = view_box.width; view->saved.height = view_box.height; - double output_x, output_y; - wlr_output_layout_closest_point(view->desktop->layout, NULL, - view->x + (double)view_box.width/2, - view->y + (double)view_box.height/2, - &output_x, &output_y); - struct wlr_output *output = wlr_output_layout_output_at( - view->desktop->layout, output_x, output_y); + struct wlr_output *output = view_get_output(view); struct wlr_box *output_box = wlr_output_layout_get_box(view->desktop->layout, output); @@ -133,6 +140,54 @@ void view_maximize(struct roots_view *view, bool maximized) { } } +void view_set_fullscreen(struct roots_view *view, bool fullscreen, + struct wlr_output *output) { + bool was_fullscreen = view->fullscreen_output != NULL; + if (was_fullscreen == fullscreen) { + // TODO: support changing the output? + return; + } + + // TODO: check if client is focused? + + if (view->set_fullscreen) { + view->set_fullscreen(view, fullscreen); + } + + if (!was_fullscreen && fullscreen) { + if (output == NULL) { + output = view_get_output(view); + } + + struct wlr_box view_box; + view_get_box(view, &view_box); + + view->saved.x = view->x; + view->saved.y = view->y; + view->saved.rotation = view->rotation; + view->saved.width = view_box.width; + view->saved.height = view_box.height; + + struct wlr_box *output_box = + wlr_output_layout_get_box(view->desktop->layout, output); + view_move_resize(view, output_box->x, output_box->y, output_box->width, + output_box->height); + view->rotation = 0; + + wlr_output_set_fullscreen_surface(output, view->wlr_surface); + view->fullscreen_output = output; + } + + if (was_fullscreen && !fullscreen) { + view_move_resize(view, view->saved.x, view->saved.y, view->saved.width, + view->saved.height); + view->rotation = view->saved.rotation; + + wlr_output_set_fullscreen_surface(view->fullscreen_output, NULL); + view->fullscreen_output = NULL; + } +} + void view_close(struct roots_view *view) { if (view->close) { view->close(view); diff --git a/rootston/output.c b/rootston/output.c index 83ff37fd..35a5dac3 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -186,6 +186,13 @@ static void output_frame_notify(struct wl_listener *listener, void *data) { wlr_output_make_current(wlr_output); wlr_renderer_begin(server->renderer, wlr_output); + if (wlr_output->fullscreen_surface != NULL) { + wlr_renderer_end(server->renderer); + wlr_output_swap_buffers(wlr_output); + output->last_frame = desktop->last_frame = now; + return; + } + struct roots_view *view; wl_list_for_each_reverse(view, &desktop->views, link) { render_view(view, desktop, wlr_output, &now); diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c index 7359c878..f285d7f6 100644 --- a/rootston/wl_shell.c +++ b/rootston/wl_shell.c @@ -59,6 +59,17 @@ static void handle_request_set_maximized(struct wl_listener *listener, view_maximize(view, true); } +static void handle_request_set_fullscreen(struct wl_listener *listener, + void *data) { + struct roots_wl_shell_surface *roots_surface = + wl_container_of(listener, roots_surface, request_set_fullscreen); + struct roots_view *view = roots_surface->view; + struct wlr_wl_shell_surface_set_fullscreen_event *e = data; + + // TODO: support e->method, e->framerate + view_set_fullscreen(view, true, e->output); +} + static void handle_set_state(struct wl_listener *listener, void *data) { struct roots_wl_shell_surface *roots_surface = wl_container_of(listener, roots_surface, set_state); @@ -68,6 +79,10 @@ static void handle_set_state(struct wl_listener *listener, void *data) { surface->state != WLR_WL_SHELL_SURFACE_STATE_MAXIMIZED) { view_maximize(view, false); } + if (view->fullscreen_output != NULL && + surface->state != WLR_WL_SHELL_SURFACE_STATE_FULLSCREEN) { + view_set_fullscreen(view, false, NULL); + } } static void handle_surface_commit(struct wl_listener *listener, void *data) { @@ -81,6 +96,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) { wl_list_remove(&roots_surface->request_move.link); wl_list_remove(&roots_surface->request_resize.link); wl_list_remove(&roots_surface->request_set_maximized.link); + wl_list_remove(&roots_surface->request_set_fullscreen.link); wl_list_remove(&roots_surface->set_state.link); wl_list_remove(&roots_surface->surface_commit.link); view_destroy(roots_surface->view); @@ -111,6 +127,10 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) { roots_surface->request_set_maximized.notify = handle_request_set_maximized; wl_signal_add(&surface->events.request_set_maximized, &roots_surface->request_set_maximized); + roots_surface->request_set_fullscreen.notify = + handle_request_set_fullscreen; + wl_signal_add(&surface->events.request_set_fullscreen, + &roots_surface->request_set_fullscreen); roots_surface->set_state.notify = handle_set_state; wl_signal_add(&surface->events.set_state, &roots_surface->set_state); roots_surface->surface_commit.notify = handle_surface_commit; diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c index 656231c7..9017f7bd 100644 --- a/rootston/xdg_shell_v6.c +++ b/rootston/xdg_shell_v6.c @@ -100,6 +100,16 @@ static void maximize(struct roots_view *view, bool maximized) { wlr_xdg_toplevel_v6_set_maximized(surface, maximized); } +static void set_fullscreen(struct roots_view *view, bool fullscreen) { + assert(view->type == ROOTS_XDG_SHELL_V6_VIEW); + struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6; + if (surface->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) { + return; + } + + wlr_xdg_toplevel_v6_set_fullscreen(surface, fullscreen); +} + static void close(struct roots_view *view) { assert(view->type == ROOTS_XDG_SHELL_V6_VIEW); struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6; @@ -150,6 +160,21 @@ static void handle_request_maximize(struct wl_listener *listener, void *data) { view_maximize(view, surface->toplevel_state->next.maximized); } +static void handle_request_fullscreen(struct wl_listener *listener, + void *data) { + struct roots_xdg_surface_v6 *roots_xdg_surface = + wl_container_of(listener, roots_xdg_surface, request_fullscreen); + struct roots_view *view = roots_xdg_surface->view; + struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6; + struct wlr_xdg_toplevel_v6_set_fullscreen_event *e = data; + + if (surface->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) { + return; + } + + view_set_fullscreen(view, e->fullscreen, e->output); +} + static void handle_commit(struct wl_listener *listener, void *data) { //struct roots_xdg_surface_v6 *roots_xdg_surface = // wl_container_of(listener, roots_xdg_surface, commit); @@ -202,6 +227,9 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) { roots_surface->request_maximize.notify = handle_request_maximize; wl_signal_add(&surface->events.request_maximize, &roots_surface->request_maximize); + roots_surface->request_fullscreen.notify = handle_request_fullscreen; + wl_signal_add(&surface->events.request_fullscreen, + &roots_surface->request_fullscreen); struct roots_view *view = calloc(1, sizeof(struct roots_view)); if (!view) { @@ -217,6 +245,7 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) { view->resize = resize; view->move_resize = move_resize; view->maximize = maximize; + view->set_fullscreen = set_fullscreen; view->close = close; roots_surface->view = view; view_init(view, desktop); diff --git a/types/wlr_output.c b/types/wlr_output.c index 411dd404..5a8baa3d 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -252,6 +252,24 @@ void wlr_output_make_current(struct wlr_output *output) { output->impl->make_current(output); } +static void output_fullscreen_surface_render(struct wlr_output *output, + struct wlr_surface *surface) { + int x = (output->width - surface->current->width) / 2; + int y = (output->height - surface->current->height) / 2; + + glViewport(0, 0, output->width, output->height); + glClearColor(0, 0, 0, 0); + + if (!wlr_surface_has_buffer(surface)) { + return; + } + + float matrix[16]; + wlr_texture_get_matrix(surface->texture, &matrix, &output->transform_matrix, + x, y); + wlr_render_with_matrix(surface->renderer, surface->texture, &matrix); +} + static void output_cursor_get_box(struct wlr_output_cursor *cursor, struct wlr_box *box) { box->x = cursor->x - cursor->hotspot_x; @@ -308,6 +326,10 @@ static void output_cursor_render(struct wlr_output_cursor *cursor) { void wlr_output_swap_buffers(struct wlr_output *output) { wl_signal_emit(&output->events.swap_buffers, &output); + if (output->fullscreen_surface != NULL) { + output_fullscreen_surface_render(output, output->fullscreen_surface); + } + struct wlr_output_cursor *cursor; wl_list_for_each(cursor, &output->cursors, link) { if (!cursor->enabled || output->hardware_cursor == cursor) { @@ -334,6 +356,51 @@ uint32_t wlr_output_get_gamma_size(struct wlr_output *output) { return output->impl->get_gamma_size(output); } +static void output_fullscreen_surface_reset(struct wlr_output *output) { + if (output->fullscreen_surface != NULL) { + wl_list_remove(&output->fullscreen_surface_commit.link); + wl_list_remove(&output->fullscreen_surface_destroy.link); + output->fullscreen_surface = NULL; + output->needs_swap = true; + } +} + +static void output_fullscreen_surface_handle_commit( + struct wl_listener *listener, void *data) { + struct wlr_output *output = wl_container_of(listener, output, + fullscreen_surface_destroy); + output->needs_swap = true; +} + +static void output_fullscreen_surface_handle_destroy( + struct wl_listener *listener, void *data) { + struct wlr_output *output = wl_container_of(listener, output, + fullscreen_surface_destroy); + output_fullscreen_surface_reset(output); +} + +void wlr_output_set_fullscreen_surface(struct wlr_output *output, + struct wlr_surface *surface) { + // TODO: hardware fullscreen + output_fullscreen_surface_reset(output); + + output->fullscreen_surface = surface; + output->needs_swap = true; + + if (surface == NULL) { + return; + } + + output->fullscreen_surface_commit.notify = + output_fullscreen_surface_handle_commit; + wl_signal_add(&surface->events.commit, &output->fullscreen_surface_commit); + output->fullscreen_surface_destroy.notify = + output_fullscreen_surface_handle_destroy; + wl_signal_add(&surface->events.destroy, + &output->fullscreen_surface_destroy); +} + + static void output_cursor_reset(struct wlr_output_cursor *cursor) { if (cursor->output->hardware_cursor != cursor) { cursor->output->needs_swap = true; diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c index 429baa70..896a5f33 100644 --- a/types/wlr_xdg_shell_v6.c +++ b/types/wlr_xdg_shell_v6.c @@ -597,21 +597,14 @@ static void xdg_toplevel_protocol_move(struct wl_client *client, return; } - struct wlr_xdg_toplevel_v6_move_event *event = - calloc(1, sizeof(struct wlr_xdg_toplevel_v6_move_event)); - if (event == NULL) { - wl_client_post_no_memory(client); - return; - } - - event->client = client; - event->surface = surface; - event->seat = seat; - event->serial = serial; - - wl_signal_emit(&surface->events.request_move, event); + struct wlr_xdg_toplevel_v6_move_event event = { + .client = client, + .surface = surface, + .seat = seat, + .serial = serial, + }; - free(event); + wl_signal_emit(&surface->events.request_move, &event); } static void xdg_toplevel_protocol_resize(struct wl_client *client, @@ -628,22 +621,15 @@ static void xdg_toplevel_protocol_resize(struct wl_client *client, return; } - struct wlr_xdg_toplevel_v6_resize_event *event = - calloc(1, sizeof(struct wlr_xdg_toplevel_v6_resize_event)); - if (event == NULL) { - wl_client_post_no_memory(client); - return; - } - - event->client = client; - event->surface = surface; - event->seat = seat; - event->serial = serial; - event->edges = edges; - - wl_signal_emit(&surface->events.request_resize, event); + struct wlr_xdg_toplevel_v6_resize_event event = { + .client = client, + .surface = surface, + .seat = seat, + .serial = serial, + .edges = edges, + }; - free(event); + wl_signal_emit(&surface->events.request_resize, &event); } static void xdg_toplevel_protocol_set_max_size(struct wl_client *client, @@ -677,15 +663,38 @@ static void xdg_toplevel_protocol_unset_maximized(struct wl_client *client, static void xdg_toplevel_protocol_set_fullscreen(struct wl_client *client, struct wl_resource *resource, struct wl_resource *output_resource) { struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource); + + struct wlr_output *output = NULL; + if (output_resource != NULL) { + output = wl_resource_get_user_data(output_resource); + } + surface->toplevel_state->next.fullscreen = true; - wl_signal_emit(&surface->events.request_fullscreen, surface); + + struct wlr_xdg_toplevel_v6_set_fullscreen_event event = { + .client = client, + .surface = surface, + .fullscreen = true, + .output = output, + }; + + wl_signal_emit(&surface->events.request_fullscreen, &event); } static void xdg_toplevel_protocol_unset_fullscreen(struct wl_client *client, struct wl_resource *resource) { struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource); + surface->toplevel_state->next.fullscreen = false; - wl_signal_emit(&surface->events.request_fullscreen, surface); + + struct wlr_xdg_toplevel_v6_set_fullscreen_event event = { + .client = client, + .surface = surface, + .fullscreen = false, + .output = NULL, + }; + + wl_signal_emit(&surface->events.request_fullscreen, &event); } static void xdg_toplevel_protocol_set_minimized(struct wl_client *client, From 80998cdf57756fe46d55921c98a745aff4848215 Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 20 Nov 2017 17:58:26 +0100 Subject: [PATCH 02/13] Add support for fullscreen xwayland views --- include/rootston/view.h | 1 + rootston/xwayland.c | 21 +++++++++++++++++++++ types/wlr_output.c | 4 ++++ 3 files changed, 26 insertions(+) diff --git a/include/rootston/view.h b/include/rootston/view.h index e1397b89..77bbfbec 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -38,6 +38,7 @@ struct roots_xwayland_surface { struct wl_listener request_move; struct wl_listener request_resize; struct wl_listener request_maximize; + struct wl_listener request_fullscreen; struct wl_listener map_notify; struct wl_listener unmap_notify; }; diff --git a/rootston/xwayland.c b/rootston/xwayland.c index c92c424b..5e27afed 100644 --- a/rootston/xwayland.c +++ b/rootston/xwayland.c @@ -92,6 +92,13 @@ static void maximize(struct roots_view *view, bool maximized) { view->xwayland_surface, maximized); } +static void set_fullscreen(struct roots_view *view, bool fullscreen) { + assert(view->type == ROOTS_XWAYLAND_VIEW); + + wlr_xwayland_surface_set_fullscreen(view->desktop->xwayland, + view->xwayland_surface, fullscreen); +} + static void handle_destroy(struct wl_listener *listener, void *data) { struct roots_xwayland_surface *roots_surface = wl_container_of(listener, roots_surface, destroy); @@ -170,6 +177,16 @@ static void handle_request_maximize(struct wl_listener *listener, void *data) { view_maximize(view, maximized); } +static void handle_request_fullscreen(struct wl_listener *listener, + void *data) { + struct roots_xwayland_surface *roots_surface = + wl_container_of(listener, roots_surface, request_fullscreen); + struct roots_view *view = roots_surface->view; + struct wlr_xwayland_surface *xwayland_surface = view->xwayland_surface; + + view_set_fullscreen(view, xwayland_surface->fullscreen, NULL); +} + static void handle_map_notify(struct wl_listener *listener, void *data) { struct roots_xwayland_surface *roots_surface = wl_container_of(listener, roots_surface, map_notify); @@ -223,6 +240,9 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) { roots_surface->request_maximize.notify = handle_request_maximize; wl_signal_add(&surface->events.request_maximize, &roots_surface->request_maximize); + roots_surface->request_fullscreen.notify = handle_request_fullscreen; + wl_signal_add(&surface->events.request_fullscreen, + &roots_surface->request_fullscreen); struct roots_view *view = calloc(1, sizeof(struct roots_view)); if (view == NULL) { @@ -240,6 +260,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) { view->move = move; view->move_resize = move_resize; view->maximize = maximize; + view->set_fullscreen = set_fullscreen; view->close = close; roots_surface->view = view; view_init(view, desktop); diff --git a/types/wlr_output.c b/types/wlr_output.c index 5a8baa3d..3ef91179 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -382,6 +382,10 @@ static void output_fullscreen_surface_handle_destroy( void wlr_output_set_fullscreen_surface(struct wlr_output *output, struct wlr_surface *surface) { // TODO: hardware fullscreen + if (output->fullscreen_surface == surface) { + return; + } + output_fullscreen_surface_reset(output); output->fullscreen_surface = surface; From abab2902f5051bcde93b34b5a57bf9bae93b3bab Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 20 Nov 2017 19:45:10 +0100 Subject: [PATCH 03/13] Check for subsurfaces and popups before using wlr_output_set_fullscreen_surface --- include/rootston/desktop.h | 5 +++-- include/rootston/view.h | 2 +- rootston/desktop.c | 16 +++++++++++++--- rootston/output.c | 27 ++++++++++++++++++++++++++- 4 files changed, 43 insertions(+), 7 deletions(-) diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h index c245eb09..8bf1f6eb 100644 --- a/include/rootston/desktop.h +++ b/include/rootston/desktop.h @@ -19,13 +19,14 @@ struct roots_output { struct wlr_output *wlr_output; struct wl_listener frame; struct timespec last_frame; - struct wl_list link; + struct wl_list link; // roots_desktop:outputs + struct roots_view *fullscreen_view; }; struct roots_desktop { struct wl_list views; // roots_view::link - struct wl_list outputs; + struct wl_list outputs; // roots_output::link struct timespec last_frame; struct roots_server *server; diff --git a/include/rootston/view.h b/include/rootston/view.h index 77bbfbec..44a98115 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -57,7 +57,7 @@ struct roots_view { float rotation; bool maximized; - struct wlr_output *fullscreen_output; + struct roots_output *fullscreen_output; struct { double x, y; uint32_t width, height; diff --git a/rootston/desktop.c b/rootston/desktop.c index be74b619..b48da44b 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -174,8 +174,14 @@ void view_set_fullscreen(struct roots_view *view, bool fullscreen, output_box->height); view->rotation = 0; - wlr_output_set_fullscreen_surface(output, view->wlr_surface); - view->fullscreen_output = output; + struct roots_output *roots_output; + wl_list_for_each(roots_output, &view->desktop->outputs, link) { + if (roots_output->wlr_output == output) { + roots_output->fullscreen_view = view; + view->fullscreen_output = roots_output; + break; + } + } } if (was_fullscreen && !fullscreen) { @@ -183,7 +189,7 @@ void view_set_fullscreen(struct roots_view *view, bool fullscreen, view->saved.height); view->rotation = view->saved.rotation; - wlr_output_set_fullscreen_surface(view->fullscreen_output, NULL); + view->fullscreen_output->fullscreen_view = NULL; view->fullscreen_output = NULL; } } @@ -236,6 +242,10 @@ bool view_center(struct roots_view *view) { void view_destroy(struct roots_view *view) { wl_signal_emit(&view->events.destroy, view); + if (view->fullscreen_output) { + view->fullscreen_output->fullscreen_view = NULL; + } + wl_list_remove(&view->link); free(view); } diff --git a/rootston/output.c b/rootston/output.c index 35a5dac3..82618b06 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -174,6 +174,22 @@ static void render_view(struct roots_view *view, struct roots_desktop *desktop, } } +static bool has_standalone_surface(struct roots_view *view) { + if (!wl_list_empty(&view->wlr_surface->subsurface_list)) { + wlr_log(L_DEBUG, "has subsurfaces"); + return false; + } + + switch (view->type) { + case ROOTS_XDG_SHELL_V6_VIEW: + return wl_list_empty(&view->xdg_surface_v6->popups); + case ROOTS_WL_SHELL_VIEW: + return wl_list_empty(&view->wl_shell_surface->popups); + case ROOTS_XWAYLAND_VIEW: + return true; + } +} + static void output_frame_notify(struct wl_listener *listener, void *data) { struct wlr_output *wlr_output = data; struct roots_output *output = wl_container_of(listener, output, frame); @@ -186,11 +202,20 @@ static void output_frame_notify(struct wl_listener *listener, void *data) { wlr_output_make_current(wlr_output); wlr_renderer_begin(server->renderer, wlr_output); - if (wlr_output->fullscreen_surface != NULL) { + if (output->fullscreen_view != NULL) { + if (has_standalone_surface(output->fullscreen_view)) { + wlr_output_set_fullscreen_surface(wlr_output, + output->fullscreen_view->wlr_surface); + } else { + wlr_output_set_fullscreen_surface(wlr_output, NULL); + render_view(output->fullscreen_view, desktop, wlr_output, &now); + } wlr_renderer_end(server->renderer); wlr_output_swap_buffers(wlr_output); output->last_frame = desktop->last_frame = now; return; + } else { + wlr_output_set_fullscreen_surface(wlr_output, NULL); } struct roots_view *view; From bc68f269605ddd681b3ab968bdf80a72f3618982 Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 20 Nov 2017 19:52:47 +0100 Subject: [PATCH 04/13] Fix evince fullscreen under xwayland --- xwayland/xwm.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 36722591..cd0a98f5 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -1345,18 +1345,16 @@ struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland) { } void wlr_xwayland_surface_set_maximized(struct wlr_xwayland *wlr_xwayland, - struct wlr_xwayland_surface *surface, bool maximized) { - if (xsurface_is_maximized(surface) != maximized) { - surface->maximized_horz = maximized; - surface->maximized_vert = maximized; - xsurface_set_net_wm_state(surface); - } + struct wlr_xwayland_surface *surface, bool maximized) { + surface->maximized_horz = maximized; + surface->maximized_vert = maximized; + xsurface_set_net_wm_state(surface); + xcb_flush(surface->xwm->xcb_conn); } void wlr_xwayland_surface_set_fullscreen(struct wlr_xwayland *wlr_xwayland, - struct wlr_xwayland_surface *surface, bool fullscreen) { - if (surface->fullscreen != fullscreen) { - surface->fullscreen = fullscreen; - xsurface_set_net_wm_state(surface); - } + struct wlr_xwayland_surface *surface, bool fullscreen) { + surface->fullscreen = fullscreen; + xsurface_set_net_wm_state(surface); + xcb_flush(surface->xwm->xcb_conn); } From 54f1135c057e76b1c05058592a6878a07a524b99 Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 20 Nov 2017 20:53:13 +0100 Subject: [PATCH 05/13] Fix fullscreen in xdg-shell --- include/wlr/types/wlr_surface.h | 8 +++++-- rootston/output.c | 12 +--------- types/wlr_output.c | 39 ++++++++++++++++----------------- types/wlr_surface.c | 14 ++++++++++++ 4 files changed, 40 insertions(+), 33 deletions(-) diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h index cea53109..c8e3761a 100644 --- a/include/wlr/types/wlr_surface.h +++ b/include/wlr/types/wlr_surface.h @@ -1,9 +1,10 @@ #ifndef WLR_TYPES_WLR_SURFACE_H #define WLR_TYPES_WLR_SURFACE_H -#include -#include #include #include +#include +#include +#include #include struct wlr_frame_callback { @@ -142,4 +143,7 @@ void wlr_surface_send_enter(struct wlr_surface *surface, void wlr_surface_send_leave(struct wlr_surface *surface, struct wlr_output *output); +void wlr_surface_send_frame_done(struct wlr_surface *surface, + const struct timespec *when); + #endif diff --git a/rootston/output.c b/rootston/output.c index 82618b06..52db62f1 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -13,10 +13,6 @@ #include "rootston/desktop.h" #include "rootston/config.h" -static inline int64_t timespec_to_msec(const struct timespec *a) { - return (int64_t)a->tv_sec * 1000 + a->tv_nsec / 1000000; -} - /** * Rotate a child's position relative to a parent. The parent size is (pw, ph), * the child position is (*sx, *sy) and its size is (sw, sh). @@ -75,12 +71,7 @@ static void render_surface(struct wlr_surface *surface, wlr_render_with_matrix(desktop->server->renderer, surface->texture, &matrix); - struct wlr_frame_callback *cb, *cnext; - wl_list_for_each_safe(cb, cnext, - &surface->current->frame_callback_list, link) { - wl_callback_send_done(cb->resource, timespec_to_msec(when)); - wl_resource_destroy(cb->resource); - } + wlr_surface_send_frame_done(surface, when); } struct wlr_subsurface *subsurface; @@ -176,7 +167,6 @@ static void render_view(struct roots_view *view, struct roots_desktop *desktop, static bool has_standalone_surface(struct roots_view *view) { if (!wl_list_empty(&view->wlr_surface->subsurface_list)) { - wlr_log(L_DEBUG, "has subsurfaces"); return false; } diff --git a/types/wlr_output.c b/types/wlr_output.c index 3ef91179..8accf7a5 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -253,7 +253,7 @@ void wlr_output_make_current(struct wlr_output *output) { } static void output_fullscreen_surface_render(struct wlr_output *output, - struct wlr_surface *surface) { + struct wlr_surface *surface, const struct timespec *when) { int x = (output->width - surface->current->width) / 2; int y = (output->height - surface->current->height) / 2; @@ -268,6 +268,8 @@ static void output_fullscreen_surface_render(struct wlr_output *output, wlr_texture_get_matrix(surface->texture, &matrix, &output->transform_matrix, x, y); wlr_render_with_matrix(surface->renderer, surface->texture, &matrix); + + wlr_surface_send_frame_done(surface, when); } static void output_cursor_get_box(struct wlr_output_cursor *cursor, @@ -278,7 +280,8 @@ static void output_cursor_get_box(struct wlr_output_cursor *cursor, box->height = cursor->height; } -static void output_cursor_render(struct wlr_output_cursor *cursor) { +static void output_cursor_render(struct wlr_output_cursor *cursor, + const struct timespec *when) { struct wlr_texture *texture = cursor->texture; struct wlr_renderer *renderer = cursor->renderer; if (cursor->surface != NULL) { @@ -321,13 +324,21 @@ static void output_cursor_render(struct wlr_output_cursor *cursor) { wlr_texture_get_matrix(texture, &matrix, &cursor->output->transform_matrix, x, y); wlr_render_with_matrix(renderer, texture, &matrix); + + if (cursor->surface != NULL) { + wlr_surface_send_frame_done(cursor->surface, when); + } } void wlr_output_swap_buffers(struct wlr_output *output) { wl_signal_emit(&output->events.swap_buffers, &output); + struct timespec now; + clock_gettime(CLOCK_MONOTONIC, &now); + if (output->fullscreen_surface != NULL) { - output_fullscreen_surface_render(output, output->fullscreen_surface); + output_fullscreen_surface_render(output, output->fullscreen_surface, + &now); } struct wlr_output_cursor *cursor; @@ -335,7 +346,7 @@ void wlr_output_swap_buffers(struct wlr_output *output) { if (!cursor->enabled || output->hardware_cursor == cursor) { continue; } - output_cursor_render(cursor); + output_cursor_render(cursor, &now); } output->impl->swap_buffers(output); @@ -472,30 +483,18 @@ static void output_cursor_commit(struct wlr_output_cursor *cursor) { cursor->output->needs_swap = true; } else { // TODO: upload pixels - } -} -static inline int64_t timespec_to_msec(const struct timespec *a) { - return (int64_t)a->tv_sec * 1000 + a->tv_nsec / 1000000; + struct timespec now; + clock_gettime(CLOCK_MONOTONIC, &now); + wlr_surface_send_frame_done(cursor->surface, &now); + } } static void output_cursor_handle_commit(struct wl_listener *listener, void *data) { struct wlr_output_cursor *cursor = wl_container_of(listener, cursor, surface_commit); - struct wlr_surface *surface = data; - output_cursor_commit(cursor); - - struct timespec now; - clock_gettime(CLOCK_MONOTONIC, &now); - - struct wlr_frame_callback *cb, *cnext; - wl_list_for_each_safe(cb, cnext, &surface->current->frame_callback_list, - link) { - wl_callback_send_done(cb->resource, timespec_to_msec(&now)); - wl_resource_destroy(cb->resource); - } } static void output_cursor_handle_destroy(struct wl_listener *listener, diff --git a/types/wlr_surface.c b/types/wlr_surface.c index 8cc2aa33..ad0c6f68 100644 --- a/types/wlr_surface.c +++ b/types/wlr_surface.c @@ -929,3 +929,17 @@ void wlr_surface_send_leave(struct wlr_surface *surface, } } } + +static inline int64_t timespec_to_msec(const struct timespec *a) { + return (int64_t)a->tv_sec * 1000 + a->tv_nsec / 1000000; +} + +void wlr_surface_send_frame_done(struct wlr_surface *surface, + const struct timespec *when) { + struct wlr_frame_callback *cb, *cnext; + wl_list_for_each_safe(cb, cnext, &surface->current->frame_callback_list, + link) { + wl_callback_send_done(cb->resource, timespec_to_msec(when)); + wl_resource_destroy(cb->resource); + } +} From 5a8bbc62032ff1623cbee487bb15c3bb136094fc Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 20 Nov 2017 20:54:54 +0100 Subject: [PATCH 06/13] Fix GCC build --- rootston/output.c | 1 + 1 file changed, 1 insertion(+) diff --git a/rootston/output.c b/rootston/output.c index 52db62f1..d62c0b0d 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -178,6 +178,7 @@ static bool has_standalone_surface(struct roots_view *view) { case ROOTS_XWAYLAND_VIEW: return true; } + return true; } static void output_frame_notify(struct wl_listener *listener, void *data) { From a268f57ed5329e5b410267eb715e9ebeffa80e3f Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 20 Nov 2017 21:05:05 +0100 Subject: [PATCH 07/13] Forgot a call to glClear --- types/wlr_output.c | 1 + 1 file changed, 1 insertion(+) diff --git a/types/wlr_output.c b/types/wlr_output.c index 8accf7a5..41a3f794 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -259,6 +259,7 @@ static void output_fullscreen_surface_render(struct wlr_output *output, glViewport(0, 0, output->width, output->height); glClearColor(0, 0, 0, 0); + glClear(GL_COLOR_BUFFER_BIT); if (!wlr_surface_has_buffer(surface)) { return; From 17d9e2ce3508d21ccdc9907b02d127b47a4a21bb Mon Sep 17 00:00:00 2001 From: emersion Date: Tue, 21 Nov 2017 09:50:00 +0100 Subject: [PATCH 08/13] Unify view events naming, remove client from event structs --- include/rootston/view.h | 4 +- include/wlr/types/wlr_wl_shell.h | 10 +--- include/wlr/types/wlr_xdg_shell_v6.h | 7 +-- rootston/wl_shell.c | 30 +++++----- types/wlr_wl_shell.c | 87 +++++++++------------------- types/wlr_xdg_shell_v6.c | 28 +++------ 6 files changed, 55 insertions(+), 111 deletions(-) diff --git a/include/rootston/view.h b/include/rootston/view.h index 44a98115..5901f0a5 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -12,8 +12,8 @@ struct roots_wl_shell_surface { struct wl_listener destroy; struct wl_listener request_move; struct wl_listener request_resize; - struct wl_listener request_set_maximized; - struct wl_listener request_set_fullscreen; + struct wl_listener request_maximize; + struct wl_listener request_fullscreen; struct wl_listener set_state; struct wl_listener surface_commit; diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h index 24936a34..ec087693 100644 --- a/include/wlr/types/wlr_wl_shell.h +++ b/include/wlr/types/wlr_wl_shell.h @@ -81,8 +81,8 @@ struct wlr_wl_shell_surface { struct wl_signal request_move; struct wl_signal request_resize; - struct wl_signal request_set_fullscreen; - struct wl_signal request_set_maximized; + struct wl_signal request_fullscreen; + struct wl_signal request_maximize; struct wl_signal set_state; struct wl_signal set_title; @@ -93,14 +93,12 @@ struct wlr_wl_shell_surface { }; struct wlr_wl_shell_surface_move_event { - struct wl_client *client; struct wlr_wl_shell_surface *surface; struct wlr_seat_client *seat; uint32_t serial; }; struct wlr_wl_shell_surface_resize_event { - struct wl_client *client; struct wlr_wl_shell_surface *surface; struct wlr_seat_client *seat; uint32_t serial; @@ -108,15 +106,13 @@ struct wlr_wl_shell_surface_resize_event { }; struct wlr_wl_shell_surface_set_fullscreen_event { - struct wl_client *client; struct wlr_wl_shell_surface *surface; enum wl_shell_surface_fullscreen_method method; uint32_t framerate; struct wlr_output *output; }; -struct wlr_wl_shell_surface_set_maximized_event { - struct wl_client *client; +struct wlr_wl_shell_surface_maximize_event { struct wlr_wl_shell_surface *surface; struct wlr_output *output; }; diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h index 7940deef..7e89ec74 100644 --- a/include/wlr/types/wlr_xdg_shell_v6.h +++ b/include/wlr/types/wlr_xdg_shell_v6.h @@ -138,14 +138,12 @@ struct wlr_xdg_surface_v6 { }; struct wlr_xdg_toplevel_v6_move_event { - struct wl_client *client; struct wlr_xdg_surface_v6 *surface; struct wlr_seat_client *seat; uint32_t serial; }; struct wlr_xdg_toplevel_v6_resize_event { - struct wl_client *client; struct wlr_xdg_surface_v6 *surface; struct wlr_seat_client *seat; uint32_t serial; @@ -153,19 +151,16 @@ struct wlr_xdg_toplevel_v6_resize_event { }; struct wlr_xdg_toplevel_v6_set_fullscreen_event { - struct wl_client *client; struct wlr_xdg_surface_v6 *surface; bool fullscreen; struct wlr_output *output; }; struct wlr_xdg_toplevel_v6_show_window_menu_event { - struct wl_client *client; struct wlr_xdg_surface_v6 *surface; struct wlr_seat_client *seat; uint32_t serial; - uint32_t x; - uint32_t y; + uint32_t x, y; }; struct wlr_xdg_shell_v6 *wlr_xdg_shell_v6_create(struct wl_display *display); diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c index e69f2dd9..ce568355 100644 --- a/rootston/wl_shell.c +++ b/rootston/wl_shell.c @@ -50,23 +50,21 @@ static void handle_request_resize(struct wl_listener *listener, void *data) { roots_seat_begin_resize(seat, view, e->edges); } -static void handle_request_set_maximized(struct wl_listener *listener, +static void handle_request_maximize(struct wl_listener *listener, void *data) { struct roots_wl_shell_surface *roots_surface = - wl_container_of(listener, roots_surface, request_set_maximized); + wl_container_of(listener, roots_surface, request_maximize); struct roots_view *view = roots_surface->view; - //struct wlr_wl_shell_surface_set_maximized_event *e = data; + //struct wlr_wl_shell_surface_maximize_event *e = data; view_maximize(view, true); } -static void handle_request_set_fullscreen(struct wl_listener *listener, +static void handle_request_fullscreen(struct wl_listener *listener, void *data) { struct roots_wl_shell_surface *roots_surface = - wl_container_of(listener, roots_surface, request_set_fullscreen); + wl_container_of(listener, roots_surface, request_fullscreen); struct roots_view *view = roots_surface->view; struct wlr_wl_shell_surface_set_fullscreen_event *e = data; - - // TODO: support e->method, e->framerate view_set_fullscreen(view, true, e->output); } @@ -95,8 +93,8 @@ static void handle_destroy(struct wl_listener *listener, void *data) { wl_list_remove(&roots_surface->destroy.link); wl_list_remove(&roots_surface->request_move.link); wl_list_remove(&roots_surface->request_resize.link); - wl_list_remove(&roots_surface->request_set_maximized.link); - wl_list_remove(&roots_surface->request_set_fullscreen.link); + wl_list_remove(&roots_surface->request_maximize.link); + wl_list_remove(&roots_surface->request_fullscreen.link); wl_list_remove(&roots_surface->set_state.link); wl_list_remove(&roots_surface->surface_commit.link); wl_list_remove(&roots_surface->view->link); @@ -125,13 +123,13 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) { roots_surface->request_resize.notify = handle_request_resize; wl_signal_add(&surface->events.request_resize, &roots_surface->request_resize); - roots_surface->request_set_maximized.notify = handle_request_set_maximized; - wl_signal_add(&surface->events.request_set_maximized, - &roots_surface->request_set_maximized); - roots_surface->request_set_fullscreen.notify = - handle_request_set_fullscreen; - wl_signal_add(&surface->events.request_set_fullscreen, - &roots_surface->request_set_fullscreen); + roots_surface->request_maximize.notify = handle_request_maximize; + wl_signal_add(&surface->events.request_maximize, + &roots_surface->request_maximize); + roots_surface->request_fullscreen.notify = + handle_request_fullscreen; + wl_signal_add(&surface->events.request_fullscreen, + &roots_surface->request_fullscreen); roots_surface->set_state.notify = handle_set_state; wl_signal_add(&surface->events.set_state, &roots_surface->set_state); roots_surface->surface_commit.notify = handle_surface_commit; diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index abe967d7..6174c872 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -108,25 +108,17 @@ static void shell_surface_protocol_pong(struct wl_client *client, static void shell_surface_protocol_move(struct wl_client *client, struct wl_resource *resource, struct wl_resource *seat_resource, uint32_t serial) { - wlr_log(L_DEBUG, "got shell surface move"); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); struct wlr_seat_client *seat = wl_resource_get_user_data(seat_resource); - struct wlr_wl_shell_surface_move_event *event = - calloc(1, sizeof(struct wlr_wl_shell_surface_move_event)); - if (event == NULL) { - wl_client_post_no_memory(client); - return; - } - event->client = client; - event->surface = surface; - event->seat = seat; - event->serial = serial; + struct wlr_wl_shell_surface_move_event event = { + .surface = surface, + .seat = seat, + .serial = serial, + }; - wl_signal_emit(&surface->events.request_move, event); - - free(event); + wl_signal_emit(&surface->events.request_move, &event); } static struct wlr_wl_shell_popup_grab *shell_popup_grab_from_seat( @@ -174,26 +166,18 @@ static void shell_surface_destroy_popup_state( static void shell_surface_protocol_resize(struct wl_client *client, struct wl_resource *resource, struct wl_resource *seat_resource, uint32_t serial, enum wl_shell_surface_resize edges) { - wlr_log(L_DEBUG, "got shell surface resize"); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); struct wlr_seat_client *seat = wl_resource_get_user_data(seat_resource); - struct wlr_wl_shell_surface_resize_event *event = - calloc(1, sizeof(struct wlr_wl_shell_surface_resize_event)); - if (event == NULL) { - wl_client_post_no_memory(client); - return; - } - event->client = client; - event->surface = surface; - event->seat = seat; - event->serial = serial; - event->edges = edges; + struct wlr_wl_shell_surface_resize_event event = { + .surface = surface, + .seat = seat, + .serial = serial, + .edges = edges, + }; - wl_signal_emit(&surface->events.request_resize, event); - - free(event); + wl_signal_emit(&surface->events.request_resize, &event); } static void shell_surface_set_state(struct wlr_wl_shell_surface *surface, @@ -279,7 +263,6 @@ static void shell_surface_protocol_set_fullscreen(struct wl_client *client, struct wl_resource *resource, enum wl_shell_surface_fullscreen_method method, uint32_t framerate, struct wl_resource *output_resource) { - wlr_log(L_DEBUG, "got shell surface fullscreen"); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); struct wlr_output *output = NULL; if (output_resource != NULL) { @@ -289,24 +272,16 @@ static void shell_surface_protocol_set_fullscreen(struct wl_client *client, shell_surface_set_state(surface, WLR_WL_SHELL_SURFACE_STATE_FULLSCREEN, NULL, NULL); - struct wlr_wl_shell_surface_set_fullscreen_event *event = - calloc(1, sizeof(struct wlr_wl_shell_surface_set_fullscreen_event)); - if (event == NULL) { - wl_client_post_no_memory(client); - return; - } - event->client = client; - event->surface = surface; - event->method = method; - event->framerate = framerate; - event->output = output; + struct wlr_wl_shell_surface_set_fullscreen_event event = { + .surface = surface, + .method = method, + .framerate = framerate, + .output = output, + }; - wl_signal_emit(&surface->events.request_set_fullscreen, event); - - free(event); + wl_signal_emit(&surface->events.request_fullscreen, &event); } - static void shell_surface_protocol_set_popup(struct wl_client *client, struct wl_resource *resource, struct wl_resource *seat_resource, uint32_t serial, struct wl_resource *parent_resource, int32_t x, @@ -368,7 +343,6 @@ static void shell_surface_protocol_set_popup(struct wl_client *client, static void shell_surface_protocol_set_maximized(struct wl_client *client, struct wl_resource *resource, struct wl_resource *output_resource) { - wlr_log(L_DEBUG, "got shell surface maximized"); struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource); struct wlr_output *output = NULL; if (output_resource != NULL) { @@ -378,19 +352,12 @@ static void shell_surface_protocol_set_maximized(struct wl_client *client, shell_surface_set_state(surface, WLR_WL_SHELL_SURFACE_STATE_MAXIMIZED, NULL, NULL); - struct wlr_wl_shell_surface_set_maximized_event *event = - calloc(1, sizeof(struct wlr_wl_shell_surface_set_maximized_event)); - if (event == NULL) { - wl_client_post_no_memory(client); - return; - } - event->client = client; - event->surface = surface; - event->output = output; - - wl_signal_emit(&surface->events.request_set_maximized, event); + struct wlr_wl_shell_surface_maximize_event event = { + .surface = surface, + .output = output, + }; - free(event); + wl_signal_emit(&surface->events.request_maximize, &event); } static void shell_surface_protocol_set_title(struct wl_client *client, @@ -545,8 +512,8 @@ static void shell_protocol_get_shell_surface(struct wl_client *client, wl_signal_init(&wl_surface->events.ping_timeout); wl_signal_init(&wl_surface->events.request_move); wl_signal_init(&wl_surface->events.request_resize); - wl_signal_init(&wl_surface->events.request_set_fullscreen); - wl_signal_init(&wl_surface->events.request_set_maximized); + wl_signal_init(&wl_surface->events.request_fullscreen); + wl_signal_init(&wl_surface->events.request_maximize); wl_signal_init(&wl_surface->events.set_state); wl_signal_init(&wl_surface->events.set_title); wl_signal_init(&wl_surface->events.set_class); diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c index 896a5f33..b69f713e 100644 --- a/types/wlr_xdg_shell_v6.c +++ b/types/wlr_xdg_shell_v6.c @@ -564,23 +564,15 @@ static void xdg_toplevel_protocol_show_window_menu(struct wl_client *client, return; } - struct wlr_xdg_toplevel_v6_show_window_menu_event *event = - calloc(1, sizeof(struct wlr_xdg_toplevel_v6_show_window_menu_event)); - if (event == NULL) { - wl_client_post_no_memory(client); - return; - } - - event->client = client; - event->surface = surface; - event->seat = seat; - event->serial = serial; - event->x = x; - event->y = y; - - wl_signal_emit(&surface->events.request_show_window_menu, event); + struct wlr_xdg_toplevel_v6_show_window_menu_event event = { + .surface = surface, + .seat = seat, + .serial = serial, + .x = x, + .y = y, + }; - free(event); + wl_signal_emit(&surface->events.request_show_window_menu, &event); } static void xdg_toplevel_protocol_move(struct wl_client *client, @@ -598,7 +590,6 @@ static void xdg_toplevel_protocol_move(struct wl_client *client, } struct wlr_xdg_toplevel_v6_move_event event = { - .client = client, .surface = surface, .seat = seat, .serial = serial, @@ -622,7 +613,6 @@ static void xdg_toplevel_protocol_resize(struct wl_client *client, } struct wlr_xdg_toplevel_v6_resize_event event = { - .client = client, .surface = surface, .seat = seat, .serial = serial, @@ -672,7 +662,6 @@ static void xdg_toplevel_protocol_set_fullscreen(struct wl_client *client, surface->toplevel_state->next.fullscreen = true; struct wlr_xdg_toplevel_v6_set_fullscreen_event event = { - .client = client, .surface = surface, .fullscreen = true, .output = output, @@ -688,7 +677,6 @@ static void xdg_toplevel_protocol_unset_fullscreen(struct wl_client *client, surface->toplevel_state->next.fullscreen = false; struct wlr_xdg_toplevel_v6_set_fullscreen_event event = { - .client = client, .surface = surface, .fullscreen = false, .output = NULL, From 9e29621ec32f6142f482780c764e6e93af31b806 Mon Sep 17 00:00:00 2001 From: emersion Date: Tue, 21 Nov 2017 10:14:50 +0100 Subject: [PATCH 09/13] Always center fullscreen view on screen --- rootston/desktop.c | 5 +++++ rootston/output.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/rootston/desktop.c b/rootston/desktop.c index 7a780cb9..0eb63dc4 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -53,6 +53,10 @@ static void view_update_output(const struct roots_view *view, } void view_move(struct roots_view *view, double x, double y) { + if (view->x == x && view->y == y) { + return; + } + struct wlr_box before; view_get_box(view, &before); if (view->move) { @@ -61,6 +65,7 @@ void view_move(struct roots_view *view, double x, double y) { view->x = x; view->y = y; } + view_update_output(view, &before); } void view_activate(struct roots_view *view, bool activate) { diff --git a/rootston/output.c b/rootston/output.c index d62c0b0d..bf684f2f 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include @@ -194,11 +195,26 @@ static void output_frame_notify(struct wl_listener *listener, void *data) { wlr_renderer_begin(server->renderer, wlr_output); if (output->fullscreen_view != NULL) { + // Make sure the view is centered on screen + const struct wlr_box *output_box = + wlr_output_layout_get_box(desktop->layout, wlr_output); + struct wlr_box view_box; + view_get_box(output->fullscreen_view, &view_box); + double view_x = (double)(output_box->width - view_box.width) / 2 + + output_box->x; + double view_y = (double)(output_box->height - view_box.height) / 2 + + output_box->y; + view_move(output->fullscreen_view, view_x, view_y); + if (has_standalone_surface(output->fullscreen_view)) { wlr_output_set_fullscreen_surface(wlr_output, output->fullscreen_view->wlr_surface); } else { wlr_output_set_fullscreen_surface(wlr_output, NULL); + + glClearColor(0, 0, 0, 0); + glClear(GL_COLOR_BUFFER_BIT); + render_view(output->fullscreen_view, desktop, wlr_output, &now); } wlr_renderer_end(server->renderer); From 9a6f799d8f72c1dcd24e22749d43eb2ed54681c6 Mon Sep 17 00:00:00 2001 From: emersion Date: Tue, 21 Nov 2017 10:37:53 +0100 Subject: [PATCH 10/13] Add fullscreen command, fix view_at with fullscreen views --- include/rootston/desktop.h | 6 +- rootston/cursor.c | 9 +- rootston/desktop.c | 183 ++++++++++++++++++++++--------------- rootston/keyboard.c | 6 ++ 4 files changed, 122 insertions(+), 82 deletions(-) diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h index 8bf1f6eb..e5c5f806 100644 --- a/include/rootston/desktop.h +++ b/include/rootston/desktop.h @@ -60,11 +60,13 @@ struct roots_server; struct roots_desktop *desktop_create(struct roots_server *server, struct roots_config *config); void desktop_destroy(struct roots_desktop *desktop); +struct roots_output *desktop_output_from_wlr_output( + struct roots_desktop *desktop, struct wlr_output *output); +struct roots_view *desktop_view_at(struct roots_desktop *desktop, double lx, + double ly, struct wlr_surface **surface, double *sx, double *sy); void view_init(struct roots_view *view, struct roots_desktop *desktop); void view_destroy(struct roots_view *view); -struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly, - struct wlr_surface **surface, double *sx, double *sy); void view_activate(struct roots_view *view, bool activate); void output_add_notify(struct wl_listener *listener, void *data); diff --git a/rootston/cursor.c b/rootston/cursor.c index 71075aa9..b3c87b30 100644 --- a/rootston/cursor.c +++ b/rootston/cursor.c @@ -37,7 +37,7 @@ static void roots_cursor_update_position(struct roots_cursor *cursor, double sx, sy; switch (cursor->mode) { case ROOTS_CURSOR_PASSTHROUGH: - view = view_at(desktop, cursor->cursor->x, cursor->cursor->y, + view = desktop_view_at(desktop, cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy); bool set_compositor_cursor = !view && cursor->cursor_client; if (view) { @@ -137,7 +137,8 @@ static void roots_cursor_press_button(struct roots_cursor *cursor, struct wlr_surface *surface; double sx, sy; - struct roots_view *view = view_at(desktop, lx, ly, &surface, &sx, &sy); + struct roots_view *view = + desktop_view_at(desktop, lx, ly, &surface, &sx, &sy); if (state == WLR_BUTTON_PRESSED && view && @@ -237,7 +238,7 @@ void roots_cursor_handle_touch_down(struct roots_cursor *cursor, return; } double sx, sy; - view_at(desktop, lx, ly, &surface, &sx, &sy); + desktop_view_at(desktop, lx, ly, &surface, &sx, &sy); uint32_t serial = 0; if (surface) { @@ -291,7 +292,7 @@ void roots_cursor_handle_touch_motion(struct roots_cursor *cursor, } double sx, sy; - view_at(desktop, lx, ly, &surface, &sx, &sy); + desktop_view_at(desktop, lx, ly, &surface, &sx, &sy); if (surface) { wlr_seat_touch_point_focus(cursor->seat->seat, surface, diff --git a/rootston/desktop.c b/rootston/desktop.c index 0eb63dc4..1a21a7c2 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -163,6 +163,11 @@ void view_set_fullscreen(struct roots_view *view, bool fullscreen, if (output == NULL) { output = view_get_output(view); } + struct roots_output *roots_output = + desktop_output_from_wlr_output(view->desktop, output); + if (roots_output == NULL) { + return; + } struct wlr_box view_box; view_get_box(view, &view_box); @@ -179,14 +184,8 @@ void view_set_fullscreen(struct roots_view *view, bool fullscreen, output_box->height); view->rotation = 0; - struct roots_output *roots_output; - wl_list_for_each(roots_output, &view->desktop->outputs, link) { - if (roots_output->wlr_output == output) { - roots_output->fullscreen_view = view; - view->fullscreen_output = roots_output; - break; - } - } + roots_output->fullscreen_view = view; + view->fullscreen_output = roots_output; } if (was_fullscreen && !fullscreen) { @@ -273,83 +272,104 @@ void view_setup(struct roots_view *view) { view_update_output(view, &before); } -struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly, +static bool view_at(struct roots_view *view, double lx, double ly, struct wlr_surface **surface, double *sx, double *sy) { - struct roots_view *view; - wl_list_for_each(view, &desktop->views, link) { - if (view->type == ROOTS_WL_SHELL_VIEW && - view->wl_shell_surface->state == - WLR_WL_SHELL_SURFACE_STATE_POPUP) { - continue; - } + if (view->type == ROOTS_WL_SHELL_VIEW && + view->wl_shell_surface->state == WLR_WL_SHELL_SURFACE_STATE_POPUP) { + return false; + } - double view_sx = lx - view->x; - double view_sy = ly - view->y; - - struct wlr_surface_state *state = view->wlr_surface->current; - struct wlr_box box = { - .x = 0, - .y = 0, - .width = state->buffer_width / state->scale, - .height = state->buffer_height / state->scale, - }; - if (view->rotation != 0.0) { - // Coordinates relative to the center of the view - double ox = view_sx - (double)box.width/2, - oy = view_sy - (double)box.height/2; - // Rotated coordinates - double rx = cos(view->rotation)*ox - sin(view->rotation)*oy, - ry = cos(view->rotation)*oy + sin(view->rotation)*ox; - view_sx = rx + (double)box.width/2; - view_sy = ry + (double)box.height/2; - } + double view_sx = lx - view->x; + double view_sy = ly - view->y; + + struct wlr_surface_state *state = view->wlr_surface->current; + struct wlr_box box = { + .x = 0, + .y = 0, + .width = state->buffer_width / state->scale, + .height = state->buffer_height / state->scale, + }; + if (view->rotation != 0.0) { + // Coordinates relative to the center of the view + double ox = view_sx - (double)box.width/2, + oy = view_sy - (double)box.height/2; + // Rotated coordinates + double rx = cos(view->rotation)*ox - sin(view->rotation)*oy, + ry = cos(view->rotation)*oy + sin(view->rotation)*ox; + view_sx = rx + (double)box.width/2; + view_sy = ry + (double)box.height/2; + } - if (view->type == ROOTS_XDG_SHELL_V6_VIEW) { - double popup_sx, popup_sy; - struct wlr_xdg_surface_v6 *popup = - wlr_xdg_surface_v6_popup_at(view->xdg_surface_v6, - view_sx, view_sy, &popup_sx, &popup_sy); - - if (popup) { - *sx = view_sx - popup_sx; - *sy = view_sy - popup_sy; - *surface = popup->surface; - return view; - } + if (view->type == ROOTS_XDG_SHELL_V6_VIEW) { + double popup_sx, popup_sy; + struct wlr_xdg_surface_v6 *popup = + wlr_xdg_surface_v6_popup_at(view->xdg_surface_v6, + view_sx, view_sy, &popup_sx, &popup_sy); + + if (popup) { + *sx = view_sx - popup_sx; + *sy = view_sy - popup_sy; + *surface = popup->surface; + return true; } + } - if (view->type == ROOTS_WL_SHELL_VIEW) { - double popup_sx, popup_sy; - struct wlr_wl_shell_surface *popup = - wlr_wl_shell_surface_popup_at(view->wl_shell_surface, - view_sx, view_sy, &popup_sx, &popup_sy); - - if (popup) { - *sx = view_sx - popup_sx; - *sy = view_sy - popup_sy; - *surface = popup->surface; - return view; - } + if (view->type == ROOTS_WL_SHELL_VIEW) { + double popup_sx, popup_sy; + struct wlr_wl_shell_surface *popup = + wlr_wl_shell_surface_popup_at(view->wl_shell_surface, + view_sx, view_sy, &popup_sx, &popup_sy); + + if (popup) { + *sx = view_sx - popup_sx; + *sy = view_sy - popup_sy; + *surface = popup->surface; + return true; } + } - double sub_x, sub_y; - struct wlr_subsurface *subsurface = - wlr_surface_subsurface_at(view->wlr_surface, - view_sx, view_sy, &sub_x, &sub_y); - if (subsurface) { - *sx = view_sx - sub_x; - *sy = view_sy - sub_y; - *surface = subsurface->surface; - return view; + double sub_x, sub_y; + struct wlr_subsurface *subsurface = + wlr_surface_subsurface_at(view->wlr_surface, + view_sx, view_sy, &sub_x, &sub_y); + if (subsurface) { + *sx = view_sx - sub_x; + *sy = view_sy - sub_y; + *surface = subsurface->surface; + return true; + } + + if (wlr_box_contains_point(&box, view_sx, view_sy) && + pixman_region32_contains_point(&view->wlr_surface->current->input, + view_sx, view_sy, NULL)) { + *sx = view_sx; + *sy = view_sy; + *surface = view->wlr_surface; + return true; + } + + return false; +} + +struct roots_view *desktop_view_at(struct roots_desktop *desktop, double lx, + double ly, struct wlr_surface **surface, double *sx, double *sy) { + struct wlr_output *wlr_output = + wlr_output_layout_output_at(desktop->layout, lx, ly); + if (wlr_output != NULL) { + struct roots_output *output = + desktop_output_from_wlr_output(desktop, wlr_output); + if (output != NULL && output->fullscreen_view != NULL) { + if (view_at(output->fullscreen_view, lx, ly, surface, sx, sy)) { + return output->fullscreen_view; + } else { + return NULL; + } } + } - if (wlr_box_contains_point(&box, view_sx, view_sy) && - pixman_region32_contains_point( - &view->wlr_surface->current->input, - view_sx, view_sy, NULL)) { - *sx = view_sx; - *sy = view_sy; - *surface = view->wlr_surface; + struct roots_view *view; + wl_list_for_each(view, &desktop->views, link) { + if (view_at(view, lx, ly, surface, sx, sy)) { return view; } } @@ -445,3 +465,14 @@ struct roots_desktop *desktop_create(struct roots_server *server, void desktop_destroy(struct roots_desktop *desktop) { // TODO } + +struct roots_output *desktop_output_from_wlr_output( + struct roots_desktop *desktop, struct wlr_output *output) { + struct roots_output *roots_output; + wl_list_for_each(roots_output, &desktop->outputs, link) { + if (roots_output->wlr_output == output) { + return roots_output; + } + } + return NULL; +} diff --git a/rootston/keyboard.c b/rootston/keyboard.c index f3fc9a85..6ad99077 100644 --- a/rootston/keyboard.c +++ b/rootston/keyboard.c @@ -95,6 +95,12 @@ static void keyboard_binding_execute(struct roots_keyboard *keyboard, if (focus != NULL) { view_close(focus); } + } else if (strcmp(command, "fullscreen") == 0) { + struct roots_view *focus = roots_seat_get_focus(seat); + if (focus != NULL) { + bool is_fullscreen = focus->fullscreen_output != NULL; + view_set_fullscreen(focus, !is_fullscreen, NULL); + } } else if (strcmp(command, "next_window") == 0) { roots_seat_cycle_focus(seat); } else if (strncmp(exec_prefix, command, strlen(exec_prefix)) == 0) { From 5a664e1e46df78c10977a4a9ee0bc53e5acf3772 Mon Sep 17 00:00:00 2001 From: emersion Date: Tue, 21 Nov 2017 18:43:22 +0100 Subject: [PATCH 11/13] Fix messed up outputs after fullscreen --- types/wlr_output.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/types/wlr_output.c b/types/wlr_output.c index bc89c97a..2ee95162 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -379,7 +379,7 @@ static void output_fullscreen_surface_reset(struct wlr_output *output) { static void output_fullscreen_surface_handle_commit( struct wl_listener *listener, void *data) { struct wlr_output *output = wl_container_of(listener, output, - fullscreen_surface_destroy); + fullscreen_surface_commit); output->needs_swap = true; } @@ -393,6 +393,7 @@ static void output_fullscreen_surface_handle_destroy( void wlr_output_set_fullscreen_surface(struct wlr_output *output, struct wlr_surface *surface) { // TODO: hardware fullscreen + if (output->fullscreen_surface == surface) { return; } From 3262661e1e77db11d7e4939aa377804046df43f5 Mon Sep 17 00:00:00 2001 From: emersion Date: Tue, 21 Nov 2017 20:58:15 +0100 Subject: [PATCH 12/13] Fix HiDPI support --- rootston/desktop.c | 6 ++---- types/wlr_output.c | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/rootston/desktop.c b/rootston/desktop.c index eb18e716..bb3af258 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -36,7 +36,7 @@ static void view_update_output(const struct roots_view *view, struct wlr_box box; view_get_box(view, &box); wl_list_for_each(output, &desktop->outputs, link) { - bool intersected = before->x != -1 && wlr_output_layout_intersects( + bool intersected = before != NULL && wlr_output_layout_intersects( desktop->layout, output->wlr_output, before->x, before->y, before->x + before->width, before->y + before->height); @@ -280,9 +280,7 @@ void view_setup(struct roots_view *view) { } view_center(view); - struct wlr_box before; - view_get_box(view, &before); - view_update_output(view, &before); + view_update_output(view, NULL); } static bool view_at(struct roots_view *view, double lx, double ly, diff --git a/types/wlr_output.c b/types/wlr_output.c index 2ee95162..3f0e1c21 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -253,8 +253,8 @@ void wlr_output_make_current(struct wlr_output *output) { static void output_fullscreen_surface_render(struct wlr_output *output, struct wlr_surface *surface, const struct timespec *when) { - int x = (output->width - surface->current->width) / 2; - int y = (output->height - surface->current->height) / 2; + int x = (output->width - surface->current->buffer_width) / 2; + int y = (output->height - surface->current->buffer_height) / 2; glViewport(0, 0, output->width, output->height); glClearColor(0, 0, 0, 0); From cc2468923b134cdf6d980b2930cd80f0d15e96e3 Mon Sep 17 00:00:00 2001 From: emersion Date: Tue, 21 Nov 2017 21:12:12 +0100 Subject: [PATCH 13/13] Fix non-HiDPI-aware fullscreen surface rendering in wlr_output --- types/wlr_output.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/types/wlr_output.c b/types/wlr_output.c index 3f0e1c21..1d98d376 100644 --- a/types/wlr_output.c +++ b/types/wlr_output.c @@ -253,8 +253,16 @@ void wlr_output_make_current(struct wlr_output *output) { static void output_fullscreen_surface_render(struct wlr_output *output, struct wlr_surface *surface, const struct timespec *when) { - int x = (output->width - surface->current->buffer_width) / 2; - int y = (output->height - surface->current->buffer_height) / 2; + int width, height; + wlr_output_effective_resolution(output, &width, &height); + + int x = (width - surface->current->width) / 2; + int y = (height - surface->current->height) / 2; + + int render_x = x * output->scale; + int render_y = y * output->scale; + int render_width = surface->current->width * output->scale; + int render_height = surface->current->height * output->scale; glViewport(0, 0, output->width, output->height); glClearColor(0, 0, 0, 0); @@ -264,9 +272,16 @@ static void output_fullscreen_surface_render(struct wlr_output *output, return; } + float translate[16]; + wlr_matrix_translate(&translate, render_x, render_y, 0); + + float scale[16]; + wlr_matrix_scale(&scale, render_width, render_height, 1); + float matrix[16]; - wlr_texture_get_matrix(surface->texture, &matrix, &output->transform_matrix, - x, y); + wlr_matrix_mul(&translate, &scale, &matrix); + wlr_matrix_mul(&output->transform_matrix, &matrix, &matrix); + wlr_render_with_matrix(surface->renderer, surface->texture, &matrix); wlr_surface_send_frame_done(surface, when);