mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-05-02 06:46:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sixel: don't erase image when printing text *next* to it.

Browse source
This commit is contained in:
Daniel Eklöf 2020-06-06 13:59:46 +02:00
parent a08e7f358f
commit 21e9031420
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -52,6 +52,7 @@
`0x0` terminal size (https://codeberg.org/dnkl/foot/issues/20). `0x0` terminal size (https://codeberg.org/dnkl/foot/issues/20).
* Glyphs overflowing into surrounding cells * Glyphs overflowing into surrounding cells
(https://codeberg.org/dnkl/foot/issues/21). (https://codeberg.org/dnkl/foot/issues/21).
* Sixel images being erased when printing text next to them.
### Security ### Security

23
sixel.c
View file

@ -1,6 +1,7 @@
#include "sixel.h" #include "sixel.h"
#include <string.h> #include <string.h>
#include <limits.h>
#define LOG_MODULE "sixel" #define LOG_MODULE "sixel"
#define LOG_ENABLE_DBG 0 #define LOG_ENABLE_DBG 0
@ -69,8 +70,8 @@ sixel_erase(struct terminal *term, struct sixel *sixel)
sixel_destroy(sixel); sixel_destroy(sixel);
} }
void static void
sixel_delete_at_row(struct terminal *term, int _row) sixel_delete_at_point(struct terminal *term, int _row, int col)
{ {
if (likely(tll_length(term->grid->sixel_images) == 0)) if (likely(tll_length(term->grid->sixel_images) == 0))
return; return;
@ -83,12 +84,22 @@ sixel_delete_at_row(struct terminal *term, int _row)
const int six_end = six_start + six->rows - 1; const int six_end = six_start + six->rows - 1;
if (row >= six_start && row <= six_end) { if (row >= six_start && row <= six_end) {
sixel_erase(term, six); const int col_end = six->pos.col + six->cols;
tll_remove(term->grid->sixel_images, it);
if (col < col_end) {
sixel_erase(term, six);
tll_remove(term->grid->sixel_images, it);
}
} }
} }
} }
void
sixel_delete_at_row(struct terminal *term, int _row)
{
sixel_delete_at_point(term, _row, INT_MAX);
}
void void
sixel_delete_in_range(struct terminal *term, int _start, int _end) sixel_delete_in_range(struct terminal *term, int _start, int _end)
{ {
@ -121,7 +132,8 @@ sixel_delete_in_range(struct terminal *term, int _start, int _end)
void void
sixel_delete_at_cursor(struct terminal *term) sixel_delete_at_cursor(struct terminal *term)
{ {
sixel_delete_at_row(term, term->grid->cursor.point.row); sixel_delete_at_point(
term, term->grid->cursor.point.row, term->grid->cursor.point.col);
} }
void void
@ -137,6 +149,7 @@ sixel_unhook(struct terminal *term)
.width = term->sixel.image.width, .width = term->sixel.image.width,
.height = term->sixel.image.height, .height = term->sixel.image.height,
.rows = (term->sixel.image.height + term->cell_height - 1) / term->cell_height, .rows = (term->sixel.image.height + term->cell_height - 1) / term->cell_height,
.cols = (term->sixel.image.width + term->cell_width - 1) / term->cell_width,
.pos = (struct coord){ .pos = (struct coord){
term->grid->cursor.point.col, term->grid->cursor.point.col,
(term->grid->offset + term->grid->cursor.point.row) & (term->grid->num_rows - 1)}, (term->grid->offset + term->grid->cursor.point.row) & (term->grid->num_rows - 1)},

1
terminal.h
View file

@ -96,6 +96,7 @@ struct sixel {
int width; int width;
int height; int height;
int rows; int rows;
int cols;
struct coord pos; struct coord pos;
}; };