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

session-lock: add basic logging

Browse Source
This commit is contained in:
Isaac Freund 2022-05-21 16:22:28 +02:00
parent 49efbfe046
commit 98d2f6a568
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
river/LockManager.zig
View File

@ -26,6 +26,8 @@ const util = @import("util.zig");
const LockSurface = @import("LockSurface.zig"); const LockSurface = @import("LockSurface.zig");
const log = std.log.scoped(.session_lock);
locked: bool = false, locked: bool = false,
lock: ?*wlr.SessionLockV1 = null, lock: ?*wlr.SessionLockV1 = null,
@ -52,6 +54,7 @@ fn handleLock(listener: *wl.Listener(*wlr.SessionLockV1), lock: *wlr.SessionLock
const manager = @fieldParentPtr(LockManager, "new_lock", listener); const manager = @fieldParentPtr(LockManager, "new_lock", listener);
if (manager.lock != null) { if (manager.lock != null) {
log.info("denying new session lock client, an active one already exists", .{});
lock.destroy(); lock.destroy();
return; return;
} }
@ -72,6 +75,10 @@ fn handleLock(listener: *wl.Listener(*wlr.SessionLockV1), lock: *wlr.SessionLock
seat.prev_mode_id = seat.mode_id; seat.prev_mode_id = seat.mode_id;
seat.enterMode(1); seat.enterMode(1);
} }
log.info("session locked", .{});
} else {
log.info("new session lock client given control of already locked session", .{});
} }
lock.events.new_surface.add(&manager.new_surface); lock.events.new_surface.add(&manager.new_surface);
@ -85,6 +92,8 @@ fn handleUnlock(listener: *wl.Listener(void)) void {
assert(manager.locked); assert(manager.locked);
manager.locked = false; manager.locked = false;
log.info("session unlocked", .{});
{ {
var it = server.input_manager.seats.first; var it = server.input_manager.seats.first;
while (it) |node| : (it = node.next) { while (it) |node| : (it = node.next) {
@ -104,6 +113,8 @@ fn handleUnlock(listener: *wl.Listener(void)) void {
fn handleDestroy(listener: *wl.Listener(void)) void { fn handleDestroy(listener: *wl.Listener(void)) void {
const manager = @fieldParentPtr(LockManager, "destroy", listener); const manager = @fieldParentPtr(LockManager, "destroy", listener);
log.debug("ext_session_lock_v1 destroyed", .{});
manager.new_surface.link.remove(); manager.new_surface.link.remove();
manager.unlock.link.remove(); manager.unlock.link.remove();
manager.destroy.link.remove(); manager.destroy.link.remove();
@ -117,6 +128,8 @@ fn handleSurface(
) void { ) void {
const manager = @fieldParentPtr(LockManager, "new_surface", listener); const manager = @fieldParentPtr(LockManager, "new_surface", listener);
log.debug("new ext_session_lock_surface_v1 created", .{});
assert(manager.locked); assert(manager.locked);
assert(manager.lock != null); assert(manager.lock != null);