X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2Flibaxwin3.so_src%2Fwm.c;h=99b9a1b63b74b267ae8c7848bf4e67d936469e70;hb=edb8fa42cff3758a25e985f4fdd7119b6206ce0a;hp=4a6d8d33ab6140bbaa7b5d606edba79a3203b3aa;hpb=d0b4559f2936f6d9f06be0f7c3c51527a480ec0d;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/libaxwin3.so_src/wm.c b/Usermode/Applications/axwin3_src/libaxwin3.so_src/wm.c
index 4a6d8d33..99b9a1b6 100644
--- a/Usermode/Applications/axwin3_src/libaxwin3.so_src/wm.c
+++ b/Usermode/Applications/axwin3_src/libaxwin3.so_src/wm.c
@@ -127,7 +127,7 @@ int AxWin3_GetDisplayDims(int Display, int *X, int *Y, int *Width, int *Height)
 	ret = (void*)msg->Data;
 	
 	if(X)	*X = ret->X;
-	if(X)	*X = ret->Y;
+	if(Y)	*Y = ret->Y;
 	if(Width)	*Width = ret->W;
 	if(Height)	*Height = ret->H;
 	
@@ -161,6 +161,8 @@ tHWND AxWin3_CreateWindow(
 	AxWin3_int_SendIPCMessage(msg);
 	free(msg);
 
+	_SysDebug("AxWin3_CreateWindow: %i :: '%s'", newWinID, Renderer);
+
 	// TODO: Detect and handle possible errors
 
 	// Return success
@@ -181,6 +183,37 @@ void *AxWin3_int_GetDataPtr(tHWND Window)
 	return Window->Data;
 }
 
+int AxWin3_int_DefaultMessageHandler(tWindow *Win, int ID, size_t Len, const void *Data)
+{
+	switch(ID)
+	{
+	case WNDMSG_HOTKEY: {
+		const struct sWndMsg_Hotkey *mi = Data;
+		if( Len < sizeof(*mi) )
+			return -1;
+
+		if( mi->ID >= MAX_HOTKEYS ) 
+			_SysDebug("--- Out of range hotkey %i fired", mi->ID);
+		else if( gAxWin3_Hotkeys[mi->ID] == 0 )
+			_SysDebug("--- Unmapped hotkey ID %i fired", mi->ID);
+		else
+			gAxWin3_Hotkeys[mi->ID]();
+		}
+		return 1;
+	// Honour a close message by default
+	case WNDMSG_CLOSE:
+		AxWin3_DestroyWindow(Win);
+		return 1;
+	// Zero fucks given?
+	case WNDMSG_DESTROY:
+		_SysDebug("TODO: Check that WNDMSG_DESTROY was from us calling _DestroyWindow");
+		// TODO: Finalise cleanup of window, this will be the last message sent to this window
+		return 1;
+	default:
+		return 0;
+	}
+}
+
 void AxWin3_int_HandleMessage(tAxWin_IPCMessage *Msg)
 {
 	tWindow	*dest;
@@ -204,28 +237,20 @@ void AxWin3_int_HandleMessage(tAxWin_IPCMessage *Msg)
 
 		if( dest->Handler(dest, info->ID, info->Length, info->Data) )
 			;
-		else {
-			switch( info->ID )
-			{
-			case WNDMSG_HOTKEY: {
-				const struct sWndMsg_Hotkey *mi = (void*)info->Data;
-				if( mi->ID >= MAX_HOTKEYS ) 
-					;	// TODO: Error when hotkey is out of range
-				else if( gAxWin3_Hotkeys[mi->ID] == 0 )
-					_SysDebug("--- Unmapped hotkey ID %i fired", mi->ID);
-				else
-					gAxWin3_Hotkeys[mi->ID]();
-				}break;
-			default:
-				_SysDebug("--- Unhandled SENDMSG %i", info->ID);
-				break;
-			}
-		}
+		else if( AxWin3_int_DefaultMessageHandler(dest, info->ID, info->Length, info->Data) )
+			;
+		else
+			_SysDebug("--- Unhandled SENDMSG 0x%x win %i", info->ID, Msg->Window);
 		break; }
+	case IPCMSG_DESTROYWIN:
+		// Clean up resources associated with this window
+		break;
 	default:
 		_SysDebug("Unknow message ID %i", Msg->ID);
 		break;
 	}
+	
+	free(Msg);
 }
 
 void AxWin3_SetWindowTitle(tHWND Window, const char *Title)
@@ -283,6 +308,36 @@ void *AxWin3_WaitMessage(tHWND Window, int MessageID, size_t *Length)
 	}
 }
 
+void AxWin3_SendIPC(tHWND Window, int Message, size_t Length, const void *Data)
+{
+	tAxWin_IPCMessage	*msg;
+	
+	msg = AxWin3_int_AllocateIPCMessage(Window, Message, IPCMSG_FLAG_RENDERER, Length);
+	memcpy(msg->Data, Data, Length);
+	AxWin3_int_SendIPCMessage(msg);
+	free(msg);
+}
+
+void *AxWin3_WaitIPCMessage(tHWND Window, int MessageID, size_t *Length)
+{
+	tAxWin_IPCMessage	*msg;
+	for( ;; )
+	{
+		msg = AxWin3_int_WaitIPCMessage(MessageID);
+		if( !(msg->Flags & IPCMSG_FLAG_RENDERER) || msg->Window != AxWin3_int_GetWindowID(Window) ) {
+			AxWin3_int_HandleMessage(msg);
+			continue ;
+		}
+
+		*Length = msg->Size;
+		void	*ret = malloc(msg->Size);
+		memcpy(ret, msg->Data, msg->Size);
+		free(msg);
+	
+		return ret;
+	}
+}
+
 void AxWin3_FocusWindow(tHWND Window)
 {
 	tAxWin_IPCMessage	*msg;