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

input-method: address nits

Browse Source
This commit is contained in:
praschke 2023-12-31 17:39:32 +00:00 committed by Isaac Freund
parent 8f497a3570
commit 55ed16efd1
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
river/InputRelay.zig
View File

@ -94,8 +94,12 @@ fn handleInputMethodDestroy(
input_method: *wlr.InputMethodV2, input_method: *wlr.InputMethodV2,
) void { ) void {
const self = @fieldParentPtr(Self, "input_method_destroy", listener); const self = @fieldParentPtr(Self, "input_method_destroy", listener);
assert(input_method == self.input_method); assert(input_method == self.input_method);
self.input_method_commit.link.remove();
self.grab_keyboard.link.remove();
self.input_method_destroy.link.remove();
self.input_method = null; self.input_method = null;
const text_input = self.getFocusedTextInput() orelse return; const text_input = self.getFocusedTextInput() orelse return;
@ -182,10 +186,8 @@ pub fn sendInputMethodState(self: *Self, wlr_text_input: *wlr.TextInputV3) void
} }
input_method.sendDone(); input_method.sendDone();
// TODO: pass intent, display popup size
} }
/// 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 new_text_input: ?*TextInput = null;
@ -210,6 +212,7 @@ pub fn setSurfaceFocus(self: *Self, wlr_surface: ?*wlr.Surface) void {
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()) {
assert(new_text_input == null);
new_text_input = text_input; new_text_input = text_input;
} }
} }