aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-09-27 02:56:18 -04:00
Code

Rewritten add_chars macro.

Browse Source 
Before it redrawn only changed cells, but were problems with ghosts.
See test/fresh.html. Now it redraws whole lines, which were modified.
This commit is contained in:
Witold Filipczyk 2017-11-23 11:40:21 +01:00
parent 48ba074969
commit 49f41d4371
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/terminal/screen.c
View File

@ -1271,19 +1271,19 @@ add_char_true(struct string *screen, struct screen_driver *driver,
{ \ { \
struct terminal_screen *screen = (term_)->screen; \ struct terminal_screen *screen = (term_)->screen; \
int y = screen->dirty_from; \ int y = screen->dirty_from; \
int ypos = y * (term_)->width; \
int prev_y = -1; \
int xmax = (term_)->width - 1; \ int xmax = (term_)->width - 1; \
int ymax = (term_)->height - 1; \ int ymax = (term_)->height - 1; \
struct screen_char *current = &screen->last_image[ypos]; \
struct screen_char *pos = &screen->image[ypos]; \
struct screen_char *prev_pos = NULL; /* Warning prevention. */ \
\ \
int_upper_bound(&screen->dirty_to, ymax); \ int_upper_bound(&screen->dirty_to, ymax); \
\ \
for (; y <= screen->dirty_to; y++) { \ for (; y <= screen->dirty_to; y++) { \
int ypos = y * (term_)->width; \
struct screen_char *current = &screen->last_image[ypos]; \
struct screen_char *pos = &screen->image[ypos]; \
struct screen_char *start_of_line = pos; \
int is_last_line = (y == ymax); \ int is_last_line = (y == ymax); \
int x = 0; \ int x = 0; \
int dirty = 0; \
\ \
for (; x <= xmax; x++, current++, pos++) { \ for (; x <= xmax; x++, current++, pos++) { \
/* Workaround for terminals without /* Workaround for terminals without
@ -1298,19 +1298,23 @@ add_char_true(struct string *screen, struct screen_driver *driver,
if (is_last_line && x == xmax) \ if (is_last_line && x == xmax) \
break; \ break; \
\ \
\ if (!compare_bg_color(pos->c.color, current->c.color) || \
/* Move the cursor when @prev_pos is more than 10 chars !compare_fg_color(pos->c.color, current->c.color) || \
* away. */ \ !(pos->attr == current->attr) || \
if (prev_y != y || prev_pos + 10 <= pos) { \ !(((pos->data > ' ') || (current->data > ' ')) \
add_cursor_move_to_string(image_, y + 1, x + 1);\ && (pos->data != current->data))) { \
prev_pos = pos; \ dirty = 1; \
prev_y = y; \ break; \
} \ } \
\
for (; prev_pos <= pos ; prev_pos++) \
ADD_CHAR(image_, driver_, prev_pos, state_); \
} \ } \
} \ \
if (!dirty) \
continue; \
add_cursor_move_to_string(image_, y + 1, 1); \
for (pos = start_of_line, x = 0; x <= xmax; x++, pos++) { \
ADD_CHAR(image_, driver_, pos, state_); \
} \
} \
} }
/*! Updating of the terminal screen is done by checking what needs to /*! Updating of the terminal screen is done by checking what needs to