Nulo/river
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make InputManager a toplevel struct

Browse source
This commit is contained in:
Isaac Freund 2020-05-02 16:28:17 +02:00
parent a03cab94fc
commit 4c97531860
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
3 changed files with 103 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

203
src/input_manager.zig
View file

@ -1,130 +1,129 @@
const Self = @This();
const std = @import("std"); const std = @import("std");
const c = @import("c.zig"); const c = @import("c.zig");
const Log = @import("log.zig").Log; const Log = @import("log.zig").Log;
const Seat = @import("seat.zig").Seat; const Seat = @import("seat.zig").Seat;
const Server = @import("server.zig"); const Server = @import("server.zig");
pub const InputManager = struct { const default_seat_name = "default";
const Self = @This();
const default_seat_name = "default"; server: *Server,
server: *Server, wlr_input_inhibit_manager: *c.wlr_input_inhibit_manager,
wlr_input_inhibit_manager: *c.wlr_input_inhibit_manager, seats: std.TailQueue(Seat),
default_seat: *Seat,
seats: std.TailQueue(Seat), exclusive_client: ?*c.wl_client,
default_seat: *Seat,
exclusive_client: ?*c.wl_client, listen_inhibit_activate: c.wl_listener,
listen_inhibit_deactivate: c.wl_listener,
listen_new_input: c.wl_listener,
listen_inhibit_activate: c.wl_listener, pub fn init(self: *Self, server: *Server) !void {
listen_inhibit_deactivate: c.wl_listener, self.server = server;
listen_new_input: c.wl_listener,
pub fn init(self: *Self, server: *Server) !void { // This is automatically freed when the display is destroyed
self.server = server; self.wlr_input_inhibit_manager =
c.wlr_input_inhibit_manager_create(server.wl_display) orelse
return error.CantCreateInputInhibitManager;
// This is automatically freed when the display is destroyed self.seats = std.TailQueue(Seat).init();
self.wlr_input_inhibit_manager =
c.wlr_input_inhibit_manager_create(server.wl_display) orelse
return error.CantCreateInputInhibitManager;
self.seats = std.TailQueue(Seat).init(); const seat_node = try server.allocator.create(std.TailQueue(Seat).Node);
try seat_node.data.init(self, default_seat_name);
self.default_seat = &seat_node.data;
self.seats.prepend(seat_node);
const seat_node = try server.allocator.create(std.TailQueue(Seat).Node); self.exclusive_client = null;
try seat_node.data.init(self, default_seat_name);
self.default_seat = &seat_node.data;
self.seats.prepend(seat_node);
self.exclusive_client = null; // Set up all listeners
self.listen_inhibit_activate.notify = handleInhibitActivate;
c.wl_signal_add(
&self.wlr_input_inhibit_manager.events.activate,
&self.listen_inhibit_activate,
);
// Set up all listeners self.listen_inhibit_deactivate.notify = handleInhibitDeactivate;
self.listen_inhibit_activate.notify = handleInhibitActivate; c.wl_signal_add(
c.wl_signal_add( &self.wlr_input_inhibit_manager.events.deactivate,
&self.wlr_input_inhibit_manager.events.activate, &self.listen_inhibit_deactivate,
&self.listen_inhibit_activate, );
);
self.listen_inhibit_deactivate.notify = handleInhibitDeactivate; self.listen_new_input.notify = handleNewInput;
c.wl_signal_add( c.wl_signal_add(&self.server.wlr_backend.events.new_input, &self.listen_new_input);
&self.wlr_input_inhibit_manager.events.deactivate, }
&self.listen_inhibit_deactivate,
);
self.listen_new_input.notify = handleNewInput; pub fn deinit(self: *Self) void {
c.wl_signal_add(&self.server.wlr_backend.events.new_input, &self.listen_new_input); while (self.seats.pop()) |seat_node| {
seat_node.data.deinit();
self.server.allocator.destroy(seat_node);
}
}
/// Must be called whenever a view is unmapped.
pub fn handleViewUnmap(self: Self, view: *View) void {
var it = self.seats.first;
while (it) |node| : (it = node.next) {
const seat = &node.data;
seat.handleViewUnmap(view);
}
}
/// Returns true if input is currently allowed on the passed surface.
pub fn inputAllowed(self: Self, wlr_surface: *c.wlr_surface) bool {
return if (self.exclusive_client) |exclusive_client|
exclusive_client == c.wl_resource_get_client(wlr_surface.resource)
else
true;
}
fn handleInhibitActivate(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
const self = @fieldParentPtr(Self, "listen_inhibit_activate", listener.?);
Log.Debug.log("Input inhibitor activated", .{});
// Clear focus of all seats
var seat_it = self.seats.first;
while (seat_it) |seat_node| : (seat_it = seat_node.next) {
seat_node.data.setFocusRaw(.{ .none = {} });
} }
pub fn deinit(self: *Self) void { self.exclusive_client = self.wlr_input_inhibit_manager.active_client;
while (self.seats.pop()) |seat_node| { }
seat_node.data.deinit();
self.server.allocator.destroy(seat_node); fn handleInhibitDeactivate(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
} const self = @fieldParentPtr(Self, "listen_inhibit_deactivate", listener.?);
Log.Debug.log("Input inhibitor deactivated", .{});
self.exclusive_client = null;
// Calling arrangeLayers() like this ensures that any top or overlay,
// keyboard-interactive surfaces will re-grab focus.
var output_it = self.server.root.outputs.first;
while (output_it) |output_node| : (output_it = output_node.next) {
output_node.data.arrangeLayers();
} }
/// Must be called whenever a view is unmapped. // After ensuring that any possible layer surface focus grab has occured,
pub fn handleViewUnmap(self: Self, view: *View) void { // have each Seat handle focus.
var it = self.seats.first; var seat_it = self.seats.first;
while (it) |node| : (it = node.next) { while (seat_it) |seat_node| : (seat_it = seat_node.next) {
const seat = &node.data; seat_node.data.focus(null);
seat.handleViewUnmap(view);
}
} }
}
/// Returns true if input is currently allowed on the passed surface. /// This event is raised by the backend when a new input device becomes available.
pub fn inputAllowed(self: Self, wlr_surface: *c.wlr_surface) bool { fn handleNewInput(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
return if (self.exclusive_client) |exclusive_client| const self = @fieldParentPtr(Self, "listen_new_input", listener.?);
exclusive_client == c.wl_resource_get_client(wlr_surface.resource) const device = @ptrCast(*c.wlr_input_device, @alignCast(@alignOf(*c.wlr_input_device), data));
else
true; // TODO: suport multiple seats
if (self.seats.first) |seat_node| {
seat_node.data.addDevice(device) catch unreachable;
} }
}
fn handleInhibitActivate(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
const self = @fieldParentPtr(Self, "listen_inhibit_activate", listener.?);
Log.Debug.log("Input inhibitor activated", .{});
// Clear focus of all seats
var seat_it = self.seats.first;
while (seat_it) |seat_node| : (seat_it = seat_node.next) {
seat_node.data.setFocusRaw(.{ .none = {} });
}
self.exclusive_client = self.wlr_input_inhibit_manager.active_client;
}
fn handleInhibitDeactivate(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
const self = @fieldParentPtr(Self, "listen_inhibit_deactivate", listener.?);
Log.Debug.log("Input inhibitor deactivated", .{});
self.exclusive_client = null;
// Calling arrangeLayers() like this ensures that any top or overlay,
// keyboard-interactive surfaces will re-grab focus.
var output_it = self.server.root.outputs.first;
while (output_it) |output_node| : (output_it = output_node.next) {
output_node.data.arrangeLayers();
}
// After ensuring that any possible layer surface focus grab has occured,
// have each Seat handle focus.
var seat_it = self.seats.first;
while (seat_it) |seat_node| : (seat_it = seat_node.next) {
seat_node.data.focus(null);
}
}
/// This event is raised by the backend when a new input device becomes available.
fn handleNewInput(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
const self = @fieldParentPtr(Self, "listen_new_input", listener.?);
const device = @ptrCast(*c.wlr_input_device, @alignCast(@alignOf(*c.wlr_input_device), data));
// TODO: suport multiple seats
if (self.seats.first) |seat_node| {
seat_node.data.addDevice(device) catch unreachable;
}
}
};

