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

diff --git a/Usermode/Applications/axwin2_src/WM/video.c b/Usermode/Applications/axwin2_src/WM/video.c
index fb082085..5c604256 100644
--- a/Usermode/Applications/axwin2_src/WM/video.c
+++ b/Usermode/Applications/axwin2_src/WM/video.c
@@ -5,11 +5,13 @@
 #include "common.h"
 #include <acess/sys.h>
 #include <acess/devices/terminal.h>
+#include <image.h>
 
 // === PROTOTYPES ===
 void	Video_Setup(void);
 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 ===
 
@@ -70,9 +72,107 @@ void Video_FillRect(short X, short Y, short W, short H, uint32_t Color)
 {
 	uint32_t	*buf = gpScreenBuffer + Y*giScreenWidth + X;
 	
+	_SysDebug("Video_FillRect: (X=%i, Y=%i, W=%i, H=%i, Color=%08x)",
+		X, Y, W, H, Color);
+	
+	if(W < 0 || X < 0 || X >= giScreenWidth)	return ;
+	if(X + W > giScreenWidth)	W = giScreenWidth - X;
+	
+	if(H < 0 || Y < 0 || Y >= giScreenHeight)	return ;
+	if(Y + H > giScreenHeight)	H = giScreenHeight - Y;
+	
 	while( H -- )
 	{
 		memset32( buf, Color, W );
 		buf += giScreenWidth;
 	}
 }
+
+void Video_DrawRect(short X, short Y, short W, short H, uint32_t Color)
+{	
+	Video_FillRect(X, Y, W, 1, Color);
+	Video_FillRect(X, Y+H-1, W, 1, Color);
+	Video_FillRect(X, Y, 1, H, Color);
+	Video_FillRect(X+W-1, Y, 1, H, Color);
+}
+
+/**
+ * \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)
+{
+	 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;
+	}
+}