--- np2/x11/np2.c 2003/11/17 16:12:27 1.2 +++ np2/x11/np2.c 2008/03/13 16:27:39 1.29 @@ -10,8 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -28,47 +26,67 @@ #include "compiler.h" #include "np2.h" +#include "pccore.h" #include "dosio.h" #include "scrndraw.h" -#include "statsave.h" #include "timing.h" #include "toolkit.h" -#include "keydisp.h" +#include "kdispwin.h" #include "toolwin.h" +#include "viewer.h" +#include "debugwin.h" +#include "skbdwin.h" #include "commng.h" +#include "joymng.h" #include "kbdmng.h" #include "mousemng.h" #include "scrnmng.h" #include "soundmng.h" #include "sysmng.h" +#include "taskmng.h" NP2OSCFG np2oscfg = { -#if !defined(CPU386) /* titles */ +#if !defined(CPUCORE_IA32) /* titles */ "Neko Project II", #else "Neko Project II + IA32", #endif - 2, /* paddingx */ - 2, /* paddingy */ + 0, /* paddingx */ + 0, /* paddingy */ 0, /* NOWAIT */ - 2, /* DRAW_SKIP */ + 0, /* DRAW_SKIP */ 0, /* DISPCLK */ KEY_KEY106, /* KEYBOARD */ - 0, /* F12COPY */ + 0, /* F12KEY */ 0, /* MOUSE_SW */ + 0, /* JOYPAD1 */ 0, /* JOYPAD2 */ - { 0, 0, 0, 0 }, /* JOY1BTN */ + { 1, 2, 5, 6 }, /* JOY1BTN */ + { + { 0, 1 }, /* JOYAXISMAP[0] */ + { 0, 1 }, /* JOYAXISMAP[1] */ + }, + { + { 0, 1, 0xff, 0xff }, /* JOYBTNMAP[0] */ + { 0, 1, 0xff, 0xff }, /* JOYBTNMAP[1] */ + }, + { "", "" }, /* JOYDEV */ { COMPORT_MIDI, 0, 0x3e, 19200, "", "", "", "" }, /* mpu */ + { + { COMPORT_NONE, 0, 0x3e, 19200, "", "", "", "" },/* com1 */ + { COMPORT_NONE, 0, 0x3e, 19200, "", "", "", "" },/* com2 */ + { COMPORT_NONE, 0, 0x3e, 19200, "", "", "", "" },/* com3 */ + }, 0, /* confirm */ @@ -77,27 +95,25 @@ NP2OSCFG np2oscfg = { 0, /* statsave */ 0, /* toolwin */ 0, /* keydisp */ + 0, /* softkbd */ 0, /* hostdrv_write */ + 0, /* jastsnd */ 0, /* I286SAVE */ - SNDDRV_NODRV, /* snddrv */ - "", /* audiodev */ + SNDDRV_SDL, /* snddrv */ { "", "" }, /* MIDIDEV */ 0, /* MIDIWAIT */ MOUSE_RATIO_100, /* mouse_move_ratio */ -#if defined(USE_GTK) /* toolkit */ - "gtk", -#else - "qt", -#endif - MMXFLAG_DISABLE, /* disablemmx */ + INTERP_NEAREST, /* drawinterp */ + 0, /* F11KEY */ }; -BOOL np2running = FALSE; +volatile sig_atomic_t np2running = 0; BYTE scrnmode = 0; +int ignore_fullscreen_mode = 0; UINT framecnt = 0; UINT waitcnt = 0; @@ -112,8 +128,23 @@ char bmpfilefolder[MAX_PATH]; char modulefile[MAX_PATH]; char statpath[MAX_PATH]; +const char np2flagext[] = "s%02d"; +const char np2resumeext[] = "sav"; + +#ifndef FONTFACE +#define FONTFACE "-misc-fixed-%s-r-normal--%d-*-*-*-*-*-*-*" +#endif +char fontname[1024] = FONTFACE; + +#ifndef FONTNAME_DEFAULT +#define FONTNAME_DEFAULT "./default.ttf" +#endif +char fontfilename[MAX_PATH] = FONTNAME_DEFAULT; + char timidity_cfgfile_path[MAX_PATH]; +int verbose = 0; + UINT32 gettick(void) @@ -176,16 +207,18 @@ flagload(const char* ext, const char* ti int ret; int rv = 0; - UNUSED(title); - getstatfilename(path, ext, sizeof(path)); ret = statsave_check(path, buf, sizeof(buf)); - if (ret & (~NP2FLAG_DISKCHG)) { - fprintf(stderr, "Couldn't restart\n"); - rv = 1; - } else if ((!force) && (ret & NP2FLAG_DISKCHG)) { - fprintf(stderr, "Conflict\n"); + if (ret & (~STATFLAG_DISKCHG)) { + toolkit_msgbox(title, "Couldn't restart", + TK_MB_OK|TK_MB_ICON_ERROR); rv = 1; + } else if ((!force) && (ret & STATFLAG_DISKCHG)) { + ret = toolkit_msgbox(title, "Conflict!\nContinue?", + TK_MB_YESNOCANCEL|TK_MB_ICON_QUESTION); + if (ret != TK_MB_YES) { + rv = 1; + } } if (rv == 0) { statsave_load(path); @@ -214,7 +247,7 @@ changescreen(BYTE newmode) if (renewal) { if (renewal & SCRNMODE_FULLSCREEN) { toolwin_destroy(); - keydisp_destroy(); + kdispwin_destroy(); } soundmng_stop(); mouse_running(MOUSE_STOP); @@ -234,7 +267,7 @@ changescreen(BYTE newmode) toolwin_create(); } if (np2oscfg.keydisp) { - keydisp_create(); + kdispwin_create(); } } } @@ -251,8 +284,11 @@ framereset(UINT cnt) framecnt = 0; scrnmng_dispclock(); - keydisp_draw((BYTE)cnt); + kdispwin_draw((BYTE)cnt); + skbdwin_process(); + debugwin_process(); toolwin_draw((BYTE)cnt); + viewer_allreload(FALSE); if (np2oscfg.DISPCLK & 3) { if (sysmng_workclockrenewal()) { sysmng_updatecaption(3); @@ -268,18 +304,90 @@ processwait(UINT cnt) timing_setcount(0); framereset(cnt); } else { - usleep(1); + taskmng_sleep(1); + } +} + +int +mainloop(void *p) +{ + + UNUSED(p); + + if (np2oscfg.NOWAIT) { + joymng_sync(); + mousemng_callback(); + pccore_exec(framecnt == 0); + if (np2oscfg.DRAW_SKIP) { + /* nowait frame skip */ + framecnt++; + if (framecnt >= np2oscfg.DRAW_SKIP) { + processwait(0); + } + } else { + /* nowait auto skip */ + framecnt = 1; + if (timing_getcount()) { + processwait(0); + } + } + } else if (np2oscfg.DRAW_SKIP) { + /* frame skip */ + if (framecnt < np2oscfg.DRAW_SKIP) { + joymng_sync(); + mousemng_callback(); + pccore_exec(framecnt == 0); + framecnt++; + } else { + processwait(np2oscfg.DRAW_SKIP); + } + } else { + /* auto skip */ + if (waitcnt == 0) { + UINT cnt; + joymng_sync(); + mousemng_callback(); + pccore_exec(framecnt == 0); + framecnt++; + cnt = timing_getcount(); + if (framecnt > cnt) { + waitcnt = framecnt; + if (framemax > 1) { + framemax--; + } + } else if (framecnt >= framemax) { + if (framemax < 12) { + framemax++; + } + if (cnt >= 12) { + timing_reset(); + } else { + timing_setcount(cnt - framecnt); + } + framereset(0); + } + } else { + processwait(waitcnt); + waitcnt = framecnt; + } } + + return TRUE; } -#if defined(__GNUC__) && (defined(i386) || defined(__i386__)) int mmxflag; int havemmx(void) { +#if !defined(GCC_CPU_ARCH_IA32) + return 0; +#else /* GCC_CPU_ARCH_IA32 */ int rv; +#if defined(GCC_CPU_ARCH_AMD64) + rv = 1; +#else /* !GCC_CPU_ARCH_AMD64 */ asm volatile ( "pushf;" "popl %%eax;" @@ -300,7 +408,7 @@ havemmx(void) "andl $0x00800000, %0;" ".nocpuid:" : "=a" (rv)); - +#endif /* GCC_CPU_ARCH_AMD64 */ return rv; +#endif /* GCC_CPU_ARCH_IA32 */ } -#endif