Syscalls - Changed SysGetMessage to provide a buffer size
[tpg/acess2.git] / Usermode / Applications / axwin3_src / WM / ipc.c
index 94691cc..1d4ac33 100644 (file)
@@ -12,6 +12,8 @@
 #include <ipcmessages.h>
 #include <stdio.h>
 #include <wm.h>
+#include <wm_internals.h>
+#include <wm_hotkeys.h>
 
 #define AXWIN_PORT     4101
 
@@ -20,7 +22,6 @@
 
 // === TYPES ===
 typedef struct sIPC_Type       tIPC_Type;
-typedef struct sIPC_Client     tIPC_Client;
 
 struct sIPC_Type
 {
@@ -38,6 +39,8 @@ struct sIPC_Client
        tWindow **Windows;
 };
 
+// === IMPORTS ===
+extern tWindow *gpWM_FocusedWindow;    // Needed for _FocusWindow
 
 // === PROTOTYPES ===
 void   IPC_Init(void);
@@ -73,41 +76,51 @@ 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))
+       size_t  len;
+       pid_t   tid;
+       while( (len = SysGetMessage(&tid, 0, NULL)) )
        {
-               pid_t   tid;
-                int    len = SysGetMessage(&tid, NULL);
                char    data[len];
-               SysGetMessage(NULL, data);
+               SysGetMessage(NULL, len, data);
 
                IPC_Handle(&gIPC_Type_SysMessage, &tid, len, (void*)data);
-               _SysDebug("IPC_HandleSelect: Message handled");
+//             _SysDebug("IPC_HandleSelect: Message handled");
        }
 }
 
@@ -141,7 +154,7 @@ int IPC_Type_Sys_GetSize(const void *Ident)
 
 int IPC_Type_Sys_Compare(const void *Ident1, const void *Ident2)
 {
-       return *(const int*)Ident1 - *(const int*)Ident2;
+       return *(const tid_t*)Ident1 - *(const tid_t*)Ident2;
 }
 
 void IPC_Type_Sys_Send(const void *Ident, size_t Length, const void *Data)
