From: John Hodge <tpg@mutabah.net>
Date: Sat, 5 Nov 2011 13:58:32 +0000 (+0800)
Subject: Usermode/AxWin3 - Implemented sending messages to windows
X-Git-Tag: rel0.14~142
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=f440462b381bb8bcfbe303e7c0c4b16ce4a97b6c;p=tpg%2Facess2.git

Usermode/AxWin3 - Implemented sending messages to windows

- Can now render the widget border (from the decorator)
---

diff --git a/Usermode/Applications/axwin3_src/WM/include/wm.h b/Usermode/Applications/axwin3_src/WM/include/wm.h
index a96061e2..d110dcc1 100644
--- a/Usermode/Applications/axwin3_src/WM/include/wm.h
+++ b/Usermode/Applications/axwin3_src/WM/include/wm.h
@@ -40,7 +40,7 @@ extern void	WM_Invalidate(tWindow *Window);
 extern void	WM_ShowWindow(tWindow *Window, int bShow);
 extern int	WM_ResizeWindow(tWindow *Window, int W, int H);
 extern int	WM_MoveWindow(tWindow *Window, int X, int Y);
-extern int	WM_SendMessage(tWindow *Window, int MessageID, int Length, void *Data);
+extern int	WM_SendMessage(tWindow *Source, tWindow *Dest, int MessageID, int Length, void *Data);
 // --- Rendering
 extern void	WM_Render_FillRect(tWindow *Window, int X, int Y, int W, int H, tColour Colour);
 extern void	WM_Render_DrawRect(tWindow *Window, int X, int Y, int W, int H, tColour Colour);
diff --git a/Usermode/Applications/axwin3_src/WM/renderer_widget.c b/Usermode/Applications/axwin3_src/WM/renderer_widget.c
index 00debedc..bea68c2f 100644
--- a/Usermode/Applications/axwin3_src/WM/renderer_widget.c
+++ b/Usermode/Applications/axwin3_src/WM/renderer_widget.c
@@ -9,6 +9,7 @@
 #include <wm_renderer.h>
 #include <renderer_widget.h>
 #include <string.h>
+#include <wm_messages.h>
 
 // === PROTOTYPES ===
  int	Renderer_Widget_Init(void);
diff --git a/Usermode/Applications/axwin3_src/WM/video.c b/Usermode/Applications/axwin3_src/WM/video.c
index 10bd1988..8066a1ba 100644
--- a/Usermode/Applications/axwin3_src/WM/video.c
+++ b/Usermode/Applications/axwin3_src/WM/video.c
@@ -67,7 +67,8 @@ void Video_Setup(void)
 	
 	// Create local framebuffer (back buffer)
 	gpScreenBuffer = malloc( giScreenWidth*giScreenHeight*4 );
-	Video_FillRect(0, 0, giScreenWidth, giScreenHeight, 0x8080FF);
+//	memset(gpScreenBufferi
+//	Video_FillRect(0, 0, giScreenWidth, giScreenHeight, 0x8080FF);
 
 	// Set cursor position and bitmap
 	ioctl(giTerminalFD, TERM_IOCTL_SETCURSORBITMAP, &cCursorBitmap);
@@ -95,36 +96,6 @@ void Video_SetCursorPos(short X, short Y)
 	ioctl(giTerminalFD, TERM_IOCTL_GETSETCURSOR, &pos);
 }
 
-void Video_FillRect(short X, short Y, short W, short H, uint32_t Color)
-{
-	 int	i;
-	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 -- )
-	{
-		for( i = W; i --; )
-			*buf++ = Color;
-		buf += giScreenWidth - W;
-	}
-}
-
-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 Blit an entire buffer to the screen
  * \note Assumes Pitch = 4*W
@@ -134,7 +105,7 @@ void Video_Blit(uint32_t *Source, short DstX, short DstY, short W, short H)
 	 int	i;
 	uint32_t	*buf;
 
-	_SysDebug("Video_Blit: (%p (%i, %i) %ix%i)", Source, DstX, DstY, W, H);
+//	_SysDebug("Video_Blit: (%p (%i, %i) %ix%i)", Source, DstX, DstY, W, H);
 	
 	if( DstX >= giScreenWidth)	return ;
 	if( DstY >= giScreenHeight)	return ;
@@ -147,8 +118,8 @@ void Video_Blit(uint32_t *Source, short DstX, short DstY, short W, short H)
 
 	if( W <= 0 || H <= 0 )	return;
 	
