mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-28 03:01:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add test for deleting images after they scroll off

Browse Source
This commit is contained in:
Kovid Goyal
2017-10-05 21:14:56 +05:30
parent 240c9b5d8b
commit 259e01e879
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kitty/graphics.c
View File

@@ -16,6 +16,7 @@
#include <zlib.h> #include <zlib.h>
#include <png.h> #include <png.h>
#include <structmember.h>
#define REPORT_ERROR(...) { fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n"); } #define REPORT_ERROR(...) { fprintf(stderr, __VA_ARGS__); fprintf(stderr, "\n"); }
@@ -629,9 +630,9 @@ grman_scroll_images(GraphicsManager *self, int32_t amt, int32_t limit) {
size_t i, j; size_t i, j;
if (self->image_count) { if (self->image_count) {
for (i = self->image_count; i-- > 0; i--) { for (i = self->image_count; i-- > 0;) {
img = self->images + i; img = self->images + i;
for (j = img->refcnt; j-- > 0; j--) { for (j = img->refcnt; j-- > 0;) {
ref = img->refs + j; ref = img->refs + j;
ref->start_row += amt; ref->start_row += amt;
if (ref->start_row + (int32_t)ref->effective_num_rows < limit) { if (ref->start_row + (int32_t)ref->effective_num_rows < limit) {
@@ -768,6 +769,10 @@ static PyMethodDef methods[] = {
{NULL} /* Sentinel */ {NULL} /* Sentinel */
}; };
static PyMemberDef members[] = {
{"image_count", T_UINT, offsetof(GraphicsManager, image_count), 0, "image_count"},
{NULL},
};
PyTypeObject GraphicsManager_Type = { PyTypeObject GraphicsManager_Type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
@@ -778,6 +783,7 @@ PyTypeObject GraphicsManager_Type = {
.tp_doc = "GraphicsManager", .tp_doc = "GraphicsManager",
.tp_new = new, .tp_new = new,
.tp_methods = methods, .tp_methods = methods,
.tp_members = members,
}; };
static PyMethodDef module_methods[] = { static PyMethodDef module_methods[] = {

16
kitty_tests/graphics.py
View File

@@ -208,3 +208,19 @@ class TestGraphics(BaseTest):
rect_eq(l[1]['dest_rect'], -1, 1, -1 + dx, 1 - dy) rect_eq(l[1]['dest_rect'], -1, 1, -1 + dx, 1 - dy)
self.ae(l[0]['group_count'], 1), self.ae(l[1]['group_count'], 1) self.ae(l[0]['group_count'], 1), self.ae(l[1]['group_count'], 1)
self.ae(s.cursor.x, 0), self.ae(s.cursor.y, 1) self.ae(s.cursor.x, 0), self.ae(s.cursor.y, 1)
def test_gr_scroll(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)
for i in range(s.lines):
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)
for i in range(s.historybuf.ynum - 1):
s.index()
self.ae(s.grman.image_count, 1)
s.index()
self.ae(s.grman.image_count, 0)