Wayland compositor (wlroots)
git clone https://git.lucas.co/cce-compositor.git
river: remove more unneeded config bits
river/Config.zig | 13 ++-----------
river/View.zig | 20 ++++++--------------
2 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/river/Config.zig b/river/Config.zig
index 5b8535c..0ac46c0 100644
--- a/river/Config.zig
+++ b/river/Config.zig
@@ -46,14 +46,8 @@ background_color: [4]f32 = [_]f32{ 0.0, 0.16862745, 0.21176471, 1.0 }, // Solari
/// Width of borders in pixels
border_width: u31 = 2,
-/// Color of border of focused window in RGBA with premultiplied alpha
-border_color_focused: [4]f32 = [_]f32{ 0.57647059, 0.63137255, 0.63137255, 1.0 }, // Solarized base1
-
-/// Color of border of unfocused window in RGBA with premultiplied alpha
-border_color_unfocused: [4]f32 = [_]f32{ 0.34509804, 0.43137255, 0.45882353, 1.0 }, // Solarized base01
-
-/// Color of border of urgent window in RGBA with premultiplied alpha
-border_color_urgent: [4]f32 = [_]f32{ 0.86274510, 0.19607843, 0.18431373, 1.0 }, // Solarized red
+/// Color of border in RGBA with premultiplied alpha
+border_color: [4]f32 = [_]f32{ 0.34509804, 0.43137255, 0.45882353, 1.0 }, // Solarized base01
/// Map of keymap mode name to mode id
/// Does not own the string keys. They are owned by the corresponding Mode struct.
@@ -62,9 +56,6 @@ mode_to_id: std.StringHashMap(u32),
/// All user-defined keymap modes, indexed by mode id
modes: std.ArrayListUnmanaged(Mode),
-/// Bitmask restricting the tags of newly created views.
-spawn_tagmask: u32 = std.math.maxInt(u32),
-
/// Keyboard repeat rate in characters per second
repeat_rate: u31 = 25,
diff --git a/river/View.zig b/river/View.zig
index defa951..45d1f1c 100644
--- a/river/View.zig
+++ b/river/View.zig
@@ -191,10 +191,10 @@ pub fn create(impl: Impl) error{OutOfMemory}!*View {
.surface_tree = try tree.createSceneTree(),
.saved_surface_tree = try tree.createSceneTree(),
.borders = .{
- try tree.createSceneRect(0, 0, &server.config.border_color_unfocused),
- try tree.createSceneRect(0, 0, &server.config.border_color_unfocused),
- try tree.createSceneRect(0, 0, &server.config.border_color_unfocused),
- try tree.createSceneRect(0, 0, &server.config.border_color_unfocused),
+ try tree.createSceneRect(0, 0, &server.config.border_color),
+ try tree.createSceneRect(0, 0, &server.config.border_color),
+ try tree.createSceneRect(0, 0, &server.config.border_color),
+ try tree.createSceneRect(0, 0, &server.config.border_color),
},
.popup_tree = popup_tree,
@@ -394,11 +394,7 @@ pub fn updateSceneState(view: *View) void {
{
const config = &server.config;
const border_width: c_int = config.border_width;
- const border_color = blk: {
- if (view.current.urgent) break :blk &config.border_color_urgent;
- if (view.current.focus != 0) break :blk &config.border_color_focused;
- break :blk &config.border_color_unfocused;
- };
+ const border_color = &config.border_color;
// Order is left, right, top, bottom
// left and right borders include the corners, top and bottom do not.
@@ -584,11 +580,7 @@ pub fn map(view: *View) !void {
view.pending.box.y = @divTrunc(@max(0, o.usable_box.height - view.pending.box.height), 2);
}
- view.pending.tags = blk: {
- const default = if (output) |o| o.pending.tags else server.root.fallback_pending.tags;
- const tags = default & server.config.spawn_tagmask;
- break :blk if (tags != 0) tags else default;
- };
+ view.pending.tags = if (output) |o| o.pending.tags else server.root.fallback_pending.tags;
if (output) |o| {
view.setPendingOutput(o);