X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Fvideo.c;h=98c88c86fa5d2d47c05385c24a0869e7eaed2233;hb=3ad4532bb952dbcb28a2b9fa72d7f1f87b5f8fd4;hp=b3ce1d7cb10a19a2233e82fe3d9ff2de3f0f5132;hpb=5c29fcc13d3db145e00c01f88d0a584966c6bc38;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/video.c b/Usermode/Applications/axwin3_src/WM/video.c
index b3ce1d7c..98c88c86 100644
--- a/Usermode/Applications/axwin3_src/WM/video.c
+++ b/Usermode/Applications/axwin3_src/WM/video.c
@@ -15,6 +15,7 @@
 #include <video.h>
 #include <wm.h>
 #include <string.h>
+#include "include/lowlevel.h"
 
 // === IMPORTS ===
 extern int	giTerminalFD_Input;
@@ -76,6 +77,12 @@ void Video_Setup(void)
 	}
 	giScreenWidth = dims.PW;
 	giScreenHeight = dims.PH;
+	if( giScreenWidth < 640 || giScreenHeight < 480 ) {
+		Video_int_SetBufFmt(PTYBUFFMT_TEXT);
+		_SysDebug("Resoltion too small, 640x480 reqd but %ix%i avail",
+			giScreenWidth, giScreenHeight);
+		exit(-1);
+	}
 	_SysDebug("AxWin3 running at %ix%i", dims.PW, dims.PH);
 
 	giVideo_LastDirtyLine = giScreenHeight;
@@ -84,8 +91,16 @@ void Video_Setup(void)
 	gpScreenBuffer = malloc( giScreenWidth*giScreenHeight*4 );
 
 	// Set cursor position and bitmap
-	// TODO: This will require using the 2DCMD buffer format
-	//_SysIOCtl(giTerminalFD, TERM_IOCTL_SETCURSORBITMAP, &cCursorBitmap);
+	{
+	Video_int_SetBufFmt(PTYBUFFMT_2DCMD);
+	struct ptycmd_header	hdr = {PTY2D_CMD_SETCURSORBMP,0,0};
+	size_t size = sizeof(hdr) + sizeof(cCursorBitmap) + cCursorBitmap.W*cCursorBitmap.H*4;
+	hdr.len_low = size / 4;
+	hdr.len_hi = size / (256*4);
+	_SysWrite(giTerminalFD, &hdr, sizeof(hdr));
+	_SysDebug("size = %i (%04x:%02x * 4)", size, hdr.len_hi, hdr.len_low);
+	_SysWrite(giTerminalFD, &cCursorBitmap, size-sizeof(hdr));
+	}
 	Video_SetCursorPos( giScreenWidth/2, giScreenHeight/2 );
 }
 
@@ -132,7 +147,9 @@ void Video_int_SetBufFmt(int NewFmt)
 void Video_SetCursorPos(short X, short Y)
 {
 	struct ptycmd_setcursorpos	cmd;
-	cmd.cmd = PTY2D_CMD_SETCURSORPOS;
+	cmd.hdr.cmd = PTY2D_CMD_SETCURSORPOS;
+	cmd.hdr.len_low = sizeof(cmd)/4;
+	cmd.hdr.len_hi = 0;
 	cmd.x = giVideo_CursorX = X;
 	cmd.y = giVideo_CursorY = Y;