From 507d58d48f3e99f5fd45171cdbadd9c690f47fe1 Mon Sep 17 00:00:00 2001 From: axtloss Date: Sun, 25 Feb 2024 02:20:07 +0100 Subject: Unhardcode color for rectangle --- fbwarn/src/parseBVG.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'fbwarn/src/parseBVG.c') diff --git a/fbwarn/src/parseBVG.c b/fbwarn/src/parseBVG.c index 235253b..ff8b248 100644 --- a/fbwarn/src/parseBVG.c +++ b/fbwarn/src/parseBVG.c @@ -32,16 +32,21 @@ void BVGRectangle(char *argv[5]) { printf("Drawing rectangle\n"); argv[4][strlen(argv[4])-2] = '\0'; printf("%s, %s\n %s, %s,\n %s\n", argv[0], argv[1], argv[2], argv[3], argv[4]); - int x, y, width, height, color; + int x, y, width, height, r, g, b; sscanf(argv[0]+strlen("x="), "%d", &x); sscanf(argv[1]+strlen("y="), "%d", &y); sscanf(argv[2]+strlen("width="), "%d", &width); sscanf(argv[3]+strlen("height="), "%d", &height); - color = (int)strtol(argv[4]+strlen("color='#"), NULL, 16); + sscanf(argv[4]+strlen("color='#"), "%02x%02x%02x", &r, &g, &b); printf("X: %d, Y: %d\n", x, y); printf("Width: %d, Height: %d\n", width, height); - printf("Color: %d\n", color); - DrawRectangle(x, y, width, height, PINK); + printf("Color: %d, %d, %d\n", r, g, b); + Color *clr = malloc(sizeof(Color)); + clr->r=r; + clr->g=g; + clr->b=b; + clr->a=255; + DrawRectangle(x, y, width, height, *clr); return; } -- cgit v1.2.3