Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-28 13:53:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some comment fixes and renaming of is_iterm2_escape_seq. (#5827)

Browse source 
* Some comment fixes and renaming of is_iterm2_escape_seq.

The comment for is_iterm2_escape_seq incorrectly says "CSI followed by ]".
This is wrong, because CSI is ESC followed by [ (or the seldom-used 0x9b).
The procedure  actually matches Operating System Command (OSC) escape codes.
Since there is nothing iterm2-specific about OSC, is_osc_escape_seq
would be a better name.

Also s_desired_append_char documents a non-existent parameter.

* Update broken iterm2 url in comment.
This commit is contained in:
Per Bothner 2019-04-19 09:29:35 -07:00 committed by Aaron Gyes
parent 4ddfd73079
commit 2edfab685a
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/screen.cpp
View file

@ -111,9 +111,11 @@ static bool is_screen_name_escape_seq(const wchar_t *code, size_t *resulting_len
return true; return true;
} }
/// iTerm2 escape codes: CSI followed by ], terminated by either BEL or escape + backslash. /// Operating System Command (OSC) escape codes, used by iTerm2 and others:
/// See https://code.google.com/p/iterm2/wiki/ProprietaryEscapeCodes. /// ESC followed by ], terminated by either BEL or escape + backslash.
static bool is_iterm2_escape_seq(const wchar_t *code, size_t *resulting_length) { /// See https://invisible-island.net/xterm/ctlseqs/ctlseqs.html
/// and https://iterm2.com/documentation-escape-codes.html .
static bool is_osc_escape_seq(const wchar_t *code, size_t *resulting_length) {
bool found = false; bool found = false;
if (code[1] == ']') { if (code[1] == ']') {
// Start at 2 to skip over <esc>]. // Start at 2 to skip over <esc>].
@ -248,7 +250,7 @@ size_t escape_code_length(const wchar_t *code) {
bool found = is_color_escape_seq(code, &esc_seq_len); bool found = is_color_escape_seq(code, &esc_seq_len);
if (!found) found = is_visual_escape_seq(code, &esc_seq_len); if (!found) found = is_visual_escape_seq(code, &esc_seq_len);
if (!found) found = is_screen_name_escape_seq(code, &esc_seq_len); if (!found) found = is_screen_name_escape_seq(code, &esc_seq_len);
if (!found) found = is_iterm2_escape_seq(code, &esc_seq_len); if (!found) found = is_osc_escape_seq(code, &esc_seq_len);
if (!found) found = is_single_byte_escape_seq(code, &esc_seq_len); if (!found) found = is_single_byte_escape_seq(code, &esc_seq_len);
if (!found) found = is_csi_style_escape_seq(code, &esc_seq_len); if (!found) found = is_csi_style_escape_seq(code, &esc_seq_len);
if (!found) found = is_two_byte_escape_seq(code, &esc_seq_len); if (!found) found = is_two_byte_escape_seq(code, &esc_seq_len);
@ -429,7 +431,6 @@ static void s_desired_append_char(screen_t *s, wchar_t b, highlight_spec_t c, in
/// The actual_cursor field of the specified screen_t will be updated. /// The actual_cursor field of the specified screen_t will be updated.
/// ///
/// \param s the screen to operate on /// \param s the screen to operate on
/// \param b the buffer to send the output escape codes to
/// \param new_x the new x position /// \param new_x the new x position
/// \param new_y the new y position /// \param new_y the new y position
static void s_move(screen_t *s, int new_x, int new_y) { static void s_move(screen_t *s, int new_x, int new_y) {