idav: comparison ui/gtk/menu.c

-:b34bd1557c6c
+:77254bd6dccb
 // TODO: error
 }
 }
 */
+static void menuitem_list_remove_binding(void *obj) {
+UiActiveMenuItemList *ls = obj;
+UiList *list = ls->var->value;
+CxList *bindings = list->obj;
+if(bindings) {
+(void)cxListFindRemove(bindings, obj);
+if(cxListSize(bindings) == 0) {
+cxListFree(bindings);
+list->obj = NULL;
+list->update = NULL;
+}
+}
+}
 void add_menuitem_list_widget(GtkWidget *p, int index, UiMenuItemI *item, UiObject *obj) {
 UiMenuItemList *il = (UiMenuItemList*)item;
 const CxAllocator *a = obj->ctx->allocator;
 UiActiveMenuItemList *ls = cxMalloc(
 ls->menu = GTK_MENU_SHELL(p);
 ls->index = index;
 ls->oldcount = 0;
 ls->getvalue = il->getvalue;
-UiVar* var = uic_create_var(ui_global_context(), il->varname, UI_VAR_LIST);
+//UiVar* var = uic_create_var(ui_global_context(), il->varname, UI_VAR_LIST);
-ls->list = var->value;
+UiVar* var = uic_create_var(obj->ctx, il->varname, UI_VAR_LIST);
+ls->var = var;
+if(var) {
+UiList *list = var->value;
+list->update = ui_menulist_update;
+list->getselection = NULL;
+list->setselection = NULL;
+// It is possible, that the UiVar is from a global shared context,
+// used by multiple windows. To support this usecase, the list->obj
+// binding object is a list of all connected UiActiveMenuItemList.
+CxList *bindings = list->obj;
+if(!bindings) {
+bindings = cxLinkedListCreate(var->from_ctx->mp->allocator, NULL, CX_STORE_POINTERS);
+list->obj = bindings;
+}
+cxListAdd(bindings, ls);
+// The destruction of the toplevel obj must remove the menulist binding
+uic_context_add_destructor(obj->ctx, menuitem_list_remove_binding, ls);
+ui_update_menuitem_list(ls);
+}
 ls->callback = il->callback;
 ls->userdata = il->userdata;
+}
-UiObserver *observer = ui_observer_new((ui_callback)ui_update_menuitem_list, ls);
-ls->list->observers = ui_obsvlist_add(ls->list->observers, observer);
+void ui_menulist_update(UiList *list, int ignored) {
-uic_list_register_observer_destructor(obj->ctx, ls->list, observer);
+CxList *bindings = list->obj;
+CxIterator i = cxListIterator(bindings);
-ui_update_menuitem_list(NULL, ls);
+cx_foreach(UiActiveMenuItemList *, ls, i) {
-}
+ui_update_menuitem_list(ls);
+}
+}
-void ui_update_menuitem_list(UiEvent *event, UiActiveMenuItemList *list) {
+void ui_update_menuitem_list(UiActiveMenuItemList *list) {
 // remove old items
 if(list->oldcount > 0) {
 int i = 0;
 GList *mi = gtk_container_get_children(GTK_CONTAINER(list->menu));
 while(mi) {
 mi = mi->next;
 i++;
 }
 }
-void* elm = ui_list_first(list->list);
+UiList *ls = list->var->value;
+void* elm = ui_list_first(ls);
 if(elm) {
 GtkWidget *widget = gtk_separator_menu_item_new();
 gtk_menu_shell_insert(list->menu, widget, list->index);
 gtk_widget_show(widget);
 }
 "destroy",
 G_CALLBACK(ui_destroy_userdata),
 event);
 }
-elm = ui_list_next(list->list);
+elm = ui_list_next(ls);
 i++;
 }
 list->oldcount = i;
 }
 event->obj = obj;
 event->userdata = i->userdata;
 event->callback = i->callback;
 event->value = 0;
 event->customdata = NULL;
