Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TextInput: fix consecutive enable requests

Browse Source 
The wording of the text-input-v3 protocol is quite confusing here
but I'm pretty sure this is now correct.
This commit is contained in:
Isaac Freund 2024-01-01 09:31:15 -06:00
parent 6f311af3b3
commit 40920c7818
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
river/TextInput.zig
View File

@ -66,9 +66,14 @@ fn handleEnable(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) v
const text_input = @fieldParentPtr(TextInput, "enable", listener); const text_input = @fieldParentPtr(TextInput, "enable", listener);
const seat: *Seat = @ptrFromInt(text_input.wlr_text_input.seat.data); const seat: *Seat = @ptrFromInt(text_input.wlr_text_input.seat.data);
if (seat.relay.text_input != null) { // The same text_input object may be enabled multiple times consecutively
log.err("client requested to enable more than one text input on a single seat, ignoring request", .{}); // without first disabling it. Enabling a different text input object without
return; // first disabling the current one is disallowed by the protocol however.
if (seat.relay.text_input) |currently_enabled| {
if (text_input != currently_enabled) {
log.err("client requested to enable more than one text input on a single seat, ignoring request", .{});
return;
}
} }
seat.relay.text_input = text_input; seat.relay.text_input = text_input;