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

input-method: check that the input method is active when committing

Browse Source
This commit is contained in:
praschke 2023-12-21 21:29:24 +00:00 committed by Isaac Freund
parent 18d4ccdd38
commit 8f497a3570
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
river/InputRelay.zig
View File

@ -60,10 +60,11 @@ fn handleInputMethodCommit(
input_method: *wlr.InputMethodV2, input_method: *wlr.InputMethodV2,
) void { ) void {
const self = @fieldParentPtr(Self, "input_method_commit", listener); const self = @fieldParentPtr(Self, "input_method_commit", listener);
const text_input = self.getFocusedTextInput() orelse return;
assert(input_method == self.input_method); assert(input_method == self.input_method);
if (!input_method.client_active) return;
const text_input = self.getFocusedTextInput() orelse return;
if (input_method.current.preedit.text) |preedit_text| { if (input_method.current.preedit.text) |preedit_text| {
text_input.wlr_text_input.sendPreeditString( text_input.wlr_text_input.sendPreeditString(
preedit_text, preedit_text,
@ -159,6 +160,7 @@ pub fn sendInputMethodState(self: *Self, wlr_text_input: *wlr.TextInputV3) void
const input_method = self.input_method orelse return; const input_method = self.input_method orelse return;
// TODO: only send each of those if they were modified // TODO: only send each of those if they were modified
// after activation, all supported features must be sent
if (wlr_text_input.active_features.surrounding_text) { if (wlr_text_input.active_features.surrounding_text) {
if (wlr_text_input.current.surrounding.text) |text| { if (wlr_text_input.current.surrounding.text) |text| {
@ -201,7 +203,7 @@ pub fn setSurfaceFocus(self: *Self, wlr_surface: ?*wlr.Surface) void {
text_input.relay.disableTextInput(text_input); text_input.relay.disableTextInput(text_input);
text_input.wlr_text_input.sendLeave(); text_input.wlr_text_input.sendLeave();
} else { } else {
log.debug("IM relay setSurfaceFocus already focused", .{}); log.debug("input relay setSurfaceFocus already focused", .{});
continue; continue;
} }
} }

2
river/TextInput.zig
View File

@ -70,6 +70,8 @@ fn handleEnable(listener: *wl.Listener(*wlr.TextInputV3), _: *wlr.TextInputV3) v
return; return;
} }
// must send surrounding_text if supported
// must send content_type if supported
self.relay.sendInputMethodState(self.wlr_text_input); self.relay.sendInputMethodState(self.wlr_text_input);
} }