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

Fix wrapped output selections and recognize single-character vi selections.

Browse Source
This commit is contained in:
Michael Grant
2026-10-06 14:38:17 +02:00
parent 36c6630951
commit 02f09554c9
3 changed files with 102 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
regress/output-editor.sh
View File

@@ -72,4 +72,49 @@ wait_editor selection
[ "$($TMUX display-message -p -t edit:0 '#{selection_present}')" = 1 ] || exit 1
$TMUX send-keys -t edit:0 -X cancel || exit 1
# Both active and stopped single-character selections use the editor binding.
printf 'o' >"$DIR/expected" || exit 1
for keys in emacs vi; do
$TMUX set-option -w -t edit:0 mode-keys "$keys" || exit 1
case "$keys" in
emacs) binding=e ;;
vi) binding=M-e ;;
esac
for state in active stopped; do
name="$keys-$state"
$TMUX set-option -g editor "sh $DIR/editor.sh $name" || exit 1
$TMUX copy-mode -t edit:0 || exit 1
$TMUX send-keys -t edit:0 -X search-backward one || exit 1
$TMUX send-keys -t edit:0 -X begin-selection || exit 1
if [ "$keys" = emacs ]; then
$TMUX send-keys -t edit:0 -X cursor-right || exit 1
fi
if [ "$state" = stopped ]; then
$TMUX send-keys -t edit:0 -X stop-selection || exit 1
fi
[ "$($TMUX display-message -p -t edit:0 \
'#{selection_present}')" = 1 ] || exit 1
$TMUX send-keys -t edit:0 "$binding" || exit 1
wait_editor "$name"
cmp "$DIR/expected" "$DIR/$name" || exit 1
[ "$($TMUX show-buffer)" = sentinel ] || exit 1
$TMUX send-keys -t edit:0 -X cancel || exit 1
done
done
# An empty emacs selection still opens the output.
printf 'one\ntwo\n' >"$DIR/expected" || exit 1
$TMUX set-option -w -t edit:0 mode-keys emacs || exit 1
$TMUX set-option -g editor "sh $DIR/editor.sh empty" || exit 1
$TMUX copy-mode -t edit:0 || exit 1
$TMUX send-keys -t edit:0 -X search-backward one || exit 1
$TMUX send-keys -t edit:0 -X begin-selection || exit 1
[ "$($TMUX display-message -p -t edit:0 '#{selection_present}')" = 0 ] ||
exit 1
$TMUX send-keys -t edit:0 e || exit 1
wait_editor empty
cmp "$DIR/expected" "$DIR/empty" || exit 1
$TMUX send-keys -t edit:0 -X cancel || exit 1
exit 0

12
regress/output-osc133-reflow.sh
View File

@@ -157,4 +157,16 @@ expected=$(printf 'one\n_')
check_output newline "${expected%_}"
check_selection newline "${expected%_}"
# Wrapped cells keep spaces, even when D splits a wrapped line.
for payload in 'one' 'one ' 'one ' ' ' 'long-output '; do
seq="${prompt}\033]133;C\007${payload}\033]133;D;0\007"
start_pane_history wrapped 8 20 "${seq} separator"
check_output wrapped "$payload"
check_selection wrapped "$payload"
$TMUX resize-window -t wrapped: -x 80 || exit 1
$TMUX resize-window -t wrapped: -x 8 || exit 1
check_output wrapped "$payload"
check_selection wrapped "$payload"
done
exit $exit_status