Skip to content

Render changes in ZWE sequences #1625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Render changes in ZWE sequences #1625

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions src/prompt_toolkit/renderer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,26 +204,35 @@ def get_max_column_index(row: Dict[int, Char]) -> int:
while c <= new_max_line_len:
new_char = new_row[c]
old_char = previous_row[c]
new_zwe = zero_width_escapes_row[c]
char_width = new_char.width or 1

# When the old and new character at this position are different,
# or the zero-width escape sequences at this position differ,
# draw the output. (Because of the performance, we don't call
# `Char.__ne__`, but inline the same expression.)
if new_char.char != old_char.char or new_char.style != old_char.style:
current_pos = move_cursor(Point(x=c, y=y))
diff_char = new_char.char != old_char.char or new_char.style != old_char.style
diff_zwe = new_zwe != previous_screen.zero_width_escapes[y][c]
if diff_char or diff_zwe:
# Don't move the cursor if it is already in the correct position
if c != current_pos.x or y != current_pos.y:
current_pos = move_cursor(Point(x=c, y=y))

# Send injected escape sequences to output.
if c in zero_width_escapes_row:
write_raw(zero_width_escapes_row[c])
if diff_zwe:
# Send injected escape sequences to output.
write_raw(new_zwe)

output_char(new_char)
current_pos = Point(x=current_pos.x + char_width, y=current_pos.y)
if diff_char:
output_char(new_char)
current_pos = Point(x=current_pos.x + char_width, y=current_pos.y)

c += char_width

# If the new line is shorter, trim it.
if previous_screen and new_max_line_len < previous_max_line_len:
current_pos = move_cursor(Point(x=new_max_line_len + 1, y=y))
# Don't move the cursor if it is already in the correct position
if current_pos.x != new_max_line_len or current_pos.y != current_pos.y:
current_pos = move_cursor(Point(x=new_max_line_len + 1, y=y))
reset_attributes()
output.erase_end_of_line()

Expand Down