dany/wvkbd
1
0
Fork 0
mirror of https://github.com/jjsullivan5196/wvkbd.git synced 2025-04-21 08:16:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Regression fix: keyboard didn't re-show on SIGUSR2 anymore

Browse Source 
When triggering show() on kill USR2, everything works as expected, but
the keyboard attributes are the same as before. So in
layer_surface_configure, we don't match the condition.

Checking hidden, and resetting it from inside this scope is enough to
solve the problem.
This commit is contained in:
Willow Barraco 2023-09-17 20:18:19 +02:00
parent eefd08f431
commit 63c209ec7f
No known key found for this signature in database
GPG Key ID: EABA44759877E02A
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main.c
View File

@ -545,23 +545,14 @@ layer_surface_configure(void *data, struct zwlr_layer_surface_v1 *surface,
uint32_t serial, uint32_t w, uint32_t h) uint32_t serial, uint32_t w, uint32_t h)
{ {
if (keyboard.w != w || keyboard.h != h || if (keyboard.w != w || keyboard.h != h ||
keyboard.scale != keyboard.pending_scale) { keyboard.scale != keyboard.pending_scale || hidden) {
keyboard.w = w; keyboard.w = w;
keyboard.h = h; keyboard.h = h;
keyboard.scale = keyboard.pending_scale; keyboard.scale = keyboard.pending_scale;
hidden = false;
if (wfs_mgr && viewporter) { if (wfs_mgr && viewporter) {
if (!wfs_draw_surf) {
wfs_draw_surf =
wp_fractional_scale_manager_v1_get_fractional_scale(
wfs_mgr, draw_surf.surf);
wp_fractional_scale_v1_add_listener(
wfs_draw_surf, &wp_fractional_scale_listener, NULL);
}
if (!draw_surf_viewport) {
draw_surf_viewport =
wp_viewporter_get_viewport(viewporter, draw_surf.surf);
}
wp_viewport_set_destination(draw_surf_viewport, keyboard.w, wp_viewport_set_destination(draw_surf_viewport, keyboard.w,
keyboard.h); keyboard.h);
} else { } else {
@ -690,6 +681,15 @@ show()
draw_surf.surf = wl_compositor_create_surface(compositor); draw_surf.surf = wl_compositor_create_surface(compositor);
wl_surface_add_listener(draw_surf.surf, &surface_listener, NULL); wl_surface_add_listener(draw_surf.surf, &surface_listener, NULL);
if (wfs_mgr && viewporter) {
wfs_draw_surf = wp_fractional_scale_manager_v1_get_fractional_scale(
wfs_mgr, draw_surf.surf);
wp_fractional_scale_v1_add_listener(
wfs_draw_surf, &wp_fractional_scale_listener, NULL);
draw_surf_viewport =
wp_viewporter_get_viewport(viewporter, draw_surf.surf);
}
layer_surface = zwlr_layer_shell_v1_get_layer_surface( layer_surface = zwlr_layer_shell_v1_get_layer_surface(
layer_shell, draw_surf.surf, NULL, layer, namespace); layer_shell, draw_surf.surf, NULL, layer, namespace);
@ -700,8 +700,6 @@ show()
zwlr_layer_surface_v1_add_listener(layer_surface, &layer_surface_listener, zwlr_layer_surface_v1_add_listener(layer_surface, &layer_surface_listener,
NULL); NULL);
wl_surface_commit(draw_surf.surf); wl_surface_commit(draw_surf.surf);
hidden = false;
} }
void void