From e4900a1066974efa2db3fb2418fc2857bebff86a Mon Sep 17 00:00:00 2001 From: Shaun Inman Date: Tue, 28 Feb 2023 22:15:31 -0500 Subject: [PATCH] misc cleanup --- notes.txt | 2 +- src/common/api.c | 11 ++++++----- src/common/defines.h | 2 +- src/minui/main.c | 32 ++++++++++++++++++++++---------- 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/notes.txt b/notes.txt index fa78911..ac84c00 100644 --- a/notes.txt +++ b/notes.txt @@ -36,4 +36,4 @@ framebuffer to png remove file from repo and history - git filter-repo --path file.ext --invert-paths --force \ No newline at end of file + git filter-repo --path file.ext --invert-paths --force diff --git a/src/common/api.c b/src/common/api.c index 882c960..5761783 100644 --- a/src/common/api.c +++ b/src/common/api.c @@ -1191,7 +1191,8 @@ int VIB_getStrength(void) { #define OVERLAY_RGBA_MASK 0x00ff0000,0x0000ff00,0x000000ff,0xff000000 #define POW_LOW_CHARGE 10 - +#define OVERLAY_FB 0 +#define OVERLAY_ID 1 static void POW_initOverlay(void) { // setup surface pow.overlay = SDL_CreateRGBSurfaceFrom(NULL,SCALE2(OVERLAY_WIDTH,OVERLAY_HEIGHT),OVERLAY_DEPTH,SCALE1(OVERLAY_PITCH), OVERLAY_RGBA_MASK); @@ -1212,8 +1213,8 @@ static void POW_initOverlay(void) { // setup overlay memset(&pow.oargs, 0, sizeof(struct owlfb_overlay_args)); - pow.oargs.fb_id = 0; - pow.oargs.overlay_id = 1; + pow.oargs.fb_id = OVERLAY_FB; + pow.oargs.overlay_id = OVERLAY_ID; pow.oargs.overlay_type = OWLFB_OVERLAY_VIDEO; pow.oargs.uintptr_overly_info = (uintptr_t)&pow.oinfo; @@ -1249,8 +1250,8 @@ static void POW_quitOverlay(void) { if (pow.overlay) SDL_FreeSurface(pow.overlay); memset(&pow.oargs, 0, sizeof(struct owlfb_overlay_args)); - pow.oargs.fb_id = 0; - pow.oargs.overlay_id = 1; + pow.oargs.fb_id = OVERLAY_FB; + pow.oargs.overlay_id = OVERLAY_ID; pow.oargs.overlay_type = OWLFB_OVERLAY_VIDEO; pow.oargs.uintptr_overly_info = 0; ioctl(gfx.fb0_fd, OWLFB_OVERLAY_DISABLE, &pow.oargs); diff --git a/src/common/defines.h b/src/common/defines.h index acc9f58..f86d8f4 100644 --- a/src/common/defines.h +++ b/src/common/defines.h @@ -66,7 +66,7 @@ #define SCREEN_WIDTH 640 #define SCREEN_HEIGHT 480 -#define SCREEN_SCALE 2 // SCREEN_HEIGHT / 240 +#define SCREEN_SCALE 2 // SCREEN_HEIGHT / BASE_HEIGHT #define SCREEN_DEPTH 16 #define SCREEN_BPP 2 diff --git a/src/minui/main.c b/src/minui/main.c index a3abebf..8f972c1 100644 --- a/src/minui/main.c +++ b/src/minui/main.c @@ -1334,7 +1334,6 @@ int main (int argc, char *argv[]) { if (show_version) { if (!version) { - // TODO: load from a file char release[256]; getFile(ROOT_SYSTEM_PATH "/version.txt", release, 256); @@ -1345,19 +1344,32 @@ int main (int argc, char *argv[]) { tmp = strchr(release, '\n'); tmp[0] = '\0'; - char* model = "Anbernic RG35XX"; + // TODO: platform specific... + char* extra_key = "Model"; + char* extra_val = "Anbernic RG35XX"; SDL_Surface* release_txt = TTF_RenderUTF8_Blended(font.large, "Release", COLOR_DARK_TEXT); SDL_Surface* version_txt = TTF_RenderUTF8_Blended(font.large, release, COLOR_WHITE); SDL_Surface* commit_txt = TTF_RenderUTF8_Blended(font.large, "Commit", COLOR_DARK_TEXT); SDL_Surface* hash_txt = TTF_RenderUTF8_Blended(font.large, commit, COLOR_WHITE); - SDL_Surface* model_txt = TTF_RenderUTF8_Blended(font.large, "Model", COLOR_DARK_TEXT); - SDL_Surface* type_txt = TTF_RenderUTF8_Blended(font.large, model, COLOR_WHITE); + SDL_Surface* key_txt = TTF_RenderUTF8_Blended(font.large, extra_key, COLOR_DARK_TEXT); + SDL_Surface* val_txt = TTF_RenderUTF8_Blended(font.large, extra_val, COLOR_WHITE); + + int l_width = 0; + int r_width = 0; + + if (release_txt->w>l_width) l_width = release_txt->w; + if (commit_txt->w>l_width) l_width = commit_txt->w; + if (key_txt->w>l_width) l_width = commit_txt->w; + + if (version_txt->w>r_width) r_width = version_txt->w; + if (hash_txt->w>r_width) r_width = hash_txt->w; + if (val_txt->w>r_width) r_width = val_txt->w; #define VERSION_LINE_HEIGHT 24 - int x = release_txt->w + SCALE1(8); - int w = x + version_txt->w; + int x = l_width + SCALE1(8); + int w = x + r_width; int h = SCALE1(VERSION_LINE_HEIGHT*4); version = SDL_CreateRGBSurface(0,w,h,16,0,0,0,0); @@ -1366,15 +1378,15 @@ int main (int argc, char *argv[]) { SDL_BlitSurface(commit_txt, NULL, version, &(SDL_Rect){0,SCALE1(VERSION_LINE_HEIGHT)}); SDL_BlitSurface(hash_txt, NULL, version, &(SDL_Rect){x,SCALE1(VERSION_LINE_HEIGHT)}); - SDL_BlitSurface(model_txt, NULL, version, &(SDL_Rect){0,SCALE1(VERSION_LINE_HEIGHT*3)}); - SDL_BlitSurface(type_txt, NULL, version, &(SDL_Rect){x,SCALE1(VERSION_LINE_HEIGHT*3)}); + SDL_BlitSurface(key_txt, NULL, version, &(SDL_Rect){0,SCALE1(VERSION_LINE_HEIGHT*3)}); + SDL_BlitSurface(val_txt, NULL, version, &(SDL_Rect){x,SCALE1(VERSION_LINE_HEIGHT*3)}); SDL_FreeSurface(release_txt); SDL_FreeSurface(version_txt); SDL_FreeSurface(commit_txt); SDL_FreeSurface(hash_txt); - SDL_FreeSurface(model_txt); - SDL_FreeSurface(type_txt); + SDL_FreeSurface(key_txt); + SDL_FreeSurface(val_txt); } SDL_BlitSurface(version, NULL, screen, &(SDL_Rect){(SCREEN_WIDTH-version->w)/2,(SCREEN_HEIGHT-version->h)/2});