dany/wvkbd
1
0
Fork 0
mirror of https://github.com/jjsullivan5196/wvkbd.git synced 2026-01-26 21:25:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cancel pending frame callback before destroying surface and ignore old surfaces

Browse Source 
This applies two of the improvements in the pull request
"Fix bug complying with wlr-layer-shell-unstable-v1 which causes crashes" to the overhauled codebase.

Reference: https://github.com/jjsullivan5196/wvkbd/pull/pr114
Co-authored-by: Armando DiCianno <armando@dicianno.org>
This commit is contained in:
Maarten van Gompel
2026-01-19 21:18:50 +01:00
committed by Willow Barraco
parent bd4a176eef
commit f0c99d276a
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main.c
View File

@@ -515,6 +515,12 @@ void
layer_surface_configure(void *data, struct zwlr_layer_surface_v1 *surface,
uint32_t serial, uint32_t w, uint32_t h)
{
// Swallow events for old/destroyed surface
if (surface != layer_surface) {
zwlr_layer_surface_v1_ack_configure(surface, serial);
return;
};
// Not what we expected, or redimension, refresh and restart
if (keyboard.w != w || keyboard.h != h) {
zwlr_layer_surface_v1_ack_configure(surface, serial);
@@ -665,7 +671,15 @@ hide()
zwlr_layer_surface_v1_destroy(layer_surface);
layer_surface = NULL;
layer_surface_configured = false;
// Cancel pending frame callback before destroying surface
if (draw_surf.frame_cb) {
wl_callback_destroy(draw_surf.frame_cb);
draw_surf.frame_cb = NULL;
}
wl_surface_destroy(draw_surf.surf);
draw_surf.attached = false;
hidden = true;
}