X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.c;h=b03f8f865f15588b8623f19774c14f9b7469f108;hb=5a31ef07776f196cbf25748eee78da65b2b89928;hp=eaabe08f303f62dc4bb169a26324322ebc9dfc81;hpb=61f66fe0ab7ab4047a2c005fc52afeb50c26fc12;p=libpicofe.git diff --git a/common/emu.c b/common/emu.c index eaabe08..b03f8f8 100644 --- a/common/emu.c +++ b/common/emu.c @@ -16,32 +16,38 @@ #include "lprintf.h" #include "config.h" #include "common.h" +#include "plat.h" -#include -#include -#include +#include +#include +#include #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 static void strlwr_(char *string) @@ -123,9 +129,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 +307,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 +324,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 +361,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 +401,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 +416,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 +428,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 +442,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 +450,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; } } @@ -492,8 +496,8 @@ int emu_ReloadRom(char *rom_fname) 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 +522,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 +531,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; @@ -670,54 +674,46 @@ int emu_WriteConfig(int is_game) } -#ifndef UIQ3 -void emu_textOut8(int x, int y, const char *text) +void emu_writelrom(void) { - int i,l,len=strlen(text); - unsigned char *screen = (unsigned char *)SCREEN_BUFFER + x + y*SCREEN_WIDTH; + char cfg[512]; + make_config_cfg(cfg); + config_writelrom(cfg); +#ifndef NO_SYNC + sync(); +#endif +} - /* 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 @@ -725,6 +721,7 @@ void emu_textOut16(int x, int y, const char *text) #define MAX_COMBO_KEY 31 #endif +// FIXME void emu_findKeyBindCombos(void) { int act, u;