Mercurial > hg > toolkit / changeset

--- a/application/main.c	Sat Dec 13 13:19:29 2025 +0100
+++ b/application/main.c	Sun Dec 14 18:54:57 2025 +0100
@@ -1305,6 +1305,7 @@
             ui_button(obj, .label = "Test 1");
             ui_button(obj, .label = "Test 2");
             ui_button(obj, .label = "Test 3");
+            ui_checkbox(obj, .label = "Test 4", .varname = "check1");
         }
     }
     ui_show(obj);

--- a/ui/server/button.c	Sat Dec 13 13:19:29 2025 +0100
+++ b/ui/server/button.c	Sun Dec 14 18:54:57 2025 +0100
@@ -33,6 +33,7 @@
 #include "args.h"
 #include "container.h"
 #include "widget.h"
+#include "var.h"
 
 cxmutstr ui_button_args_to_string(UiContext *ctx, UiButtonArgs *args) {
     CxBuffer buf;
@@ -51,8 +52,22 @@
     return cx_mutstrn(buf.space, buf.size);
 }
 
-cxmutstr ui_toggle_args_to_string(UiContext *ctx, UiToggleArgs *args) {
+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);
+    
+    cxBufferPutString(&buf, "{");
     
+    UI_STANDARD_ARGS(&buf, args);
+    UI_LABEL_ARGS(&buf, args);
+    if(value.ptr) ui_argstr_add_str(&buf, "value", value.ptr);
+    // TODO: labeltype, states
+    
+    if(buf.size > 0 && buf.space[buf.size-1] == ',') {
+        buf.space[buf.size-1] = ' ';
+    }
+    cxBufferPutString(&buf, "}");
+    return cx_mutstrn(buf.space, buf.size);
 }
 
 
@@ -80,13 +95,42 @@
     ui_serialize_type_obj_id(&w->widget, &buf);
     cxBufferPutString(&buf, ",\"args\":");
     cxBufferPutString(&buf, w->widget.args.ptr);
