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

Keyboard: Add new keyboards to groups if matched

Browse Source 
Previously new keyboards would not be added to already existing
keyboard groups on (re-)connect. Only during the creation of
the groups themselves were devices added to them. This meant
that only keyboards connected during startup - before the init
is executed - would work with groups in a typical river session.
This commit is contained in:
Leon Henrik Plickat 2024-01-03 20:58:04 +01:00 committed by Isaac Freund
parent ebb6d1bdd1
commit c86f460135
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
river/Keyboard.zig
View File

@ -1,6 +1,6 @@
// This file is part of river, a dynamic tiling wayland compositor. // This file is part of river, a dynamic tiling wayland compositor.
// //
// Copyright 2020 The River Developers // Copyright 2020 - 2024 The River Developers
// //
// This program is free software: you can redistribute it and/or modify // This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
@ -52,6 +52,16 @@ pub fn init(self: *Self, seat: *Seat, wlr_device: *wlr.InputDevice) !void {
// wlroots will log a more detailed error if this fails. // wlroots will log a more detailed error if this fails.
if (!wlr_keyboard.setKeymap(server.config.keymap)) return error.OutOfMemory; if (!wlr_keyboard.setKeymap(server.config.keymap)) return error.OutOfMemory;
// Add to keyboard group, if applicable.
var it = seat.keyboard_groups.first;
while (it) |node| : (it = node.next) {
if (node.data.identifiers.contains(self.device.identifier)) {
// wlroots will log an error if this fails explaining the reason.
_ = node.data.wlr_group.addKeyboard(wlr_keyboard);
break;
}
}
wlr_keyboard.setRepeatInfo(server.config.repeat_rate, server.config.repeat_delay); wlr_keyboard.setRepeatInfo(server.config.repeat_rate, server.config.repeat_delay);
wlr_keyboard.events.key.add(&self.key); wlr_keyboard.events.key.add(&self.key);