--- np2/win9x/np2.cpp	2003/10/30 16:54:04	1.18
+++ np2/win9x/np2.cpp	2003/10/31 04:11:40	1.20
@@ -86,12 +86,13 @@ static	BYTE	np2stopemulate = 0;
 static	int		np2opening = 1;
 static	int		np2quitmsg = 0;
 		HMENU	hStat = NULL;
+static	BYTE	scrnmode;
+		WINLOC	wl;
 
 static const char np2help[] = "np2.hlp";
 static const char np2resume[] = "sav";
 
 
-static	BYTE	scrnmode;
 
 
 static void winuienter(void) {
@@ -552,19 +553,31 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 
 				case IDM_F12MOUSE:
 					xmenu_setf12copy(0);
-					keystat_resetcopyhelp();
+					winkbd_resetf12();
 					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_F12COPY:
 					xmenu_setf12copy(1);
-					keystat_resetcopyhelp();
+					winkbd_resetf12();
 					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_F12STOP:
 					xmenu_setf12copy(2);
-					keystat_resetcopyhelp();
+					winkbd_resetf12();
+					update |= SYS_UPDATECFG;
+					break;
+
+				case IDM_F12EQU:
+					xmenu_setf12copy(3);
+					winkbd_resetf12();
+					update |= SYS_UPDATECFG;
+					break;
+
+				case IDM_F12COMMA:
+					xmenu_setf12copy(4);
+					winkbd_resetf12();
 					update |= SYS_UPDATECFG;
 					break;
 
@@ -910,7 +923,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 		case WM_ENTERSIZEMOVE:
 			soundmng_disable(SNDPROC_MAIN);
 			mouse_running(MOUSE_STOP);
-			winloc_movingstart();
+			winloc_movingstart(&wl);
 			toolwin_movingstart();
 			break;
 
@@ -922,7 +935,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 
 		case WM_MOVING:
 			if (np2oscfg.WINSNAP) {
-				winloc_movingproc((RECT *)lParam);
+				winloc_movingproc(&wl, (RECT *)lParam);
 			}
 			break;
 
@@ -937,7 +950,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 				sysmng_update(SYS_UPDATECFG);
 			}
 			else {
-				winkeydown106(wParam, lParam);
+				winkbd_keydown(wParam, lParam);
 			}
 			break;
 
@@ -946,7 +959,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 				return(DefWindowProc(hWnd, WM_SYSKEYUP, VK_F10, lParam));
 			}
 			if ((wParam != VK_F12) || (np2oscfg.F12COPY)) {
-				winkeyup106(wParam, lParam);
+				winkbd_keyup(wParam, lParam);
 			}
 			break;
 
@@ -961,11 +974,11 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 					break;
 				}
 			}
-			winkeydown106(wParam, lParam);
+			winkbd_keydown(wParam, lParam);
 			break;
 
 		case WM_SYSKEYUP:
-			winkeyup106(wParam, lParam);
+			winkbd_keyup(wParam, lParam);
 			break;
 
 		case WM_MOUSEMOVE: