From: Olaf Wintermann Date: Sun, 7 Dec 2025 14:40:53 +0000 (+0100) Subject: update toolkit symbol names X-Git-Url: https://uap-core.de/gitweb/?a=commitdiff_plain;h=c3e1d443cddf97e363d3ec69c2032c7ac894748f;p=rssreader.git update toolkit symbol names --- diff --git a/ui-java/src/main/java/de/unixwork/ui/ArgFuncs.java b/ui-java/src/main/java/de/unixwork/ui/ArgFuncs.java index da34e13..bb7f291 100644 --- a/ui-java/src/main/java/de/unixwork/ui/ArgFuncs.java +++ b/ui-java/src/main/java/de/unixwork/ui/ArgFuncs.java @@ -68,7 +68,7 @@ class ArgFuncs { MethodHandle toolbar_item_args_set_tooltip; MethodHandle toolbar_item_args_set_onclick; MethodHandle toolbar_item_args_set_onclickdata; - MethodHandle toolbar_item_args_set_groups; + MethodHandle toolbar_item_args_set_states; MethodHandle toolbar_item_args_free; MethodHandle toolbar_toggleitem_args_new; @@ -78,7 +78,7 @@ class ArgFuncs { MethodHandle toolbar_toggleitem_args_set_varname; MethodHandle toolbar_toggleitem_args_set_onchange; MethodHandle toolbar_toggleitem_args_set_onchangedata; - MethodHandle toolbar_toggleitem_args_set_groups; + MethodHandle toolbar_toggleitem_args_set_states; MethodHandle toolbar_toggleitem_args_free; MethodHandle toolbar_menu_args_new; @@ -289,7 +289,7 @@ class ArgFuncs { MethodHandle button_args_set_labeltype; MethodHandle button_args_set_onclick; MethodHandle button_args_set_onclickdata; - MethodHandle button_args_set_groups; + MethodHandle button_args_set_states; MethodHandle button_args_free; MethodHandle toggle_args_new; @@ -314,10 +314,10 @@ class ArgFuncs { MethodHandle toggle_args_set_labeltype; MethodHandle toggle_args_set_varname; MethodHandle toggle_args_set_value; - MethodHandle toggle_args_set_enablegroup; + MethodHandle toggle_args_set_enablestate; MethodHandle toggle_args_set_onchange; MethodHandle toggle_args_set_onchangedata; - MethodHandle toggle_args_set_groups; + MethodHandle toggle_args_set_states; MethodHandle toggle_args_free; MethodHandle linkbutton_args_new; @@ -344,7 +344,7 @@ class ArgFuncs { MethodHandle linkbutton_args_set_onclickdata; MethodHandle linkbutton_args_set_nofollow; MethodHandle linkbutton_args_set_type; - MethodHandle linkbutton_args_set_groups; + MethodHandle linkbutton_args_set_states; MethodHandle linkbutton_args_free; MethodHandle list_args_new; @@ -386,7 +386,7 @@ class ArgFuncs { MethodHandle list_args_set_onsavedata; MethodHandle list_args_set_multiselection; MethodHandle list_args_set_contextmenu; - MethodHandle list_args_set_groups; + MethodHandle list_args_set_states; MethodHandle list_args_free; MethodHandle sourcelist_args_new; @@ -438,7 +438,7 @@ class ArgFuncs { MethodHandle textarea_args_set_value; MethodHandle textarea_args_set_onchange; MethodHandle textarea_args_set_onchangedata; - MethodHandle textarea_args_set_groups; + MethodHandle textarea_args_set_states; MethodHandle textarea_args_free; MethodHandle textfield_args_new; @@ -463,7 +463,7 @@ class ArgFuncs { MethodHandle textfield_args_set_onchangedata; MethodHandle textfield_args_set_onactivate; MethodHandle textfield_args_set_onactivatedata; - MethodHandle textfield_args_set_groups; + MethodHandle textfield_args_set_states; MethodHandle textfield_args_free; MethodHandle spinbox_args_new; @@ -492,7 +492,7 @@ class ArgFuncs { MethodHandle spinbox_args_set_intvalue; MethodHandle spinbox_args_set_doublevalue; MethodHandle spinbox_args_set_rangevalue; - MethodHandle spinbox_args_set_groups; + MethodHandle spinbox_args_set_states; MethodHandle spinbox_args_free; MethodHandle webview_args_new; @@ -513,7 +513,7 @@ class ArgFuncs { MethodHandle webview_args_set_style_class; MethodHandle webview_args_set_varname; MethodHandle webview_args_set_value; - MethodHandle webview_args_set_groups; + MethodHandle webview_args_set_states; MethodHandle webview_args_free; private ArgFuncs(Linker linker, SymbolLookup lib) { @@ -588,7 +588,7 @@ class ArgFuncs { MemorySegment ui_toolbar_item_args_set_tooltip_addr = lib.find("ui_toolbar_item_args_set_tooltip").orElseThrow(); MemorySegment ui_toolbar_item_args_set_onclick_addr = lib.find("ui_toolbar_item_args_set_onclick").orElseThrow(); MemorySegment ui_toolbar_item_args_set_onclickdata_addr = lib.find("ui_toolbar_item_args_set_onclickdata").orElseThrow(); - MemorySegment ui_toolbar_item_args_set_groups_addr = lib.find("ui_toolbar_item_args_set_groups").orElseThrow(); + MemorySegment ui_toolbar_item_args_set_states_addr = lib.find("ui_toolbar_item_args_set_states").orElseThrow(); MemorySegment ui_toolbar_item_args_free_addr = lib.find("ui_toolbar_item_args_free").orElseThrow(); MemorySegment ui_toolbar_toggleitem_args_new_addr = lib.find("ui_toolbar_toggleitem_args_new").orElseThrow(); @@ -598,7 +598,7 @@ class ArgFuncs { MemorySegment ui_toolbar_toggleitem_args_set_varname_addr = lib.find("ui_toolbar_toggleitem_args_set_varname").orElseThrow(); MemorySegment ui_toolbar_toggleitem_args_set_onchange_addr = lib.find("ui_toolbar_toggleitem_args_set_onchange").orElseThrow(); MemorySegment ui_toolbar_toggleitem_args_set_onchangedata_addr = lib.find("ui_toolbar_toggleitem_args_set_onchangedata").orElseThrow(); - MemorySegment ui_toolbar_toggleitem_args_set_groups_addr = lib.find("ui_toolbar_toggleitem_args_set_groups").orElseThrow(); + MemorySegment ui_toolbar_toggleitem_args_set_states_addr = lib.find("ui_toolbar_toggleitem_args_set_states").orElseThrow(); MemorySegment ui_toolbar_toggleitem_args_free_addr = lib.find("ui_toolbar_toggleitem_args_free").orElseThrow(); MemorySegment ui_toolbar_menu_args_new_addr = lib.find("ui_toolbar_menu_args_new").orElseThrow(); @@ -810,7 +810,7 @@ class ArgFuncs { MemorySegment ui_button_args_set_labeltype_addr = lib.find("ui_button_args_set_labeltype").orElseThrow(); MemorySegment ui_button_args_set_onclick_addr = lib.find("ui_button_args_set_onclick").orElseThrow(); MemorySegment ui_button_args_set_onclickdata_addr = lib.find("ui_button_args_set_onclickdata").orElseThrow(); - MemorySegment ui_button_args_set_groups_addr = lib.find("ui_button_args_set_groups").orElseThrow(); + MemorySegment ui_button_args_set_states_addr = lib.find("ui_button_args_set_states").orElseThrow(); MemorySegment ui_button_args_free_addr = lib.find("ui_button_args_free").orElseThrow(); MemorySegment ui_toggle_args_new_addr = lib.find("ui_toggle_args_new").orElseThrow(); @@ -837,8 +837,8 @@ class ArgFuncs { MemorySegment ui_toggle_args_set_value_addr = lib.find("ui_toggle_args_set_value").orElseThrow(); MemorySegment ui_toggle_args_set_onchange_addr = lib.find("ui_toggle_args_set_onchange").orElseThrow(); MemorySegment ui_toggle_args_set_onchangedata_addr = lib.find("ui_toggle_args_set_onchangedata").orElseThrow(); - MemorySegment ui_toggle_args_set_enablegroup = lib.find("ui_toggle_args_set_enablegroup").orElseThrow(); - MemorySegment ui_toggle_args_set_groups_addr = lib.find("ui_toggle_args_set_groups").orElseThrow(); + MemorySegment ui_toggle_args_set_enablestate = lib.find("ui_toggle_args_set_enablestate").orElseThrow(); + MemorySegment ui_toggle_args_set_states_addr = lib.find("ui_toggle_args_set_states").orElseThrow(); MemorySegment ui_toggle_args_free_addr = lib.find("ui_toggle_args_free").orElseThrow(); MemorySegment ui_linkbutton_args_new_addr = lib.find("ui_linkbutton_args_new").orElseThrow(); @@ -865,7 +865,7 @@ class ArgFuncs { MemorySegment ui_linkbutton_args_set_onclickdata_addr = lib.find("ui_linkbutton_args_set_onclickdata").orElseThrow(); MemorySegment ui_linkbutton_args_set_nofollow_addr = lib.find("ui_linkbutton_args_set_nofollow").orElseThrow(); MemorySegment ui_linkbutton_args_set_type_addr = lib.find("ui_linkbutton_args_set_type").orElseThrow(); - MemorySegment ui_linkbutton_args_set_groups_addr = lib.find("ui_linkbutton_args_set_groups").orElseThrow(); + MemorySegment ui_linkbutton_args_set_states_addr = lib.find("ui_linkbutton_args_set_states").orElseThrow(); MemorySegment ui_linkbutton_args_free_addr = lib.find("ui_linkbutton_args_free").orElseThrow(); MemorySegment ui_list_args_new_addr = lib.find("ui_list_args_new").orElseThrow(); @@ -907,7 +907,7 @@ class ArgFuncs { MemorySegment ui_list_args_set_onsavedata_addr = lib.find("ui_list_args_set_onsavedata").orElseThrow(); MemorySegment ui_list_args_set_multiselection_addr = lib.find("ui_list_args_set_multiselection").orElseThrow(); MemorySegment ui_list_args_set_contextmenu_addr = lib.find("ui_list_args_set_contextmenu").orElseThrow(); - MemorySegment ui_list_args_set_groups_addr = lib.find("ui_list_args_set_groups").orElseThrow(); + MemorySegment ui_list_args_set_states_addr = lib.find("ui_list_args_set_states").orElseThrow(); MemorySegment ui_list_args_free_addr = lib.find("ui_list_args_free").orElseThrow(); MemorySegment ui_sourcelist_args_new_addr = lib.find("ui_sourcelist_args_new").orElseThrow(); @@ -959,7 +959,7 @@ class ArgFuncs { MemorySegment ui_textarea_args_set_value_addr = lib.find("ui_textarea_args_set_value").orElseThrow(); MemorySegment ui_textarea_args_set_onchange_addr = lib.find("ui_textarea_args_set_onchange").orElseThrow(); MemorySegment ui_textarea_args_set_onchangedata_addr = lib.find("ui_textarea_args_set_onchangedata").orElseThrow(); - MemorySegment ui_textarea_args_set_groups_addr = lib.find("ui_textarea_args_set_groups").orElseThrow(); + MemorySegment ui_textarea_args_set_states_addr = lib.find("ui_textarea_args_set_states").orElseThrow(); MemorySegment ui_textarea_args_free_addr = lib.find("ui_textarea_args_free").orElseThrow(); MemorySegment ui_textfield_args_new_addr = lib.find("ui_textfield_args_new").orElseThrow(); @@ -984,7 +984,7 @@ class ArgFuncs { MemorySegment ui_textfield_args_set_onchangedata_addr = lib.find("ui_textfield_args_set_onchangedata").orElseThrow(); MemorySegment ui_textfield_args_set_onactivate_addr = lib.find("ui_textfield_args_set_onactivate").orElseThrow(); MemorySegment ui_textfield_args_set_onactivatedata_addr = lib.find("ui_textfield_args_set_onactivatedata").orElseThrow(); - MemorySegment ui_textfield_args_set_groups_addr = lib.find("ui_textfield_args_set_groups").orElseThrow(); + MemorySegment ui_textfield_args_set_states_addr = lib.find("ui_textfield_args_set_states").orElseThrow(); MemorySegment ui_textfield_args_free_addr = lib.find("ui_textfield_args_free").orElseThrow(); MemorySegment ui_spinbox_args_new_addr = lib.find("ui_spinbox_args_new").orElseThrow(); @@ -1013,7 +1013,7 @@ class ArgFuncs { MemorySegment ui_spinbox_args_set_intvalue_addr = lib.find("ui_spinbox_args_set_intvalue").orElseThrow(); MemorySegment ui_spinbox_args_set_doublevalue_addr = lib.find("ui_spinbox_args_set_doublevalue").orElseThrow(); MemorySegment ui_spinbox_args_set_rangevalue_addr = lib.find("ui_spinbox_args_set_rangevalue").orElseThrow(); - MemorySegment ui_spinbox_args_set_groups_addr = lib.find("ui_spinbox_args_set_groups").orElseThrow(); + MemorySegment ui_spinbox_args_set_states_addr = lib.find("ui_spinbox_args_set_states").orElseThrow(); MemorySegment ui_spinbox_args_free_addr = lib.find("ui_spinbox_args_free").orElseThrow(); MemorySegment ui_webview_args_new_addr = lib.find("ui_webview_args_new").orElseThrow(); @@ -1034,7 +1034,7 @@ class ArgFuncs { MemorySegment ui_webview_args_set_style_class_addr = lib.find("ui_webview_args_set_style_class").orElseThrow(); MemorySegment ui_webview_args_set_varname_addr = lib.find("ui_webview_args_set_varname").orElseThrow(); MemorySegment ui_webview_args_set_value_addr = lib.find("ui_webview_args_set_value").orElseThrow(); - MemorySegment ui_webview_args_set_groups_addr = lib.find("ui_webview_args_set_groups").orElseThrow(); + MemorySegment ui_webview_args_set_states_addr = lib.find("ui_webview_args_set_states").orElseThrow(); MemorySegment ui_webview_args_free_addr = lib.find("ui_webview_args_free").orElseThrow(); dialog_args_new = linker.downcallHandle(ui_dialog_args_new_addr, sigm); @@ -1099,7 +1099,7 @@ class ArgFuncs { toolbar_item_args_set_label = linker.downcallHandle(ui_toolbar_item_args_set_label_addr, sigv_mm); toolbar_item_args_set_onclick = linker.downcallHandle(ui_toolbar_item_args_set_onclick_addr, sigv_mm); toolbar_item_args_set_onclickdata = linker.downcallHandle(ui_toolbar_item_args_set_onclickdata_addr, sigv_mm); - toolbar_item_args_set_groups = linker.downcallHandle(ui_toolbar_item_args_set_groups_addr, sigv_mmi); + toolbar_item_args_set_states = linker.downcallHandle(ui_toolbar_item_args_set_states_addr, sigv_mmi); toolbar_item_args_free = linker.downcallHandle(ui_toolbar_item_args_free_addr, sigv_m); toolbar_toggleitem_args_new = linker.downcallHandle(ui_toolbar_toggleitem_args_new_addr, sigm); @@ -1109,7 +1109,7 @@ class ArgFuncs { toolbar_toggleitem_args_set_varname = linker.downcallHandle(ui_toolbar_toggleitem_args_set_varname_addr, sigv_mm); toolbar_toggleitem_args_set_onchange = linker.downcallHandle(ui_toolbar_toggleitem_args_set_onchange_addr, sigv_mm); toolbar_toggleitem_args_set_onchangedata = linker.downcallHandle(ui_toolbar_toggleitem_args_set_onchangedata_addr, sigv_mm); - toolbar_toggleitem_args_set_groups = linker.downcallHandle(ui_toolbar_toggleitem_args_set_groups_addr, sigv_mmi); + toolbar_toggleitem_args_set_states = linker.downcallHandle(ui_toolbar_toggleitem_args_set_states_addr, sigv_mmi); toolbar_toggleitem_args_free = linker.downcallHandle(ui_toolbar_toggleitem_args_free_addr, sigv_m); toolbar_menu_args_new = linker.downcallHandle(ui_toolbar_menu_args_new_addr, sigm); @@ -1320,7 +1320,7 @@ class ArgFuncs { button_args_set_labeltype = linker.downcallHandle(ui_button_args_set_labeltype_addr, sigv_mi); button_args_set_onclick = linker.downcallHandle(ui_button_args_set_onclick_addr, sigv_mm); button_args_set_onclickdata = linker.downcallHandle(ui_button_args_set_onclickdata_addr, sigv_mm); - button_args_set_groups = linker.downcallHandle(ui_button_args_set_groups_addr, sigv_mmi); + button_args_set_states = linker.downcallHandle(ui_button_args_set_states_addr, sigv_mmi); button_args_free = linker.downcallHandle(ui_button_args_free_addr, sigv_m); toggle_args_new = linker.downcallHandle(ui_toggle_args_new_addr, sigm); @@ -1347,8 +1347,8 @@ class ArgFuncs { toggle_args_set_value = linker.downcallHandle(ui_toggle_args_set_value_addr, sigv_mm); toggle_args_set_onchange = linker.downcallHandle(ui_toggle_args_set_onchange_addr, sigv_mm); toggle_args_set_onchangedata = linker.downcallHandle(ui_toggle_args_set_onchangedata_addr, sigv_mm); - toggle_args_set_enablegroup = linker.downcallHandle(ui_toggle_args_set_enablegroup, sigv_mi); - toggle_args_set_groups = linker.downcallHandle(ui_toggle_args_set_groups_addr, sigv_mmi); + toggle_args_set_enablestate = linker.downcallHandle(ui_toggle_args_set_enablestate, sigv_mi); + toggle_args_set_states = linker.downcallHandle(ui_toggle_args_set_states_addr, sigv_mmi); toggle_args_free = linker.downcallHandle(ui_toggle_args_free_addr, sigv_m); linkbutton_args_new = linker.downcallHandle(ui_linkbutton_args_new_addr, sigm); @@ -1375,7 +1375,7 @@ class ArgFuncs { linkbutton_args_set_onclickdata = linker.downcallHandle(ui_linkbutton_args_set_onclickdata_addr, sigv_mm); linkbutton_args_set_nofollow = linker.downcallHandle(ui_linkbutton_args_set_nofollow_addr, sigv_mb); linkbutton_args_set_type = linker.downcallHandle(ui_linkbutton_args_set_type_addr, sigv_mi); - linkbutton_args_set_groups = linker.downcallHandle(ui_linkbutton_args_set_groups_addr, sigv_mmi); + linkbutton_args_set_states = linker.downcallHandle(ui_linkbutton_args_set_states_addr, sigv_mmi); linkbutton_args_free = linker.downcallHandle(ui_linkbutton_args_free_addr, sigv_m); list_args_new = linker.downcallHandle(ui_list_args_new_addr, sigm); @@ -1417,7 +1417,7 @@ class ArgFuncs { list_args_set_onsavedata = linker.downcallHandle(ui_list_args_set_onsavedata_addr, sigv_mm); list_args_set_multiselection = linker.downcallHandle(ui_list_args_set_multiselection_addr, sigv_mb); list_args_set_contextmenu = linker.downcallHandle(ui_list_args_set_contextmenu_addr, sigv_mm); - list_args_set_groups = linker.downcallHandle(ui_list_args_set_groups_addr, sigv_mmi); + list_args_set_states = linker.downcallHandle(ui_list_args_set_states_addr, sigv_mmi); list_args_free = linker.downcallHandle(ui_list_args_free_addr, sigv_m); sourcelist_args_new = linker.downcallHandle(ui_sourcelist_args_new_addr, sigm); @@ -1469,7 +1469,7 @@ class ArgFuncs { textarea_args_set_value = linker.downcallHandle(ui_textarea_args_set_value_addr, sigv_mm); textarea_args_set_onchange = linker.downcallHandle(ui_textarea_args_set_onchange_addr, sigv_mm); textarea_args_set_onchangedata = linker.downcallHandle(ui_textarea_args_set_onchangedata_addr, sigv_mm); - textarea_args_set_groups = linker.downcallHandle(ui_textarea_args_set_groups_addr, sigv_mmi); + textarea_args_set_states = linker.downcallHandle(ui_textarea_args_set_states_addr, sigv_mmi); textarea_args_free = linker.downcallHandle(ui_textarea_args_free_addr, sigv_m); textfield_args_new = linker.downcallHandle(ui_textfield_args_new_addr, sigm); @@ -1494,7 +1494,7 @@ class ArgFuncs { textfield_args_set_onchangedata = linker.downcallHandle(ui_textfield_args_set_onchangedata_addr, sigv_mm); textfield_args_set_onactivate = linker.downcallHandle(ui_textfield_args_set_onactivate_addr, sigv_mm); textfield_args_set_onactivatedata = linker.downcallHandle(ui_textfield_args_set_onactivatedata_addr, sigv_mm); - textfield_args_set_groups = linker.downcallHandle(ui_textfield_args_set_groups_addr, sigv_mmi); + textfield_args_set_states = linker.downcallHandle(ui_textfield_args_set_states_addr, sigv_mmi); textfield_args_free = linker.downcallHandle(ui_textfield_args_free_addr, sigv_m); spinbox_args_new = linker.downcallHandle(ui_spinbox_args_new_addr, sigm); @@ -1523,7 +1523,7 @@ class ArgFuncs { spinbox_args_set_intvalue = linker.downcallHandle(ui_spinbox_args_set_intvalue_addr, sigv_mm); spinbox_args_set_doublevalue = linker.downcallHandle(ui_spinbox_args_set_doublevalue_addr, sigv_mm); spinbox_args_set_rangevalue = linker.downcallHandle(ui_spinbox_args_set_rangevalue_addr, sigv_mm); - spinbox_args_set_groups = linker.downcallHandle(ui_spinbox_args_set_groups_addr, sigv_mmi); + spinbox_args_set_states = linker.downcallHandle(ui_spinbox_args_set_states_addr, sigv_mmi); spinbox_args_free = linker.downcallHandle(ui_spinbox_args_free_addr, sigv_m); webview_args_new = linker.downcallHandle(ui_webview_args_new_addr, sigm); @@ -1544,7 +1544,7 @@ class ArgFuncs { webview_args_set_style_class = linker.downcallHandle(ui_webview_args_set_style_class_addr, sigv_mm); webview_args_set_varname = linker.downcallHandle(ui_webview_args_set_varname_addr, sigv_mm); webview_args_set_value = linker.downcallHandle(ui_webview_args_set_value_addr, sigv_mm); - webview_args_set_groups = linker.downcallHandle(ui_webview_args_set_groups_addr, sigv_mmi); + webview_args_set_states = linker.downcallHandle(ui_webview_args_set_states_addr, sigv_mmi); webview_args_free = linker.downcallHandle(ui_webview_args_free_addr, sigv_m); } diff --git a/ui-java/src/main/java/de/unixwork/ui/ButtonBuilder.java b/ui-java/src/main/java/de/unixwork/ui/ButtonBuilder.java index bd15e4b..8ecd5f6 100644 --- a/ui-java/src/main/java/de/unixwork/ui/ButtonBuilder.java +++ b/ui-java/src/main/java/de/unixwork/ui/ButtonBuilder.java @@ -207,7 +207,7 @@ public class ButtonBuilder extends AbstractWidgetBuilder { if(states != null) { MemorySegment st = arena.allocate(ValueLayout.JAVA_INT, states.length); MemorySegment.copy(states, 0, st, ValueLayout.JAVA_INT, 0, states.length); - ui.button_args_set_groups.invoke(args, st, states.length); + ui.button_args_set_states.invoke(args, st, states.length); } ui.button_args_set_labeltype.invoke(args, labelType); diff --git a/ui-java/src/main/java/de/unixwork/ui/Context.java b/ui-java/src/main/java/de/unixwork/ui/Context.java index edf47e4..f65b48c 100644 --- a/ui-java/src/main/java/de/unixwork/ui/Context.java +++ b/ui-java/src/main/java/de/unixwork/ui/Context.java @@ -164,7 +164,7 @@ public abstract class Context { public void setState(int state) { ToolkitFuncs ui = ToolkitFuncs.getInstance(); try { - ui.set_group.invoke(ptr, state); + ui.set_state.invoke(ptr, state); } catch (Throwable e) { throw new RuntimeException(e); } @@ -173,7 +173,7 @@ public abstract class Context { public void unsetState(int state) { ToolkitFuncs ui = ToolkitFuncs.getInstance(); try { - ui.unset_group.invoke(ptr, state); + ui.unset_state.invoke(ptr, state); } catch (Throwable e) { throw new RuntimeException(e); } diff --git a/ui-java/src/main/java/de/unixwork/ui/LinkButtonBuilder.java b/ui-java/src/main/java/de/unixwork/ui/LinkButtonBuilder.java index e7d9102..0df6500 100644 --- a/ui-java/src/main/java/de/unixwork/ui/LinkButtonBuilder.java +++ b/ui-java/src/main/java/de/unixwork/ui/LinkButtonBuilder.java @@ -245,7 +245,7 @@ public class LinkButtonBuilder extends AbstractWidgetBuilder { if(states != null) { MemorySegment st = arena.allocate(ValueLayout.JAVA_INT, states.length); MemorySegment.copy(states, 0, st, ValueLayout.JAVA_INT, 0, states.length); - ui.linkbutton_args_set_groups.invoke(args, st, states.length); + ui.linkbutton_args_set_states.invoke(args, st, states.length); } return args; diff --git a/ui-java/src/main/java/de/unixwork/ui/ListViewBuilder.java b/ui-java/src/main/java/de/unixwork/ui/ListViewBuilder.java index 2818135..1b3b372 100644 --- a/ui-java/src/main/java/de/unixwork/ui/ListViewBuilder.java +++ b/ui-java/src/main/java/de/unixwork/ui/ListViewBuilder.java @@ -286,7 +286,7 @@ public class ListViewBuilder extends AbstractWidgetBuilder { if(states != null) { MemorySegment st = arena.allocate(ValueLayout.JAVA_INT, states.length); MemorySegment.copy(states, 0, st, ValueLayout.JAVA_INT, 0, states.length); - ui.list_args_set_groups.invoke(args, st, states.length); + ui.list_args_set_states.invoke(args, st, states.length); } return args; diff --git a/ui-java/src/main/java/de/unixwork/ui/SpinBoxBuilder.java b/ui-java/src/main/java/de/unixwork/ui/SpinBoxBuilder.java index 4c3c4d3..f7e801b 100644 --- a/ui-java/src/main/java/de/unixwork/ui/SpinBoxBuilder.java +++ b/ui-java/src/main/java/de/unixwork/ui/SpinBoxBuilder.java @@ -249,7 +249,7 @@ public class SpinBoxBuilder extends AbstractWidgetBuilder{ if(states != null) { MemorySegment st = arena.allocate(ValueLayout.JAVA_INT, states.length); MemorySegment.copy(states, 0, st, ValueLayout.JAVA_INT, 0, states.length); - ui.spinbox_args_set_groups.invoke(args, st, states.length); + ui.spinbox_args_set_states.invoke(args, st, states.length); } return args; diff --git a/ui-java/src/main/java/de/unixwork/ui/TableModel.java b/ui-java/src/main/java/de/unixwork/ui/TableModel.java index cc767c1..128c6e2 100644 --- a/ui-java/src/main/java/de/unixwork/ui/TableModel.java +++ b/ui-java/src/main/java/de/unixwork/ui/TableModel.java @@ -54,7 +54,7 @@ public class TableModel { } MemorySegment cstr = arena.allocateFrom(col.getTitle()); - ui.model_add_column.invoke(ctxPtr, model, type, cstr, col.getWidth()); + ui.model_add_column.invoke(model, type, cstr, col.getWidth()); } } catch (Throwable e) { throw new RuntimeException(e); diff --git a/ui-java/src/main/java/de/unixwork/ui/TableViewBuilder.java b/ui-java/src/main/java/de/unixwork/ui/TableViewBuilder.java index de5495e..871c458 100644 --- a/ui-java/src/main/java/de/unixwork/ui/TableViewBuilder.java +++ b/ui-java/src/main/java/de/unixwork/ui/TableViewBuilder.java @@ -305,7 +305,7 @@ public class TableViewBuilder extends AbstractWidgetBuilder { if(states != null) { MemorySegment st = arena.allocate(ValueLayout.JAVA_INT, states.length); MemorySegment.copy(states, 0, st, ValueLayout.JAVA_INT, 0, states.length); - ui.list_args_set_groups.invoke(args, st, states.length); + ui.list_args_set_states.invoke(args, st, states.length); } return args; diff --git a/ui-java/src/main/java/de/unixwork/ui/TextAreaBuilder.java b/ui-java/src/main/java/de/unixwork/ui/TextAreaBuilder.java index c12b47c..61c6158 100644 --- a/ui-java/src/main/java/de/unixwork/ui/TextAreaBuilder.java +++ b/ui-java/src/main/java/de/unixwork/ui/TextAreaBuilder.java @@ -199,7 +199,7 @@ public class TextAreaBuilder extends AbstractWidgetBuilder { if(states != null) { MemorySegment st = arena.allocate(ValueLayout.JAVA_INT, states.length); MemorySegment.copy(states, 0, st, ValueLayout.JAVA_INT, 0, states.length); - ui.textarea_args_set_groups.invoke(args, st, states.length); + ui.textarea_args_set_states.invoke(args, st, states.length); } return args; diff --git a/ui-java/src/main/java/de/unixwork/ui/TextFieldBuilder.java b/ui-java/src/main/java/de/unixwork/ui/TextFieldBuilder.java index 33eef52..8f9cec4 100644 --- a/ui-java/src/main/java/de/unixwork/ui/TextFieldBuilder.java +++ b/ui-java/src/main/java/de/unixwork/ui/TextFieldBuilder.java @@ -213,7 +213,7 @@ public class TextFieldBuilder extends AbstractWidgetBuilder { if(states != null) { MemorySegment st = arena.allocate(ValueLayout.JAVA_INT, states.length); MemorySegment.copy(states, 0, st, ValueLayout.JAVA_INT, 0, states.length); - ui.textfield_args_set_groups.invoke(args, st, states.length); + ui.textfield_args_set_states.invoke(args, st, states.length); } return args; diff --git a/ui-java/src/main/java/de/unixwork/ui/ToggleBuilder.java b/ui-java/src/main/java/de/unixwork/ui/ToggleBuilder.java index fbd7034..84c5bf7 100644 --- a/ui-java/src/main/java/de/unixwork/ui/ToggleBuilder.java +++ b/ui-java/src/main/java/de/unixwork/ui/ToggleBuilder.java @@ -230,12 +230,12 @@ public class ToggleBuilder extends AbstractWidgetBuilder { ui.toggle_args_set_value.invoke(args, value.valuePtr); } if(enableState > 0) { - ui.toggle_args_set_enablegroup.invoke(args, enableState); + ui.toggle_args_set_enablestate.invoke(args, enableState); } if(states != null) { MemorySegment st = arena.allocate(ValueLayout.JAVA_INT, states.length); MemorySegment.copy(states, 0, st, ValueLayout.JAVA_INT, 0, states.length); - ui.toggle_args_set_groups.invoke(args, st, states.length); + ui.toggle_args_set_states.invoke(args, st, states.length); } if(onChange != null) { diff --git a/ui-java/src/main/java/de/unixwork/ui/ToolkitFuncs.java b/ui-java/src/main/java/de/unixwork/ui/ToolkitFuncs.java index 8b557b5..1cd1c38 100644 --- a/ui-java/src/main/java/de/unixwork/ui/ToolkitFuncs.java +++ b/ui-java/src/main/java/de/unixwork/ui/ToolkitFuncs.java @@ -94,8 +94,8 @@ public class ToolkitFuncs { public MethodHandle set_widget_groups2; public MethodHandle set_widget_visibility_states; - public MethodHandle set_group; - public MethodHandle unset_group; + public MethodHandle set_state; + public MethodHandle unset_state; public MethodHandle call_mainthread; @@ -124,7 +124,7 @@ public class ToolkitFuncs { FunctionDescriptor sigv_m = FunctionDescriptor.ofVoid(ValueLayout.ADDRESS); FunctionDescriptor sigm_l = FunctionDescriptor.of(ValueLayout.ADDRESS, ValueLayout.JAVA_LONG); FunctionDescriptor sigv_miii = FunctionDescriptor.ofVoid(ValueLayout.ADDRESS, ValueLayout.JAVA_INT, ValueLayout.JAVA_INT, ValueLayout.JAVA_INT); - FunctionDescriptor sigv_mmimi = FunctionDescriptor.ofVoid(ValueLayout.ADDRESS, ValueLayout.ADDRESS, ValueLayout.JAVA_INT, ValueLayout.ADDRESS, ValueLayout.JAVA_INT); + FunctionDescriptor sigv_mimi = FunctionDescriptor.ofVoid(ValueLayout.ADDRESS, ValueLayout.JAVA_INT, ValueLayout.ADDRESS, ValueLayout.JAVA_INT); FunctionDescriptor sigv_md = FunctionDescriptor.ofVoid(ValueLayout.ADDRESS, ValueLayout.JAVA_DOUBLE); FunctionDescriptor sigd_m = FunctionDescriptor.of(ValueLayout.JAVA_DOUBLE, ValueLayout.ADDRESS); FunctionDescriptor sigv_mdd = FunctionDescriptor.ofVoid(ValueLayout.ADDRESS, ValueLayout.JAVA_DOUBLE, ValueLayout.JAVA_DOUBLE); @@ -214,11 +214,11 @@ public class ToolkitFuncs { ui_set_visible_addr = lib.find("ui_set_visible").orElseThrow(); ui_set_enabled_addr = lib.find("ui_set_enabled").orElseThrow(); - MemorySegment ui_widget_set_groups2_addr = lib.find("ui_widget_set_groups2").orElseThrow(); + MemorySegment ui_widget_set_states2_addr = lib.find("ui_widget_set_states2").orElseThrow(); MemorySegment ui_widget_set_visibility_states_addr = lib.find("ui_widget_set_visibility_states").orElseThrow(); - MemorySegment set_group_addr = lib.find("ui_set_group").orElseThrow(); - MemorySegment unset_group_addr = lib.find("ui_unset_group").orElseThrow(); + MemorySegment set_state_addr = lib.find("ui_set_state").orElseThrow(); + MemorySegment unset_state_addr = lib.find("ui_unset_state").orElseThrow(); MemorySegment call_mainthread_addr = lib.find("ui_call_mainthread").orElseThrow(); @@ -299,8 +299,8 @@ public class ToolkitFuncs { range_get_extent = linker.downcallHandle(range_get_extent_addr, sigd_m); model_new = linker.downcallHandle(model_new_addr, sigm_m); - model_add_column = linker.downcallHandle(model_add_column_addr, sigv_mmimi); - model_free = linker.downcallHandle(model_free_addr, sigv_mm); + model_add_column = linker.downcallHandle(model_add_column_addr, sigv_mimi); + model_free = linker.downcallHandle(model_free_addr, sigv_m); textstyle_set_bold = linker.downcallHandle(textstyle_set_bold_addr, sigv_mb); textstyle_set_italic = linker.downcallHandle(textstyle_set_italic_addr, sigv_mb); @@ -315,11 +315,11 @@ public class ToolkitFuncs { set_enabled = linker.downcallHandle(ui_set_enabled_addr, sigv_mi); set_visible = linker.downcallHandle(ui_set_visible_addr, sigv_mi); - set_widget_groups2 = linker.downcallHandle(ui_widget_set_groups2_addr, sigv_mmmmi); + set_widget_groups2 = linker.downcallHandle(ui_widget_set_states2_addr, sigv_mmmmi); set_widget_visibility_states = linker.downcallHandle(ui_widget_set_visibility_states_addr, sigv_mmmi); - set_group = linker.downcallHandle(set_group_addr, sigv_mi); - unset_group = linker.downcallHandle(unset_group_addr, sigv_mi); + set_state = linker.downcallHandle(set_state_addr, sigv_mi); + unset_state = linker.downcallHandle(unset_state_addr, sigv_mi); call_mainthread = linker.downcallHandle(call_mainthread_addr, sigv_mm);