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

layer-shell: default to focused output

Browse Source 
Layer shell clients may leave the output on which to display a layer
surface up to the compositor. Instead of always putting such surfaces
on the first output use the focused output of the default seat.
This commit is contained in:
Isaac Freund
2020-09-29 17:27:33 +02:00
parent 3e955935eb
commit d783347476
3 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
river/InputManager.zig
View File

@ -36,7 +36,6 @@ wlr_idle: *c.wlr_idle,
wlr_input_inhibit_manager: *c.wlr_input_inhibit_manager,
seats: std.TailQueue(Seat) = std.TailQueue(Seat).init(),
default_seat: *Seat,
exclusive_client: ?*c.wl_client = null,
@ -53,13 +52,12 @@ pub fn init(self: *Self, server: *Server) !void {
.wlr_idle = c.wlr_idle_create(server.wl_display) orelse return error.OutOfMemory,
.wlr_input_inhibit_manager = c.wlr_input_inhibit_manager_create(server.wl_display) orelse
return error.OutOfMemory,
.default_seat = &seat_node.data,
};
try seat_node.data.init(self, default_seat_name);
self.seats.prepend(seat_node);
try seat_node.data.init(self, default_seat_name);
if (build_options.xwayland) c.wlr_xwayland_set_seat(server.wlr_xwayland, self.default_seat.wlr_seat);
if (build_options.xwayland) c.wlr_xwayland_set_seat(server.wlr_xwayland, self.defaultSeat().wlr_seat);
// Set up all listeners
self.listen_inhibit_activate.notify = handleInhibitActivate;
@ -79,6 +77,10 @@ pub fn deinit(self: *Self) void {
}
}
pub fn defaultSeat(self: Self) *Seat {
return &self.seats.first.?.data;
}
/// Must be called whenever a view is unmapped.
pub fn handleViewUnmap(self: Self, view: *View) void {
var it = self.seats.first;
@ -147,5 +149,5 @@ fn handleNewInput(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
const device = util.voidCast(c.wlr_input_device, data.?);
// TODO: suport multiple seats
self.default_seat.addDevice(device);
self.defaultSeat().addDevice(device);
}