KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make the image dict more complete

Browse Source
This commit is contained in:
Kovid Goyal 2021-01-26 07:33:03 +05:30
parent 0adbbc6d62
commit 6631bb0eac
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kitty/graphics.c
View File

@ -1123,14 +1123,23 @@ static inline PyObject*
image_as_dict(GraphicsManager *self, Image *img) { image_as_dict(GraphicsManager *self, Image *img) {
#define U(x) #x, img->x #define U(x) #x, img->x
ImageAndFrame key = {.image_id = img->internal_id}; ImageAndFrame key = {.image_id = img->internal_id};
return Py_BuildValue("{sI sI sI sI sK sI sI sO sO sN}", PyObject *frames = PyTuple_New(img->extra_framecnt);
for (unsigned i = 0; i < img->extra_framecnt; i++) {
key.frame_idx = i + 1;
PyTuple_SET_ITEM(frames, i, Py_BuildValue(
"{sI sN}", "gap", img->extra_frames[i].gap, "data", read_from_disk_cache_python(self->disk_cache, &key, sizeof(key))));
}
key.frame_idx = 0;
return Py_BuildValue("{sI sI sI sI sK sI sI sO sO sI sI sO sN sN}",
U(texture_id), U(client_id), U(width), U(height), U(internal_id), U(refcnt), U(client_number), U(texture_id), U(client_id), U(width), U(height), U(internal_id), U(refcnt), U(client_number),
"data_loaded", img->data_loaded ? Py_True : Py_False, "data_loaded", img->data_loaded ? Py_True : Py_False,
"is_4byte_aligned", img->load_data.is_4byte_aligned ? Py_True : Py_False, "is_4byte_aligned", img->is_4byte_aligned ? Py_True : Py_False,
"data", read_from_disk_cache_python(self->disk_cache, &key, sizeof(key)) U(current_frame_index), U(loop_delay),
"animation_enabled", img->animation_enabled ? Py_True : Py_False,
"data", read_from_disk_cache_python(self->disk_cache, &key, sizeof(key)),
"extra_frames", frames
); );
#undef U #undef U
} }
#define W(x) static PyObject* py##x(GraphicsManager UNUSED *self, PyObject *args) #define W(x) static PyObject* py##x(GraphicsManager UNUSED *self, PyObject *args)

4
kitty/graphics.h
View File

@ -57,11 +57,11 @@ typedef struct {
ImageRef *refs; ImageRef *refs;
Frame *extra_frames; Frame *extra_frames;
uint32_t loop_delay; uint32_t loop_delay, current_frame_index;
size_t refcnt, refcap, extra_framecnt; size_t refcnt, refcap, extra_framecnt;
monotonic_t atime; monotonic_t atime;
size_t used_storage; size_t used_storage;
bool is_opaque, is_4byte_aligned; bool is_opaque, is_4byte_aligned, animation_enabled;
} Image; } Image;
typedef struct { typedef struct {