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

diff --git a/Usermode/Applications/axwin2_src/WM/video.c b/Usermode/Applications/axwin2_src/WM/video.c
index 39ba1e51..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)