+event->customint = 0;
 g_signal_connect(
 action,
 "activate",
 G_CALLBACK(ui_activate_event_wrapper),
 // TODO
 }
 void ui_gmenu_add_radioitem(GMenu *p, int index, UiMenuItemI *item, UiObject *obj) {
+}
+static void menuitem_list_remove_binding(void *obj) {
+UiActiveGMenuItemList *ls = obj;
+UiList *list = ls->var->value;
+CxList *bindings = list->obj;
+if(bindings) {
+(void)cxListFindRemove(bindings, obj);
+if(cxListSize(bindings) == 0) {
+cxListFree(bindings);
+list->obj = NULL;
+list->update = NULL;
+}
+}
 }
 void ui_gmenu_add_menuitem_list(GMenu *p, int index, UiMenuItemI *item, UiObject *obj) {
 UiMenuItemList *il = (UiMenuItemList*)item;
 ls->menu = p;
 ls->index = index;
 ls->oldcount = 0;
 ls->getvalue = il->getvalue;
-UiVar* var = uic_create_var(ui_global_context(), il->varname, UI_VAR_LIST);
+//UiVar* var = uic_create_var(ui_global_context(), il->varname, UI_VAR_LIST);
+UiVar* var = uic_create_var(obj->ctx, il->varname, UI_VAR_LIST);
 ls->var = var;
-UiList *list = var->value;
+if(var) {
+UiList *list = var->value;
+list->update = ui_menulist_update;
+list->getselection = NULL;
+list->setselection = NULL;
+// It is possible, that the UiVar is from a global shared context,
+// used by multiple windows. To support this usecase, the list->obj
+// binding object is a list of all connected UiActiveMenuItemList.
+CxList *bindings = list->obj;
+if(!bindings) {
+bindings = cxLinkedListCreate(var->from_ctx->mp->allocator, NULL, CX_STORE_POINTERS);
+list->obj = bindings;
+}
+cxListAdd(bindings, ls);
+// The destruction of the toplevel obj must remove the menulist binding
+uic_context_add_destructor(obj->ctx, menuitem_list_remove_binding, ls);
+ui_update_gmenu_item_list(ls);
+}
 ls->callback = il->callback;
 ls->userdata = il->userdata;
-UiObserver *observer = ui_observer_new((ui_callback)ui_update_gmenu_item_list, ls);
-list->observers = ui_obsvlist_add(list->observers, observer);
-uic_list_register_observer_destructor(obj->ctx, list, observer);
 GSimpleAction *action = g_simple_action_new(item->id, g_variant_type_new("i"));
 g_action_map_add_action(obj->ctx->action_map, G_ACTION(action));
 snprintf(ls->action, 32, "win.%s", item->id);
 UiEventData *event = malloc(sizeof(UiEventData));
 event->obj = obj;
 event->userdata = il->userdata;
 event->callback = il->callback;
 event->customdata = var;
+event->customint = 0;
 event->value = 0;
 g_signal_connect(
 action,
 "activate",
 g_signal_connect(
 obj->widget,
 "destroy",
 G_CALLBACK(ui_destroy_userdata),
 event);
-ui_update_gmenu_item_list(NULL, ls);
 }
 void ui_activate_event_wrapper(GSimpleAction* self, GVariant* parameter, UiEventData *event) {
 int intval = event->value;
 if(parameter && g_variant_is_of_type(parameter, G_VARIANT_TYPE_INT32)) {
 UiEvent evt;
 evt.obj = event->obj;
 evt.window = event->obj->window;
 evt.document = event->obj->ctx->document;
 evt.eventdata = event->customdata;
+evt.eventdatatype = event->customint;
 evt.intval = intval;
 event->callback(&evt, event->userdata);
 }
 void ui_menu_list_item_activate_event_wrapper(GSimpleAction* self, GVariant* parameter, UiEventData *event) {
 UiEvent evt;
 evt.obj = event->obj;
 evt.window = event->obj->window;
 evt.document = event->obj->ctx->document;
 evt.eventdata = ui_list_get(list, index);
+evt.eventdatatype = UI_EVENT_DATA_LIST_ELM;
 evt.intval = index;
 event->callback(&evt, event->userdata);
 }
-void ui_update_gmenu_item_list(UiEvent *event, UiActiveGMenuItemList *list) {
+void ui_menulist_update(UiList *list, int ignored) {
+CxList *bindings = list->obj;
+CxIterator i = cxListIterator(bindings);
+cx_foreach(UiActiveGMenuItemList *, ls, i) {
+ui_update_gmenu_item_list(ls);
+}
+}
+void ui_update_gmenu_item_list(UiActiveGMenuItemList *list) {
 // remove old items
 for(int i=0;i<list->oldcount;i++) {
 g_menu_remove(list->menu, list->index);
 }
 UiList *ls = list->var->value;

Mercurial > hg > idav / file comparison

comparison: ui/gtk/menu.c

ui/gtk/menu.c