X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2Flibaxwin3.so_src%2Fwm.c;h=53208f2de0df1cbd2f7ae26ecfcc1456aa27c943;hb=f194730e75d6d3681e5f99a4efed1616fd1ea738;hp=4a6242b19025ee80282827f6f9cb93ec08c776e8;hpb=cee7338738f1a68c7eb7b956cab8d9fb83f95714;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 4a6242b1..53208f2d 100644
--- a/Usermode/Applications/axwin3_src/libaxwin3.so_src/wm.c
+++ b/Usermode/Applications/axwin3_src/libaxwin3.so_src/wm.c
@@ -10,8 +10,10 @@
 #include <string.h>
 #include "include/internal.h"
 #include "include/ipc.h"
+#include <wm_messages.h>
 
-#define WINDOWS_PER_ALLOC	(63)
+#define WINDOWS_PER_ALLOC	(64-1)	// -1 to make it 64 pointers (+ Next)
+#define MAX_HOTKEYS	32
 
 typedef struct sWindowBlock	tWindowBlock;
 
@@ -28,6 +30,7 @@ struct sWindowBlock
  int	giAxWin3_LowestFreeWinID;
  int	giAxWin3_HighestUsedWinID;
 tWindowBlock	gAxWin3_WindowList;
+tAxWin3_HotkeyCallback	gAxWin3_Hotkeys[MAX_HOTKEYS];
 
 // === CODE ===
 tWindow *AxWin3_int_CreateWindowStruct(uint32_t ServerID, int ExtraBytes)
@@ -124,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;
 	
@@ -158,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
@@ -188,12 +193,43 @@ void AxWin3_int_HandleMessage(tAxWin_IPCMessage *Msg)
 	{
 	case IPCMSG_SENDMSG: {
 		tIPCMsg_SendMsg	*info = (void*)Msg->Data;
-		if(Msg->Size < sizeof(*info))	return ;
-		if(Msg->Size < sizeof(*info) + info->Length)	return ;
-		if(!dest || !dest->Handler)	return ;
-		dest->Handler(dest, info->ID, info->Length, info->Data);
+		if(Msg->Size < sizeof(*info) || Msg->Size < sizeof(*info) + info->Length) {
+			_SysDebug("Message is undersized (%i < %i + %i)",
+				Msg->Size < sizeof(*info), info->Length);
+			return ;
+		}
+		if(!dest || !dest->Handler) {
+			_SysDebug("No handler for destination %p", dest);
+			return ;
+		}
+		_SysDebug("IPC Message 0x%x - %i bytes", info->ID, info->Length);
+
+		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;
+			}
+		}
 		break; }
+	default:
+		_SysDebug("Unknow message ID %i", Msg->ID);
+		break;
 	}
+	
+	free(Msg);
 }
 
 void AxWin3_SetWindowTitle(tHWND Window, const char *Title)
@@ -225,6 +261,62 @@ void AxWin3_SendMessage(tHWND Window, tHWND Destination, int Message, int Length
 	free(msg);
 }
 
+void *AxWin3_WaitMessage(tHWND Window, int MessageID, size_t *Length)
+{
+	tAxWin_IPCMessage	*msg;
+	
+	for( ;; )
+	{
+		msg = AxWin3_int_WaitIPCMessage(IPCMSG_SENDMSG);
+		if( msg->Window != AxWin3_int_GetWindowID(Window) ) {
+			AxWin3_int_HandleMessage(msg);
+			continue ;
+		}
+		tIPCMsg_SendMsg	*info = (void*)msg->Data;
+		if( info->ID != MessageID ) {
+			AxWin3_int_HandleMessage(msg);
+			continue ;
+		}
+
+		*Length = info->Length;
+		void	*ret = malloc(info->Length);	
+		memcpy(ret, info->Data, info->Length);
+		free(msg);
+	
+		return ret;
+	}
+}
+
+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;
@@ -316,3 +408,28 @@ void AxWin3_ResizeWindow(tHWND Window, short W, short H)
 	free(msg);
 }
 
+int AxWin3_RegisterAction(tHWND Window, const char *Action, tAxWin3_HotkeyCallback cb)
+{
+	 int	i;
+	for( i = 0; i < MAX_HOTKEYS; i ++ )
+	{
+		if( gAxWin3_Hotkeys[i] == NULL )
+		{
+			tAxWin_IPCMessage	*msg;
+			struct sIPCMsg_RegAction	*info;
+			gAxWin3_Hotkeys[i] = cb;
+			
+			msg = AxWin3_int_AllocateIPCMessage(Window, IPCMSG_REGACTION, 0, sizeof(*info)+strlen(Action)+1);
+			info = (void*)msg->Data;
+		
+			info->Index = i;
+			strcpy(info->Action, Action);
+			
+			AxWin3_int_SendIPCMessage(msg);
+			free(msg);
+			return i;
+		}
+	}
+	return -1;
+}
+