X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.c;h=ff17e3be0cfd442ef061c57efed00517fce0952c;hb=388947f33d88ce3de0d9cb3e873244fbb5162a59;hp=58fee619eb9ea645fdf44dbfa7ab21a349782db3;hpb=7f3b59cfbc4a85e2b2f036b0ae3fce09a94ed919;p=libpicofe.git diff --git a/common/emu.c b/common/emu.c index 58fee61..ff17e3b 100644 --- a/common/emu.c +++ b/common/emu.c @@ -5,7 +5,6 @@ #include #include -#include // tolower #ifndef NO_SYNC #include #endif @@ -15,7 +14,8 @@ #include "fonts.h" #include "lprintf.h" #include "config.h" -#include "common.h" +#include "plat.h" +#include "input.h" #include #include @@ -23,32 +23,36 @@ #include +void *g_screen_ptr; + +#if !SCREEN_SIZE_FIXED +int g_screen_width = SCREEN_WIDTH; +int g_screen_height = SCREEN_HEIGHT; +#endif + char *PicoConfigFile = "config.cfg"; currentConfig_t currentConfig, defaultConfig; -int rom_loaded = 0; -char noticeMsg[64] = { 0, }; int state_slot = 0; int config_slot = 0, config_slot_current = 0; -char loadedRomFName[512] = { 0, }; -int kb_combo_keys = 0, kb_combo_acts = 0; // keys and actions which need button combos int pico_inp_mode = 0; +int engineState = PGS_Menu; + +/* TODO: len checking */ +char rom_fname_reload[512] = { 0, }; +char rom_fname_loaded[512] = { 0, }; +int rom_loaded = 0; unsigned char *movie_data = NULL; static int movie_size = 0; -// provided by platform code: -extern void emu_noticeMsgUpdated(void); -extern int emu_getMainDir(char *dst, int len); -extern void menu_romload_prepare(const char *rom_name); -extern void menu_romload_end(void); - -// utilities +/* don't use tolower() for easy old glibc binary compatibility */ static void strlwr_(char *string) { char *p; for (p = string; *p; p++) - *p = (char)tolower(*p); + if ('A' <= *p && *p <= 'Z') + *p += 'a' - 'A'; } static int try_rfn_cut(char *fname) @@ -123,9 +127,9 @@ int emu_findBios(int region, char **bios_file) if (bios_file) *bios_file = bios_path; return 1; } else { - sprintf(menuErrorMsg, "no %s BIOS files found, read docs", + sprintf(bios_path, "no %s BIOS files found, read docs", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA"); - lprintf("%s\n", menuErrorMsg); + me_update_msg(bios_path); return 0; } } @@ -301,7 +305,7 @@ int emu_ReloadRom(char *rom_fname) // detect wrong extensions if (!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz - sprintf(menuErrorMsg, "Not a ROM/CD selected."); + me_update_msg("Not a ROM/CD selected."); return 0; } @@ -318,32 +322,32 @@ int emu_ReloadRom(char *rom_fname) int dummy; FILE *movie_file = fopen(rom_fname, "rb"); if(!movie_file) { - sprintf(menuErrorMsg, "Failed to open movie."); + me_update_msg("Failed to open movie."); return 0; } fseek(movie_file, 0, SEEK_END); movie_size = ftell(movie_file); fseek(movie_file, 0, SEEK_SET); if(movie_size < 64+3) { - sprintf(menuErrorMsg, "Invalid GMV file."); + me_update_msg("Invalid GMV file."); fclose(movie_file); return 0; } movie_data = malloc(movie_size); if(movie_data == NULL) { - sprintf(menuErrorMsg, "low memory."); + me_update_msg("low memory."); fclose(movie_file); return 0; } fread(movie_data, 1, movie_size, movie_file); fclose(movie_file); if (strncmp((char *)movie_data, "Gens Movie TEST", 15) != 0) { - sprintf(menuErrorMsg, "Invalid GMV file."); + me_update_msg("Invalid GMV file."); return 0; } dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname); if (!dummy) { - sprintf(menuErrorMsg, "Could't find a ROM for movie."); + me_update_msg("Could't find a ROM for movie."); return 0; } get_ext(rom_fname, ext); @@ -355,7 +359,7 @@ int emu_ReloadRom(char *rom_fname) PicoPatchLoad(rom_fname); dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname); if (!dummy) { - sprintf(menuErrorMsg, "Could't find a ROM to patch."); + me_update_msg("Could't find a ROM to patch."); return 0; } get_ext(rom_fname, ext); @@ -395,12 +399,12 @@ int emu_ReloadRom(char *rom_fname) rom = pm_open(used_rom_name); if (!rom) { - sprintf(menuErrorMsg, "Failed to open ROM/CD image"); + me_update_msg("Failed to open ROM/CD image"); goto fail; } if (cd_state < 0) { - sprintf(menuErrorMsg, "Invalid CD image"); + me_update_msg("Invalid CD image"); goto fail; } @@ -410,10 +414,9 @@ int emu_ReloadRom(char *rom_fname) rom_loaded = 0; if ( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) { - if (ret == 2) sprintf(menuErrorMsg, "Out of memory"); - else if (ret == 3) sprintf(menuErrorMsg, "Read failed"); - else sprintf(menuErrorMsg, "PicoCartLoad() failed."); - lprintf("%s\n", menuErrorMsg); + if (ret == 2) me_update_msg("Out of memory"); + else if (ret == 3) me_update_msg("Read failed"); + else me_update_msg("PicoCartLoad() failed."); goto fail2; } pm_close(rom); @@ -423,7 +426,7 @@ int emu_ReloadRom(char *rom_fname) if (rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 || ((*(unsigned char *)(rom_data+4)<<16)|(*(unsigned short *)(rom_data+6))) >= (int)rom_size) { if (rom_data) free(rom_data); - sprintf(menuErrorMsg, "Not a ROM selected."); + me_update_msg("Not a ROM selected."); goto fail2; } @@ -437,7 +440,7 @@ int emu_ReloadRom(char *rom_fname) lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size); if (PicoCartInsert(rom_data, rom_size)) { - sprintf(menuErrorMsg, "Failed to load ROM."); + me_update_msg("Failed to load ROM."); goto fail2; } @@ -445,8 +448,7 @@ int emu_ReloadRom(char *rom_fname) if (cd_state != CIT_NOT_CD) { ret = Insert_CD(rom_fname, cd_state); if (ret != 0) { - sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?"); - lprintf("%s\n", menuErrorMsg); + me_update_msg("Insert_CD() failed, invalid CD image?"); goto fail2; } } @@ -475,25 +477,20 @@ int emu_ReloadRom(char *rom_fname) // TODO: bits 6 & 5 } movie_data[0x18+30] = 0; - sprintf(noticeMsg, "MOVIE: %s", (char *) &movie_data[0x18]); + plat_status_msg("MOVIE: %s", (char *) &movie_data[0x18]); } else { PicoOpt &= ~POPT_DIS_VDP_FIFO; - if (Pico.m.pal) { - strcpy(noticeMsg, "PAL SYSTEM / 50 FPS"); - } else { - strcpy(noticeMsg, "NTSC SYSTEM / 60 FPS"); - } + plat_status_msg(Pico.m.pal ? "PAL SYSTEM / 50 FPS" : "NTSC SYSTEM / 60 FPS"); } - emu_noticeMsgUpdated(); // load SRAM for this ROM if (currentConfig.EmuOpt & EOPT_USE_SRAM) emu_SaveLoadGame(1, 1); - strncpy(loadedRomFName, rom_fname, sizeof(loadedRomFName)-1); - loadedRomFName[sizeof(loadedRomFName)-1] = 0; + strncpy(rom_fname_loaded, rom_fname, sizeof(rom_fname_loaded)-1); + rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0; rom_loaded = 1; return 1; @@ -518,8 +515,8 @@ static void romfname_ext(char *dst, const char *prefix, const char *ext) int prefix_len = 0; // make save filename - p = loadedRomFName+strlen(loadedRomFName)-1; - for (; p >= loadedRomFName && *p != PATH_SEP_C; p--); p++; + p = rom_fname_loaded + strlen(rom_fname_loaded) - 1; + for (; p >= rom_fname_loaded && *p != PATH_SEP_C; p--); p++; *dst = 0; if (prefix) { int len = emu_getMainDir(dst, 512); @@ -527,7 +524,7 @@ static void romfname_ext(char *dst, const char *prefix, const char *ext) prefix_len = len + strlen(prefix); } #ifdef UIQ3 - else p = loadedRomFName; // backward compatibility + else p = rom_fname_loaded; // backward compatibility #endif strncpy(dst + prefix_len, p, 511-prefix_len); dst[511-8] = 0; @@ -619,23 +616,21 @@ int emu_ReadConfig(int game, int no_defaults) } } + plat_validate_config(); + // some sanity checks - if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200; #ifdef PSP + /* TODO: mv to plat_validate_config() */ + if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200; if (currentConfig.gamma < -4 || currentConfig.gamma > 16) currentConfig.gamma = 0; if (currentConfig.gamma2 < 0 || currentConfig.gamma2 > 2) currentConfig.gamma2 = 0; -#else - if (currentConfig.gamma < 10 || currentConfig.gamma > 300) currentConfig.gamma = 100; -#endif - if (currentConfig.volume < 0 || currentConfig.volume > 99) currentConfig.volume = 50; -#ifdef __GP2X__ - // if volume keys are unbound, bind them to volume control - if (!currentConfig.KeyBinds[23] && !currentConfig.KeyBinds[22]) { - currentConfig.KeyBinds[23] = 1<<29; // vol up - currentConfig.KeyBinds[22] = 1<<30; // vol down - } #endif - if (ret == 0) config_slot_current = config_slot; + if (currentConfig.volume < 0 || currentConfig.volume > 99) + currentConfig.volume = 50; + + if (ret == 0) + config_slot_current = config_slot; + return (ret == 0); } @@ -680,112 +675,46 @@ void emu_writelrom(void) #endif } -#ifndef UIQ3 -void emu_textOut8(int x, int y, const char *text) -{ - int i,l,len=strlen(text); - unsigned char *screen = (unsigned char *)SCREEN_BUFFER + x + y*SCREEN_WIDTH; - - /* always using built-in font */ - for (i = 0; i < len; i++) - { - for (l=0;l<8;l++) - { - unsigned char fd = fontdata8x8[((text[i])*8)+l]; - if (fd&0x80) screen[l*SCREEN_WIDTH+0]=0xf0; - if (fd&0x40) screen[l*SCREEN_WIDTH+1]=0xf0; - if (fd&0x20) screen[l*SCREEN_WIDTH+2]=0xf0; - if (fd&0x10) screen[l*SCREEN_WIDTH+3]=0xf0; - if (fd&0x08) screen[l*SCREEN_WIDTH+4]=0xf0; - if (fd&0x04) screen[l*SCREEN_WIDTH+5]=0xf0; - if (fd&0x02) screen[l*SCREEN_WIDTH+6]=0xf0; - if (fd&0x01) screen[l*SCREEN_WIDTH+7]=0xf0; - } - screen += 8; - } +/* always using built-in font */ + +#define mk_text_out(name, type, val) \ +void name(int x, int y, const char *text) \ +{ \ + int i, l, len = strlen(text); \ + type *screen = (type *)g_screen_ptr + x + y * g_screen_width; \ + \ + for (i = 0; i < len; i++, screen += 8) \ + { \ + for (l = 0; l < 8; l++) \ + { \ + unsigned char fd = fontdata8x8[text[i] * 8 + l];\ + type *s = screen + l * g_screen_width; \ + if (fd&0x80) s[0] = val; \ + if (fd&0x40) s[1] = val; \ + if (fd&0x20) s[2] = val; \ + if (fd&0x10) s[3] = val; \ + if (fd&0x08) s[4] = val; \ + if (fd&0x04) s[5] = val; \ + if (fd&0x02) s[6] = val; \ + if (fd&0x01) s[7] = val; \ + } \ + } \ } -void emu_textOut16(int x, int y, const char *text) -{ - int i,l,len=strlen(text); - unsigned short *screen = (unsigned short *)SCREEN_BUFFER + x + y*SCREEN_WIDTH; +mk_text_out(emu_textOut8, unsigned char, 0xf0) +mk_text_out(emu_textOut16, unsigned short, 0xffff) - for (i = 0; i < len; i++) - { - for (l=0;l<8;l++) - { - unsigned char fd = fontdata8x8[((text[i])*8)+l]; - if(fd&0x80) screen[l*SCREEN_WIDTH+0]=0xffff; - if(fd&0x40) screen[l*SCREEN_WIDTH+1]=0xffff; - if(fd&0x20) screen[l*SCREEN_WIDTH+2]=0xffff; - if(fd&0x10) screen[l*SCREEN_WIDTH+3]=0xffff; - if(fd&0x08) screen[l*SCREEN_WIDTH+4]=0xffff; - if(fd&0x04) screen[l*SCREEN_WIDTH+5]=0xffff; - if(fd&0x02) screen[l*SCREEN_WIDTH+6]=0xffff; - if(fd&0x01) screen[l*SCREEN_WIDTH+7]=0xffff; - } - screen += 8; - } -} -#endif +#undef mk_text_out -#ifdef PSP -#define MAX_COMBO_KEY 23 -#else -#define MAX_COMBO_KEY 31 -#endif -void emu_findKeyBindCombos(void) -{ - int act, u; - - // find out which keys and actions are combos - kb_combo_keys = kb_combo_acts = 0; - for (act = 0; act < 32; act++) - { - int keyc = 0, keyc2 = 0; - if (act == 16 || act == 17) continue; // player2 flag - if (act > 17) - { - for (u = 0; u <= MAX_COMBO_KEY; u++) - if (currentConfig.KeyBinds[u] & (1 << act)) keyc++; - } - else - { - for (u = 0; u <= MAX_COMBO_KEY; u++) - if ((currentConfig.KeyBinds[u] & 0x30000) == 0 && // pl. 1 - (currentConfig.KeyBinds[u] & (1 << act))) keyc++; - for (u = 0; u <= MAX_COMBO_KEY; u++) - if ((currentConfig.KeyBinds[u] & 0x30000) == 1 && // pl. 2 - (currentConfig.KeyBinds[u] & (1 << act))) keyc2++; - if (keyc2 > keyc) keyc = keyc2; - } - if (keyc > 1) - { - // loop again and mark those keys and actions as combo - for (u = 0; u <= MAX_COMBO_KEY; u++) - { - if (currentConfig.KeyBinds[u] & (1 << act)) { - kb_combo_keys |= 1 << u; - kb_combo_acts |= 1 << act; - } - } - } - } - - // printf("combo keys/acts: %08x %08x\n", kb_combo_keys, kb_combo_acts); -} - - -void emu_updateMovie(void) +void update_movie(void) { int offs = Pico.m.frame_count*3 + 0x40; if (offs+3 > movie_size) { free(movie_data); movie_data = 0; - strcpy(noticeMsg, "END OF MOVIE."); + plat_status_msg("END OF MOVIE."); lprintf("END OF MOVIE.\n"); - emu_noticeMsgUpdated(); } else { // MXYZ SACB RLDU PicoPad[0] = ~movie_data[offs] & 0x8f; // ! SCBA RLDU @@ -905,10 +834,8 @@ int emu_SaveLoadGame(int load, int sram) // make save filename saveFname = emu_GetSaveFName(load, sram, state_slot); if (saveFname == NULL) { - if (!sram) { - strcpy(noticeMsg, load ? "LOAD FAILED (missing file)" : "SAVE FAILED "); - emu_noticeMsgUpdated(); - } + if (!sram) + plat_status_msg(load ? "LOAD FAILED (missing file)" : "SAVE FAILED"); return -1; } @@ -994,14 +921,13 @@ int emu_SaveLoadGame(int load, int sram) } else ret = -1; if (!ret) - strcpy(noticeMsg, load ? "GAME LOADED " : "GAME SAVED "); + plat_status_msg(load ? "GAME LOADED" : "GAME SAVED"); else { - strcpy(noticeMsg, load ? "LOAD FAILED " : "SAVE FAILED "); + plat_status_msg(load ? "LOAD FAILED" : "SAVE FAILED"); ret = -1; } - emu_noticeMsgUpdated(); return ret; } } @@ -1020,8 +946,7 @@ void emu_changeFastForward(int set_on) currentConfig.EmuOpt &= ~4; currentConfig.EmuOpt |= 0x40000; is_on = 1; - strcpy(noticeMsg, "FAST FORWARD "); - emu_noticeMsgUpdated(); + plat_status_msg("FAST FORWARD"); } else if (!set_on && is_on) { PsndOut = set_PsndOut; @@ -1036,31 +961,31 @@ void emu_RunEventsPico(unsigned int events) { if (events & (1 << 3)) { pico_inp_mode++; - if (pico_inp_mode > 2) pico_inp_mode = 0; + if (pico_inp_mode > 2) + pico_inp_mode = 0; switch (pico_inp_mode) { - case 2: strcpy(noticeMsg, "Input: Pen on Pad "); break; - case 1: strcpy(noticeMsg, "Input: Pen on Storyware"); break; - case 0: strcpy(noticeMsg, "Input: Joytick "); + case 2: plat_status_msg("Input: Pen on Pad"); break; + case 1: plat_status_msg("Input: Pen on Storyware"); break; + case 0: plat_status_msg("Input: Joystick"); PicoPicohw.pen_pos[0] = PicoPicohw.pen_pos[1] = 0x8000; break; } - emu_noticeMsgUpdated(); } if (events & (1 << 4)) { PicoPicohw.page--; - if (PicoPicohw.page < 0) PicoPicohw.page = 0; - sprintf(noticeMsg, "Page %i ", PicoPicohw.page); - emu_noticeMsgUpdated(); + if (PicoPicohw.page < 0) + PicoPicohw.page = 0; + plat_status_msg("Page %i", PicoPicohw.page); } if (events & (1 << 5)) { PicoPicohw.page++; - if (PicoPicohw.page > 6) PicoPicohw.page = 6; - sprintf(noticeMsg, "Page %i ", PicoPicohw.page); - emu_noticeMsgUpdated(); + if (PicoPicohw.page > 6) + PicoPicohw.page = 6; + plat_status_msg("Page %i", PicoPicohw.page); } } -void emu_DoTurbo(int *pad, int acts) +static void do_turbo(int *pad, int acts) { static int turbo_pad = 0; static unsigned char turbo_cnt[3] = { 0, 0, 0 }; @@ -1084,3 +1009,105 @@ void emu_DoTurbo(int *pad, int acts) *pad |= turbo_pad & (acts >> 8); } +static void run_ui_events(unsigned int which) +{ + if (which & (PEV_STATE_LOAD|PEV_STATE_SAVE)) + { + int do_it = 1; + if ( emu_checkSaveFile(state_slot) && + (((which & PEV_STATE_LOAD) && (currentConfig.EmuOpt & EOPT_CONFIRM_LOAD)) || + ((which & PEV_STATE_SAVE) && (currentConfig.EmuOpt & EOPT_CONFIRM_SAVE))) ) + { + const char *nm; + char tmp[64]; + int keys, len; + + strcpy(tmp, (which & PEV_STATE_LOAD) ? "LOAD STATE?" : "OVERWRITE SAVE?"); + len = strlen(tmp); + nm = in_get_key_name(-1, -PBTN_MA3); + snprintf(tmp + len, sizeof(tmp) - len, "(%s=yes, ", nm); + len = strlen(tmp); + nm = in_get_key_name(-1, -PBTN_MBACK); + snprintf(tmp + len, sizeof(tmp) - len, "%s=no)", nm); + + plat_status_msg_busy_first(tmp); + + in_set_blocking(1); + while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK)) + ; + while ( !((keys = in_menu_wait_any(50)) & (PBTN_MA3|PBTN_MBACK)) ) + ; + if (keys & PBTN_MBACK) + do_it = 0; + while (in_menu_wait_any(50) & (PBTN_MA3|PBTN_MBACK)) + ; + in_set_blocking(0); + } + if (do_it) { + plat_status_msg_busy_first((which & PEV_STATE_LOAD) ? "LOADING GAME" : "SAVING GAME"); + PicoStateProgressCB = plat_status_msg_busy_next; + emu_SaveLoadGame((which & PEV_STATE_LOAD) ? 1 : 0, 0); + PicoStateProgressCB = NULL; + } + } + if (which & PEV_SWITCH_RND) + { + plat_video_toggle_renderer(); + } + if (which & (PEV_SSLOT_PREV|PEV_SSLOT_NEXT)) + { + if (which & PEV_SSLOT_PREV) { + state_slot -= 1; + if (state_slot < 0) + state_slot = 9; + } else { + state_slot += 1; + if (state_slot > 9) + state_slot = 0; + } + + plat_status_msg("SAVE SLOT %i [%s]", state_slot, + emu_checkSaveFile(state_slot) ? "USED" : "FREE"); + } + if (which & PEV_MENU) + engineState = PGS_Menu; +} + +void emu_update_input(void) +{ + unsigned int allActions[2] = { 0, 0 }, events; + static unsigned int prevEvents = 0; + + /* FIXME: player2 */ + allActions[0] = in_update(); + + PicoPad[0] = allActions[0] & 0xfff; + PicoPad[1] = allActions[1] & 0xfff; + + if (allActions[0] & 0x7000) do_turbo(&PicoPad[0], allActions[0]); + if (allActions[1] & 0x7000) do_turbo(&PicoPad[1], allActions[1]); + + events = (allActions[0] | allActions[1]) & PEV_MASK; + + // volume is treated in special way and triggered every frame + if (events & (PEV_VOL_DOWN|PEV_VOL_UP)) + plat_update_volume(1, events & PEV_VOL_UP); + + if ((events ^ prevEvents) & PEV_FF) { + emu_changeFastForward(events & PEV_FF); + plat_update_volume(0, 0); +// reset_timing = 1; + } + + events &= ~prevEvents; + +// TODO if (PicoAHW == PAHW_PICO) +// RunEventsPico(events); + if (events) + run_ui_events(events); + if (movie_data) + update_movie(); + + prevEvents = (allActions[0] | allActions[1]) & PEV_MASK; +} +