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

Fix output-specific images when output reappears

Browse Source 
When setting an image with `--image <output>:<path>`, the image used to
fail to apply if the relevant output appears some time after swaylock
executes.

Co-authored-by: Alexander Bakker <ab@alexbakker.me>
This commit is contained in:
Martin Dørum 2020-10-15 14:26:02 +02:00 committed by Simon Ser
parent f2298bdbf7
commit ba921312c5
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/swaylock.h
View File

@ -112,6 +112,7 @@ struct swaylock_surface {
struct wl_subsurface *subsurface; struct wl_subsurface *subsurface;
struct ext_session_lock_surface_v1 *ext_session_lock_surface_v1; struct ext_session_lock_surface_v1 *ext_session_lock_surface_v1;
struct pool_buffer indicator_buffers[2]; struct pool_buffer indicator_buffers[2];
bool created;
bool frame_pending, dirty; bool frame_pending, dirty;
uint32_t width, height; uint32_t width, height;
int32_t scale; int32_t scale;

13
main.c
View File

@ -152,6 +152,8 @@ static void create_surface(struct swaylock_surface *surface) {
wl_surface_set_opaque_region(surface->surface, region); wl_surface_set_opaque_region(surface->surface, region);
wl_region_destroy(region); wl_region_destroy(region);
} }
surface->created = true;
} }
static void ext_session_lock_surface_v1_handle_configure(void *data, static void ext_session_lock_surface_v1_handle_configure(void *data,
@ -234,7 +236,11 @@ static void handle_wl_output_mode(void *data, struct wl_output *output,
} }
static void handle_wl_output_done(void *data, struct wl_output *output) { static void handle_wl_output_done(void *data, struct wl_output *output) {
// Who cares struct swaylock_surface *surface = data;
if (!surface->created && surface->state->run_display) {
create_surface(surface);
wl_display_roundtrip(surface->state->display);
}
} }
static void handle_wl_output_scale(void *data, struct wl_output *output, static void handle_wl_output_scale(void *data, struct wl_output *output,
@ -310,11 +316,6 @@ static void handle_global(void *data, struct wl_registry *registry,
surface->output_global_name = name; surface->output_global_name = name;
wl_output_add_listener(surface->output, &_wl_output_listener, surface); wl_output_add_listener(surface->output, &_wl_output_listener, surface);
wl_list_insert(&state->surfaces, &surface->link); wl_list_insert(&state->surfaces, &surface->link);
if (state->run_display) {
create_surface(surface);
wl_display_roundtrip(state->display);
}
} else if (strcmp(interface, ext_session_lock_manager_v1_interface.name) == 0) { } else if (strcmp(interface, ext_session_lock_manager_v1_interface.name) == 0) {
state->ext_session_lock_manager_v1 = wl_registry_bind(registry, name, state->ext_session_lock_manager_v1 = wl_registry_bind(registry, name,
&ext_session_lock_manager_v1_interface, 1); &ext_session_lock_manager_v1_interface, 1);