--- a/ui/gtk/toolbar.c Tue Dec 08 15:19:31 2020 +0100
+++ b/ui/gtk/toolbar.c Thu Dec 10 13:42:25 2020 +0100
@@ -108,49 +108,58 @@
ucx_map_cstr_put(toolbar_items, name, item);
}
-void ui_toolitem_toggle_st(char *name, char *stockid, ui_callback f, void *udata) {
- ui_toolitem_toggle_stgr(name, stockid, f, udata, -1);
-}
-
-void ui_toolitem_toggle_stgr(char *name, char *stockid, ui_callback f, void *udata, ...) {
- UiStToolItem *item = malloc(sizeof(UiStToolItem));
- item->item.add_to = (ui_toolbar_add_f)add_toolitem_toggle_st_widget;
- item->stockid = stockid;
- item->callback = f;
- item->userdata = udata;
+void ui_toolitem_toggle(const char *name, const char *label, const char *img, UiInteger *i) {
+ UiToggleToolItem *item = malloc(sizeof(UiToggleToolItem));
+ item->item.add_to = (ui_toolbar_add_f)add_toolitem_toggle_widget;
+ item->label = label;
+ item->image = img;
+ item->stockid = NULL;
item->groups = NULL;
item->isimportant = 0;
-
- // add groups
- va_list ap;
- va_start(ap, udata);
- int group;
- while((group = va_arg(ap, int)) != -1) {
- item->groups = ucx_list_append(item->groups, (void*)(intptr_t)group);
- }
- va_end(ap);
+ item->value = i;
+ item->var = NULL;
ucx_map_cstr_put(toolbar_items, name, item);
}
-void ui_toolitem_toggle_imggr(char *name, char *label, char *img, ui_callback f, void *udata, ...) {
- UiToolItem *item = malloc(sizeof(UiToolItem));
+void ui_toolitem_toggle_st(const char *name, const char *stockid, UiInteger *i) {
+ UiToggleToolItem *item = malloc(sizeof(UiToggleToolItem));
+ item->item.add_to = (ui_toolbar_add_f)add_toolitem_toggle_widget;
+ item->label = NULL;
+ item->image = NULL;
+ item->stockid = stockid;
+ item->groups = NULL;
+ item->isimportant = 0;
+ item->value = i;
+ item->var = NULL;
+
+ ucx_map_cstr_put(toolbar_items, name, item);
+}
+
+void ui_toolitem_toggle_nv(const char *name, const char *label, const char *img, const char *intvar) {
+ UiToggleToolItem *item = malloc(sizeof(UiToggleToolItem));
item->item.add_to = (ui_toolbar_add_f)add_toolitem_toggle_widget;
item->label = label;
item->image = img;
- item->callback = f;
- item->userdata = udata;
+ item->stockid = NULL;
item->groups = NULL;
item->isimportant = 0;
+ item->value = NULL;
+ item->var = intvar;
- // add groups
- va_list ap;
- va_start(ap, udata);
- int group;
- while((group = va_arg(ap, int)) != -1) {
- item->groups = ucx_list_append(item->groups, (void*)(intptr_t)group);
- }
- va_end(ap);
+ ucx_map_cstr_put(toolbar_items, name, item);
+}
+
+void ui_toolitem_toggle_stnv(const char *name, const char *stockid, const char *intvar) {
+ UiToggleToolItem *item = malloc(sizeof(UiToggleToolItem));
+ item->item.add_to = (ui_toolbar_add_f)add_toolitem_toggle_widget;
+ item->label = NULL;
+ item->image = NULL;
+ item->stockid = stockid;
+ item->groups = NULL;
+ item->isimportant = 0;
+ item->value = NULL;
+ item->var = intvar;
ucx_map_cstr_put(toolbar_items, name, item);
}
@@ -299,33 +308,61 @@
}
}
-void add_toolitem_toggle_widget(GtkToolbar *tb, UiToolItem *item, UiObject *obj) {
- GtkToolItem *button = gtk_toggle_tool_button_new();
- gtk_tool_item_set_homogeneous(button, FALSE);
- if(item->label) {
- gtk_tool_button_set_label(GTK_TOOL_BUTTON(button), item->label);
+void add_toolitem_toggle_widget(GtkToolbar *tb, UiToggleToolItem *item, UiObject *obj) {
+ GtkToolItem *button;
+ if(item->stockid) {
+ button = gtk_toggle_tool_button_new_from_stock(item->stockid);
+ } else {
+ button = gtk_toggle_tool_button_new();
+ gtk_tool_item_set_homogeneous(button, FALSE);
+ if(item->label) {
+ gtk_tool_button_set_label(GTK_TOOL_BUTTON(button), item->label);
+ }
+ if(item->image) {
+ GdkPixbuf *pixbuf = ui_get_image(item->image);
+ GtkWidget *image = gtk_image_new_from_pixbuf(pixbuf);
+ gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(button), image);
+ }
}
- if(item->image) {
- GdkPixbuf *pixbuf = ui_get_image(item->image);
- GtkWidget *image = gtk_image_new_from_pixbuf(pixbuf);
- gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(button), image);
- }
- if(item->callback) {
- UiEventData *event = ucx_mempool_malloc(
- obj->ctx->mempool,
- sizeof(UiEventData));
- event->obj = obj;
- event->userdata = item->userdata;
- event->callback = item->callback;
-
- g_signal_connect(
- button,
- "toggled",
- G_CALLBACK(ui_button_toggled),
- event);
+ UiVar *var;
+ if(item->value) {
+ var = malloc(sizeof(UiVar));
+ var->value = item->value;
+ var->type = UI_VAR_SPECIAL;
+ var->from = NULL;
+ var->from_ctx = NULL;
+ } else {
+ var = uic_create_var(obj->ctx, item->var, UI_VAR_INTEGER);
}
+ if(var->value) {
+ UiInteger *i = var->value;
+ i->get = ui_tool_toggle_button_get;
+ i->set = ui_tool_toggle_button_set;
+ i->obj = button;
+
+ if(i->value != 0) {
+ gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(button), TRUE);
+ }
+ }
+
+ // register event
+ // the event func will call the UiInteger observer callbacks
+ UiEventData *event = ucx_mempool_malloc(
+ obj->ctx->mempool,
+ sizeof(UiEventData));
+ event->obj = obj;
+ event->userdata = var;
+ event->callback = NULL;
+
+ g_signal_connect(
+ button,
+ "toggled",
+ G_CALLBACK(ui_tool_button_toggled),
+ event);
+
+ // add item to toolbar
gtk_toolbar_insert(tb, button, -1);
if(item->groups) {
@@ -333,30 +370,29 @@
}
}
-void add_toolitem_toggle_st_widget(GtkToolbar *tb, UiStToolItem *item, UiObject *obj) {
- GtkToolItem *button = gtk_toggle_tool_button_new_from_stock(item->stockid);
- gtk_tool_item_set_homogeneous(button, FALSE);
+void ui_tool_button_toggled(GtkToggleToolButton *widget, UiEventData *event) {
+ UiEvent e;
+ e.obj = event->obj;
+ e.window = event->obj->window;
+ e.document = event->obj->ctx->document;
+ e.eventdata = NULL;
+ e.intval = gtk_toggle_tool_button_get_active(widget);
+
+ UiVar *var = event->userdata;
+ UiInteger *i = var->value;
- if(item->callback) {
- UiEventData *event = ucx_mempool_malloc(
- obj->ctx->mempool,
- sizeof(UiEventData));
- event->obj = obj;
- event->userdata = item->userdata;
- event->callback = item->callback;
-
- g_signal_connect(
- button,
- "toggled",
- G_CALLBACK(ui_button_toggled),
- event);
- }
-
- gtk_toolbar_insert(tb, button, -1);
-
- if(item->groups) {
- uic_add_group_widget(obj->ctx, button, item->groups);
- }
+ ui_notify_evt(i->observers, &e);
+}
+
+int64_t ui_tool_toggle_button_get(UiInteger *integer) {
+ integer->value = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(integer->obj));
+ return integer->value;
+}
+
+void ui_tool_toggle_button_set(UiInteger *integer, int64_t value) {
+ gboolean s = integer->value != 0 ? TRUE : FALSE;
+ gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(integer->obj), s);
+ integer->value = s;
}
void add_toolbar_combobox(GtkToolbar *tb, UiToolbarComboBox *cb, UiObject *obj) {