LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Config menu cleanup

Browse Source
This commit is contained in:
Aurora 2016-04-13 15:19:35 +02:00
parent 6d4a84a325
commit 85533411c9
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
source/config.c
View File

@ -32,9 +32,9 @@ void configureCFW(const char *configPath)
"( ) Enable splash screen with no screen-init" }; "( ) Enable splash screen with no screen-init" };
struct multiOption { struct multiOption {
int posXs[4];
int posY; int posY;
u32 enabled; u32 enabled;
int posXs[4];
} multiOptions[] = { } multiOptions[] = {
{ .posXs = {26, 31, 36, 41} }, { .posXs = {26, 31, 36, 41} },
{ .posXs = {17, 26, 32, 44} } { .posXs = {17, 26, 32, 44} }
@ -43,7 +43,7 @@ void configureCFW(const char *configPath)
//Calculate the amount of the various kinds of options and pre-select the first single one //Calculate the amount of the various kinds of options and pre-select the first single one
u32 multiOptionsAmount = sizeof(multiOptions) / sizeof(struct multiOption), u32 multiOptionsAmount = sizeof(multiOptions) / sizeof(struct multiOption),
singleOptionsAmount = sizeof(singleOptionsText) / sizeof(char *), singleOptionsAmount = sizeof(singleOptionsText) / sizeof(char *),
totalOptions = multiOptionsAmount + singleOptionsAmount, totalIndexes = multiOptionsAmount + singleOptionsAmount - 1,
selectedOption = multiOptionsAmount; selectedOption = multiOptionsAmount;
struct singleOption { struct singleOption {
@ -70,16 +70,16 @@ void configureCFW(const char *configPath)
drawCharacter(selected, 10 + multiOptions[i].posXs[multiOptions[i].enabled] * SPACING_X, multiOptions[i].posY, COLOR_WHITE); drawCharacter(selected, 10 + multiOptions[i].posXs[multiOptions[i].enabled] * SPACING_X, multiOptions[i].posY, COLOR_WHITE);
} }
//Display the first normal option in red endPos += SPACING_Y / 2;
singleOptions[0].posY = endPos + SPACING_Y + SPACING_Y / 2; u32 color = COLOR_RED;
endPos = drawString(singleOptionsText[0], 10, singleOptions[0].posY, COLOR_RED);
//Display all the normal options in white except for the first one //Display all the normal options in white except for the first one
for(u32 i = 1; i < singleOptionsAmount; i++) for(u32 i = 0; i < singleOptionsAmount; i++)
{ {
singleOptions[i].posY = endPos + SPACING_Y; singleOptions[i].posY = endPos + SPACING_Y;
endPos = drawString(singleOptionsText[i], 10, singleOptions[i].posY, COLOR_WHITE); endPos = drawString(singleOptionsText[i], 10, singleOptions[i].posY, color);
if(singleOptions[i].enabled) drawCharacter(selected, 10 + SPACING_X, singleOptions[i].posY, COLOR_WHITE); if(singleOptions[i].enabled) drawCharacter(selected, 10 + SPACING_X, singleOptions[i].posY, color);
color = COLOR_WHITE;
} }
u32 pressed = 0; u32 pressed = 0;
@ -87,42 +87,37 @@ void configureCFW(const char *configPath)
//Boring configuration menu //Boring configuration menu
while(pressed != BUTTON_START) while(pressed != BUTTON_START)
{ {
do { do
//In any case, if the current option is enabled (or a multiple choice option is selected) we must display a red 'x' {
if(selectedOption < multiOptionsAmount)
drawCharacter(selected, 10 + multiOptions[selectedOption].posXs[multiOptions[selectedOption].enabled] * SPACING_X, multiOptions[selectedOption].posY, COLOR_RED);
else if(singleOptions[selectedOption - multiOptionsAmount].enabled)
drawCharacter(selected, 10 + SPACING_X, singleOptions[selectedOption - multiOptionsAmount].posY, COLOR_RED);
pressed = waitInput(); pressed = waitInput();
} }
while(!(pressed & MENU_BUTTONS)); while(!(pressed & MENU_BUTTONS));
//Remember the previously selected option
u32 oldSelectedOption = selectedOption;
if(pressed != BUTTON_A) if(pressed != BUTTON_A)
{ {
//Remember the previously selected option
u32 oldSelectedOption = selectedOption;
switch(pressed) switch(pressed)
{ {
case BUTTON_UP: case BUTTON_UP:
selectedOption = !selectedOption ? totalOptions - 1 : selectedOption - 1; selectedOption = !selectedOption ? totalIndexes : selectedOption - 1;
break; break;
case BUTTON_DOWN: case BUTTON_DOWN:
selectedOption = selectedOption == (totalOptions - 1) ? 0 : selectedOption + 1; selectedOption = selectedOption == totalIndexes ? 0 : selectedOption + 1;
break; break;
case BUTTON_LEFT: case BUTTON_LEFT:
if(!selectedOption) continue;
selectedOption = 0; selectedOption = 0;
break; break;
case BUTTON_RIGHT: case BUTTON_RIGHT:
if(selectedOption == totalOptions - 1) continue; selectedOption = totalIndexes;
selectedOption = totalOptions - 1;
break; break;
default: default:
continue; continue;
} }
if(selectedOption == oldSelectedOption) continue;
//The user moved to a different option, print the old option in white and the new one in red. Only print 'x's if necessary //The user moved to a different option, print the old option in white and the new one in red. Only print 'x's if necessary
if(oldSelectedOption < multiOptionsAmount) if(oldSelectedOption < multiOptionsAmount)
{ {
@ -146,7 +141,7 @@ void configureCFW(const char *configPath)
} }
else else
{ {
//The selected option's status changed, print the 'x's accordingly. //The selected option's status changed, print the 'x's accordingly
if(selectedOption < multiOptionsAmount) if(selectedOption < multiOptionsAmount)
{ {
u32 oldEnabled = multiOptions[selectedOption].enabled; u32 oldEnabled = multiOptions[selectedOption].enabled;
@ -160,6 +155,15 @@ void configureCFW(const char *configPath)
if(oldEnabled) drawCharacter(selected, 10 + SPACING_X, singleOptions[selectedOption - multiOptionsAmount].posY, COLOR_BLACK); if(oldEnabled) drawCharacter(selected, 10 + SPACING_X, singleOptions[selectedOption - multiOptionsAmount].posY, COLOR_BLACK);
} }
} }
//In any case, if the current option is enabled (or a multiple choice option is selected) we must display a red 'x'
if(selectedOption < multiOptionsAmount)
drawCharacter(selected, 10 + multiOptions[selectedOption].posXs[multiOptions[selectedOption].enabled] * SPACING_X, multiOptions[selectedOption].posY, COLOR_RED);
else
{
u32 singleSelected = selectedOption - multiOptionsAmount;
if(singleOptions[singleSelected].enabled) drawCharacter(selected, 10 + SPACING_X, singleOptions[singleSelected].posY, COLOR_RED);
}
} }
//Preserve the last-used boot options (last 12 bits) //Preserve the last-used boot options (last 12 bits)