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

DRYer

Browse Source
This commit is contained in:
Kovid Goyal
2017-09-27 14:17:24 +05:30
parent 66bce4b8cd
commit 9facc5f7d3
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
kitty/graphics.c
View File

@@ -137,6 +137,7 @@ handle_add_command(GraphicsManager *self, const GraphicsCommand *g, const uint8_
bool existing, init_img = true; bool existing, init_img = true;
Image *img; Image *img;
unsigned char tt = g->transmission_type ? g->transmission_type : 'd'; unsigned char tt = g->transmission_type ? g->transmission_type : 'd';
enum FORMATS { RGB=24, RGBA=32, PNG=100 };
if (tt == 'd' && (g->more && self->loading_image)) init_img = false; if (tt == 'd' && (g->more && self->loading_image)) init_img = false;
if (init_img) { if (init_img) {
remove_images(self, add_trim_predicate); remove_images(self, add_trim_predicate);
@@ -151,23 +152,20 @@ handle_add_command(GraphicsManager *self, const GraphicsCommand *g, const uint8_
img->width = g->data_width; img->height = g->data_height; img->width = g->data_width; img->height = g->data_height;
size_t sz = img->width * img->height; size_t sz = img->width * img->height;
switch(g->format) { switch(g->format) {
case 100: // PNG case PNG:
sz = sz * 4 + 1024; sz *= 4;
break; break;
case 8: case RGB:
case 24: case RGBA:
case 32:
sz *= g->format / 8; sz *= g->format / 8;
break; break;
default: break;
} }
if (g->compressed) sz += 1024; // compression header img->load_data.data_sz = sz;
img->load_data.max_data_sz = sz + 10;
if (tt == 'd') { if (tt == 'd') {
if (g->more) self->loading_image = img->internal_id; if (g->more) self->loading_image = img->internal_id;
img->load_data.buf = malloc(img->load_data.max_data_sz + 4); img->load_data.buf_capacity = sz + ((g->compressed || g->format == PNG) ? 1024 : 10); // compression header
img->load_data.buf = malloc(img->load_data.buf_capacity + 4);
if (img->load_data.buf == NULL) fatal("Out of memory while allocating image load data buffer"); if (img->load_data.buf == NULL) fatal("Out of memory while allocating image load data buffer");
img->load_data.buf_capacity = img->load_data.max_data_sz;
img->load_data.buf_used = 0; img->load_data.buf_used = 0;
} }
} else { } else {

2
kitty/graphics.h
View File

@@ -23,7 +23,7 @@ typedef struct {
uint8_t *mapped_file; uint8_t *mapped_file;
size_t mapped_file_sz; size_t mapped_file_sz;
size_t max_data_sz; size_t data_sz;
} LoadData; } LoadData;
typedef struct { typedef struct {