X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin2_src%2FWM%2Fcommon.h;h=ff60f8c609f249d1dcfc582cae8d2bf42b51c0ec;hb=889b379627388811c630aad3214efcaee1ac9885;hp=eb21f3c7292e8e79bd92098b58ad550d271e4041;hpb=b98fbd4e9c71447d81fc9bd643fb174c76346e0f;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin2_src/WM/common.h b/Usermode/Applications/axwin2_src/WM/common.h
index eb21f3c7..ff60f8c6 100644
--- a/Usermode/Applications/axwin2_src/WM/common.h
+++ b/Usermode/Applications/axwin2_src/WM/common.h
@@ -13,6 +13,46 @@
 #include "image.h"
 //#include "font.h"
 
+typedef struct sFont	tFont;
+
+// === MACROS ===
+static inline uint32_t Video_AlphaBlend(uint32_t _orig, uint32_t _new, uint8_t _alpha)
+{
+	 int	ao,ro,go,bo;
+	 int	an,rn,gn,bn;
+	if( _alpha == 0 )	return _orig;
+	if( _alpha == 255 )	return _new;
+	
+	ao = (_orig >> 24) & 0xFF;
+	ro = (_orig >> 16) & 0xFF;
+	go = (_orig >>  8) & 0xFF;
+	bo = (_orig >>  0) & 0xFF;
+	
+	an = (_new >> 24) & 0xFF;
+	rn = (_new >> 16) & 0xFF;
+	gn = (_new >>  8) & 0xFF;
+	bn = (_new >>  0) & 0xFF;
+
+	if( _alpha == 0x80 ) {
+		ao = (ao + an) / 2;
+		ro = (ro + rn) / 2;
+		go = (go + gn) / 2;
+		bo = (bo + bn) / 2;
+	}
+	else {
+		ao = ao*(255-_alpha) + an*_alpha;
+		ro = ro*(255-_alpha) + rn*_alpha;
+		go = go*(255-_alpha) + gn*_alpha;
+		bo = bo*(255-_alpha) + bn*_alpha;
+		ao /= 255*2;
+		ro /= 255*2;
+		go /= 255*2;
+		bo /= 255*2;
+	}
+
+	return (ao << 24) | (ro << 16) | (go << 8) | bo;
+}
+
 // === GLOBALS ===
 extern char	*gsTerminalDevice;
 extern char	*gsMouseDevice;
@@ -30,7 +70,8 @@ extern void	memset32(void *ptr, uint32_t val, size_t count);
 extern void	Video_Update(void);
 extern void	Video_FillRect(short X, short Y, short W, short H, uint32_t Color);
 extern void	Video_DrawRect(short X, short Y, short W, short H, uint32_t Color);
-extern void	Video_DrawText(short X, short Y, short W, short H, void *Font, int Point, uint32_t Color, char *Text);
+extern int	Video_DrawText(short X, short Y, short W, short H, tFont *Font, uint32_t Color, char *Text);
+extern void Video_DrawImage(short X, short Y, short W, short H, tImage *Image);
 // --- Debug Hack ---
 extern void	_SysDebug(const char *Format, ...);
 #endif