The-Homebrew-Cloud/frodo-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/frodo-wii.git synced 2025-02-19 22:02:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed menu to work correctly

Browse Source
This commit is contained in:
simon.kagstrom 2009-01-04 14:52:50 +00:00
parent b96da79408
commit b4bdbf818b
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Src/C64_SDL.i
View File

@ -165,7 +165,7 @@ void C64::select_disc(Prefs *np)
menu_init(&select_disc_menu, this->menu_font, file_list, menu_init(&select_disc_menu, this->menu_font, file_list,
0, 0, MENU_SIZE_X, MENU_SIZE_Y); 0, 0, MENU_SIZE_X, MENU_SIZE_Y);
int opt = menu_select(real_screen, &select_disc_menu, ~0, NULL); int opt = menu_select(real_screen, &select_disc_menu, NULL);
if (opt >= 0) if (opt >= 0)
{ {
const char *name = file_list[opt]; const char *name = file_list[opt];
@ -203,7 +203,7 @@ void C64::bind_key(Prefs *np)
static const char *keys[] = { "space", "Run/Stop", "return", "F1", "F3", "F5", "F7", static const char *keys[] = { "space", "Run/Stop", "return", "F1", "F3", "F5", "F7",
"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A",
"B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M",
"N", "O", "P", "Q", "R", "S", "T", "U", "V", "X", "Y", "Z", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
NULL }; NULL };
int kcs[] = { MATRIX(7, 4), MATRIX(7, 7), MATRIX(0, 1), /* space, R/S, return */ int kcs[] = { MATRIX(7, 4), MATRIX(7, 7), MATRIX(0, 1), /* space, R/S, return */
MATRIX(0, 4), MATRIX(0, 5), MATRIX(0, 6), MATRIX(0, 3), MATRIX(4, 3), MATRIX(7, 0), MATRIX(0, 4), MATRIX(0, 5), MATRIX(0, 6), MATRIX(0, 3), MATRIX(4, 3), MATRIX(7, 0),
@ -216,12 +216,12 @@ void C64::bind_key(Prefs *np)
menu_init(&bind_key_menu, this->menu_font, bind_key_messages, menu_init(&bind_key_menu, this->menu_font, bind_key_messages,
0, 0, MENU_SIZE_X, MENU_SIZE_Y); 0, 0, MENU_SIZE_X, MENU_SIZE_Y);
int opt = menu_select(real_screen, &bind_key_menu, ~0, NULL); int opt = menu_select(real_screen, &bind_key_menu, NULL);
if (opt >= 0) if (opt >= 0)
{ {
menu_init(&key_menu, this->menu_font, keys, menu_init(&key_menu, this->menu_font, keys,
0, 0, MENU_SIZE_X, MENU_SIZE_Y); 0, 0, MENU_SIZE_X, MENU_SIZE_Y);
int key = menu_select(real_screen, &key_menu, ~0, NULL); int key = menu_select(real_screen, &key_menu, NULL);
np->JoystickKeyBinding[opt] = kcs[key]; np->JoystickKeyBinding[opt] = kcs[key];
menu_fini(&key_menu); menu_fini(&key_menu);
@ -235,7 +235,7 @@ void C64::display_options(Prefs *np)
menu_init(&display_menu, this->menu_font, display_option_messages, menu_init(&display_menu, this->menu_font, display_option_messages,
0, 0, MENU_SIZE_X, MENU_SIZE_Y); 0, 0, MENU_SIZE_X, MENU_SIZE_Y);
int opt = menu_select(real_screen, &display_menu, ~0, NULL); int opt = menu_select(real_screen, &display_menu, NULL);
if (opt >= 0) if (opt >= 0)
np->DisplayOption = opt; np->DisplayOption = opt;
menu_fini(&display_menu); menu_fini(&display_menu);
@ -249,7 +249,7 @@ void C64::save_load_state(Prefs *np)
menu_init(&save_load_menu, this->menu_font, save_load_state_messages, menu_init(&save_load_menu, this->menu_font, save_load_state_messages,
0, 0, MENU_SIZE_X, MENU_SIZE_Y); 0, 0, MENU_SIZE_X, MENU_SIZE_Y);
int opt = menu_select(real_screen, &save_load_menu, ~0, NULL); int opt = menu_select(real_screen, &save_load_menu, NULL);
switch(opt) switch(opt)
{ {
case 1: /* save */ case 1: /* save */
@ -264,7 +264,7 @@ void C64::save_load_state(Prefs *np)
case 0: /* load/delete */ case 0: /* load/delete */
case 2: case 2:
{ {
int save = menu_select(real_screen, &select_saves_menu, ~0, NULL); int save = menu_select(real_screen, &select_saves_menu, NULL);
} break; } break;
default: default:
break; break;
@ -373,7 +373,7 @@ void C64::VBlank(bool draw_frame)
} }
if (this->have_a_break) { if (this->have_a_break) {
int submenus[1]; int submenus[1];
int opt = menu_select(real_screen, &this->main_menu, ~0, submenus); int opt = menu_select(real_screen, &this->main_menu, submenus);
Prefs *np = Frodo::reload_prefs(); Prefs *np = Frodo::reload_prefs();
switch(opt) switch(opt)

10
Src/menu.cpp
View File

@ -96,10 +96,7 @@ static void menu_draw(SDL_Surface *screen, menu_t *p_menu)
const char *msg = p_menu->pp_msgs[i]; const char *msg = p_menu->pp_msgs[i];
int y = (i - p_menu->start_entry_visible) * line_height; int y = (i - p_menu->start_entry_visible) * line_height;
if ((p_menu->available_options & (1<<i)) == 0) /* Gray (not available) */ if (p_menu->cur_sel == i) /* Selected - color */
print_font(screen, p_menu->p_font, 128,128,128, x_start,
y_start + y, msg);
else if (p_menu->cur_sel == i) /* Selected - color */
print_font(screen, p_menu->p_font, 255,255,0, x_start, print_font(screen, p_menu->p_font, 255,255,0, x_start,
y_start + y, msg); y_start + y, msg);
else /* Otherwise white */ else /* Otherwise white */
@ -156,7 +153,6 @@ static void select_next(menu_t *p_menu, int dx, int dy)
(p_menu->cur_sel + dy + 1) % p_menu->n_entries; (p_menu->cur_sel + dy + 1) % p_menu->n_entries;
if (p_menu->pp_msgs[p_menu->cur_sel][0] == ' ' || if (p_menu->pp_msgs[p_menu->cur_sel][0] == ' ' ||
( (p_menu->available_options & (1<<p_menu->cur_sel)) == 0) ||
IS_SUBMENU(p_menu->pp_msgs[p_menu->cur_sel]) ) IS_SUBMENU(p_menu->pp_msgs[p_menu->cur_sel]) )
select_next(p_menu, dx, dy); select_next(p_menu, dx, dy);
/* If the next is a submenu */ /* If the next is a submenu */
@ -336,12 +332,10 @@ static uint32_t wait_key_press(void)
int menu_select(SDL_Surface *screen, menu_t *p_menu, int menu_select(SDL_Surface *screen, menu_t *p_menu,
uint32_t available_options, int *p_submenus) int *p_submenus)
{ {
int ret = -1; int ret = -1;
p_menu->available_options = available_options;
while(1) while(1)
{ {
uint32_t keys; uint32_t keys;

3
Src/menu.h
View File

@ -36,7 +36,6 @@ typedef struct
int x2,y2; int x2,y2;
int text_w; int text_w;
int text_h; int text_h;
uint32_t available_options;
int n_submenus; int n_submenus;
submenu_t *p_submenus; submenu_t *p_submenus;
@ -51,7 +50,7 @@ void menu_init(menu_t *p_menu, TTF_Font *p_font, const char **pp_msgs,
void menu_fini(menu_t *p_menu); void menu_fini(menu_t *p_menu);
int menu_select(SDL_Surface *screen, menu_t *p_menu, int menu_select(SDL_Surface *screen, menu_t *p_menu,
uint32_t available_options, int *p_submenus); int *p_submenus);
#if defined(__cplusplus) #if defined(__cplusplus)
}; };