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

A spot of refactoring

Browse Source
This commit is contained in:
Kovid Goyal
2017-09-29 07:21:53 +05:30
parent 4f98d10caa
commit 9078ca975e
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
kitty/graphics.c
View File

@@ -114,6 +114,8 @@ img_by_internal_id(GraphicsManager *self, size_t id) {
return NULL; return NULL;
} }
// Loading image data {{{
static char add_response[512] = {0}; static char add_response[512] = {0};
static bool has_add_respose = false; static bool has_add_respose = false;
@@ -282,6 +284,7 @@ static bool
handle_add_command(GraphicsManager *self, const GraphicsCommand *g, const uint8_t *payload) { handle_add_command(GraphicsManager *self, const GraphicsCommand *g, const uint8_t *payload) {
#define ABRT(code, ...) { set_add_response(#code, __VA_ARGS__); self->loading_image = 0; return false; } #define ABRT(code, ...) { set_add_response(#code, __VA_ARGS__); self->loading_image = 0; return false; }
#define MAX_DATA_SZ (4 * 100000000) #define MAX_DATA_SZ (4 * 100000000)
has_add_respose = false;
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';
@@ -422,25 +425,31 @@ handle_add_command(GraphicsManager *self, const GraphicsCommand *g, const uint8_
#undef ABRT #undef ABRT
} }
static inline const char*
create_add_response(GraphicsManager UNUSED *self, const GraphicsCommand *g, bool data_loaded) {
static char rbuf[sizeof(add_response)/sizeof(add_response[0])];
if (g->id) {
if (!has_add_respose) {
if (!data_loaded) return NULL;
snprintf(add_response, 10, "OK");
}
snprintf(rbuf, sizeof(rbuf)/sizeof(rbuf[0]) - 1, "\033_Gi=%u;%s\033\\", g->id, add_response);
return rbuf;
}
return NULL;
}
// }}}
const char* const char*
grman_handle_command(GraphicsManager *self, const GraphicsCommand *g, const uint8_t *payload) { grman_handle_command(GraphicsManager *self, const GraphicsCommand *g, const uint8_t *payload) {
static char rbuf[sizeof(add_response)/sizeof(add_response[0])];
bool data_loaded; bool data_loaded;
switch(g->action) { switch(g->action) {
case 0: case 0:
case 't': case 't':
has_add_respose = false;
data_loaded = handle_add_command(self, g, payload); data_loaded = handle_add_command(self, g, payload);
if (g->id) { return create_add_response(self, g, data_loaded);
if (!has_add_respose) {
if (!data_loaded) break;
snprintf(add_response, 10, "OK");
}
snprintf(rbuf, sizeof(rbuf)/sizeof(rbuf[0]) - 1, "\033_Gi=%u;%s\033\\", g->id, add_response);
return rbuf;
}
break;
default: default:
REPORT_ERROR("Unknown graphics command action: %c", g->action); REPORT_ERROR("Unknown graphics command action: %c", g->action);
break; break;