-	_SysDebug(" Clipped to (%i, %i) %ix%i", DstX, DstY, W, H);
-	_SysDebug(" Source[0] = 0x%x", Source[0]);
+//	_SysDebug(" Clipped to (%i, %i) %ix%i", DstX, DstY, W, H);
+//	_SysDebug(" Source[0] = 0x%x", Source[0]);
 	buf = gpScreenBuffer + DstY*giScreenWidth + DstX;
 	while( H -- )
 	{
@@ -158,88 +129,3 @@ void Video_Blit(uint32_t *Source, short DstX, short DstY, short W, short H)
 	}
 }
 
-/**
- * \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;
-	default:
-		_SysDebug("ERROR: Unknown image format %i\n", Image->Format);
-		break;
-	}
-}
diff --git a/Usermode/Applications/axwin3_src/WM/wm.c b/Usermode/Applications/axwin3_src/WM/wm.c
index eddd12de..786c338e 100644
--- a/Usermode/Applications/axwin3_src/WM/wm.c
+++ b/Usermode/Applications/axwin3_src/WM/wm.c
@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <video.h>
+#include <wm_messages.h>
 
 // === GLOBALS ===
 tWMRenderer	*gpWM_Renderers;
@@ -118,16 +119,41 @@ int WM_ResizeWindow(tWindow *Window, int W, int H)
 	Window->W = W;	Window->H = H;
 
 	WM_Invalidate(Window);
+
+	{
+		struct sWndMsg_Resize	msg;
+		msg.W = W;
+		msg.H = H;
+		WM_SendMessage(NULL, Window, WNDMSG_RESIZE, sizeof(msg), &msg);
+	}
 	
 	return 0;
 }
 
+int WM_SendMessage(tWindow *Source, tWindow *Dest, int Message, int Length, void *Data)
+{
+	if(Dest == NULL)	return -2;
+	if(Length > 0 && Data == NULL)	return -1;
+	
+	// ->HandleMessage returns 1 when the message was not handled
+	if( Dest->Renderer->HandleMessage(Dest, Message, Length, Data) != 1 )
+	{
+		// TODO: Catch errors from ->HandleMessage
+		return 0;
+	}
+	
+	// TODO: Pass on to user
+	_SysDebug("WM_SendMessage: TODO - Implement sending to client application");
+	
+	return 1;
+}
+
 void WM_Invalidate(tWindow *Window)
 {
 	// Don't invalidate twice (speedup)
 	if( !(Window->Flags & WINFLAG_CLEAN) )	return;
 
-	_SysDebug("Invalidating %p");
+//	_SysDebug("Invalidating %p");
 	
 	// Mark for re-render
 	Window->Flags &= ~WINFLAG_CLEAN;
@@ -135,7 +161,7 @@ void WM_Invalidate(tWindow *Window)
 	// Mark up the tree that a child window has changed	
 	while( (Window = Window->Parent) )
 	{
-		_SysDebug("Childclean removed from %p", Window);
+//		_SysDebug("Childclean removed from %p", Window);
 		Window->Flags &= ~WINFLAG_CHILDCLEAN;
 	}
 }
@@ -205,8 +231,8 @@ void WM_Render_FillRect(tWindow *Window, int X, int Y, int W, int H, tColour Col
 {
 	uint32_t	*dest;
 	 int	i;
-	_SysDebug("WM_Render_FilledRect(%p, 0x%x...", Window, Colour);
-	_SysDebug(" (%i,%i), %ix%i)", X, Y, W, H);
+//	_SysDebug("WM_Render_FilledRect(%p, 0x%x...", Window, Colour);
+//	_SysDebug(" (%i,%i), %ix%i)", X, Y, W, H);
 	// Clip to window dimensions
 	if(X < 0) { W += X; X = 0; }
 	if(Y < 0) { H += Y; Y = 0; }
@@ -214,7 +240,7 @@ void WM_Render_FillRect(tWindow *Window, int X, int Y, int W, int H, tColour Col
 	if(Y >= Window->H)	return;
 	if(X + W > Window->W)	W = Window->W - X;
 	if(Y + H > Window->H)	H = Window->H - Y;
-	_SysDebug(" Clipped to (%i,%i), %ix%i", X, Y, W, H);
+//	_SysDebug(" Clipped to (%i,%i), %ix%i", X, Y, W, H);
 
 	// Render to buffer
 	// Create if needed?
@@ -243,6 +269,7 @@ void WM_Render_DrawRect(tWindow *Window, int X, int Y, int W, int H, tColour Col
 void WM_Render_DrawText(tWindow *Window, int X, int Y, int W, int H, void *Font, tColour Colour, const char *Text)
 {
 	// TODO: Implement
+	_SysDebug("WM_Render_DrawText - TODO: Implement");
 }
 
 /**