mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-12 05:33:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

common/img/img-xbm: avoid using global variables

Browse source
This commit is contained in:
tokyo4j 2025-05-22 15:42:41 +09:00 • committed by Hiroaki Yamamoto
parent fd5031731e
commit c870043a8a
1 changed files with 50 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

102
src/img/img-xbm.c
View file

@ -42,35 +42,37 @@ struct pixmap {
int height; int height;
}; };
static uint32_t color; struct tokenizer_context {
static char *current_buffer_position; char *buffer_position;
static struct token *tokens; struct token *tokens;
static int nr_tokens, alloc_tokens; int nr_tokens, alloc_tokens;
};
static void static void
add_token(enum token_type token_type) add_token(struct tokenizer_context *ctx, enum token_type token_type)
{ {
if (nr_tokens == alloc_tokens) { if (ctx->nr_tokens == ctx->alloc_tokens) {
alloc_tokens = (alloc_tokens + 16) * 2; ctx->alloc_tokens = (ctx->alloc_tokens + 16) * 2;
tokens = xrealloc(tokens, alloc_tokens * sizeof(struct token)); ctx->tokens = xrealloc(ctx->tokens,
ctx->alloc_tokens * sizeof(struct token));
} }
struct token *token = tokens + nr_tokens; struct token *token = ctx->tokens + ctx->nr_tokens;
memset(token, 0, sizeof(*token)); memset(token, 0, sizeof(*token));
nr_tokens++; ctx->nr_tokens++;
token->type = token_type; token->type = token_type;
} }
static void static void
get_identifier_token(void) get_identifier_token(struct tokenizer_context *ctx)
{ {
struct token *token = tokens + nr_tokens - 1; struct token *token = ctx->tokens + ctx->nr_tokens - 1;
token->name[token->pos] = current_buffer_position[0]; token->name[token->pos] = ctx->buffer_position[0];
token->pos++; token->pos++;
if (token->pos == MAX_TOKEN_SIZE - 1) { if (token->pos == MAX_TOKEN_SIZE - 1) {
return; return;
} }
current_buffer_position++; ctx->buffer_position++;
switch (current_buffer_position[0]) { switch (ctx->buffer_position[0]) {
case '\0': case '\0':
return; return;
case 'a' ... 'z': case 'a' ... 'z':
@ -78,7 +80,7 @@ get_identifier_token(void)
case '0' ... '9': case '0' ... '9':
case '_': case '_':
case '#': case '#':
get_identifier_token(); get_identifier_token(ctx);
break; break;
default: default:
break; break;
@ -86,23 +88,23 @@ get_identifier_token(void)
} }
static void static void
get_number_token(void) get_number_token(struct tokenizer_context *ctx)
{ {
struct token *token = tokens + nr_tokens - 1; struct token *token = ctx->tokens + ctx->nr_tokens - 1;
token->name[token->pos] = current_buffer_position[0]; token->name[token->pos] = ctx->buffer_position[0];
token->pos++; token->pos++;
if (token->pos == MAX_TOKEN_SIZE - 1) { if (token->pos == MAX_TOKEN_SIZE - 1) {
return; return;
} }
current_buffer_position++; ctx->buffer_position++;
switch (current_buffer_position[0]) { switch (ctx->buffer_position[0]) {
case '\0': case '\0':
return; return;
case '0' ... '9': case '0' ... '9':
case 'a' ... 'f': case 'a' ... 'f':
case 'A' ... 'F': case 'A' ... 'F':
case 'x': case 'x':
get_number_token(); get_number_token(ctx);
break; break;
default: default:
break; break;
@ -110,11 +112,11 @@ get_number_token(void)
} }
static void static void
get_special_char_token(void) get_special_char_token(struct tokenizer_context *ctx)
{ {
struct token *token = tokens + nr_tokens - 1; struct token *token = ctx->tokens + ctx->nr_tokens - 1;
token->name[0] = current_buffer_position[0]; token->name[0] = ctx->buffer_position[0];
current_buffer_position++; ctx->buffer_position++;
} }
/** /**
@ -125,41 +127,38 @@ get_special_char_token(void)
static struct token * static struct token *
tokenize_xbm(char *buffer) tokenize_xbm(char *buffer)
{ {
tokens = NULL; struct tokenizer_context ctx = {0};
nr_tokens = 0; ctx.buffer_position = buffer;
alloc_tokens = 0;
current_buffer_position = buffer;
for (;;) { for (;;) {
switch (current_buffer_position[0]) { switch (ctx.buffer_position[0]) {
case '\0': case '\0':
goto out; goto out;
case 'a' ... 'z': case 'a' ... 'z':
case 'A' ... 'Z': case 'A' ... 'Z':
case '_': case '_':
case '#': case '#':
add_token(TOKEN_IDENT); add_token(&ctx, TOKEN_IDENT);
get_identifier_token(); get_identifier_token(&ctx);
continue; continue;
case '0' ... '9': case '0' ... '9':
add_token(TOKEN_INT); add_token(&ctx, TOKEN_INT);
get_number_token(); get_number_token(&ctx);
struct token *token = tokens + nr_tokens - 1; struct token *token = ctx.tokens + ctx.nr_tokens - 1;
token->value = (int)strtol(token->name, NULL, 0); token->value = (int)strtol(token->name, NULL, 0);
continue; continue;
case '{': case '{':
add_token(TOKEN_SPECIAL); add_token(&ctx, TOKEN_SPECIAL);
get_special_char_token(); get_special_char_token(&ctx);
continue; continue;
default: default:
break; break;
} }
++current_buffer_position; ++ctx.buffer_position;
} }
out: out:
add_token(TOKEN_NONE); /* vector end marker */ add_token(&ctx, TOKEN_NONE); /* vector end marker */
return tokens; return ctx.tokens;
} }
static uint32_t static uint32_t
@ -174,7 +173,7 @@ argb32(float *rgba)
} }
static void static void
process_bytes(struct pixmap *pixmap, struct token *tokens) process_bytes(struct pixmap *pixmap, struct token *tokens, uint32_t color)
{ {
pixmap->data = znew_n(uint32_t, pixmap->width * pixmap->height); pixmap->data = znew_n(uint32_t, pixmap->width * pixmap->height);
struct token *t = tokens; struct token *t = tokens;
@ -205,7 +204,7 @@ process_bytes(struct pixmap *pixmap, struct token *tokens)
* @tokens: token vector * @tokens: token vector
*/ */
static struct pixmap static struct pixmap
parse_xbm_tokens(struct token *tokens) parse_xbm_tokens(struct token *tokens, uint32_t color)
{ {
struct pixmap pixmap = { 0 }; struct pixmap pixmap = { 0 };
@ -214,7 +213,7 @@ parse_xbm_tokens(struct token *tokens)
if (t->type != TOKEN_INT) { if (t->type != TOKEN_INT) {
continue; continue;
} }
process_bytes(&pixmap, t); process_bytes(&pixmap, t, color);
goto out; goto out;
} }
if (strstr(t->name, "width")) { if (strstr(t->name, "width")) {
@ -238,7 +237,7 @@ out:
* @button: button byte array (xbm format) * @button: button byte array (xbm format)
*/ */
static struct pixmap static struct pixmap
parse_xbm_builtin(const char *button, int size) parse_xbm_builtin(const char *button, int size, uint32_t color)
{ {
struct pixmap pixmap = { 0 }; struct pixmap pixmap = { 0 };
@ -252,16 +251,15 @@ parse_xbm_builtin(const char *button, int size)
t[i].type = TOKEN_INT; t[i].type = TOKEN_INT;
} }
t[size].type = 0; t[size].type = 0;
process_bytes(&pixmap, t); process_bytes(&pixmap, t, color);
return pixmap; return pixmap;
} }
struct lab_data_buffer * struct lab_data_buffer *
img_xbm_load_from_bitmap(const char *bitmap, float *rgba) img_xbm_load_from_bitmap(const char *bitmap, float *rgba)
{ {
struct pixmap pixmap = {0}; uint32_t color = argb32(rgba);
color = argb32(rgba); struct pixmap pixmap = parse_xbm_builtin(bitmap, 6, color);
pixmap = parse_xbm_builtin(bitmap, 6);
return buffer_create_from_data(pixmap.data, pixmap.width, pixmap.height, return buffer_create_from_data(pixmap.data, pixmap.width, pixmap.height,
pixmap.width * 4); pixmap.width * 4);
@ -274,13 +272,13 @@ img_xbm_load(const char *filename, float *rgba)
if (string_null_or_empty(filename)) { if (string_null_or_empty(filename)) {
return NULL; return NULL;
} }
color = argb32(rgba); uint32_t color = argb32(rgba);
/* Read file into memory as it's easier to tokenize that way */ /* Read file into memory as it's easier to tokenize that way */
struct buf token_buf = grab_file(filename); struct buf token_buf = grab_file(filename);
if (token_buf.len) { if (token_buf.len) {
struct token *tokens = tokenize_xbm(token_buf.data); struct token *tokens = tokenize_xbm(token_buf.data);
pixmap = parse_xbm_tokens(tokens); pixmap = parse_xbm_tokens(tokens, color);
if (tokens) { if (tokens) {
free(tokens); free(tokens);
} }