mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-26 18:22:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Off-by-one for image visibility testing

Browse Source 
Also delete all images that overlap the screen on reset
This commit is contained in:
Kovid Goyal
2017-10-05 22:54:52 +05:30
parent 1c9612bd55
commit 600bff73d6
2 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
kitty/graphics.c
View File

@@ -588,7 +588,7 @@ grman_update_layers(GraphicsManager *self, unsigned int scrolled_by, float scree
r.top = y0 - ref->start_row * dy - dy * (float)ref->cell_y_offset / (float)global_state.cell_height; r.top = y0 - ref->start_row * dy - dy * (float)ref->cell_y_offset / (float)global_state.cell_height;
if (ref->num_rows) r.bottom = y0 - (ref->start_row + ref->num_rows) * dy; if (ref->num_rows) r.bottom = y0 - (ref->start_row + ref->num_rows) * dy;
else r.bottom = r.top - screen_height * (float)ref->src_height / screen_height_px; else r.bottom = r.top - screen_height * (float)ref->src_height / screen_height_px;
if (r.top < screen_bottom || r.bottom > screen_top) continue; // not visible if (r.top <= screen_bottom || r.bottom >= screen_top) continue; // not visible
r.left = screen_left + ref->start_column * dx + dx * (float)ref->cell_x_offset / (float) global_state.cell_width; r.left = screen_left + ref->start_column * dx + dx * (float)ref->cell_x_offset / (float) global_state.cell_width;
if (ref->num_cols) r.right = screen_left + (ref->start_column + ref->num_cols) * dx; if (ref->num_cols) r.right = screen_left + (ref->start_column + ref->num_cols) * dx;
@@ -624,8 +624,8 @@ grman_update_layers(GraphicsManager *self, unsigned int scrolled_by, float scree
// Image lifetime/scrolling {{{ // Image lifetime/scrolling {{{
void static inline void
grman_scroll_images(GraphicsManager *self, int32_t amt, int32_t limit) { filter_refs(GraphicsManager *self, const void* data, bool (*filter_func)(ImageRef*, const void*)) {
Image *img; ImageRef *ref; Image *img; ImageRef *ref;
size_t i, j; size_t i, j;
@@ -634,8 +634,7 @@ grman_scroll_images(GraphicsManager *self, int32_t amt, int32_t limit) {
img = self->images + i; img = self->images + i;
for (j = img->refcnt; j-- > 0;) { for (j = img->refcnt; j-- > 0;) {
ref = img->refs + j; ref = img->refs + j;
ref->start_row += amt; if (filter_func(ref, data)) {
if (ref->start_row + (int32_t)ref->effective_num_rows < limit) {
remove_from_array(img->refs, sizeof(ImageRef), j, img->refcnt--); remove_from_array(img->refs, sizeof(ImageRef), j, img->refcnt--);
} }
} }
@@ -648,9 +647,28 @@ grman_scroll_images(GraphicsManager *self, int32_t amt, int32_t limit) {
} }
} }
static inline bool
scroll_filter_func(ImageRef *ref, const void* data) {
int32_t *d = (int32_t*)data, amt = d[0], limit = d[1];
ref->start_row += amt;
return ref->start_row + (int32_t)ref->effective_num_rows <= limit;
}
void
grman_scroll_images(GraphicsManager *self, int32_t amt, int32_t limit) {
int32_t data[2];
data[0] = amt; data[1] = limit;
filter_refs(self, data, scroll_filter_func);
}
static inline bool
clear_filter_func(ImageRef *ref, const void UNUSED *data) {
return ref->start_row + (int32_t)ref->effective_num_rows > 0;
}
void void
grman_clear(GraphicsManager UNUSED *self) { grman_clear(GraphicsManager *self) {
// TODO: Implement this filter_refs(self, NULL, clear_filter_func);
} }
// }}} // }}}

18
kitty_tests/graphics.py
View File

@@ -216,11 +216,23 @@ class TestGraphics(BaseTest):
self.ae(len(layers(s)), 1) self.ae(len(layers(s)), 1)
for i in range(s.lines): for i in range(s.lines):
s.index() s.index()
self.ae(len(layers(s)), 1), self.ae(s.grman.image_count, 1)
s.index()
self.ae(len(layers(s)), 0), self.ae(s.grman.image_count, 1) self.ae(len(layers(s)), 0), self.ae(s.grman.image_count, 1)
for i in range(s.historybuf.ynum - 1): for i in range(s.historybuf.ynum - 1):
s.index() s.index()
self.ae(s.grman.image_count, 1) self.ae(len(layers(s)), 0), self.ae(s.grman.image_count, 1)
s.index() s.index()
self.ae(s.grman.image_count, 0) self.ae(s.grman.image_count, 0)
def test_gr_reset(self):
cw, ch = 10, 20
s, dx, dy, put_image, put_ref, layers, rect_eq = put_helpers(self, cw, ch)
put_image(s, 10, 20) # a one cell image at (0, 0)
self.ae(len(layers(s)), 1)
s.reset()
self.ae(s.grman.image_count, 0)
put_image(s, 10, 20) # a one cell image at (0, 0)
self.ae(s.grman.image_count, 1)
for i in range(s.lines):
s.index()
s.reset()
self.ae(s.grman.image_count, 1)