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

input-method: send text-input enter event after all leave events

Browse Source
This commit is contained in:
praschke 2023-12-06 15:08:43 +00:00 committed by Isaac Freund
parent 4af77f5ffb
commit 18d4ccdd38
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
river/InputRelay.zig
View File

@ -185,6 +185,8 @@ pub fn sendInputMethodState(self: *Self, wlr_text_input: *wlr.TextInputV3) void
/// Update the current focused surface. Surface must belong to the same seat. /// Update the current focused surface. Surface must belong to the same seat.
pub fn setSurfaceFocus(self: *Self, wlr_surface: ?*wlr.Surface) void { pub fn setSurfaceFocus(self: *Self, wlr_surface: ?*wlr.Surface) void {
var new_text_input: ?*TextInput = null;
var it = self.text_inputs.first; var it = self.text_inputs.first;
while (it) |node| : (it = node.next) { while (it) |node| : (it = node.next) {
const text_input = &node.data; const text_input = &node.data;
@ -203,14 +205,19 @@ pub fn setSurfaceFocus(self: *Self, wlr_surface: ?*wlr.Surface) void {
continue; continue;
} }
} }
if (wlr_surface) |surface| { if (wlr_surface) |surface| {
if (text_input.wlr_text_input.resource.getClient() == surface.resource.getClient()) { if (text_input.wlr_text_input.resource.getClient() == surface.resource.getClient()) {
if (self.input_method != null) { new_text_input = text_input;
text_input.wlr_text_input.sendEnter(surface);
} else {
text_input.setPendingFocusedSurface(surface);
}
} }
} }
} }
if (new_text_input) |text_input| {
if (self.input_method != null) {
text_input.wlr_text_input.sendEnter(wlr_surface.?);
} else {
text_input.setPendingFocusedSurface(wlr_surface.?);
}
}
} }