Merge: 9P rounds 9-17 + render DPI, dark tints, G4-G10

1 files changed, 26 insertions, 8 deletions

diff --git a/src/config.zig b/src/config.zig
index 2fa6f89d..229c70ea 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -122,6 +122,7 @@ pub const leader_path = paths: {
     if (builtins.capabilities.window_blur) table.set(.WindowBlur, null);
     if (builtins.capabilities.ligatures) table.set(.Ligatures, null);
     if (builtins.capabilities.lift) table.set(.CursorBlink, null);
+    if (builtins.capabilities.lift) table.set(.SelectionGlow, null);
     if (builtins.capabilities.lift) table.set(.Lift, null);
     table.set(.Motion, null);
     table.set(.InactiveDim, null);
@@ -141,6 +142,9 @@ pub const leader_path = paths: {
     }
     if (builtins.capabilities.scene_shaders) {
         table.set(.Crt, "tr");
+        table.set(.Bloom, null);
+        table.set(.Vignette, null);
+        table.set(.Grain, null);
         table.set(.Shader, null);
         table.set(.ShaderAnimation, null);
     }
@@ -663,12 +667,17 @@ pub const Runtime = struct {
     /// solid while typing and for half a second after, eased at each edge,
     /// solid again after ten idle seconds.
     cursor_blink: bool = true,
+    /// G9: a soft halo round the selection in the body, fading in over
+    /// 100 ms, a pixel shell's (docs/effects.md).
+    selection_glow: bool = false,
     /// How long a message stays after the key or click that dismisses it.
     message_linger_ms: u16 = 800,
-    /// How long its ease-in fall into the row takes.
+    /// How long its fall into the row takes, easing out (§8.1: arriving,
+    /// 150 to 220 ms).
     message_fall_ms: u16 = 180,
-    /// How long its ease-out dissolve takes.
-    message_dissolve_ms: u16 = 300,
+    /// How long its dissolve takes, easing in: leaving is quicker than
+    /// arriving (§8.1: 100 to 160 ms).
+    message_dissolve_ms: u16 = 150,
     /// Where Dump writes and a relative Restore looks; empty is the default
     /// ($XDG_DATA_HOME/pardes, else ~/.local/share/pardes).
     dump_dir: Text(limits.host_path_cap) = .{},
@@ -884,9 +893,10 @@ 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 };
-    /// The bundled post pass, a Shadertoy file in shaders/post/.
-    pub const Scene = enum { crt };
+    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 };
+    /// 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 };
 
     pub const Action = union(enum) {
         toggle: Toggle,
@@ -942,6 +952,7 @@ pub const Runtime = struct {
         .{ .word = "MessageAnimation", .action = .{ .toggle = .message_animation }, .doc = "A message falls into its row and dissolves out of it, on or off." },
         .{ .word = "Ligatures", .action = .{ .toggle = .ligatures }, .availability = .ligatures, .doc = "A font's programming ligatures draw across their cells, on or off." },
         .{ .word = "CursorBlink", .action = .{ .toggle = .cursor_blink }, .availability = .lift, .doc = "The cursor blinks, solid while typing, on or off." },
+        .{ .word = "SelectionGlow", .action = .{ .toggle = .selection_glow }, .availability = .lift, .doc = "A soft halo of the selection's colour round it in the body, on or off." },
         .{ .word = "Lift", .action = .lift, .availability = .lift, .doc = "How the focused pane stands off the page: off, shadow, rim or auto." },
         .{ .word = "Motion", .action = .motion, .doc = "How animations move: off, crisp, smooth, bouncy or playful." },
         .{ .word = "InactiveDim", .action = .inactive_dim, .doc = "Fade the unfocused panes' text by a percentage, 0 through 100, 0 off." },
@@ -968,6 +979,9 @@ pub const Runtime = struct {
         .{ .word = "PanelScramble", .action = .{ .transition = .scramble }, .availability = .panel_transitions, .doc = "Panes open and close through scrambled text, on or off." },
         .{ .word = "PanelType", .action = .{ .transition = .typewriter }, .availability = .panel_transitions, .doc = "Panes type themselves in as they open, on or off." },
         .{ .word = "Crt", .action = .{ .scene = .crt }, .availability = .scene_shaders, .doc = "The bundled CRT post pass over the window, on or off." },
+        .{ .word = "Bloom", .action = .{ .scene = .bloom }, .availability = .scene_shaders, .doc = "The brightest ink glows a little: a level, 0 (off) through 3." },
+        .{ .word = "Vignette", .action = .{ .scene = .vignette }, .availability = .scene_shaders, .doc = "The window's corners fall into shade: a level, 0 (off) through 3." },
+        .{ .word = "Grain", .action = .{ .scene = .grain }, .availability = .scene_shaders, .doc = "The page takes a fine, still grain, like paper: a level, 0 (off) through 3." },
         .{ .word = "Shader", .action = .shader, .availability = .scene_shaders, .doc = "A Shadertoy file into the post chain, or out of it; off empties the chain." },
         .{ .word = "ShaderAnimation", .action = .shader_animation, .availability = .scene_shaders, .doc = "When the post chain animates on its own: off, on (while focused) or always." },
         .{ .word = "Placement", .action = .{ .choice = .placement }, .doc = "Where a new pane goes: acme, as makenewwindow does, or pardes, the older rules." },
@@ -1015,9 +1029,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) {
+                } else if (field == .cursor_blink or field == .selection_glow) {
                     if (setting.availability != .lift)
-                        @compileError("CursorBlink must use the lift capability (a pixel shell's)");
+                        @compileError("CursorBlink and SelectionGlow 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)
@@ -1672,6 +1686,7 @@ pub const Runtime = struct {
                     .message_animation => "MessageAnimation off\n",
                     .ligatures => "Ligatures off\n",
                     .cursor_blink => "CursorBlink off\n",
+                    .selection_glow => "SelectionGlow on\n",
                 },
                 .shell => "Shell requested (new panes) fish\n",
                 .tagline_size => "TaglineSize 73\n",
@@ -1699,6 +1714,9 @@ pub const Runtime = struct {
                 },
                 .scene => |effect| switch (effect) {
                     .crt => "Crt 2\n",
+                    .bloom => "Bloom 2\n",
+                    .vignette => "Vignette 2\n",
+                    .grain => "Grain 2\n",
                 },
                 .shader => "Shader ~/crt.glsl\n",
                 .shader_animation => "ShaderAnimation always\n",