--- np2/win9x/toolwin.cpp	2003/10/30 22:33:34	1.10
+++ np2/win9x/toolwin.cpp	2003/11/04 19:23:03	1.14
@@ -2,18 +2,23 @@
 #include	"strres.h"
 #include	"resource.h"
 #include	"np2.h"
+#include	"winloc.h"
 #include	"dosio.h"
 #include	"soundmng.h"
 #include	"sysmng.h"
 #include	"menu.h"
 #include	"toolwin.h"
 #include	"ini.h"
+#include	"np2class.h"
 #include	"dialog.h"
 #include	"dialogs.h"
 #include	"pccore.h"
 #include	"diskdrv.h"
 
 
+extern WINLOCEX np2_winlocexallwin(HWND base);
+
+
 enum {
 	IDC_TOOLHDDACC			= 0,
 	IDC_TOOLFDD1ACC,
@@ -30,10 +35,10 @@ enum {
 
 	IDC_BASE				= 3000,
 
-	IDC_SKINSEL				= 3100,
-	IDC_SKINDEF				= 3101,
-	IDC_SKINMRU				= 3102,
-	IDC_TOOLCLOSE			= IDC_SKINMRU + SKINMRU_MAX
+	IDM_SKINSEL				= 3100,
+	IDM_SKINDEF				= 3101,
+	IDM_SKINMRU				= 3102,
+	IDM_TOOLCLOSE			= IDM_SKINMRU + SKINMRU_MAX
 };
 
 enum {
@@ -63,6 +68,7 @@ const char	*text;
 
 typedef struct {
 	HWND			hwnd;
+	WINLOCEX		wlex;
 	HBITMAP			hbmp;
 	BYTE			fddaccess[2];
 	BYTE			hddaccess;
@@ -83,8 +89,8 @@ typedef struct {
 } TOOLWIN;
 
 enum {
-	GTWL_FOCUS		= 0,
-	GTWL_SIZE		= 4
+	GTWL_FOCUS		= NP2GWL_SIZE + 0,
+	GTWL_SIZE		= NP2GWL_SIZE + 4
 };
 
 		NP2TOOL		np2tool;
@@ -382,11 +388,6 @@ static LRESULT CALLBACK twsub(HWND hWnd,
 	else if (msg == WM_SETFOCUS) {
 		SetWindowLong(GetParent(hWnd), GTWL_FOCUS, idc);
 	}
-	else if (msg == WM_SYSKEYDOWN) {
-		if (((short)wp == VK_SPACE) && (lp & 0x20000000)) {
-			return(SendMessage(GetParent(hWnd), msg, wp, lp));
-		}
-	}
 	return(CallWindowProc(toolwin.subproc[idc], hWnd, msg, wp, lp));
 }
 
@@ -556,12 +557,12 @@ const char	*base;
 const char	*file[SKINMRU_MAX];
 
 	ret = CreatePopupMenu();
-	AppendMenu(ret, MF_STRING, IDC_SKINSEL, str_skinsel);
+	AppendMenu(ret, MF_STRING, IDM_SKINSEL, str_skinsel);
 	AppendMenu(ret, MF_SEPARATOR, 0, NULL);
 
 	base = np2tool.skin;
 	flag = (base[0] == '\0')?MF_CHECKED:0;
-	AppendMenu(ret, MF_STRING + flag, IDC_SKINDEF, str_skindef);
+	AppendMenu(ret, MF_STRING + flag, IDM_SKINDEF, str_skindef);
 	for (cnt=0; cnt<SKINMRU_MAX; cnt++) {
 		p = np2tool.skinmru[cnt];
 		if (p[0] == '\0') {
@@ -582,17 +583,18 @@ const char	*file[SKINMRU_MAX];
 	for (i=0; i<cnt; i++) {
 		j = id[i];
 		flag = (!file_cmpname(base, np2tool.skinmru[j]))?MF_CHECKED:0;
-		AppendMenu(ret, MF_STRING + flag, IDC_SKINMRU + j, file[j]);
+		AppendMenu(ret, MF_STRING + flag, IDM_SKINMRU + j, file[j]);
 	}
 	return(ret);
 }
 
 static void skinchange(HWND hWnd) {
 
-const char	*p;
-	UINT	i;
-	HBITMAP	hbmp;
-	BITMAP	bmp;
+const char		*p;
+	UINT		i;
+	HBITMAP		hbmp;
+	BITMAP		bmp;
+	WINLOCEX	wlex;
 
 	p = np2tool.skin;
 	if (p[0]) {
@@ -608,12 +610,15 @@ const char	*p;
 		}
 		file_cpyname(np2tool.skinmru[0], p, sizeof(np2tool.skinmru[0]));
 	}
+	ModifyMenu(np2class_gethmenu(hWnd), 0, MF_BYPOSITION | MF_POPUP,
+									(UINT)createskinmenu(), str_toolskin);
 	ModifyMenu(GetSystemMenu(hWnd, FALSE), 0, MF_BYPOSITION | MF_POPUP,
 									(UINT)createskinmenu(), str_toolskin);
 	DrawMenuBar(hWnd);
 	sysmng_update(SYS_UPDATEOSCFG);
 
-	toolwin_movingstart();
+	wlex = np2_winlocexallwin(hWndMain);
+	winlocex_setholdwnd(wlex, hWnd);
 	toolwindestroy();
 	hbmp = skinload(np2tool.skin);
 	if (hbmp == NULL) {
@@ -622,194 +627,10 @@ const char	*p;
 	}
 	GetObject(hbmp, sizeof(BITMAP), &bmp);
 	toolwin.hbmp = hbmp;
-	MoveWindow(hWnd, np2tool.posx, np2tool.posy,
-											bmp.bmWidth, bmp.bmHeight, TRUE);
+	winloc_setclientsize(hWnd, bmp.bmWidth, bmp.bmHeight);
 	toolwincreate(hWnd);
-	toolwin_movingend();
-}
-
-
-// ---- moving
-
-enum {
-	SNAPDOTPULL		= 12,
-	SNAPDOTREL		= 16
-};
-
-static void movingstart(void) {
-
-	toolwin.winflg = 0;
-	toolwin.wingx = 0;
-	toolwin.wingy = 0;
-}
-
-static void movingproc(RECT *rect) {
-
-	RECT	workrc;
-	RECT	mainrc;
-	int		winlx;
-	int		winly;
-	BOOL	changes;
-	BOOL	connectx;
-	BOOL	connecty;
-	int		d;
-
-	SystemParametersInfo(SPI_GETWORKAREA, 0, &workrc, 0);
-	GetWindowRect(hWndMain, &mainrc);
-	winlx = rect->right - rect->left;
-	winly = rect->bottom - rect->top;
-
-	if ((winlx > (workrc.right - workrc.left)) ||
-		(winly > (workrc.bottom - workrc.top))) {
-		return;
-	}
-
-	if (toolwin.winflg & 0x03) {
-		toolwin.wingx += rect->left - toolwin.wintx;
-		rect->left = toolwin.wintx;
-		if ((toolwin.wingx >= SNAPDOTREL) || (toolwin.wingx <= -SNAPDOTREL)) {
-			toolwin.winflg &= ~0x03;
-			rect->left += toolwin.wingx;
-			toolwin.wingx = 0;
-		}
-		rect->right = rect->left + winlx;
-	}
-	if (toolwin.winflg & 0x0c) {
-		toolwin.wingy += rect->top - toolwin.winty;
-		rect->top = toolwin.winty;
-		if ((toolwin.wingy >= SNAPDOTREL) || (toolwin.wingy <= -SNAPDOTREL)) {
-			toolwin.winflg &= ~0x0c;
-			rect->top += toolwin.wingy;
-			toolwin.wingy = 0;
-		}
-		rect->bottom = rect->top + winly;
-	}
-
-	connectx = ((rect->right >= mainrc.left) && (rect->left <= mainrc.right));
-	connecty = ((rect->bottom >= mainrc.top) && (rect->top <= mainrc.bottom));
-	if ((!connectx) || (!connecty)) {
-		if (toolwin.winflg & 0x01) {
-			toolwin.winflg &= ~0x01;
-			rect->left += toolwin.wingx;
-			rect->right = rect->left + winlx;
-			toolwin.wingx = 0;
-		}
-		if (toolwin.winflg & 0x04) {
-			toolwin.winflg &= ~0x04;
-			rect->top += toolwin.wingy;
-			rect->bottom = rect->top + winly;
-			toolwin.wingy = 0;
-		}
-	}
-
-	do {
-		changes = FALSE;
-		if ((!(toolwin.winflg & 0x01)) &&
-			(rect->bottom >= mainrc.top) && (rect->top <= mainrc.bottom)) {
-			do {
-				d = rect->left - mainrc.right;
-				if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) {
-					break;
-				}
-				d = rect->right - mainrc.left;
-				if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) {
-					break;
-				}
-				if ((rect->bottom == mainrc.top) ||
-					(rect->top == mainrc.bottom)) {
-					d = rect->left - mainrc.left;
-					if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) {
-						break;
-					}
-					d = rect->right - mainrc.right;
-					if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) {
-						break;
-					}
-				}
-			} while(0);
-			if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) {
-				toolwin.winflg |= 0x01;
-				rect->left -= d;
-				rect->right = rect->left + winlx;
-				toolwin.wingx = d;
-				toolwin.wintx = rect->left;
-				changes = TRUE;
-			}
-		}
-		if (!(toolwin.winflg & 0x03)) {
-			do {
-				d = rect->left - workrc.left;
-				if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) {
-					break;
-				}
-				d = rect->right - workrc.right;
-				if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) {
-					break;
-				}
-			} while(0);
-			if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) {
-				toolwin.winflg |= 0x02;
-				rect->left -= d;
-				rect->right = rect->left + winlx;
-				toolwin.wingx = d;
-				toolwin.wintx = rect->left;
-				changes = TRUE;
-			}
-		}
-
-		if ((!(toolwin.winflg & 0x04)) &&
-			(rect->right >= mainrc.left) && (rect->left <= mainrc.right)) {
-			do {
-				d = rect->top - mainrc.bottom;
-				if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) {
-					break;
-				}
-				d = rect->bottom - mainrc.top;
-				if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) {
-					break;
-				}
-				if ((rect->right == mainrc.left) ||
-					(rect->left == mainrc.right)) {
-					d = rect->top - mainrc.top;
-					if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) {
-						break;
-					}
-					d = rect->bottom - mainrc.bottom;
-					if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) {
-						break;
-					}
-				}
-			} while(0);
-			if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) {
-				toolwin.winflg |= 0x04;
-				rect->top -= d;
-				rect->bottom = rect->top + winly;
-				toolwin.wingy = d;
-				toolwin.winty = rect->top;
-				changes = TRUE;
-			}
-		}
-		if (!(toolwin.winflg & 0x0c)) {
-			do {
-				d = rect->top - workrc.top;
-				if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) {
-					break;
-				}
-				d = rect->bottom - workrc.bottom;
-				if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) {
-					break;
-				}
-			} while(0);
-			if ((d < SNAPDOTPULL) && (d > -SNAPDOTPULL)) {
-				toolwin.winflg |= 0x08;
-				rect->top -= d;
-				rect->bottom = rect->top + winly;
-				toolwin.wingy = d;
-				toolwin.winty = rect->top;
-				changes = TRUE;
-			}
-		}
-	} while(changes);
+	winlocex_move(wlex);
+	winlocex_destroy(wlex);
 }
 
 
