--- np2/win9x/np2.cpp	2006/12/24 00:52:29	1.67
+++ np2/win9x/np2.cpp	2007/01/08 01:16:59	1.69
@@ -66,13 +66,9 @@ static	TCHAR		szClassName[] = _T("NP2-Ma
 		BOOL		winui_en;
 
 		NP2OSCFG	np2oscfg = {
-#if !defined(SUPPORT_PC9821)
-						OEMTEXT("Neko Project II"),
-#else
-						OEMTEXT("Neko Project 21"),
-#endif
+						OEMTEXT(PROJECTNAME) OEMTEXT(PROJECTSUBNAME),
 						OEMTEXT("NP2"),
-						CW_USEDEFAULT, CW_USEDEFAULT, 1, 1, 0, 1, 0, 0,
+						CW_USEDEFAULT, CW_USEDEFAULT, 1, 1, 0, 0, 0, 1, 0, 0,
 						0, 0, KEY_UNKNOWN, 0,
 						0, 0, 0, {1, 2, 2, 1},
 						{5, 0, 0x3e, 19200,
@@ -84,7 +80,7 @@ static	TCHAR		szClassName[] = _T("NP2-Ma
 						{0, 0, 0x3e, 19200,
 						 OEMTEXT(""), OEMTEXT(""), OEMTEXT(""), OEMTEXT("")},
 						0xffffff, 0xffbf6a, 0, 0,
-						0, 1, 0, 9801, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+						0, 1, 0, 9801, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
 		OEMCHAR		fddfolder[MAX_PATH];
 		OEMCHAR		hddfolder[MAX_PATH];
@@ -1275,7 +1271,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 #if defined(SUPPORT_DCLOCK)
 				else {
 					POINT p;
-					if ((GetCursorPos(&p)) && (p.y >= 466)) {
+					if ((GetCursorPos(&p)) &&
+						(scrnmng_isdispclockclick(&p))) {
 						np2oscfg.clk_x++;
 						sysmng_update(SYS_UPDATEOSCFG);
 						dclock_reset();
@@ -1306,8 +1303,9 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 #if defined(SUPPORT_DCLOCK)
 				else {
 					POINT p;
-					if ((GetCursorPos(&p)) && (p.y >= 466) &&
-												(np2oscfg.clk_x)) {
+					if ((GetCursorPos(&p)) &&
+						(scrnmng_isdispclockclick(&p)) &&
+						(np2oscfg.clk_x)) {
 						np2oscfg.clk_fnt++;
 						sysmng_update(SYS_UPDATEOSCFG);
 						dclock_reset();