--- np2/wince/scrnmng.cpp	2003/11/21 06:51:15	1.2
+++ np2/wince/scrnmng.cpp	2004/04/05 09:45:07	1.8
@@ -6,6 +6,13 @@
 #include	"vramhdl.h"
 #include	"menubase.h"
 #include	"nekop2.res"
+#include	"cmndraw.h"
+#include	"softkbd.h"
+
+
+#if defined(GX_DLL)
+#pragma comment(lib, "gx.lib")
+#endif
 
 
 typedef struct {
@@ -18,6 +25,9 @@ typedef struct {
 	long	start;
 	long	xalign;
 	long	yalign;
+#if defined(SUPPORT_SOFTKBD)
+	int		allflash;
+#endif
 } SCRNMNG;
 
 typedef struct {
@@ -32,6 +42,7 @@ static	SCRNSTAT	scrnstat;
 static	SCRNSURF	scrnsurf;
 
 static	BYTE		gx_disable = 1;
+extern	GXKeyList	gx_keylist;
 
 static const TCHAR	errmsg[] = STRLITERAL("Error");
 
@@ -72,19 +83,33 @@ static BOOL calcdrawrect(DRAWRECT *dr, V
 	return(SUCCESS);
 }
 
-void scrnmng_keybinds(struct GXKeyList *gxkey) {
+static void palcnv(CMNPAL *dst, const RGB32 *src, UINT pals, UINT bpp) {
 
-	short	tmp;
+	UINT	i;
 
-	if (scrnmng.rotate) {
-		tmp = gxkey->vkLeft;
-		gxkey->vkLeft = gxkey->vkDown;
-		gxkey->vkDown = gxkey->vkRight;
-		gxkey->vkRight = gxkey->vkUp;
-		gxkey->vkUp = tmp;
+	if (bpp == 16) {
+		for (i=0; i<pals; i++) {
+			dst[i].pal16 = ((src[i].p.r & 0xf8) << 8) |
+							((src[i].p.g & 0xfc) << 3) |
+							(src[i].p.b >> 3);
+		}
 	}
 }
 
+static void bmp16draw(void *bmp, BYTE *dst, int width, int height,
+												int xalign, int yalign) {
+
+	CMNVRAM	vram;
+
+	vram.ptr = dst;
+	vram.width = width;
+	vram.height = height;
+	vram.xalign = xalign;
+	vram.yalign = yalign;
+	vram.bpp = 16;
+	cmndraw_bmp16(&vram, bmp, palcnv, CMNBMP_CENTER | CMNBMP_MIDDLE);
+}
+
 
 // ----
 
@@ -154,6 +179,9 @@ BOOL scrnmng_create(HWND hWnd, LONG widt
 	}
 	gx_disable = 0;
 	scrnmng_clear(TRUE);
+#if defined(SUPPORT_SOFTKBD)
+	softkbd_initialize();
+#endif
 	return(SUCCESS);
 }
 
@@ -161,14 +189,28 @@ void scrnmng_destroy(void) {
 
 	gx_disable = 1;
 	GXCloseDisplay();
+#if defined(SUPPORT_SOFTKBD)
+	softkbd_deinitialize();
+#endif
 }
 
+#if defined(SUPPORT_SOFTKBD)
+void scrnmng_allflash(void) {
+
+	scrnmng.allflash = 1;
+}
+#endif
+
 RGB16 scrnmng_makepal16(RGB32 pal32) {
 
 	RGB16	ret;
 
 	ret = (pal32.p.r & 0xf8) << 8;
+#if defined(SIZE_QVGA) && !defined(SIZE_VGATEST)
 	ret += (pal32.p.g & 0xfc) << (3 + 16);
+#else
+	ret += (pal32.p.g & 0xfc) << 3;
+#endif
 	ret += pal32.p.b >> 3;
 	return(ret);
 }
@@ -198,8 +240,13 @@ const SCRNSURF *scrnmng_surflock(void) {
 		scrnsurf.xalign = 2;
 		scrnsurf.yalign = scrnmng.vram->yalign;
 	}
+#if !defined(SIZE_VGATEST)
 	scrnsurf.width = min(scrnstat.width, 640);
 	scrnsurf.height = min(scrnstat.height, 400);
+#else
+	scrnsurf.width = min(scrnstat.width, 320);
+	scrnsurf.height = min(scrnstat.height, 200);
+#endif
 	scrnsurf.bpp = 16;
 	scrnsurf.extend = 0;
 	return(&scrnsurf);
@@ -218,11 +265,22 @@ const BYTE		*a;
 
 	rt.left = 0;
 	rt.top = 0;
-	rt.right = min(scrnstat.width, 640);
-	rt.bottom = min(scrnstat.height, 400);
+#if defined(SUPPORT_SOFTKBD)
+	if (!scrnmng.allflash) {
+#endif
+		rt.right = min(scrnstat.width, 640);
+		rt.bottom = min(scrnstat.height, 400);
 #if defined(SIZE_QVGA)
-	rt.right >>= 1;
-	rt.bottom >>= 1;
+		rt.right >>= 1;
+		rt.bottom >>= 1;
+#endif
+#if defined(SUPPORT_SOFTKBD)
+	}
+	else {
+		scrnmng.allflash = 0;
+		rt.right = scrnmng.width;
+		rt.bottom = scrnmng.height;
+	}
 #endif
 	if (calcdrawrect(&dr, menuvram, &rt) != SUCCESS) {
 		return;
@@ -251,8 +309,24 @@ const BYTE		*a;
 
 void scrnmng_surfunlock(const SCRNSURF *surf) {
 
+#if defined(SUPPORT_SOFTKBD)
+	CMNVRAM	vram;
+#endif
+
 	if (surf) {
 		if (scrnmng.vram == NULL) {
+#if defined(SUPPORT_SOFTKBD)
+			if (scrnmng.allflash) {
+				scrnmng.allflash = 0;
+				vram.ptr = surf->ptr + (surf->yalign * 200);
+				vram.width = 320;
+				vram.height = 40;
+				vram.xalign = surf->xalign;
+				vram.yalign = surf->yalign;
+				vram.bpp = 16;
+				softkbd_paint(&vram, palcnv, TRUE);
+			}
+#endif
 			GXEndDraw();
 		}
 		else {
@@ -263,9 +337,6 @@ void scrnmng_surfunlock(const SCRNSURF *
 	}
 }
 
-void scrnmng_update(void) {
-}
-
 
 // ---- for wince
 
@@ -299,11 +370,63 @@ BOOL scrnmng_mousepos(LPARAM *lp) {
 	return(SUCCESS);
 }
 
+void scrnmng_clear(BOOL logo) {
+
+	void	*bmp;
+	BYTE	*p;
+	BYTE	*q;
+	int		y;
+	int		x;
+	long	yalign;
+
+	if (gx_disable) {
+		return;
+	}
+	bmp = NULL;
+	if (logo) {
+		bmp = (void *)bmpdata_solvedata(nekop2_bmp);
+	}
+	p = (BYTE *)GXBeginDraw();
+	q = p;
+	y = gx_dp.cyHeight;
+	yalign = gx_dp.cbyPitch - (gx_dp.cbxPitch * gx_dp.cxWidth);
+	do {
+		x = gx_dp.cxWidth;
+		do {
+			*(UINT16 *)q = 0;
+			q += gx_dp.cbxPitch;
+		} while(--x);
+		q += yalign;
+	} while(--y);
+	bmp16draw(bmp, p + scrnmng.start, scrnmng.width, scrnmng.height,
+												scrnmng.xalign, scrnmng.yalign);	GXEndDraw();
+	if (bmp) {
+		_MFREE(bmp);
+	}
+}
+
+void scrnmng_keybinds(void) {
+
+	short	tmp;
+
+	if (scrnmng.rotate) {
+		tmp = gx_keylist.vkLeft;
+		gx_keylist.vkLeft = gx_keylist.vkDown;
+		gx_keylist.vkDown = gx_keylist.vkRight;
+		gx_keylist.vkRight = gx_keylist.vkUp;
+		gx_keylist.vkUp = tmp;
+	}
+}
+
 
 // ---- for menubase
 
 BOOL scrnmng_entermenu(SCRNMENU *smenu) {
 
+#if defined(SUPPORT_SOFTKBD)
+	CMNVRAM	vram;
+#endif
+
 	if (smenu == NULL) {
 		goto smem_err;
 	}
@@ -313,6 +436,15 @@ BOOL scrnmng_entermenu(SCRNMENU *smenu) 
 		goto smem_err;
 	}
 	scrndraw_redraw();
+#if defined(SUPPORT_SOFTKBD)
+	vram.ptr = scrnmng.vram->ptr + (640 * 200);
+	vram.width = 320;
+	vram.height = 40;
+	vram.xalign = 2;
+	vram.yalign = 640;
+	vram.bpp = 16;
+	softkbd_paint(&vram, palcnv, TRUE);
+#endif
 	smenu->width = scrnmng.width;
 	smenu->height = scrnmng.height;
 	smenu->bpp = 16;
@@ -372,110 +504,3 @@ const BYTE		*q;
 	GXEndDraw();
 }
 
-
-// ---- clear
-
-static void np2open_draw(BYTE *dst, BMPFILE *bf) {
-
-const BMPINFO	*bi;
-const BYTE		*pal;
-	BMPDATA		inf;
-	BYTE		*src;
-	int			bmpalign;
-	long		yalign;
-	UINT		pals;
-	UINT16		paltbl[16];
-	UINT		c;
-	int			x;
-	int			y;
-
-	if (bf == NULL) {
-		goto nod_err;
-	}
-	bi = (BMPINFO *)(bf + 1);
-	pal = (BYTE *)(bi + 1);
-	if (((bf->bfType[0] != 'B') && (bf->bfType[1] != 'M')) ||
-		(bmpdata_getinfo(bi, &inf) != SUCCESS) || (inf.bpp != 4)) {
-		goto nod_err;
-	}
-	src = (BYTE *)bf + (LOADINTELDWORD(bf->bfOffBits));
-	bmpalign = bmpdata_getalign(bi);
-	if (inf.height > 0) {
-		src += (inf.height - 1) * bmpalign;
-		bmpalign *= -1;
-	}
-	else {
-		inf.height *= -1;
-	}
-	if ((scrnmng.width < inf.width) || (scrnmng.height < inf.height)) {
-		goto nod_err;
-	}
-	dst += scrnmng.start;
-	dst += ((scrnmng.width - inf.width) / 2) * scrnmng.xalign;
-	dst += ((scrnmng.height - inf.height) / 2) * scrnmng.yalign;
-	yalign = scrnmng.yalign - (inf.width * scrnmng.xalign);
-
-	pals = LOADINTELDWORD(bi->biClrUsed);
-	pals = min(pals, 16);
-	ZeroMemory(paltbl, sizeof(paltbl));
-	for (c=0; c<pals; c++) {
-		paltbl[c] = ((pal[c*4+2] & 0xf8) << 8) +
-					((pal[c*4+1] & 0xfc) << 3) + (pal[c*4+0] >> 3);
-	}
-
-	for (y=0; y<inf.height; y++) {
-		for (x=0; x<inf.width; x++) {
-			if (!(x & 1)) {
-				c = src[x >> 1] >> 4;
-			}
-			else {
-				c = src[x >> 1] & 15;
-			}
-			*(UINT16 *)dst = paltbl[c];
-			dst += scrnmng.xalign;
-		}
-		src += bmpalign;
-		dst += yalign;
-	}
-
-nod_err:
-	return;
-}
-
-void scrnmng_clear(BOOL logo) {
-
-	BMPFILE *bf;
-	BYTE	*p;
-	BYTE	*q;
-	int		y;
-	int		x;
-	long	yalign;
-
-	if (gx_disable) {
-		return;
-	}
-	bf = NULL;
-	if (logo) {
-		bf = (BMPFILE *)bmpdata_solvedata(nekop2_bmp);
-	}
-	p = (BYTE *)GXBeginDraw();
-	q = p;
-	y = gx_dp.cyHeight;
-	yalign = gx_dp.cbyPitch - (gx_dp.cbxPitch * gx_dp.cxWidth);
-	do {
-		x = gx_dp.cxWidth;
-		do {
-			*(UINT16 *)q = 0;
-			q += gx_dp.cbxPitch;
-		} while(--x);
-		q += yalign;
-	} while(--y);
-	if (bf) {
-		np2open_draw(p, bf);
-	}
-	GXEndDraw();
-	if (bf) {
-		_MFREE(bf);
-	}
-}
-