From d83cbf55d16c04c3fe8316805cde8f4fe6a6610e Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Sun, 24 May 2020 20:58:39 +0200 Subject: Split control into separate protocol --- src/Control.zig | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/Server.zig | 6 +-- src/WindowManager.zig | 127 -------------------------------------------------- src/c.zig | 2 +- src/riverctl.zig | 18 +++---- 5 files changed, 140 insertions(+), 140 deletions(-) create mode 100644 src/Control.zig delete mode 100644 src/WindowManager.zig (limited to 'src') diff --git a/src/Control.zig b/src/Control.zig new file mode 100644 index 0000000..b870ada --- /dev/null +++ b/src/Control.zig @@ -0,0 +1,127 @@ +// 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 Command = @import("Command.zig"); +const Log = @import("log.zig").Log; +const Server = @import("Server.zig"); + +const protocol_version = 1; + +const implementation = c.struct_zriver_control_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.server = server; + self.wl_global = c.wl_global_create( + server.wl_display, + &c.zriver_control_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_control_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, + wl_array: ?*c.wl_array, + callback_id: u32, +) callconv(.C) void { + const self = @ptrCast(*Self, @alignCast(@alignOf(*Self), c.wl_resource_get_user_data(wl_resource))); + const allocator = self.server.allocator; + + var args = std.ArrayList([]const u8).init(allocator); + + var i: usize = 0; + const data = @ptrCast([*]const u8, wl_array.?.data); + while (i < wl_array.?.size) { + const slice = std.mem.spanZ(@ptrCast([*:0]const u8, &data[i])); + args.append(std.mem.dupe(allocator, u8, slice) catch unreachable) catch unreachable; + + i += slice.len + 1; + } + + const callback_resource = c.wl_resource_create( + wl_client, + &c.zriver_command_callback_v1_interface, + protocol_version, + callback_id, + ) orelse { + c.wl_client_post_no_memory(wl_client); + return; + }; + + c.wl_resource_set_implementation(callback_resource, null, null, null); + + const command = Command.init(args.items, allocator) catch |err| { + c.zriver_command_callback_v1_send_failure( + callback_resource, + switch (err) { + Command.Error.NoCommand => "no command given", + Command.Error.UnknownCommand => "unknown command", + Command.Error.NotEnoughArguments => "not enough arguments", + Command.Error.TooManyArguments => "too many arguments", + Command.Error.Overflow => "value out of bounds", + Command.Error.InvalidCharacter => "invalid character in argument", + Command.Error.InvalidDirection => "invalid direction. Must be 'next' or 'previous'", + Command.Error.OutOfMemory => unreachable, + }, + ); + return; + }; + c.zriver_command_callback_v1_send_success(callback_resource); + command.run(self.server.input_manager.default_seat); +} diff --git a/src/Server.zig b/src/Server.zig index 1aba359..e46a619 100644 --- a/src/Server.zig +++ b/src/Server.zig @@ -31,7 +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 WindowManager = @import("WindowManager.zig"); +const Control = @import("Control.zig"); const XwaylandUnmanaged = @import("XwaylandUnmanaged.zig"); allocator: *std.mem.Allocator, @@ -56,7 +56,7 @@ decoration_manager: DecorationManager, input_manager: InputManager, root: Root, config: Config, -window_manager: WindowManager, +control: Control, pub fn init(self: *Self, allocator: *std.mem.Allocator) !void { self.allocator = allocator; @@ -122,7 +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_manager.init(self); + try self.control.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/WindowManager.zig b/src/WindowManager.zig deleted file mode 100644 index 02bf90a..0000000 --- a/src/WindowManager.zig +++ /dev/null @@ -1,127 +0,0 @@ -// 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 Command = @import("Command.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.server = server; - 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, - wl_array: ?*c.wl_array, - callback_id: u32, -) callconv(.C) void { - const self = @ptrCast(*Self, @alignCast(@alignOf(*Self), c.wl_resource_get_user_data(wl_resource))); - const allocator = self.server.allocator; - - var args = std.ArrayList([]const u8).init(allocator); - - var i: usize = 0; - const data = @ptrCast([*]const u8, wl_array.?.data); - while (i < wl_array.?.size) { - const slice = std.mem.spanZ(@ptrCast([*:0]const u8, &data[i])); - args.append(std.mem.dupe(allocator, u8, slice) catch unreachable) catch unreachable; - - i += slice.len + 1; - } - - const callback_resource = c.wl_resource_create( - wl_client, - &c.zriver_command_callback_v1_interface, - protocol_version, - callback_id, - ) orelse { - c.wl_client_post_no_memory(wl_client); - return; - }; - - c.wl_resource_set_implementation(callback_resource, null, null, null); - - const command = Command.init(args.items, allocator) catch |err| { - c.zriver_command_callback_v1_send_failure( - callback_resource, - switch (err) { - Command.Error.NoCommand => "no command given", - Command.Error.UnknownCommand => "unknown command", - Command.Error.NotEnoughArguments => "not enough arguments", - Command.Error.TooManyArguments => "too many arguments", - Command.Error.Overflow => "value out of bounds", - Command.Error.InvalidCharacter => "invalid character in argument", - Command.Error.InvalidDirection => "invalid direction. Must be 'next' or 'previous'", - Command.Error.OutOfMemory => unreachable, - }, - ); - return; - }; - c.zriver_command_callback_v1_send_success(callback_resource); - command.run(self.server.input_manager.default_seat); -} diff --git a/src/c.zig b/src/c.zig index a242622..f7d6646 100644 --- a/src/c.zig +++ b/src/c.zig @@ -48,7 +48,7 @@ pub usingnamespace @cImport({ // that can be automatically imported @cInclude("include/bindings.h"); - @cInclude("river-window-management-unstable-v1-protocol.h"); + @cInclude("river-control-unstable-v1-protocol.h"); }); // These are needed because zig currently names translated anonymous unions diff --git a/src/riverctl.zig b/src/riverctl.zig index d5d45af..287c1aa 100644 --- a/src/riverctl.zig +++ b/src/riverctl.zig @@ -19,7 +19,7 @@ const std = @import("std"); const c = @cImport({ @cInclude("wayland-client.h"); - @cInclude("river-window-management-unstable-v1-client-protocol.h"); + @cInclude("river-control-unstable-v1-client-protocol.h"); }); const wl_registry_listener = c.wl_registry_listener{ @@ -32,7 +32,7 @@ const command_callback_listener = c.zriver_command_callback_v1_listener{ .failure = handleFailure, }; -var river_window_manager: ?*c.zriver_window_manager_v1 = null; +var river_control_optional: ?*c.zriver_control_v1 = null; pub fn main() !void { const wl_display = c.wl_display_connect(null) orelse return error.CantConnectToDisplay; @@ -42,7 +42,7 @@ pub fn main() !void { return error.FailedToAddListener; if (c.wl_display_roundtrip(wl_display) < 0) return error.RoundtripFailed; - const wm = river_window_manager orelse return error.RiverWMNotAdvertised; + const river_control = river_control_optional orelse return error.RiverControlNotAdvertised; var command: c.wl_array = undefined; c.wl_array_init(&command); @@ -57,7 +57,7 @@ pub fn main() !void { ptr[arg.len] = 0; } - const command_callback = c.zriver_window_manager_v1_run_command(wm, &command); + const command_callback = c.zriver_control_v1_run_command(river_control, &command); if (c.zriver_command_callback_v1_add_listener( command_callback, &command_callback_listener, @@ -75,15 +75,15 @@ fn handleGlobal( interface: ?[*:0]const u8, version: u32, ) callconv(.C) void { - // We only care about the river_window_manager global + // We only care about the river_control global if (std.mem.eql( u8, std.mem.spanZ(interface.?), - std.mem.spanZ(@ptrCast([*:0]const u8, c.zriver_window_manager_v1_interface.name.?)), + std.mem.spanZ(@ptrCast([*:0]const u8, c.zriver_control_v1_interface.name.?)), )) { - river_window_manager = @ptrCast( - *c.zriver_window_manager_v1, - c.wl_registry_bind(wl_registry, name, &c.zriver_window_manager_v1_interface, 1), + river_control_optional = @ptrCast( + *c.zriver_control_v1, + c.wl_registry_bind(wl_registry, name, &c.zriver_control_v1_interface, 1), ); } } -- cgit v1.2.3