X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2Fipc.c;h=cbed7fd17bcb81c6eb46b37916ad3b14ae9b0f00;hb=8dcc3e209d0d728565a18c8dca2b0ba220b74a6f;hp=46aff215dd9287e7995fd75dff7bbe16cef66d94;hpb=cee7338738f1a68c7eb7b956cab8d9fb83f95714;p=tpg%2Facess2.git diff --git a/Usermode/Applications/axwin3_src/WM/ipc.c b/Usermode/Applications/axwin3_src/WM/ipc.c index 46aff215..cbed7fd1 100644 --- a/Usermode/Applications/axwin3_src/WM/ipc.c +++ b/Usermode/Applications/axwin3_src/WM/ipc.c @@ -13,6 +13,7 @@ #include #include #include +#include #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)) @@ -259,10 +270,88 @@ void IPC_int_SetWindow(tIPC_Client *Client, uint32_t WindowID, tWindow *WindowPt } // --- 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) ) @@ -280,27 +369,13 @@ int IPC_Msg_SendMsg(tIPC_Client *Client, tAxWin_IPCMessage *Msg) return 0; } -int IPC_Msg_FocusWindow(tIPC_Client *Client, tAxWin_IPCMessage *Msg) -{ - tWindow *win; - - // 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_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(*info) + 1 ) { @@ -335,6 +410,8 @@ 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; @@ -351,6 +428,8 @@ int IPC_Msg_ShowWindow(tIPC_Client *Client, tAxWin_IPCMessage *Msg) 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); @@ -375,11 +454,31 @@ int IPC_Msg_DecorateWindow(tIPC_Client *Client, tAxWin_IPCMessage *Msg) 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); @@ -395,62 +494,47 @@ int IPC_Msg_SetWinPos(tIPC_Client *Client, tAxWin_IPCMessage *Msg) return 0; } -int IPC_Msg_GetDisplayCount(tIPC_Client *Client, tAxWin_IPCMessage *Msg) +int IPC_Msg_RegisterAction(tIPC_Client *Client, tAxWin_IPCMessage *Msg) { - tAxWin_IPCMessage *ret_hdr; - tIPCMsg_ReturnInt *ret; - char buf[sizeof(*ret_hdr)+sizeof(*ret)]; - - 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 + tIPCMsg_RegAction *info = (void*)Msg->Data; + tWindow *win; - Client->IPCType->SendMessage(Client->Ident, sizeof(buf), buf); - return 0; -} + ASSERT(Msg->ID == IPCMSG_REGACTION); -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)]; + if( Msg->Size < sizeof(*info) + 1 ) + return -1; - if( !(Msg->Flags & IPCMSG_FLAG_RETURN) ) return 0; + win = IPC_int_GetWindow(Client, Msg->Window); + if(!win) return 1; - info = (void*)Msg->Data; + 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); - 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 (*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; @@ -466,79 +550,21 @@ 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 ) - { - tIPCMsg_ReturnInt *ret = (void*)Msg->Data; - Msg->ID = IPCMSG_PING; - Msg->Size = sizeof(*ret); - ret->Value = AXWIN_VERSION; - IPCType->SendMessage(Ident, sizeof(*Msg)+sizeof(*ret), Msg); - } - break; - - // -- Get display count - case IPCMSG_GETDISPLAYCOUNT: - rv = IPC_Msg_GetDisplayCount(client, Msg); - break; - - // --- Get display dimensions - case IPCMSG_GETDISPLAYDIMS: - rv = IPC_Msg_GetDisplayDims(client, Msg); - break; - - // --- Send a message - case IPCMSG_SENDMSG: - _SysDebug(" IPC_Handle: IPCMSG_SENDMSG %i", ((tIPCMsg_SendMsg*)Msg->Data)->ID); - rv = IPC_Msg_SendMsg(client, Msg); - break; - - // --- Create window - case IPCMSG_CREATEWIN: - _SysDebug(" IPC_Handle: IPCMSG_CREATEWIN"); - rv = IPC_Msg_CreateWin(client, Msg); - break; - // TODO: Destroy window - - // --- Set window title - case IPCMSG_SETWINTITLE: - _SysDebug(" IPC_Handle: IPCMSG_SETWINTITLE"); - rv = IPC_Msg_SetWindowTitle(client, Msg); - break; - - // --- Give a window focus - case IPCMSG_FOCUSWINDOW: - _SysDebug(" IPC_Handle: IPCMSG_FOCUSWINDOW"); - rv = IPC_Msg_FocusWindow(client, Msg); - break; - // --- Show/Hide a window - case IPCMSG_SHOWWINDOW: - _SysDebug(" IPC_Handle: IPCMSG_SHOWWINDOW"); - rv = IPC_Msg_ShowWindow(client, Msg); - break; - case IPCMSG_DECORATEWINDOW: - _SysDebug(" IPC_Handle: IPCMSG_DECORATEWINDOW"); - rv = IPC_Msg_DecorateWindow(client, Msg); - break; - // --- Move/Resize a window - case IPCMSG_SETWINPOS: - _SysDebug(" IPC_Handle: IPCMSG_SETWINPOS"); - rv = 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(rv) - _SysDebug("IPC_Handle: rv = %i", rv); + + 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