Merge: 9P round 21 + Afterglow removed + symmetric focus dim

1 files changed, 3 insertions, 7 deletions

diff --git a/src/config.zig b/src/config.zig
index a703f79e..ea7a877a 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -127,7 +127,6 @@ pub const leader_path = paths: {
     if (builtins.capabilities.lift) table.set(.HoverGlow, null);
     if (builtins.capabilities.lift) table.set(.Occlusion, null);
     if (builtins.capabilities.lift) table.set(.Parallax, null);
-    if (builtins.capabilities.lift) table.set(.Afterglow, null);
     table.set(.JumpTrail, null);
     table.set(.ChipShadow, null);
     table.set(.ThumbFlash, null);
@@ -691,7 +690,6 @@ pub const Runtime = struct {
     parallax: bool = false,
     /// G14: text that changes glows for a moment in the theme's accent and
     /// fades, a pixel shell's.
-    afterglow: bool = false,
     /// T2: in a terminal, a jump of the cursor leaves a short trail that
     /// fades in 120 ms (a truecolor terminal's; a pixel shell glides).
     jump_trail: bool = false,
@@ -924,7 +922,7 @@ pub const Runtime = struct {
     /// The message timings a setting word sets, each in milliseconds.
     pub const MessageTime = enum { linger, fall, dissolve };
 
-    pub const Toggle = enum { colors, wrap, tree_context_tag_style, tag_bottom, debug, focus_tint, syntax_bold, verbose, message_animation, ligatures, cursor_blink, selection_glow, hover_glow, occlusion, parallax, afterglow, jump_trail, chip_shadow, thumb_flash };
+    pub const Toggle = enum { colors, wrap, tree_context_tag_style, tag_bottom, debug, focus_tint, syntax_bold, verbose, message_animation, ligatures, cursor_blink, selection_glow, hover_glow, occlusion, parallax, jump_trail, chip_shadow, thumb_flash };
     /// A bundled post pass, a Shadertoy file in shaders/post/: the CRT, and
     /// G4's bloom, vignette and grain (docs/effects.md).
     pub const Scene = enum { crt, bloom, vignette, grain };
@@ -987,7 +985,6 @@ pub const Runtime = struct {
         .{ .word = "HoverGlow", .action = .{ .toggle = .hover_glow }, .availability = .lift, .doc = "A soft underline of light under the word a look-hover would open, on or off." },
         .{ .word = "Occlusion", .action = .{ .toggle = .occlusion }, .availability = .lift, .doc = "Pane bodies darken faintly toward their edges, on or off." },
         .{ .word = "Parallax", .action = .{ .toggle = .parallax }, .availability = .lift, .doc = "A theme's page pattern moves with the text at a quarter of its speed, on or off." },
-        .{ .word = "Afterglow", .action = .{ .toggle = .afterglow }, .availability = .lift, .doc = "Text that changes glows for a moment and fades, on or off." },
         .{ .word = "JumpTrail", .action = .{ .toggle = .jump_trail }, .doc = "In a terminal, a jump of the cursor leaves a short trail that fades, on or off." },
         .{ .word = "ChipShadow", .action = .{ .toggle = .chip_shadow }, .doc = "In a terminal, a notice chip casts a cell's shadow right and down, on or off." },
         .{ .word = "ThumbFlash", .action = .{ .toggle = .thumb_flash }, .doc = "In a terminal, a pane's scroll thumb brightens as it scrolls and fades back, on or off." },
@@ -1067,9 +1064,9 @@ pub const Runtime = struct {
                 .toggle => |field| if (field == .ligatures) {
                     if (setting.availability != .ligatures)
                         @compileError("the ligatures toggle must use the ligatures capability");
-                } else if (field == .cursor_blink or field == .selection_glow or field == .hover_glow or field == .occlusion or field == .parallax or field == .afterglow) {
+                } else if (field == .cursor_blink or field == .selection_glow or field == .hover_glow or field == .occlusion or field == .parallax) {
                     if (setting.availability != .lift)
-                        @compileError("CursorBlink, SelectionGlow, HoverGlow, Occlusion, Parallax and Afterglow must use the lift capability (a pixel shell's)");
+                        @compileError("CursorBlink, SelectionGlow, HoverGlow, Occlusion and Parallax must use the lift capability (a pixel shell's)");
                 } else if (setting.availability != null)
                     @compileError("unconditional toggles cannot carry a backend capability"),
                 else => if (setting.availability != null)
@@ -1728,7 +1725,6 @@ pub const Runtime = struct {
                     .hover_glow => "HoverGlow on\n",
                     .occlusion => "Occlusion on\n",
                     .parallax => "Parallax on\n",
-                    .afterglow => "Afterglow on\n",
                     .jump_trail => "JumpTrail on\n",
                     .chip_shadow => "ChipShadow on\n",
                     .thumb_flash => "ThumbFlash on\n",