qi-hardware/antorcha
1
0
Fork 0
mirror of git://projects.qi-hardware.com/antorcha.git synced 2024-11-01 05:15:20 +02:00
Code

tools/ant-gui/ant-gui.c: support multiple images per file

Browse Source
This commit is contained in:
Werner Almesberger 2012-11-01 20:00:12 -03:00
parent 5a71d27678
commit c528c0a068
1 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
tools/ant-gui/ant-gui.c
View File

@ -38,13 +38,7 @@
#define FG_ACT_RGBA 0xff2020ff #define FG_ACT_RGBA 0xff2020ff
struct img { static void render(SDL_Surface *s, const uint8_t *img, int x, int y,
uint8_t *canvas;
const char *path;
};
static void render(SDL_Surface *s, struct img *img, int x, int y,
int sel, int act) int sel, int act)
{ {
int ix, iy; int ix, iy;
@ -54,14 +48,14 @@ static void render(SDL_Surface *s, struct img *img, int x, int y,
for (iy = 0; iy != H; iy++) for (iy = 0; iy != H; iy++)
for (ix = 0; ix != W; ix++) for (ix = 0; ix != W; ix++)
if (img->canvas[(iy*W+ix) >> 3] & (1 << (ix & 7))) if (img[(iy*W+ix) >> 3] & (1 << (ix & 7)))
pixelColor(s, x+ix, y+iy, fg); pixelColor(s, x+ix, y+iy, fg);
else else
pixelColor(s, x+ix, y+iy, bg); pixelColor(s, x+ix, y+iy, bg);
} }
static void gui(struct img *img, int n) static void gui(uint8_t *const *imgs, int n)
{ {
SDL_Surface *surf; SDL_Surface *surf;
SDL_Event event; SDL_Event event;
@ -138,7 +132,7 @@ static void gui(struct img *img, int n)
i = iy*NX+ix; i = iy*NX+ix;
if (i >= n) if (i >= n)
break; break;
render(surf, img+i, ix*W, (iy-y_top)*H, render(surf, imgs[i], ix*W, (iy-y_top)*H,
ix == x && iy == y, i == active); ix == x && iy == y, i == active);
} }
SDL_UnlockSurface(surf); SDL_UnlockSurface(surf);
@ -147,14 +141,34 @@ static void gui(struct img *img, int n)
} }
static void *generate(const char *path) static void flush_edits(uint8_t ***imgs, int *n, struct edit *edits)
{
const char *err;
if (!edits)
return;
*imgs = realloc(*imgs, sizeof(uint8_t **)*(*n+1));
if (!*imgs) {
perror("realloc");
exit(1);
}
(*imgs)[*n] = apply_edits(W, H, edits, &err);
if (!(*imgs)[*n]) {
fprintf(stderr, "%s\n", err);
exit(1);
}
(*n)++;
free_edits(edits);
}
static void generate(uint8_t ***imgs, int *n, const char *path)
{ {
FILE *file; FILE *file;
char buf[100]; char buf[100];
struct edit *edits = NULL, **last = &edits; struct edit *edits = NULL, **last = &edits;
const char *err; const char *err;
char *nl; char *nl;
void *res;
file = fopen(path, "r"); file = fopen(path, "r");
if (!file) { if (!file) {
@ -165,6 +179,12 @@ static void *generate(const char *path)
nl = strchr(buf, '\n'); nl = strchr(buf, '\n');
if (nl) if (nl)
*nl = 0; *nl = 0;
if (!buf[0]) {
flush_edits(imgs, n, edits);
edits = NULL;
last = &edits;
continue;
}
if (edits) { if (edits) {
*last = malloc(sizeof(struct edit)); *last = malloc(sizeof(struct edit));
if (!*last) if (!*last)
@ -181,26 +201,18 @@ static void *generate(const char *path)
last = &(*last)->next; last = &(*last)->next;
} }
fclose(file); fclose(file);
res = apply_edits(W, H, edits, &err); flush_edits(imgs, n, edits);
if (!res) {
fprintf(stderr, "%s\n", err);
exit(1);
}
free_edits(edits);
return res;
} }
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int n = argc-1; uint8_t **imgs = NULL;
struct img img[n]; int n = 0;
int i; int i;
for (i = 0; i != n; i++) { for (i = 1; i != argc; i++)
img[i].canvas = generate(argv[i+1]); generate(&imgs, &n, argv[i]);
img[i].path = argv[i+1]; gui(imgs, n);
}
gui(img, n);
exit(1); exit(1);
} }