Mercurial > hg > toolkit / changeset

--- a/ui/server/button.c	Sun Dec 28 19:01:05 2025 +0100
+++ b/ui/server/button.c	Mon Dec 29 17:46:10 2025 +0100
@@ -37,7 +37,7 @@
 
 cxmutstr ui_button_args_to_string(UiContext *ctx, UiButtonArgs *args) {
     CxBuffer buf;
-    cxBufferInit(&buf, NULL, 256, ctx->allocator, CX_BUFFER_AUTO_EXTEND | CX_BUFFER_FREE_CONTENTS);
+    cxBufferInit(&buf, ctx->allocator, NULL, 256, CX_BUFFER_AUTO_EXTEND | CX_BUFFER_FREE_CONTENTS);
     
     cxBufferPutString(&buf, "{");
     
@@ -54,7 +54,7 @@
 
 cxmutstr ui_toggle_args_to_string(UiContext *ctx, UiToggleArgs *args, cxmutstr value) {
     CxBuffer buf;
-    cxBufferInit(&buf, NULL, 256, ctx->allocator, CX_BUFFER_AUTO_EXTEND | CX_BUFFER_FREE_CONTENTS);
+    cxBufferInit(&buf, ctx->allocator, NULL, 256, CX_BUFFER_AUTO_EXTEND | CX_BUFFER_FREE_CONTENTS);
     
     cxBufferPutString(&buf, "{");
     
@@ -89,7 +89,7 @@
 
 cxmutstr ui_button_serialize(UiCallbackWidget *w) {
     CxBuffer buf;
-    cxBufferInit(&buf, NULL, 1024, NULL, CX_BUFFER_AUTO_EXTEND | CX_BUFFER_FREE_CONTENTS);
+    cxBufferInit(&buf, cxDefaultAllocator, NULL, 1024, CX_BUFFER_AUTO_EXTEND | CX_BUFFER_FREE_CONTENTS);
     
     cxBufferPutString(&buf, "{");
     ui_serialize_type_obj_id(&w->widget, &buf);

--- a/ui/server/container.c	Sun Dec 28 19:01:05 2025 +0100
+++ b/ui/server/container.c	Mon Dec 29 17:46:10 2025 +0100
@@ -55,7 +55,7 @@
 
 cxmutstr ui_container_args_to_string(UiContext *ctx, UiContainerArgs *args) {
     CxBuffer buf;
-    cxBufferInit(&buf, NULL, 256, ctx->allocator, CX_BUFFER_AUTO_EXTEND | CX_BUFFER_FREE_CONTENTS);
+    cxBufferInit(&buf, ctx->allocator, NULL, 256, CX_BUFFER_AUTO_EXTEND | CX_BUFFER_FREE_CONTENTS);
     
     cxBufferPutString(&buf, "{");
     
@@ -79,7 +79,7 @@
     widget->obj = obj->widget->obj;
     widget->type = cx_str(type);
     widget->args = ui_container_args_to_string(obj->ctx, args);
-    widget->children = cxLinkedListCreate(a, NULL, CX_STORE_POINTERS);
+    widget->children = cxLinkedListCreate(a, CX_STORE_POINTERS);
     widget->serialize = ui_container_serialize;
     
     UiWidget *parent = obj->container_end->container;
@@ -109,7 +109,7 @@
 
 cxmutstr ui_container_serialize(UiWidget *w) {
     CxBuffer buf;
-    cxBufferInit(&buf, NULL, 1024, NULL, CX_BUFFER_AUTO_EXTEND | CX_BUFFER_FREE_CONTENTS);
+    cxBufferInit(&buf, cxDefaultAllocator, NULL, 1024, CX_BUFFER_AUTO_EXTEND | CX_BUFFER_FREE_CONTENTS);
     
     cxBufferPutString(&buf, "{");
     ui_serialize_type_obj_id(w, &buf);

--- a/ui/server/toolkit.c	Sun Dec 28 19:01:05 2025 +0100
+++ b/ui/server/toolkit.c	Mon Dec 29 17:46:10 2025 +0100
@@ -57,7 +57,7 @@
     
     message_handler = uic_simple_msg_handler(STDIN_FILENO, STDOUT_FILENO, ui_server_message_received);
     
-    srv_obj_map = cxHashMapCreateSimple(CX_STORE_POINTERS);
+    srv_obj_map = cxHashMapCreate(NULL, CX_STORE_POINTERS, 16);
 }
 
 const char* ui_appname() {

--- a/ui/server/window.c	Sun Dec 28 19:01:05 2025 +0100
+++ b/ui/server/window.c	Mon Dec 29 17:46:10 2025 +0100
@@ -41,7 +41,7 @@
     UiWindow *window = cxZalloc(a, sizeof(UiWindow));
     window->widget.obj = ui_create_server_object(obj->ctx);
     window->widget.type = cx_str(type);
-    window->widget.children = cxLinkedListCreate(a, NULL, CX_STORE_POINTERS);
+    window->widget.children = cxLinkedListCreate(a, CX_STORE_POINTERS);
     window->widget.serialize = (ui_serialize_func)ui_window_serialize;
     window->widget.invisible = TRUE;
     window->title = cx_strdup_a(a, title);
@@ -72,7 +72,7 @@
 
 cxmutstr ui_window_serialize(UiWindow *w) {
     CxBuffer buf;
-    cxBufferInit(&buf, NULL, 1024, NULL, CX_BUFFER_AUTO_EXTEND | CX_BUFFER_FREE_CONTENTS);
+    cxBufferInit(&buf, NULL, NULL, 1024, CX_BUFFER_AUTO_EXTEND | CX_BUFFER_FREE_CONTENTS);
     
     cxBufferPutString(&buf, "{");
     ui_serialize_type_obj_id(&w->widget, &buf);