circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-09 03:34:25 +00:00
Code Issues Projects Releases Wiki Activity

Fix clear issue which lost C and A osc133 markers. Several cleanups.

Browse Source
This commit is contained in:
Michael Grant
2026-10-03 01:13:01 +01:00
parent cd0dc6e1a5
commit c35c98aef0
3 changed files with 330 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
regress/output-commands.sh
View File

@@ -169,6 +169,103 @@ $TMUX send-keys -t :clear.0 -X copy-selection || exit 1
[ "$($TMUX show-buffer)" = "$(printf 'PID TTY\n1 pts/0')" ] || exit 1
$TMUX send-keys -t :clear.0 -X cancel || exit 1
# Select from either output line after clearing the screen.
for view in normal unfolded; do
for steps in 2 3; do
if [ "$view" = unfolded ]; then
$TMUX copy-mode -U -t :clear || exit 1
else
$TMUX copy-mode -t :clear || exit 1
fi
$TMUX send-keys -t :clear.0 -X -N "$steps" cursor-up || exit 1
$TMUX send-keys -t :clear.0 C-o || exit 1
[ "$($TMUX display-message -p -t :clear.0 '#{selection_present}')" = 1 ] || exit 1
$TMUX set-buffer sentinel || exit 1
$TMUX send-keys -t :clear.0 -X copy-selection || exit 1
[ "$($TMUX show-buffer)" = "$(printf 'PID TTY\n1 pts/0')" ] || exit 1
$TMUX send-keys -t :clear.0 -X cancel || exit 1
done
done
$TMUX set-option -g scroll-on-clear on || exit 1
$TMUX new-window -d -n clearprompt "printf '\\033]133;A\\007p\\$ \\033]133;B\\007clear; echo hello; echo world\\n\\033]133;C\\007\\033[H\\033[2J\\033[3Jhello\\nworld\\n\\033]133;D;0\\007\\033]133;A\\007p\\$ \\033]133;B\\007'; exec sleep 100" || exit 1
sleep 1
for steps in 1 2; do
$TMUX copy-mode -t :clearprompt || exit 1
$TMUX send-keys -t :clearprompt.0 -X -N "$steps" cursor-up || exit 1
$TMUX send-keys -t :clearprompt.0 C-o || exit 1
[ "$($TMUX display-message -p -t :clearprompt.0 '#{selection_present}')" = 1 ] || exit 1
$TMUX set-buffer sentinel || exit 1
$TMUX send-keys -t :clearprompt.0 -X copy-selection || exit 1
[ "$($TMUX show-buffer)" = "$(printf 'hello\nworld')" ] || exit 1
$TMUX send-keys -t :clearprompt.0 -X cancel || exit 1
done
# A screen clear must not pull earlier commands or plain scrollback into output.
for integration in plain marked; do
for erase in J 2J; do
$TMUX set-option -g scroll-on-clear off || exit 1
if [ "$integration" = marked ]; then
prefix='\033]133;A\007old>\033]133;B\007seq\n\033]133;C\007'
ending='\033]133;D;0\007'
else
prefix=
ending=
fi
$TMUX new-window -d -n retained "printf '$prefix'; seq 1 40; printf '$ending\\033]133;A\\007p\\$ \\033]133;B\\007clear; echo hello; echo world\\n\\033]133;C\\007\\033[H\\033[${erase}hello\\nworld\\n\\033]133;D;0\\007\\033]133;A\\007p\\$ \\033]133;B\\007'; exec sleep 100" || exit 1
sleep 1
[ "$($TMUX display-message -p -t :retained.0 '#{history_size}')" -gt 0 ] || exit 1
for steps in 0 1 2; do
$TMUX copy-mode -t :retained || exit 1
if [ "$steps" -gt 0 ]; then
$TMUX send-keys -t :retained.0 -X -N "$steps" cursor-up || exit 1
fi
$TMUX send-keys -t :retained.0 C-o || exit 1
[ "$($TMUX display-message -p -t :retained.0 '#{selection_present}')" = 1 ] || exit 1
$TMUX set-buffer sentinel || exit 1
$TMUX send-keys -t :retained.0 -X copy-selection || exit 1
[ "$($TMUX show-buffer)" = "$(printf 'hello\nworld')" ] || exit 1
$TMUX send-keys -t :retained.0 -X cancel || exit 1
done
$TMUX kill-window -t :retained || exit 1
done
done
# Preserve C when scroll-on-clear keeps the command's earlier output.
$TMUX set-option -g scroll-on-clear on || exit 1
$TMUX new-window -d -n preserve "printf '\\033]133;A\\007p\\$ \\033]133;B\\007echo before; clear; echo hello; echo world\\n\\033]133;C\\007before\\n\\033[H\\033[2Jhello\\nworld\\n\\033]133;D;0\\007\\033]133;A\\007p\\$ \\033]133;B\\007'; exec sleep 100" || exit 1
sleep 1
$TMUX copy-mode -t :preserve || exit 1
$TMUX set-buffer sentinel || exit 1
$TMUX send-keys -t :preserve.0 -X copy-output || exit 1
[ "$($TMUX show-buffer)" = "$(printf 'before\nhello\nworld')" ] || exit 1
$TMUX send-keys -t :preserve.0 -X cancel || exit 1
# An unfinished command can be selected using its restored C without D.
$TMUX set-option -g scroll-on-clear off || exit 1
$TMUX new-window -d -n running "seq 1 40; printf '\\033]133;A\\007p\\$ \\033]133;B\\007clear; echo hello; echo world\\n\\033]133;C\\007\\033[H\\033[2Jhello\\nworld\\n'; exec sleep 100" || exit 1
sleep 1
$TMUX copy-mode -t :running || exit 1
$TMUX send-keys -t :running.0 -X cursor-up || exit 1
$TMUX send-keys -t :running.0 C-o || exit 1
[ "$($TMUX display-message -p -t :running.0 '#{selection_present}')" = 1 ] || exit 1
$TMUX set-buffer sentinel || exit 1
$TMUX send-keys -t :running.0 -X copy-selection || exit 1
[ "$($TMUX show-buffer)" = "$(printf 'hello\nworld')" ] || exit 1
$TMUX send-keys -t :running.0 -X cancel || exit 1
# Do not infer output from a D which belongs to the first surviving prompt.
$TMUX new-window -d -n prefix "printf 'prefix\\n\\033]133;A\\007p\\$ \\033]133;B\\007echo\\033]133;C\\007one\\033]133;D;0\\007'; exec sleep 100" || exit 1
sleep 1
$TMUX copy-mode -t :prefix || exit 1
$TMUX send-keys -t :prefix.0 -X cursor-up || exit 1
$TMUX send-keys -t :prefix.0 C-o || exit 1
[ "$($TMUX display-message -p -t :prefix.0 '#{selection_present}')" = 0 ] || exit 1
$TMUX set-buffer sentinel || exit 1
$TMUX send-keys -t :prefix.0 -X copy-output || exit 1
[ "$($TMUX show-buffer)" = sentinel ] || exit 1
$TMUX send-keys -t :prefix.0 -X cancel || exit 1
$TMUX new-window -d -n oneline "printf '\\033]133;A\\007p\\$ \\033]133;B\\007echo\\n\\033]133;C\\007one\\033]133;D;0\\007\\nseparator\\n\\033]133;A\\007p\\$ \\033]133;B\\007'; exec sleep 100" || exit 1
sleep 1
$TMUX copy-mode -t :oneline || exit 1