mvietri/union-minui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added MENU version screen + MENU dismisses menu

Browse source
This commit is contained in:
Shaun Inman 2023-02-16 22:30:13 -05:00
parent d24721469d
commit 467a66438b
5 changed files with 272 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

1
makefile
View file

@ -91,6 +91,7 @@ readmes:
fmt -w 40 -s ./skeleton/EXTRAS/README.txt > ./build/EXTRAS/README.txt fmt -w 40 -s ./skeleton/EXTRAS/README.txt > ./build/EXTRAS/README.txt
zip: zip:
cd ./build/SYSTEM/rg35xx/paks/MinUI.pak && echo "$(RELEASE_NAME)\n$(BUILD_HASH)" > version.txt
cd ./build && find . -type f -name '.DS_Store' -delete cd ./build && find . -type f -name '.DS_Store' -delete
mkdir -p ./build/PAYLOAD mkdir -p ./build/PAYLOAD
mv ./build/SYSTEM ./build/PAYLOAD/.system mv ./build/SYSTEM ./build/PAYLOAD/.system

26
src/common/api.c
View file

@ -1027,6 +1027,20 @@ int PAD_isPressed(int btn) { return pad.is_pressed & btn; }
int PAD_justReleased(int btn) { return pad.just_released & btn; } int PAD_justReleased(int btn) { return pad.just_released & btn; }
int PAD_justRepeated(int btn) { return pad.just_repeated & btn; } int PAD_justRepeated(int btn) { return pad.just_repeated & btn; }
int PAD_tappedMenu(uint32_t now) {
#define MENU_DELAY 250 // also in POW_update()
static uint32_t menu_start = 0;
static int ignore_menu = 0;
if (PAD_justPressed(BTN_MENU)) {
ignore_menu = 0;
menu_start = now;
}
else if (PAD_isPressed(BTN_MENU) && (PAD_justPressed(BTN_PLUS) || PAD_justPressed(BTN_MINUS))) {
ignore_menu = 1;
}
return (!ignore_menu && PAD_justReleased(BTN_MENU) && now-menu_start<MENU_DELAY);
}
/////////////////////////////// ///////////////////////////////
static struct VIB_Context { static struct VIB_Context {
@ -1085,6 +1099,7 @@ void POW_update(int* _dirty, int* _show_setting, POW_callback_t before_sleep, PO
static uint32_t cancel_start = 0; static uint32_t cancel_start = 0;
static uint32_t power_start = 0; static uint32_t power_start = 0;
static uint32_t menu_start = 0;
static uint32_t setting_start = 0; static uint32_t setting_start = 0;
static uint32_t charge_start = 0; static uint32_t charge_start = 0;
static int was_charging = -1; static int was_charging = -1;
@ -1122,20 +1137,25 @@ void POW_update(int* _dirty, int* _show_setting, POW_callback_t before_sleep, PO
POW_fauxSleep(); POW_fauxSleep();
if (after_sleep) after_sleep(); if (after_sleep) after_sleep();
cancel_start = SDL_GetTicks(); cancel_start = now = SDL_GetTicks();
power_start = 0; power_start = 0;
dirty = 1; dirty = 1;
} }
int was_dirty = dirty; // dirty list (not including settings/battery) int was_dirty = dirty; // dirty list (not including settings/battery)
#define SETTING_DELAY 750 #define SETTING_DELAY 500
if (show_setting && now-setting_start>=SETTING_DELAY && !PAD_isPressed(BTN_MENU)) { if (show_setting && now-setting_start>=SETTING_DELAY && !PAD_isPressed(BTN_MENU)) {
show_setting = 0; show_setting = 0;
dirty = 1; dirty = 1;
} }
if (PAD_justRepeated(BTN_PLUS) || PAD_justRepeated(BTN_MINUS) || PAD_justPressed(BTN_MENU)) { if (!show_setting && !PAD_isPressed(BTN_MENU)) {
menu_start = now; // this is weird, updates until pressed
}
#define MENU_DELAY 250 // also in PAD_tappedMenu()
if (PAD_justRepeated(BTN_PLUS) || PAD_justRepeated(BTN_MINUS) || (PAD_isPressed(BTN_MENU) && now-menu_start>=MENU_DELAY)) {
setting_start = now; setting_start = now;
if (PAD_isPressed(BTN_MENU)) { if (PAD_isPressed(BTN_MENU)) {
show_setting = 1; show_setting = 1;

1
src/common/api.h
View file

@ -198,6 +198,7 @@ int PAD_isPressed(int btn);
int PAD_justReleased(int btn); int PAD_justReleased(int btn);
int PAD_justRepeated(int btn); int PAD_justRepeated(int btn);
int PAD_tappedMenu(uint32_t now); // special case, returns 1 on release of BTN_MENU within 250ms and BTN_PLUS/BTN_MINUS haven't been pressed
/////////////////////////////// ///////////////////////////////

10
src/minarch/main.c
View file

@ -3059,8 +3059,6 @@ static int Menu_options(MenuList* list) {
} }
GFX_startFrame(); GFX_startFrame();
uint32_t frame_start = SDL_GetTicks();
PAD_poll(); PAD_poll();
if (PAD_justRepeated(BTN_UP)) { if (PAD_justRepeated(BTN_UP)) {
@ -3511,9 +3509,12 @@ static void Menu_loop(void) {
int status = STATUS_CONT; // TODO: tmp? int status = STATUS_CONT; // TODO: tmp?
int show_setting = 0; int show_setting = 0;
int dirty = 1; int dirty = 1;
int ignore_menu = 0;
int menu_start = 0;
while (show_menu) { while (show_menu) {
GFX_startFrame(); GFX_startFrame();
uint32_t frame_start = SDL_GetTicks(); uint32_t now = SDL_GetTicks();
PAD_poll(); PAD_poll();
@ -3568,7 +3569,8 @@ static void Menu_loop(void) {
// printf("bmp_path: %s (%i)\n", bmp_path, preview_exists); // printf("bmp_path: %s (%i)\n", bmp_path, preview_exists);
} }
if (PAD_justPressed(BTN_B)) {
if (PAD_justPressed(BTN_B) || PAD_tappedMenu(now)) {
status = STATUS_CONT; status = STATUS_CONT;
show_menu = 0; show_menu = 0;
} }

406
src/minui/main.c
View file

@ -1180,133 +1180,146 @@ int main (int argc, char *argv[]) {
PAD_reset(); PAD_reset();
int dirty = 1; int dirty = 1;
int show_version = 0;
int show_setting = 0; // 1=brightness,2=volume int show_setting = 0; // 1=brightness,2=volume
while (!quit) { while (!quit) {
GFX_startFrame(); GFX_startFrame();
unsigned long frame_start = SDL_GetTicks(); unsigned long now = SDL_GetTicks();
PAD_poll(); PAD_poll();
int selected = top->selected; int selected = top->selected;
int total = top->entries->count; int total = top->entries->count;
if (total>0) { if (show_version) {
if (PAD_justRepeated(BTN_UP)) { if (PAD_justPressed(BTN_B) || PAD_tappedMenu(now)) {
if (selected==0 && !PAD_justPressed(BTN_UP)) { show_version = 0;
// stop at top dirty = 1;
}
}
else {
if (PAD_tappedMenu(now)) {
show_version = 1;
dirty = 1;
}
else if (total>0) {
if (PAD_justRepeated(BTN_UP)) {
if (selected==0 && !PAD_justPressed(BTN_UP)) {
// stop at top
}
else {
selected -= 1;
if (selected<0) {
selected = total-1;
int start = total - MAIN_ROW_COUNT;
top->start = (start<0) ? 0 : start;
top->end = total;
}
else if (selected<top->start) {
top->start -= 1;
top->end -= 1;
}
}
} }
else { else if (PAD_justRepeated(BTN_DOWN)) {
selected -= 1; if (selected==total-1 && !PAD_justPressed(BTN_DOWN)) {
// stop at bottom
}
else {
selected += 1;
if (selected>=total) {
selected = 0;
top->start = 0;
top->end = (total<MAIN_ROW_COUNT) ? total : MAIN_ROW_COUNT;
}
else if (selected>=top->end) {
top->start += 1;
top->end += 1;
}
}
}
if (PAD_justRepeated(BTN_LEFT)) {
selected -= MAIN_ROW_COUNT;
if (selected<0) { if (selected<0) {
selected = 0;
top->start = 0;
top->end = (total<MAIN_ROW_COUNT) ? total : MAIN_ROW_COUNT;
}
else if (selected<top->start) {
top->start -= MAIN_ROW_COUNT;
if (top->start<0) top->start = 0;
top->end = top->start + MAIN_ROW_COUNT;
}
}
else if (PAD_justRepeated(BTN_RIGHT)) {
selected += MAIN_ROW_COUNT;
if (selected>=total) {
selected = total-1; selected = total-1;
int start = total - MAIN_ROW_COUNT; int start = total - MAIN_ROW_COUNT;
top->start = (start<0) ? 0 : start; top->start = (start<0) ? 0 : start;
top->end = total; top->end = total;
} }
else if (selected<top->start) {
top->start -= 1;
top->end -= 1;
}
}
}
else if (PAD_justRepeated(BTN_DOWN)) {
if (selected==total-1 && !PAD_justPressed(BTN_DOWN)) {
// stop at bottom
}
else {
selected += 1;
if (selected>=total) {
selected = 0;
top->start = 0;
top->end = (total<MAIN_ROW_COUNT) ? total : MAIN_ROW_COUNT;
}
else if (selected>=top->end) { else if (selected>=top->end) {
top->start += 1; top->end += MAIN_ROW_COUNT;
top->end += 1; if (top->end>total) top->end = total;
top->start = top->end - MAIN_ROW_COUNT;
} }
} }
} }
if (PAD_justRepeated(BTN_LEFT)) {
selected -= MAIN_ROW_COUNT; if (PAD_justRepeated(BTN_L1)) { // previous alpha
if (selected<0) { Entry* entry = top->entries->items[selected];
selected = 0; int i = entry->alpha-1;
top->start = 0; if (i>=0) {
top->end = (total<MAIN_ROW_COUNT) ? total : MAIN_ROW_COUNT; selected = top->alphas->items[i];
} if (total>MAIN_ROW_COUNT) {
else if (selected<top->start) { top->start = selected;
top->start -= MAIN_ROW_COUNT; top->end = top->start + MAIN_ROW_COUNT;
if (top->start<0) top->start = 0; if (top->end>total) top->end = total;
top->end = top->start + MAIN_ROW_COUNT; top->start = top->end - MAIN_ROW_COUNT;
}
} }
} }
else if (PAD_justRepeated(BTN_RIGHT)) { else if (PAD_justRepeated(BTN_R1)) { // next alpha
selected += MAIN_ROW_COUNT; Entry* entry = top->entries->items[selected];
if (selected>=total) { int i = entry->alpha+1;
selected = total-1; if (i<top->alphas->count) {
int start = total - MAIN_ROW_COUNT; selected = top->alphas->items[i];
top->start = (start<0) ? 0 : start; if (total>MAIN_ROW_COUNT) {
top->end = total; top->start = selected;
} top->end = top->start + MAIN_ROW_COUNT;
else if (selected>=top->end) { if (top->end>total) top->end = total;
top->end += MAIN_ROW_COUNT; top->start = top->end - MAIN_ROW_COUNT;
if (top->end>total) top->end = total; }
top->start = top->end - MAIN_ROW_COUNT;
} }
} }
}
if (PAD_justRepeated(BTN_L1)) { // previous alpha if (selected!=top->selected) {
Entry* entry = top->entries->items[selected]; top->selected = selected;
int i = entry->alpha-1; dirty = 1;
if (i>=0) {
selected = top->alphas->items[i];
if (total>MAIN_ROW_COUNT) {
top->start = selected;
top->end = top->start + MAIN_ROW_COUNT;
if (top->end>total) top->end = total;
top->start = top->end - MAIN_ROW_COUNT;
}
} }
}
else if (PAD_justRepeated(BTN_R1)) { // next alpha if (dirty && total>0) readyResume(top->entries->items[top->selected]);
Entry* entry = top->entries->items[selected];
int i = entry->alpha+1; if (total>0 && can_resume && PAD_justReleased(BTN_RESUME)) {
if (i<top->alphas->count) { should_resume = 1;
selected = top->alphas->items[i]; Entry_open(top->entries->items[top->selected]);
if (total>MAIN_ROW_COUNT) { dirty = 1;
top->start = selected;
top->end = top->start + MAIN_ROW_COUNT;
if (top->end>total) top->end = total;
top->start = top->end - MAIN_ROW_COUNT;
}
} }
} else if (total>0 && PAD_justPressed(BTN_A)) {
Entry_open(top->entries->items[top->selected]);
total = top->entries->count;
dirty = 1;
if (selected!=top->selected) { if (total>0) readyResume(top->entries->items[top->selected]);
top->selected = selected; }
dirty = 1; else if (PAD_justPressed(BTN_B) && stack->count>1) {
} closeDirectory();
total = top->entries->count;
if (dirty && total>0) readyResume(top->entries->items[top->selected]); dirty = 1;
// can_resume = 0;
if (total>0 && can_resume && PAD_justReleased(BTN_RESUME)) { if (total>0) readyResume(top->entries->items[top->selected]);
should_resume = 1; }
Entry_open(top->entries->items[top->selected]);
dirty = 1;
}
else if (total>0 && PAD_justPressed(BTN_A)) {
Entry_open(top->entries->items[top->selected]);
total = top->entries->count;
dirty = 1;
if (total>0) readyResume(top->entries->items[top->selected]);
}
else if (PAD_justPressed(BTN_B) && stack->count>1) {
closeDirectory();
total = top->entries->count;
dirty = 1;
// can_resume = 0;
if (total>0) readyResume(top->entries->items[top->selected]);
} }
POW_update(&dirty, &show_setting, NULL, NULL); POW_update(&dirty, &show_setting, NULL, NULL);
@ -1318,38 +1331,109 @@ int main (int argc, char *argv[]) {
int oy; int oy;
int ow = GFX_blitHardwareGroup(screen, show_setting); int ow = GFX_blitHardwareGroup(screen, show_setting);
// list if (show_version) {
if (total>0) { if (!version) {
int selected_row = top->selected - top->start; // TODO: load from a file
for (int i=top->start,j=0; i<top->end; i++,j++) { char release[256];
Entry* entry = top->entries->items[i]; getFile("./version.txt", release, 256);
char* entry_name = entry->name;
char* entry_unique = entry->unique;
int available_width = SCREEN_WIDTH - SCALE1(PADDING * 2);
if (i==top->start) available_width -= ow;
SDL_Color text_color = COLOR_WHITE; char *tmp,*commit;
commit = strrchr(release, '\n');
commit[0] = '\0';
commit = strrchr(release, '\n')+1;
tmp = strchr(release, '\n');
tmp[0] = '\0';
trimSortingMeta(&entry_name); char* model = "Anbernic RG35XX";
char display_name[256]; SDL_Surface* release_txt = TTF_RenderUTF8_Blended(font.large, "Release", COLOR_DARK_TEXT);
int text_width = GFX_truncateText(font.large, entry_unique ? entry_unique : entry_name, display_name, available_width); SDL_Surface* version_txt = TTF_RenderUTF8_Blended(font.large, release, COLOR_WHITE);
int max_width = MIN(available_width, text_width); SDL_Surface* commit_txt = TTF_RenderUTF8_Blended(font.large, "Commit", COLOR_DARK_TEXT);
if (j==selected_row) { SDL_Surface* hash_txt = TTF_RenderUTF8_Blended(font.large, commit, COLOR_WHITE);
GFX_blitPill(ASSET_WHITE_PILL, screen, &(SDL_Rect){
SCALE1(PADDING),
SCALE1(PADDING+(j*PILL_SIZE)),
max_width,
SCALE1(PILL_SIZE)
});
text_color = COLOR_BLACK;
}
else if (entry->unique) {
trimSortingMeta(&entry_unique);
char unique_name[256];
GFX_truncateText(font.large, entry_unique, unique_name, available_width);
SDL_Surface* text = TTF_RenderUTF8_Blended(font.large, unique_name, COLOR_DARK_TEXT); 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);
#define VERSION_LINE_HEIGHT 24
int x = release_txt->w + SCALE1(8);
int w = x + version_txt->w;
int h = SCALE1(VERSION_LINE_HEIGHT*4);
version = SDL_CreateRGBSurface(0,w,h,16,0,0,0,0);
SDL_BlitSurface(release_txt, NULL, version, &(SDL_Rect){0, 0});
SDL_BlitSurface(version_txt, NULL, version, &(SDL_Rect){x,0});
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_FreeSurface(release_txt);
SDL_FreeSurface(version_txt);
SDL_FreeSurface(commit_txt);
SDL_FreeSurface(hash_txt);
SDL_FreeSurface(model_txt);
SDL_FreeSurface(type_txt);
}
SDL_BlitSurface(version, NULL, screen, &(SDL_Rect){(SCREEN_WIDTH-version->w)/2,(SCREEN_HEIGHT-version->h)/2});
// buttons (duped and trimmed from below)
if (show_setting) {
if (show_setting==1) GFX_blitButtonGroup((char*[]){ BRIGHTNESS_BUTTON_LABEL,"BRIGHTNESS", NULL }, screen, 0);
else GFX_blitButtonGroup((char*[]){ "MENU","BRIGHTNESS", NULL }, screen, 0);
}
else {
GFX_blitButtonGroup((char*[]){ "POWER","SLEEP", NULL }, screen, 0);
}
GFX_blitButtonGroup((char*[]){ "B","BACK", NULL }, screen, 1);
}
else {
// list
if (total>0) {
int selected_row = top->selected - top->start;
for (int i=top->start,j=0; i<top->end; i++,j++) {
Entry* entry = top->entries->items[i];
char* entry_name = entry->name;
char* entry_unique = entry->unique;
int available_width = SCREEN_WIDTH - SCALE1(PADDING * 2);
if (i==top->start) available_width -= ow;
SDL_Color text_color = COLOR_WHITE;
trimSortingMeta(&entry_name);
char display_name[256];
int text_width = GFX_truncateText(font.large, entry_unique ? entry_unique : entry_name, display_name, available_width);
int max_width = MIN(available_width, text_width);
if (j==selected_row) {
GFX_blitPill(ASSET_WHITE_PILL, screen, &(SDL_Rect){
SCALE1(PADDING),
SCALE1(PADDING+(j*PILL_SIZE)),
max_width,
SCALE1(PILL_SIZE)
});
text_color = COLOR_BLACK;
}
else if (entry->unique) {
trimSortingMeta(&entry_unique);
char unique_name[256];
GFX_truncateText(font.large, entry_unique, unique_name, available_width);
SDL_Surface* text = TTF_RenderUTF8_Blended(font.large, unique_name, COLOR_DARK_TEXT);
SDL_BlitSurface(text, &(SDL_Rect){
0,
0,
max_width-SCALE1(BUTTON_PADDING*2),
text->h
}, screen, &(SDL_Rect){
SCALE1(PADDING+BUTTON_PADDING),
SCALE1(PADDING+(j*PILL_SIZE)+4)
});
GFX_truncateText(font.large, entry_name, display_name, available_width);
}
SDL_Surface* text = TTF_RenderUTF8_Blended(font.large, display_name, text_color);
SDL_BlitSurface(text, &(SDL_Rect){ SDL_BlitSurface(text, &(SDL_Rect){
0, 0,
0, 0,
@ -1359,49 +1443,37 @@ int main (int argc, char *argv[]) {
SCALE1(PADDING+BUTTON_PADDING), SCALE1(PADDING+BUTTON_PADDING),
SCALE1(PADDING+(j*PILL_SIZE)+4) SCALE1(PADDING+(j*PILL_SIZE)+4)
}); });
SDL_FreeSurface(text);
GFX_truncateText(font.large, entry_name, display_name, available_width);
} }
SDL_Surface* text = TTF_RenderUTF8_Blended(font.large, display_name, text_color);
SDL_BlitSurface(text, &(SDL_Rect){
0,
0,
max_width-SCALE1(BUTTON_PADDING*2),
text->h
}, screen, &(SDL_Rect){
SCALE1(PADDING+BUTTON_PADDING),
SCALE1(PADDING+(j*PILL_SIZE)+4)
});
SDL_FreeSurface(text);
}
}
else {
GFX_blitMessage("Empty folder", screen, NULL);
}
// buttons
if (show_setting) {
if (show_setting==1) GFX_blitButtonGroup((char*[]){ BRIGHTNESS_BUTTON_LABEL,"BRIGHTNESS", NULL }, screen, 0);
else GFX_blitButtonGroup((char*[]){ "MENU","BRIGHTNESS", NULL }, screen, 0);
}
else if (can_resume) {
GFX_blitButtonGroup((char*[]){ "X","RESUME", NULL }, screen, 0);
}
else {
GFX_blitButtonGroup((char*[]){ "POWER","SLEEP", NULL }, screen, 0);
}
if (total==0) {
if (stack->count>1) {
GFX_blitButtonGroup((char*[]){ "B","BACK", NULL }, screen, 1);
}
}
else {
if (stack->count>1) {
GFX_blitButtonGroup((char*[]){ "B","BACK", "A","OPEN", NULL }, screen, 1);
} }
else { else {
GFX_blitButtonGroup((char*[]){ "A","OPEN", NULL }, screen, 1); GFX_blitMessage("Empty folder", screen, NULL);
}
// buttons
if (show_setting) {
if (show_setting==1) GFX_blitButtonGroup((char*[]){ BRIGHTNESS_BUTTON_LABEL,"BRIGHTNESS", NULL }, screen, 0);
else GFX_blitButtonGroup((char*[]){ "MENU","BRIGHTNESS", NULL }, screen, 0);
}
else if (can_resume) {
GFX_blitButtonGroup((char*[]){ "X","RESUME", NULL }, screen, 0);
}
else {
GFX_blitButtonGroup((char*[]){ "POWER","SLEEP", NULL }, screen, 0);
}
if (total==0) {
if (stack->count>1) {
GFX_blitButtonGroup((char*[]){ "B","BACK", NULL }, screen, 1);
}
}
else {
if (stack->count>1) {
GFX_blitButtonGroup((char*[]){ "B","BACK", "A","OPEN", NULL }, screen, 1);
}
else {
GFX_blitButtonGroup((char*[]){ "A","OPEN", NULL }, screen, 1);
}
} }
} }