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

InputManager: eliminate "self" naming convention

Browse Source
This commit is contained in:
Isaac Freund 2024-03-14 12:34:28 +01:00
parent 693a2b0dda
commit f02d26c533
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
river/InputManager.zig
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/>. // along with this program. If not, see <https://www.gnu.org/licenses/>.
const Self = @This(); const InputManager = @This();
const build_options = @import("build_options"); const build_options = @import("build_options");
const std = @import("std"); const std = @import("std");
@ -72,11 +72,11 @@ new_input_method: wl.Listener(*wlr.InputMethodV2) =
new_text_input: wl.Listener(*wlr.TextInputV3) = new_text_input: wl.Listener(*wlr.TextInputV3) =
wl.Listener(*wlr.TextInputV3).init(handleNewTextInput), wl.Listener(*wlr.TextInputV3).init(handleNewTextInput),
pub fn init(self: *Self) !void { pub fn init(input_manager: *InputManager) !void {
const seat_node = try util.gpa.create(std.TailQueue(Seat).Node); const seat_node = try util.gpa.create(std.TailQueue(Seat).Node);
errdefer util.gpa.destroy(seat_node); errdefer util.gpa.destroy(seat_node);
self.* = .{ input_manager.* = .{
// These are automatically freed when the display is destroyed // These are automatically freed when the display is destroyed
.idle_notifier = try wlr.IdleNotifierV1.create(server.wl_server), .idle_notifier = try wlr.IdleNotifierV1.create(server.wl_server),
.relative_pointer_manager = try wlr.RelativePointerManagerV1.create(server.wl_server), .relative_pointer_manager = try wlr.RelativePointerManagerV1.create(server.wl_server),
@ -90,53 +90,53 @@ pub fn init(self: *Self) !void {
.devices = undefined, .devices = undefined,
}; };
self.devices.init(); input_manager.devices.init();
self.seats.prepend(seat_node); input_manager.seats.prepend(seat_node);
try seat_node.data.init(default_seat_name); try seat_node.data.init(default_seat_name);
if (build_options.xwayland) { if (build_options.xwayland) {
if (server.xwayland) |xwayland| { if (server.xwayland) |xwayland| {
xwayland.setSeat(self.defaultSeat().wlr_seat); xwayland.setSeat(input_manager.defaultSeat().wlr_seat);
} }
} }
server.backend.events.new_input.add(&self.new_input); server.backend.events.new_input.add(&input_manager.new_input);
self.virtual_pointer_manager.events.new_virtual_pointer.add(&self.new_virtual_pointer); input_manager.virtual_pointer_manager.events.new_virtual_pointer.add(&input_manager.new_virtual_pointer);
self.virtual_keyboard_manager.events.new_virtual_keyboard.add(&self.new_virtual_keyboard); input_manager.virtual_keyboard_manager.events.new_virtual_keyboard.add(&input_manager.new_virtual_keyboard);
self.pointer_constraints.events.new_constraint.add(&self.new_constraint); input_manager.pointer_constraints.events.new_constraint.add(&input_manager.new_constraint);
self.input_method_manager.events.input_method.add(&self.new_input_method); input_manager.input_method_manager.events.input_method.add(&input_manager.new_input_method);
self.text_input_manager.events.text_input.add(&self.new_text_input); input_manager.text_input_manager.events.text_input.add(&input_manager.new_text_input);
} }
pub fn deinit(self: *Self) void { pub fn deinit(input_manager: *InputManager) void {
// This function must be called after the backend has been destroyed // This function must be called after the backend has been destroyed
assert(self.devices.empty()); assert(input_manager.devices.empty());
self.new_virtual_pointer.link.remove(); input_manager.new_virtual_pointer.link.remove();
self.new_virtual_keyboard.link.remove(); input_manager.new_virtual_keyboard.link.remove();
self.new_constraint.link.remove(); input_manager.new_constraint.link.remove();
self.new_input_method.link.remove(); input_manager.new_input_method.link.remove();
self.new_text_input.link.remove(); input_manager.new_text_input.link.remove();
while (self.seats.pop()) |seat_node| { while (input_manager.seats.pop()) |seat_node| {
seat_node.data.deinit(); seat_node.data.deinit();
util.gpa.destroy(seat_node); util.gpa.destroy(seat_node);
} }
for (self.configs.items) |*config| { for (input_manager.configs.items) |*config| {
config.deinit(); config.deinit();
} }
self.configs.deinit(); input_manager.configs.deinit();
} }
pub fn defaultSeat(self: Self) *Seat { pub fn defaultSeat(input_manager: InputManager) *Seat {
return &self.seats.first.?.data; return &input_manager.seats.first.?.data;
} }
/// Returns true if input is currently allowed on the passed surface. /// Returns true if input is currently allowed on the passed surface.
pub fn inputAllowed(self: Self, wlr_surface: *wlr.Surface) bool { pub fn inputAllowed(input_manager: InputManager, wlr_surface: *wlr.Surface) bool {
return if (self.exclusive_client) |exclusive_client| return if (input_manager.exclusive_client) |exclusive_client|
exclusive_client == wlr_surface.resource.getClient() exclusive_client == wlr_surface.resource.getClient()
else else
true; true;
@ -144,10 +144,10 @@ pub fn inputAllowed(self: Self, wlr_surface: *wlr.Surface) bool {
/// Reconfigures all devices' libinput configuration as well as their output mapping. /// Reconfigures all devices' libinput configuration as well as their output mapping.
/// This is called on outputs being added or removed and on the input configuration being changed. /// This is called on outputs being added or removed and on the input configuration being changed.
pub fn reconfigureDevices(self: *Self) void { pub fn reconfigureDevices(input_manager: *InputManager) void {
var it = self.devices.iterator(.forward); var it = input_manager.devices.iterator(.forward);
while (it.next()) |device| { while (it.next()) |device| {
for (self.configs.items) |config| { for (input_manager.configs.items) |config| {
if (globber.match(device.identifier, config.glob)) { if (globber.match(device.identifier, config.glob)) {
config.apply(device); config.apply(device);
} }
@ -156,16 +156,16 @@ pub fn reconfigureDevices(self: *Self) void {
} }
fn handleNewInput(listener: *wl.Listener(*wlr.InputDevice), wlr_device: *wlr.InputDevice) void { fn handleNewInput(listener: *wl.Listener(*wlr.InputDevice), wlr_device: *wlr.InputDevice) void {
const self = @fieldParentPtr(Self, "new_input", listener); const input_manager = @fieldParentPtr(InputManager, "new_input", listener);
self.defaultSeat().addDevice(wlr_device); input_manager.defaultSeat().addDevice(wlr_device);
} }
fn handleNewVirtualPointer( fn handleNewVirtualPointer(
listener: *wl.Listener(*wlr.VirtualPointerManagerV1.event.NewPointer), listener: *wl.Listener(*wlr.VirtualPointerManagerV1.event.NewPointer),
event: *wlr.VirtualPointerManagerV1.event.NewPointer, event: *wlr.VirtualPointerManagerV1.event.NewPointer,
) void { ) void {
const self = @fieldParentPtr(Self, "new_virtual_pointer", listener); const input_manager = @fieldParentPtr(InputManager, "new_virtual_pointer", listener);
// TODO Support multiple seats and don't ignore // TODO Support multiple seats and don't ignore
if (event.suggested_seat != null) { if (event.suggested_seat != null) {
@ -176,7 +176,7 @@ fn handleNewVirtualPointer(
log.debug("Ignoring output suggestion from virtual pointer", .{}); log.debug("Ignoring output suggestion from virtual pointer", .{});
} }
self.defaultSeat().addDevice(&event.new_pointer.pointer.base); input_manager.defaultSeat().addDevice(&event.new_pointer.pointer.base);
} }
fn handleNewVirtualKeyboard( fn handleNewVirtualKeyboard(