fix(detect): update sctk dependency to fix crash

[morgan-dgk]

Integrates the fix from smithay-client-toolkit PR 406.

This should resolve #1768 and #1750.

Testing?

Compiled with patched smithay-client-toolkit package and confirmed espanso runs normally under Hyprland v0.33.1.

Anything Else?

This is my very first PR, apologies if information is missing.

I am unsure how the smithay-client-toolkit dependency should ultimately be patched. Currently Cargo.toml points to the fork I made of sctk. I tried naively updating to 16.1 which should include this fix, but there are breaking changes which cause the build to fail.

Thanks!

[federico-terzi]

Hey @morgan-dgk, thanks for the investigation! I think we should prefer bumping the smithay-client-toolkit version rather than using a patched version from git, as the latter might become tricky to maintain.

If you can update this PR updating the version to 16.1, I'd be happy to help you fix the build errors :)

PS: please pull from dev to access the latest fixes

[morgan-dgk]

Thanks for your guidance @federico-terzi, I have updated my PR to bump sctk to 16.1. Build is failing due to a type error in espanso-detect/src/evdev/sync/wayland:

85 |           match map_keyboard_repeat(
   |  _______________-
86 | |           event_loop.handle(),
87 | |           &seat,
88 | |           None,
89 | |           RepeatKind::System,
90 | |           move |event, _, _| keyboard_event_handler(event, &result_clone),
91 | |         ) {
   | |_________- this expression has type `Result<WlKeyboard, smithay_client_toolkit::seat::keyboard::Error>`
92 |             Ok((kbd, repeat_source)) => {
   |                ^^^^^^^^^^^^^^^^^^^^ expected `WlKeyboard`, found `(_, _)`
   |
   = note: expected struct `WlKeyboard`
               found tuple `(_, _)`

[federico-terzi]

@morgan-dgk Thanks! Looking at this example, it seems they removed the second parameter of the call

So we'd need to:

• Change the seats type to be

let mut seats = Vec::<(String, Option<wl_keyboard::WlKeyboard>)>::new();

And have the match statements to be:

 Ok(kbd) => {
                        seats.push((name, Some(kbd)));
                    }

(we basically don't use the second parameter anymore)

Do you think you could give it a spin? :)

[morgan-dgk]

@federico-terzi thanks for your encouragement :). I gave it a shot - appears to build locally. I'm not sure if additional changes are needed in the match statement on map_keyboard_repeat.

[federico-terzi]

Looks great! Let's see if the CI is happy

[federico-terzi]

All green! Before merging, did you check if it's working correctly locally? I mean, giving it a run on Wayland :)

[morgan-dgk]

Just did, matching and replacment works fine on Hyprland v0.33.1. However, it looks like something may have broken with the UI rendering though as the popup window no longer shows Espanso logo or text, just a rainbow gradient:

[federico-terzi]

Oh interesting! I guess that's fine for now, it's better for it to work than for it to be beautiful :)

Thanks for the effort!