X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin2_src%2FWM%2Fvideo.c;h=4121fbeb2fb237a33ce026d1e7a92ec819b48dab;hb=e02f66c7125bf18f77c6c53587238cbd49da2c89;hp=5c604256422c285c3d614b007d846ec1665e597a;hpb=c3a2920bab79e0a41b45c74b883367437ab1dd6d;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin2_src/WM/video.c b/Usermode/Applications/axwin2_src/WM/video.c
index 5c604256..4121fbeb 100644
--- a/Usermode/Applications/axwin2_src/WM/video.c
+++ b/Usermode/Applications/axwin2_src/WM/video.c
@@ -6,14 +6,18 @@
 #include <acess/sys.h>
 #include <acess/devices/terminal.h>
 #include <image.h>
+#include "resources/cursor.h"
 
 // === PROTOTYPES ===
 void	Video_Setup(void);
+void	Video_SetCursorPos(short X, short Y);
 void	Video_Update(void);
 void	Video_FillRect(short X, short Y, short W, short H, uint32_t Color);
 void	Video_DrawRect(short X, short Y, short W, short H, uint32_t Color);
 
 // === GLOBALS ===
+ int	giVideo_CursorX;
+ int	giVideo_CursorY;
 
 // === CODE ===
 void Video_Setup(void)
@@ -52,12 +56,17 @@ void Video_Setup(void)
 	tmpInt = TERM_MODE_FB;
 	ioctl( giTerminalFD, TERM_IOCTL_MODETYPE, &tmpInt );
 	
-	// Force VT8 to be shown
+	// Force VT to be shown
 	ioctl( giTerminalFD, TERM_IOCTL_FORCESHOW, NULL );
 	
 	// Create local framebuffer (back buffer)
 	gpScreenBuffer = malloc( giScreenWidth*giScreenHeight*4 );
 	memset32( gpScreenBuffer, 0x8888FF, giScreenWidth*giScreenHeight );
+
+	// Set cursor position and bitmap
+	ioctl(giTerminalFD, TERM_IOCTL_SETCURSORBITMAP, &cCursorBitmap);
+	Video_SetCursorPos( giScreenWidth/2, giScreenHeight/2 );
+
 	Video_Update();
 }
 
@@ -65,7 +74,18 @@ void Video_Update(void)
 {
 	//seek(giTerminalFD, 0, SEEK_SET);
 	seek(giTerminalFD, 0, 1);
-	write(giTerminalFD, giScreenWidth*giScreenHeight*4, gpScreenBuffer);
+	write(giTerminalFD, gpScreenBuffer, giScreenWidth*giScreenHeight*4);
+}
+
+void Video_SetCursorPos(short X, short Y)
+{
+	struct {
+		uint16_t	x;
+		uint16_t	y;
+	} pos;
+	pos.x = giVideo_CursorX = X;
+	pos.y = giVideo_CursorY = Y;
+	ioctl(giTerminalFD, TERM_IOCTL_GETSETCURSOR, &pos);
 }
 
 void Video_FillRect(short X, short Y, short W, short H, uint32_t Color)
@@ -131,7 +151,8 @@ void Video_DrawImage(short X, short Y, short W, short H, tImage *Image)
 		{
 			 int	r, g, b, a;	// New
 			 int	or, og, ob;	// Original
-			for( x = 0; x < W; x ++ ) {
+			for( x = 0; x < W; x ++ )
+			{
 				b = data[x*4+0]; g = data[x*4+1]; r = data[x*4+2]; a = data[x*4+3];
 				if( a == 0 )	continue;	// 100% transparent
 				ob = buf[x*4+0]; og = buf[x*4+1]; or = buf[x*4+2];
@@ -165,7 +186,8 @@ void Video_DrawImage(short X, short Y, short W, short H, tImage *Image)
 	case IMGFMT_RGB:
 		for( y = 0; y < H; y ++ )
 		{
-			for( x = 0; x < W; x ++ ) {
+			for( x = 0; x < W; x ++ )
+			{
 				buf[x*4+0] = data[x*3+2];	// Blue
 				buf[x*4+1] = data[x*3+1];	// Green
 				buf[x*4+2] = data[x*3+0];	// Red
@@ -174,5 +196,8 @@ void Video_DrawImage(short X, short Y, short W, short H, tImage *Image)
 			buf += giScreenWidth * 4;
 		}
 		break;
+	default:
+		_SysDebug("ERROR: Unknown image format %i\n", Image->Format);
+		break;
 	}
 }