Universal dev (#60)

* Adding New Pocket Go * Fixing relative size * Pushing SDL_Color to graphics.c to keep the code generic * Unused joystick * Tidying stuff up * Zooming Images to screen size * setting height for 2devices that use 320x240 * Changing footer for full screen mode * transparent footer * Fixing resolution for console and managing smoothing * Updating resources * Fixing indentation * Fixing full screen footer, adding the chance of not scaling and also scaling logos correctly * Fixing foter * Adding better navigation in full screen mode using shoulder buttons * Replacing images for rectangles, making fullscreen menu more compact and making logos be shown when pressing shoulder buttons while in FS mode * Better indication of total items per page, smaller fullscreen text, darker fullsceen background and showing logo while roms load in the background in fullscreen mode or hotkey mode * List branch (#54) * Universal dev (#49) * Adding New Pocket Go * Fixing relative size * Pushing SDL_Color to graphics.c to keep the code generic * Unused joystick * Tidying stuff up * Zooming Images to screen size * setting height for 2devices that use 320x240 * Changing footer for full screen mode * transparent footer * Fixing resolution for console and managing smoothing * Updating resources * Fixing indentation * Fixing full screen footer, adding the chance of not scaling and also scaling logos correctly * Fixing foter * Adding better navigation in full screen mode using shoulder buttons * Replacing images for rectangles, making fullscreen menu more compact and making logos be shown when pressing shoulder buttons while in FS mode * first commit of the list branch * Fixing memory leak * Adding numbers in full screen mode and making it display 12 games instead of 10 * Fixing favorites * Restoring execution * Setting 12 games per page when coming back to full screen and altering full screen text view * Fixing 12 games per page when comming back to full screen and altering text alignment in that mode * Fixing relative distance of text in full screen mode and ignoring triggers in favorites in full screen mode * Fixing how much text you can see in full screen * Fixing bugs and tuning fullscreen mode letter box * Better * Changing alpha navigation in fullscren mode * Fixing bugs * Showing the logo before loading the games * Fixing delete functionality * Improving fullscreen menu appearance when deleting games * Improving menu behavior in fullscreen mode * more tweaks * Keeping the strip roms state between sessions * POC for only highlighting letters that exist in the current rom list * Graying out letters in alpha nav, fullscreen * Fixing seg fault when exiting if showing the menu * Fixing showing favorites in the right spot, bad, bad code, but works * List branch (#56) * Universal dev (#49) * Adding New Pocket Go * Fixing relative size * Pushing SDL_Color to graphics.c to keep the code generic * Unused joystick * Tidying stuff up * Zooming Images to screen size * setting height for 2devices that use 320x240 * Changing footer for full screen mode * transparent footer * Fixing resolution for console and managing smoothing * Updating resources * Fixing indentation * Fixing full screen footer, adding the chance of not scaling and also scaling logos correctly * Fixing foter * Adding better navigation in full screen mode using shoulder buttons * Replacing images for rectangles, making fullscreen menu more compact and making logos be shown when pressing shoulder buttons while in FS mode * first commit of the list branch * Fixing memory leak * Adding numbers in full screen mode and making it display 12 games instead of 10 * Fixing favorites * Restoring execution * Setting 12 games per page when coming back to full screen and altering full screen text view * Fixing 12 games per page when comming back to full screen and altering text alignment in that mode * Fixing relative distance of text in full screen mode and ignoring triggers in favorites in full screen mode * Fixing how much text you can see in full screen * Fixing bugs and tuning fullscreen mode letter box * Better * Changing alpha navigation in fullscren mode * Fixing bugs * Showing the logo before loading the games * Fixing delete functionality * Improving fullscreen menu appearance when deleting games * Improving menu behavior in fullscreen mode * more tweaks * Keeping the strip roms state between sessions * POC for only highlighting letters that exist in the current rom list * Graying out letters in alpha nav, fullscreen * Fixing seg fault when exiting if showing the menu * Fixing showing favorites in the right spot, bad, bad code, but works * Fixing favrites bug, adding logo and imporving full screen mode * no idea * Making it fullscreen * whatever * List branch (#59) * first commit of the list branch * Fixing memory leak * Adding numbers in full screen mode and making it display 12 games instead of 10 * Fixing favorites * Restoring execution * Setting 12 games per page when coming back to full screen and altering full screen text view * Fixing 12 games per page when comming back to full screen and altering text alignment in that mode * Fixing relative distance of text in full screen mode and ignoring triggers in favorites in full screen mode * Fixing how much text you can see in full screen * Fixing bugs and tuning fullscreen mode letter box * Better * Changing alpha navigation in fullscren mode * Fixing bugs * Showing the logo before loading the games * Fixing delete functionality * Improving fullscreen menu appearance when deleting games * Improving menu behavior in fullscreen mode * more tweaks * Keeping the strip roms state between sessions * POC for only highlighting letters that exist in the current rom list * Graying out letters in alpha nav, fullscreen * Fixing seg fault when exiting if showing the menu * Fixing showing favorites in the right spot, bad, bad code, but works * Fixing favrites bug, adding logo and imporving full screen mode * no idea * Making it fullscreen * whatever * tweaks * Improving speed with less calls to getNthElement * Fixing scroll down * Fixing scroll up and down plus advance section * More fixes when changing page and loading * Fixing section switching * Fixing favorites * Fixing switching between fullscreen and menu mode * Fixing random select * Removing printfs * Fixing coming in and out of favorites in different modes * Fixing section switching in fullscreen mode * Fixing reintroduced bug when switching sections in different modes * Fixing section switching in fullscreen * Fixing favorites * Fixing favorites deletion * Configurable media folder
fgl82 · Feb 22, 2020 · 26500d5 · 26500d5
1 parent 71e2301
commit 26500d5
Show file tree

Hide file tree

Showing 13 changed files with 238 additions and 266 deletions.
diff --git a/simplemenu/Makefile b/simplemenu/Makefile
@@ -3,8 +3,8 @@ TARGET = simplemenu
 #PLATFORM = BITTBOY
 #PLATFORM = RG-300
 #PLATFORM = RG-350
-#PLATFORM = NPG
-PLATFORM = PC
+PLATFORM = NPG
+#PLATFORM = PC
 
 # Compiler
 

diff --git a/simplemenu/src/headers/control.h b/simplemenu/src/headers/control.h
@@ -9,6 +9,7 @@ void launchGame();
 void launchEmulator();
 void scrollUp();
 void scrollDown();
+void scrollToGame(int gameNumber);
 void advancePage();
 void rewindPage();
 void showOrHideFavorites();

diff --git a/simplemenu/src/headers/globals.h b/simplemenu/src/headers/globals.h
@@ -12,6 +12,8 @@
 
 int running;
 
+char mediaFolder[100];
+
 int itsStoppedBecauseOfAnError;
 char *errorMessage;
 int thereIsACriticalError;
@@ -27,7 +29,7 @@ int menuSectionCounter;
 int gamesInPage;
 
 int currentCPU;
-int pictureMode;
+int fullscreenMode;
 int hotKeyPressed;
 int currentlySectionSwitching;
 int currentlyChoosingEmulator;
@@ -84,6 +86,7 @@ struct MenuSection {
 	int realCurrentGameNumber;
 	int alphabeticalPaging;
 	int totalPages;
+	int gameCount;
 	int initialized;
 	int onlyFileNamesNoExtension;
 	int headerAndFooterBackgroundColor[3];
@@ -92,14 +95,15 @@ struct MenuSection {
 	int bodyTextColor[3];
 	int bodySelectedTextBackgroundColor[3];
 	int bodySelectedTextTextColor[3];
+	struct Node* currentGameNode;
 	struct Node *head;
+	struct Node *tail;
 	hashtable_t *aliasHashTable;
 	int activeExecutable;
 	int activeEmulatorDirectory;
 	char category[100];
 };
 
-//struct Rom* currentGame;
 
 struct MenuSection menuSections[50];
 

diff --git a/simplemenu/src/headers/screen.h b/simplemenu/src/headers/screen.h
@@ -1,6 +1,6 @@
 #ifndef SCREEN_DEFINED
 #define SCREEN_DEFINED
-void updateScreen();
+void updateScreen(struct Rom *rom);
 void drawHeader();
 void drawGameList();
 void drawFooter();

diff --git a/simplemenu/src/logic/config.c b/simplemenu/src/logic/config.c
@@ -154,7 +154,7 @@ void saveLastState() {
 	snprintf(pathToStatesFilePlusFileName,sizeof(pathToStatesFilePlusFileName),"%s/.simplemenu/last_state.cfg",getenv("HOME"));
 	fp = fopen(pathToStatesFilePlusFileName, "w");
 	fprintf(fp, "%d;\n", stripGames);
-	fprintf(fp, "%d;\n", pictureMode);
+	fprintf(fp, "%d;\n", fullscreenMode);
 	fprintf(fp, "%d;\n", currentSectionNumber);
 	for (currentSectionNumber=0;currentSectionNumber<menuSectionCounter;currentSectionNumber++) {
 		fprintf(fp, "%d;%d;%d;%d\n", currentSectionNumber, CURRENT_SECTION.currentPage, CURRENT_SECTION.currentGameInPage, CURRENT_SECTION.realCurrentGameNumber);
@@ -206,7 +206,7 @@ void loadLastState() {
 	}
 	stripGames=stripGamesConfig;
 	currentSectionNumber=startInSection;
-	pictureMode=startInPictureMode;
+	fullscreenMode=startInPictureMode;
 	fclose(fp);
 	if (line) {
 		free(line);
@@ -239,9 +239,13 @@ void loadConfig() {
 		}  else if (i==5){
 			stripGames=atoi(line);
 		}  else if (i==6){
-			pictureMode=atoi(line);
-		} else {
+			fullscreenMode=atoi(line);
+		} else if (i==7){
 			shutDownEnabled=atoi(line);
+		} else {
+			strcpy(mediaFolder,line);
+			mediaFolder[strlen(mediaFolder)-1]='\0';
+			printf("%s\n",mediaFolder);
 		}
 		i++;
 	}