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.11

version 1.6, 2003/11/26 14:55:01	version 1.11, 2003/12/22 12:25:11
Line 27	Line 27

#include "compiler.h"	#include "compiler.h"

	#include <sys/stat.h>
#include <getopt.h>	#include <getopt.h>
#include <signal.h>	#include <signal.h>

Line 42	Line 43
#include "timing.h"	#include "timing.h"
#include "toolkit.h"	#include "toolkit.h"

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

#include "commng.h"	#include "commng.h"
	#include "fontmng.h"
	#include "inputmng.h"
#include "joymng.h"	#include "joymng.h"
#include "kbdmng.h"	#include "kbdmng.h"
#include "mousemng.h"	#include "mousemng.h"
#include "scrnmng.h"	#include "scrnmng.h"
#include "soundmng.h"	#include "soundmng.h"
#include "sysmng.h"	#include "sysmng.h"
	#include "taskmng.h"


/*	/*
Line 94 sighandler(int signo)	Line 100 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 127 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 158 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 227 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 234 main(int argc, char *argv[])	Line 240 main(int argc, char *argv[])

TRACEINIT();	TRACEINIT();

keystat_reset();	if (fontmng_init() != SUCCESS)
	goto fontmng_failure;

	kdispwin_initialize();
	viewer_init();

toolkit_widget_create();	toolkit_widget_create();
scrnmng_initialize();	scrnmng_initialize();
kbdmng_init();	kbdmng_init();
	inputmng_init();
	keystat_reset();

scrnmode = 0;	scrnmode = 0;
if (np2cfg.RASTER) {	if (np2cfg.RASTER) {
scrnmode \|= SCRNMODE_HIGHCOLOR;	scrnmode \|= SCRNMODE_HIGHCOLOR;
}	}
	if (sysmenu_create() != SUCCESS)
	goto sysmenu_failure;
if (scrnmng_create(scrnmode) != SUCCESS)	if (scrnmng_create(scrnmode) != SUCCESS)
goto resource_cleanup;	goto scrnmng_failure;

if (soundmng_initialize() == SUCCESS) {	if (soundmng_initialize() == SUCCESS) {
result = soundmng_pcmload(SOUND_PCMSEEK, file_getcd("fddseek.wav"));	result = soundmng_pcmload(SOUND_PCMSEEK, file_getcd("fddseek.wav"));
Line 272 main(int argc, char *argv[])	Line 286 main(int argc, char *argv[])

commng_initialize();	commng_initialize();
sysmng_initialize();	sysmng_initialize();
	taskmng_initialize();

joy_init();	joy_init();
pccore_init();	pccore_init();
Line 287 main(int argc, char *argv[])	Line 302 main(int argc, char *argv[])
toolwin_create();	toolwin_create();
}	}
if (np2oscfg.keydisp) {	if (np2oscfg.keydisp) {
keydisp_create();	kdispwin_create();
}	}
}	}

Line 305 main(int argc, char *argv[])	Line 320 main(int argc, char *argv[])
setup_signal(SIGINT, sighandler);	setup_signal(SIGINT, sighandler);
setup_signal(SIGTERM, sighandler);	setup_signal(SIGTERM, sighandler);

np2running = TRUE;
toolkit_widget_mainloop();	toolkit_widget_mainloop();
np2running = FALSE;
rv = 0;	rv = 0;

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

pccore_cfgupdate();	pccore_cfgupdate();
Line 329 main(int argc, char *argv[])	Line 342 main(int argc, char *argv[])
soundmng_deinitialize();	soundmng_deinitialize();
scrnmng_destroy();	scrnmng_destroy();

resource_cleanup:	scrnmng_failure:
	sysmenu_destroy();

	sysmenu_failure:
	fontmng_terminate();

	fontmng_failure:
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.11