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

Merge pull request #2353 from emersion/render-opaque-overlay

Browse source 
Improve rendering with a fullscreen opaque overlay surface
This commit is contained in:
Drew DeVault 2018-07-25 08:32:32 -04:00 committed by GitHub
parent fc718f629a 0e79b2114c
commit 53dbe2da4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/sway/output.h
View file

@ -65,8 +65,7 @@ struct sway_container *output_by_name(const char *name);
void output_enable(struct sway_output *output); void output_enable(struct sway_output *output);
bool output_has_opaque_lockscreen(struct sway_output *output, bool output_has_opaque_overlay_layer_surface(struct sway_output *output);
struct sway_seat *seat);
struct sway_container *output_get_active_workspace(struct sway_output *output); struct sway_container *output_get_active_workspace(struct sway_output *output);

26
sway/desktop/output.c
View file

@ -182,21 +182,14 @@ struct sway_container *output_get_active_workspace(struct sway_output *output) {
return workspace; return workspace;
} }
bool output_has_opaque_lockscreen(struct sway_output *output, bool output_has_opaque_overlay_layer_surface(struct sway_output *output) {
struct sway_seat *seat) {
if (!seat->exclusive_client) {
return false;
}
struct wlr_layer_surface *wlr_layer_surface; struct wlr_layer_surface *wlr_layer_surface;
wl_list_for_each(wlr_layer_surface, &server.layer_shell->surfaces, link) { wl_list_for_each(wlr_layer_surface, &server.layer_shell->surfaces, link) {
if (wlr_layer_surface->output != output->wlr_output) { if (wlr_layer_surface->output != output->wlr_output ||
wlr_layer_surface->layer != ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY) {
continue; continue;
} }
struct wlr_surface *wlr_surface = wlr_layer_surface->surface; struct wlr_surface *wlr_surface = wlr_layer_surface->surface;
if (wlr_surface->resource->client != seat->exclusive_client) {
continue;
}
struct sway_layer_surface *sway_layer_surface = struct sway_layer_surface *sway_layer_surface =
layer_from_wlr_layer_surface(wlr_layer_surface); layer_from_wlr_layer_surface(wlr_layer_surface);
pixman_box32_t output_box = { pixman_box32_t output_box = {
@ -222,16 +215,11 @@ struct send_frame_done_data {
struct root_geometry root_geo; struct root_geometry root_geo;
struct sway_output *output; struct sway_output *output;
struct timespec *when; struct timespec *when;
struct wl_client *exclusive_client;
}; };
static void send_frame_done_iterator(struct wlr_surface *surface, static void send_frame_done_iterator(struct wlr_surface *surface,
int sx, int sy, void *_data) { int sx, int sy, void *_data) {
struct send_frame_done_data *data = _data; struct send_frame_done_data *data = _data;
if (data->exclusive_client &&
data->exclusive_client != surface->resource->client) {
return;
}
bool intersects = output_get_surface_box(&data->root_geo, data->output, surface, bool intersects = output_get_surface_box(&data->root_geo, data->output, surface,
sx, sy, NULL); sx, sy, NULL);
@ -280,14 +268,15 @@ static void send_frame_done_container(struct send_frame_done_data *data,
} }
static void send_frame_done(struct sway_output *output, struct timespec *when) { static void send_frame_done(struct sway_output *output, struct timespec *when) {
struct sway_seat *seat = input_manager_current_seat(input_manager);
struct send_frame_done_data data = { struct send_frame_done_data data = {
.output = output, .output = output,
.when = when, .when = when,
.exclusive_client = output_has_opaque_lockscreen(output, seat) ?
seat->exclusive_client : NULL,
}; };
if (output_has_opaque_overlay_layer_surface(output)) {
goto send_frame_overlay;
}
struct sway_container *workspace = output_get_active_workspace(output); struct sway_container *workspace = output_get_active_workspace(output);
if (workspace->current.ws_fullscreen) { if (workspace->current.ws_fullscreen) {
send_frame_done_container_iterator( send_frame_done_container_iterator(
@ -315,6 +304,7 @@ static void send_frame_done(struct sway_output *output, struct timespec *when) {
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]); &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
} }
send_frame_overlay:
send_frame_done_layer(&data, send_frame_done_layer(&data,
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]); &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
send_frame_done_drag_icons(&data, &root_container.sway_root->drag_icons); send_frame_done_drag_icons(&data, &root_container.sway_root->drag_icons);

21
sway/desktop/render.c
View file

@ -837,21 +837,12 @@ void output_render(struct sway_output *output, struct timespec *when,
struct sway_container *workspace = output_get_active_workspace(output); struct sway_container *workspace = output_get_active_workspace(output);
struct sway_view *fullscreen_view = workspace->current.ws_fullscreen; struct sway_view *fullscreen_view = workspace->current.ws_fullscreen;
struct sway_seat *seat = input_manager_current_seat(input_manager);
if (output_has_opaque_lockscreen(output, seat) && seat->focused_layer) { if (output_has_opaque_overlay_layer_surface(output)) {
struct wlr_layer_surface *wlr_layer_surface = seat->focused_layer; goto render_overlay;
struct sway_layer_surface *sway_layer_surface = }
layer_from_wlr_layer_surface(seat->focused_layer);
struct render_data data = { if (fullscreen_view) {
.output = output,
.damage = damage,
.alpha = 1.0f,
};
output_surface_for_each_surface(wlr_layer_surface->surface,
sway_layer_surface->geo.x, sway_layer_surface->geo.y,
&data.root_geo, render_surface_iterator, &data);
} else if (fullscreen_view) {
float clear_color[] = {0.0f, 0.0f, 0.0f, 1.0f}; float clear_color[] = {0.0f, 0.0f, 0.0f, 1.0f};
int nrects; int nrects;
@ -897,6 +888,8 @@ void output_render(struct sway_output *output, struct timespec *when,
render_layer(output, damage, render_layer(output, damage,
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]); &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
} }
render_overlay:
render_layer(output, damage, render_layer(output, damage,
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]); &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
render_drag_icons(output, damage, &root_container.sway_root->drag_icons); render_drag_icons(output, damage, &root_container.sway_root->drag_icons);