Make Decoration a toplevel struct

This commit is contained in:
Isaac Freund 2020-05-02 16:25:04 +02:00
parent fb766fe09c
commit d20d01e596
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
2 changed files with 25 additions and 26 deletions

View file

@ -1,37 +1,36 @@
const Self = @This();
const std = @import("std");
const c = @import("c.zig");
const DecorationManager = @import("decoration_manager.zig");
// TODO: this needs to listen for destroy and free nodes from the deco list
pub const Decoration = struct {
const Self = @This();
decoration_manager: *DecorationManager,
wlr_xdg_toplevel_decoration: *c.wlr_xdg_toplevel_decoration_v1,
listen_request_mode: c.wl_listener,
pub fn init(
self: *Self,
decoration_manager: *DecorationManager,
wlr_xdg_toplevel_decoration: *c.wlr_xdg_toplevel_decoration_v1,
) void {
self.decoration_manager = decoration_manager;
self.wlr_xdg_toplevel_decoration = wlr_xdg_toplevel_decoration;
listen_request_mode: c.wl_listener,
self.listen_request_mode.notify = handleRequestMode;
c.wl_signal_add(&self.wlr_xdg_toplevel_decoration.events.request_mode, &self.listen_request_mode);
pub fn init(
self: *Self,
decoration_manager: *DecorationManager,
wlr_xdg_toplevel_decoration: *c.wlr_xdg_toplevel_decoration_v1,
) void {
self.decoration_manager = decoration_manager;
self.wlr_xdg_toplevel_decoration = wlr_xdg_toplevel_decoration;
handleRequestMode(&self.listen_request_mode, self.wlr_xdg_toplevel_decoration);
}
self.listen_request_mode.notify = handleRequestMode;
c.wl_signal_add(&self.wlr_xdg_toplevel_decoration.events.request_mode, &self.listen_request_mode);
handleRequestMode(&self.listen_request_mode, self.wlr_xdg_toplevel_decoration);
}
fn handleRequestMode(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
const self = @fieldParentPtr(Self, "listen_request_mode", listener.?);
// TODO: we might need to take this configure serial and do a transaction
_ = c.wlr_xdg_toplevel_decoration_v1_set_mode(
self.wlr_xdg_toplevel_decoration,
c.wlr_xdg_toplevel_decoration_v1_mode.WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE,
);
}
};
fn handleRequestMode(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
const self = @fieldParentPtr(Self, "listen_request_mode", listener.?);
// TODO: we might need to take this configure serial and do a transaction
_ = c.wlr_xdg_toplevel_decoration_v1_set_mode(
self.wlr_xdg_toplevel_decoration,
c.wlr_xdg_toplevel_decoration_v1_mode.WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE,
);
}

View file

@ -4,7 +4,7 @@ const std = @import("std");
const c = @import("c.zig");
const Decoration = @import("decoration.zig").Decoration;
const Decoration = @import("decoration.zig");
const Server = @import("server.zig");
server: *Server,