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

diff --git a/Usermode/Applications/axwin2_src/WM/video.c b/Usermode/Applications/axwin2_src/WM/video.c
index d17e0e59..4121fbeb 100644
--- a/Usermode/Applications/axwin2_src/WM/video.c
+++ b/Usermode/Applications/axwin2_src/WM/video.c
@@ -5,13 +5,19 @@
 #include "common.h"
 #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)
@@ -50,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();
 }
 
@@ -63,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)
@@ -94,7 +116,88 @@ void Video_DrawRect(short X, short Y, short W, short H, uint32_t Color)
 	Video_FillRect(X+W-1, Y, 1, H, Color);
 }
 
-void Video_DrawText(short X, short Y, short W, short H, void *Font, int Point, uint32_t Color, char *Text)
+/**
+ * \brief Draw an image to the screen
+ * \todo Maybe have support for an offset in the image
+ */
+void Video_DrawImage(short X, short Y, short W, short H, tImage *Image)
 {
-	// TODO!
+	 int	x, y;
+	uint8_t	*buf = (uint8_t *)(gpScreenBuffer + Y*giScreenWidth + X);
+	uint8_t	*data;
+	
+	// Sanity please
+	if( !Image )
+		return ;
+	
+	// Bounds Check
+	if( X >= giScreenWidth )	return ;
+	if( Y >= giScreenHeight )	return ;
+	
+	// Wrap to image size
+	if( W > Image->Width )	W = Image->Width;
+	if( H > Image->Height )	H = Image->Height;
+	
+	// Wrap to screen size
+	if( X + W > giScreenWidth )	W = giScreenWidth - X;
+	if( Y + H > giScreenHeight )	H = giScreenHeight - Y;
+	
+	// Do the render
+	data = Image->Data;
+	switch( Image->Format )
+	{
+	case IMGFMT_BGRA:
+		for( y = 0; y < H; y ++ )
+		{
+			 int	r, g, b, a;	// New
+			 int	or, og, ob;	// Original
+			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];
+				// Handle Alpha
+				switch(a)
+				{
+				// Transparent: Handled above
+				// Solid
+				case 0xFF:	break;
+				// Half
+				case 0x80:
+					r = (or + r) / 2;
+					g = (og + g) / 2;
+					b = (ob + b) / 2;
+					break;
+				// General
+				default:
+					r = (or * (255-a) + r * a) / 255;
+					g = (og * (255-a) + g * a) / 255;
+					b = (ob * (255-a) + b * a) / 255;
+					break;
+				}
+				buf[x*4+0] = b; buf[x*4+1] = g; buf[x*4+2] = r;
+			}
+			data += Image->Width * 4;
+			buf += giScreenWidth * 4;
+		}
+		break;
+	
+	// RGB
+	case IMGFMT_RGB:
+		for( y = 0; y < H; y ++ )
+		{
+			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
+			}
+			data += W * 3;
+			buf += giScreenWidth * 4;
+		}
+		break;
+	default:
+		_SysDebug("ERROR: Unknown image format %i\n", Image->Format);
+		break;
+	}
 }