np2/win9x/np2.cpp - diff

Return to np2.cpp CVS log

Up to [RetroPC.NET] / np2 / win9x

Diff for /np2/win9x/np2.cpp between versions 1.29 and 1.31

version 1.29, 2003/11/14 07:37:29	version 1.31, 2003/11/21 06:51:14
Line 46	Line 46
#include "statsave.h"	#include "statsave.h"
#include "debugsub.h"	#include "debugsub.h"
#include "keydisp.h"	#include "keydisp.h"
	#include "kdispwin.h"
#include "viewer.h"	#include "viewer.h"


Line 92 static WINLOCEX smwlex;	Line 93 static WINLOCEX smwlex;

static const char np2help[] = "np2.chm";	static const char np2help[] = "np2.chm";
static const char np2flagext[] = "S%02d";	static const char np2flagext[] = "S%02d";
static const char np2resumeext[] = "sav";



static void winuienter(void) {	static void winuienter(void) {
Line 117 WINLOCEX np2_winlocexallwin(HWND base) {	Line 116 WINLOCEX np2_winlocexallwin(HWND base) {

list[0] = hWndMain;	list[0] = hWndMain;
list[1] = toolwin_gethwnd();	list[1] = toolwin_gethwnd();
list[2] = keydisp_gethwnd();	list[2] = kdispwin_gethwnd();
for (i=0; i<3; i++) {	for (i=0; i<3; i++) {
if (list[i] == base) {	if (list[i] == base) {
list[i] = NULL;	list[i] = NULL;
Line 147 static void changescreen(BYTE newmode) {	Line 146 static void changescreen(BYTE newmode) {
if (renewal) {	if (renewal) {
if (renewal & SCRNMODE_FULLSCREEN) {	if (renewal & SCRNMODE_FULLSCREEN) {
toolwin_destroy();	toolwin_destroy();
keydisp_destroy();	kdispwin_destroy();
}	}
else if (renewal & SCRNMODE_ROTATEMASK) {	else if (renewal & SCRNMODE_ROTATEMASK) {
wlex = np2_winlocexallwin(hWndMain);	wlex = np2_winlocexallwin(hWndMain);
Line 172 static void changescreen(BYTE newmode) {	Line 171 static void changescreen(BYTE newmode) {
toolwin_create();	toolwin_create();
}	}
if (np2oscfg.keydisp) {	if (np2oscfg.keydisp) {
keydisp_create();	kdispwin_create();
}	}
}	}
}	}
Line 357 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 356 LRESULT CALLBACK WndProc(HWND hWnd, UINT
case IDM_KEYDISP:	case IDM_KEYDISP:
sysmenu_setkeydisp(np2oscfg.keydisp ^ 1);	sysmenu_setkeydisp(np2oscfg.keydisp ^ 1);
if (np2oscfg.keydisp) {	if (np2oscfg.keydisp) {
keydisp_create();	kdispwin_create();
}	}
else {	else {
keydisp_destroy();	kdispwin_destroy();
}	}
break;	break;

Line 422 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 421 LRESULT CALLBACK WndProc(HWND hWnd, UINT
if (subwin) {	if (subwin) {
ShowWindow(subwin, SW_SHOWNOACTIVATE);	ShowWindow(subwin, SW_SHOWNOACTIVATE);
}	}
subwin = keydisp_gethwnd();	subwin = kdispwin_gethwnd();
if (subwin) {	if (subwin) {
ShowWindow(subwin, SW_SHOWNOACTIVATE);	ShowWindow(subwin, SW_SHOWNOACTIVATE);
}	}
Line 603 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 602 LRESULT CALLBACK WndProc(HWND hWnd, UINT
case IDM_KEY:	case IDM_KEY:
xmenu_setkey(0);	xmenu_setkey(0);
keystat_resetjoykey();	keystat_resetjoykey();
	update \|= SYS_UPDATECFG;
break;	break;

case IDM_JOY1:	case IDM_JOY1:
xmenu_setkey(1);	xmenu_setkey(1);
keystat_resetjoykey();	keystat_resetjoykey();
	update \|= SYS_UPDATECFG;
break;	break;

case IDM_JOY2:	case IDM_JOY2:
xmenu_setkey(2);	xmenu_setkey(2);
keystat_resetjoykey();	keystat_resetjoykey();
	update \|= SYS_UPDATECFG;
break;	break;

case IDM_XSHIFT:	case IDM_XSHIFT:
xmenu_setxshift(np2cfg.XSHIFT ^ 1);	xmenu_setxshift(np2cfg.XSHIFT ^ 1);
keystat_forcerelease(0x70);	keystat_forcerelease(0x70);
	update \|= SYS_UPDATECFG;
break;	break;

case IDM_XCTRL:	case IDM_XCTRL:
xmenu_setxshift(np2cfg.XSHIFT ^ 2);	xmenu_setxshift(np2cfg.XSHIFT ^ 2);
keystat_forcerelease(0x74);	keystat_forcerelease(0x74);
	update \|= SYS_UPDATECFG;
break;	break;

case IDM_XGRPH:	case IDM_XGRPH:
xmenu_setxshift(np2cfg.XSHIFT ^ 4);	xmenu_setxshift(np2cfg.XSHIFT ^ 4);
keystat_forcerelease(0x73);	keystat_forcerelease(0x73);
	update \|= SYS_UPDATECFG;
break;	break;

case IDM_F12MOUSE:	case IDM_F12MOUSE:
xmenu_setf12copy(0);	xmenu_setf12copy(0);
winkbd_resetf12();	winkbd_resetf12();
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATEOSCFG;
break;	break;

case IDM_F12COPY:	case IDM_F12COPY:
xmenu_setf12copy(1);	xmenu_setf12copy(1);
winkbd_resetf12();	winkbd_resetf12();
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATEOSCFG;
break;	break;

case IDM_F12STOP:	case IDM_F12STOP:
xmenu_setf12copy(2);	xmenu_setf12copy(2);
winkbd_resetf12();	winkbd_resetf12();
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATEOSCFG;
break;	break;

case IDM_F12EQU:	case IDM_F12EQU:
xmenu_setf12copy(3);	xmenu_setf12copy(3);
winkbd_resetf12();	winkbd_resetf12();
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATEOSCFG;
break;	break;

case IDM_F12COMMA:	case IDM_F12COMMA:
xmenu_setf12copy(4);	xmenu_setf12copy(4);
winkbd_resetf12();	winkbd_resetf12();
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATEOSCFG;
break;	break;

case IDM_BEEPOFF:	case IDM_BEEPOFF:
Line 715 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 720 LRESULT CALLBACK WndProc(HWND hWnd, UINT
break;	break;

case IDM_PC9801_118:	case IDM_PC9801_118:
xmenu_setsound(8);	xmenu_setsound(0x08);
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATECFG;
break;	break;

Line 1128 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 1133 LRESULT CALLBACK WndProc(HWND hWnd, UINT
winuileave();	winuileave();
}	}
if (b) {	if (b) {
keydisp_destroy();
viewer_allclose();	viewer_allclose();
DestroyWindow(hWnd);	DestroyWindow(hWnd);
}	}
Line 1203 static void framereset(UINT cnt) {	Line 1207 static void framereset(UINT cnt) {

framecnt = 0;	framecnt = 0;
scrnmng_dispclock();	scrnmng_dispclock();
keydisp_draw((BYTE)cnt);	kdispwin_draw((BYTE)cnt);
toolwin_draw((BYTE)cnt);	toolwin_draw((BYTE)cnt);
viewer_allreload(FALSE);	viewer_allreload(FALSE);
if (np2oscfg.DISPCLK & 3) {	if (np2oscfg.DISPCLK & 3) {
Line 1244 int WINAPI WinMain(HINSTANCE hInstance,	Line 1248 int WINAPI WinMain(HINSTANCE hInstance,
np2arg_analize(lpszCmdLine);	np2arg_analize(lpszCmdLine);
initload();	initload();
toolwin_readini();	toolwin_readini();
keydisp_readini();	kdispwin_readini();

rand_setseed((unsigned)time(NULL));	rand_setseed((unsigned)time(NULL));

Line 1295 int WINAPI WinMain(HINSTANCE hInstance,	Line 1299 int WINAPI WinMain(HINSTANCE hInstance,
}	}
}	}
toolwin_initapp(hInstance);	toolwin_initapp(hInstance);
keydisp_initialize(hPreInst);	kdispwin_initialize(hPreInst);
viewer_init(hPreInst); // ver0.30	viewer_init(hPreInst); // ver0.30

hWndMain = CreateWindow(szClassName, np2oscfg.titles,	hWndMain = CreateWindow(szClassName, np2oscfg.titles,
Line 1423 int WINAPI WinMain(HINSTANCE hInstance,	Line 1427 int WINAPI WinMain(HINSTANCE hInstance,
toolwin_create();	toolwin_create();
}	}
if (np2oscfg.keydisp) {	if (np2oscfg.keydisp) {
keydisp_create();	kdispwin_create();
}	}
}	}

Line 1433 int WINAPI WinMain(HINSTANCE hInstance,	Line 1437 int WINAPI WinMain(HINSTANCE hInstance,
if (np2oscfg.resume) {	if (np2oscfg.resume) {
int id;	int id;

id = flagload(np2resumeext, "Resume", FALSE);	id = flagload(str_sav, str_resume, FALSE);
if (id == IDYES) {	if (id == IDYES) {
for (i=0; i<4; i++) np2arg.disk[i] = NULL;	for (i=0; i<4; i++) np2arg.disk[i] = NULL;
}	}
Line 1549 int WINAPI WinMain(HINSTANCE hInstance,	Line 1553 int WINAPI WinMain(HINSTANCE hInstance,
}	}
}	}
toolwin_destroy();	toolwin_destroy();
	kdispwin_destroy();

pccore_cfgupdate();	pccore_cfgupdate();

Line 1556 int WINAPI WinMain(HINSTANCE hInstance,	Line 1561 int WINAPI WinMain(HINSTANCE hInstance,
S98_trash();	S98_trash();

if (np2oscfg.resume) {	if (np2oscfg.resume) {
flagsave(np2resumeext);	flagsave(str_sav);
}	}
else {	else {
flagdelete(np2resumeext);	flagdelete(str_sav);
}	}

#ifdef USE_ROMEO	#ifdef USE_ROMEO
Line 1579 int WINAPI WinMain(HINSTANCE hInstance,	Line 1584 int WINAPI WinMain(HINSTANCE hInstance,
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();

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

Removed from v.1.29
changed lines
	Added in v.1.31