np2/x11/np2.c - diff

Return to np2.c CVS log

Up to [RetroPC.NET] / np2 / x11

Diff for /np2/x11/np2.c between versions 1.17 and 1.34

version 1.17, 2004/05/25 14:06:10	version 1.34, 2011/01/15 18:43:13
Line 10	Line 10
* 2. Redistributions in binary form must reproduce the above copyright	* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the	* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.	* 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	* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Line 38	Line 36
#include "toolwin.h"	#include "toolwin.h"
#include "viewer.h"	#include "viewer.h"
#include "debugwin.h"	#include "debugwin.h"
	#include "skbdwin.h"

#include "commng.h"	#include "commng.h"
#include "joymng.h"	#include "joymng.h"
Line 68 NP2OSCFG np2oscfg = {	Line 67 NP2OSCFG np2oscfg = {
0, /* F12KEY */	0, /* F12KEY */

0, /* MOUSE_SW */	0, /* MOUSE_SW */

0, /* JOYPAD1 */	0, /* JOYPAD1 */
0, /* JOYPAD2 */	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_MIDI, 0, 0x3e, 19200, "", "", "", "" }, /* mpu */
{	{
Line 86 NP2OSCFG np2oscfg = {	Line 95 NP2OSCFG np2oscfg = {
0, /* statsave */	0, /* statsave */
0, /* toolwin */	0, /* toolwin */
0, /* keydisp */	0, /* keydisp */
	0, /* softkbd */
0, /* hostdrv_write */	0, /* hostdrv_write */
0, /* jastsnd */	0, /* jastsnd */
0, /* I286SAVE */	0, /* I286SAVE */

SNDDRV_NODRV, /* snddrv */	SNDDRV_SDL, /* snddrv */
"", /* audiodev */
{ "", "" }, /* MIDIDEV */	{ "", "" }, /* MIDIDEV */
0, /* MIDIWAIT */	0, /* MIDIWAIT */

MOUSE_RATIO_100, /* mouse_move_ratio */	MOUSE_RATIO_100, /* mouse_move_ratio */

#if defined(USE_GTK) /* toolkit */
"gtk",
#elif defined(USE_QT)
"qt",
#elif defined(USE_SDL)
"sdl",
#else
"unknown",
#endif

MMXFLAG_DISABLE, /* disablemmx */	MMXFLAG_DISABLE, /* disablemmx */
FALSE, /* shared_pixmap */	INTERP_NEAREST, /* drawinterp */
	0, /* F11KEY */

	FALSE, /* cfgreadonly */
};	};

BOOL np2running = FALSE;	volatile sig_atomic_t np2running = 0;
BYTE scrnmode = 0;	BYTE scrnmode = 0;
	int ignore_fullscreen_mode = 0;

UINT framecnt = 0;	UINT framecnt = 0;
UINT waitcnt = 0;	UINT waitcnt = 0;
Line 127 char bmpfilefolder[MAX_PATH];	Line 130 char bmpfilefolder[MAX_PATH];
char modulefile[MAX_PATH];	char modulefile[MAX_PATH];
char statpath[MAX_PATH];	char statpath[MAX_PATH];

	char np2appname[MAX_PATH] = "np2";
	const char np2flagext[] = "s%02d";
	const char np2resumeext[] = "sav";

#ifndef FONTFACE	#ifndef FONTFACE
#define FONTFACE "-misc-fixed-%s-r-normal--%d-------*"	#define FONTFACE "-misc-fixed-%s-r-normal--%d-------*"
#endif	#endif
char fontname[1024] = FONTFACE;	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];	char timidity_cfgfile_path[MAX_PATH];

BOOL use_shared_pixmap;	int verbose = 0;


UINT32	UINT32
Line 157 getstatfilename(char* path, const char*	Line 159 getstatfilename(char* path, const char*

/*	/*
* default:	* default:
* e.g. resume: "/home/user_name/.np2/sav/sav"	* e.g. resume: "/home/user_name/.np2/sav/np2.sav"
* statpath: "/home/user_name/.np2/sav/s00"	* statpath: "/home/user_name/.np2/sav/np2.s00"
	* config: "/home/user_name/.np2/np2rc"
*	*
* --config option:	* --config option:
* e.g. resume: "/config_file_path/sav"	* e.g. resume: "/config_file_path/sav/np2.sav"
* statpath: "/config_file_path/s00"	* statpath: "/config_file_path/sav/np2.s00"
* config: "/config_file_path/config_file_name"	* config: "/config_file_path/config_file_name"
*/	*/
file_cpyname(path, statpath, size);	file_cpyname(path, statpath, size);
	file_catname(path, ".", size);
file_catname(path, ext, size);	file_catname(path, ext, size);
}	}

Line 203 flagload(const char* ext, const char* ti	Line 207 flagload(const char* ext, const char* ti
int ret;	int ret;
int rv = 0;	int rv = 0;

UNUSED(title);

getstatfilename(path, ext, sizeof(path));	getstatfilename(path, ext, sizeof(path));
ret = statsave_check(path, buf, sizeof(buf));	ret = statsave_check(path, buf, sizeof(buf));
if (ret & (~STATFLAG_DISKCHG)) {	if (ret & (~STATFLAG_DISKCHG)) {
fprintf(stderr, "Couldn't restart\n");	toolkit_msgbox(title, "Couldn't restart",
	TK_MB_OK\|TK_MB_ICON_ERROR);
rv = 1;	rv = 1;
} else if ((!force) && (ret & STATFLAG_DISKCHG)) {	} else if ((!force) && (ret & STATFLAG_DISKCHG)) {
fprintf(stderr, "Conflict\n");	ret = toolkit_msgbox(title, "Conflict!\nContinue?",
rv = 1;	TK_MB_YESNO\|TK_MB_ICON_QUESTION);
	if (ret != TK_MB_YES) {
	rv = 1;
	}
}	}
if (rv == 0) {	if (rv == 0) {
statsave_load(path);	statsave_load(path);
Line 279 framereset(UINT cnt)	Line 285 framereset(UINT cnt)
framecnt = 0;	framecnt = 0;
scrnmng_dispclock();	scrnmng_dispclock();
kdispwin_draw((BYTE)cnt);	kdispwin_draw((BYTE)cnt);
	skbdwin_process();
	debugwin_process();
toolwin_draw((BYTE)cnt);	toolwin_draw((BYTE)cnt);
viewer_allreload(FALSE);	viewer_allreload(FALSE);
debugwin_process();
if (np2oscfg.DISPCLK & 3) {	if (np2oscfg.DISPCLK & 3) {
if (sysmng_workclockrenewal()) {	if (sysmng_workclockrenewal()) {
sysmng_updatecaption(3);	sysmng_updatecaption(3);
Line 305 int	Line 312 int
mainloop(void *p)	mainloop(void *p)
{	{

UNUSED(p);

if (np2oscfg.NOWAIT) {	if (np2oscfg.NOWAIT) {
joy_flash();	joymng_sync();
mousemng_callback();	mousemng_callback();
pccore_exec(framecnt == 0);	pccore_exec(framecnt == 0);
if (np2oscfg.DRAW_SKIP) {	if (np2oscfg.DRAW_SKIP) {
Line 327 mainloop(void *p)	Line 332 mainloop(void *p)
} else if (np2oscfg.DRAW_SKIP) {	} else if (np2oscfg.DRAW_SKIP) {
/* frame skip */	/* frame skip */
if (framecnt < np2oscfg.DRAW_SKIP) {	if (framecnt < np2oscfg.DRAW_SKIP) {
joy_flash();	joymng_sync();
mousemng_callback();	mousemng_callback();
pccore_exec(framecnt == 0);	pccore_exec(framecnt == 0);
framecnt++;	framecnt++;
Line 338 mainloop(void *p)	Line 343 mainloop(void *p)
/* auto skip */	/* auto skip */
if (waitcnt == 0) {	if (waitcnt == 0) {
UINT cnt;	UINT cnt;
joy_flash();	joymng_sync();
mousemng_callback();	mousemng_callback();
pccore_exec(framecnt == 0);	pccore_exec(framecnt == 0);
framecnt++;	framecnt++;
Line 368 mainloop(void *p)	Line 373 mainloop(void *p)
return TRUE;	return TRUE;
}	}

#if defined(GCC_CPU_ARCH_IA32)
int mmxflag;	int mmxflag;

int	int
havemmx(void)	havemmx(void)
{	{
	#if !defined(GCC_CPU_ARCH_IA32)
	return 0;
	#else /* GCC_CPU_ARCH_IA32 */
int rv;	int rv;

	#if defined(GCC_CPU_ARCH_AMD64)
	rv = 1;
	#else /* !GCC_CPU_ARCH_AMD64 */
asm volatile (	asm volatile (
"pushf;"	"pushf;"
"popl %%eax;"	"popl %%eax;"
Line 396 havemmx(void)	Line 406 havemmx(void)
"andl $0x00800000, %0;"	"andl $0x00800000, %0;"
".nocpuid:"	".nocpuid:"
: "=a" (rv));	: "=a" (rv));
	#endif /* GCC_CPU_ARCH_AMD64 */
return rv;	return rv;
}
#endif /* GCC_CPU_ARCH_IA32 */	#endif /* GCC_CPU_ARCH_IA32 */
	}

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.17
changed lines
	Added in v.1.34