--- np2/macosx/scrnmng.cpp	2003/10/17 03:52:24	1.2
+++ np2/macosx/scrnmng.cpp	2003/11/12 19:06:33	1.4
@@ -1,14 +1,19 @@
 #include	"compiler.h"
 #include	"np2.h"
 #include	"scrnmng.h"
+#include	"toolwin.h"
 
 
 typedef struct {
+	int				width;
+	int				height;
 	BOOL			exist;
 	WindowPtr		hWnd;
 	GWorldPtr		gw;
 	PixMapHandle	pm;
 	Rect			rect;
+	GWorldPtr		gwp;
+	GDHandle		hgd;
 } _QDRAW, *QDRAW;
 
 
@@ -23,28 +28,95 @@ static	GWorldPtr	gwp;
 static	GDHandle	hgd;
 #endif
 
+static void changeclientsize(int width, int height, BYTE mode) {
+
+	QDRAW		qd;
+    int			scrnwidth, scrnheight;
+    BYTE		opentoolwin = np2oscfg.toolwin;
+
+	qd = &qdraw;
+	if (!qd->exist) {
+		return;
+	}
+    if (opentoolwin) {
+        toolwin_close();
+    }
+    if (!(mode & SCRNMODE_ROTATE)) {
+        scrnwidth = width;
+        scrnheight = height;
+    }
+    else {
+        scrnwidth = height;
+        scrnheight = width;
+    }
+    if (mode & SCRNMODE_FULLSCREEN) {
+        GetWindowBounds(hWndMain, kWindowContentRgn, &qd->rect);
+    }
+    else {
+        SizeWindow(qd->hWnd, scrnwidth, scrnheight, TRUE);
+        SetRect(&qd->rect, 0, 0, scrnwidth, scrnheight);
+    }
+    if (opentoolwin) {
+        toolwin_open();
+    }
+}
+
+
+#if defined(macosx_only)
+#if defined(SUPPORT_16BPP)
+UINT16 scrnmng_makepal16(RGB32 pal32) {
+//win9xのをちょこっと改造(tk800)
+	RGB32	pal;
+
+	pal.d = pal32.d & 0xF8F8F8;
+	return((UINT16)((pal.p.g << 2) +
+						(pal.p.r << 7) + (pal.p.b >> 3)));
+}
+#else
+UINT16 scrnmng_makepal16(RGB32 pal32) {
+    return(0);
+}
+#endif
+
+//ディスプレイの色深度を返す(tk800)
+int	scrnmng_getbpp(void) {
+    return(CGDisplayBitsPerPixel(kCGDirectMainDisplay));
+}
+#else
+int	scrnmng_getbpp(void) {
+    return(32);
+}
+#endif
 
 void scrnmng_initialize(void) {
+
+	QDRAW	qd;
+
+	qd = &qdraw;
+	qd->width = 640;
+	qd->height = 400;
 }
 
