Skip to content

Support delta along with ANSI support (continuation) #1298

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

Support delta along with ANSI support (continuation) #1298

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4862289
Add vscode setting based on the vim setting
Aug 17, 2021
93233fe
Support delta with parsing its ansi code
Aug 17, 2021
4e653e9
Restrict delta from enabling true-color
Aug 17, 2021
256dea0
Note about delta is supported
Aug 17, 2021
da8ec39
Fix wording for parsing ansi
Aug 17, 2021
a630539
Change wattrset to wattr_set for accepting short id number
Aug 17, 2021
bc2f506
Keep LINE_CURSOR pair while line is selected
Aug 19, 2021
a5a28e6
Fix comment about init_extended_pair
Aug 19, 2021
69e40ce
Add pager handling when drawing anci codes
Feb 7, 2022
1669448
Handle oversized string out of maxwidth while string contains ansi codes
Feb 7, 2022
47baf22
Apply Light theme option
Feb 7, 2022
b318ee9
Add test for supporting delta
Feb 7, 2022
087c51c
Refactor codes for delta support
Feb 8, 2022
dc89bcc
Avoid the edge case at entering drawing ansi but it's actually not ansi
Feb 8, 2022
2e81666
Refactor draw_ansi_line by removing unnecessary strlen
Feb 10, 2022
4180ab3
Remove the vscode settings from delta support pull request
Feb 12, 2022
851abb5
Handle a consecutive ansi which has more than two attributes
Feb 22, 2022
dc7addb
Fix ansi converter by passing char pointer by reference
Feb 22, 2022
d0f5df2
Bring back the process of ansi 47 code
Feb 22, 2022
d2b29cd
Rework after review
Aug 16, 2022
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
Prev Previous commit
Next Next commit
Fix ansi converter by passing char pointer by reference
  • Loading branch information
@koutcher
ulwlu authored and koutcher committed Sep 4, 2023
commit dc7addb136673b64d296c0645b2ae1e63e9821fb
2 changes: 1 addition & 1 deletion include/tig/ansi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void split_ansi(const char *string, int *ansi_num, char **ansi_ptrs);
void draw_ansi(struct view *view, int *ansi_num, char **ansi_ptrs, int max_width, size_t skip);
void draw_ansi_line(struct view *view, char *ansi_end_ptr, int *after_ansi_len, size_t *skip, int *cur_width, int *widths_of_display);
void wattrset_by_ansi_status(struct view *view, struct ansi_status* cur_ansi_status);
short convert_ansi_into_256_color(char *save_ptr);
short convert_ansi_into_256_color(char **save_ptr);

#endif

Expand Down
10 changes: 5 additions & 5 deletions src/ansi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ draw_ansi(struct view *view, int *ansi_num, char **ansi_ptrs, int max_width, siz
if (strcmp(ansi_code_part, "37") == 0)
cur_ansi_status.fg = COLOR_WHITE;
if (strcmp(ansi_code_part, "38") == 0) {
short c256 = convert_ansi_into_256_color(saveptr);
short c256 = convert_ansi_into_256_color(&saveptr);
if (c256 != -1)
cur_ansi_status.fg = c256;
}
Expand All @@ -152,7 +152,7 @@ draw_ansi(struct view *view, int *ansi_num, char **ansi_ptrs, int max_width, siz
if (strcmp(ansi_code_part, "46") == 0)
cur_ansi_status.bg = COLOR_CYAN;
if (strcmp(ansi_code_part, "48") == 0) {
short c256 = convert_ansi_into_256_color(saveptr);
short c256 = convert_ansi_into_256_color(&saveptr);
if (c256 != -1)
cur_ansi_status.bg = c256;
}
Expand Down Expand Up @@ -208,11 +208,11 @@ wattrset_by_ansi_status(struct view *view, struct ansi_status* cur_ansi_status)
}

short
convert_ansi_into_256_color(char *save_ptr) {
char *color_method_mark = strtok_r(NULL, ";", &save_ptr);
convert_ansi_into_256_color(char **save_ptr) {
char *color_method_mark = strtok_r(NULL, ";", save_ptr);
short c256 = -1;
if (strcmp(color_method_mark, "5") == 0) {
char *color_code = strtok_r(NULL, ";", &save_ptr);
char *color_code = strtok_r(NULL, ";", save_ptr);
c256 = atoi(color_code);
}

Expand Down