+    if(w->widget.var_id.ptr) {
+        cxBufferPutString(&buf, ",\"value\":\"");
+        cxBufferPutString(&buf, w->widget.var_id.ptr);
+        cxBufferPutString(&buf, "\"");
+    }
     cxBufferPutString(&buf, "}\n");
     
     return cx_mutstrn(buf.space, buf.size);
 }
 
 static UIWIDGET togglebutton_create(UiObject *obj, const char *type, UiToggleArgs *args) {
-    return NULL;
+    cxmutstr var_id = cx_mutstrn(NULL, 0);
+    UiVar* var = uic_widget_var(obj->ctx, obj->ctx, args->value, args->varname, UI_VAR_INTEGER);
+    if(var) {
+        UiInteger *i = var->value;
+        if(!i->obj) {
+            ui_server_bind_int(obj->ctx, i);
+        }
+        var_id = cx_mutstr(i->obj);
+    }
+    
+    UiCallbackWidget *widget = cxZalloc(obj->ctx->allocator, sizeof(UiCallbackWidget));
+    widget->widget.obj = obj->widget->obj;
+    widget->widget.type = cx_str(type);
+    widget->widget.args = ui_toggle_args_to_string(obj->ctx, args, var_id);
+    widget->widget.var_id = var_id;
+    widget->widget.var_type = UI_VAR_INTEGER;
+    widget->widget.serialize = (ui_serialize_func)ui_button_serialize;
+    widget->callback = args->onchange;
+    widget->userdata = args->onchangedata;
+    ui_reg_widget((UiWidget*)widget);
+    
+    UiWidget *parent = obj->container_end->container;
+    cxListAdd(parent->children, widget);
+    
+    return (UiWidget*)widget;
 }
 
 UIWIDGET ui_togglebutton_create(UiObject *obj, UiToggleArgs *args) {

--- a/ui/server/button.h	Sat Dec 13 13:19:29 2025 +0100
+++ b/ui/server/button.h	Sun Dec 14 18:54:57 2025 +0100
@@ -38,7 +38,7 @@
 #endif
 
 cxmutstr ui_button_args_to_string(UiContext *ctx, UiButtonArgs *args);
-cxmutstr ui_toggle_args_to_string(UiContext *ctx, UiToggleArgs *args);
+cxmutstr ui_toggle_args_to_string(UiContext *ctx, UiToggleArgs *args, cxmutstr value);
 
 cxmutstr ui_button_serialize(UiCallbackWidget *w);
 

--- a/ui/server/objs.mk	Sat Dec 13 13:19:29 2025 +0100
+++ b/ui/server/objs.mk	Sun Dec 14 18:54:57 2025 +0100
@@ -32,6 +32,7 @@
 SERVEROBJ = toolkit.o
 SERVEROBJ += widget.o
 SERVEROBJ += args.o
+SERVEROBJ += var.o
 SERVEROBJ += window.o
 SERVEROBJ += container.o
 SERVEROBJ += button.o

--- a/ui/server/toolkit.c	Sat Dec 13 13:19:29 2025 +0100
+++ b/ui/server/toolkit.c	Sun Dec 14 18:54:57 2025 +0100
@@ -125,7 +125,7 @@
     UiSrvObj *obj = cxZalloc(a, sizeof(UiSrvObj));
     
     char id[32];
-    snprintf(id, 32, "%" PRIu64, srv_obj_id_counter++);
+    snprintf(id, 32, "%" PRIx64, srv_obj_id_counter++);
     obj->id = cx_strdup_a(a, id);
     obj->ctx = ctx;
     
@@ -138,9 +138,8 @@
     UiSrvObj *obj = widget->obj;
     
     char id[32];
-    snprintf(id, 32, "%" PRIu64, obj->widget_id_counter++);
+    snprintf(id, 32, "%" PRIx64, obj->widget_id_counter++);
     
     widget->id = cx_strdup_a(widget->obj->ctx->allocator, cx_str(id));
     cxMapPut(obj->widgets, id, widget);
 }
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ui/server/var.c	Sun Dec 14 18:54:57 2025 +0100
@@ -0,0 +1,88 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2025 Olaf Wintermann. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "toolkit.h"
+
+#include "var.h"
+
+static uint64_t var_counter = 0;
+
+char* ui_generate_var_id(const CxAllocator *a) {
+    char id[32];
+    snprintf(id, 32, "%" PRIx64, var_counter++);
+    return cx_strdup_a(a, id).ptr;
+}
+
+cxmutstr ui_server_bind_int(UiContext *ctx, UiInteger *i) {
+    i->obj = ui_generate_var_id(ctx->allocator);
+    i->get = ui_server_int_get;
+    i->set = ui_server_int_set;
+    return cx_mutstr(i->obj);
+}
+
+cxmutstr ui_server_bind_double(UiContext *ctx, UiDouble *d) {
+    d->obj = ui_generate_var_id(ctx->allocator);
+    d->get = ui_server_double_get;
+    d->set = ui_server_double_set;
+    return cx_mutstr(d->obj);
+}
+
+cxmutstr ui_server_bind_string(UiContext *ctx, UiString *s) {
+    s->obj = ui_generate_var_id(ctx->allocator);
+    s->get = ui_server_string_get;
+    s->set  = ui_server_string_set;
+    return cx_mutstr(s->obj);
+}
+
+
+int64_t ui_server_int_get(UiInteger *i) {
+    return 0;
+}
+
+void ui_server_int_set(UiInteger *i, int64_t value) {
+    
+}
+
+double ui_server_double_get(UiDouble *d) {
+    return 0;
+}
+
+void ui_server_double_set(UiDouble *d, double value) {
+    
+}
+
+char* ui_server_string_get(UiString *s) {
+    return NULL;
+}
+
+void ui_server_string_set(UiString *s, const char *str) {
+    
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ui/server/var.h	Sun Dec 14 18:54:57 2025 +0100
@@ -0,0 +1,61 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2025 Olaf Wintermann. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef VAR_H
+#define VAR_H
+
+#include "../ui/toolkit.h"
+#include <cx/allocator.h>
+#include <cx/string.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+char* ui_generate_var_id(const CxAllocator *a);
+
+cxmutstr ui_server_bind_int(UiContext *ctx, UiInteger *i);
+cxmutstr ui_server_bind_double(UiContext *ctx, UiDouble *d);
+cxmutstr ui_server_bind_string(UiContext *ctx, UiString *s);
+
+int64_t ui_server_int_get(UiInteger *i);
+void ui_server_int_set(UiInteger *i, int64_t value);
+
+double ui_server_double_get(UiDouble *d);
+void ui_server_double_set(UiDouble *d, double value);
+
+char* ui_server_string_get(UiString *s);
+void ui_server_string_set(UiString *s, const char *str);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* VAR_H */
+