Update tests for colour/position changes.

2026-07-03 10:12:31 +00:00 · 2026-06-26 11:32:32 +01:00
parent 666464d7a9
commit 1e5aef279a
27 changed files with 218 additions and 218 deletions
--- a/regress/screen-redraw-results/colour-two-plus-float.result
+++ b/regress/screen-redraw-results/colour-two-plus-float.result
@@ -1,12 +1,12 @@
                    [31m│[39m
-         [32m┌────────────────┐[39m
-         [32m│[39m                [32m│[39m
-         [32m│[39m                [32m│[39m
-         [32m│[39m                [32m│[39m
-         [32m│[39m                [32m│[39m
-         [32m│[39m                [32m│[39m
-         [32m│[39m                [32m│[39m
-         [32m└────────────────┘[39m
+                    [31m│[39m
+          [32m┌──────────────┐[39m
+          [32m│[39m              [32m│[39m
+          [32m│[39m              [32m│[39m
+          [32m│[39m              [32m│[39m
+          [32m│[39m              [32m│[39m
+          [32m└──────────────┘[39m
+                    [32m│[39m
                    [32m│[39m
                    [32m│[39m
                    [32m│[39m
--- a/regress/screen-redraw-results/floating-basic.result
+++ b/regress/screen-redraw-results/floating-basic.result
@@ -1,12 +1,12 @@
 base

-       ┌────────────────────┐
-       │FLOAT               │
-       │                    │
-       │                    │
-       │                    │
-       │                    │
-       │                    │
-       └────────────────────┘
+
+        ┌──────────────────┐
+        │FLOAT             │
+        │                  │
+        │                  │
+        │                  │
+        └──────────────────┘
+


--- a/regress/screen-redraw-results/floating-border-double.result
+++ b/regress/screen-redraw-results/floating-border-double.result
@@ -1,12 +1,12 @@
-bas╔════════════════════════════╗
-   ║FLOAT                       ║
-   ║                            ║
-   ║                            ║
-   ║                            ║
-   ║                            ║
-   ║                            ║
-   ║                            ║
-   ║                            ║
-   ╚════════════════════════════╝
+base
+    ╔══════════════════════════╗
+    ║FLOAT                     ║
+    ║                          ║
+    ║                          ║
+    ║                          ║
+    ║                          ║
+    ║                          ║
+    ╚══════════════════════════╝
+


--- a/regress/screen-redraw-results/floating-clip-bottom.result
+++ b/regress/screen-redraw-results/floating-clip-bottom.result
@@ -6,7 +6,7 @@
 06:abcdefghijklmnopqrstuvwxyz0123456789
 07:abcdefghijklmnopqrstuvwxyz0123456789
 08:abcdefghijklmnopqrstuvwxyz0123456789
-09:abcdef┌────────────────────┐23456789
-10:abcdef│BOTTOM              │23456789
-11:abcdef│                    │23456789
-         │                    │
+09:abcdefghijklmnopqrstuvwxyz0123456789
+10:abcdefg┌──────────────────┐123456789
+11:abcdefg│BOTTOM            │123456789
+          │                  │
--- a/regress/screen-redraw-results/floating-clip-edge.result
+++ b/regress/screen-redraw-results/floating-clip-edge.result
@@ -5,8 +5,8 @@ base



-                             ┌──────────
-                             │CLIP
-                             │
-                             │
-                             │
+
+                              ┌─────────
+                              │CLIP
+                              │
+                              │
--- a/regress/screen-redraw-results/floating-clip-left.result
+++ b/regress/screen-redraw-results/floating-clip-left.result
@@ -1,12 +1,12 @@
 01:abcdefghijklmnopqrstuvwxyz0123456789
 02:abcdefghijklmnopqrstuvwxyz0123456789
-──────────┐ijklmnopqrstuvwxyz0123456789
-          │ijklmnopqrstuvwxyz0123456789
-          │ijklmnopqrstuvwxyz0123456789
-          │ijklmnopqrstuvwxyz0123456789
-          │ijklmnopqrstuvwxyz0123456789
-          │ijklmnopqrstuvwxyz0123456789
-          │ijklmnopqrstuvwxyz0123456789
-──────────┘ijklmnopqrstuvwxyz0123456789
+03:abcdefghijklmnopqrstuvwxyz0123456789
+─────────┐hijklmnopqrstuvwxyz0123456789
+         │hijklmnopqrstuvwxyz0123456789
+         │hijklmnopqrstuvwxyz0123456789
+         │hijklmnopqrstuvwxyz0123456789
+         │hijklmnopqrstuvwxyz0123456789
+─────────┘hijklmnopqrstuvwxyz0123456789
+10:abcdefghijklmnopqrstuvwxyz0123456789
 11:abcdefghijklmnopqrstuvwxyz0123456789

--- a/regress/screen-redraw-results/floating-clip-right.result
+++ b/regress/screen-redraw-results/floating-clip-right.result
@@ -1,12 +1,12 @@
 01:abcdefghijklmnopqrstuvwxyz0123456789
 02:abcdefghijklmnopqrstuvwxyz0123456789
-03:abcdefghijklmnopqrstuvwxyz┌──────────
-04:abcdefghijklmnopqrstuvwxyz│RIGHT
-05:abcdefghijklmnopqrstuvwxyz│
-06:abcdefghijklmnopqrstuvwxyz│
-07:abcdefghijklmnopqrstuvwxyz│
-08:abcdefghijklmnopqrstuvwxyz│
-09:abcdefghijklmnopqrstuvwxyz│
-10:abcdefghijklmnopqrstuvwxyz└──────────
+03:abcdefghijklmnopqrstuvwxyz0123456789
+04:abcdefghijklmnopqrstuvwxyz0┌─────────
+05:abcdefghijklmnopqrstuvwxyz0│RIGHT
+06:abcdefghijklmnopqrstuvwxyz0│
+07:abcdefghijklmnopqrstuvwxyz0│
+08:abcdefghijklmnopqrstuvwxyz0│
+09:abcdefghijklmnopqrstuvwxyz0└─────────
+10:abcdefghijklmnopqrstuvwxyz0123456789
 11:abcdefghijklmnopqrstuvwxyz0123456789

--- a/regress/screen-redraw-results/floating-clip-top.result
+++ b/regress/screen-redraw-results/floating-clip-top.result
@@ -1,7 +1,7 @@
-01:abcdef│                    │23456789
-02:abcdef│                    │23456789
-03:abcdef│                    │23456789
-04:abcdef└────────────────────┘23456789
+01:abcdefg│                  │123456789
+02:abcdefg│                  │123456789
+03:abcdefg└──────────────────┘123456789
+04:abcdefghijklmnopqrstuvwxyz0123456789
 05:abcdefghijklmnopqrstuvwxyz0123456789
 06:abcdefghijklmnopqrstuvwxyz0123456789
 07:abcdefghijklmnopqrstuvwxyz0123456789
--- a/regress/screen-redraw-results/floating-clip-topleft.result
+++ b/regress/screen-redraw-results/floating-clip-topleft.result
@@ -1,8 +1,8 @@
-              │
-              │
-              │
-              │
-──────────────┘
+             │
+             │
+             │
+─────────────┘
+



--- a/regress/screen-redraw-results/floating-empty.result
+++ b/regress/screen-redraw-results/floating-empty.result
@@ -1,12 +1,12 @@
 ········································
 ········································
-·······┌────────────────────┐···········
-·······│FLOAT               │···········
-·······│                    │···········
-·······│                    │···········
-·······│                    │···········
-·······│                    │···········
-·······│                    │···········
-·······└────────────────────┘···········
+········································
+········┌──────────────────┐············
+········│FLOAT             │············
+········│                  │············
+········│                  │············
+········│                  │············
+········└──────────────────┘············
+········································
 ········································

--- a/regress/screen-redraw-results/floating-mixed-config.result
+++ b/regress/screen-redraw-results/floating-mixed-config.result
@@ -1,12 +1,12 @@
-ba┌── one ─────────┐
-  │ONE             │
-  │                │
-  │                │
-  │                │
-  └──────────────┏━━━━━━━━━━━━━━━━┓
-                 ┃TWO             ┃
-                 ┃                ┃
-                 ┃                ┃
-                 ┃                ┃
-                 ┗━━ two ━━━━━━━━━┛
+base
+   ┌── one ───────┐
+   │ONE           │
+   │              │
+   └──────────────┘
+
+                  ┏━━━━━━━━━━━━━━┓
+                  ┃TWO           ┃
+                  ┃              ┃
+                  ┗━━ two ━━━━━━━┛
+

--- a/regress/screen-redraw-results/floating-outside.result
+++ b/regress/screen-redraw-results/floating-outside.result
@@ -1,12 +1,12 @@
 base                        │···········
                            │···········
                            │···········
-                 ┌──────────│···········
-                 │OUT       │···········
-                 │          │···········
-                 │          │···········
-                 │          │···········
-────────────────────────────┘···········
+                            │···········
+                  ┌─────────│···········
+                  │OUT      │···········
+                  │         │···········
+                  │         │···········
+──────────────────└─────────┘···········
 ········································
 ········································
 ········································
--- a/regress/screen-redraw-results/floating-over-scrollbar.result
+++ b/regress/screen-redraw-results/floating-over-scrollbar.result
@@ -1,12 +1,12 @@
 base                                   [30m[47m
 [39m[49m                                       [30m[47m
-[39m[49m                     [32m┌────────────────┐[30m[47m
-[39m[49m                     [32m│[39mOVERSB         [30m[47m [32m[49m│[30m[47m
-[39m[49m                     [32m│[39m               [30m[47m [32m[49m│[30m[47m
-[39m[49m                     [32m│[39m               [30m[47m [32m[49m│[30m[47m
-[39m[49m                     [32m│[39m               [30m[47m [32m[49m│[30m[47m
-[39m[49m                     [32m│[39m               [30m[47m [32m[49m│[30m[47m
-[39m[49m                     [32m│[39m               [30m[47m [32m[49m│[30m[47m
-[39m[49m                     [32m└────────────────┘[30m[47m
+[39m[49m                                       [30m[47m
+[39m[49m                      [38;2;143;188;143m┌──────────────┐[39m [30m[47m
+[39m[49m                      [38;2;143;188;143m│[39mOVERSB       [30m[47m [38;2;143;188;143m[49m│[39m [30m[47m
+[39m[49m                      [38;2;143;188;143m│[39m             [30m[47m [38;2;143;188;143m[49m│[39m [30m[47m
+[39m[49m                      [38;2;143;188;143m│[39m             [30m[47m [38;2;143;188;143m[49m│[39m [30m[47m
+[39m[49m                      [38;2;143;188;143m│[39m             [30m[47m [38;2;143;188;143m[49m│[39m [30m[47m
+[39m[49m                      [38;2;143;188;143m└──────────────┘[39m [30m[47m
+[39m[49m                                       [30m[47m
 [39m[49m                                       [30m[47m
 [39m[49m                                       [30m[47m
--- a/regress/screen-redraw-results/floating-over-status.result
+++ b/regress/screen-redraw-results/floating-over-status.result
@@ -4,9 +4,9 @@ base



-       ┌────────────────────┐
-       │OVERST              │
-       │                    │
-       │                    │
-       │                    │
+
+        ┌──────────────────┐
+        │OVERST            │
+        │                  │
+        │                  │

--- a/regress/screen-redraw-results/floating-over-tiled-double.result
+++ b/regress/screen-redraw-results/floating-over-tiled-double.result
@@ -1,12 +1,12 @@
 TILE01 abcdefghij  │TILE01 abcdefghij
 TILE02 abcdefghij  │TILE02 abcdefghij
-TILE03 abc╔════════════════╗bcdefghij
-TILE04 abc║FLT             ║bcdefghij
-          ║                ║
-──────────║                ║────────────
-TILE00 abc║                ║bcdefghij
-TILE01 abc║                ║bcdefghij
-TILE02 abc║                ║bcdefghij
-TILE03 abc╚════════════════╝bcdefghij
+TILE03 abcdefghij  │TILE03 abcdefghij
+TILE04 abcd╔══════════════╗abcdefghij
+           ║FLT           ║
+───────────║              ║─────────────
+TILE00 abcd║              ║abcdefghij
+TILE01 abcd║              ║abcdefghij
+TILE02 abcd╚══════════════╝abcdefghij
+TILE03 abcdefghij  │TILE03 abcdefghij
 TILE04 abcdefghij  │TILE04 abcdefghij
                   │
--- a/regress/screen-redraw-results/floating-over-tiled.result
+++ b/regress/screen-redraw-results/floating-over-tiled.result
@@ -1,12 +1,12 @@
 TILE01 abcdefghij  │TILE01 abcdefghij
 TILE02 abcdefghij  │TILE02 abcdefghij
-TILE03 abc┌────────────────┐bcdefghij
-TILE04 abc│FLT             │bcdefghij
-          │                │
-──────────│                │────────────
-TILE00 abc│                │bcdefghij
-TILE01 abc│                │bcdefghij
-TILE02 abc│                │bcdefghij
-TILE03 abc└────────────────┘bcdefghij
+TILE03 abcdefghij  │TILE03 abcdefghij
+TILE04 abcd┌──────────────┐abcdefghij
+           │FLT           │
+───────────│              │─────────────
+TILE00 abcd│              │abcdefghij
+TILE01 abcd│              │abcdefghij
+TILE02 abcd└──────────────┘abcdefghij
+TILE03 abcdefghij  │TILE03 abcdefghij
 TILE04 abcdefghij  │TILE04 abcdefghij
                   │
--- a/regress/screen-redraw-results/floating-overlap.result
+++ b/regress/screen-redraw-results/floating-overlap.result
@@ -1,12 +1,12 @@
 base
-   ┌────────────────┐
-   │AAA             │
-   │                │
-   │                │
-   │         ┌────────────────┐
-   │         │BBB             │
-   │         │                │
-   └─────────│                │
-             │                │
-             │                │
-             │                │
+
+    ┌──────────────┐
+    │AAA           │
+    │              │
+    │              │
+    │         ┌──────────────┐
+    └─────────│BBB           │
+              │              │
+              │              │
+              │              │
+              └──────────────┘
--- a/regress/screen-redraw-results/floating-title.result
+++ b/regress/screen-redraw-results/floating-title.result
@@ -1,12 +1,12 @@
 ── base ────────────────────────────────
-base   ┌── title ───────────┐
-       │FLOAT               │
-       │                    │
-       │                    │
-       │                    │
-       │                    │
-       │                    │
-       └────────────────────┘
+base
+        ┌── title ─────────┐
+        │FLOAT             │
+        │                  │
+        │                  │
+        │                  │
+        └──────────────────┘
+



--- a/regress/screen-redraw-results/marked-pane-float.result
+++ b/regress/screen-redraw-results/marked-pane-float.result
@@ -1,12 +1,12 @@


-       [7m[32m┌────────────────────┐[0m
-       [7m[32m│[0m                    [7m[32m│[0m
-       [7m[32m│[0m                    [7m[32m│[0m
-       [7m[32m│[0m                    [7m[32m│[0m
-       [7m[32m│[0m                    [7m[32m│[0m
-       [7m[32m│[0m                    [7m[32m│[0m
-       [7m[32m│[0m                    [7m[32m│[0m
-       [7m[32m└────────────────────┘[0m
+
+        [7m[38;2;147;112;219m┌──────────────────┐[0m
+        [7m[38;2;147;112;219m│[0m                  [7m[38;2;147;112;219m│[0m
+        [7m[38;2;147;112;219m│[0m                  [7m[38;2;147;112;219m│[0m
+        [7m[38;2;147;112;219m│[0m                  [7m[38;2;147;112;219m│[0m
+        [7m[38;2;147;112;219m│[0m                  [7m[38;2;147;112;219m│[0m
+        [7m[38;2;147;112;219m└──────────────────┘[0m
+


--- a/regress/screen-redraw-results/marked-pane-lr.result
+++ b/regress/screen-redraw-results/marked-pane-lr.result
@@ -1,12 +1,12 @@
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
--- a/regress/screen-redraw-results/marked-pane-status.result
+++ b/regress/screen-redraw-results/marked-pane-status.result
@@ -1,12 +1,12 @@
-[32m── 0:left ──────────[7m┬[39m──[0m 1:right ────────
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
-                    [7m[32m│[0m
+[38;2;143;188;143m── 0:left ──────────[7m┬[38;2;179;179;179m──[0m[38;2;179;179;179m 1:right ────────
+[39m                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
+                    [7m[38;2;143;188;143m│[0m
--- a/regress/screen-redraw-results/marked-pane-tb.result
+++ b/regress/screen-redraw-results/marked-pane-tb.result
@@ -4,7 +4,7 @@



-[7m[32m────────────────────────────────────────
+[7m[38;2;143;188;143m────────────────────────────────────────



--- a/regress/screen-redraw-results/marked-pane-three.result
+++ b/regress/screen-redraw-results/marked-pane-three.result
@@ -1,12 +1,12 @@
-          [7m[32m│[0m         [7m│[0m
-          [7m[32m│[0m         [7m│[0m
-          [7m[32m│[0m         [7m│[0m
-          [7m[32m│[0m         [7m│[0m
-          [7m[32m│[0m         [7m│[0m
-          [7m[32m│[0m         [7m│[0m
-          [7m[32m│[0m         [7m│[0m
-          [7m[32m│[0m         [7m│[0m
-          [7m[32m│[0m         [7m│[0m
-          [7m[32m│[0m         [7m│[0m
-          [7m[32m│[0m         [7m│[0m
-          [7m[32m│[0m         [7m│[0m
+          [7m[38;2;143;188;143m│[0m         [7m[38;2;179;179;179m│[0m
+          [7m[38;2;143;188;143m│[0m         [7m[38;2;179;179;179m│[0m
+          [7m[38;2;143;188;143m│[0m         [7m[38;2;179;179;179m│[0m
+          [7m[38;2;143;188;143m│[0m         [7m[38;2;179;179;179m│[0m
+          [7m[38;2;143;188;143m│[0m         [7m[38;2;179;179;179m│[0m
+          [7m[38;2;143;188;143m│[0m         [7m[38;2;179;179;179m│[0m
+          [7m[38;2;143;188;143m│[0m         [7m[38;2;179;179;179m│[0m
+          [7m[38;2;143;188;143m│[0m         [7m[38;2;179;179;179m│[0m
+          [7m[38;2;143;188;143m│[0m         [7m[38;2;179;179;179m│[0m
+          [7m[38;2;143;188;143m│[0m         [7m[38;2;179;179;179m│[0m
+          [7m[38;2;143;188;143m│[0m         [7m[38;2;179;179;179m│[0m
+          [7m[38;2;143;188;143m│[0m         [7m[38;2;179;179;179m│[0m
--- a/regress/screen-redraw-results/scrollbar-floating.result
+++ b/regress/screen-redraw-results/scrollbar-floating.result
@@ -1,12 +1,12 @@
 SB00 abcdefghij                        [30m[47m
 [39m[49mSB01 abcdefghij                        [30m[47m
-[39m[49mSB02 ab[32m┌────────────────────┐[39m          [30m[47m
-[39m[49mSB03 ab[32m│[39mFLOAT00 abcdef     [30m[47m [32m[49m│[39m          [30m[47m
-[39m[49mSB04 ab[32m│[39mFLOAT01 abcdef     [30m[47m [32m[49m│[39m          [30m[47m
-[39m[49mSB05 ab[32m│[39mFLOAT02 abcdef     [30m[47m [32m[49m│[39m          [30m[47m
-[39m[49mSB06 ab[32m│[39mFLOAT03 abcdef     [30m[47m [32m[49m│[39m          [30m[47m
-[39m[49mSB07 ab[32m│[39mFLOAT04 abcdef     [30m[47m [32m[49m│[39m          [30m[47m
-[39m[49mSB08 ab[32m│[39m                   [30m[47m [32m[49m│[39m          [30m[47m
-[39m[49mSB09 ab[32m└────────────────────┘[39m          [30m[47m
+[39m[49mSB02 abcdefghij                        [30m[47m
+[39m[49mSB03 abc[38;2;143;188;143m┌──────────────────┐[39m           [30m[47m
+[39m[49mSB04 abc[38;2;143;188;143m│[39mFLOAT02 abcdef   [37m[40m [38;2;143;188;143m[49m│[39m           [30m[47m
+[39m[49mSB05 abc[38;2;143;188;143m│[39mFLOAT03 abcdef   [37m[40m [38;2;143;188;143m[49m│[39m           [30m[47m
+[39m[49mSB06 abc[38;2;143;188;143m│[39mFLOAT04 abcdef   [30m[47m [38;2;143;188;143m[49m│[39m           [30m[47m
+[39m[49mSB07 abc[38;2;143;188;143m│[39m                 [30m[47m [38;2;143;188;143m[49m│[39m           [30m[47m
+[39m[49mSB08 abc[38;2;143;188;143m└──────────────────┘[39m           [30m[47m
+[39m[49mSB09 abcdefghij                        [30m[47m
 [39m[49mSB10 abcdefghij                        [30m[47m
 [39m[49m                                       [30m[47m
--- a/regress/screen-redraw-results/scrollbar-split-left.result
+++ b/regress/screen-redraw-results/scrollbar-split-left.result
@@ -1,12 +1,12 @@
-[30m[47m [39m[49mSB00 abcdefghij    [32m│[30m[47m [39m[49mSBL00 abcdefghij
-[30m[47m [39m[49mSB01 abcdefghij    [32m│[30m[47m [39m[49mSBL01 abcdefghij
-[30m[47m [39m[49mSB02 abcdefghij    [32m│[30m[47m [39m[49mSBL02 abcdefghij
-[30m[47m [39m[49mSB03 abcdefghij    [32m│[30m[47m [39m[49mSBL03 abcdefghij
-[30m[47m [39m[49mSB04 abcdefghij    [32m│[30m[47m [39m[49mSBL04 abcdefghij
-[30m[47m [39m[49mSB05 abcdefghij    [32m│[30m[47m [39m[49mSBL05 abcdefghij
-[30m[47m [39m[49mSB06 abcdefghij    [32m│[30m[47m [39m[49mSBL06 abcdefghij
-[30m[47m [39m[49mSB07 abcdefghij    │[30m[47m [39m[49mSBL07 abcdefghij
-[30m[47m [39m[49mSB08 abcdefghij    │[30m[47m [39m[49mSBL08 abcdefghij
-[30m[47m [39m[49mSB09 abcdefghij    │[30m[47m [39m[49mSBL09 abcdefghij
-[30m[47m [39m[49mSB10 abcdefghij    │[30m[47m [39m[49mSBL10 abcdefghij
-[30m[47m [39m[49m                   │[30m[47m [39m[49m
+[30m[47m [39m[49mSB00 abcdefghij    [38;2;143;188;143m│[30m[47m [39m[49mSBL00 abcdefghij
+[30m[47m [39m[49mSB01 abcdefghij    [38;2;143;188;143m│[30m[47m [39m[49mSBL01 abcdefghij
+[30m[47m [39m[49mSB02 abcdefghij    [38;2;143;188;143m│[30m[47m [39m[49mSBL02 abcdefghij
+[30m[47m [39m[49mSB03 abcdefghij    [38;2;143;188;143m│[30m[47m [39m[49mSBL03 abcdefghij
+[30m[47m [39m[49mSB04 abcdefghij    [38;2;143;188;143m│[30m[47m [39m[49mSBL04 abcdefghij
+[30m[47m [39m[49mSB05 abcdefghij    [38;2;143;188;143m│[30m[47m [39m[49mSBL05 abcdefghij
+[30m[47m [39m[49mSB06 abcdefghij    [38;2;143;188;143m│[30m[47m [39m[49mSBL06 abcdefghij
+[30m[47m [39m[49mSB07 abcdefghij    [38;2;179;179;179m│[30m[47m [39m[49mSBL07 abcdefghij
+[30m[47m [39m[49mSB08 abcdefghij    [38;2;179;179;179m│[30m[47m [39m[49mSBL08 abcdefghij
+[30m[47m [39m[49mSB09 abcdefghij    [38;2;179;179;179m│[30m[47m [39m[49mSBL09 abcdefghij
+[30m[47m [39m[49mSB10 abcdefghij    [38;2;179;179;179m│[30m[47m [39m[49mSBL10 abcdefghij
+[30m[47m [39m[49m                   [38;2;179;179;179m│[30m[47m [39m[49m
--- a/regress/screen-redraw-results/scrollbar-split-right.result
+++ b/regress/screen-redraw-results/scrollbar-split-right.result
@@ -1,12 +1,12 @@
-SB00 abcdefghij    [30m[47m [32m[49m│[39mSBR00 abcdefghij  [30m[47m
-[39m[49mSB01 abcdefghij    [30m[47m [32m[49m│[39mSBR01 abcdefghij  [30m[47m
-[39m[49mSB02 abcdefghij    [30m[47m [32m[49m│[39mSBR02 abcdefghij  [30m[47m
-[39m[49mSB03 abcdefghij    [30m[47m [32m[49m│[39mSBR03 abcdefghij  [30m[47m
-[39m[49mSB04 abcdefghij    [30m[47m [32m[49m│[39mSBR04 abcdefghij  [30m[47m
-[39m[49mSB05 abcdefghij    [30m[47m [32m[49m│[39mSBR05 abcdefghij  [30m[47m
-[39m[49mSB06 abcdefghij    [30m[47m [32m[49m│[39mSBR06 abcdefghij  [30m[47m
-[39m[49mSB07 abcdefghij    [30m[47m [39m[49m│SBR07 abcdefghij  [30m[47m
-[39m[49mSB08 abcdefghij    [30m[47m [39m[49m│SBR08 abcdefghij  [30m[47m
-[39m[49mSB09 abcdefghij    [30m[47m [39m[49m│SBR09 abcdefghij  [30m[47m
-[39m[49mSB10 abcdefghij    [30m[47m [39m[49m│SBR10 abcdefghij  [30m[47m
-[39m[49m                   [30m[47m [39m[49m│                  [30m[47m
+SB00 abcdefghij    [30m[47m [38;2;143;188;143m[49m│[39mSBR00 abcdefghij  [30m[47m
+[39m[49mSB01 abcdefghij    [30m[47m [38;2;143;188;143m[49m│[39mSBR01 abcdefghij  [30m[47m
+[39m[49mSB02 abcdefghij    [30m[47m [38;2;143;188;143m[49m│[39mSBR02 abcdefghij  [30m[47m
+[39m[49mSB03 abcdefghij    [30m[47m [38;2;143;188;143m[49m│[39mSBR03 abcdefghij  [30m[47m
+[39m[49mSB04 abcdefghij    [30m[47m [38;2;143;188;143m[49m│[39mSBR04 abcdefghij  [30m[47m
+[39m[49mSB05 abcdefghij    [30m[47m [38;2;143;188;143m[49m│[39mSBR05 abcdefghij  [30m[47m
+[39m[49mSB06 abcdefghij    [30m[47m [38;2;143;188;143m[49m│[39mSBR06 abcdefghij  [30m[47m
+[39m[49mSB07 abcdefghij    [30m[47m [38;2;179;179;179m[49m│[39mSBR07 abcdefghij  [30m[47m
+[39m[49mSB08 abcdefghij    [30m[47m [38;2;179;179;179m[49m│[39mSBR08 abcdefghij  [30m[47m
+[39m[49mSB09 abcdefghij    [30m[47m [38;2;179;179;179m[49m│[39mSBR09 abcdefghij  [30m[47m
+[39m[49mSB10 abcdefghij    [30m[47m [38;2;179;179;179m[49m│[39mSBR10 abcdefghij  [30m[47m
+[39m[49m                   [30m[47m [38;2;179;179;179m[49m│[39m                  [30m[47m
--- a/regress/screen-redraw-results/window-style-active.result
+++ b/regress/screen-redraw-results/window-style-active.result
@@ -1,8 +1,8 @@
-[41mSTYLE00 abcdefghij  [32m[49m│[39m[44mSTYLE00 abcdefghij
-[41mSTYLE01 abcdefghij  [32m[49m│[39m[44mSTYLE01 abcdefghij
-[41mSTYLE02 abcdefghij  [32m[49m│[39m[44mSTYLE02 abcdefghij
-[41mSTYLE03 abcdefghij  [32m[49m│[39m[44mSTYLE03 abcdefghij
-[41mSTYLE04 abcdefghij  [32m[49m│[39m[44mSTYLE04 abcdefghij
-[41mSTYLE05 abcdefghij  [49m│[44mSTYLE05 abcdefghij
-[41mSTYLE06 abcdefghij  [49m│[44mSTYLE06 abcdefghij
-[41m                    [49m│[44m
+[41mSTYLE00 abcdefghij  [38;2;143;188;143m[49m│[39m[44mSTYLE00 abcdefghij
+[41mSTYLE01 abcdefghij  [38;2;143;188;143m[49m│[39m[44mSTYLE01 abcdefghij
+[41mSTYLE02 abcdefghij  [38;2;143;188;143m[49m│[39m[44mSTYLE02 abcdefghij
+[41mSTYLE03 abcdefghij  [38;2;143;188;143m[49m│[39m[44mSTYLE03 abcdefghij
+[41mSTYLE04 abcdefghij  [38;2;143;188;143m[49m│[39m[44mSTYLE04 abcdefghij
+[41mSTYLE05 abcdefghij  [38;2;179;179;179m[49m│[39m[44mSTYLE05 abcdefghij
+[41mSTYLE06 abcdefghij  [38;2;179;179;179m[49m│[39m[44mSTYLE06 abcdefghij
+[41m                    [38;2;179;179;179m[49m│[39m[44m