pjht/swaylock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use infinite opaque region in swaylock

Browse Source
This commit is contained in:
Ryan Dwyer 2018-07-03 18:15:02 +10:00
parent f43f683720
commit 788b771632
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
main.c
View File

@ -84,6 +84,10 @@ static const struct zwlr_layer_surface_v1_listener layer_surface_listener;
static cairo_surface_t *select_image(struct swaylock_state *state, static cairo_surface_t *select_image(struct swaylock_state *state,
struct swaylock_surface *surface); struct swaylock_surface *surface);
static bool image_is_opaque(cairo_surface_t *image) {
return cairo_surface_get_content(image) == CAIRO_CONTENT_COLOR;
}
static void create_layer_surface(struct swaylock_surface *surface) { static void create_layer_surface(struct swaylock_surface *surface) {
struct swaylock_state *state = surface->state; struct swaylock_state *state = surface->state;
@ -108,11 +112,18 @@ static void create_layer_surface(struct swaylock_surface *surface) {
surface->layer_surface, true); surface->layer_surface, true);
zwlr_layer_surface_v1_add_listener(surface->layer_surface, zwlr_layer_surface_v1_add_listener(surface->layer_surface,
&layer_surface_listener, surface); &layer_surface_listener, surface);
wl_surface_commit(surface->surface);
if (image_is_opaque(surface->image) &&
surface->state->args.mode != BACKGROUND_MODE_CENTER &&
surface->state->args.mode != BACKGROUND_MODE_FIT) {
struct wl_region *region =
wl_compositor_create_region(surface->state->compositor);
wl_region_add(region, 0, 0, INT32_MAX, INT32_MAX);
wl_surface_set_opaque_region(surface->surface, region);
wl_region_destroy(region);
} }
static bool image_is_opaque(cairo_surface_t *image) { wl_surface_commit(surface->surface);
return cairo_surface_get_content(image) == CAIRO_CONTENT_COLOR;
} }
static void layer_surface_configure(void *data, static void layer_surface_configure(void *data,
@ -121,17 +132,6 @@ static void layer_surface_configure(void *data,
struct swaylock_surface *surface = data; struct swaylock_surface *surface = data;
surface->width = width; surface->width = width;
surface->height = height; surface->height = height;
if (image_is_opaque(surface->image) &&
surface->state->args.mode != BACKGROUND_MODE_CENTER &&
surface->state->args.mode != BACKGROUND_MODE_FIT) {
struct wl_region *region =
wl_compositor_create_region(surface->state->compositor);
wl_region_add(region, 0, 0, width, height);
wl_surface_set_opaque_region(surface->surface, region);
wl_region_destroy(region);
}
zwlr_layer_surface_v1_ack_configure(layer_surface, serial); zwlr_layer_surface_v1_ack_configure(layer_surface, serial);
render_frame(surface); render_frame(surface);
} }