X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Fipc.c;h=cbed7fd17bcb81c6eb46b37916ad3b14ae9b0f00;hb=8dcc3e209d0d728565a18c8dca2b0ba220b74a6f;hp=92f898465615a8518b74891e340e286ae7696f98;hpb=f22d52d646638847ec2ff876f603efa2b173995d;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/ipc.c b/Usermode/Applications/axwin3_src/WM/ipc.c
index 92f89846..cbed7fd1 100644
--- a/Usermode/Applications/axwin3_src/WM/ipc.c
+++ b/Usermode/Applications/axwin3_src/WM/ipc.c
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <wm.h>
 #include <wm_internals.h>
+#include <wm_hotkeys.h>
 
 #define AXWIN_PORT	4101
 
@@ -75,30 +76,40 @@ void IPC_Init(void)
 	 int	tmp;
 	// TODO: Check this
 	giNetworkFileHandle = open("/Devices/ip/loop/udp", OPENFLAG_READ);
-	tmp = AXWIN_PORT;	ioctl(giNetworkFileHandle, 4, &tmp);	// TODO: Don't hard-code IOCtl number
+	if( giNetworkFileHandle != -1 )
+	{
+		tmp = AXWIN_PORT;
+		ioctl(giNetworkFileHandle, 4, &tmp);	// TODO: Don't hard-code IOCtl number
+	}
 }
 
 void IPC_FillSelect(int *nfds, fd_set *set)
 {
-	if( giNetworkFileHandle > *nfds )	*nfds = giNetworkFileHandle;
-	FD_SET(giNetworkFileHandle, set);
+	if( giNetworkFileHandle != -1 )
+	{
+		if( giNetworkFileHandle > *nfds )	*nfds = giNetworkFileHandle;
+		FD_SET(giNetworkFileHandle, set);
+	}
 }
 
 void IPC_HandleSelect(fd_set *set)
 {
-	if( FD_ISSET(giNetworkFileHandle, set) )
+	if( giNetworkFileHandle != -1 )
 	{
-		char	staticBuf[STATICBUF_SIZE];
-		 int	readlen, identlen;
-		char	*msg;
-
-		readlen = read(giNetworkFileHandle, staticBuf, sizeof(staticBuf));
-		
-		identlen = 4 + Net_GetAddressSize( ((uint16_t*)staticBuf)[1] );
-		msg = staticBuf + identlen;
-
-		IPC_Handle(&gIPC_Type_Datagram, staticBuf, readlen - identlen, (void*)msg);
-//		_SysDebug("IPC_HandleSelect: UDP handled");
+		if( FD_ISSET(giNetworkFileHandle, set) )
+		{
+			char	staticBuf[STATICBUF_SIZE];
+			 int	readlen, identlen;
+			char	*msg;
+	
+			readlen = read(giNetworkFileHandle, staticBuf, sizeof(staticBuf));
+			
+			identlen = 4 + Net_GetAddressSize( ((uint16_t*)staticBuf)[1] );
+			msg = staticBuf + identlen;
+	
+			IPC_Handle(&gIPC_Type_Datagram, staticBuf, readlen - identlen, (void*)msg);
+//			_SysDebug("IPC_HandleSelect: UDP handled");
+		}
 	}
 
 	while(SysGetMessage(NULL, NULL))
@@ -485,7 +496,26 @@ int IPC_Msg_SetWinPos(tIPC_Client *Client, tAxWin_IPCMessage *Msg)
 
 int IPC_Msg_RegisterAction(tIPC_Client *Client, tAxWin_IPCMessage *Msg)
 {
+	tIPCMsg_RegAction	*info = (void*)Msg->Data;
+	tWindow	*win;
+	
 	ASSERT(Msg->ID == IPCMSG_REGACTION);
+
+	if( Msg->Size < sizeof(*info) + 1 )
+		return -1;
+	
+	win = IPC_int_GetWindow(Client, Msg->Window);
+	if(!win)	return 1;
+
+	if( strnlen(info->Action, Msg->Size - sizeof(*info)) == Msg->Size - sizeof(*info) )
+		return 1;
+
+	_SysDebug("RegisterAction %p:%i [%i]\"%s\"",
+		Client, Msg->Window, info->Index, info->Action
+		);
+
+	WM_Hotkey_RegisterAction(info->Action, win, info->Index);
+
 	return 0;
 }