Merge pull request #1 from OperationNT414C/OperationNT414C-patch-1

Ofsset and background image fix / Alpha highlight feature

Author: devinshoemaker

source/config.c

@@ -27,6 +27,22 @@ void setColor(u8 *cfgColor, const char *color) {
     cfgColor[2] = (u8) (l & 0xFF);
 }
 
+void setColorAlpha(u8 *cfgColor, const char *color) {
+	if ( (color[6] >= '0' && color[6] <= '9') || (color[6] >= 'A' && color[6] <= 'F') || (color[6] >= 'a' && color[6] <= 'f') )
+	{
+		long l = strtoul(color, NULL, 16);
+		cfgColor[0] = (u8) (l >> 8 & 0xFF);
+		cfgColor[1] = (u8) (l >> 16 & 0xFF);
+		cfgColor[2] = (u8) (l >> 24 & 0xFF);
+		cfgColor[3] = (u8) (l & 0xFF);
+	}
+	else
+	{
+		setColor(cfgColor, color);
+		cfgColor[3] = 0xFF;
+	}
+}
+
 static char *ini_buffer_reader(char *str, int num, void *stream) {
     buffer_ctx *ctx = (buffer_ctx *) stream;
     int idx = 0;
@@ -92,8 +108,8 @@ static int handler(void *user, const char *section, const char *name,
         setColor(config->bgTop2, item);
     } else if (MATCH("theme", "bgBottom")) {
         setColor(config->bgBot, item);
-    } else if (MATCH("theme", "highlight")) {
-        setColor(config->highlight, item);
+	} else if (MATCH("theme", "highlight")) {
+        setColorAlpha(config->highlight, item);
     } else if (MATCH("theme", "borders")) {
         setColor(config->borders, item);
     } else if (MATCH("theme", "font1")) {
@@ -239,7 +255,10 @@ void configSave() {
     size += snprintf(cfg+size, 256, "bgTop1=%02X%02X%02X;\n", config->bgTop1[0], config->bgTop1[1], config->bgTop1[2]);
     size += snprintf(cfg+size, 256, "bgTop2=%02X%02X%02X;\n", config->bgTop2[0], config->bgTop2[1], config->bgTop2[2]);
     size += snprintf(cfg+size, 256, "bgBottom=%02X%02X%02X;\n", config->bgBot[0], config->bgBot[1], config->bgBot[2]);
-    size += snprintf(cfg+size, 256, "highlight=%02X%02X%02X;\n", config->highlight[0], config->highlight[1], config->highlight[2]);
+	if ( config->highlight[3] < 0xFF )
+		size += snprintf(cfg+size, 256, "highlight=%02X%02X%02X%02X;\n", config->highlight[2], config->highlight[1], config->highlight[0], config->highlight[3]);
+	else
+		size += snprintf(cfg+size, 256, "highlight=%02X%02X%02X;\n", config->highlight[0], config->highlight[1], config->highlight[2]);		
     size += snprintf(cfg+size, 256, "borders=%02X%02X%02X;\n", config->borders[0], config->borders[1], config->borders[2]);
     size += snprintf(cfg+size, 256, "font1=%02X%02X%02X;\n", config->fntDef[0], config->fntDef[1], config->fntDef[2]);
     size += snprintf(cfg+size, 256, "font2=%02X%02X%02X;\n", config->fntSel[0], config->fntSel[1], config->fntSel[2]);
@@ -250,7 +269,7 @@ void configSave() {
         size += snprintf(cfg+size, 256, "[entry];\n");
         size += snprintf(cfg+size, 256, "title=%s;\n", config->entries[i].title);
         size += snprintf(cfg+size, 256, "path=%s;\n", config->entries[i].path);
-        size += snprintf(cfg+size, 256, "offset=%ld;\n", config->entries[i].offset);
+        size += snprintf(cfg+size, 256, "offset=%x;\n", (int)config->entries[i].offset);
         size += snprintf(cfg+size, 256, "key=%i;\n\n", config->entries[i].key);
     }
 #ifdef ARM9

source/config.h

@@ -36,7 +36,7 @@ typedef struct {
     u8 bgTop1[3];
     u8 bgTop2[3];
     u8 bgBot[3];
-    u8 highlight[3];
+    u8 highlight[4];
     u8 borders[3];
     u8 fntDef[3];
     u8 fntSel[3];

source/gfx.c

@@ -18,12 +18,12 @@
 
 u8 *gfxGetFramebuffer(gfxScreen_t screen, gfx3dSide_t side, u16 *width, u16 *height) {
     if (screen == GFX_TOP) {
-        *width = 240;
-        *height = 400;
+		if (width) *width = 240;
+        if (height) *height = 400;
         return PTR_TOP_SCREEN_BUF;
     } else {
-        *width = 240;
-        *height = 320;
+        if (width) *width = 240;
+        if (height) *height = 320;
         return PTR_BOT_SCREEN_BUF;
     }
 }
@@ -132,7 +132,7 @@ void gfxFillColorGradient(gfxScreen_t screen, gfx3dSide_t side, u8 rgbColorStart
     }
 }
 
-void _gfxDrawRectangle(gfxScreen_t screen, gfx3dSide_t side, u8 rgbColor[3], s16 x, s16 y, u16 width, u16 height) {
+void _gfxDrawRectangle(gfxScreen_t screen, gfx3dSide_t side, u8 rgbColor[4], s16 x, s16 y, u16 width, u16 height) {
     u16 fbWidth, fbHeight;
     u8 *fbAdr = gfxGetFramebuffer(screen, side, &fbWidth, &fbHeight);
 
@@ -150,23 +150,43 @@ void _gfxDrawRectangle(gfxScreen_t screen, gfx3dSide_t side, u8 rgbColor[3], s16
     if (x + width >= fbWidth)width = fbWidth - x;
     if (y + height >= fbHeight)height = fbHeight - y;
 
-    u8 colorLine[width * 3];
-
-    int j;
-    for (j = 0; j < width; j++) {
-        colorLine[j * 3 + 0] = rgbColor[2];
-        colorLine[j * 3 + 1] = rgbColor[1];
-        colorLine[j * 3 + 2] = rgbColor[0];
-    }
-
-    fbAdr += fbWidth * 3 * y;
-    for (j = 0; j < height; j++) {
-        memcpy(&fbAdr[x * 3], colorLine, width * 3);
-        fbAdr += fbWidth * 3;
-    }
-}
-
-void gfxDrawRectangle(gfxScreen_t screen, gfx3dSide_t side, u8 rgbColor[3], s16 x, s16 y, u16 width, u16 height) {
+	if ( rgbColor[3] == 0xFF )
+	{
+		u8 colorLine[width * 3];
+
+		int j;
+		for (j = 0; j < width; j++) {
+			colorLine[j * 3 + 0] = rgbColor[2];
+			colorLine[j * 3 + 1] = rgbColor[1];
+			colorLine[j * 3 + 2] = rgbColor[0];
+		}
+
+		fbAdr += fbWidth * 3 * y;
+		for (j = 0; j < height; j++) {
+			memcpy(&fbAdr[x * 3], colorLine, width * 3);
+			fbAdr += fbWidth * 3;
+		}
+	}
+	else
+	{
+		float alpha = (float)rgbColor[3] / 255.f;
+		float one_minus_alpha = 1.f - alpha;
+		int i, j;
+		fbAdr += fbWidth * 3 * y;
+		for (j = 0; j < height; j++)
+		{
+			for (i = 0; i < width; i++)
+			{
+				fbAdr[3*(i+x)+0] = (u8)(alpha*(float)rgbColor[0]+one_minus_alpha*(float)fbAdr[3*(i+x)+0]);
+				fbAdr[3*(i+x)+1] = (u8)(alpha*(float)rgbColor[1]+one_minus_alpha*(float)fbAdr[3*(i+x)+1]);
+				fbAdr[3*(i+x)+2] = (u8)(alpha*(float)rgbColor[2]+one_minus_alpha*(float)fbAdr[3*(i+x)+2]);	
+			}
+			fbAdr += fbWidth * 3;
+		}
+	}
+}
+
+void gfxDrawRectangle(gfxScreen_t screen, gfx3dSide_t side, u8 rgbColor[4], s16 x, s16 y, u16 width, u16 height) {
     _gfxDrawRectangle(screen, side, rgbColor, 240 - y, x, height, width);
 }