Usermode/axwin2 - Added full mouse/cursor support (no input yet though :)

[tpg/acess2.git] / Usermode / Applications / axwin2_src / WM / video.c

diff --git a/Usermode/Applications/axwin2_src/WM/video.c b/Usermode/Applications/axwin2_src/WM/video.c
index 7b3eb2f..4121fbe 100644 (file)
--- 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();
 }
 
@@ -67,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)