From 7ebac4a3c3064147199fe45ea3f920ce52bd16d0 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sun, 21 Jun 2026 20:47:23 +0100 Subject: [PATCH] Add some content to test panes. --- regress/screen-redraw-bidi.sh | 6 ++--- regress/screen-redraw-cache.sh | 10 +++---- regress/screen-redraw-floating.sh | 9 +++++++ regress/screen-redraw-outside.sh | 6 ++--- regress/screen-redraw-popups.sh | 2 +- .../screen-redraw-results/bidi-single.result | 4 +-- .../screen-redraw-results/bidi-split.result | 4 +-- .../bigger-bottomright.result | 20 +++++++------- .../bigger-topleft.result | 24 ++++++++--------- .../cache-resize-after.result | 26 +++++++++---------- .../cache-resize-before.result | 26 +++++++++---------- .../cache-resizeclient-after.result | 14 +++++----- .../cache-resizeclient-before.result | 22 ++++++++-------- .../cache-rotate-after.result | 24 ++++++++--------- .../cache-rotate-before.result | 24 ++++++++--------- .../cache-swap-after.result | 24 ++++++++--------- .../cache-swap-before.result | 24 ++++++++--------- .../cache-window-a-again.result | 26 +++++++++---------- .../cache-window-a.result | 26 +++++++++---------- .../cache-window-b.result | 22 ++++++++-------- .../floating-over-tiled-double.result | 18 ++++++------- .../floating-over-tiled.result | 18 ++++++------- .../outside-both-2x2.result | 12 ++++----- .../outside-bottom-split.result | 12 ++++----- .../outside-right-single.result | 26 +++++++++---------- .../outside-right-split.result | 26 +++++++++---------- .../screen-redraw-results/popup-basic.result | 26 +++++++++---------- .../screen-redraw-results/popup-double.result | 26 +++++++++---------- .../popup-noborder.result | 26 +++++++++---------- .../popup-over-split.result | 26 +++++++++---------- .../scrollbar-floating.result | 22 ++++++++-------- .../scrollbar-left-pad.result | 22 ++++++++-------- .../scrollbar-left-w1.result | 22 ++++++++-------- .../scrollbar-right-pad.result | 22 ++++++++-------- .../scrollbar-right-w1.result | 22 ++++++++-------- .../scrollbar-right-w2.result | 22 ++++++++-------- .../scrollbar-split-left.result | 22 ++++++++-------- .../scrollbar-split-right.result | 22 ++++++++-------- .../window-style-active.result | 14 +++++----- .../window-style-single.result | 14 +++++----- regress/screen-redraw-scrollbars.sh | 10 +++---- regress/screen-redraw-window-style.sh | 6 ++--- 42 files changed, 394 insertions(+), 385 deletions(-) diff --git a/regress/screen-redraw-bidi.sh b/regress/screen-redraw-bidi.sh index c7a18fdbe..e4e962950 100644 --- a/regress/screen-redraw-bidi.sh +++ b/regress/screen-redraw-bidi.sh @@ -43,17 +43,17 @@ compare() { } new_scene() { - $TMUX2 neww -d "sh -c 'exec sleep 100'" || exit 1 + $TMUX2 neww -d "sh -c 'printf \"BIDI-LEFT 12345\nBIDI-RIGHT 67890\"; exec sleep 100'" || exit 1 $TMUX2 selectw -t:\$ || exit 1 $TMUX2 resizew -x40 -y12 || exit 1 } -C="sh -c 'exec sleep 100'" +C="sh -c 'printf \"BIDI-PANE 12345\nBIDI-PANE 67890\"; exec sleep 100'" $TMUX kill-server 2>/dev/null $TMUX2 kill-server 2>/dev/null -$TMUX2 new -d -x40 -y12 "sh -c 'exec sleep 100'" || exit 1 +$TMUX2 new -d -x40 -y12 "sh -c 'printf \"BIDI-BASE 12345\nBIDI-BASE 67890\"; exec sleep 100'" || exit 1 $TMUX2 set -g status off || exit 1 $TMUX2 set -g window-size manual || exit 1 # Add the Bidi capability before the client attaches. diff --git a/regress/screen-redraw-cache.sh b/regress/screen-redraw-cache.sh index af256668f..27c98e3b4 100644 --- a/regress/screen-redraw-cache.sh +++ b/regress/screen-redraw-cache.sh @@ -44,12 +44,12 @@ compare() { } new_scene() { - $TMUX2 neww -d "sh -c 'exec sleep 100'" || exit 1 + $TMUX2 neww -d "sh -c 'i=0; while [ \$i -lt 13 ]; do printf \"BASE%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" || exit 1 $TMUX2 selectw -t:\$ || exit 1 $TMUX2 resizew -x40 -y14 || exit 1 } -C="sh -c 'exec sleep 100'" +C="sh -c 'i=0; while [ \$i -lt 5 ]; do printf \"PANE%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" $TMUX kill-server 2>/dev/null $TMUX2 kill-server 2>/dev/null @@ -125,13 +125,13 @@ compare cache-swap-after # layout and switching back must not show the other window's cached scene. --- # Window A: a single pane (no internal border). -$TMUX2 neww -d "sh -c 'exec sleep 100'" || exit 1 +$TMUX2 neww -d "sh -c 'i=0; while [ \$i -lt 13 ]; do printf \"WINA%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" || exit 1 $TMUX2 selectw -t:\$ || exit 1 $TMUX2 resizew -x40 -y14 || exit 1 A=$($TMUX2 display -p '#{window_id}') || exit 1 # Window B: a top/bottom split (a horizontal border). -$TMUX2 neww -d "sh -c 'exec sleep 100'" || exit 1 +$TMUX2 neww -d "sh -c 'i=0; while [ \$i -lt 13 ]; do printf \"WINB%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" || exit 1 $TMUX2 selectw -t:\$ || exit 1 $TMUX2 resizew -x40 -y14 || exit 1 $TMUX2 splitw -v "$C" || exit 1 @@ -151,7 +151,7 @@ compare cache-window-a-again # be rebuilt at the new size (the scene->sx/sy mismatch path in # redraw_get_scene), not drawn at the old size. $TMUX2 set -g window-size latest || exit 1 -$TMUX2 neww -d "sh -c 'exec sleep 100'" || exit 1 +$TMUX2 neww -d "sh -c 'i=0; while [ \$i -lt 13 ]; do printf \"SIZE%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" || exit 1 $TMUX2 selectw -t:\$ || exit 1 $TMUX2 splitw -v "$C" || exit 1 compare cache-resizeclient-before diff --git a/regress/screen-redraw-floating.sh b/regress/screen-redraw-floating.sh index c3eed99f8..82c36d364 100644 --- a/regress/screen-redraw-floating.sh +++ b/regress/screen-redraw-floating.sh @@ -63,6 +63,13 @@ fill_base_pattern() { $TMUX2 respawnp -k "sh -c 'i=0; while [ \$i -lt 12 ]; do printf \"%02d:abcdefghijklmnopqrstuvwxyz0123456789\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" || exit 1 } +# fill_all_panes: make each pane visibly nonblank. +fill_all_panes() { + for pane in $($TMUX2 list-panes -F '#{pane_id}'); do + $TMUX2 respawnp -k -t "$pane" "sh -c 'i=0; while [ \$i -lt 5 ]; do printf \"TILE%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" || exit 1 + done +} + $TMUX kill-server 2>/dev/null $TMUX2 kill-server 2>/dev/null @@ -149,6 +156,7 @@ compare floating-clip-bottom # NOT merge its borders with the tiled pane borders underneath. new_scene 40 12 tile_2x2 +fill_all_panes $TMUX2 new-pane -x16 -y6 -X11 -Y3 "sh -c 'printf FLT; exec sleep 100'" || exit 1 compare floating-over-tiled @@ -156,6 +164,7 @@ compare floating-over-tiled # the two border styles must coexist without merging. new_scene 40 12 tile_2x2 +fill_all_panes $TMUX2 new-pane -x16 -y6 -X11 -Y3 -B double \ "sh -c 'printf FLT; exec sleep 100'" || exit 1 compare floating-over-tiled-double diff --git a/regress/screen-redraw-outside.sh b/regress/screen-redraw-outside.sh index d90e05b87..53a2a72b1 100644 --- a/regress/screen-redraw-outside.sh +++ b/regress/screen-redraw-outside.sh @@ -45,17 +45,17 @@ compare() { # new_scene : fresh inner window smaller than the 40x14 client. new_scene() { - $TMUX2 neww -d "sh -c 'printf base; exec sleep 100'" || exit 1 + $TMUX2 neww -d "sh -c 'i=0; while [ \$i -lt $(($2 - 1)) ]; do printf \"OUT%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" || exit 1 $TMUX2 selectw -t:\$ || exit 1 $TMUX2 resizew -x$1 -y$2 || exit 1 } -C="sh -c 'exec sleep 100'" +C="sh -c 'i=0; while [ \$i -lt 8 ]; do printf \"PAN%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" $TMUX kill-server 2>/dev/null $TMUX2 kill-server 2>/dev/null -$TMUX2 new -d -x40 -y14 "sh -c 'printf base; exec sleep 100'" || exit 1 +$TMUX2 new -d -x40 -y14 "sh -c 'i=0; while [ \$i -lt 13 ]; do printf \"OUT%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" || exit 1 $TMUX2 set -g status off || exit 1 $TMUX2 set -g window-size manual || exit 1 diff --git a/regress/screen-redraw-popups.sh b/regress/screen-redraw-popups.sh index f0700df87..1eb7e5897 100644 --- a/regress/screen-redraw-popups.sh +++ b/regress/screen-redraw-popups.sh @@ -42,7 +42,7 @@ compare() { fi } -C="sh -c 'exec sleep 100'" +C="sh -c 'i=0; while [ \$i -lt 13 ]; do printf \"POP%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" # setup: fresh inner window attached inside a fresh outer pane, 40x14. setup() { diff --git a/regress/screen-redraw-results/bidi-single.result b/regress/screen-redraw-results/bidi-single.result index 1901ba936..874e62e1b 100644 --- a/regress/screen-redraw-results/bidi-single.result +++ b/regress/screen-redraw-results/bidi-single.result @@ -1,5 +1,5 @@ - - +BIDI-LEFT 12345 +BIDI-RIGHT 67890 diff --git a/regress/screen-redraw-results/bidi-split.result b/regress/screen-redraw-results/bidi-split.result index 7d889921a..654695f18 100644 --- a/regress/screen-redraw-results/bidi-split.result +++ b/regress/screen-redraw-results/bidi-split.result @@ -1,5 +1,5 @@ - ⁩│⁦ - ⁩│⁦ +BIDI-LEFT 12345 ⁩│⁦BIDI-PANE 12345 +BIDI-RIGHT 67890 ⁩│⁦BIDI-PANE 67890 ⁩│⁦ ⁩│⁦ ⁩│⁦ diff --git a/regress/screen-redraw-results/bigger-bottomright.result b/regress/screen-redraw-results/bigger-bottomright.result index 17a5df718..8840fa2b1 100644 --- a/regress/screen-redraw-results/bigger-bottomright.result +++ b/regress/screen-redraw-results/bigger-bottomright.result @@ -1,14 +1,14 @@ - │ - │ + │PAN06 abcdefghij + │PAN07 abcdefghij │ ─────────┼────────────────────────────── - │ - │ - │ - │ - │ - │ - │ - │ + │PAN00 abcdefghij + │PAN01 abcdefghij + │PAN02 abcdefghij + │PAN03 abcdefghij + │PAN04 abcdefghij + │PAN05 abcdefghij + │PAN06 abcdefghij + │PAN07 abcdefghij │ │ diff --git a/regress/screen-redraw-results/bigger-topleft.result b/regress/screen-redraw-results/bigger-topleft.result index 6538e3aa6..4f1e482cf 100644 --- a/regress/screen-redraw-results/bigger-topleft.result +++ b/regress/screen-redraw-results/bigger-topleft.result @@ -1,14 +1,14 @@ -base │ - │ - │ - │ - │ - │ - │ - │ +OUT11 abcdefghij │PAN00 abcd +OUT12 abcdefghij │PAN01 abcd +OUT13 abcdefghij │PAN02 abcd +OUT14 abcdefghij │PAN03 abcd +OUT15 abcdefghij │PAN04 abcd +OUT16 abcdefghij │PAN05 abcd +OUT17 abcdefghij │PAN06 abcd +OUT18 abcdefghij │PAN07 abcd │ ─────────────────────────────┼────────── - │ - │ - │ - │ +PAN00 abcdefghij │PAN00 abcd +PAN01 abcdefghij │PAN01 abcd +PAN02 abcdefghij │PAN02 abcd +PAN03 abcdefghij │PAN03 abcd diff --git a/regress/screen-redraw-results/cache-resize-after.result b/regress/screen-redraw-results/cache-resize-after.result index 3153e9bc0..163f853d2 100644 --- a/regress/screen-redraw-results/cache-resize-after.result +++ b/regress/screen-redraw-results/cache-resize-after.result @@ -1,14 +1,14 @@ - │ - │ - │ - │ - │ - │ - │ - │ - │ - │ - │ - │ - │ +hij │PANE00 abcdefghij +BASE07 abcdefg│PANE01 abcdefghij +hij │PANE02 abcdefghij +BASE08 abcdefg│PANE03 abcdefghij +hij │PANE04 abcdefghij +BASE09 abcdefg│ +hij │ +BASE10 abcdefg│ +hij │ +BASE11 abcdefg│ +hij │ +BASE12 abcdefg│ +hij │ │ diff --git a/regress/screen-redraw-results/cache-resize-before.result b/regress/screen-redraw-results/cache-resize-before.result index 7d8e14562..ee18481f7 100644 --- a/regress/screen-redraw-results/cache-resize-before.result +++ b/regress/screen-redraw-results/cache-resize-before.result @@ -1,14 +1,14 @@ - │ - │ - │ - │ - │ - │ - │ - │ - │ - │ - │ - │ - │ +BASE00 abcdefghij │PANE00 abcdefghij +BASE01 abcdefghij │PANE01 abcdefghij +BASE02 abcdefghij │PANE02 abcdefghij +BASE03 abcdefghij │PANE03 abcdefghij +BASE04 abcdefghij │PANE04 abcdefghij +BASE05 abcdefghij │ +BASE06 abcdefghij │ +BASE07 abcdefghij │ +BASE08 abcdefghij │ +BASE09 abcdefghij │ +BASE10 abcdefghij │ +BASE11 abcdefghij │ +BASE12 abcdefghij │ │ diff --git a/regress/screen-redraw-results/cache-resizeclient-after.result b/regress/screen-redraw-results/cache-resizeclient-after.result index edb646954..675012f0d 100644 --- a/regress/screen-redraw-results/cache-resizeclient-after.result +++ b/regress/screen-redraw-results/cache-resizeclient-after.result @@ -1,10 +1,10 @@ - - - - +SIZE09 abcdefghij +SIZE10 abcdefghij +SIZE11 abcdefghij +SIZE12 abcdefghij ────────────────────────────── - - - +PANE02 abcdefghij +PANE03 abcdefghij +PANE04 abcdefghij diff --git a/regress/screen-redraw-results/cache-resizeclient-before.result b/regress/screen-redraw-results/cache-resizeclient-before.result index 3a6144aef..48c1058c3 100644 --- a/regress/screen-redraw-results/cache-resizeclient-before.result +++ b/regress/screen-redraw-results/cache-resizeclient-before.result @@ -1,14 +1,14 @@ - - - - - - +SIZE07 abcdefghij +SIZE08 abcdefghij +SIZE09 abcdefghij +SIZE10 abcdefghij +SIZE11 abcdefghij +SIZE12 abcdefghij ──────────────────────────────────────── - - - - - +PANE00 abcdefghij +PANE01 abcdefghij +PANE02 abcdefghij +PANE03 abcdefghij +PANE04 abcdefghij diff --git a/regress/screen-redraw-results/cache-rotate-after.result b/regress/screen-redraw-results/cache-rotate-after.result index 14f859e90..15acf7bb3 100644 --- a/regress/screen-redraw-results/cache-rotate-after.result +++ b/regress/screen-redraw-results/cache-rotate-after.result @@ -1,14 +1,14 @@ ── BBB ───┬── CCC ──┬── AAA ──────────── - │ │ - │ │ - │ │ - │ │ - │ │ - │ │ - │ │ - │ │ - │ │ - │ │ - │ │ - │ │ +PANE00 abc│cdefghij │BASE01 abcdefghij +defghij │PANE03 ab│BASE02 abcdefghij +PANE01 abc│cdefghij │BASE03 abcdefghij +defghij │PANE04 ab│BASE04 abcdefghij +PANE02 abc│cdefghij │BASE05 abcdefghij +defghij │ │BASE06 abcdefghij +PANE03 abc│ │BASE07 abcdefghij +defghij │ │BASE08 abcdefghij +PANE04 abc│ │BASE09 abcdefghij +defghij │ │BASE10 abcdefghij + │ │BASE11 abcdefghij + │ │BASE12 abcdefghij │ │ diff --git a/regress/screen-redraw-results/cache-rotate-before.result b/regress/screen-redraw-results/cache-rotate-before.result index 95deb8e10..856946d17 100644 --- a/regress/screen-redraw-results/cache-rotate-before.result +++ b/regress/screen-redraw-results/cache-rotate-before.result @@ -1,14 +1,14 @@ ── AAA ───┬── BBB ──┬── CCC ──────────── - │ │ - │ │ - │ │ - │ │ - │ │ - │ │ - │ │ - │ │ - │ │ - │ │ - │ │ - │ │ +BASE07 abc│PANE00 ab│PANE00 abcdefghij +defghij │cdefghij │PANE01 abcdefghij +BASE08 abc│PANE01 ab│PANE02 abcdefghij +defghij │cdefghij │PANE03 abcdefghij +BASE09 abc│PANE02 ab│PANE04 abcdefghij +defghij │cdefghij │ +BASE10 abc│PANE03 ab│ +defghij │cdefghij │ +BASE11 abc│PANE04 ab│ +defghij │cdefghij │ +BASE12 abc│ │ +defghij │ │ │ │ diff --git a/regress/screen-redraw-results/cache-swap-after.result b/regress/screen-redraw-results/cache-swap-after.result index 34e3b502c..87424c1bf 100644 --- a/regress/screen-redraw-results/cache-swap-after.result +++ b/regress/screen-redraw-results/cache-swap-after.result @@ -1,14 +1,14 @@ ── RIGHT ───────────┬── LEFT ─────────── - │ - │ - │ - │ - │ - │ - │ - │ - │ - │ - │ - │ +PANE00 abcdefghij │BASE01 abcdefghij +PANE01 abcdefghij │BASE02 abcdefghij +PANE02 abcdefghij │BASE03 abcdefghij +PANE03 abcdefghij │BASE04 abcdefghij +PANE04 abcdefghij │BASE05 abcdefghij + │BASE06 abcdefghij + │BASE07 abcdefghij + │BASE08 abcdefghij + │BASE09 abcdefghij + │BASE10 abcdefghij + │BASE11 abcdefghij + │BASE12 abcdefghij │ diff --git a/regress/screen-redraw-results/cache-swap-before.result b/regress/screen-redraw-results/cache-swap-before.result index 50aadd6da..3e84a9c4d 100644 --- a/regress/screen-redraw-results/cache-swap-before.result +++ b/regress/screen-redraw-results/cache-swap-before.result @@ -1,14 +1,14 @@ ── LEFT ────────────┬── RIGHT ────────── - │ - │ - │ - │ - │ - │ - │ - │ - │ - │ - │ - │ +BASE01 abcdefghij │PANE00 abcdefghij +BASE02 abcdefghij │PANE01 abcdefghij +BASE03 abcdefghij │PANE02 abcdefghij +BASE04 abcdefghij │PANE03 abcdefghij +BASE05 abcdefghij │PANE04 abcdefghij +BASE06 abcdefghij │ +BASE07 abcdefghij │ +BASE08 abcdefghij │ +BASE09 abcdefghij │ +BASE10 abcdefghij │ +BASE11 abcdefghij │ +BASE12 abcdefghij │ │ diff --git a/regress/screen-redraw-results/cache-window-a-again.result b/regress/screen-redraw-results/cache-window-a-again.result index 5cf5d3dc4..093f62ba3 100644 --- a/regress/screen-redraw-results/cache-window-a-again.result +++ b/regress/screen-redraw-results/cache-window-a-again.result @@ -1,14 +1,14 @@ - - - - - - - - - - - - - +WINA00 abcdefghij +WINA01 abcdefghij +WINA02 abcdefghij +WINA03 abcdefghij +WINA04 abcdefghij +WINA05 abcdefghij +WINA06 abcdefghij +WINA07 abcdefghij +WINA08 abcdefghij +WINA09 abcdefghij +WINA10 abcdefghij +WINA11 abcdefghij +WINA12 abcdefghij diff --git a/regress/screen-redraw-results/cache-window-a.result b/regress/screen-redraw-results/cache-window-a.result index 5cf5d3dc4..093f62ba3 100644 --- a/regress/screen-redraw-results/cache-window-a.result +++ b/regress/screen-redraw-results/cache-window-a.result @@ -1,14 +1,14 @@ - - - - - - - - - - - - - +WINA00 abcdefghij +WINA01 abcdefghij +WINA02 abcdefghij +WINA03 abcdefghij +WINA04 abcdefghij +WINA05 abcdefghij +WINA06 abcdefghij +WINA07 abcdefghij +WINA08 abcdefghij +WINA09 abcdefghij +WINA10 abcdefghij +WINA11 abcdefghij +WINA12 abcdefghij diff --git a/regress/screen-redraw-results/cache-window-b.result b/regress/screen-redraw-results/cache-window-b.result index 3a6144aef..f0c9fe683 100644 --- a/regress/screen-redraw-results/cache-window-b.result +++ b/regress/screen-redraw-results/cache-window-b.result @@ -1,14 +1,14 @@ - - - - - - +WINB07 abcdefghij +WINB08 abcdefghij +WINB09 abcdefghij +WINB10 abcdefghij +WINB11 abcdefghij +WINB12 abcdefghij ──────────────────────────────────────── - - - - - +PANE00 abcdefghij +PANE01 abcdefghij +PANE02 abcdefghij +PANE03 abcdefghij +PANE04 abcdefghij diff --git a/regress/screen-redraw-results/floating-over-tiled-double.result b/regress/screen-redraw-results/floating-over-tiled-double.result index 8c4b5eaf8..5e286a90f 100644 --- a/regress/screen-redraw-results/floating-over-tiled-double.result +++ b/regress/screen-redraw-results/floating-over-tiled-double.result @@ -1,12 +1,12 @@ -base │ - │ - ╔════════════════╗ - ║FLT ║ +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 +TILE04 abcdefghij │TILE04 abcdefghij │ diff --git a/regress/screen-redraw-results/floating-over-tiled.result b/regress/screen-redraw-results/floating-over-tiled.result index 4ddf95ed0..4332c27c0 100644 --- a/regress/screen-redraw-results/floating-over-tiled.result +++ b/regress/screen-redraw-results/floating-over-tiled.result @@ -1,12 +1,12 @@ -base │ - │ - ┌────────────────┐ - │FLT │ +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 +TILE04 abcdefghij │TILE04 abcdefghij │ diff --git a/regress/screen-redraw-results/outside-both-2x2.result b/regress/screen-redraw-results/outside-both-2x2.result index 193d66aa9..18644f952 100644 --- a/regress/screen-redraw-results/outside-both-2x2.result +++ b/regress/screen-redraw-results/outside-both-2x2.result @@ -1,11 +1,11 @@ -base │ │··········· - │ │··········· - │ │··········· +hij │ij │··········· +OUT07 abcdefg│PAN07 abcdefgh│··········· +hij │ij │··········· │ │··········· ─────────────┼──────────────┤··········· - │ │··········· - │ │··········· - │ │··········· +hij │ij │··········· +PAN07 abcdefg│PAN07 abcdefgh│··········· +hij │ij │··········· │ │··········· ─────────────┴──────────────┘··········· ········································ diff --git a/regress/screen-redraw-results/outside-bottom-split.result b/regress/screen-redraw-results/outside-bottom-split.result index af6ac8a56..fe68489da 100644 --- a/regress/screen-redraw-results/outside-bottom-split.result +++ b/regress/screen-redraw-results/outside-bottom-split.result @@ -1,11 +1,11 @@ -base - - +OUT05 abcdefghij +OUT06 abcdefghij +OUT07 abcdefghij ──────────────────────────────────────── - - - +PAN05 abcdefghij +PAN06 abcdefghij +PAN07 abcdefghij ──────────────────────────────────────── ········································ diff --git a/regress/screen-redraw-results/outside-right-single.result b/regress/screen-redraw-results/outside-right-single.result index 27d98e8d7..1aed39fd4 100644 --- a/regress/screen-redraw-results/outside-right-single.result +++ b/regress/screen-redraw-results/outside-right-single.result @@ -1,14 +1,14 @@ -base │··········· - │··········· - │··········· - │··········· - │··········· - │··········· - │··········· - │··········· - │··········· - │··········· - │··········· - │··········· - │··········· +OUT00 abcdefghij │··········· +OUT01 abcdefghij │··········· +OUT02 abcdefghij │··········· +OUT03 abcdefghij │··········· +OUT04 abcdefghij │··········· +OUT05 abcdefghij │··········· +OUT06 abcdefghij │··········· +OUT07 abcdefghij │··········· +OUT08 abcdefghij │··········· +OUT09 abcdefghij │··········· +OUT10 abcdefghij │··········· +OUT11 abcdefghij │··········· +OUT12 abcdefghij │··········· │··········· diff --git a/regress/screen-redraw-results/outside-right-split.result b/regress/screen-redraw-results/outside-right-split.result index fd57ef0ee..c115e708c 100644 --- a/regress/screen-redraw-results/outside-right-split.result +++ b/regress/screen-redraw-results/outside-right-split.result @@ -1,14 +1,14 @@ -base │ │··········· - │ │··········· - │ │··········· - │ │··········· - │ │··········· - │ │··········· - │ │··········· - │ │··········· - │ │··········· - │ │··········· - │ │··········· - │ │··········· - │ │··········· +ij │hij │··········· +OUT07 abcdefgh│PAN02 abcdefg│··········· +ij │hij │··········· +OUT08 abcdefgh│PAN03 abcdefg│··········· +ij │hij │··········· +OUT09 abcdefgh│PAN04 abcdefg│··········· +ij │hij │··········· +OUT10 abcdefgh│PAN05 abcdefg│··········· +ij │hij │··········· +OUT11 abcdefgh│PAN06 abcdefg│··········· +ij │hij │··········· +OUT12 abcdefgh│PAN07 abcdefg│··········· +ij │hij │··········· │ │··········· diff --git a/regress/screen-redraw-results/popup-basic.result b/regress/screen-redraw-results/popup-basic.result index 20d19f437..7b05d3a61 100644 --- a/regress/screen-redraw-results/popup-basic.result +++ b/regress/screen-redraw-results/popup-basic.result @@ -1,14 +1,14 @@ - ┌──────────────────┐ - │POPUP │ - │ │ - │ │ - │ │ - └──────────────────┘ - - - - - - - +POP00 ┌──────────────────┐ +POP01 │POPUP │ +POP02 │ │ +POP03 │ │ +POP04 │ │ +POP05 └──────────────────┘ +POP06 abcdefghij +POP07 abcdefghij +POP08 abcdefghij +POP09 abcdefghij +POP10 abcdefghij +POP11 abcdefghij +POP12 abcdefghij diff --git a/regress/screen-redraw-results/popup-double.result b/regress/screen-redraw-results/popup-double.result index b3b15c3aa..70b38c8c3 100644 --- a/regress/screen-redraw-results/popup-double.result +++ b/regress/screen-redraw-results/popup-double.result @@ -1,14 +1,14 @@ - ╔══════════════════╗ - ║POPUP ║ - ║ ║ - ║ ║ - ║ ║ - ╚══════════════════╝ - - - - - - - +POP00 ╔══════════════════╗ +POP01 ║POPUP ║ +POP02 ║ ║ +POP03 ║ ║ +POP04 ║ ║ +POP05 ╚══════════════════╝ +POP06 abcdefghij +POP07 abcdefghij +POP08 abcdefghij +POP09 abcdefghij +POP10 abcdefghij +POP11 abcdefghij +POP12 abcdefghij diff --git a/regress/screen-redraw-results/popup-noborder.result b/regress/screen-redraw-results/popup-noborder.result index 46208a3af..fc641e781 100644 --- a/regress/screen-redraw-results/popup-noborder.result +++ b/regress/screen-redraw-results/popup-noborder.result @@ -1,14 +1,14 @@ - POPUP - - - - - - - - - - - - +POP00 POPUP +POP01 +POP02 +POP03 +POP04 +POP05 +POP06 abcdefghij +POP07 abcdefghij +POP08 abcdefghij +POP09 abcdefghij +POP10 abcdefghij +POP11 abcdefghij +POP12 abcdefghij diff --git a/regress/screen-redraw-results/popup-over-split.result b/regress/screen-redraw-results/popup-over-split.result index 7302f964a..558efc92e 100644 --- a/regress/screen-redraw-results/popup-over-split.result +++ b/regress/screen-redraw-results/popup-over-split.result @@ -1,14 +1,14 @@ - ┌──────────────────────┐ - │POPUP │ - │ │ - │ │ - │ │ - │ │ - │ │ - └──────────────────────┘ - │ - │ - │ - │ - │ +POP00 ab┌──────────────────────┐fghij +POP01 ab│POPUP │fghij +POP02 ab│ │fghij +POP03 ab│ │fghij +POP04 ab│ │fghij +POP05 ab│ │fghij +POP06 ab│ │fghij +POP07 ab└──────────────────────┘fghij +POP08 abcdefghij │POP08 abcdefghij +POP09 abcdefghij │POP09 abcdefghij +POP10 abcdefghij │POP10 abcdefghij +POP11 abcdefghij │POP11 abcdefghij +POP12 abcdefghij │POP12 abcdefghij │ diff --git a/regress/screen-redraw-results/scrollbar-floating.result b/regress/screen-redraw-results/scrollbar-floating.result index 8adb4da49..9ed4caff1 100644 --- a/regress/screen-redraw-results/scrollbar-floating.result +++ b/regress/screen-redraw-results/scrollbar-floating.result @@ -1,12 +1,12 @@ -base  -  - ┌────────────────────┐  - │FLOAT  │  - │  │  - │  │  - │  │  - │  │  - │  │  - └────────────────────┘  -  +SB00 abcdefghij  +SB01 abcdefghij  +SB02 ab┌────────────────────┐  +SB03 ab│FLOAT00 abcdef  │  +SB04 ab│FLOAT01 abcdef  │  +SB05 ab│FLOAT02 abcdef  │  +SB06 ab│FLOAT03 abcdef  │  +SB07 ab│FLOAT04 abcdef  │  +SB08 ab│  │  +SB09 ab└────────────────────┘  +SB10 abcdefghij    diff --git a/regress/screen-redraw-results/scrollbar-left-pad.result b/regress/screen-redraw-results/scrollbar-left-pad.result index 4a578e789..fbc0f8920 100644 --- a/regress/screen-redraw-results/scrollbar-left-pad.result +++ b/regress/screen-redraw-results/scrollbar-left-pad.result @@ -1,12 +1,12 @@ -  base -  -  -  -  -  -  -  -  -  -  +  SB00 abcdefghij +  SB01 abcdefghij +  SB02 abcdefghij +  SB03 abcdefghij +  SB04 abcdefghij +  SB05 abcdefghij +  SB06 abcdefghij +  SB07 abcdefghij +  SB08 abcdefghij +  SB09 abcdefghij +  SB10 abcdefghij   diff --git a/regress/screen-redraw-results/scrollbar-left-w1.result b/regress/screen-redraw-results/scrollbar-left-w1.result index 84d278627..e09becffe 100644 --- a/regress/screen-redraw-results/scrollbar-left-w1.result +++ b/regress/screen-redraw-results/scrollbar-left-w1.result @@ -1,12 +1,12 @@ - base -  -  -  -  -  -  -  -  -  -  + SB00 abcdefghij + SB01 abcdefghij + SB02 abcdefghij + SB03 abcdefghij + SB04 abcdefghij + SB05 abcdefghij + SB06 abcdefghij + SB07 abcdefghij + SB08 abcdefghij + SB09 abcdefghij + SB10 abcdefghij   diff --git a/regress/screen-redraw-results/scrollbar-right-pad.result b/regress/screen-redraw-results/scrollbar-right-pad.result index dff530e26..ef9d6db47 100644 --- a/regress/screen-redraw-results/scrollbar-right-pad.result +++ b/regress/screen-redraw-results/scrollbar-right-pad.result @@ -1,12 +1,12 @@ -base  -  -  -  -  -  -  -  -  -  -  +SB00 abcdefghij  +SB01 abcdefghij  +SB02 abcdefghij  +SB03 abcdefghij  +SB04 abcdefghij  +SB05 abcdefghij  +SB06 abcdefghij  +SB07 abcdefghij  +SB08 abcdefghij  +SB09 abcdefghij  +SB10 abcdefghij    diff --git a/regress/screen-redraw-results/scrollbar-right-w1.result b/regress/screen-redraw-results/scrollbar-right-w1.result index dff530e26..ef9d6db47 100644 --- a/regress/screen-redraw-results/scrollbar-right-w1.result +++ b/regress/screen-redraw-results/scrollbar-right-w1.result @@ -1,12 +1,12 @@ -base  -  -  -  -  -  -  -  -  -  -  +SB00 abcdefghij  +SB01 abcdefghij  +SB02 abcdefghij  +SB03 abcdefghij  +SB04 abcdefghij  +SB05 abcdefghij  +SB06 abcdefghij  +SB07 abcdefghij  +SB08 abcdefghij  +SB09 abcdefghij  +SB10 abcdefghij    diff --git a/regress/screen-redraw-results/scrollbar-right-w2.result b/regress/screen-redraw-results/scrollbar-right-w2.result index a82d86218..3ccb8fe73 100644 --- a/regress/screen-redraw-results/scrollbar-right-w2.result +++ b/regress/screen-redraw-results/scrollbar-right-w2.result @@ -1,12 +1,12 @@ -base  -  -  -  -  -  -  -  -  -  -  +SB00 abcdefghij  +SB01 abcdefghij  +SB02 abcdefghij  +SB03 abcdefghij  +SB04 abcdefghij  +SB05 abcdefghij  +SB06 abcdefghij  +SB07 abcdefghij  +SB08 abcdefghij  +SB09 abcdefghij  +SB10 abcdefghij    diff --git a/regress/screen-redraw-results/scrollbar-split-left.result b/regress/screen-redraw-results/scrollbar-split-left.result index 8108a4719..23938119f 100644 --- a/regress/screen-redraw-results/scrollbar-split-left.result +++ b/regress/screen-redraw-results/scrollbar-split-left.result @@ -1,12 +1,12 @@ - base │ base -  │  -  │  -  │  -  │  -  │  -  │  -  │  -  │  -  │  -  │  + SB00 abcdefghij │ SBL00 abcdefghij + SB01 abcdefghij │ SBL01 abcdefghij + SB02 abcdefghij │ SBL02 abcdefghij + SB03 abcdefghij │ SBL03 abcdefghij + SB04 abcdefghij │ SBL04 abcdefghij + SB05 abcdefghij │ SBL05 abcdefghij + SB06 abcdefghij │ SBL06 abcdefghij + SB07 abcdefghij │ SBL07 abcdefghij + SB08 abcdefghij │ SBL08 abcdefghij + SB09 abcdefghij │ SBL09 abcdefghij + SB10 abcdefghij │ SBL10 abcdefghij   │  diff --git a/regress/screen-redraw-results/scrollbar-split-right.result b/regress/screen-redraw-results/scrollbar-split-right.result index b49abd2f9..ab6184619 100644 --- a/regress/screen-redraw-results/scrollbar-split-right.result +++ b/regress/screen-redraw-results/scrollbar-split-right.result @@ -1,12 +1,12 @@ -base  │base  -  │  -  │  -  │  -  │  -  │  -  │  -  │  -  │  -  │  -  │  +SB00 abcdefghij  │SBR00 abcdefghij  +SB01 abcdefghij  │SBR01 abcdefghij  +SB02 abcdefghij  │SBR02 abcdefghij  +SB03 abcdefghij  │SBR03 abcdefghij  +SB04 abcdefghij  │SBR04 abcdefghij  +SB05 abcdefghij  │SBR05 abcdefghij  +SB06 abcdefghij  │SBR06 abcdefghij  +SB07 abcdefghij  │SBR07 abcdefghij  +SB08 abcdefghij  │SBR08 abcdefghij  +SB09 abcdefghij  │SBR09 abcdefghij  +SB10 abcdefghij  │SBR10 abcdefghij    │  diff --git a/regress/screen-redraw-results/window-style-active.result b/regress/screen-redraw-results/window-style-active.result index 9059228be..e32cc31ca 100644 --- a/regress/screen-redraw-results/window-style-active.result +++ b/regress/screen-redraw-results/window-style-active.result @@ -1,8 +1,8 @@ - │ - │ - │ - │ - │ - │ - │ +STYLE00 abcdefghij │STYLE00 abcdefghij +STYLE01 abcdefghij │STYLE01 abcdefghij +STYLE02 abcdefghij │STYLE02 abcdefghij +STYLE03 abcdefghij │STYLE03 abcdefghij +STYLE04 abcdefghij │STYLE04 abcdefghij +STYLE05 abcdefghij │STYLE05 abcdefghij +STYLE06 abcdefghij │STYLE06 abcdefghij  │ diff --git a/regress/screen-redraw-results/window-style-single.result b/regress/screen-redraw-results/window-style-single.result index 5a2e4bfbf..3895c6f31 100644 --- a/regress/screen-redraw-results/window-style-single.result +++ b/regress/screen-redraw-results/window-style-single.result @@ -1,8 +1,8 @@ - - - - - - - +STYLE00 abcdefghij +STYLE01 abcdefghij +STYLE02 abcdefghij +STYLE03 abcdefghij +STYLE04 abcdefghij +STYLE05 abcdefghij +STYLE06 abcdefghij diff --git a/regress/screen-redraw-scrollbars.sh b/regress/screen-redraw-scrollbars.sh index 926a4a119..f8298b5e1 100644 --- a/regress/screen-redraw-scrollbars.sh +++ b/regress/screen-redraw-scrollbars.sh @@ -44,7 +44,7 @@ compare() { # new_scene: fresh inner window, single full-size pane. new_scene() { - $TMUX2 neww -d "sh -c 'printf base; exec sleep 100'" || exit 1 + $TMUX2 neww -d "sh -c 'i=0; while [ \$i -lt 11 ]; do printf \"SB%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" || exit 1 $TMUX2 selectw -t:\$ || exit 1 $TMUX2 resizew -x40 -y12 || exit 1 } @@ -52,7 +52,7 @@ new_scene() { $TMUX kill-server 2>/dev/null $TMUX2 kill-server 2>/dev/null -$TMUX2 new -d -x40 -y12 "sh -c 'printf base; exec sleep 100'" || exit 1 +$TMUX2 new -d -x40 -y12 "sh -c 'i=0; while [ \$i -lt 11 ]; do printf \"SB%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" || exit 1 $TMUX2 set -g status off || exit 1 $TMUX2 set -g window-size manual || exit 1 $TMUX2 set -g pane-scrollbars on || exit 1 @@ -103,7 +103,7 @@ compare scrollbar-left-pad new_scene $TMUX2 setw pane-scrollbars-position right || exit 1 $TMUX2 setw pane-scrollbars-style "bg=black,fg=white,width=1,pad=0" || exit 1 -$TMUX2 new-pane -x20 -y6 -X8 -Y3 "sh -c 'printf FLOAT; exec sleep 100'" || exit 1 +$TMUX2 new-pane -x20 -y6 -X8 -Y3 "sh -c 'i=0; while [ \$i -lt 5 ]; do printf \"FLOAT%02d abcdef\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" || exit 1 compare scrollbar-floating # Two tiled panes side by side, each with a right scrollbar. The left pane's @@ -114,7 +114,7 @@ compare scrollbar-floating new_scene $TMUX2 setw pane-scrollbars-position right || exit 1 $TMUX2 setw pane-scrollbars-style "bg=black,fg=white,width=1,pad=0" || exit 1 -$TMUX2 splitw -h "sh -c 'printf base; exec sleep 100'" || exit 1 +$TMUX2 splitw -h "sh -c 'i=0; while [ \$i -lt 11 ]; do printf \"SBR%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" || exit 1 $TMUX2 selectp -t0 || exit 1 compare scrollbar-split-right @@ -123,7 +123,7 @@ compare scrollbar-split-right new_scene $TMUX2 setw pane-scrollbars-position left || exit 1 $TMUX2 setw pane-scrollbars-style "bg=black,fg=white,width=1,pad=0" || exit 1 -$TMUX2 splitw -h "sh -c 'printf base; exec sleep 100'" || exit 1 +$TMUX2 splitw -h "sh -c 'i=0; while [ \$i -lt 11 ]; do printf \"SBL%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" || exit 1 $TMUX2 selectp -t0 || exit 1 compare scrollbar-split-left diff --git a/regress/screen-redraw-window-style.sh b/regress/screen-redraw-window-style.sh index 0b4e07d7c..1d2b2b281 100644 --- a/regress/screen-redraw-window-style.sh +++ b/regress/screen-redraw-window-style.sh @@ -39,17 +39,17 @@ compare() { } new_scene() { - $TMUX2 neww -d "sh -c 'exec sleep 100'" || exit 1 + $TMUX2 neww -d "sh -c 'i=0; while [ \$i -lt 7 ]; do printf \"STYLE%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" || exit 1 $TMUX2 selectw -t:\$ || exit 1 $TMUX2 resizew -x40 -y8 || exit 1 } -C="sh -c 'exec sleep 100'" +C="sh -c 'i=0; while [ \$i -lt 7 ]; do printf \"STYLE%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" $TMUX kill-server 2>/dev/null $TMUX2 kill-server 2>/dev/null -$TMUX2 new -d -x40 -y8 "sh -c 'exec sleep 100'" || exit 1 +$TMUX2 new -d -x40 -y8 "sh -c 'i=0; while [ \$i -lt 7 ]; do printf \"STYLE%02d abcdefghij\n\" \$i; i=\$((i + 1)); done; exec sleep 100'" || exit 1 $TMUX2 set -g status off || exit 1 $TMUX2 set -g window-size manual || exit 1