-BOOL scrnmng_create(BYTE scrnmode) {
+BOOL scrnmng_create(BYTE mode) {
 
 	QDRAW	qd;
 
 	qd = &qdraw;
-	SetRect(&qd->rect, 0, 0, 640, 480);
-#if defined(macosx_only)   
+#if defined(macosx_only)
 //GWorldの代わりに直接ウィンドウバッファを設定(tk800)
     GrafPtr		dstport;
     dstport = GetWindowPort(hWndMain);
     if (dstport) {
-        LockPortBits(dstport);//こうしないと描画位置がおかしくなる
         qd->pm = GetPortPixMap(dstport);
         qd->exist = TRUE;
         qd->hWnd = hWndMain;
+        if (!(mode & SCRNMODE_FULLSCREEN)) {
+            changeclientsize(qd->width, qd->height, mode);
+        }
         return(SUCCESS);
     }
 #else        
+	SetRect(&qd->rect, 0, 0, 640, 480);
 	if (NewGWorld(&qd->gw, 32, &qd->rect, NULL, NULL, useTempMem) == noErr) {
 		qd->pm = GetGWorldPixMap(qd->gw);
 		qd->exist = TRUE;
@@ -53,7 +125,7 @@ BOOL scrnmng_create(BYTE scrnmode) {
 	}
 #endif
 	else {
-		(void)scrnmode;
+		(void)mode;
 		return(FAILURE);
 	}
 }
@@ -65,17 +137,22 @@ void scrnmng_destroy(void) {
 	qd = &qdraw;
 	if (qd->exist) {
 		qd->exist = FALSE;
+#if defined(macosx_only)
 		DisposeGWorld(qd->gw);
-	}
-#if defined(macosx_only)    
-    UnlockPortBits(GetWindowPort(hWndMain));
 #endif
+	}
 }
 
 void scrnmng_setwidth(int posx, int width) {
 
+	QDRAW	qd;
+
+	qd = &qdraw;
+	if (qd->width != width) {
+		qd->width = width;
+		changeclientsize(width, qd->height, scrnmode);
+	}
 	(void)posx;
-	(void)width;
 }
 
 void scrnmng_setextend(int extend) {
@@ -85,40 +162,60 @@ void scrnmng_setextend(int extend) {
 
 void scrnmng_setheight(int posy, int height) {
 
+	QDRAW	qd;
+
+	qd = &qdraw;
+	if (qd->height != height) {
+		qd->height = height;
+		changeclientsize(qd->width, height, scrnmode);
+	}
 	(void)posy;
-	(void)height;
 }
 
 const SCRNSURF *scrnmng_surflock(void) {
 
 	QDRAW		qd;
 
-#if 0 && defined(macosx_only)    
-//色深度が32ビットじゃないときはさようなら(tk800)
-    if (CGDisplayBitsPerPixel(kCGDirectMainDisplay)!=32) {
-        return(NULL);
-    }
-#endif
 	qd = &qdraw;
 	if (!qd->exist) {
 		return(NULL);
 	}
 
+	scrnsurf.width = qd->width;
+	scrnsurf.height = qd->height;
 #if defined(macosx_only)   
 //描画位置をウィンドウバーの下に設定(tk800) 
+    LockPortBits(GetWindowPort(hWndMain));//こうしないと描画位置がおかしくなる(tk800)
 	LockPixels(qd->pm);
-	scrnsurf.ptr = (BYTE *)GetPixBaseAddr(qd->pm) + +640*4*22;
+    long	rowbyte = GetPixRowBytes(qd->pm);
+	scrnsurf.bpp = scrnmng_getbpp();
+	if (!(scrnmode & SCRNMODE_ROTATE)) {
+		scrnsurf.ptr = (BYTE *)GetPixBaseAddr(qd->pm) + rowbyte*22;
+		scrnsurf.xalign = scrnsurf.bpp >> 3;
+		scrnsurf.yalign = rowbyte;
+	}
+	else if (!(scrnmode & SCRNMODE_ROTATEDIR)) {
+		scrnsurf.ptr = (BYTE *)GetPixBaseAddr(qd->pm) + rowbyte*22;
+		scrnsurf.ptr += (scrnsurf.width - 1) * rowbyte;
+		scrnsurf.xalign = 0 - rowbyte;
+		scrnsurf.yalign = scrnsurf.bpp >> 3;
+	}
+	else {
+		scrnsurf.ptr = (BYTE *)GetPixBaseAddr(qd->pm) + rowbyte*22;
+		scrnsurf.ptr += (scrnsurf.height - 1) * (scrnsurf.bpp >> 3);
+		scrnsurf.xalign = rowbyte;
+		scrnsurf.yalign = 0 - (scrnsurf.bpp >> 3);
+    }
 #else
 	GetGWorld(&gwp, &hgd);
 	LockPixels(qd->pm);
 	SetGWorld(qd->gw, NULL);
 
 	scrnsurf.ptr = (BYTE *)GetPixBaseAddr(qd->pm);
-#endif
 	scrnsurf.xalign = 4;
 	scrnsurf.yalign = ((*qd->pm)->rowBytes) & 0x3fff;
-	scrnsurf.width = 640;
-	scrnsurf.height = 400;
+    scrnsurf.bpp = 32;
+#endif
 	scrnsurf.extend = 0;
 	return(&scrnsurf);
 }
@@ -135,8 +232,8 @@ void scrnmng_surfunlock(const SCRNSURF *
         GrafPtr		dstport;
         dstport = GetWindowPort(hWndMain);
         QDAddRectToDirtyRegion(dstport, &qd->rect);
-        QDFlushPortBuffer(dstport, NULL);
 		UnlockPixels(qd->pm);
+        UnlockPortBits(dstport);
 #else
 
 #if TARGET_API_MAC_CARBON
@@ -170,4 +267,3 @@ void scrnmng_surfunlock(const SCRNSURF *
 #endif
 	}
 }
-