np2/x11/main.c - diff

Return to main.c CVS log

Up to [RetroPC.NET] / np2 / x11

Diff for /np2/x11/main.c between versions 1.6 and 1.9

version 1.6, 2003/11/26 14:55:01	version 1.9, 2003/12/11 15:13:17
Line 42	Line 42
#include "timing.h"	#include "timing.h"
#include "toolkit.h"	#include "toolkit.h"

#include "keydisp.h"	#include "kdispwin.h"
#include "toolwin.h"	#include "toolwin.h"
	#include "viewer.h"

#include "commng.h"	#include "commng.h"
#include "joymng.h"	#include "joymng.h"
Line 94 sighandler(int signo)	Line 95 sighandler(int signo)
static struct option longopts[] = {	static struct option longopts[] = {
{ "config", required_argument, 0, 'c' },	{ "config", required_argument, 0, 'c' },
{ "timidity-config", required_argument, 0, 'C' },	{ "timidity-config", required_argument, 0, 'C' },
{ "no-shared-pixmap", no_argument, 0, 'p' },	{ "shared-pixmap", no_argument, 0, 'p' },
{ "help", no_argument, 0, 'h' },	{ "help", no_argument, 0, 'h' },
{ 0, 0, 0, 0 },	{ 0, 0, 0, 0 },
};	};
Line 121 main(int argc, char *argv[])	Line 122 main(int argc, char *argv[])
int rv = 1;	int rv = 1;
int ch;	int ch;
int i, drvmax;	int i, drvmax;
BOOL shared_pixmap_flag = TRUE;	BOOL shared_pixmap_flag = FALSE;

progname = argv[0];	progname = argv[0];

Line 152 main(int argc, char *argv[])	Line 153 main(int argc, char *argv[])
break;	break;

case 'p':	case 'p':
shared_pixmap_flag = FALSE;	shared_pixmap_flag = TRUE;
break;	break;

case 'h':	case 'h':
Line 221 main(int argc, char *argv[])	Line 222 main(int argc, char *argv[])
file_setcd(modulefile);	file_setcd(modulefile);
initload();	initload();
toolwin_readini();	toolwin_readini();
keydisp_readini();	kdispwin_readini();

rand_setseed((SINT32)time(NULL));	rand_setseed((SINT32)time(NULL));

Line 236 main(int argc, char *argv[])	Line 237 main(int argc, char *argv[])

keystat_reset();	keystat_reset();

	kdispwin_initialize();
	viewer_init();

toolkit_widget_create();	toolkit_widget_create();
scrnmng_initialize();	scrnmng_initialize();
kbdmng_init();	kbdmng_init();
Line 287 main(int argc, char *argv[])	Line 291 main(int argc, char *argv[])
toolwin_create();	toolwin_create();
}	}
if (np2oscfg.keydisp) {	if (np2oscfg.keydisp) {
keydisp_create();	kdispwin_create();
}	}
}	}

Line 310 main(int argc, char *argv[])	Line 314 main(int argc, char *argv[])
np2running = FALSE;	np2running = FALSE;
rv = 0;	rv = 0;

keydisp_destroy();	kdispwin_destroy();
toolwin_destroy();	toolwin_destroy();

pccore_cfgupdate();	pccore_cfgupdate();
Line 333 resource_cleanup:	Line 337 resource_cleanup:
if (sys_updates & (SYS_UPDATECFG\|SYS_UPDATEOSCFG)) {	if (sys_updates & (SYS_UPDATECFG\|SYS_UPDATEOSCFG)) {
initsave();	initsave();
toolwin_writeini();	toolwin_writeini();
keydisp_writeini();	kdispwin_writeini();
}	}

TRACETERM();	TRACETERM();
dosio_term();	dosio_term();

	viewer_term();
toolkit_terminate();	toolkit_terminate();

return rv;	return rv;

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

Removed from v.1.6
changed lines
	Added in v.1.9