mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify and merge {config,theme}-dir.c

Browse source
This commit is contained in:
Johan Malm 2020-08-10 17:24:17 +01:00
parent fc6fca6945
commit f003abf608
20 changed files with 181 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tools/xbm/Makefile
View file

@ -4,8 +4,14 @@ LDFLAGS += `pkg-config --cflags --libs cairo`
ASAN += -fsanitize=address
PROGS = xbm-tokenize xbm-parse
DEP_TOKENIZE = ../../src/common/buf.c ../../src/theme/xbm/tokenize.c
DEP_PARSE = $(DEP_TOKENIZE) ../../src/theme/xbm/parse.c
DEP_TOKENIZE = \
../../src/common/buf.c \
../../src/theme/xbm/tokenize.c
DEP_PARSE = $(DEP_TOKENIZE) \
../../src/theme/xbm/parse.c \
../../src/common/grab-file.c
all: $(PROGS)

7
tools/xbm/xbm-parse.c
View file

@ -4,6 +4,7 @@
#include <cairo.h>
#include "theme/xbm/parse.h"
#include "common/grab-file.h"
int main(int argc, char **argv)
{
@ -14,12 +15,12 @@ int main(int argc, char **argv)
return 1;
}
char *buffer = xbm_read_file(argv[1]);
char *buffer = grab_file(argv[1]);
if (!buffer)
exit(EXIT_FAILURE);
tokens = xbm_tokenize(buffer);
tokens = tokenize_xbm(buffer);
free(buffer);
struct pixmap pixmap = xbm_create_pixmap(tokens);
struct pixmap pixmap = parse_xbm_tokens(tokens);
free(tokens);
cairo_surface_t *g_surface;

4
tools/xbm/xbm-tokenize.c
View file

@ -3,7 +3,7 @@
#include <stdlib.h>
#include <string.h>
#include "buf.h"
#include "common/buf.h"
#include "theme/xbm/tokenize.h"
/* Read file into buffer, because it's easier to tokenize that way */
@ -41,7 +41,7 @@ int main(int argc, char **argv)
char *buffer = read_file(argv[1]);
if (!buffer)
exit(EXIT_FAILURE);
tokens = xbm_tokenize(buffer);
tokens = tokenize_xbm(buffer);
free(buffer);
for (struct token *t = tokens; t->type; t++)
printf("%s\n", t->name);