X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2Flibaxwin3.so_src%2Fr_widget.c;h=62e42779c9fb91871c8c60e2ae5db6b0ca4fbc33;hb=97088ef688ddecc19077ce134046af7ea6d1e232;hp=875f14b87c9985bc18f4ab02e9aa4be9cfe7d337;hpb=8c12dd82f2a4e01d8de5d29db6d4fdd0802c7e83;p=tpg%2Facess2.git diff --git a/Usermode/Applications/axwin3_src/libaxwin3.so_src/r_widget.c b/Usermode/Applications/axwin3_src/libaxwin3.so_src/r_widget.c index 875f14b8..62e42779 100644 --- a/Usermode/Applications/axwin3_src/libaxwin3.so_src/r_widget.c +++ b/Usermode/Applications/axwin3_src/libaxwin3.so_src/r_widget.c @@ -8,7 +8,6 @@ #include #include #include "include/internal.h" -#include "include/ipc.h" #include #include #include @@ -47,6 +46,33 @@ tAxWin3_Widget *AxWin3_Widget_int_GetElementByID(tHWND Window, uint32_t ID) return info->Elements[ID]; } +uint32_t AxWin3_Widget_int_AllocateID(tWidgetWindowInfo *Info) +{ + uint32_t newID; + // BUG BUG BUG - Double Allocations! (citation needed) + // TODO: Atomicity + for( newID = Info->FirstFreeID; newID < Info->nElements; newID ++ ) + { + if( Info->Elements[newID] == NULL ) + break; + } + if( newID == Info->nElements ) + { + const int size_step = 4; + Info->nElements += 4; + Info->Elements = realloc(Info->Elements, sizeof(*Info->Elements)*Info->nElements); + newID = Info->nElements - 4; + memset( &Info->Elements[newID+1], 0, (size_step-1)*sizeof(Info->Elements)); + _SysDebug("Widget: Expanded to %i and allocated %i", Info->nElements, newID); + } + else + _SysDebug("Widget: Allocated %i", newID); + Info->Elements[newID] = (void*)-1; + + return newID; + +} + int AxWin3_Widget_MessageHandler(tHWND Window, int MessageID, int Size, void *Data) { tAxWin3_Widget *widget; @@ -59,7 +85,7 @@ int AxWin3_Widget_MessageHandler(tHWND Window, int MessageID, int Size, void *Da widget = AxWin3_Widget_int_GetElementByID(Window, msg->WidgetID); if(widget->Fire) widget->Fire(widget); - return 0; } + return 1; } default: return 0; } @@ -109,26 +135,7 @@ tAxWin3_Widget *AxWin3_Widget_AddWidget(tAxWin3_Widget *Parent, int Type, int Fl info = AxWin3_int_GetDataPtr(Parent->Window); - // Assign ID - // BUG BUG BUG - Double Allocations! - // TODO: Atomicity - for( newID = info->FirstFreeID; newID < info->nElements; newID ++ ) - { - if( info->Elements[newID] == NULL ) - break; - } - if( newID == info->nElements ) - { - const int size_step = 4; - info->nElements += 4; - info->Elements = realloc(info->Elements, sizeof(*info->Elements)*info->nElements); - newID = info->nElements - 4; - memset( &info->Elements[newID+1], 0, (size_step-1)*sizeof(info->Elements)); - _SysDebug("Expanded to %i and allocated %i", info->nElements, newID); - } - else - _SysDebug("Allocated %i", newID); - info->Elements[newID] = (void*)-1; + newID = AxWin3_Widget_int_AllocateID(info); // Create new widget structure ret = calloc(sizeof(tAxWin3_Widget), 1); @@ -139,26 +146,53 @@ tAxWin3_Widget *AxWin3_Widget_AddWidget(tAxWin3_Widget *Parent, int Type, int Fl // Send create widget message { - char tmp[sizeof(tWidgetMsg_Create)+1]; - tWidgetMsg_Create *msg = (void*)tmp; + char tmp[sizeof(tWidgetIPC_Create)+1]; + tWidgetIPC_Create *msg = (void*)tmp; msg->Parent = Parent->ID; msg->NewID = newID; msg->Type = Type; msg->Flags = Flags; msg->DebugName[0] = '\0'; - AxWin3_SendMessage(ret->Window, ret->Window, MSG_WIDGET_CREATE, sizeof(tmp), tmp); + AxWin3_SendIPC(ret->Window, IPC_WIDGET_CREATE, sizeof(tmp), tmp); } return ret; } +tAxWin3_Widget *AxWin3_Widget_AddWidget_SubWindow(tAxWin3_Widget *Parent, tHWND Window, int Flags, const char *DbgName) +{ + tWidgetWindowInfo *info = AxWin3_int_GetDataPtr(Parent->Window); + int newID = AxWin3_Widget_int_AllocateID(info); + + tAxWin3_Widget *ret = calloc(sizeof(tAxWin3_Widget), 1); + ret->Window = Parent->Window; + ret->ID = newID; + info->Elements[newID] = ret; + + // Send message + { + char tmp[sizeof(tWidgetIPC_CreateSubWin)+1]; + tWidgetIPC_CreateSubWin *msg = (void*)tmp; + msg->Parent = Parent->ID; + msg->NewID = newID; + msg->Type = ELETYPE_SUBWIN; + msg->Flags = Flags; // TODO: Flags + msg->WindowHandle = AxWin3_int_GetWindowID(Window); + msg->DebugName[0] = '\0'; + AxWin3_SendIPC(ret->Window, IPC_WIDGET_CREATESUBWIN, sizeof(tmp), tmp); + } + + return ret; +} + + void AxWin3_Widget_DelWidget(tAxWin3_Widget *Widget) { - tWidgetMsg_Delete msg; + tWidgetIPC_Delete msg; tWidgetWindowInfo *info = AxWin3_int_GetDataPtr(Widget->Window); msg.WidgetID = Widget->ID; - AxWin3_SendMessage(Widget->Window, Widget->Window, MSG_WIDGET_DELETE, sizeof(msg), &msg); + AxWin3_SendIPC(Widget->Window, IPC_WIDGET_DELETE, sizeof(msg), &msg); info->Elements[Widget->ID] = NULL; if(Widget->ID < info->FirstFreeID) @@ -200,64 +234,61 @@ void AxWin3_Widget_SetMouseButtonHandler(tAxWin3_Widget *Widget, tAxWin3_Widget_ // --- Manipulation void AxWin3_Widget_SetFlags(tAxWin3_Widget *Widget, int FlagSet, int FlagMask) { - tWidgetMsg_SetFlags msg; + tWidgetIPC_SetFlags msg; msg.WidgetID = Widget->ID; msg.Value = FlagSet; msg.Mask = FlagMask; - AxWin3_SendMessage(Widget->Window, Widget->Window, MSG_WIDGET_SETFLAGS, sizeof(msg), &msg); + AxWin3_SendIPC(Widget->Window, IPC_WIDGET_SETFLAGS, sizeof(msg), &msg); } void AxWin3_Widget_SetSize(tAxWin3_Widget *Widget, int Size) { - tWidgetMsg_SetSize msg; + tWidgetIPC_SetSize msg; msg.WidgetID = Widget->ID; msg.Value = Size; - AxWin3_SendMessage(Widget->Window, Widget->Window, MSG_WIDGET_SETSIZE, sizeof(msg), &msg); + AxWin3_SendIPC(Widget->Window, IPC_WIDGET_SETSIZE, sizeof(msg), &msg); } void AxWin3_Widget_SetText(tAxWin3_Widget *Widget, const char *Text) { - char buf[sizeof(tWidgetMsg_SetText) + strlen(Text) + 1]; - tWidgetMsg_SetText *msg = (void*)buf; + char buf[sizeof(tWidgetIPC_SetText) + strlen(Text) + 1]; + tWidgetIPC_SetText *msg = (void*)buf; msg->WidgetID = Widget->ID; strcpy(msg->Text, Text); - AxWin3_SendMessage(Widget->Window, Widget->Window, MSG_WIDGET_SETTEXT, sizeof(buf), buf); + AxWin3_SendIPC(Widget->Window, IPC_WIDGET_SETTEXT, sizeof(buf), buf); } char *AxWin3_Widget_GetText(tAxWin3_Widget *Widget) { - char buf[sizeof(tWidgetMsg_SetText)]; - tWidgetMsg_SetText *msg = (void*)buf; - tAxWin_IPCMessage *retmsg; - char *ret; + char buf[sizeof(tWidgetIPC_SetText)]; + tWidgetIPC_SetText *msg = (void*)buf; + size_t retmsg_size; msg->WidgetID = Widget->ID; - AxWin3_SendMessage(Widget->Window, Widget->Window, MSG_WIDGET_GETTEXT, sizeof(buf), buf); - - retmsg = AxWin3_int_WaitIPCMessage(MSG_WIDGET_GETTEXT); - msg = (void*)retmsg->Data; + AxWin3_SendIPC(Widget->Window, IPC_WIDGET_GETTEXT, sizeof(buf), buf); - if( retmsg->Size < sizeof(*msg) ) { - free(retmsg); + msg = AxWin3_WaitIPCMessage(Widget->Window, IPC_WIDGET_GETTEXT, &retmsg_size); + if( retmsg_size < sizeof(*msg) ) { + free(msg); return NULL; } - ret = strndup(msg->Text, retmsg->Size - sizeof(*msg)); - free(retmsg); + char *ret = strndup(msg->Text, retmsg_size - sizeof(*msg)); + free(msg); return ret; } void AxWin3_Widget_SetColour(tAxWin3_Widget *Widget, int Index, tAxWin3_Colour Colour) { - tWidgetMsg_SetColour msg; + tWidgetIPC_SetColour msg; msg.WidgetID = Widget->ID; msg.Index = Index; msg.Colour = Colour; - AxWin3_SendMessage(Widget->Window, Widget->Window, MSG_WIDGET_SETCOLOUR, sizeof(msg), &msg); + AxWin3_SendIPC(Widget->Window, IPC_WIDGET_SETCOLOUR, sizeof(msg), &msg); }