river: add rules system
This is a breaking change and replaces the previous csd-filter-add/remove and float-filter-add/remove commands. See the riverctl(1) man page for documentation on the new system.
This commit is contained in:
@ -18,13 +18,14 @@ const Self = @This();
|
||||
|
||||
const std = @import("std");
|
||||
const mem = std.mem;
|
||||
const globber = @import("globber");
|
||||
const xkb = @import("xkbcommon");
|
||||
|
||||
const util = @import("util.zig");
|
||||
|
||||
const Server = @import("Server.zig");
|
||||
const Mode = @import("Mode.zig");
|
||||
const View = @import("View.zig");
|
||||
const RuleList = @import("RuleList.zig");
|
||||
|
||||
pub const AttachMode = enum {
|
||||
top,
|
||||
@ -72,13 +73,8 @@ mode_to_id: std.StringHashMap(u32),
|
||||
/// All user-defined keymap modes, indexed by mode id
|
||||
modes: std.ArrayListUnmanaged(Mode),
|
||||
|
||||
/// Sets of app_ids and titles which will be started floating
|
||||
float_filter_app_ids: std.StringHashMapUnmanaged(void) = .{},
|
||||
float_filter_titles: std.StringHashMapUnmanaged(void) = .{},
|
||||
|
||||
/// Sets of app_ids and titles which are allowed to use client side decorations
|
||||
csd_filter_app_ids: std.StringHashMapUnmanaged(void) = .{},
|
||||
csd_filter_titles: std.StringHashMapUnmanaged(void) = .{},
|
||||
float_rules: RuleList = .{},
|
||||
ssd_rules: RuleList = .{},
|
||||
|
||||
/// The selected focus_follows_cursor mode
|
||||
focus_follows_cursor: FocusFollowsCursorMode = .disabled,
|
||||
@ -152,64 +148,11 @@ pub fn deinit(self: *Self) void {
|
||||
for (self.modes.items) |*mode| mode.deinit();
|
||||
self.modes.deinit(util.gpa);
|
||||
|
||||
{
|
||||
var it = self.float_filter_app_ids.keyIterator();
|
||||
while (it.next()) |key| util.gpa.free(key.*);
|
||||
self.float_filter_app_ids.deinit(util.gpa);
|
||||
}
|
||||
|
||||
{
|
||||
var it = self.float_filter_titles.keyIterator();
|
||||
while (it.next()) |key| util.gpa.free(key.*);
|
||||
self.float_filter_titles.deinit(util.gpa);
|
||||
}
|
||||
|
||||
{
|
||||
var it = self.csd_filter_app_ids.keyIterator();
|
||||
while (it.next()) |key| util.gpa.free(key.*);
|
||||
self.csd_filter_app_ids.deinit(util.gpa);
|
||||
}
|
||||
|
||||
{
|
||||
var it = self.csd_filter_titles.keyIterator();
|
||||
while (it.next()) |key| util.gpa.free(key.*);
|
||||
self.csd_filter_titles.deinit(util.gpa);
|
||||
}
|
||||
self.float_rules.deinit();
|
||||
self.ssd_rules.deinit();
|
||||
|
||||
util.gpa.free(self.default_layout_namespace);
|
||||
|
||||
self.keymap.unref();
|
||||
self.xkb_context.unref();
|
||||
}
|
||||
|
||||
pub fn shouldFloat(self: Self, view: *View) bool {
|
||||
if (view.getAppId()) |app_id| {
|
||||
if (self.float_filter_app_ids.contains(std.mem.span(app_id))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
if (view.getTitle()) |title| {
|
||||
if (self.float_filter_titles.contains(std.mem.span(title))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
pub fn csdAllowed(self: Self, view: *View) bool {
|
||||
if (view.getAppId()) |app_id| {
|
||||
if (self.csd_filter_app_ids.contains(std.mem.span(app_id))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
if (view.getTitle()) |title| {
|
||||
if (self.csd_filter_titles.contains(std.mem.span(title))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
@ -877,7 +877,7 @@ fn processMotion(self: *Self, device: *wlr.InputDevice, time: u32, delta_x: f64,
|
||||
|
||||
{
|
||||
// Modify the pending box, taking constraints into account
|
||||
const border_width = if (data.view.pending.borders) server.config.border_width else 0;
|
||||
const border_width = if (data.view.pending.ssd) server.config.border_width else 0;
|
||||
|
||||
var output_width: i32 = undefined;
|
||||
var output_height: i32 = undefined;
|
||||
|
@ -132,7 +132,7 @@ pub fn apply(self: *Self, layout: *Layout) void {
|
||||
|
||||
// Here we apply the offset to align the coords with the origin of the
|
||||
// usable area and shrink the dimensions to accommodate the border size.
|
||||
const border_width = if (view.inflight.borders) server.config.border_width else 0;
|
||||
const border_width = if (view.inflight.ssd) server.config.border_width else 0;
|
||||
view.inflight.box = .{
|
||||
.x = proposed.x + output.usable_box.x + border_width,
|
||||
.y = proposed.y + output.usable_box.y + border_width,
|
||||
|
106
river/RuleList.zig
Normal file
106
river/RuleList.zig
Normal file
@ -0,0 +1,106 @@
|
||||
// This file is part of river, a dynamic tiling wayland compositor.
|
||||
//
|
||||
// Copyright 2023 The River Developers
|
||||
//
|
||||
// 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, version 3.
|
||||
//
|
||||
// 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 <https://www.gnu.org/licenses/>.
|
||||
|
||||
const RuleList = @This();
|
||||
|
||||
const std = @import("std");
|
||||
const mem = std.mem;
|
||||
|
||||
const globber = @import("globber");
|
||||
const util = @import("util.zig");
|
||||
|
||||
const View = @import("View.zig");
|
||||
|
||||
const Rule = struct {
|
||||
app_id_glob: []const u8,
|
||||
title_glob: []const u8,
|
||||
value: bool,
|
||||
};
|
||||
|
||||
/// Ordered from most specific to most general.
|
||||
/// Ordered first by app-id generality then by title generality.
|
||||
rules: std.ArrayListUnmanaged(Rule) = .{},
|
||||
|
||||
pub fn deinit(list: *RuleList) void {
|
||||
for (list.rules.items) |rule| {
|
||||
util.gpa.free(rule.app_id_glob);
|
||||
util.gpa.free(rule.title_glob);
|
||||
}
|
||||
list.rules.deinit(util.gpa);
|
||||
}
|
||||
|
||||
pub fn add(list: *RuleList, rule: Rule) error{OutOfMemory}!void {
|
||||
const index = for (list.rules.items) |*existing, i| {
|
||||
if (mem.eql(u8, rule.app_id_glob, existing.app_id_glob) and
|
||||
mem.eql(u8, rule.title_glob, existing.title_glob))
|
||||
{
|
||||
existing.value = rule.value;
|
||||
return;
|
||||
}
|
||||
|
||||
switch (globber.order(rule.app_id_glob, existing.app_id_glob)) {
|
||||
.lt => break i,
|
||||
.eq => {
|
||||
if (globber.order(rule.title_glob, existing.title_glob) == .lt) {
|
||||
break i;
|
||||
}
|
||||
},
|
||||
.gt => {},
|
||||
}
|
||||
} else list.rules.items.len;
|
||||
|
||||
const owned_app_id_glob = try util.gpa.dupe(u8, rule.app_id_glob);
|
||||
errdefer util.gpa.free(owned_app_id_glob);
|
||||
|
||||
const owned_title_glob = try util.gpa.dupe(u8, rule.title_glob);
|
||||
errdefer util.gpa.free(owned_title_glob);
|
||||
|
||||
try list.rules.insert(util.gpa, index, .{
|
||||
.app_id_glob = owned_app_id_glob,
|
||||
.title_glob = owned_title_glob,
|
||||
.value = rule.value,
|
||||
});
|
||||
}
|
||||
|
||||
pub fn del(list: *RuleList, rule: Rule) void {
|
||||
for (list.rules.items) |existing, i| {
|
||||
if (mem.eql(u8, rule.app_id_glob, existing.app_id_glob) and
|
||||
mem.eql(u8, rule.title_glob, existing.title_glob))
|
||||
{
|
||||
util.gpa.free(existing.app_id_glob);
|
||||
util.gpa.free(existing.title_glob);
|
||||
_ = list.rules.orderedRemove(i);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Returns the value of the most specific rule matching the view.
|
||||
/// Returns null if no rule matches.
|
||||
pub fn match(list: *RuleList, view: *View) ?bool {
|
||||
const app_id = mem.sliceTo(view.getAppId(), 0) orelse "";
|
||||
const title = mem.sliceTo(view.getTitle(), 0) orelse "";
|
||||
|
||||
for (list.rules.items) |rule| {
|
||||
if (globber.match(app_id, rule.app_id_glob) and
|
||||
globber.match(title, rule.title_glob))
|
||||
{
|
||||
return rule.value;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
@ -72,13 +72,13 @@ pub const State = struct {
|
||||
float: bool = false,
|
||||
fullscreen: bool = false,
|
||||
urgent: bool = false,
|
||||
borders: bool = true,
|
||||
ssd: bool = false,
|
||||
resizing: bool = false,
|
||||
|
||||
/// Modify the x/y of the given state by delta_x/delta_y, clamping to the
|
||||
/// bounds of the output.
|
||||
pub fn move(state: *State, delta_x: i32, delta_y: i32) void {
|
||||
const border_width = if (state.borders) server.config.border_width else 0;
|
||||
const border_width = if (state.ssd) server.config.border_width else 0;
|
||||
|
||||
var output_width: i32 = math.maxInt(i32);
|
||||
var output_height: i32 = math.maxInt(i32);
|
||||
@ -106,7 +106,7 @@ pub const State = struct {
|
||||
var output_height: i32 = undefined;
|
||||
output.wlr_output.effectiveResolution(&output_width, &output_height);
|
||||
|
||||
const border_width = if (state.borders) server.config.border_width else 0;
|
||||
const border_width = if (state.ssd) server.config.border_width else 0;
|
||||
state.box.width = math.min(state.box.width, output_width - (2 * border_width));
|
||||
state.box.height = math.min(state.box.height, output_height - (2 * border_width));
|
||||
|
||||
@ -265,7 +265,7 @@ pub fn updateCurrent(view: *Self) void {
|
||||
view.tree.node.setPosition(box.x, box.y);
|
||||
view.popup_tree.node.setPosition(box.x, box.y);
|
||||
|
||||
const enable_borders = view.current.borders and !view.current.fullscreen;
|
||||
const enable_borders = view.current.ssd and !view.current.fullscreen;
|
||||
|
||||
const border_width: c_int = config.border_width;
|
||||
view.borders.left.node.setEnabled(enable_borders);
|
||||
@ -428,7 +428,12 @@ pub fn map(view: *Self) !void {
|
||||
|
||||
view.foreign_toplevel_handle.map();
|
||||
|
||||
view.pending.borders = !server.config.csdAllowed(view);
|
||||
if (server.config.float_rules.match(view)) |float| {
|
||||
view.pending.float = float;
|
||||
}
|
||||
if (server.config.ssd_rules.match(view)) |ssd| {
|
||||
view.pending.ssd = ssd;
|
||||
}
|
||||
|
||||
if (server.input_manager.defaultSeat().focused_output) |output| {
|
||||
// Center the initial pending box on the output
|
||||
|
@ -42,7 +42,14 @@ pub fn init(wlr_decoration: *wlr.XdgToplevelDecorationV1) void {
|
||||
wlr_decoration.events.destroy.add(&decoration.destroy);
|
||||
wlr_decoration.events.request_mode.add(&decoration.request_mode);
|
||||
|
||||
handleRequestMode(&decoration.request_mode, decoration.wlr_decoration);
|
||||
const ssd = server.config.ssd_rules.match(xdg_toplevel.view) orelse
|
||||
(decoration.wlr_decoration.requested_mode != .client_side);
|
||||
|
||||
// TODO(wlroots): make sure this is properly batched in a single configure
|
||||
// with all other initial state when wlroots makes this possible.
|
||||
_ = wlr_decoration.setMode(if (ssd) .server_side else .client_side);
|
||||
|
||||
xdg_toplevel.view.pending.ssd = ssd;
|
||||
}
|
||||
|
||||
// TODO(wlroots): remove this function when updating to 0.17.0
|
||||
@ -72,9 +79,13 @@ fn handleRequestMode(
|
||||
const decoration = @fieldParentPtr(XdgDecoration, "request_mode", listener);
|
||||
|
||||
const xdg_toplevel = @intToPtr(*XdgToplevel, decoration.wlr_decoration.surface.data);
|
||||
if (server.config.csdAllowed(xdg_toplevel.view)) {
|
||||
_ = decoration.wlr_decoration.setMode(.client_side);
|
||||
} else {
|
||||
_ = decoration.wlr_decoration.setMode(.server_side);
|
||||
const view = xdg_toplevel.view;
|
||||
|
||||
const ssd = server.config.ssd_rules.match(xdg_toplevel.view) orelse
|
||||
(decoration.wlr_decoration.requested_mode != .client_side);
|
||||
|
||||
if (view.pending.ssd != ssd) {
|
||||
view.pending.ssd = ssd;
|
||||
server.root.applyPending();
|
||||
}
|
||||
}
|
||||
|
@ -115,6 +115,7 @@ pub fn configure(self: *Self) bool {
|
||||
(inflight.focus != 0) == (current.focus != 0) and
|
||||
inflight_fullscreen == current_fullscreen and
|
||||
inflight_float == current_float and
|
||||
inflight.ssd == current.ssd and
|
||||
inflight.resizing == current.resizing)
|
||||
{
|
||||
return false;
|
||||
@ -130,6 +131,10 @@ pub fn configure(self: *Self) bool {
|
||||
_ = self.xdg_toplevel.setTiled(.{ .top = true, .bottom = true, .left = true, .right = true });
|
||||
}
|
||||
|
||||
if (self.decoration) |decoration| {
|
||||
_ = decoration.wlr_decoration.setMode(if (inflight.ssd) .server_side else .client_side);
|
||||
}
|
||||
|
||||
_ = self.xdg_toplevel.setResizing(inflight.resizing);
|
||||
|
||||
// Only track configures with the transaction system if they affect the dimensions of the view.
|
||||
@ -226,9 +231,8 @@ fn handleMap(listener: *wl.Listener(void)) void {
|
||||
(state.min_width == state.max_width or state.min_height == state.max_height);
|
||||
|
||||
if (self.xdg_toplevel.parent != null or has_fixed_size) {
|
||||
// If the self.xdg_toplevel has a parent or has a fixed size make it float
|
||||
view.pending.float = true;
|
||||
} else if (server.config.shouldFloat(view)) {
|
||||
// If the self.xdg_toplevel has a parent or has a fixed size make it float.
|
||||
// This will be overwritten in View.map() if the view is matched by a rule.
|
||||
view.pending.float = true;
|
||||
}
|
||||
|
||||
|
@ -51,6 +51,8 @@ set_override_redirect: wl.Listener(*wlr.XwaylandSurface) =
|
||||
// Listeners that are only active while the view is mapped
|
||||
set_title: wl.Listener(*wlr.XwaylandSurface) = wl.Listener(*wlr.XwaylandSurface).init(handleSetTitle),
|
||||
set_class: wl.Listener(*wlr.XwaylandSurface) = wl.Listener(*wlr.XwaylandSurface).init(handleSetClass),
|
||||
set_decorations: wl.Listener(*wlr.XwaylandSurface) =
|
||||
wl.Listener(*wlr.XwaylandSurface).init(handleSetDecorations),
|
||||
request_fullscreen: wl.Listener(*wlr.XwaylandSurface) =
|
||||
wl.Listener(*wlr.XwaylandSurface).init(handleRequestFullscreen),
|
||||
request_minimize: wl.Listener(*wlr.XwaylandSurface.event.Minimize) =
|
||||
@ -168,6 +170,7 @@ pub fn handleMap(listener: *wl.Listener(*wlr.XwaylandSurface), xwayland_surface:
|
||||
// Add listeners that are only active while mapped
|
||||
xwayland_surface.events.set_title.add(&self.set_title);
|
||||
xwayland_surface.events.set_class.add(&self.set_class);
|
||||
xwayland_surface.events.set_decorations.add(&self.set_decorations);
|
||||
xwayland_surface.events.request_fullscreen.add(&self.request_fullscreen);
|
||||
xwayland_surface.events.request_minimize.add(&self.request_minimize);
|
||||
|
||||
@ -194,12 +197,14 @@ pub fn handleMap(listener: *wl.Listener(*wlr.XwaylandSurface), xwayland_surface:
|
||||
false;
|
||||
|
||||
if (self.xwayland_surface.parent != null or has_fixed_size) {
|
||||
// If the toplevel has a parent or has a fixed size make it float
|
||||
view.pending.float = true;
|
||||
} else if (server.config.shouldFloat(view)) {
|
||||
// If the toplevel has a parent or has a fixed size make it float by default.
|
||||
// This will be overwritten in View.map() if the view is matched by a rule.
|
||||
view.pending.float = true;
|
||||
}
|
||||
|
||||
// This will be overwritten in View.map() if the view is matched by a rule.
|
||||
view.pending.ssd = !xwayland_surface.decorations.no_border;
|
||||
|
||||
view.pending.fullscreen = xwayland_surface.fullscreen;
|
||||
|
||||
view.map() catch {
|
||||
@ -276,6 +281,19 @@ fn handleSetClass(listener: *wl.Listener(*wlr.XwaylandSurface), _: *wlr.Xwayland
|
||||
self.view.notifyAppId();
|
||||
}
|
||||
|
||||
fn handleSetDecorations(listener: *wl.Listener(*wlr.XwaylandSurface), _: *wlr.XwaylandSurface) void {
|
||||
const self = @fieldParentPtr(Self, "set_decorations", listener);
|
||||
const view = self.view;
|
||||
|
||||
const ssd = server.config.ssd_rules.match(view) orelse
|
||||
!self.xwayland_surface.decorations.no_border;
|
||||
|
||||
if (view.pending.ssd != ssd) {
|
||||
view.pending.ssd = ssd;
|
||||
server.root.applyPending();
|
||||
}
|
||||
}
|
||||
|
||||
fn handleRequestFullscreen(listener: *wl.Listener(*wlr.XwaylandSurface), xwayland_surface: *wlr.XwaylandSurface) void {
|
||||
const self = @fieldParentPtr(Self, "request_fullscreen", listener);
|
||||
if (self.view.pending.fullscreen != xwayland_surface.fullscreen) {
|
||||
|
@ -47,28 +47,32 @@ const command_impls = std.ComptimeStringMap(
|
||||
.{ "border-color-urgent", @import("command/config.zig").borderColorUrgent },
|
||||
.{ "border-width", @import("command/config.zig").borderWidth },
|
||||
.{ "close", @import("command/close.zig").close },
|
||||
.{ "csd-filter-add", @import("command/filter.zig").csdFilterAdd },
|
||||
.{ "csd-filter-remove", @import("command/filter.zig").csdFilterRemove },
|
||||
.{ "declare-mode", @import("command/declare_mode.zig").declareMode },
|
||||
.{ "default-layout", @import("command/layout.zig").defaultLayout },
|
||||
.{ "enter-mode", @import("command/enter_mode.zig").enterMode },
|
||||
.{ "exit", @import("command/exit.zig").exit },
|
||||
.{ "float-filter-add", @import("command/filter.zig").floatFilterAdd },
|
||||
.{ "float-filter-remove", @import("command/filter.zig").floatFilterRemove },
|
||||
.{ "focus-follows-cursor", @import("command/focus_follows_cursor.zig").focusFollowsCursor },
|
||||
.{ "focus-output", @import("command/output.zig").focusOutput },
|
||||
.{ "focus-previous-tags", @import("command/tags.zig").focusPreviousTags },
|
||||
.{ "focus-view", @import("command/focus_view.zig").focusView },
|
||||
.{ "hide-cursor", @import("command/cursor.zig").cursor },
|
||||
.{ "input", @import("command/input.zig").input },
|
||||
.{ "keyboard-group-add", @import("command/keyboard_group.zig").keyboardGroupAdd },
|
||||
.{ "keyboard-group-create", @import("command/keyboard_group.zig").keyboardGroupCreate },
|
||||
.{ "keyboard-group-destroy", @import("command/keyboard_group.zig").keyboardGroupDestroy },
|
||||
.{ "keyboard-group-remove", @import("command/keyboard_group.zig").keyboardGroupRemove },
|
||||
.{ "keyboard-layout", @import("command/keyboard.zig").keyboardLayout },
|
||||
.{ "list-input-configs", @import("command/input.zig").listInputConfigs},
|
||||
.{ "list-inputs", @import("command/input.zig").listInputs },
|
||||
.{ "list-rules", @import("command/rule.zig").listRules},
|
||||
.{ "map", @import("command/map.zig").map },
|
||||
.{ "map-pointer", @import("command/map.zig").mapPointer },
|
||||
.{ "map-switch", @import("command/map.zig").mapSwitch },
|
||||
.{ "move", @import("command/move.zig").move },
|
||||
.{ "output-layout", @import("command/layout.zig").outputLayout },
|
||||
.{ "resize", @import("command/move.zig").resize },
|
||||
.{ "rule-add", @import("command/rule.zig").ruleAdd },
|
||||
.{ "rule-del", @import("command/rule.zig").ruleDel },
|
||||
.{ "send-layout-cmd", @import("command/layout.zig").sendLayoutCmd },
|
||||
.{ "send-to-output", @import("command/output.zig").sendToOutput },
|
||||
.{ "send-to-previous-tags", @import("command/tags.zig").sendToPreviousTags },
|
||||
@ -89,11 +93,6 @@ const command_impls = std.ComptimeStringMap(
|
||||
.{ "unmap-switch", @import("command/map.zig").unmapSwitch },
|
||||
.{ "xcursor-theme", @import("command/xcursor_theme.zig").xcursorTheme },
|
||||
.{ "zoom", @import("command/zoom.zig").zoom },
|
||||
.{ "keyboard-layout", @import("command/keyboard.zig").keyboardLayout },
|
||||
.{ "keyboard-group-create", @import("command/keyboard_group.zig").keyboardGroupCreate },
|
||||
.{ "keyboard-group-destroy", @import("command/keyboard_group.zig").keyboardGroupDestroy },
|
||||
.{ "keyboard-group-add", @import("command/keyboard_group.zig").keyboardGroupAdd },
|
||||
.{ "keyboard-group-remove", @import("command/keyboard_group.zig").keyboardGroupRemove },
|
||||
},
|
||||
);
|
||||
// zig fmt: on
|
||||
@ -107,6 +106,7 @@ pub const Error = error{
|
||||
InvalidButton,
|
||||
InvalidCharacter,
|
||||
InvalidDirection,
|
||||
InvalidGlob,
|
||||
InvalidPhysicalDirection,
|
||||
InvalidOutputIndicator,
|
||||
InvalidOrientation,
|
||||
@ -136,7 +136,7 @@ pub fn run(
|
||||
try impl_fn(seat, args, out);
|
||||
}
|
||||
|
||||
/// Return a short error message for the given error. Passing Error.Other is UB
|
||||
/// Return a short error message for the given error. Passing Error.Other is invalid.
|
||||
pub fn errToMsg(err: Error) [:0]const u8 {
|
||||
return switch (err) {
|
||||
Error.NoCommand => "no command given",
|
||||
@ -149,6 +149,7 @@ pub fn errToMsg(err: Error) [:0]const u8 {
|
||||
Error.InvalidButton => "invalid button",
|
||||
Error.InvalidCharacter => "invalid character in argument",
|
||||
Error.InvalidDirection => "invalid direction. Must be 'next' or 'previous'",
|
||||
Error.InvalidGlob => "invalid glob. '*' is only allowed as the first and/or last character",
|
||||
Error.InvalidPhysicalDirection => "invalid direction. Must be 'up', 'down', 'left' or 'right'",
|
||||
Error.InvalidOutputIndicator => "invalid indicator for an output. Must be 'next', 'previous', 'up', 'down', 'left', 'right' or a valid output name",
|
||||
Error.InvalidOrientation => "invalid orientation. Must be 'horizontal', or 'vertical'",
|
||||
|
@ -1,147 +0,0 @@
|
||||
// This file is part of river, a dynamic tiling wayland compositor.
|
||||
//
|
||||
// Copyright 2020 The River Developers
|
||||
//
|
||||
// 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, version 3.
|
||||
//
|
||||
// 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 <https://www.gnu.org/licenses/>.
|
||||
|
||||
const std = @import("std");
|
||||
const assert = std.debug.assert;
|
||||
const mem = std.mem;
|
||||
|
||||
const server = &@import("../main.zig").server;
|
||||
const util = @import("../util.zig");
|
||||
|
||||
const View = @import("../View.zig");
|
||||
const Error = @import("../command.zig").Error;
|
||||
const Seat = @import("../Seat.zig");
|
||||
|
||||
const FilterKind = enum {
|
||||
@"app-id",
|
||||
title,
|
||||
};
|
||||
|
||||
pub fn floatFilterAdd(
|
||||
_: *Seat,
|
||||
args: []const [:0]const u8,
|
||||
_: *?[]const u8,
|
||||
) Error!void {
|
||||
if (args.len < 3) return Error.NotEnoughArguments;
|
||||
if (args.len > 3) return Error.TooManyArguments;
|
||||
|
||||
const kind = std.meta.stringToEnum(FilterKind, args[1]) orelse return Error.UnknownOption;
|
||||
const map = switch (kind) {
|
||||
.@"app-id" => &server.config.float_filter_app_ids,
|
||||
.title => &server.config.float_filter_titles,
|
||||
};
|
||||
|
||||
const key = args[2];
|
||||
const gop = try map.getOrPut(util.gpa, key);
|
||||
if (gop.found_existing) return;
|
||||
errdefer assert(map.remove(key));
|
||||
gop.key_ptr.* = try util.gpa.dupe(u8, key);
|
||||
}
|
||||
|
||||
pub fn floatFilterRemove(
|
||||
_: *Seat,
|
||||
args: []const [:0]const u8,
|
||||
_: *?[]const u8,
|
||||
) Error!void {
|
||||
if (args.len < 3) return Error.NotEnoughArguments;
|
||||
if (args.len > 3) return Error.TooManyArguments;
|
||||
|
||||
const kind = std.meta.stringToEnum(FilterKind, args[1]) orelse return Error.UnknownOption;
|
||||
const map = switch (kind) {
|
||||
.@"app-id" => &server.config.float_filter_app_ids,
|
||||
.title => &server.config.float_filter_titles,
|
||||
};
|
||||
|
||||
const key = args[2];
|
||||
if (map.fetchRemove(key)) |kv| util.gpa.free(kv.key);
|
||||
}
|
||||
|
||||
pub fn csdFilterAdd(
|
||||
_: *Seat,
|
||||
args: []const [:0]const u8,
|
||||
_: *?[]const u8,
|
||||
) Error!void {
|
||||
if (args.len < 3) return Error.NotEnoughArguments;
|
||||
if (args.len > 3) return Error.TooManyArguments;
|
||||
|
||||
const kind = std.meta.stringToEnum(FilterKind, args[1]) orelse return Error.UnknownOption;
|
||||
const map = switch (kind) {
|
||||
.@"app-id" => &server.config.csd_filter_app_ids,
|
||||
.title => &server.config.csd_filter_titles,
|
||||
};
|
||||
|
||||
const key = args[2];
|
||||
const gop = try map.getOrPut(util.gpa, key);
|
||||
if (gop.found_existing) return;
|
||||
errdefer assert(map.remove(key));
|
||||
gop.key_ptr.* = try util.gpa.dupe(u8, key);
|
||||
|
||||
csdFilterUpdateViews(kind, key, .add);
|
||||
server.root.applyPending();
|
||||
}
|
||||
|
||||
pub fn csdFilterRemove(
|
||||
_: *Seat,
|
||||
args: []const [:0]const u8,
|
||||
_: *?[]const u8,
|
||||
) Error!void {
|
||||
if (args.len < 3) return Error.NotEnoughArguments;
|
||||
if (args.len > 3) return Error.TooManyArguments;
|
||||
|
||||
const kind = std.meta.stringToEnum(FilterKind, args[1]) orelse return Error.UnknownOption;
|
||||
const map = switch (kind) {
|
||||
.@"app-id" => &server.config.csd_filter_app_ids,
|
||||
.title => &server.config.csd_filter_titles,
|
||||
};
|
||||
|
||||
const key = args[2];
|
||||
if (map.fetchRemove(key)) |kv| {
|
||||
util.gpa.free(kv.key);
|
||||
csdFilterUpdateViews(kind, key, .remove);
|
||||
server.root.applyPending();
|
||||
}
|
||||
}
|
||||
|
||||
fn csdFilterUpdateViews(kind: FilterKind, pattern: []const u8, operation: enum { add, remove }) void {
|
||||
var it = server.root.views.iterator(.forward);
|
||||
while (it.next()) |view| {
|
||||
if (view.impl == .xdg_toplevel) {
|
||||
if (view.impl.xdg_toplevel.decoration) |decoration| {
|
||||
if (viewMatchesPattern(kind, pattern, view)) {
|
||||
switch (operation) {
|
||||
.add => {
|
||||
_ = decoration.wlr_decoration.setMode(.client_side);
|
||||
view.pending.borders = false;
|
||||
},
|
||||
.remove => {
|
||||
_ = decoration.wlr_decoration.setMode(.server_side);
|
||||
view.pending.borders = true;
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn viewMatchesPattern(kind: FilterKind, pattern: []const u8, view: *View) bool {
|
||||
const p = switch (kind) {
|
||||
.@"app-id" => mem.span(view.getAppId()),
|
||||
.title => mem.span(view.getTitle()),
|
||||
} orelse return false;
|
||||
|
||||
return mem.eql(u8, pattern, p);
|
||||
}
|
164
river/command/rule.zig
Normal file
164
river/command/rule.zig
Normal file
@ -0,0 +1,164 @@
|
||||
// This file is part of river, a dynamic tiling wayland compositor.
|
||||
//
|
||||
// Copyright 2023 The River Developers
|
||||
//
|
||||
// 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, version 3.
|
||||
//
|
||||
// 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 <https://www.gnu.org/licenses/>.
|
||||
|
||||
const std = @import("std");
|
||||
const fmt = std.fmt;
|
||||
|
||||
const globber = @import("globber");
|
||||
const flags = @import("flags");
|
||||
|
||||
const server = &@import("../main.zig").server;
|
||||
const util = @import("../util.zig");
|
||||
|
||||
const Error = @import("../command.zig").Error;
|
||||
const RuleList = @import("../RuleList.zig");
|
||||
const Seat = @import("../Seat.zig");
|
||||
const View = @import("../View.zig");
|
||||
|
||||
const Action = enum {
|
||||
float,
|
||||
@"no-float",
|
||||
ssd,
|
||||
csd,
|
||||
};
|
||||
|
||||
pub fn ruleAdd(_: *Seat, args: []const [:0]const u8, _: *?[]const u8) Error!void {
|
||||
if (args.len < 2) return Error.NotEnoughArguments;
|
||||
|
||||
const result = flags.parser([:0]const u8, &.{
|
||||
.{ .name = "app-id", .kind = .arg },
|
||||
.{ .name = "title", .kind = .arg },
|
||||
}).parse(args[2..]) catch {
|
||||
return error.InvalidValue;
|
||||
};
|
||||
|
||||
if (result.args.len > 0) return Error.TooManyArguments;
|
||||
|
||||
const action = std.meta.stringToEnum(Action, args[1]) orelse return Error.UnknownOption;
|
||||
const app_id_glob = result.flags.@"app-id" orelse "*";
|
||||
const title_glob = result.flags.title orelse "*";
|
||||
|
||||
try globber.validate(app_id_glob);
|
||||
try globber.validate(title_glob);
|
||||
|
||||
switch (action) {
|
||||
.float, .@"no-float" => {
|
||||
try server.config.float_rules.add(.{
|
||||
.app_id_glob = app_id_glob,
|
||||
.title_glob = title_glob,
|
||||
.value = (action == .float),
|
||||
});
|
||||
},
|
||||
.ssd, .csd => {
|
||||
try server.config.ssd_rules.add(.{
|
||||
.app_id_glob = app_id_glob,
|
||||
.title_glob = title_glob,
|
||||
.value = (action == .ssd),
|
||||
});
|
||||
apply_ssd_rules();
|
||||
server.root.applyPending();
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
pub fn ruleDel(_: *Seat, args: []const [:0]const u8, _: *?[]const u8) Error!void {
|
||||
if (args.len < 2) return Error.NotEnoughArguments;
|
||||
|
||||
const result = flags.parser([:0]const u8, &.{
|
||||
.{ .name = "app-id", .kind = .arg },
|
||||
.{ .name = "title", .kind = .arg },
|
||||
}).parse(args[2..]) catch {
|
||||
return error.InvalidValue;
|
||||
};
|
||||
|
||||
if (result.args.len > 0) return Error.TooManyArguments;
|
||||
|
||||
const action = std.meta.stringToEnum(Action, args[1]) orelse return Error.UnknownOption;
|
||||
const app_id_glob = result.flags.@"app-id" orelse "*";
|
||||
const title_glob = result.flags.title orelse "*";
|
||||
|
||||
switch (action) {
|
||||
.float, .@"no-float" => {
|
||||
server.config.float_rules.del(.{
|
||||
.app_id_glob = app_id_glob,
|
||||
.title_glob = title_glob,
|
||||
.value = (action == .float),
|
||||
});
|
||||
},
|
||||
.ssd, .csd => {
|
||||
server.config.ssd_rules.del(.{
|
||||
.app_id_glob = app_id_glob,
|
||||
.title_glob = title_glob,
|
||||
.value = (action == .ssd),
|
||||
});
|
||||
apply_ssd_rules();
|
||||
server.root.applyPending();
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
fn apply_ssd_rules() void {
|
||||
var it = server.root.views.iterator(.forward);
|
||||
while (it.next()) |view| {
|
||||
if (server.config.ssd_rules.match(view)) |ssd| {
|
||||
view.pending.ssd = ssd;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn listRules(_: *Seat, args: []const [:0]const u8, out: *?[]const u8) Error!void {
|
||||
if (args.len < 2) return error.NotEnoughArguments;
|
||||
if (args.len > 2) return error.TooManyArguments;
|
||||
|
||||
const list = std.meta.stringToEnum(enum { float, ssd }, args[1]) orelse return Error.UnknownOption;
|
||||
|
||||
const rules = switch (list) {
|
||||
.float => server.config.float_rules.rules.items,
|
||||
.ssd => server.config.ssd_rules.rules.items,
|
||||
};
|
||||
|
||||
var action_column_max = "action".len;
|
||||
var app_id_column_max = "app-id".len;
|
||||
for (rules) |rule| {
|
||||
const action = switch (list) {
|
||||
.float => if (rule.value) "float" else "no-float",
|
||||
.ssd => if (rule.value) "ssd" else "csd",
|
||||
};
|
||||
action_column_max = @max(action_column_max, action.len);
|
||||
app_id_column_max = @max(app_id_column_max, rule.app_id_glob.len);
|
||||
}
|
||||
action_column_max += 2;
|
||||
app_id_column_max += 2;
|
||||
|
||||
var buffer = std.ArrayList(u8).init(util.gpa);
|
||||
const writer = buffer.writer();
|
||||
|
||||
try fmt.formatBuf("action", .{ .width = action_column_max, .alignment = .Left }, writer);
|
||||
try fmt.formatBuf("app-id", .{ .width = app_id_column_max, .alignment = .Left }, writer);
|
||||
try writer.writeAll("title\n");
|
||||
|
||||
for (rules) |rule| {
|
||||
const action = switch (list) {
|
||||
.float => if (rule.value) "float" else "no-float",
|
||||
.ssd => if (rule.value) "ssd" else "csd",
|
||||
};
|
||||
try fmt.formatBuf(action, .{ .width = action_column_max, .alignment = .Left }, writer);
|
||||
try fmt.formatBuf(rule.app_id_glob, .{ .width = app_id_column_max, .alignment = .Left }, writer);
|
||||
try writer.print("{s}\n", .{rule.title_glob});
|
||||
}
|
||||
|
||||
out.* = buffer.toOwnedSlice();
|
||||
}
|
Reference in New Issue
Block a user