X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2Flibaxwin3.so_src%2Fr_widget.c;h=450e4b4f41079f196e3c3b526767e811a7e10735;hb=8dcc3e209d0d728565a18c8dca2b0ba220b74a6f;hp=9eb55bbd30a9ba4264a49ca9896abc52968e9cbc;hpb=f42e912b8bc615c2009b795ce12d4c54cef4ee8b;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 9eb55bbd..450e4b4f 100644 --- a/Usermode/Applications/axwin3_src/libaxwin3.so_src/r_widget.c +++ b/Usermode/Applications/axwin3_src/libaxwin3.so_src/r_widget.c @@ -2,21 +2,27 @@ * AxWin3 Interface Library * - By John Hodge (thePowersGang) * - * main.c - * - Entrypoint and setup + * r_widget.c + * - Widget window type interface */ #include #include #include "include/internal.h" #include #include +#include // === STRUCTURES === struct sAxWin3_Widget { tHWND Window; uint32_t ID; - tAxWin3_Widget_Callback Callback; + // Callbacks + tAxWin3_Widget_FireCb Fire; + tAxWin3_Widget_KeyUpDownCb KeyUpDown; + tAxWin3_Widget_KeyFireCb KeyFire; + tAxWin3_Widget_MouseMoveCb MouseMove; + tAxWin3_Widget_MouseBtnCb MouseButton; }; typedef struct @@ -24,13 +30,38 @@ typedef struct int nElements; tAxWin3_Widget **Elements; int FirstFreeID; + tAxWin3_Widget RootElement; // Callbacks for each element } tWidgetWindowInfo; // === CODE === -int AxWin3_Widget_MessageHandler(tHWND Window, int Size, void *Data) +tAxWin3_Widget *AxWin3_Widget_int_GetElementByID(tHWND Window, uint32_t ID) { - return 0; + tWidgetWindowInfo *info; + if(!Window) return NULL; + + info = AxWin3_int_GetDataPtr(Window); + if(ID >= info->nElements) return NULL; + + return info->Elements[ID]; +} + +int AxWin3_Widget_MessageHandler(tHWND Window, int MessageID, int Size, void *Data) +{ + tAxWin3_Widget *widget; + + switch(MessageID) + { + case MSG_WIDGET_FIRE: { + tWidgetMsg_Fire *msg = Data; + if(Size < sizeof(*msg)) return -1; + widget = AxWin3_Widget_int_GetElementByID(Window, msg->WidgetID); + if(widget->Fire) widget->Fire(widget); + + return 0; } + default: + return 0; + } } tHWND AxWin3_Widget_CreateWindow(tHWND Parent, int W, int H, int RootEleFlags) @@ -44,10 +75,8 @@ tHWND AxWin3_Widget_CreateWindow(tHWND Parent, int W, int H, int RootEleFlags) ); info = AxWin3_int_GetDataPtr(ret); - info->nElements = 1; - info->Elements = malloc(sizeof(tAxWin3_Widget*)); - info->Elements[0] = (void*)(info + 1); // Get end of *info - info->FirstFreeID = 1; + info->RootElement.Window = ret; + info->RootElement.ID = -1; AxWin3_ResizeWindow(ret, W, H); @@ -66,7 +95,7 @@ void AxWin3_Widget_DestroyWindow(tHWND Window) tAxWin3_Widget *AxWin3_Widget_GetRoot(tHWND Window) { tWidgetWindowInfo *info = AxWin3_int_GetDataPtr(Window); - return info->Elements[0]; + return &info->RootElement; } tAxWin3_Widget *AxWin3_Widget_AddWidget(tAxWin3_Widget *Parent, int Type, int Flags, const char *DebugName) @@ -80,25 +109,30 @@ 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( info->Elements[newID] ) + if( newID == info->nElements ) { - info->nElements ++; + const int size_step = 4; + info->nElements += 4; info->Elements = realloc(info->Elements, sizeof(*info->Elements)*info->nElements); - newID = info->nElements - 1; + 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; // Create new widget structure - ret = malloc(sizeof(tAxWin3_Widget)); + ret = calloc(sizeof(tAxWin3_Widget), 1); ret->Window = Parent->Window; ret->ID = newID; - ret->Callback = NULL; info->Elements[newID] = ret; @@ -108,9 +142,118 @@ tAxWin3_Widget *AxWin3_Widget_AddWidget(tAxWin3_Widget *Parent, int Type, int Fl tWidgetMsg_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); } return ret; } + +void AxWin3_Widget_DelWidget(tAxWin3_Widget *Widget) +{ + tWidgetMsg_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); + + info->Elements[Widget->ID] = NULL; + if(Widget->ID < info->FirstFreeID) + info->FirstFreeID = Widget->ID; + free(Widget); +} + +// --- Callbacks +void AxWin3_Widget_SetFireHandler(tAxWin3_Widget *Widget, tAxWin3_Widget_FireCb Callback) +{ + if(!Widget) return; + Widget->Fire = Callback; +} + +void AxWin3_Widget_SetKeyHandler(tAxWin3_Widget *Widget, tAxWin3_Widget_KeyUpDownCb Callback) +{ + if(!Widget) return; + Widget->KeyUpDown = Callback; +} + +void AxWin3_Widget_SetKeyFireHandler(tAxWin3_Widget *Widget, tAxWin3_Widget_KeyFireCb Callback) +{ + if(!Widget) return; + Widget->KeyFire = Callback; +} + +void AxWin3_Widget_SetMouseMoveHandler(tAxWin3_Widget *Widget, tAxWin3_Widget_MouseMoveCb Callback) +{ + if(!Widget) return; + Widget->MouseMove = Callback; +} + +void AxWin3_Widget_SetMouseButtonHandler(tAxWin3_Widget *Widget, tAxWin3_Widget_MouseBtnCb Callback) +{ + if(!Widget) return; + Widget->MouseButton = Callback; +} + +// --- Manipulation +void AxWin3_Widget_SetFlags(tAxWin3_Widget *Widget, int FlagSet, int FlagMask) +{ + tWidgetMsg_SetFlags msg; + msg.WidgetID = Widget->ID; + msg.Value = FlagSet; + msg.Mask = FlagMask; + + AxWin3_SendMessage(Widget->Window, Widget->Window, MSG_WIDGET_SETFLAGS, sizeof(msg), &msg); +} + +void AxWin3_Widget_SetSize(tAxWin3_Widget *Widget, int Size) +{ + tWidgetMsg_SetSize msg; + + msg.WidgetID = Widget->ID; + msg.Value = Size; + AxWin3_SendMessage(Widget->Window, Widget->Window, MSG_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; + + msg->WidgetID = Widget->ID; + strcpy(msg->Text, Text); + + AxWin3_SendMessage(Widget->Window, Widget->Window, MSG_WIDGET_SETTEXT, sizeof(buf), buf); +} + +char *AxWin3_Widget_GetText(tAxWin3_Widget *Widget) +{ + char buf[sizeof(tWidgetMsg_SetText)]; + tWidgetMsg_SetText *msg = (void*)buf; + size_t retmsg_size; + + msg->WidgetID = Widget->ID; + + AxWin3_SendMessage(Widget->Window, Widget->Window, MSG_WIDGET_GETTEXT, sizeof(buf), buf); + + msg = AxWin3_WaitMessage(Widget->Window, MSG_WIDGET_GETTEXT, &retmsg_size); + if( retmsg_size < sizeof(*msg) ) { + free(msg); + return NULL; + } + + 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; + + msg.WidgetID = Widget->ID; + msg.Index = Index; + msg.Colour = Colour; + AxWin3_SendMessage(Widget->Window, Widget->Window, MSG_WIDGET_SETCOLOUR, sizeof(msg), &msg); +}