From b04a9a248d4cf3d0e93e1b39ee9eedc9da359173 Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 20 Nov 2017 17:27:36 +0100 Subject: Initial fullscreen support --- include/wlr/types/wlr_output.h | 6 ++++++ include/wlr/types/wlr_xdg_shell_v6.h | 7 +++++++ 2 files changed, 13 insertions(+) (limited to 'include/wlr') 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; -- cgit v1.2.3 From 54f1135c057e76b1c05058592a6878a07a524b99 Mon Sep 17 00:00:00 2001 From: emersion Date: Mon, 20 Nov 2017 20:53:13 +0100 Subject: 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(-) (limited to 'include/wlr') 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); + } +} -- cgit v1.2.3 From 17d9e2ce3508d21ccdc9907b02d127b47a4a21bb Mon Sep 17 00:00:00 2001 From: emersion Date: Tue, 21 Nov 2017 09:50:00 +0100 Subject: 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(-) (limited to 'include/wlr') 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, -- cgit v1.2.3