From 0904dc53467d9e94cdce050c493e9377da8ebfcc Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Tue, 19 May 2020 13:25:16 +0200 Subject: [PATCH] Create WindowManagement struct --- build.zig | 2 ++ src/Server.zig | 3 ++ src/WindowManagement.zig | 77 ++++++++++++++++++++++++++++++++++++++++ src/c.zig | 2 ++ 4 files changed, 84 insertions(+) create mode 100644 src/WindowManagement.zig diff --git a/build.zig b/build.zig index 54597d3..d57a142 100644 --- a/build.zig +++ b/build.zig @@ -45,6 +45,7 @@ pub fn build(b: *std.build.Builder) !void { fn addDeps(exe: *std.build.LibExeObjStep, protocol_step: *std.build.Step) void { exe.step.dependOn(protocol_step); exe.addIncludeDir("protocol"); + exe.addCSourceFile("protocol/river-window-management-unstable-v1-protocol.c", &[_][]const u8{"-std=c99"}); exe.addCSourceFile("include/bindings.c", &[_][]const u8{"-std=c99"}); exe.addIncludeDir("."); @@ -83,6 +84,7 @@ const ScanProtocolsStep = struct { const protocol_dir_paths = [_][]const []const u8{ &[_][]const u8{ protocol_dir, "stable/xdg-shell/xdg-shell.xml" }, &[_][]const u8{ "protocol", "wlr-layer-shell-unstable-v1.xml" }, + &[_][]const u8{ "protocol", "river-window-management-unstable-v1.xml" }, }; for (protocol_dir_paths) |dir_path| { diff --git a/src/Server.zig b/src/Server.zig index 69ec78e..622b76f 100644 --- a/src/Server.zig +++ b/src/Server.zig @@ -31,6 +31,7 @@ const Output = @import("Output.zig"); const Root = @import("Root.zig"); const View = @import("View.zig"); const ViewStack = @import("view_stack.zig").ViewStack; +const WindowManagement = @import("WindowManagement.zig"); const XwaylandUnmanaged = @import("XwaylandUnmanaged.zig"); allocator: *std.mem.Allocator, @@ -55,6 +56,7 @@ decoration_manager: DecorationManager, input_manager: InputManager, root: Root, config: Config, +window_management: WindowManagement, pub fn init(self: *Self, allocator: *std.mem.Allocator) !void { self.allocator = allocator; @@ -120,6 +122,7 @@ pub fn init(self: *Self, allocator: *std.mem.Allocator) !void { try self.root.init(self); // Must be called after root is initialized try self.input_manager.init(self); + try self.window_management.init(self); // These all free themselves when the wl_display is destroyed _ = c.wlr_data_device_manager_create(self.wl_display) orelse diff --git a/src/WindowManagement.zig b/src/WindowManagement.zig new file mode 100644 index 0000000..be8d425 --- /dev/null +++ b/src/WindowManagement.zig @@ -0,0 +1,77 @@ +// This file is part of river, a dynamic tiling wayland compositor. +// +// Copyright 2020 Isaac Freund +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +const Self = @This(); + +const std = @import("std"); + +const c = @import("c.zig"); + +const Log = @import("log.zig").Log; +const Server = @import("Server.zig"); + +const protocol_version = 1; + +const implementation = c.struct_zriver_window_manager_v1_interface{ + .run_command = runCommand, +}; + +server: *Server, +wl_global: *c.wl_global, + +listen_display_destroy: c.wl_listener, + +pub fn init(self: *Self, server: *Server) !void { + self.wl_global = c.wl_global_create( + server.wl_display, + &c.zriver_window_manager_v1_interface, + protocol_version, + self, + bind, + ) orelse return error.CantCreateRiverWindowManagementGlobal; + + self.listen_display_destroy.notify = handleDisplayDestroy; + c.wl_display_add_destroy_listener(server.wl_display, &self.listen_display_destroy); +} + +fn handleDisplayDestroy(wl_listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void { + const self = @fieldParentPtr(Self, "listen_display_destroy", wl_listener.?); + c.wl_global_destroy(self.wl_global); +} + +/// Called when a client binds our global +fn bind(wl_client: ?*c.wl_client, data: ?*c_void, version: u32, id: u32) callconv(.C) void { + const self = @ptrCast(*Self, @alignCast(@alignOf(*Self), data)); + const wl_resource = c.wl_resource_create( + wl_client, + &c.zriver_window_manager_v1_interface, + @intCast(c_int, version), + id, + ) orelse { + c.wl_client_post_no_memory(wl_client); + return; + }; + c.wl_resource_set_implementation(wl_resource, &implementation, self, resourceDestroy); +} + +fn resourceDestroy(wl_resource: ?*c.wl_resource) callconv(.C) void { + // TODO +} + +fn runCommand(wl_client: ?*c.wl_client, wl_resource: ?*c.wl_resource, command: ?[*:0]const u8) callconv(.C) void { + Log.Debug.log("command: {}", .{command}); +} diff --git a/src/c.zig b/src/c.zig index aae0095..a242622 100644 --- a/src/c.zig +++ b/src/c.zig @@ -47,6 +47,8 @@ pub usingnamespace @cImport({ // Contains a subset of functions from wlr/backend.h and wlr/render/wlr_renderer.h // that can be automatically imported @cInclude("include/bindings.h"); + + @cInclude("river-window-management-unstable-v1-protocol.h"); }); // These are needed because zig currently names translated anonymous unions