Usermode/AxWin3 - Implementing window creation

[tpg/acess2.git] / Usermode / Libraries / libaxwin3.so_src / wm.c

diff --git a/Usermode/Libraries/libaxwin3.so_src/wm.c b/Usermode/Libraries/libaxwin3.so_src/wm.c
index 7315c05..9f15ad7 100644 (file)
--- a/Usermode/Libraries/libaxwin3.so_src/wm.c
+++ b/Usermode/Libraries/libaxwin3.so_src/wm.c
@@ -40,7 +40,49 @@ tWindow *AxWin3_int_CreateWindowStruct(uint32_t ServerID, int ExtraBytes)
        return ret;
 }
 
-tHWND AxWin3_CreateWindow(tHWND Parent, const char *Renderer, int Flags, int DataBytes, void **DataPtr)
+tWindow *AxWin3_int_AllocateWindowInfo(int DataBytes, int *WinID)
+{
+        int    idx, newWinID;
+       tWindowBlock *block, *prev;
+       tWindow *ret;   
+
+       block = &gAxWin3_WindowList;
+       newWinID = giAxWin3_LowestFreeWinID;
+       for( idx = 0; block; newWinID ++ )
+       {
+               if( block->Windows[idx] == NULL )
+                       break;
+               idx ++;
+               if(idx == WINDOWS_PER_ALLOC) {
+                       prev = block;
+                       block = block->Next;
+                       idx = 0;
+               }
+       }
+       
+       if( !block )
+       {
+               block = calloc(sizeof(tWindowBlock), 1);
+               prev->Next = block;
+               idx = 0;
+       }
+       
+       ret = block->Windows[idx] = AxWin3_int_CreateWindowStruct(newWinID, DataBytes);
+       if(newWinID > giAxWin3_HighestUsedWinID)
+               giAxWin3_HighestUsedWinID = newWinID;
+       if(newWinID == giAxWin3_LowestFreeWinID)
+               giAxWin3_HighestUsedWinID ++;
+
+       if(WinID)       *WinID = newWinID;
+
+       return ret;
+}
+
+tHWND AxWin3_CreateWindow(
+       tHWND Parent, const char *Renderer, int Flags,
+       int DataBytes, void **DataPtr,
+       tAxWin3_WindowMessageHandler MessageHandler
+       )
 {
        tWindow *ret;
         int    newWinID;
@@ -48,40 +90,10 @@ tHWND AxWin3_CreateWindow(tHWND Parent, const char *Renderer, int Flags, int Dat
        tAxWin_IPCMessage       *msg;
        tIPCMsg_CreateWin       *create_win;
 
-       // TODO: Validate `Parent`
-       
        // Allocate a window ID
-       {
-                int    idx;
-               tWindowBlock *block, *prev;
-               block = &gAxWin3_WindowList;
-               newWinID = giAxWin3_LowestFreeWinID;
-               for( idx = 0; block; newWinID ++ )
-               {
-                       if( block->Windows[idx] == NULL )
-                               break;
-                       idx ++;
-                       if(idx == WINDOWS_PER_ALLOC) {
-                               prev = block;
-                               block = block->Next;
-                               idx = 0;
-                       }
-               }
-               
-               if( !block )
-               {
-                       block = calloc(sizeof(tWindowBlock), 1);
-                       prev->Next = block;
-                       idx = 0;
-               }
-               
-               ret = block->Windows[idx] = AxWin3_int_CreateWindowStruct(newWinID, DataBytes);
-
-               if(newWinID > giAxWin3_HighestUsedWinID)
-                       giAxWin3_HighestUsedWinID = newWinID;
-               if(newWinID == giAxWin3_LowestFreeWinID)
-                       giAxWin3_HighestUsedWinID ++;
-       }
+       ret = AxWin3_int_AllocateWindowInfo(DataBytes, &newWinID);
+       if(!ret)        return NULL;
+       ret->Handler = MessageHandler;
 
        // Create message
        msg = AxWin3_int_AllocateIPCMessage(Parent, IPCMSG_CREATEWIN, 0, dataSize);
@@ -94,7 +106,7 @@ tHWND AxWin3_CreateWindow(tHWND Parent, const char *Renderer, int Flags, int Dat
        AxWin3_int_SendIPCMessage(msg);
        free(msg);
 
-       // TODO: Detect errors in AxWin3_CreateWindow
+       // TODO: Detect and handle possible errors
 
        // Return success
        if(DataPtr)     *DataPtr = ret->Data;
@@ -103,4 +115,74 @@ tHWND AxWin3_CreateWindow(tHWND Parent, const char *Renderer, int Flags, int Dat
 
 void AxWin3_DestroyWindow(tHWND Window)
 {
+       tAxWin_IPCMessage       *msg;
+       
+       msg = AxWin3_int_AllocateIPCMessage(Window, IPCMSG_DESTROYWIN, 0, 0);
+       AxWin3_int_SendIPCMessage(msg);
+       free(msg);
+}
+
+void AxWin3_ShowWindow(tHWND Window, int bShow)
+{
+       tAxWin_IPCMessage       *msg;
+       tIPCMsg_ShowWindow      *info;
+
+       msg = AxWin3_int_AllocateIPCMessage(Window, IPCMSG_SHOWWINDOW, 0, sizeof(*info));
+       info = (void*)msg->Data;
+       info->bShow = !!bShow;
+       
+       AxWin3_int_SendIPCMessage(msg);
+       
+       free(msg);
+}
+
+void AxWin3_SetWindowPos(tHWND Window, short X, short Y, short W, short H)
+{
+       tAxWin_IPCMessage       *msg;
+       tIPCMsg_SetWindowPos    *info;
+       
+       msg = AxWin3_int_AllocateIPCMessage(Window, IPCMSG_SETWINPOS, 0, sizeof(*info));
+       info = (void*)msg->Data;
+
+       info->Fields = 0xF;
+       info->X = X;    info->Y = Y;
+       info->W = W;    info->H = H;
+
+       AxWin3_int_SendIPCMessage(msg); 
+       free(msg);
+}
+
+void AxWin3_MoveWindow(tHWND Window, short X, short Y)
+{
+       tAxWin_IPCMessage       *msg;
+       tIPCMsg_SetWindowPos    *info;
+       
+       msg = AxWin3_int_AllocateIPCMessage(Window, IPCMSG_SETWINPOS, 0, sizeof(*info));
+       info = (void*)msg->Data;
+
+       info->Fields = 0x3;
+       info->X = X;
+       info->Y = Y;
+       
+       AxWin3_int_SendIPCMessage(msg);
+       
+       free(msg);
+}
+
+void AxWin3_ResizeWindow(tHWND Window, short W, short H)
+{
+       tAxWin_IPCMessage       *msg;
+       tIPCMsg_SetWindowPos    *info;
+       
+       msg = AxWin3_int_AllocateIPCMessage(Window, IPCMSG_SETWINPOS, 0, sizeof(*info));
+       info = (void*)msg->Data;
+
+       info->Fields = 0xC;
+       info->W = W;
+       info->H = H;
+       
+       AxWin3_int_SendIPCMessage(msg);
+       
+       free(msg);
 }
+