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.43 and 1.48

version 1.43, 2004/03/07 07:51:26	version 1.48, 2004/04/07 13:15:40
Line 43	Line 43
#include "timing.h"	#include "timing.h"
#include "keystat.h"	#include "keystat.h"
#include "debugsub.h"	#include "debugsub.h"
#include "keydisp.h"	#include "subwind.h"
#include "kdispwin.h"
#include "viewer.h"	#include "viewer.h"


Line 107 static void winuileave(void) {	Line 106 static void winuileave(void) {

WINLOCEX np2_winlocexallwin(HWND base) {	WINLOCEX np2_winlocexallwin(HWND base) {

HWND list[3];
UINT i;	UINT i;
	UINT cnt;
	HWND list[4];

list[0] = hWndMain;	cnt = 0;
list[1] = toolwin_gethwnd();	list[cnt++] = hWndMain;
list[2] = kdispwin_gethwnd();	list[cnt++] = toolwin_gethwnd();
for (i=0; i<3; i++) {	list[cnt++] = kdispwin_gethwnd();
	list[cnt++] = skbdwin_gethwnd();
	for (i=0; i<cnt; i++) {
if (list[i] == base) {	if (list[i] == base) {
list[i] = NULL;	list[i] = NULL;
}	}
Line 121 WINLOCEX np2_winlocexallwin(HWND base) {	Line 123 WINLOCEX np2_winlocexallwin(HWND base) {
if (base != hWndMain) { // hWndMainのみ全体移動	if (base != hWndMain) { // hWndMainのみ全体移動
base = NULL;	base = NULL;
}	}
return(winlocex_create(base, list, 3));	return(winlocex_create(base, list, cnt));
}	}

static void changescreen(BYTE newmode) {	static void changescreen(BYTE newmode) {
Line 143 static void changescreen(BYTE newmode) {	Line 145 static void changescreen(BYTE newmode) {
if (renewal & SCRNMODE_FULLSCREEN) {	if (renewal & SCRNMODE_FULLSCREEN) {
toolwin_destroy();	toolwin_destroy();
kdispwin_destroy();	kdispwin_destroy();
	skbdwin_destroy();
}	}
else if (renewal & SCRNMODE_ROTATEMASK) {	else if (renewal & SCRNMODE_ROTATEMASK) {
wlex = np2_winlocexallwin(hWndMain);	wlex = np2_winlocexallwin(hWndMain);
Line 320 static void np2popup(HWND hWnd, LPARAM l	Line 323 static void np2popup(HWND hWnd, LPARAM l
DestroyMenu(hMenu);	DestroyMenu(hMenu);
}	}

// extern "C" void iptrace_out(void);

static void np2cmd(HWND hWnd, UINT16 cmd) {	static void np2cmd(HWND hWnd, UINT16 cmd) {

UINT update;	UINT update;
Line 773 static void np2cmd(HWND hWnd, UINT16 cmd	Line 774 static void np2cmd(HWND hWnd, UINT16 cmd
dialog_writebmp(hWnd);	dialog_writebmp(hWnd);
winuileave();	winuileave();
break;	break;
	#if defined(SUPPPORT_S98)
case IDM_S98LOGGING:	case IDM_S98LOGGING:
winuienter();	winuienter();
dialog_s98(hWnd);	dialog_s98(hWnd);
winuileave();	winuileave();
break;	break;
	#endif
	#if defined(SUPPORT_WAVEREC)
	case IDM_WAVEREC:
	winuienter();
	dialog_waverec(hWnd);
	winuileave();
	break;
	#endif
case IDM_DISPCLOCK:	case IDM_DISPCLOCK:
xmenu_setdispclk(np2oscfg.DISPCLK ^ 1);	xmenu_setdispclk(np2oscfg.DISPCLK ^ 1);
update \|= SYS_UPDATECFG;	update \|= SYS_UPDATECFG;
Line 900 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 908 LRESULT CALLBACK WndProc(HWND hWnd, UINT
update \|= SYS_UPDATEOSCFG;	update \|= SYS_UPDATEOSCFG;
break;	break;

	#if defined(SUPPORT_KEYDISP)
case IDM_KEYDISP:	case IDM_KEYDISP:
sysmenu_setkeydisp(np2oscfg.keydisp ^ 1);	sysmenu_setkeydisp(np2oscfg.keydisp ^ 1);
if (np2oscfg.keydisp) {	if (np2oscfg.keydisp) {
Line 909 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 918 LRESULT CALLBACK WndProc(HWND hWnd, UINT
kdispwin_destroy();	kdispwin_destroy();
}	}
break;	break;
	#endif
	#if defined(SUPPORT_SOFTKBD)
	case IDM_SOFTKBD:
	skbdwin_create();
	break;
	#endif

case IDM_SCREENCENTER:	case IDM_SCREENCENTER:
if ((!scrnmng_isfullscreen()) &&	if ((!scrnmng_isfullscreen()) &&
Line 972 LRESULT CALLBACK WndProc(HWND hWnd, UINT	Line 987 LRESULT CALLBACK WndProc(HWND hWnd, UINT
if (subwin) {	if (subwin) {
ShowWindow(subwin, SW_SHOWNOACTIVATE);	ShowWindow(subwin, SW_SHOWNOACTIVATE);
}	}
	subwin = skbdwin_gethwnd();
	if (subwin) {
	ShowWindow(subwin, SW_SHOWNOACTIVATE);
	}
return(DefWindowProc(hWnd, msg, wParam, lParam));	return(DefWindowProc(hWnd, msg, wParam, lParam));

default:	default:
Line 1299 static void framereset(UINT cnt) {	Line 1318 static void framereset(UINT cnt) {
framecnt = 0;	framecnt = 0;
scrnmng_dispclock();	scrnmng_dispclock();
kdispwin_draw((BYTE)cnt);	kdispwin_draw((BYTE)cnt);
	skbdwin_process();
toolwin_draw((BYTE)cnt);	toolwin_draw((BYTE)cnt);
viewer_allreload(FALSE);	viewer_allreload(FALSE);
if (np2oscfg.DISPCLK & 3) {	if (np2oscfg.DISPCLK & 3) {
Line 1340 int WINAPI WinMain(HINSTANCE hInstance,	Line 1360 int WINAPI WinMain(HINSTANCE hInstance,
initload();	initload();
toolwin_readini();	toolwin_readini();
kdispwin_readini();	kdispwin_readini();
	skbdwin_readini();

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

Line 1391 int WINAPI WinMain(HINSTANCE hInstance,	Line 1412 int WINAPI WinMain(HINSTANCE hInstance,
}	}
toolwin_initapp(hInstance);	toolwin_initapp(hInstance);
kdispwin_initialize(hPreInst);	kdispwin_initialize(hPreInst);
	skbdwin_initialize(hPreInst);
viewer_init(hPreInst);	viewer_init(hPreInst);

mousemng_initialize();	mousemng_initialize();
Line 1633 int WINAPI WinMain(HINSTANCE hInstance,	Line 1655 int WINAPI WinMain(HINSTANCE hInstance,
}	}
toolwin_destroy();	toolwin_destroy();
kdispwin_destroy();	kdispwin_destroy();
	skbdwin_destroy();

pccore_cfgupdate();	pccore_cfgupdate();

Line 1662 int WINAPI WinMain(HINSTANCE hInstance,	Line 1685 int WINAPI WinMain(HINSTANCE hInstance,
initsave();	initsave();
toolwin_writeini();	toolwin_writeini();
kdispwin_writeini();	kdispwin_writeini();
	skbdwin_writeini();
}	}
	skbdwin_deinitialize();

TRACETERM();	TRACETERM();
_MEM_USED("report.txt");	_MEM_USED("report.txt");

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

Removed from v.1.43
changed lines
	Added in v.1.48