@@ -818,48 +639,53 @@ static void movingproc(RECT *rect) {
 static void openpopup(HWND hWnd, LPARAM lp) {
 
 	HMENU	hMenu;
+	HMENU	mainmenu;
 	POINT	pt;
 
 	hMenu = CreatePopupMenu();
+	if (!winui_en) {
+		mainmenu = np2class_gethmenu(hWndMain);
+		menu_addmenubar(hMenu, mainmenu);
+	}
 	AppendMenu(hMenu, MF_POPUP, (UINT)createskinmenu(), str_toolskin);
 	AppendMenu(hMenu, MF_SEPARATOR, 0, NULL);
-	AppendMenu(hMenu, MF_STRING, IDC_TOOLCLOSE, str_toolclose);
+	AppendMenu(hMenu, MF_STRING, IDM_TOOLCLOSE, str_toolclose);
 	pt.x = LOWORD(lp);
 	pt.y = HIWORD(lp);
 	ClientToScreen(hWnd, &pt);
 	TrackPopupMenu(hMenu, TPM_LEFTALIGN, pt.x, pt.y, 0, hWnd, NULL);
-	ModifyMenu(hMenu, 0, MF_BYPOSITION | MF_POPUP, (UINT)0, str_toolskin);
 	DestroyMenu(hMenu);
 }
 
 static LRESULT CALLBACK twproc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) {
 
-	HMENU	hMenu;
-	BOOL	r;
-	UINT	idc;
+	HMENU		hMenu;
+	BOOL		r;
+	UINT		idc;
+	WINLOCEX	wlex;
 
 	switch(msg) {
 		case WM_CREATE:
+			np2class_wmcreate(hWnd);
+			ModifyMenu(np2class_gethmenu(hWnd), 0, MF_BYPOSITION | MF_POPUP,
+									(UINT)createskinmenu(), str_toolskin);
 			hMenu = GetSystemMenu(hWnd, FALSE);
 			InsertMenu(hMenu, 0, MF_BYPOSITION | MF_POPUP,
 									(UINT)createskinmenu(), str_toolskin);
 			InsertMenu(hMenu, 1, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
 
-			SetWindowLong(hWnd, GWL_STYLE,
-							GetWindowLong(hWnd, GWL_STYLE) & (~WS_CAPTION));
-			SetWindowPos(hWnd, 0, 0, 0, 0, 0,
-					SWP_DRAWFRAME | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER);
+			np2class_windowtype(hWnd, (np2tool.type & 1) << 1);
 			toolwincreate(hWnd);
 			break;
 
 		case WM_SYSCOMMAND:
 			switch(wp) {
-				case IDC_SKINSEL:
-				case IDC_SKINDEF:
-				case IDC_SKINMRU + 0:
-				case IDC_SKINMRU + 1:
-				case IDC_SKINMRU + 2:
-				case IDC_SKINMRU + 3:
+				case IDM_SKINSEL:
+				case IDM_SKINDEF:
+				case IDM_SKINMRU + 0:
+				case IDM_SKINMRU + 1:
+				case IDM_SKINMRU + 2:
+				case IDM_SKINMRU + 3:
 					return(SendMessage(hWnd, WM_COMMAND, wp, lp));
 
 				default:
@@ -876,9 +702,9 @@ static LRESULT CALLBACK twproc(HWND hWnd
 					break;
 
 				case IDC_BASE + IDC_TOOLFDD1BROWSE:
-					soundmng_disable(SNDPROC_TOOL);
-					dialog_changefdd(hWnd, 0);
-					soundmng_enable(SNDPROC_TOOL);
+					if (!winui_en) {
+						SendMessage(hWndMain, WM_COMMAND, IDM_FDD1OPEN, 0);
+					}
 					break;
 
 				case IDC_BASE + IDC_TOOLFDD1EJECT:
@@ -893,9 +719,9 @@ static LRESULT CALLBACK twproc(HWND hWnd
 					break;
 
 				case IDC_BASE + IDC_TOOLFDD2BROWSE:
-					soundmng_disable(SNDPROC_TOOL);
-					dialog_changefdd(hWnd, 1);
-					soundmng_enable(SNDPROC_TOOL);
+					if (!winui_en) {
+						SendMessage(hWndMain, WM_COMMAND, IDM_FDD2OPEN, 0);
+					}
 					break;
 
 				case IDC_BASE + IDC_TOOLFDD2EJECT:
@@ -904,15 +730,19 @@ static LRESULT CALLBACK twproc(HWND hWnd
 					break;
 
 				case IDC_BASE + IDC_TOOLRESET:
-					SendMessage(hWndMain, WM_COMMAND, IDM_RESET, 0);
-					SetForegroundWindow(hWndMain);
+					if (!winui_en) {
+						SendMessage(hWndMain, WM_COMMAND, IDM_RESET, 0);
+						SetForegroundWindow(hWndMain);
+					}
 					break;
 
 				case IDC_BASE + IDC_TOOLPOWER:
-					SendMessage(hWndMain, WM_CLOSE, 0, 0L);
+					if (!winui_en) {
+						SendMessage(hWndMain, WM_CLOSE, 0, 0L);
+					}
 					break;
 
-				case IDC_SKINSEL:
+				case IDM_SKINSEL:
 					soundmng_disable(SNDPROC_TOOL);
 					r = dlgs_selectfile(hWnd, &skinui, np2tool.skin,
 											sizeof(np2tool.skin), NULL);
@@ -922,24 +752,30 @@ static LRESULT CALLBACK twproc(HWND hWnd
 					}
 					break;
 
-				case IDC_SKINDEF:
+				case IDM_SKINDEF:
 					np2tool.skin[0] = '\0';
 					skinchange(hWnd);
 					break;
 
-				case IDC_SKINMRU + 0:
-				case IDC_SKINMRU + 1:
-				case IDC_SKINMRU + 2:
-				case IDC_SKINMRU + 3:
+				case IDM_SKINMRU + 0:
+				case IDM_SKINMRU + 1:
+				case IDM_SKINMRU + 2:
+				case IDM_SKINMRU + 3:
 					file_cpyname(np2tool.skin,
-									np2tool.skinmru[LOWORD(wp) - IDC_SKINMRU],
+									np2tool.skinmru[LOWORD(wp) - IDM_SKINMRU],
 									sizeof(np2tool.skin));
 					skinchange(hWnd);
 					break;
 
-				case IDC_TOOLCLOSE:
+				case IDM_TOOLCLOSE:
 					SendMessage(hWnd, WM_CLOSE, 0, 0);
 					break;
+
+				default:
+					if (!winui_en) {
+						return(SendMessage(hWndMain, msg, wp, lp));
+					}
+					break;
 			}
 			break;
 
@@ -951,17 +787,13 @@ static LRESULT CALLBACK twproc(HWND hWnd
 				}
 				return(0);
 			}
-			break;
+			return(SendMessage(hWndMain, msg, wp, lp));
 
-		case WM_SYSKEYDOWN:			// ALT+SPACEを自前処理
-			if (((short)wp == VK_SPACE) && (lp & 0x20000000)) {
-				POINT pt;
-				pt.x = 0;
-				pt.y = 0;
-				ClientToScreen(hWnd, &pt);
-				return(SendMessage(hWnd, 0x313, 0, MAKELPARAM(pt.x, pt.y)));
+		case WM_KEYUP:
+			if ((short)wp == VK_TAB) {
+				return(0);
 			}
-			break;
+			return(SendMessage(hWndMain, msg, wp, lp));
 
 		case WM_PAINT:
 			toolwinpaint(hWnd);
@@ -981,15 +813,18 @@ static LRESULT CALLBACK twproc(HWND hWnd
 
 		case WM_ENTERSIZEMOVE:
 			soundmng_disable(SNDPROC_TOOL);
-			movingstart();
+			winlocex_destroy(toolwin.wlex);
+			toolwin.wlex = np2_winlocexallwin(hWnd);
 			break;
 
-		case WM_EXITSIZEMOVE:
-			soundmng_enable(SNDPROC_TOOL);
+		case WM_MOVING:
+			winlocex_moving(toolwin.wlex, (RECT *)lp);
 			break;
 
-		case WM_MOVING:
-			movingproc((RECT *)lp);
+		case WM_EXITSIZEMOVE:
+			winlocex_destroy(toolwin.wlex);
+			toolwin.wlex = NULL;
+			soundmng_enable(SNDPROC_TOOL);
 			break;
 
 		case WM_MOVE:
@@ -1004,24 +839,37 @@ static LRESULT CALLBACK twproc(HWND hWnd
 			break;
 
 		case WM_CLOSE:
-			xmenu_settoolwin(0);
+			sysmenu_settoolwin(0);
 			sysmng_update(SYS_UPDATEOSCFG);
 			DestroyWindow(hWnd);
 			break;
 
 		case WM_DESTROY:
+			np2class_wmdestroy(hWnd);
 			toolwindestroy();
 			toolwin.hwnd = NULL;
 			break;
 
 		case WM_LBUTTONDOWN:
-			SendMessage(hWnd, WM_NCLBUTTONDOWN, HTCAPTION, 0L);
+			if (np2tool.type & 1) {
+				return(SendMessage(hWnd, WM_NCLBUTTONDOWN, HTCAPTION, 0L));
+			}
 			break;
 
 		case WM_RBUTTONDOWN:
 			openpopup(hWnd, lp);
 			break;
 
+		case WM_LBUTTONDBLCLK:
+			np2tool.type ^= 1;
+			wlex = np2_winlocexallwin(hWndMain);
+			winlocex_setholdwnd(wlex, hWnd);
+			np2class_windowtype(hWnd, (np2tool.type & 1) << 1);
+			winlocex_move(wlex);
+			winlocex_destroy(wlex);
+			sysmng_update(SYS_UPDATEOSCFG);
+			break;
+
 		default:
 			return(DefWindowProc(hWnd, msg, wp, lp));
 	}
@@ -1032,7 +880,7 @@ BOOL toolwin_initapp(HINSTANCE hInstance
 
 	WNDCLASS wc;
 
-	wc.style = CS_HREDRAW | CS_VREDRAW;
+	wc.style = CS_BYTEALIGNCLIENT | CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
 	wc.lpfnWndProc = twproc;
 	wc.cbClsExtra = 0;
 	wc.cbWndExtra = GTWL_SIZE;
@@ -1040,12 +888,12 @@ BOOL toolwin_initapp(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.lpszMenuName = MAKEINTRESOURCE(IDR_TOOLWIN);
 	wc.lpszClassName = np2toolclass;
 	return(RegisterClass(&wc));
 }
 
-void toolwin_open(void) {
+void toolwin_create(void) {
 
 	HBITMAP	hbmp;
 	BITMAP	bmp;
@@ -1061,16 +909,18 @@ void toolwin_open(void) {
 	}
 	GetObject(hbmp, sizeof(BITMAP), &bmp);
 	toolwin.hbmp = hbmp;
-	hWnd = CreateWindow(np2toolclass, np2tooltitle, WS_SYSMENU,
+	hWnd = CreateWindow(np2toolclass, np2tooltitle,
+							WS_SYSMENU | WS_MINIMIZEBOX,
 							np2tool.posx, np2tool.posy,
 							bmp.bmWidth, bmp.bmHeight,
 							NULL, NULL, hInst, NULL);
+	winloc_setclientsize(hWnd, bmp.bmWidth, bmp.bmHeight);
 	toolwin.hwnd = hWnd;
 	if (hWnd == NULL) {
 		goto twope_err2;
 	}
 	UpdateWindow(hWnd);
-	ShowWindow(hWnd, SW_SHOW);
+	ShowWindow(hWnd, SW_SHOWNOACTIVATE);
 	SetForegroundWindow(hWndMain);
 	return;
 
@@ -1078,117 +928,21 @@ twope_err2:
 	DeleteObject(hbmp);
 
 twope_err1:
-	xmenu_settoolwin(0);
+	sysmenu_settoolwin(0);
 	sysmng_update(SYS_UPDATEOSCFG);
 	return;
 }
 
-void toolwin_close(void) {
+void toolwin_destroy(void) {
 
 	if (toolwin.hwnd) {
 		DestroyWindow(toolwin.hwnd);
 	}
 }
 
-void toolwin_movingstart(void) {
-
-	RECT	mainrc;
-	RECT	toolrc;
-	UINT	connect;
+HWND toolwin_gethwnd(void) {
 
-	if (toolwin.hwnd == NULL) {
-		return;
-	}
-	GetWindowRect(hWndMain, &mainrc);
-	GetWindowRect(toolwin.hwnd, &toolrc);
-	connect = 0;
-	if ((toolrc.bottom >= mainrc.top) && (toolrc.top <= mainrc.bottom)) {
-		if (toolrc.right == mainrc.left) {
-			connect += 0x01;
-		}
-		else if (toolrc.left == mainrc.right) {
-			connect += 0x02;
-		}
-		else if (toolrc.left == mainrc.left) {
-			connect += 0x03;
-		}
-		else if (toolrc.right == mainrc.right) {
-			connect += 0x04;
-		}
-	}
-	if ((toolrc.right >= mainrc.left) && (toolrc.left <= mainrc.right)) {
-		if (toolrc.bottom == mainrc.top) {
-			connect += 1 << 4;
-		}
-		else if (toolrc.top == mainrc.bottom) {
-			connect += 2 << 4;
-		}
-		else if (toolrc.top == mainrc.top) {
-			connect += 3 << 4;
-		}
-		else if (toolrc.bottom == mainrc.bottom) {
-			connect += 4 << 4;
-		}
-	}
-	toolwin.parentcn = connect;
-	toolwin.parentx = mainrc.left;
-	toolwin.parenty = mainrc.top;
-}
-
-void toolwin_movingend(void) {
-
-	UINT	connect;
-	RECT	mainrc;
-	RECT	toolrc;
-	int		cx;
-	int		cy;
-
-	connect = toolwin.parentcn;
-	toolwin.parentcn = 0;
-	if ((toolwin.hwnd == NULL) || (!connect)) {
-		return;
-	}
-	GetWindowRect(hWndMain, &mainrc);
-	GetWindowRect(toolwin.hwnd, &toolrc);
-	cx = toolrc.right - toolrc.left;
-	cy = toolrc.bottom - toolrc.top;
-	toolrc.left += mainrc.left - toolwin.parentx;
-	toolrc.top += mainrc.top - toolwin.parenty;
-	switch(connect & 0x0f) {
-		case 1:
-			toolrc.left = mainrc.left - cx;
-			break;
-
-		case 2:
-			toolrc.left = mainrc.right;
-			break;
-
-		case 3:
-			toolrc.left = mainrc.left;
-			break;
-
-		case 4:
-			toolrc.left = mainrc.right - cx;
-			break;
-	}
-	switch((connect >> 4) & 0x0f) {
-		case 1:
-			toolrc.top = mainrc.top - cy;
-			break;
-
-		case 2:
-			toolrc.top = mainrc.bottom;
-			break;
-
-		case 3:
-			toolrc.top = mainrc.top;
-			break;
-
-		case 4:
-			toolrc.top = mainrc.bottom - cy;
-			break;
-	}
-	MoveWindow(toolwin.hwnd, toolrc.left, toolrc.top, cx, cy, TRUE);
+	return(toolwin.hwnd);
 }
 
 void toolwin_setfdd(BYTE drv, const char *name) {
@@ -1308,6 +1062,7 @@ static const char ini_title[] = "NP2 too
 static const INITBL iniitem[] = {
 	{"WindposX", INITYPE_SINT32,	&np2tool.posx,			0},
 	{"WindposY", INITYPE_SINT32,	&np2tool.posy,			0},
+	{"WindType", INITYPE_BOOL,		&np2tool.type,			0},
 	{"SkinFile", INITYPE_STR,		np2tool.skin,			MAX_PATH},
 	{"SkinMRU0", INITYPE_STR,		np2tool.skinmru[0],		MAX_PATH},
 	{"SkinMRU1", INITYPE_STR,		np2tool.skinmru[1],		MAX_PATH},
@@ -1337,6 +1092,7 @@ void toolwin_readini(void) {
 	ZeroMemory(&np2tool, sizeof(np2tool));
 	np2tool.posx = CW_USEDEFAULT;
 	np2tool.posy = CW_USEDEFAULT;
+	np2tool.type = 1;
 	initgetfile(path, sizeof(path));
 	ini_read(path, ini_title, iniitem, sizeof(iniitem)/sizeof(INITBL));
 }