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=cb21b7fdbfc7dac287a85599211d1f8c730749b3;hpb=e3b5f81f2af81fbb2f2b0f449f71324e63f9a645;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 cb21b7fd..99b9a1b6 100644
--- a/Usermode/Applications/axwin3_src/libaxwin3.so_src/wm.c
+++ b/Usermode/Applications/axwin3_src/libaxwin3.so_src/wm.c
@@ -176,8 +176,6 @@ void AxWin3_DestroyWindow(tHWND Window)
 	msg = AxWin3_int_AllocateIPCMessage(Window, IPCMSG_DESTROYWIN, 0, 0);
 	AxWin3_int_SendIPCMessage(msg);
 	free(msg);
-	
-	free(ret);
 }
 
 void *AxWin3_int_GetDataPtr(tHWND Window)
@@ -185,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;
@@ -208,23 +237,10 @@ 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 0x%x win %i", info->ID, Msg->Window);
-				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