--- np2/win9x/subwind.cpp	2004/04/08 13:08:22	1.7
+++ np2/win9x/subwind.cpp	2007/11/11 07:11:27	1.15
@@ -20,7 +20,7 @@ static void wintypechange(HWND hWnd, UIN
 
 	WINLOCEX	wlex;
 
-	wlex = np2_winlocexallwin(hWndMain);
+	wlex = np2_winlocexallwin(g_hWndMain);
 	winlocex_setholdwnd(wlex, hWnd);
 	np2class_windowtype(hWnd, type);
 	winlocex_move(wlex);
@@ -49,28 +49,33 @@ typedef struct {
 typedef struct {
 	int		posx;
 	int		posy;
-	BYTE	mode;
-	BYTE	type;
+	UINT8	mode;
+	UINT8	type;
 } KDISPCFG;
 
 static	KDISPWIN	kdispwin;
 static	KDISPCFG	kdispcfg;
 
-static const char kdispapp[] = "Key Display";
-static const char kdispclass[] = "NP2-KeyDispWin";
-static const char str_kdclose[] = "&Close";
+static const TCHAR kdisptitle[] = _T("Key Display");
+static const TCHAR kdispclass[] = _T("NP2-KeyDispWin");
+static const TCHAR str_kdclose[] = _T("&Close");
 
 static const UINT32 kdisppal[KEYDISP_PALS] =
 									{0x00000000, 0xffffffff, 0xf9ff0000};
 
-static const INITBL kdispini[] = {
-	{"WindposX", INITYPE_SINT32,	&kdispcfg.posx,			0},
-	{"WindposY", INITYPE_SINT32,	&kdispcfg.posy,			0},
-	{"keydmode", INITYPE_UINT8,		&kdispcfg.mode,			0},
-	{"windtype", INITYPE_BOOL,		&kdispcfg.type,			0}};
+#if defined(OSLANG_UTF8)
+static const OEMCHAR kdispapp[] = OEMTEXT("Key Display");
+#else
+#define	kdispapp	kdisptitle
+#endif
+static const PFTBL kdispini[] = {
+				PFVAL("WindposX", PFTYPE_SINT32,	&kdispcfg.posx),
+				PFVAL("WindposY", PFTYPE_SINT32,	&kdispcfg.posy),
+				PFVAL("keydmode", PFTYPE_UINT8,		&kdispcfg.mode),
+				PFVAL("windtype", PFTYPE_BOOL,		&kdispcfg.type)};
 
 
-static BYTE kdgetpal8(CMNPALFN *self, UINT num) {
+static UINT8 kdgetpal8(CMNPALFN *self, UINT num) {
 
 	if (num < KEYDISP_PALS) {
 		return(kdisppal[num] >> 24);
@@ -119,7 +124,7 @@ static void kdsetwinsize(void) {
 	int			height;
 	WINLOCEX	wlex;
 
-	wlex = np2_winlocexallwin(hWndMain);
+	wlex = np2_winlocexallwin(g_hWndMain);
 	winlocex_setholdwnd(wlex, kdispwin.hwnd);
 	keydisp_getsize(&width, &height);
 	winloc_setclientsize(kdispwin.hwnd, width, height);
@@ -127,7 +132,7 @@ static void kdsetwinsize(void) {
 	winlocex_destroy(wlex);
 }
 
-static void kdsetdispmode(BYTE mode) {
+static void kdsetdispmode(UINT8 mode) {
 
 	HMENU	hmenu;
 
@@ -221,7 +226,7 @@ static LRESULT CALLBACK kdproc(HWND hWnd
 
 		case WM_KEYDOWN:
 		case WM_KEYUP:
-			SendMessage(hWndMain, msg, wp, lp);
+			SendMessage(g_hWndMain, msg, wp, lp);
 			break;
 
 		case WM_ENTERMENULOOP:
@@ -278,46 +283,44 @@ static LRESULT CALLBACK kdproc(HWND hWnd
 	return(0L);
 }
 
-BOOL kdispwin_initialize(HINSTANCE hPreInst) {
+BOOL kdispwin_initialize(HINSTANCE hInstance) {
 
 	WNDCLASS	wc;
 
-	if (!hPreInst) {
-		ZeroMemory(&wc, sizeof(wc));
-		wc.style = CS_BYTEALIGNCLIENT | CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
-		wc.lpfnWndProc = kdproc;
-		wc.cbClsExtra = 0;
-		wc.cbWndExtra = NP2GWL_SIZE;
-		wc.hInstance = hInst;
-		wc.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ICON2));
-		wc.hCursor = LoadCursor(NULL, IDC_ARROW);
-		wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH);
-		wc.lpszMenuName = MAKEINTRESOURCE(IDR_KEYDISP);
-		wc.lpszClassName = kdispclass;
-		if (!RegisterClass(&wc)) {
-			return(FAILURE);
-		}
+	ZeroMemory(&wc, sizeof(wc));
+	wc.style = CS_BYTEALIGNCLIENT | CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
+	wc.lpfnWndProc = kdproc;
+	wc.cbClsExtra = 0;
+	wc.cbWndExtra = NP2GWLP_SIZE;
+	wc.hInstance = hInstance;
+	wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON2));
+	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+	wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH);
+	wc.lpszMenuName = MAKEINTRESOURCE(IDR_KEYDISP);
+	wc.lpszClassName = kdispclass;
+	if (!RegisterClass(&wc)) {
+		return(FAILURE);
 	}
 	keydisp_initialize();
 	return(SUCCESS);
 }
 
-void kdispwin_create(void) {
+void kdispwin_create(HINSTANCE hInstance) {
 
 	HWND		hwnd;
-	BYTE		mode;
+	UINT8		mode;
 	CMNPALFN	palfn;
 
 	if (kdispwin.hwnd != NULL) {
 		return;
 	}
 	ZeroMemory(&kdispwin, sizeof(kdispwin));
-	hwnd = CreateWindow(kdispclass, kdispapp,
+	hwnd = CreateWindow(kdispclass, kdisptitle,
 						WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION |
 						WS_MINIMIZEBOX,
 						kdispcfg.posx, kdispcfg.posy,
-						CW_USEDEFAULT, CW_USEDEFAULT,
-						NULL, NULL, hInst, NULL);
+						KEYDISP_WIDTH, KEYDISP_HEIGHT,
+						NULL, NULL, hInstance, NULL);
 	kdispwin.hwnd = hwnd;
 	if (hwnd == NULL) {
 		goto kdcre_err1;
@@ -345,7 +348,7 @@ void kdispwin_create(void) {
 	palfn.userdata = (long)kdispwin.dd2hdl;
 	keydisp_setpal(&palfn);
 	kdispwin_draw(0);
-	SetForegroundWindow(hWndMain);
+	SetForegroundWindow(g_hWndMain);
 	return;
 
 kdcre_err2:
@@ -368,9 +371,9 @@ HWND kdispwin_gethwnd(void) {
 	return(kdispwin.hwnd);
 }
 
-void kdispwin_draw(BYTE cnt) {
+void kdispwin_draw(UINT8 cnt) {
 
-	BYTE	flag;
+	UINT8	flag;
 
 	if (kdispwin.hwnd) {
 		if (!cnt) {
@@ -386,21 +389,21 @@ void kdispwin_draw(BYTE cnt) {
 
 void kdispwin_readini(void) {
 
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 
 	ZeroMemory(&kdispcfg, sizeof(kdispcfg));
 	kdispcfg.posx = CW_USEDEFAULT;
 	kdispcfg.posy = CW_USEDEFAULT;
-	initgetfile(path, sizeof(path));
-	ini_read(path, kdispapp, kdispini, sizeof(kdispini)/sizeof(INITBL));
+	initgetfile(path, NELEMENTS(path));
+	ini_read(path, kdispapp, kdispini, NELEMENTS(kdispini));
 }
 
 void kdispwin_writeini(void) {
 
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 
-	initgetfile(path, sizeof(path));
-	ini_write(path, kdispapp, kdispini, sizeof(kdispini)/sizeof(INITBL));
+	initgetfile(path, NELEMENTS(path));
+	ini_write(path, kdispapp, kdispini, NELEMENTS(kdispini));
 }
 #endif
 
@@ -426,12 +429,18 @@ typedef struct {
 static	MDBGWIN		mdbgwin;
 static	MDBGCFG		mdbgcfg;
 
-static const char mdbgapp[] = "Memory Map";
-static const char mdbgclass[] = "NP2-MemDbgWin";
-static const INITBL mdbgini[] = {
-	{"WindposX", INITYPE_SINT32,	&mdbgcfg.posx,			0},
-	{"WindposY", INITYPE_SINT32,	&mdbgcfg.posy,			0},
-	{"windtype", INITYPE_BOOL,		&mdbgcfg.type,			0}};
+static const TCHAR mdbgtitle[] = _T("Memory Map");
+static const TCHAR mdbgclass[] = _T("NP2-MemDbgWin");
+
+#if defined(OSLANG_UTF8)
+static const OEMCHAR mdbgapp[] = OEMTEXT("Memory Map");
+#else
+#define	mdbgapp		mdbgtitle
+#endif
+static const PFTBL mdbgini[] = {
+				PFVAL("WindposX", PFTYPE_SINT32,	&mdbgcfg.posx),
+				PFVAL("WindposY", PFTYPE_SINT32,	&mdbgcfg.posy),
+				PFVAL("windtype", PFTYPE_BOOL,		&mdbgcfg.type)};
 
 
 static void mdpalcnv(CMNPAL *dst, const RGB32 *src, UINT pals, UINT bpp) {
@@ -439,11 +448,25 @@ static void mdpalcnv(CMNPAL *dst, const 
 	UINT	i;
 
 	switch(bpp) {
+#if defined(SUPPORT_16BPP)
+		case 16:
+			for (i=0; i<pals; i++) {
+				dst[i].pal16 = dd2_get16pal(mdbgwin.dd2hdl, src[i]);
+			}
+			break;
+#endif
+#if defined(SUPPORT_24BPP)
+		case 24:
+#endif
+#if defined(SUPPORT_32BPP)
 		case 32:
+#endif
+#if defined(SUPPORT_24BPP) || defined(SUPPORT_32BPP)
 			for (i=0; i<pals; i++) {
 				dst[i].pal32.d = src[i].d;
 			}
 			break;
+#endif
 	}
 }
 
@@ -497,9 +520,21 @@ static LRESULT CALLBACK mdproc(HWND hWnd
 			mdpaintmsg(hWnd);
 			break;
 
+		case WM_LBUTTONDOWN:
+			if (mdbgcfg.type & 1) {
+				return(SendMessage(hWnd, WM_NCLBUTTONDOWN, HTCAPTION, 0L));
+			}
+			break;
+
+		case WM_LBUTTONDBLCLK:
+			mdbgcfg.type ^= 1;
+			wintypechange(hWnd, (mdbgcfg.type & 1) + 1);
+			sysmng_update(SYS_UPDATEOSCFG);
+			break;
+
 		case WM_KEYDOWN:
 		case WM_KEYUP:
-			SendMessage(hWndMain, msg, wp, lp);
+			SendMessage(g_hWndMain, msg, wp, lp);
 			break;
 
 		case WM_ENTERMENULOOP:
@@ -553,16 +588,16 @@ static LRESULT CALLBACK mdproc(HWND hWnd
 	return(0);
 }
 
-BOOL memdbg_initialize(HINSTANCE hInstance) {
+BOOL mdbgwin_initialize(HINSTANCE hInstance) {
 
 	WNDCLASS	wc;
 
-	wc.style = CS_BYTEALIGNCLIENT | CS_HREDRAW | CS_VREDRAW;
+	wc.style = CS_BYTEALIGNCLIENT | CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
 	wc.lpfnWndProc = mdproc;
 	wc.cbClsExtra = 0;
 	wc.cbWndExtra = 0;
 	wc.hInstance = hInstance;
-	wc.hIcon = NULL;
+	wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON2));
 	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
 	wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH);
 	wc.lpszMenuName = NULL;
@@ -574,33 +609,33 @@ BOOL memdbg_initialize(HINSTANCE hInstan
 	return(SUCCESS);
 }
 
-void memdbg_create(void) {
+void mdbgwin_create(HINSTANCE hInstance) {
 
-	HWND	hwnd;
+	HWND	hWnd;
 
 	if (mdbgwin.hwnd != NULL) {
 		return;
 	}
 	ZeroMemory(&mdbgwin, sizeof(mdbgwin));
 	memdbg32_getsize(&mdbgwin.width, &mdbgwin.height);
-	hwnd = CreateWindow(mdbgclass, mdbgapp,
+	hWnd = CreateWindow(mdbgclass, mdbgtitle,
 						WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION |
 						WS_MINIMIZEBOX,
 						mdbgcfg.posx, mdbgcfg.posy,
 						mdbgwin.width, mdbgwin.height,
-						NULL, NULL, hInst, NULL);
-	mdbgwin.hwnd = hwnd;
-	if (hwnd == NULL) {
+						NULL, NULL, hInstance, NULL);
+	mdbgwin.hwnd = hWnd;
+	if (hWnd == NULL) {
 		goto mdcre_err1;
 	}
-	ShowWindow(hwnd, SW_SHOWNOACTIVATE);
-	UpdateWindow(hwnd);
+	ShowWindow(hWnd, SW_SHOWNOACTIVATE);
+	UpdateWindow(hWnd);
 	mdbgwin.dd2hdl = dd2_create(hwnd, mdbgwin.width, mdbgwin.height);
 	if (mdbgwin.dd2hdl == NULL) {
 		goto mdcre_err2;
 	}
-	InvalidateRect(hwnd, NULL, TRUE);
-	SetForegroundWindow(hWndMain);
+	InvalidateRect(hWnd, NULL, TRUE);
+	SetForegroundWindow(g_hWndMain);
 	return;
 
 mdcre_err2:
@@ -610,41 +645,41 @@ mdcre_err1:
 	return;
 }
 
-void memdbg_destroy(void) {
+void mdbgwin_destroy(void) {
 
 	if (mdbgwin.hwnd) {
 		DestroyWindow(mdbgwin.hwnd);
 	}
 }
 
-void memdbg_process(void) {
+void mdbgwin_process(void) {
 
 	if ((mdbgwin.hwnd) && (memdbg32_process())) {
 		mddrawwin(mdbgwin.hwnd, FALSE);
 	}
 }
 
-HWND memdbg_gethwnd(void) {
+HWND mdbgwin_gethwnd(void) {
 
 	return(mdbgwin.hwnd);
 }
 
-void memdbg_readini(void) {
+void mdbgwin_readini(void) {
 
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 
 	mdbgcfg.posx = CW_USEDEFAULT;
 	mdbgcfg.posy = CW_USEDEFAULT;
-	initgetfile(path, sizeof(path));
-	ini_read(path, mdbgapp, mdbgini, sizeof(mdbgini)/sizeof(INITBL));
+	initgetfile(path, NELEMENTS(path));
+	ini_read(path, mdbgapp, mdbgini, NELEMENTS(mdbgini));
 }
 
-void memdbg_writeini(void) {
+void mdbgwin_writeini(void) {
 
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 
-	initgetfile(path, sizeof(path));
-	ini_write(path, mdbgapp, mdbgini, sizeof(mdbgini)/sizeof(INITBL));
+	initgetfile(path, NELEMENTS(path));
+	ini_write(path, mdbgapp, mdbgini, NELEMENTS(mdbgini));
 }
 #endif
 
@@ -669,22 +704,24 @@ typedef struct {
 static	SKBDWIN		skbdwin;
 static	SKBDCFG		skbdcfg;
 
-static const char skbdapp[] = "Soft Keyboard";
-static const char skbdclass[] = "NP2-SoftKBDWin";
-static const INITBL skbdini[] = {
-	{"WindposX", INITYPE_SINT32,	&skbdcfg.posx,			0},
-	{"WindposY", INITYPE_SINT32,	&skbdcfg.posy,			0},
-	{"windtype", INITYPE_BOOL,		&skbdcfg.type,			0}};
+static const TCHAR skbdtitle[] = _T("Soft Keyboard");
+static const TCHAR skbdclass[] = _T("NP2-SoftKBDWin");
+
+#if defined(OSLANG_UTF8)
+static const OEMCHAR skbdapp[] = OEMTEXT("Soft Keyboard");
+#else
+#define	skbdapp		skbdtitle
+#endif
+static const PFTBL skbdini[] = {
+				PFVAL("WindposX", PFTYPE_SINT32,	&skbdcfg.posx),
+				PFVAL("WindposY", PFTYPE_SINT32,	&skbdcfg.posy),
+				PFVAL("windtype", PFTYPE_BOOL,		&skbdcfg.type)};
 
 static void skpalcnv(CMNPAL *dst, const RGB32 *src, UINT pals, UINT bpp) {
 
 	UINT	i;
 
 	switch(bpp) {
-#if defined(SUPPORT_8BPP)
-		case 8:
-			break;
-#endif
 #if defined(SUPPORT_16BPP)
 		case 16:
 			for (i=0; i<pals; i++) {
@@ -770,7 +807,7 @@ static LRESULT CALLBACK skproc(HWND hWnd
 
 		case WM_KEYDOWN:
 		case WM_KEYUP:
-			SendMessage(hWndMain, msg, wp, lp);
+			SendMessage(g_hWndMain, msg, wp, lp);
 			break;
 
 		case WM_ENTERMENULOOP:
@@ -824,25 +861,23 @@ static LRESULT CALLBACK skproc(HWND hWnd
 	return(0L);
 }
 
-BOOL skbdwin_initialize(HINSTANCE hPreInst) {
+BOOL skbdwin_initialize(HINSTANCE hInstance) {
 
 	WNDCLASS	wc;
 
-	if (!hPreInst) {
-		ZeroMemory(&wc, sizeof(wc));
-		wc.style = CS_BYTEALIGNCLIENT | CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
-		wc.lpfnWndProc = skproc;
-		wc.cbClsExtra = 0;
-		wc.cbWndExtra = NP2GWL_SIZE;
-		wc.hInstance = hInst;
-		wc.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ICON2));
-		wc.hCursor = LoadCursor(NULL, IDC_ARROW);
-		wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH);
-		wc.lpszMenuName = NULL;
-		wc.lpszClassName = skbdclass;
-		if (!RegisterClass(&wc)) {
-			return(FAILURE);
-		}
+	ZeroMemory(&wc, sizeof(wc));
+	wc.style = CS_BYTEALIGNCLIENT | CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
+	wc.lpfnWndProc = skproc;
+	wc.cbClsExtra = 0;
+	wc.cbWndExtra = NP2GWLP_SIZE;
+	wc.hInstance = hInstance;
+	wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON2));
+	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+	wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH);
+	wc.lpszMenuName = NULL;
+	wc.lpszClassName = skbdclass;
+	if (!RegisterClass(&wc)) {
+		return(FAILURE);
 	}
 	softkbd_initialize();
 	return(SUCCESS);
@@ -853,7 +888,7 @@ void skbdwin_deinitialize(void) {
 	softkbd_deinitialize();
 }
 
-void skbdwin_create(void) {
+void skbdwin_create(HINSTANCE hInstance) {
 
 	HWND	hwnd;
 
@@ -864,12 +899,12 @@ void skbdwin_create(void) {
 	if (softkbd_getsize(&skbdwin.width, &skbdwin.height) != SUCCESS) {
 		return;
 	}
-	hwnd = CreateWindow(skbdclass, skbdapp,
+	hwnd = CreateWindow(skbdclass, skbdtitle,
 						WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION |
 						WS_MINIMIZEBOX,
 						skbdcfg.posx, skbdcfg.posy,
 						skbdwin.width, skbdwin.height,
-						NULL, NULL, hInst, NULL);
+						NULL, NULL, hInstance, NULL);
 	skbdwin.hwnd = hwnd;
 	if (hwnd == NULL) {
 		goto skcre_err1;
@@ -881,7 +916,7 @@ void skbdwin_create(void) {
 		goto skcre_err2;
 	}
 	InvalidateRect(hwnd, NULL, TRUE);
-	SetForegroundWindow(hWndMain);
+	SetForegroundWindow(g_hWndMain);
 	return;
 
 skcre_err2:
@@ -912,20 +947,20 @@ void skbdwin_process(void) {
 
 void skbdwin_readini(void) {
 
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 
 	skbdcfg.posx = CW_USEDEFAULT;
 	skbdcfg.posy = CW_USEDEFAULT;
-	initgetfile(path, sizeof(path));
-	ini_read(path, skbdapp, skbdini, sizeof(skbdini)/sizeof(INITBL));
+	initgetfile(path, NELEMENTS(path));
+	ini_read(path, skbdapp, skbdini, NELEMENTS(skbdini));
 }
 
 void skbdwin_writeini(void) {
 
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 
-	initgetfile(path, sizeof(path));
-	ini_write(path, skbdapp, skbdini, sizeof(skbdini)/sizeof(INITBL));
+	initgetfile(path, NELEMENTS(path));
+	ini_write(path, skbdapp, skbdini, NELEMENTS(skbdini));
 }
 #endif