2
src/seat.zig
View file

@ -2,7 +2,7 @@ const c = @import("c.zig");
const std = @import("std"); const std = @import("std");
const Cursor = @import("cursor.zig").Cursor; const Cursor = @import("cursor.zig").Cursor;
const InputManager = @import("input_manager.zig").InputManager; const InputManager = @import("input_manager.zig");
const Keyboard = @import("keyboard.zig").Keyboard; const Keyboard = @import("keyboard.zig").Keyboard;
const LayerSurface = @import("layer_surface.zig").LayerSurface; const LayerSurface = @import("layer_surface.zig").LayerSurface;
const Output = @import("output.zig").Output; const Output = @import("output.zig").Output;

2
src/server.zig
View file

@ -6,7 +6,7 @@ const c = @import("c.zig");
const Config = @import("config.zig"); const Config = @import("config.zig");
const DecorationManager = @import("decoration_manager.zig"); const DecorationManager = @import("decoration_manager.zig");
const InputManager = @import("input_manager.zig").InputManager; const InputManager = @import("input_manager.zig");
const Log = @import("log.zig").Log; const Log = @import("log.zig").Log;
const Output = @import("output.zig").Output; const Output = @import("output.zig").Output;
const Root = @import("root.zig").Root; const Root = @import("root.zig").Root;