Skip to content

NEW: check and evaluate CURSOR FORWARD command after CSI #1502

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 2 commits into
base: main
Choose a base branch
from
Open

NEW: check and evaluate CURSOR FORWARD command after CSI #1502

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1db0b8
NEW: check and evaluate CURSOR FORWARD command after CSI
nnako Sep 19, 2021
fe94866
FIX: removed additional empty lines not conforming to FLAKE8 rules
nnako Sep 27, 2021
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
55 changes: 45 additions & 10 deletions prompt_toolkit/formatted_text/ansi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,15 @@ def _parse_corot(self) -> Generator[None, str, None]:
formatted_text = self._formatted_text

while True:

# NOTE: CSI is a special token within a stream of characters that
# introduces an ANSI control sequence used to set the foreground /
# background colors of the following characters, set the cursor
# position of the next printable character, ... the csi flag is
# used here to help evaluating the respective control sequence.

csi = False

c = yield

# Everything between \001 and \002 should become a ZeroWidthEscape.
Expand All @@ -70,6 +78,7 @@ def _parse_corot(self) -> Generator[None, str, None]:
else:
escaped_text += c

# check for CSI
if c == "\x1b":
# Start of color escape sequence.
square_bracket = yield
Expand All @@ -80,33 +89,55 @@ def _parse_corot(self) -> Generator[None, str, None]:
elif c == "\x9b":
csi = True

# IF CSI was detected
if csi:
# Got a CSI sequence. Color codes are following.
current = ""
params = []

# get next char from input sequence
while True:
char = yield

# construct number
if char.isdigit():
current += char

# eval number
else:

# limit and save number value
params.append(min(int(current or 0), 9999))

# get delimiter token if present
if char == ";":
current = ""

# check and evaluate color codes
elif char == "m":
# Set attributes and token.
self._select_graphic_rendition(params)
style = self._create_style_string()
break

# check and evaluate cursor forward
elif char == "C":
for i in range(params[0]):
# add <SPACE> using current style
formatted_text.append((style, " "))
break

# further control sequences?
else:
# Ignore unsupported sequence.
break
else:
# Add current character.

# NOTE: At this point, we could merge the current character
# into the previous tuple if the style did not change,
# however, it's not worth the effort given that it will
# be "Exploded" once again when it's rendered to the
# output.
# into the previous tuple if the style did not change, however,
# it's not worth the effort given that it will be "Exploded"
# once again when it's rendered to the output.

# add current character
formatted_text.append((style, c))

def _select_graphic_rendition(self, attrs: List[int]) -> None:
Expand All @@ -127,22 +158,24 @@ def _select_graphic_rendition(self, attrs: List[int]) -> None:
self._bgcolor = _bg_colors[attr]
elif attr == 1:
self._bold = True
# elif attr == 2:
# self._faint = True
elif attr == 3:
self._italic = True
elif attr == 4:
self._underline = True
elif attr == 5:
self._blink = True
self._blink = True # slow blink
elif attr == 6:
self._blink = True # Fast blink.
self._blink = True # fast blink
elif attr == 7:
self._reverse = True
elif attr == 8:
self._hidden = True
elif attr == 9:
self._strike = True
elif attr == 22:
self._bold = False
self._bold = False # normal intensity
elif attr == 23:
self._italic = False
elif attr == 24:
Expand All @@ -151,10 +184,12 @@ def _select_graphic_rendition(self, attrs: List[int]) -> None:
self._blink = False
elif attr == 27:
self._reverse = False
elif attr == 28:
self._hidden = False
elif attr == 29:
self._strike = False
elif not attr:
self._color = None
self._color = None # reset all style attributes
self._bgcolor = None
self._bold = False
self._underline = False
Expand Down