X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin2_src%2FWM%2Fvideo.c;h=4121fbeb2fb237a33ce026d1e7a92ec819b48dab;hb=94c9ee44d701154379842425b5ee0826995e000e;hp=b57b8c7fb084a15f33b29565760a51321ad2a38b;hpb=6c7e82169e66197939b83945812b02787ed0f52e;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin2_src/WM/video.c b/Usermode/Applications/axwin2_src/WM/video.c
index b57b8c7f..4121fbeb 100644
--- a/Usermode/Applications/axwin2_src/WM/video.c
+++ b/Usermode/Applications/axwin2_src/WM/video.c
@@ -6,9 +6,11 @@
 #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);
@@ -54,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();
 }
 
@@ -70,6 +77,17 @@ void Video_Update(void)
 	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)
 {
 	uint32_t	*buf = gpScreenBuffer + Y*giScreenWidth + X;