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

StatusManager: eliminate "self" naming convention

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

34
river/StatusManager.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 StatusManager = @This();
const std = @import("std"); const std = @import("std");
const wlr = @import("wlroots"); const wlr = @import("wlroots");
@ -37,46 +37,46 @@ global: *wl.Global,
server_destroy: wl.Listener(*wl.Server) = wl.Listener(*wl.Server).init(handleServerDestroy), server_destroy: wl.Listener(*wl.Server) = wl.Listener(*wl.Server).init(handleServerDestroy),
pub fn init(self: *Self) !void { pub fn init(status_manager: *StatusManager) !void {
self.* = .{ status_manager.* = .{
.global = try wl.Global.create(server.wl_server, zriver.StatusManagerV1, 4, ?*anyopaque, null, bind), .global = try wl.Global.create(server.wl_server, zriver.StatusManagerV1, 4, ?*anyopaque, null, bind),
}; };
server.wl_server.addDestroyListener(&self.server_destroy); server.wl_server.addDestroyListener(&status_manager.server_destroy);
} }
fn handleServerDestroy(listener: *wl.Listener(*wl.Server), _: *wl.Server) void { fn handleServerDestroy(listener: *wl.Listener(*wl.Server), _: *wl.Server) void {
const self = @fieldParentPtr(Self, "server_destroy", listener); const status_manager = @fieldParentPtr(StatusManager, "server_destroy", listener);
self.global.destroy(); status_manager.global.destroy();
} }
fn bind(client: *wl.Client, _: ?*anyopaque, version: u32, id: u32) void { fn bind(client: *wl.Client, _: ?*anyopaque, version: u32, id: u32) void {
const status_manager = zriver.StatusManagerV1.create(client, version, id) catch { const status_manager_v1 = zriver.StatusManagerV1.create(client, version, id) catch {
client.postNoMemory(); client.postNoMemory();
log.err("out of memory", .{}); log.err("out of memory", .{});
return; return;
}; };
status_manager.setHandler(?*anyopaque, handleRequest, null, null); status_manager_v1.setHandler(?*anyopaque, handleRequest, null, null);
} }
fn handleRequest( fn handleRequest(
status_manager: *zriver.StatusManagerV1, status_manager_v1: *zriver.StatusManagerV1,
request: zriver.StatusManagerV1.Request, request: zriver.StatusManagerV1.Request,
_: ?*anyopaque, _: ?*anyopaque,
) void { ) void {
switch (request) { switch (request) {
.destroy => status_manager.destroy(), .destroy => status_manager_v1.destroy(),
.get_river_output_status => |req| { .get_river_output_status => |req| {
// ignore if the output is inert // ignore if the output is inert
const wlr_output = wlr.Output.fromWlOutput(req.output) orelse return; const wlr_output = wlr.Output.fromWlOutput(req.output) orelse return;
const output: *Output = @ptrFromInt(wlr_output.data); const output: *Output = @ptrFromInt(wlr_output.data);
const resource = zriver.OutputStatusV1.create( const resource = zriver.OutputStatusV1.create(
status_manager.getClient(), status_manager_v1.getClient(),
status_manager.getVersion(), status_manager_v1.getVersion(),
req.id, req.id,
) catch { ) catch {
status_manager.getClient().postNoMemory(); status_manager_v1.getClient().postNoMemory();
log.err("out of memory", .{}); log.err("out of memory", .{});
return; return;
}; };
@ -89,17 +89,17 @@ fn handleRequest(
const seat: *Seat = @ptrFromInt(wlr_seat.seat.data); const seat: *Seat = @ptrFromInt(wlr_seat.seat.data);
const node = util.gpa.create(std.SinglyLinkedList(SeatStatus).Node) catch { const node = util.gpa.create(std.SinglyLinkedList(SeatStatus).Node) catch {
status_manager.getClient().postNoMemory(); status_manager_v1.getClient().postNoMemory();
log.err("out of memory", .{}); log.err("out of memory", .{});
return; return;
}; };
const seat_status = zriver.SeatStatusV1.create( const seat_status = zriver.SeatStatusV1.create(
status_manager.getClient(), status_manager_v1.getClient(),
status_manager.getVersion(), status_manager_v1.getVersion(),
req.id, req.id,
) catch { ) catch {
status_manager.getClient().postNoMemory(); status_manager_v1.getClient().postNoMemory();
util.gpa.destroy(node); util.gpa.destroy(node);
log.err("out of memory", .{}); log.err("out of memory", .{});
return; return;