--- np2/win9x/subwind.cpp	2004/03/25 10:41:13	1.2
+++ np2/win9x/subwind.cpp	2004/04/07 13:15:40	1.6
@@ -416,6 +416,8 @@ typedef struct {
 	HWND		hwnd;
 	WINLOCEX	wlex;
 	DD2HDL		dd2hdl;
+	int			width;
+	int			height;
 } SKBDWIN;
 
 typedef struct {
@@ -435,46 +437,63 @@ static const INITBL np2skini[] = {
 	{"WindposY", INITYPE_SINT32,	&skbdcfg.posy,			0},
 	{"windtype", INITYPE_BOOL,		&skbdcfg.type,			0}};
 
-static void skpalcnv(CMNPAL *dst, RGB32 *src, UINT pals, UINT bpp) {
+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++) {
 				dst[i].pal16 = dd2_get16pal(skbdwin.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
 	}
 }
 
-static void skpaintmsg(HWND hWnd) {
+static void skdrawkeys(HWND hWnd, BOOL redraw) {
 
-	HDC			hdc;
-	PAINTSTRUCT	ps;
 	RECT		rect;
 	RECT		draw;
 	CMNVRAM		*vram;
 
-	TRACEOUT(("skpaintmsg"));
 	GetClientRect(hWnd, &rect);
 	draw.left = 0;
 	draw.top = 0;
-	draw.right = min(SOFTKBD_WIDTH, rect.right - rect.left);
-	draw.bottom = min(SOFTKBD_HEIGHT, rect.bottom - rect.top);
-	hdc = BeginPaint(hWnd, &ps);
+	draw.right = min(skbdwin.width, rect.right - rect.left);
+	draw.bottom = min(skbdwin.height, rect.bottom - rect.top);
 	vram = dd2_bsurflock(skbdwin.dd2hdl);
 	if (vram) {
-		softkbd_paint(vram, skpalcnv);
+		softkbd_paint(vram, skpalcnv, redraw);
 		dd2_bsurfunlock(skbdwin.dd2hdl);
 		dd2_blt(skbdwin.dd2hdl, NULL, &draw);
 	}
+}
+
+static void skpaintmsg(HWND hWnd) {
+
+	HDC			hdc;
+	PAINTSTRUCT	ps;
+
+	hdc = BeginPaint(hWnd, &ps);
+	skdrawkeys(hWnd, TRUE);
 	EndPaint(hWnd, &ps);
 }
 
@@ -483,7 +502,7 @@ static LRESULT CALLBACK skproc(HWND hWnd
 	switch(msg) {
 		case WM_CREATE:
 			np2class_wmcreate(hWnd);
-			winloc_setclientsize(hWnd, SOFTKBD_WIDTH, SOFTKBD_HEIGHT);
+			winloc_setclientsize(hWnd, skbdwin.width, skbdwin.height);
 			np2class_windowtype(hWnd, (skbdcfg.type & 1) + 1);
 			break;
 
@@ -589,9 +608,15 @@ BOOL skbdwin_initialize(HINSTANCE hPreIn
 			return(FAILURE);
 		}
 	}
+	softkbd_initialize();
 	return(SUCCESS);
 }
 
+void skbdwin_deinitialize(void) {
+
+	softkbd_deinitialize();
+}
+
 void skbdwin_create(void) {
 
 	HWND	hwnd;
@@ -600,11 +625,14 @@ void skbdwin_create(void) {
 		return;
 	}
 	ZeroMemory(&skbdwin, sizeof(skbdwin));
+	if (softkbd_getsize(&skbdwin.width, &skbdwin.height) != SUCCESS) {
+		return;
+	}
 	hwnd = CreateWindow(np2skclass, np2skcaption,
 						WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION |
 						WS_MINIMIZEBOX,
 						skbdcfg.posx, skbdcfg.posy,
-						SOFTKBD_WIDTH, SOFTKBD_HEIGHT,
+						skbdwin.width, skbdwin.height,
 						NULL, NULL, hInst, NULL);
 	skbdwin.hwnd = hwnd;
 	if (hwnd == NULL) {
@@ -612,7 +640,7 @@ void skbdwin_create(void) {
 	}
 	ShowWindow(hwnd, SW_SHOWNOACTIVATE);
 	UpdateWindow(hwnd);
-	skbdwin.dd2hdl = dd2_create(hwnd, SOFTKBD_WIDTH, SOFTKBD_HEIGHT);
+	skbdwin.dd2hdl = dd2_create(hwnd, skbdwin.width, skbdwin.height);
 	if (skbdwin.dd2hdl == NULL) {
 		goto skcre_err2;
 	}
@@ -639,6 +667,13 @@ HWND skbdwin_gethwnd(void) {
 	return(skbdwin.hwnd);
 }
 
+void skbdwin_process(void) {
+
+	if ((skbdwin.hwnd) && (softkbd_process())) {
+		skdrawkeys(skbdwin.hwnd, FALSE);
+	}
+}
+
 void skbdwin_readini(void) {
 
 	char	path[MAX_PATH];