@@ -163,11 +176,12 @@ int _CompareClientPtrs(const void *_a, const void *_b)
 
 tIPC_Client *IPC_int_GetClient(const tIPC_Type *IPCType, const void *Ident)
 {
-        int    pos;    // Position where the new client will be inserted
+        int    pos = 0;        // Position where the new client will be inserted
         int    ident_size;
        tIPC_Client     *ret;
 
        // - Search list of registered clients
+       if(giIPC_ClientCount > 0)
        {
                tIPC_Client     target;
                 int    div;
@@ -183,6 +197,7 @@ tIPC_Client *IPC_int_GetClient(const tIPC_Type *IPCType, const void *Ident)
                {
                        div /= 2;
                        cmp = _CompareClientPtrs(&ret, &gIPC_Clients[pos]);
+//                     _SysDebug("Checking against %i gives %i", pos, cmp);
                        if(cmp == 0)    break;
                        if(cmp < 0)
                                pos -= div;
@@ -201,10 +216,11 @@ tIPC_Client *IPC_int_GetClient(const tIPC_Type *IPCType, const void *Ident)
 
        // - Create a new client entry
        ident_size = IPCType->GetIdentSize(Ident);
+//     _SysDebug("ident_size = %i", ident_size);
        ret = malloc( sizeof(tIPC_Client) + ident_size );
        if(!ret)        return NULL;
        ret->IPCType = IPCType;
-       ret->Ident = &ret + 1;  // Get the end of the structure
+       ret->Ident = ret + 1;   // Get the end of the structure
        memcpy( (void*)ret->Ident, Ident, ident_size );
        ret->nWindows = 0;
        ret->Windows = NULL;
@@ -227,8 +243,10 @@ tWindow *IPC_int_GetWindow(tIPC_Client *Client, uint32_t WindowID)
        if( WindowID == -1 )
                return NULL;
 
-       if( WindowID >= Client->nWindows )
+       if( WindowID >= Client->nWindows ) {
+//             _SysDebug("Window %i out of range for %p (%i)", WindowID, Client, Client->nWindows);
                return NULL;
+       }
 
        return Client->Windows[WindowID];
 }
@@ -244,23 +262,135 @@ void IPC_int_SetWindow(tIPC_Client *Client, uint32_t WindowID, tWindow *WindowPt
                Client->nWindows = WindowID + 1;
                Client->Windows = realloc(Client->Windows, Client->nWindows*sizeof(tWindow*));
                memset( &Client->Windows[oldCount],  0, (Client->nWindows-oldCount)*sizeof(tWindow*) );
+               _SysDebug("Expanded %p's window list from %i to %i", Client, oldCount, Client->nWindows);
        }
-       
+
+       _SysDebug("Assigned %p to window %i for %p", WindowPtr, WindowID, Client);      
        Client->Windows[WindowID] = WindowPtr;
 }
 
 // --- IPC Message Handlers ---
+int IPC_Msg_Ping(tIPC_Client *Client, tAxWin_IPCMessage *Msg)
+{
+       ASSERT(Msg->ID == IPCMSG_PING);
+       
+       if( !(Msg->Flags & IPCMSG_FLAG_RETURN) )        return 0;
+       
+       if( Msg->Size < 4 )     return -1;
+       
+       tIPCMsg_ReturnInt       *ret = (void*)Msg->Data;
+       Msg->ID = IPCMSG_PING;
+       Msg->Size = sizeof(*ret);
+       ret->Value = AXWIN_VERSION;
+       Client->IPCType->SendMessage(Client->Ident, sizeof(*Msg)+sizeof(*ret), Msg);
+       return 0;
+}
+
+int IPC_Msg_GetDisplayCount(tIPC_Client *Client, tAxWin_IPCMessage *Msg)
+{
+       tAxWin_IPCMessage       *ret_hdr;
+       tIPCMsg_ReturnInt       *ret;
+       char    buf[sizeof(*ret_hdr)+sizeof(*ret)];
+       
+       ASSERT(Msg->ID == IPCMSG_GETDISPLAYCOUNT);
+
+       if( !(Msg->Flags & IPCMSG_FLAG_RETURN) )        return 0;
+       
+       ret_hdr = (void*)buf;
+       ret_hdr->ID = IPCMSG_GETDISPLAYCOUNT;
+       ret_hdr->Flags = 0;
+       ret_hdr->Window = -1;
+       ret_hdr->Size = sizeof(*ret);
+       ret = (void*)ret_hdr->Data;
+       ret->Value = 1; // HARD CODE - Current version only supports one display
+       
+       Client->IPCType->SendMessage(Client->Ident, sizeof(buf), buf);
+       return 0;
+}
+
+int IPC_Msg_GetDisplayDims(tIPC_Client *Client, tAxWin_IPCMessage *Msg)
+{
+       tIPCMsg_GetDisplayDims  *info;
+       tAxWin_IPCMessage       *ret_hdr;
+       tIPCMsg_RetDisplayDims  *ret;
+       char    buf[sizeof(*ret_hdr)+sizeof(*ret)];
+       
+       ASSERT(Msg->ID == IPCMSG_GETDISPLAYDIMS);
+
+       if( !(Msg->Flags & IPCMSG_FLAG_RETURN) )        return 0;
+
+       info = (void*)Msg->Data;        
+
+       ret_hdr = (void*)buf;
+       ret_hdr->ID = IPCMSG_GETDISPLAYDIMS;
+       ret_hdr->Flags = 0;
+       ret_hdr->Window = -1;
+       ret_hdr->Size = sizeof(*ret);
+       ret = (void*)ret_hdr->Data;
+       
+       // HARD CODE! Only one display supported
+       if( info->DisplayID == 0 )
+       {
+               ret->X = 0;
+               ret->Y = 0;
+               ret->W = giScreenWidth;
+               ret->H = giScreenHeight;
+       }
+       else
+       {
+               ret->X = 0;     ret->Y = 0;
+               ret->W = 0;     ret->H = 0;
+       }
+       
+       Client->IPCType->SendMessage(Client->Ident, sizeof(buf), buf);
+       return 0;
+}
+
+int IPC_Msg_SendMsg(tIPC_Client *Client, tAxWin_IPCMessage *Msg)
+{
+       tIPCMsg_SendMsg *info = (void*)Msg->Data;
+       tWindow *src, *dest;
+
+       ASSERT(Msg->ID == IPCMSG_SENDMSG);
+       
+       // - Sanity checks
+       if( Msg->Size < sizeof(tIPCMsg_SendMsg) )
+               return -1;
+       if( Msg->Size < sizeof(tIPCMsg_SendMsg) + info->Length )
+               return -1;
+       
+       src = IPC_int_GetWindow(Client, Msg->Window);
+       if(!src)        return 1;
+       dest = IPC_int_GetWindow(Client, info->Remote);
+       if(!dest)       return 1;
+
+       WM_SendMessage(src, dest, info->ID, info->Length, info->Data);  
+
+       return 0;
+}
+
 int IPC_Msg_CreateWin(tIPC_Client *Client, tAxWin_IPCMessage *Msg)
 {
        tIPCMsg_CreateWin       *info = (void*)Msg->Data;
        tWindow *newwin, *parent;
 
+       ASSERT(Msg->ID == IPCMSG_CREATEWIN);
+
        // - Sanity checks
        //  > +1 is for NULL byte on string
-       if( Msg->Size < sizeof(tIPCMsg_CreateWin) + 1 )
+       if( Msg->Size < sizeof(*info) + 1 ) {
+               _SysDebug("IPC_Msg_CreateWin: Size check 1 failed");
                return -1;
-       if( info->Renderer[Msg->Size - sizeof(tIPCMsg_CreateWin)] != '\0' )
+       }
+       if( info->Renderer[Msg->Size - sizeof(*info) - 1] != '\0' ) {
+               _SysDebug("IPC_Msg_CreateWin: Size check 2 failed");
+               _SysDebug("info = {");
+               _SysDebug("  .NewWinID = %i", info->NewWinID);
+               _SysDebug("  .RendererArg = %i", info->RendererArg);
+               _SysDebug("  .Renderer = '%.*s'", Msg->Size - sizeof(*info), info->Renderer);
+               _SysDebug("}");
                return -1;
+       }
        
        // - Get the parent window ID
        parent = IPC_int_GetWindow(Client, Msg->Window);
@@ -270,37 +400,92 @@ int IPC_Msg_CreateWin(tIPC_Client *Client, tAxWin_IPCMessage *Msg)
                return 1;
 
        // - Create the new window, and save its pointer
-       newwin = WM_CreateWindow(parent, info->RendererArg, info->Renderer);
+       newwin = WM_CreateWindow(parent, Client, info->NewWinID, info->RendererArg, info->Renderer);
        IPC_int_SetWindow(Client, info->NewWinID, newwin);
 
        return 0;
 }
 
+int IPC_Msg_SetWindowTitle(tIPC_Client *Client, tAxWin_IPCMessage *Msg)
+{
+       tWindow *win;
+
+       ASSERT(Msg->ID == IPCMSG_SETWINTITLE);
+       
+       if( Msg->Size < 1 )     return -1;
+       if( Msg->Data[ Msg->Size-1 ] != '\0' )  return -1;      
+
+       win = IPC_int_GetWindow(Client, Msg->Window);
+       if(!win)        return 1;
+
+       WM_SetWindowTitle(win, Msg->Data);
+
+       return 0;
+}
+
 int IPC_Msg_ShowWindow(tIPC_Client *Client, tAxWin_IPCMessage *Msg)
 {
-       tIPCMsg_ShowWindow      *info = (void*)Msg->Data;
+       tIPCMsg_Boolean *info = (void*)Msg->Data;
        tWindow *win;
        
+       ASSERT(Msg->ID == IPCMSG_SHOWWINDOW);
+       
        if( Msg->Size < sizeof(*info) ) return -1;
        
        win = IPC_int_GetWindow(Client, Msg->Window);
        if(!win)        return 1;
 
-       WM_ShowWindow(win, !!info->bShow);
+       WM_ShowWindow(win, !!info->Value);
        
        return 0;
 }
 
+int IPC_Msg_DecorateWindow(tIPC_Client *Client, tAxWin_IPCMessage *Msg)
+{
+       tIPCMsg_Boolean *info = (void*)Msg->Data;
+       tWindow *win;
+       
+       if( Msg->Size < sizeof(*info) ) return -1;
+       
+       win = IPC_int_GetWindow(Client, Msg->Window);
+       if(!win)        return 1;
+       
+       WM_DecorateWindow(win, !!info->Value);
+       return 0;
+}
+
+int IPC_Msg_FocusWindow(tIPC_Client *Client, tAxWin_IPCMessage *Msg)
+{
+       tWindow *win;
+
+       ASSERT(Msg->ID == IPCMSG_FOCUSWINDOW);
+       
+       // Don't allow the focus to be changed unless the client has the focus
+       if(!gpWM_FocusedWindow) return 1;
+       if(gpWM_FocusedWindow->Client != Client)        return 1;
+
+       win = IPC_int_GetWindow(Client, Msg->Window);
+       if(!win)        return 1;
+
+       WM_FocusWindow(win);
+
+       return 0;
+}
+
 int IPC_Msg_SetWinPos(tIPC_Client *Client, tAxWin_IPCMessage *Msg)
 {
        tIPCMsg_SetWindowPos    *info = (void*)Msg->Data;
        tWindow *win;
        
+       ASSERT(Msg->ID == IPCMSG_SETWINPOS);
+       
        if(Msg->Size < sizeof(*info))   return -1;
        
        win = IPC_int_GetWindow(Client, Msg->Window);
        if(!win)        return 1;
        
+       _SysDebug("info = {..., bSetPos=%i,bSetDims=%i}", info->bSetPos, info->bSetDims);
+       
        if(info->bSetPos)
                WM_MoveWindow(win, info->X, info->Y);
        if(info->bSetDims)
@@ -309,9 +494,51 @@ int IPC_Msg_SetWinPos(tIPC_Client *Client, tAxWin_IPCMessage *Msg)
        return 0;
 }
 
+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;
+}
+
+int (*gIPC_MessageHandlers[])(tIPC_Client *Client, tAxWin_IPCMessage *Msg) = {
+       IPC_Msg_Ping,
+       IPC_Msg_GetDisplayCount,
+       IPC_Msg_GetDisplayDims,
+       IPC_Msg_SendMsg,
+       IPC_Msg_CreateWin,
+       NULL,   // Destroy window
+       IPC_Msg_SetWindowTitle,
+       IPC_Msg_ShowWindow,
+       IPC_Msg_DecorateWindow,
+       IPC_Msg_FocusWindow,
+       IPC_Msg_SetWinPos,
+       IPC_Msg_RegisterAction
+};
+const int giIPC_NumMessageHandlers = sizeof(gIPC_MessageHandlers)/sizeof(gIPC_MessageHandlers[0]);
+
 void IPC_Handle(const tIPC_Type *IPCType, const void *Ident, size_t MsgLen, tAxWin_IPCMessage *Msg)
 {
        tIPC_Client     *client;
+        int    rv = 0;
        
        _SysDebug("IPC_Handle: (IPCType=%p, Ident=%p, MsgLen=%i, Msg=%p)",
                IPCType, Ident, MsgLen, Msg);
@@ -323,42 +550,43 @@ void IPC_Handle(const tIPC_Type *IPCType, const void *Ident, size_t MsgLen, tAxW
        
        client = IPC_int_GetClient(IPCType, Ident);
 
-       switch((enum eAxWin_IPCMessageTypes) Msg->ID)
-       {
-       // --- Ping message (reset timeout and get server version)
-       case IPCMSG_PING:
-               _SysDebug(" IPC_Handle: IPCMSG_PING");
-               if( Msg->Size < 4 )     return;
-               if( Msg->Flags & IPCMSG_FLAG_RETURN )
-               {
-                       Msg->ID = IPCMSG_PING;
-                       Msg->Size = sizeof(tIPCMsg_Return);
-                       ((tIPCMsg_Return*)Msg->Data)->Value = AXWIN_VERSION;
-                       IPCType->SendMessage(Ident, sizeof(tIPCMsg_Return), Msg);
-               }
-               break;
-
-       // --- Create window
-       case IPCMSG_CREATEWIN:
-               _SysDebug(" IPC_Handle: IPCMSG_CREATEWIN");
-               IPC_Msg_CreateWin(client, Msg);
-               break;
-       // --- Show/Hide a window
-       case IPCMSG_SHOWWINDOW:
-               _SysDebug(" IPC_Handle: IPCMSG_SHOWWINDOW");
-               IPC_Msg_ShowWindow(client, Msg);
-               break;
-       // --- Move/Resize a window
-       case IPCMSG_SETWINPOS:
-               _SysDebug(" IPC_Handle: IPCMSG_SETWINPOS");
-               IPC_Msg_SetWinPos(client, Msg);
-               break;
-
-       // --- Unknown message
-       default:
+       if( Msg->ID >= giIPC_NumMessageHandlers ) {
                fprintf(stderr, "WARNING: Unknown message %i (%p)\n", Msg->ID, IPCType);
                _SysDebug("WARNING: Unknown message %i (%p)", Msg->ID, IPCType);
-               break;
+               return ;
+       }
+       
+       if( !gIPC_MessageHandlers[ Msg->ID ] ) {
+               fprintf(stderr, "WARNING: Message %i does not have a handler\n", Msg->ID);
+               _SysDebug("WARNING: Message %i does not have a handler", Msg->ID);
+               return ;
        }
+
+       _SysDebug("IPC_Handle: Msg->ID = %i", Msg->ID);
+       rv = gIPC_MessageHandlers[Msg->ID](client, Msg);
+       _SysDebug("IPC_Handle: rv = %i", rv);
+}
+
+// --- Server->Client replies
+void IPC_SendWMMessage(tIPC_Client *Client, uint32_t Src, uint32_t Dst, int MsgID, int Len, void *Data)
+{
+       tAxWin_IPCMessage       *hdr;
+       tIPCMsg_SendMsg         *msg;
+       char    buf[sizeof(*hdr)+sizeof(*msg)+Len];
+       
+       hdr = (void*)buf;
+       msg = (void*)hdr->Data;
+       
+       hdr->ID = IPCMSG_SENDMSG;
+       hdr->Flags = 0;
+       hdr->Size = sizeof(*msg) + Len;
+       hdr->Window = Dst;
+       
+       msg->Remote = Src;
+       msg->ID = MsgID;
+       msg->Length = Len;
+       memcpy(msg->Data, Data, Len);
+       
+       Client->IPCType->SendMessage(Client->Ident, sizeof(buf), buf);
 }
 

UCC git Repository :: git.ucc.asn.au