pull imgui docking 1.91.7 and generate

generator.lua: change for Used4kPagesMap -> Used8kPagesMap
cpp2ffi: better functypedef parsing
2025-08-14 05:38:29 +01:00 · 2025-01-21 15:59:46 +01:00 · 2025-01-21 10:50:30 +01:00 · 2025-01-17 17:08:30 +01:00 · 2025-01-08 16:49:42 +01:00 · 2025-01-08 15:54:31 +01:00
17 changed files with 48013 additions and 45926 deletions
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ History:
 Initially cimgui was developed by Stephan Dilly as hand-written code but lately turned into an auto-generated version by sonoro1234 in order to keep up with imgui more easily (letting the user select the desired branch and commit)

 Notes:
-* currently this wrapper is based on version [1.91.4 of Dear ImGui with internal api]
+* currently this wrapper is based on version [1.91.7 of Dear ImGui with internal api]
 * only functions, structs and enums from imgui.h (an optionally imgui_internal.h) are wrapped.
 * if you are interested in imgui backends you should look [LuaJIT-ImGui](https://github.com/sonoro1234/LuaJIT-ImGui) project.
 * All naming is algorithmic except for those names that were coded in cimgui_overloads table (https://github.com/cimgui/cimgui/blob/master/generator/generator.lua#L60). In the official version this table is empty.
--- a/cimgui.cpp
+++ b/cimgui.cpp
@@ -1,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.91.5" 19150 from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.91.7" 19170 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 //with imgui_freetype.h api
 //docking branch
@@ -3995,6 +3995,10 @@ CIMGUI_API ImGuiIO* igGetIOEx(ImGuiContext* ctx)
 {
    return &ImGui::GetIOEx(ctx);
 }
+CIMGUI_API ImGuiPlatformIO* igGetPlatformIOEx(ImGuiContext* ctx)
+{
+    return &ImGui::GetPlatformIOEx(ctx);
+}
 CIMGUI_API ImGuiWindow* igGetCurrentWindowRead()
 {
    return ImGui::GetCurrentWindowRead();
@@ -5395,9 +5399,9 @@ CIMGUI_API bool igArrowButtonEx(const char* str_id,ImGuiDir dir,ImVec2 size_arg,
 {
    return ImGui::ArrowButtonEx(str_id,dir,size_arg,flags);
 }
-CIMGUI_API bool igImageButtonEx(ImGuiID id,ImTextureID texture_id,const ImVec2 image_size,const ImVec2 uv0,const ImVec2 uv1,const ImVec4 bg_col,const ImVec4 tint_col,ImGuiButtonFlags flags)
+CIMGUI_API bool igImageButtonEx(ImGuiID id,ImTextureID user_texture_id,const ImVec2 image_size,const ImVec2 uv0,const ImVec2 uv1,const ImVec4 bg_col,const ImVec4 tint_col,ImGuiButtonFlags flags)
 {
-    return ImGui::ImageButtonEx(id,texture_id,image_size,uv0,uv1,bg_col,tint_col,flags);
+    return ImGui::ImageButtonEx(id,user_texture_id,image_size,uv0,uv1,bg_col,tint_col,flags);
 }
 CIMGUI_API void igSeparatorEx(ImGuiSeparatorFlags flags,float thickness)
 {
@@ -5427,9 +5431,9 @@ CIMGUI_API void igScrollbar(ImGuiAxis axis)
 {
    return ImGui::Scrollbar(axis);
 }
-CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,ImS64* p_scroll_v,ImS64 avail_v,ImS64 contents_v,ImDrawFlags flags)
+CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,ImS64* p_scroll_v,ImS64 avail_v,ImS64 contents_v,ImDrawFlags draw_rounding_flags)
 {
-    return ImGui::ScrollbarEx(bb,id,axis,p_scroll_v,avail_v,contents_v,flags);
+    return ImGui::ScrollbarEx(bb,id,axis,p_scroll_v,avail_v,contents_v,draw_rounding_flags);
 }
 CIMGUI_API void igGetWindowScrollbarRect(ImRect *pOut,ImGuiWindow* window,ImGuiAxis axis)
 {
@@ -5803,7 +5807,7 @@ CIMGUI_API void ImGuiFreeType_SetAllocatorFunctions(void*(*alloc_func)(size_t sz


 /////////////////////////////manual written functions
-CIMGUI_API void igLogText(CONST char *fmt, ...)
+CIMGUI_API void igLogText(const char *fmt, ...)
 {
    char buffer[256];
    va_list args;
@@ -5813,11 +5817,11 @@ CIMGUI_API void igLogText(CONST char *fmt, ...)

    ImGui::LogText("%s", buffer);
 }
-CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const char *fmt, ...)
+CIMGUI_API void ImGuiTextBuffer_appendf(ImGuiTextBuffer *self, const char *fmt, ...)
 {
    va_list args;
    va_start(args, fmt);
-    buffer->appendfv(fmt, args);
+    self->appendfv(fmt, args);
    va_end(args);
 }

--- a/cimgui.h
+++ b/cimgui.h
@@ -1,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.91.5" 19150 from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.91.7" 19170 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 //with imgui_freetype.h api
 //docking branch
@@ -88,6 +88,7 @@ typedef struct ImGuiColorMod ImGuiColorMod;
 typedef struct ImGuiContextHook ImGuiContextHook;
 typedef struct ImGuiDataVarInfo ImGuiDataVarInfo;
 typedef struct ImGuiDataTypeInfo ImGuiDataTypeInfo;
+typedef struct ImGuiDeactivatedItemData ImGuiDeactivatedItemData;
 typedef struct ImGuiDockContext ImGuiDockContext;
 typedef struct ImGuiDockRequest ImGuiDockRequest;
 typedef struct ImGuiDockNode ImGuiDockNode;
@@ -216,6 +217,7 @@ typedef ImU64 ImTextureID;
 typedef unsigned short ImDrawIdx;
 typedef unsigned int ImWchar32;
 typedef unsigned short ImWchar16;
+
 #ifdef IMGUI_USE_WCHAR32            
 typedef ImWchar32 ImWchar;
 #else
@@ -314,12 +316,13 @@ typedef enum {
    ImGuiInputTextFlags_DisplayEmptyRefVal = 1 << 14,
    ImGuiInputTextFlags_NoHorizontalScroll = 1 << 15,
    ImGuiInputTextFlags_NoUndoRedo = 1 << 16,
-    ImGuiInputTextFlags_CallbackCompletion = 1 << 17,
-    ImGuiInputTextFlags_CallbackHistory = 1 << 18,
-    ImGuiInputTextFlags_CallbackAlways = 1 << 19,
-    ImGuiInputTextFlags_CallbackCharFilter = 1 << 20,
-    ImGuiInputTextFlags_CallbackResize = 1 << 21,
-    ImGuiInputTextFlags_CallbackEdit = 1 << 22,
+    ImGuiInputTextFlags_ElideLeft = 1 << 17,
+    ImGuiInputTextFlags_CallbackCompletion = 1 << 18,
+    ImGuiInputTextFlags_CallbackHistory = 1 << 19,
+    ImGuiInputTextFlags_CallbackAlways = 1 << 20,
+    ImGuiInputTextFlags_CallbackCharFilter = 1 << 21,
+    ImGuiInputTextFlags_CallbackResize = 1 << 22,
+    ImGuiInputTextFlags_CallbackEdit = 1 << 23,
 }ImGuiInputTextFlags_;
 typedef enum {
    ImGuiTreeNodeFlags_None = 0,
@@ -336,9 +339,10 @@ typedef enum {
    ImGuiTreeNodeFlags_FramePadding = 1 << 10,
    ImGuiTreeNodeFlags_SpanAvailWidth = 1 << 11,
    ImGuiTreeNodeFlags_SpanFullWidth = 1 << 12,
-    ImGuiTreeNodeFlags_SpanTextWidth = 1 << 13,
+    ImGuiTreeNodeFlags_SpanLabelWidth = 1 << 13,
    ImGuiTreeNodeFlags_SpanAllColumns = 1 << 14,
-    ImGuiTreeNodeFlags_NavLeftJumpsBackHere = 1 << 15,
+    ImGuiTreeNodeFlags_LabelSpanAllColumns = 1 << 15,
+    ImGuiTreeNodeFlags_NavLeftJumpsBackHere = 1 << 17,
    ImGuiTreeNodeFlags_CollapsingHeader = ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_NoAutoOpenOnLog,
 }ImGuiTreeNodeFlags_;
 typedef enum {
@@ -471,6 +475,7 @@ typedef enum {
    ImGuiDataType_Float,
    ImGuiDataType_Double,
    ImGuiDataType_Bool,
+    ImGuiDataType_String,
    ImGuiDataType_COUNT
 }ImGuiDataType_;
 typedef enum {
@@ -834,6 +839,7 @@ typedef enum {
    ImGuiSliderFlags_WrapAround = 1 << 8,
    ImGuiSliderFlags_ClampOnInput = 1 << 9,
    ImGuiSliderFlags_ClampZeroRange = 1 << 10,
+    ImGuiSliderFlags_NoSpeedTweaks = 1 << 11,
    ImGuiSliderFlags_AlwaysClamp = ImGuiSliderFlags_ClampOnInput | ImGuiSliderFlags_ClampZeroRange,
    ImGuiSliderFlags_InvalidMask_ = 0x7000000F,
 }ImGuiSliderFlags_;
@@ -1442,8 +1448,8 @@ struct ImFontGlyphRangesBuilder
 typedef struct ImFontAtlasCustomRect ImFontAtlasCustomRect;
 struct ImFontAtlasCustomRect
 {
-    unsigned short Width, Height;
    unsigned short X, Y;
+    unsigned short Width, Height;
    unsigned int GlyphID : 31;
    unsigned int GlyphColored : 1;
    float GlyphAdvanceX;
@@ -1502,9 +1508,9 @@ struct ImFont
    ImFontAtlas* ContainerAtlas;
    const ImFontConfig* ConfigData;
    short ConfigDataCount;
-    ImWchar FallbackChar;
-    ImWchar EllipsisChar;
    short EllipsisCharCount;
+    ImWchar EllipsisChar;
+    ImWchar FallbackChar;
    float EllipsisWidth;
    float EllipsisCharStep;
    bool DirtyLookupTables;
@@ -1615,6 +1621,7 @@ struct ImGuiContext;
 struct ImGuiContextHook;
 struct ImGuiDataVarInfo;
 struct ImGuiDataTypeInfo;
+struct ImGuiDeactivatedItemData;
 struct ImGuiDockContext;
 struct ImGuiDockRequest;
 struct ImGuiDockNode;
@@ -1705,6 +1712,7 @@ struct ImGuiTextIndex
 struct ImDrawListSharedData
 {
    ImVec2 TexUvWhitePixel;
+    const ImVec4* TexUvLines;
    ImFont* Font;
    float FontSize;
    float FontScale;
@@ -1716,7 +1724,6 @@ struct ImDrawListSharedData
    ImVec2 ArcFastVtx[48];
    float ArcFastRadiusCutoff;
    ImU8 CircleSegmentCounts[64];
-    const ImVec4* TexUvLines;
 };
 struct ImDrawDataBuilder
 {
@@ -1742,8 +1749,7 @@ struct ImGuiDataTypeInfo
    const char* ScanFmt;
 };
 typedef enum {
-    ImGuiDataType_String = ImGuiDataType_COUNT + 1,
-    ImGuiDataType_Pointer,
+    ImGuiDataType_Pointer = ImGuiDataType_COUNT + 1,
    ImGuiDataType_ID,
 }ImGuiDataTypePrivate_;
 typedef enum {
@@ -1895,7 +1901,7 @@ struct ImGuiGroupData
    ImVec2 BackupCurrLineSize;
    float BackupCurrLineTextBaseOffset;
    ImGuiID BackupActiveIdIsAlive;
-    bool BackupActiveIdPreviousFrameIsAlive;
+    bool BackupDeactivatedIdIsAlive;
    bool BackupHoveredIdIsAlive;
    bool BackupIsSameLine;
    bool EmitItem;
@@ -1922,8 +1928,10 @@ struct ImGuiInputTextState
 {
    ImGuiContext* Ctx;
    ImStbTexteditState* Stb;
+    ImGuiInputTextFlags Flags;
    ImGuiID ID;
    int TextLen;
+    const char* TextSrc;
    ImVector_char TextA;
    ImVector_char TextToRevertTo;
    ImVector_char CallbackTextBackup;
@@ -1933,8 +1941,7 @@ struct ImGuiInputTextState
    bool CursorFollow;
    bool SelectedAllMouseLock;
    bool Edited;
-    ImGuiInputTextFlags Flags;
-    bool ReloadUserBuf;
+    bool WantReloadUserBuf;
    int ReloadSelectionStart;
    int ReloadSelectionEnd;
 };
@@ -2060,6 +2067,13 @@ struct ImGuiPtrOrIndex
    void* Ptr;
    int Index;
 };
+struct ImGuiDeactivatedItemData
+{
+    ImGuiID ID;
+    int ElapseFrame;
+    bool HasBeenEditedBefore;
+    bool IsAlive;
+};
 typedef enum {
    ImGuiPopupPositionPolicy_Default,
    ImGuiPopupPositionPolicy_ComboBox,
@@ -2582,10 +2596,11 @@ typedef enum {
    ImGuiDebugLogFlags_EventClipper = 1 << 5,
    ImGuiDebugLogFlags_EventSelection = 1 << 6,
    ImGuiDebugLogFlags_EventIO = 1 << 7,
-    ImGuiDebugLogFlags_EventInputRouting = 1 << 8,
-    ImGuiDebugLogFlags_EventDocking = 1 << 9,
-    ImGuiDebugLogFlags_EventViewport = 1 << 10,
-    ImGuiDebugLogFlags_EventMask_ = ImGuiDebugLogFlags_EventError | ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventSelection | ImGuiDebugLogFlags_EventIO | ImGuiDebugLogFlags_EventInputRouting | ImGuiDebugLogFlags_EventDocking | ImGuiDebugLogFlags_EventViewport,
+    ImGuiDebugLogFlags_EventFont = 1 << 8,
+    ImGuiDebugLogFlags_EventInputRouting = 1 << 9,
+    ImGuiDebugLogFlags_EventDocking = 1 << 10,
+    ImGuiDebugLogFlags_EventViewport = 1 << 11,
+    ImGuiDebugLogFlags_EventMask_ = ImGuiDebugLogFlags_EventError | ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventSelection | ImGuiDebugLogFlags_EventIO | ImGuiDebugLogFlags_EventFont | ImGuiDebugLogFlags_EventInputRouting | ImGuiDebugLogFlags_EventDocking | ImGuiDebugLogFlags_EventViewport,
    ImGuiDebugLogFlags_OutputToTTY = 1 << 20,
    ImGuiDebugLogFlags_OutputToTestEngine = 1 << 21,
 }ImGuiDebugLogFlags_;
@@ -2726,9 +2741,9 @@ struct ImGuiContext
    int FrameCountEnded;
    int FrameCountPlatformEnded;
    int FrameCountRendered;
+    ImGuiID WithinEndChildID;
    bool WithinFrameScope;
    bool WithinFrameScopeWithImplicitWindow;
-    bool WithinEndChild;
    bool GcCompactAll;
    bool TestEngineHookItems;
    void* TestEngine;
@@ -2782,9 +2797,8 @@ struct ImGuiContext
    ImGuiWindow* ActiveIdWindow;
    ImGuiInputSource ActiveIdSource;
    ImGuiID ActiveIdPreviousFrame;
-    bool ActiveIdPreviousFrameIsAlive;
-    bool ActiveIdPreviousFrameHasBeenEditedBefore;
-    ImGuiWindow* ActiveIdPreviousFrameWindow;
+    ImGuiDeactivatedItemData DeactivatedItemData;
+    ImGuiDataTypeStorage ActiveIdValueOnActivation;
    ImGuiID LastActiveId;
    float LastActiveIdTimer;
    double LastKeyModsChangeTime;
@@ -4565,6 +4579,7 @@ CIMGUI_API ImGuiTableSettings* ImGuiTableSettings_ImGuiTableSettings(void);
 CIMGUI_API void ImGuiTableSettings_destroy(ImGuiTableSettings* self);
 CIMGUI_API ImGuiTableColumnSettings* ImGuiTableSettings_GetColumnSettings(ImGuiTableSettings* self);
 CIMGUI_API ImGuiIO* igGetIOEx(ImGuiContext* ctx);
+CIMGUI_API ImGuiPlatformIO* igGetPlatformIOEx(ImGuiContext* ctx);
 CIMGUI_API ImGuiWindow* igGetCurrentWindowRead(void);
 CIMGUI_API ImGuiWindow* igGetCurrentWindow(void);
 CIMGUI_API ImGuiWindow* igFindWindowByID(ImGuiID id);
@@ -4915,7 +4930,7 @@ CIMGUI_API ImDrawFlags igCalcRoundingFlagsForRectInRect(const ImRect r_in,const
 CIMGUI_API void igTextEx(const char* text,const char* text_end,ImGuiTextFlags flags);
 CIMGUI_API bool igButtonEx(const char* label,const ImVec2 size_arg,ImGuiButtonFlags flags);
 CIMGUI_API bool igArrowButtonEx(const char* str_id,ImGuiDir dir,ImVec2 size_arg,ImGuiButtonFlags flags);
-CIMGUI_API bool igImageButtonEx(ImGuiID id,ImTextureID texture_id,const ImVec2 image_size,const ImVec2 uv0,const ImVec2 uv1,const ImVec4 bg_col,const ImVec4 tint_col,ImGuiButtonFlags flags);
+CIMGUI_API bool igImageButtonEx(ImGuiID id,ImTextureID user_texture_id,const ImVec2 image_size,const ImVec2 uv0,const ImVec2 uv1,const ImVec4 bg_col,const ImVec4 tint_col,ImGuiButtonFlags flags);
 CIMGUI_API void igSeparatorEx(ImGuiSeparatorFlags flags,float thickness);
 CIMGUI_API void igSeparatorTextEx(ImGuiID id,const char* label,const char* label_end,float extra_width);
 CIMGUI_API bool igCheckboxFlags_S64Ptr(const char* label,ImS64* flags,ImS64 flags_value);
@@ -4923,7 +4938,7 @@ CIMGUI_API bool igCheckboxFlags_U64Ptr(const char* label,ImU64* flags,ImU64 flag
 CIMGUI_API bool igCloseButton(ImGuiID id,const ImVec2 pos);
 CIMGUI_API bool igCollapseButton(ImGuiID id,const ImVec2 pos,ImGuiDockNode* dock_node);
 CIMGUI_API void igScrollbar(ImGuiAxis axis);
-CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,ImS64* p_scroll_v,ImS64 avail_v,ImS64 contents_v,ImDrawFlags flags);
+CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,ImS64* p_scroll_v,ImS64 avail_v,ImS64 contents_v,ImDrawFlags draw_rounding_flags);
 CIMGUI_API void igGetWindowScrollbarRect(ImRect *pOut,ImGuiWindow* window,ImGuiAxis axis);
 CIMGUI_API ImGuiID igGetWindowScrollbarID(ImGuiWindow* window,ImGuiAxis axis);
 CIMGUI_API ImGuiID igGetWindowResizeCornerID(ImGuiWindow* window,int n);
@@ -5023,7 +5038,7 @@ CIMGUI_API void ImGuiFreeType_SetAllocatorFunctions(void*(*alloc_func)(size_t sz
 //no LogTextV
 CIMGUI_API void igLogText(const char *fmt, ...);
 //no appendfV
-CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const char *fmt, ...);
+CIMGUI_API void ImGuiTextBuffer_appendf(ImGuiTextBuffer *self, const char *fmt, ...);
 //for getting FLT_MAX in bindings
 CIMGUI_API float igGET_FLT_MAX(void);
 //for getting FLT_MIN in bindings
--- a/generator/cimgui_template.cpp
+++ b/generator/cimgui_template.cpp
@@ -12,7 +12,7 @@


 /////////////////////////////manual written functions
-CIMGUI_API void igLogText(CONST char *fmt, ...)
+CIMGUI_API void igLogText(const char *fmt, ...)
 {
    char buffer[256];
    va_list args;
@@ -22,11 +22,11 @@ CIMGUI_API void igLogText(CONST char *fmt, ...)

    ImGui::LogText("%s", buffer);
 }
-CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const char *fmt, ...)
+CIMGUI_API void ImGuiTextBuffer_appendf(ImGuiTextBuffer *self, const char *fmt, ...)
 {
    va_list args;
    va_start(args, fmt);
-    buffer->appendfv(fmt, args);
+    self->appendfv(fmt, args);
    va_end(args);
 }

--- a/generator/cimgui_template.h
+++ b/generator/cimgui_template.h
@@ -49,7 +49,7 @@ typedef union SDL_Event SDL_Event;
 //no LogTextV
 CIMGUI_API void igLogText(const char *fmt, ...);
 //no appendfV
-CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const char *fmt, ...);
+CIMGUI_API void ImGuiTextBuffer_appendf(ImGuiTextBuffer *self, const char *fmt, ...);
 //for getting FLT_MAX in bindings
 CIMGUI_API float igGET_FLT_MAX(void);
 //for getting FLT_MIN in bindings
--- a/generator/cpp2ffi.lua
+++ b/generator/cpp2ffi.lua
@@ -320,6 +320,9 @@ local function getRE()
 	function_re = "^([^;{}]+%b()[\n%s]*;)%s*",
 	function_re = "^([^;{}=]+%b()[\n%s%w]*;)", --const at the end
 	function_re = "^([^;{}=]+%b()[\n%s%w%(%)_]*;)", --attribute(deprecated)
+	--we need to skip = as function because of "var = f()" initialization in struct fields
+	-- but we don want operator== to appear as a var and as we should skip this kind of function solution is:
+	operator_re = "^([^;{}]+operator[^;{}]+%b()[\n%s%w%(%)_]*;)",
 	struct_re = "^([^;{}]-struct[^;{}]-%b{}[%s%w_%(%)]*;)",
 	enum_re = "^([^;{}]-enum[^;{}]-%b{}[%s%w_%(%)]*;)",
 	union_re = "^([^;{}]-union[^;{}]-%b{}[%s%w_%(%)]*;)",
@@ -344,7 +347,7 @@ local function getRE()
 	}
 	
 	local resN = {"comment2_re","comment_re","emptyline_re",
-	"functypedef_re","functype_re","function_re","functionD_re","typedef_st_re","struct_re","enum_re","union_re","namespace_re","class_re","typedef_re","vardef_re"}
+	"functypedef_re","functype_re","function_re","functionD_re","operator_re","typedef_st_re","struct_re","enum_re","union_re","namespace_re","class_re","typedef_re","vardef_re"}
 	
 	return res,resN
 end
@@ -600,7 +603,7 @@ local function clean_names_from_signature(self,signat)
 	return result
 end
 local function clean_functypedef(line)
-	local first, args = line:match("(typedef .-%(%*[_%w]+%))%s*(%b())")
+	local first, args = line:match("(typedef .-%(%*%s*[_%w]+%))%s*(%b())")

 	if not args then
 		print"not getting args in"
@@ -1042,7 +1045,39 @@ local function ADDIMSTR_S(FP)
    end
 	FP.funcdefs = newcdefs
 end
+--this creates defsBystruct in case you need to list by struct container
+local function DefsByStruct(FP)
+    local structs = {}
+    for fun,defs in pairs(FP.defsT) do
+        local stname = defs[1].stname
+        structs[stname] = structs[stname] or {}
+        table.insert(structs[stname],defs)--fun)
+    end
+    return structs
+end  
+local function get_nonPOD(FP)
+	local defbystruct = DefsByStruct(FP)
+	--M.prtable(defbystruct)
+	local nonPOD = {}
+	for k,defs in pairs(defbystruct) do 
+		if k~="" then
+		for i, ww in ipairs(defs) do
+			-- print(k,i,ww)
+			-- M.prtable(ww)
+			if not ww[1].ret then --constructor
+				nonPOD[k] = true
+				break;
+			end
+		end
+		end
+	end
+	FP.structs_and_enums_table.nonPOD = nonPOD
+	return nonPOD
+end
 local function ADDnonUDT(FP)
+	local nonPOD = get_nonPOD(FP)
+	--print"nonPOD"
+	--M.prtable(nonPOD)
    local defsT = FP.defsT
    --local newcdefs = {}
    for numcdef,t in ipairs(FP.funcdefs) do
@@ -1056,10 +1091,17 @@ local function ADDnonUDT(FP)
 		end
        --if UDT return generate nonUDT version
 		local isUDT = false
-		for _,udt_ret in ipairs(FP.UDTs) do
-			if udt_ret == defT.ret then isUDT=true;break end
+		--isUDT = FP.structs_and_enums_table.structs[defT.ret] and true or false
+		isUDT = nonPOD[defT.ret] and true or false
+		--inherited
+		if (not isUDT) and FP.cimgui_inherited and FP.cimgui_inherited.nonPOD[defT.ret] then
+			isUDT = true
 		end
-        --if defT.ret=="ImVec2" or defT.ret=="ImVec4" or defT.ret=="ImColor" then
+		for _,udt_ret in ipairs(FP.UDTs) do
+			if udt_ret == defT.ret then isUDT=true; break end
+		end
+
+
 		if isUDT then
            --passing as a pointer arg
            local defT2 = {}
@@ -1425,6 +1467,7 @@ function M.Parser()
 		--save_data("./preparse"..tostring(self):gsub("table: ","")..".c",txt)
 		--]]
 		self.itemsarr = par:parseItemsR2(txt)
+		--save_data("./itemsarr.lua",ToStr(self.itemsarr))
 		itemsarr = self.itemsarr
 	end
 	
@@ -1471,10 +1514,13 @@ function M.Parser()
 		local predeclare = ""
 		--local iner = strip_end(stru:match("%b{}"):sub(2,-2))
 		local inistruct = clean_spaces(stru:match("(.-)%b{}"))
+		--clean final:
+		inistruct = inistruct:gsub("%s*final%s*:",":")
 		--local stname = stru:match("struct%s*(%S+)%s*%b{}")
 		local stname, derived
 		if inistruct:match":" then
 			stname,derived = inistruct:match"struct%s*([^%s:]+):(.+)"
+			--print(inistruct,stname,derived)
 			derived = derived:match"(%S+)$"
 		else
 			if itst.re_name == "struct_re" then
@@ -1529,12 +1575,14 @@ function M.Parser()
 					--local ttype,template = it.item:match("([^%s,%(%)]+)%s*<(.+)>")
 					local ttype,template,te,code2 =  check_template(it2)  --it.item:match"([^%s,%(%)]+)%s*<(.+)>"
 					if template then
+						--print("not doheader",ttype,template,te)
 						if self.typenames[ttype] ~= template then --rule out T (template typename)
 							self.templates[ttype] = self.templates[ttype] or {}
 							self.templates[ttype][template] = te
 							it2=code2
 						end
 						if doheader then
+							
 							local templatetypedef = self:gentemplatetypedef(ttype, template,self.templates[ttype][template])
 							predeclare = predeclare .. templatetypedef
 						end
@@ -1590,7 +1638,7 @@ function M.Parser()
 				end
 			elseif it.re_name == "enum_re" then
 				--nop
-			elseif it.re_name ~= "functionD_re" and it.re_name ~= "function_re" then
+			elseif it.re_name ~= "functionD_re" and it.re_name ~= "function_re" and it.re_name ~= "operator_re" then
 				print(it.re_name,"not processed clean_struct in",stname,it.item:sub(1,24))
 				--M.prtable(it)
 			end
@@ -1657,6 +1705,7 @@ function M.Parser()
 						it2 = clean_functypedef(it2)
 					else
 						assert(it.re_name == "vardef_re")
+						it2 = it2:gsub("constexpr","static const")
 						if it2:match"enum" then
 							print("--skip enum forward declaration:",it2)
 							it2 = ""
@@ -1771,7 +1820,9 @@ function M.Parser()
 					local ttype,fun = it.item:match"^%s*template%s+<%s*typename%s+([^>]+)%s*>%s*(.+)$"
 					if self.ftemplate_list and self.ftemplate_list[ttype] then
 						for iT,vT in ipairs(self.ftemplate_list[ttype]) do
-							local funT = fun:gsub(ttype,vT)
+							local funT = fun:gsub("([< %(])"..ttype,"%1"..vT)
+							--funT = funT:gsub("sizeof%("..ttype.."%)","sizeof("..vT..")")
+							--local funT = fun:gsub(ttype,vT)
 							self:parseFunction(stname,{item=funT},namespace,it.locat)
 						end
 					end
@@ -1779,7 +1830,9 @@ function M.Parser()
 					self:parseFunction(stname,it,namespace,it.locat)
 				end
 			else
+				if it.re_name~="operator_re" then
 				print("not processed gen",it.re_name,it.item:sub(1,20))
+				end
 			end
 		end
 		
@@ -1938,7 +1991,7 @@ function M.Parser()
 					self.typedefs_dict[typedefname] = strip(typedefdef)
 				elseif it.re_name == "functypedef_re" then
 					-- "^\n*%s*(typedef[%w%s%*_]+%([^*]*%*?%s*[%w_]+%s*%)%s*%b()%s*;)"
-					local key = it.item:match("%(%*([%w_]+)%)%([^%(%)]*%)")
+					local key = it.item:match("%(%*%s*([%w_]+)%)%s*%([^%(%)]*%)")
 					if key then
 						local linet = it.item
 						linet = linet:gsub("[\n%s]+typedef ","")
@@ -1989,7 +2042,7 @@ function M.Parser()
 				end
 			elseif it.re_name == "namespace_re" or it.re_name == "union_re" or it.re_name == "functype_re" then
 				--nop
-			elseif it.re_name ~= "functionD_re" and it.re_name ~= "function_re" then
+			elseif it.re_name ~= "functionD_re" and it.re_name ~= "function_re" and it.re_name ~= "operator_re" then
 				print("not processed gen table",it.re_name)
 			end
 		end
@@ -2234,6 +2287,7 @@ function M.Parser()
 		return self:gen_template_typedef_auto(ttype,te,newte)
 	end
 	function par:gen_template_typedef_auto(ttype,te,newte)
+		--M.prtable(self.templated_structs)
 		assert(self.templated_structs[ttype],ttype)
 		local defi = self.templated_structs[ttype]
 		local Targ = strsplit(self.typenames[ttype],",")
@@ -2277,7 +2331,111 @@ function M.Parser()
 	end
 	return par
 end
+-- more compact serialization
+local function basicSerialize (o)
+    if type(o) == "number" then
+		return string.format("%.17g", o)
+	elseif type(o)=="boolean" then
+        return tostring(o)
+    elseif type(o) == "string" then
+        return string.format("%q", o)
+	elseif pcall(function() return o.__serialize end) then
+		return o.__serialize(o)
+	elseif type(o)=="cdata" then
+		return cdataSerialize(o)
+	else
+		return tostring(o) --"nil"
+    end
+end
+-- very readable and now suited for cyclic tables
+local kw = {['and'] = true, ['break'] = true, ['do'] = true, ['else'] = true,
+	['elseif'] = true, ['end'] = true, ['false'] = true, ['for'] = true,
+	['function'] = true, ['goto'] = true, ['if'] = true, ['in'] = true,
+	['local'] = true, ['nil'] = true, ['not'] = true, ['or'] = true,
+	['repeat'] = true, ['return'] = true, ['then'] = true, ['true'] = true,
+	['until'] = true, ['while'] = true}
+function tb2st_serialize(t,options)
+	options = options or {}
+	local function sorter(a,b)
+        if type(a)==type(b) then 
+            return a<b 
+        elseif type(a)=="number" then
+            return true
+        else
+            assert(type(b)=="number")
+            return false
+        end
+    end
+	local function serialize_key(val, dodot, pretty)
+		local dot = dodot and "." or ""
+		if type(val)=="string" then
+			if  val:match '^[_%a][_%w]*$' and not kw[val] then
+				return dot..tostring(val)
+			else
+				return "[\""..tostring(val).."\"]"
+			end
+		elseif (not pretty) and (not dodot) and (type(val) == "number") and (math.floor(val)==val) then
+			return  --array index
+		else
+			return "["..tostring(val).."]"
+		end
+	end
+	local function serialize_key_name(val)
+		return serialize_key(val, true)
+	end
+	local insert = table.insert
+	local function _tb2st(t,saved,sref,level,name)
+		saved = saved or {}		-- initial value
+		level = level or 0
+		sref = sref or {}
+		name = name or "t"
+		if type(t)=="table" then
+			if saved[t] then
+				sref[#sref+1] = {saved[t],name}
+				return"nil"
+			else
+				saved[t] = name

+				local ordered_keys = {}
+				for k,v in pairs(t) do
+					insert(ordered_keys,k)
+				end
+				table.sort(ordered_keys,sorter)
+				
+				local str2 = {}
+				insert(str2,"{")
+				if options.pretty then insert(str2,"\n") end
+				for _,k in ipairs(ordered_keys) do
+					if options.pretty then insert(str2,("  "):rep(level+1)) end
+					local v = t[k]
+					local kser = serialize_key(k, nil, options.pretty)
+					insert(str2, (kser and (kser .."=") or ""))
+					if type(v)~="table" then
+						insert(str2, basicSerialize(v))
+					else
+						local name2 = name .. serialize_key_name(k)
+						insert(str2,_tb2st(v,saved,sref,level+1,name2))
+					end
+					if options.pretty then insert(str2,",\n") else insert(str2, ",") end
+				end
+				str2[#str2] = "}"
+				if level == 0 then
+					--insert(str2, 1,"local ffi = require'ffi'\nlocal t=")
+					insert(str2, 1,"local t=")
+					for i,v in ipairs(sref) do 
+						insert(str2, "\n"..v[2].."="..v[1])
+					end
+					insert(str2,"\n return t")
+				end
+				return table.concat(str2)
+			end
+		else
+			return basicSerialize(t)
+		end
+	end
+	return(_tb2st(t))
+end
+M.tb2st_serialize = tb2st_serialize
 ------serializeTable("anyname",table) gives a string that recreates the table with dofile(generated_string)
 local function serializeTable(name, value, saved)
    
@@ -2339,10 +2497,11 @@ local function serializeTable(name, value, saved)
    
    return table.concat(string_table)
 end
-M.serializeTable = serializeTable
-M.serializeTableF = function(t)
-	return M.serializeTable("defs",t).."\nreturn defs"
-end
+-- M.serializeTable = serializeTable
+-- M.serializeTableF = function(t)
+	-- return M.serializeTable("defs",t).."\nreturn defs"
+-- end
+M.serializeTableF = function(t) return tb2st_serialize(t,{pretty=true}) end --new serialization more compact
 --iterates lines from a gcc/clang -E in a specific location
 local function location(file,locpathT,defines,COMPILER,keepemptylines)
 	local define_re = "^#define%s+([^%s]+)%s+(.+)$"
--- a/generator/generator.lua
+++ b/generator/generator.lua
@@ -225,7 +225,9 @@ local function colapse_defines(str, define)
 	return str
 end
 local wchardefine =
-[[#ifdef IMGUI_USE_WCHAR32            
+[[
+
+#ifdef IMGUI_USE_WCHAR32            
 typedef ImWchar32 ImWchar;
 #else
 typedef ImWchar16 ImWchar;
@@ -293,8 +295,8 @@ local function cimgui_generation(parser)
 	local num
 	hstrfile, num = hstrfile:gsub("typedef ImWchar16 ImWchar;", wchardefine)
 	assert(num == 1)
-	hstrfile, num = hstrfile:gsub("Used4kPagesMap%[%(0xFFFF", "Used4kPagesMap[(IM_UNICODE_CODEPOINT_MAX")
-	assert(num == 1)
+	hstrfile, num = hstrfile:gsub("kPagesMap%[%(0xFFFF", "kPagesMap[(IM_UNICODE_CODEPOINT_MAX")
+	assert(num == 1, "kPagesMap[(IM_UNICODE_CODEPOINT_MAX not found or found more than once")
    save_data("./output/cimgui.h",cimgui_header,hstrfile)
    
    --merge it in cimgui_template.cpp to cimgui.cpp
--- a/generator/output/cimgui_impl.h
+++ b/generator/output/cimgui_impl.h
@@ -79,6 +79,7 @@ CIMGUI_API bool ImGui_ImplSDL3_InitForVulkan(SDL_Window* window);
 CIMGUI_API bool ImGui_ImplSDL3_InitForD3D(SDL_Window* window);
 CIMGUI_API bool ImGui_ImplSDL3_InitForMetal(SDL_Window* window);
 CIMGUI_API bool ImGui_ImplSDL3_InitForSDLRenderer(SDL_Window* window,SDL_Renderer* renderer);
+CIMGUI_API bool ImGui_ImplSDL3_InitForSDLGPU(SDL_Window* window);
 CIMGUI_API bool ImGui_ImplSDL3_InitForOther(SDL_Window* window);
 CIMGUI_API void ImGui_ImplSDL3_Shutdown(void);
 CIMGUI_API void ImGui_ImplSDL3_NewFrame(void);
--- a/generator/output/definitions.json
+++ b/generator/output/definitions.json
--- a/generator/output/definitions.lua
+++ b/generator/output/definitions.lua
--- a/generator/output/impl_definitions.json
+++ b/generator/output/impl_definitions.json
@@ -427,7 +427,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
-      "location": "imgui_impl_opengl2:37",
+      "location": "imgui_impl_opengl2:39",
      "ov_cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
      "ret": "bool",
      "signature": "()",
@@ -443,7 +443,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_CreateFontsTexture",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_CreateFontsTexture",
-      "location": "imgui_impl_opengl2:35",
+      "location": "imgui_impl_opengl2:37",
      "ov_cimguiname": "ImGui_ImplOpenGL2_CreateFontsTexture",
      "ret": "bool",
      "signature": "()",
@@ -459,7 +459,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
-      "location": "imgui_impl_opengl2:38",
+      "location": "imgui_impl_opengl2:40",
      "ov_cimguiname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
      "ret": "void",
      "signature": "()",
@@ -475,7 +475,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
-      "location": "imgui_impl_opengl2:36",
+      "location": "imgui_impl_opengl2:38",
      "ov_cimguiname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
      "ret": "void",
      "signature": "()",
@@ -491,7 +491,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_Init",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_Init",
-      "location": "imgui_impl_opengl2:29",
+      "location": "imgui_impl_opengl2:31",
      "ov_cimguiname": "ImGui_ImplOpenGL2_Init",
      "ret": "bool",
      "signature": "()",
@@ -507,7 +507,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_NewFrame",
-      "location": "imgui_impl_opengl2:31",
+      "location": "imgui_impl_opengl2:33",
      "ov_cimguiname": "ImGui_ImplOpenGL2_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -528,7 +528,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_RenderDrawData",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_RenderDrawData",
-      "location": "imgui_impl_opengl2:32",
+      "location": "imgui_impl_opengl2:34",
      "ov_cimguiname": "ImGui_ImplOpenGL2_RenderDrawData",
      "ret": "void",
      "signature": "(ImDrawData*)",
@@ -544,7 +544,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL2_Shutdown",
-      "location": "imgui_impl_opengl2:30",
+      "location": "imgui_impl_opengl2:32",
      "ov_cimguiname": "ImGui_ImplOpenGL2_Shutdown",
      "ret": "void",
      "signature": "()",
@@ -879,11 +879,11 @@
          "type": "int"
        }
      ],
-      "argsoriginal": "(ImGui_ImplSDL2_GamepadMode mode,struct _SDL_GameController** manual_gamepads_array=((void*)0),int manual_gamepads_count=-1)",
+      "argsoriginal": "(ImGui_ImplSDL2_GamepadMode mode,struct _SDL_GameController** manual_gamepads_array=nullptr,int manual_gamepads_count=-1)",
      "call_args": "(mode,manual_gamepads_array,manual_gamepads_count)",
      "cimguiname": "ImGui_ImplSDL2_SetGamepadMode",
      "defaults": {
-        "manual_gamepads_array": "NULL",
+        "manual_gamepads_array": "nullptr",
        "manual_gamepads_count": "-1"
      },
      "funcname": "ImGui_ImplSDL2_SetGamepadMode",
@@ -991,13 +991,34 @@
      "cimguiname": "ImGui_ImplSDL3_InitForOther",
      "defaults": {},
      "funcname": "ImGui_ImplSDL3_InitForOther",
-      "location": "imgui_impl_sdl3:41",
+      "location": "imgui_impl_sdl3:42",
      "ov_cimguiname": "ImGui_ImplSDL3_InitForOther",
      "ret": "bool",
      "signature": "(SDL_Window*)",
      "stname": ""
    }
  ],
+  "ImGui_ImplSDL3_InitForSDLGPU": [
+    {
+      "args": "(SDL_Window* window)",
+      "argsT": [
+        {
+          "name": "window",
+          "type": "SDL_Window*"
+        }
+      ],
+      "argsoriginal": "(SDL_Window* window)",
+      "call_args": "(window)",
+      "cimguiname": "ImGui_ImplSDL3_InitForSDLGPU",
+      "defaults": {},
+      "funcname": "ImGui_ImplSDL3_InitForSDLGPU",
+      "location": "imgui_impl_sdl3:41",
+      "ov_cimguiname": "ImGui_ImplSDL3_InitForSDLGPU",
+      "ret": "bool",
+      "signature": "(SDL_Window*)",
+      "stname": ""
+    }
+  ],
  "ImGui_ImplSDL3_InitForSDLRenderer": [
    {
      "args": "(SDL_Window* window,SDL_Renderer* renderer)",
@@ -1053,7 +1074,7 @@
      "cimguiname": "ImGui_ImplSDL3_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplSDL3_NewFrame",
-      "location": "imgui_impl_sdl3:43",
+      "location": "imgui_impl_sdl3:44",
      "ov_cimguiname": "ImGui_ImplSDL3_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -1074,7 +1095,7 @@
      "cimguiname": "ImGui_ImplSDL3_ProcessEvent",
      "defaults": {},
      "funcname": "ImGui_ImplSDL3_ProcessEvent",
-      "location": "imgui_impl_sdl3:44",
+      "location": "imgui_impl_sdl3:45",
      "ov_cimguiname": "ImGui_ImplSDL3_ProcessEvent",
      "ret": "bool",
      "signature": "(const SDL_Event*)",
@@ -1098,15 +1119,15 @@
          "type": "int"
        }
      ],
-      "argsoriginal": "(ImGui_ImplSDL3_GamepadMode mode,SDL_Gamepad** manual_gamepads_array=((void*)0),int manual_gamepads_count=-1)",
+      "argsoriginal": "(ImGui_ImplSDL3_GamepadMode mode,SDL_Gamepad** manual_gamepads_array=nullptr,int manual_gamepads_count=-1)",
      "call_args": "(mode,manual_gamepads_array,manual_gamepads_count)",
      "cimguiname": "ImGui_ImplSDL3_SetGamepadMode",
      "defaults": {
-        "manual_gamepads_array": "NULL",
+        "manual_gamepads_array": "nullptr",
        "manual_gamepads_count": "-1"
      },
      "funcname": "ImGui_ImplSDL3_SetGamepadMode",
-      "location": "imgui_impl_sdl3:49",
+      "location": "imgui_impl_sdl3:50",
      "ov_cimguiname": "ImGui_ImplSDL3_SetGamepadMode",
      "ret": "void",
      "signature": "(ImGui_ImplSDL3_GamepadMode,SDL_Gamepad**,int)",
@@ -1122,7 +1143,7 @@
      "cimguiname": "ImGui_ImplSDL3_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplSDL3_Shutdown",
-      "location": "imgui_impl_sdl3:42",
+      "location": "imgui_impl_sdl3:43",
      "ov_cimguiname": "ImGui_ImplSDL3_Shutdown",
      "ret": "void",
      "signature": "()",
--- a/generator/output/impl_definitions.lua
+++ b/generator/output/impl_definitions.lua
--- a/generator/output/structs_and_enums.json
+++ b/generator/output/structs_and_enums.json
@@ -1035,20 +1035,15 @@
      }
    ],
    "ImGuiDataTypePrivate_": [
-      {
-        "calc_value": 12,
-        "name": "ImGuiDataType_String",
-        "value": "ImGuiDataType_COUNT + 1"
-      },
      {
        "calc_value": 13,
        "name": "ImGuiDataType_Pointer",
-        "value": "ImGuiDataType_COUNT + 1+1"
+        "value": "ImGuiDataType_COUNT + 1"
      },
      {
        "calc_value": 14,
        "name": "ImGuiDataType_ID",
-        "value": "ImGuiDataType_COUNT + 1+1+1"
+        "value": "ImGuiDataType_COUNT + 1+1"
      }
    ],
    "ImGuiDataType_": [
@@ -1109,8 +1104,13 @@
      },
      {
        "calc_value": 11,
-        "name": "ImGuiDataType_COUNT",
+        "name": "ImGuiDataType_String",
        "value": "11"
+      },
+      {
+        "calc_value": 12,
+        "name": "ImGuiDataType_COUNT",
+        "value": "12"
      }
    ],
    "ImGuiDebugLogFlags_": [
@@ -1161,23 +1161,28 @@
      },
      {
        "calc_value": 256,
-        "name": "ImGuiDebugLogFlags_EventInputRouting",
+        "name": "ImGuiDebugLogFlags_EventFont",
        "value": "1 << 8"
      },
      {
        "calc_value": 512,
-        "name": "ImGuiDebugLogFlags_EventDocking",
+        "name": "ImGuiDebugLogFlags_EventInputRouting",
        "value": "1 << 9"
      },
      {
        "calc_value": 1024,
-        "name": "ImGuiDebugLogFlags_EventViewport",
+        "name": "ImGuiDebugLogFlags_EventDocking",
        "value": "1 << 10"
      },
      {
-        "calc_value": 2047,
+        "calc_value": 2048,
+        "name": "ImGuiDebugLogFlags_EventViewport",
+        "value": "1 << 11"
+      },
+      {
+        "calc_value": 4095,
        "name": "ImGuiDebugLogFlags_EventMask_",
-        "value": "ImGuiDebugLogFlags_EventError | ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventSelection | ImGuiDebugLogFlags_EventIO | ImGuiDebugLogFlags_EventInputRouting | ImGuiDebugLogFlags_EventDocking | ImGuiDebugLogFlags_EventViewport"
+        "value": "ImGuiDebugLogFlags_EventError | ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventSelection | ImGuiDebugLogFlags_EventIO | ImGuiDebugLogFlags_EventFont | ImGuiDebugLogFlags_EventInputRouting | ImGuiDebugLogFlags_EventDocking | ImGuiDebugLogFlags_EventViewport"
      },
      {
        "calc_value": 1048576,
@@ -2038,33 +2043,38 @@
      },
      {
        "calc_value": 131072,
-        "name": "ImGuiInputTextFlags_CallbackCompletion",
+        "name": "ImGuiInputTextFlags_ElideLeft",
        "value": "1 << 17"
      },
      {
        "calc_value": 262144,
-        "name": "ImGuiInputTextFlags_CallbackHistory",
+        "name": "ImGuiInputTextFlags_CallbackCompletion",
        "value": "1 << 18"
      },
      {
        "calc_value": 524288,
-        "name": "ImGuiInputTextFlags_CallbackAlways",
+        "name": "ImGuiInputTextFlags_CallbackHistory",
        "value": "1 << 19"
      },
      {
        "calc_value": 1048576,
-        "name": "ImGuiInputTextFlags_CallbackCharFilter",
+        "name": "ImGuiInputTextFlags_CallbackAlways",
        "value": "1 << 20"
      },
      {
        "calc_value": 2097152,
-        "name": "ImGuiInputTextFlags_CallbackResize",
+        "name": "ImGuiInputTextFlags_CallbackCharFilter",
        "value": "1 << 21"
      },
      {
        "calc_value": 4194304,
-        "name": "ImGuiInputTextFlags_CallbackEdit",
+        "name": "ImGuiInputTextFlags_CallbackResize",
        "value": "1 << 22"
+      },
+      {
+        "calc_value": 8388608,
+        "name": "ImGuiInputTextFlags_CallbackEdit",
+        "value": "1 << 23"
      }
    ],
    "ImGuiItemFlagsPrivate_": [
@@ -3925,6 +3935,11 @@
        "name": "ImGuiSliderFlags_ClampZeroRange",
        "value": "1 << 10"
      },
+      {
+        "calc_value": 2048,
+        "name": "ImGuiSliderFlags_NoSpeedTweaks",
+        "value": "1 << 11"
+      },
      {
        "calc_value": 1536,
        "name": "ImGuiSliderFlags_AlwaysClamp",
@@ -4760,7 +4775,7 @@
      },
      {
        "calc_value": 8192,
-        "name": "ImGuiTreeNodeFlags_SpanTextWidth",
+        "name": "ImGuiTreeNodeFlags_SpanLabelWidth",
        "value": "1 << 13"
      },
      {
@@ -4770,9 +4785,14 @@
      },
      {
        "calc_value": 32768,
-        "name": "ImGuiTreeNodeFlags_NavLeftJumpsBackHere",
+        "name": "ImGuiTreeNodeFlags_LabelSpanAllColumns",
        "value": "1 << 15"
      },
+      {
+        "calc_value": 131072,
+        "name": "ImGuiTreeNodeFlags_NavLeftJumpsBackHere",
+        "value": "1 << 17"
+      },
      {
        "calc_value": 26,
        "name": "ImGuiTreeNodeFlags_CollapsingHeader",
@@ -5103,203 +5123,289 @@
    "ImGuiSortDirection": "ImU8"
  },
  "locations": {
-    "ImBitVector": "imgui_internal:610",
-    "ImColor": "imgui:2856",
-    "ImDrawChannel": "imgui:3096",
-    "ImDrawCmd": "imgui:3053",
-    "ImDrawCmdHeader": "imgui:3088",
-    "ImDrawData": "imgui:3312",
-    "ImDrawDataBuilder": "imgui_internal:799",
-    "ImDrawFlags_": "imgui:3122",
-    "ImDrawList": "imgui:3160",
-    "ImDrawListFlags_": "imgui:3142",
-    "ImDrawListSharedData": "imgui_internal:775",
-    "ImDrawListSplitter": "imgui:3105",
-    "ImDrawVert": "imgui:3073",
-    "ImFont": "imgui:3536",
-    "ImFontAtlas": "imgui:3432",
-    "ImFontAtlasCustomRect": "imgui:3393",
-    "ImFontAtlasFlags_": "imgui:3407",
-    "ImFontBuilderIO": "imgui_internal:3829",
-    "ImFontConfig": "imgui:3336",
-    "ImFontGlyph": "imgui:3366",
-    "ImFontGlyphRangesBuilder": "imgui:3378",
-    "ImGuiActivateFlags_": "imgui_internal:1558",
-    "ImGuiAxis": "imgui_internal:1025",
-    "ImGuiBackendFlags_": "imgui:1663",
-    "ImGuiBoxSelectState": "imgui_internal:1747",
-    "ImGuiButtonFlagsPrivate_": "imgui_internal:915",
-    "ImGuiButtonFlags_": "imgui:1797",
-    "ImGuiChildFlags_": "imgui:1152",
-    "ImGuiCol_": "imgui:1678",
-    "ImGuiColorEditFlags_": "imgui:1808",
-    "ImGuiColorMod": "imgui_internal:1039",
-    "ImGuiComboFlagsPrivate_": "imgui_internal:940",
-    "ImGuiComboFlags_": "imgui:1295",
-    "ImGuiComboPreviewData": "imgui_internal:1056",
-    "ImGuiCond_": "imgui:1909",
-    "ImGuiConfigFlags_": "imgui:1634",
-    "ImGuiContext": "imgui_internal:2214",
-    "ImGuiContextHook": "imgui_internal:2199",
-    "ImGuiContextHookType": "imgui_internal:2197",
-    "ImGuiDataAuthority_": "imgui_internal:1858",
-    "ImGuiDataTypeInfo": "imgui_internal:825",
-    "ImGuiDataTypePrivate_": "imgui_internal:834",
-    "ImGuiDataTypeStorage": "imgui_internal:819",
-    "ImGuiDataType_": "imgui:1443",
-    "ImGuiDataVarInfo": "imgui_internal:811",
-    "ImGuiDebugAllocEntry": "imgui_internal:2133",
-    "ImGuiDebugAllocInfo": "imgui_internal:2140",
-    "ImGuiDebugLogFlags_": "imgui_internal:2112",
-    "ImGuiDir": "imgui:1460",
-    "ImGuiDockContext": "imgui_internal:1960",
-    "ImGuiDockNode": "imgui_internal:1874",
-    "ImGuiDockNodeFlagsPrivate_": "imgui_internal:1828",
-    "ImGuiDockNodeFlags_": "imgui:1396",
-    "ImGuiDockNodeState": "imgui_internal:1865",
-    "ImGuiDragDropFlags_": "imgui:1415",
-    "ImGuiErrorRecoveryState": "imgui_internal:1289",
-    "ImGuiFocusRequestFlags_": "imgui_internal:985",
-    "ImGuiFocusScopeData": "imgui_internal:1644",
-    "ImGuiFocusedFlags_": "imgui:1342",
+    "ImBitVector": "imgui_internal:616",
+    "ImColor": "imgui:2869",
+    "ImDrawChannel": "imgui:3109",
+    "ImDrawCmd": "imgui:3066",
+    "ImDrawCmdHeader": "imgui:3101",
+    "ImDrawData": "imgui:3326",
+    "ImDrawDataBuilder": "imgui_internal:805",
+    "ImDrawFlags_": "imgui:3135",
+    "ImDrawList": "imgui:3173",
+    "ImDrawListFlags_": "imgui:3155",
+    "ImDrawListSharedData": "imgui_internal:783",
+    "ImDrawListSplitter": "imgui:3118",
+    "ImDrawVert": "imgui:3086",
+    "ImFont": "imgui:3552",
+    "ImFontAtlas": "imgui:3448",
+    "ImFontAtlasCustomRect": "imgui:3407",
+    "ImFontAtlasFlags_": "imgui:3423",
+    "ImFontBuilderIO": "imgui_internal:3849",
+    "ImFontConfig": "imgui:3350",
+    "ImFontGlyph": "imgui:3380",
+    "ImFontGlyphRangesBuilder": "imgui:3392",
+    "ImGuiActivateFlags_": "imgui_internal:1573",
+    "ImGuiAxis": "imgui_internal:1030",
+    "ImGuiBackendFlags_": "imgui:1672",
+    "ImGuiBoxSelectState": "imgui_internal:1762",
+    "ImGuiButtonFlagsPrivate_": "imgui_internal:920",
+    "ImGuiButtonFlags_": "imgui:1806",
+    "ImGuiChildFlags_": "imgui:1155",
+    "ImGuiCol_": "imgui:1687",
+    "ImGuiColorEditFlags_": "imgui:1817",
+    "ImGuiColorMod": "imgui_internal:1044",
+    "ImGuiComboFlagsPrivate_": "imgui_internal:945",
+    "ImGuiComboFlags_": "imgui:1303",
+    "ImGuiComboPreviewData": "imgui_internal:1061",
+    "ImGuiCond_": "imgui:1919",
+    "ImGuiConfigFlags_": "imgui:1643",
+    "ImGuiContext": "imgui_internal:2233",
+    "ImGuiContextHook": "imgui_internal:2218",
+    "ImGuiContextHookType": "imgui_internal:2216",
+    "ImGuiDataAuthority_": "imgui_internal:1875",
+    "ImGuiDataTypeInfo": "imgui_internal:831",
+    "ImGuiDataTypePrivate_": "imgui_internal:840",
+    "ImGuiDataTypeStorage": "imgui_internal:825",
+    "ImGuiDataType_": "imgui:1451",
+    "ImGuiDataVarInfo": "imgui_internal:817",
+    "ImGuiDeactivatedItemData": "imgui_internal:1338",
+    "ImGuiDebugAllocEntry": "imgui_internal:2152",
+    "ImGuiDebugAllocInfo": "imgui_internal:2159",
+    "ImGuiDebugLogFlags_": "imgui_internal:2130",
+    "ImGuiDir": "imgui:1469",
+    "ImGuiDockContext": "imgui_internal:1977",
+    "ImGuiDockNode": "imgui_internal:1891",
+    "ImGuiDockNodeFlagsPrivate_": "imgui_internal:1843",
+    "ImGuiDockNodeFlags_": "imgui:1404",
+    "ImGuiDockNodeState": "imgui_internal:1882",
+    "ImGuiDragDropFlags_": "imgui:1423",
+    "ImGuiErrorRecoveryState": "imgui_internal:1295",
+    "ImGuiFocusRequestFlags_": "imgui_internal:990",
+    "ImGuiFocusScopeData": "imgui_internal:1659",
+    "ImGuiFocusedFlags_": "imgui:1350",
    "ImGuiFreeTypeBuilderFlags": "imgui_freetype:26",
-    "ImGuiGroupData": "imgui_internal:1069",
-    "ImGuiHoveredFlagsPrivate_": "imgui_internal:898",
-    "ImGuiHoveredFlags_": "imgui:1356",
-    "ImGuiIDStackTool": "imgui_internal:2180",
-    "ImGuiIO": "imgui:2282",
-    "ImGuiInputEvent": "imgui_internal:1418",
-    "ImGuiInputEventAppFocused": "imgui_internal:1416",
-    "ImGuiInputEventKey": "imgui_internal:1414",
-    "ImGuiInputEventMouseButton": "imgui_internal:1412",
-    "ImGuiInputEventMousePos": "imgui_internal:1410",
-    "ImGuiInputEventMouseViewport": "imgui_internal:1413",
-    "ImGuiInputEventMouseWheel": "imgui_internal:1411",
-    "ImGuiInputEventText": "imgui_internal:1415",
-    "ImGuiInputEventType": "imgui_internal:1386",
-    "ImGuiInputFlagsPrivate_": "imgui_internal:1485",
-    "ImGuiInputFlags_": "imgui:1611",
-    "ImGuiInputSource": "imgui_internal:1399",
-    "ImGuiInputTextCallbackData": "imgui:2535",
-    "ImGuiInputTextDeactivatedState": "imgui_internal:1105",
-    "ImGuiInputTextFlagsPrivate_": "imgui_internal:906",
-    "ImGuiInputTextFlags_": "imgui:1186",
-    "ImGuiInputTextState": "imgui_internal:1127",
-    "ImGuiItemFlagsPrivate_": "imgui_internal:848",
-    "ImGuiItemFlags_": "imgui:1173",
-    "ImGuiItemStatusFlags_": "imgui_internal:872",
-    "ImGuiKey": "imgui:1484",
-    "ImGuiKeyData": "imgui:2274",
-    "ImGuiKeyOwnerData": "imgui_internal:1472",
-    "ImGuiKeyRoutingData": "imgui_internal:1446",
-    "ImGuiKeyRoutingTable": "imgui_internal:1460",
-    "ImGuiLastItemData": "imgui_internal:1261",
-    "ImGuiLayoutType_": "imgui_internal:1006",
-    "ImGuiListClipper": "imgui:2764",
-    "ImGuiListClipperData": "imgui_internal:1542",
-    "ImGuiListClipperRange": "imgui_internal:1529",
-    "ImGuiLocEntry": "imgui_internal:2086",
-    "ImGuiLocKey": "imgui_internal:2068",
-    "ImGuiLogFlags_": "imgui_internal:1013",
-    "ImGuiMenuColumns": "imgui_internal:1087",
-    "ImGuiMetricsConfig": "imgui_internal:2150",
-    "ImGuiMouseButton_": "imgui:1869",
-    "ImGuiMouseCursor_": "imgui:1879",
-    "ImGuiMouseSource": "imgui:1898",
-    "ImGuiMultiSelectFlags_": "imgui:2914",
-    "ImGuiMultiSelectIO": "imgui:2941",
-    "ImGuiMultiSelectState": "imgui_internal:1804",
-    "ImGuiMultiSelectTempData": "imgui_internal:1779",
-    "ImGuiNavItemData": "imgui_internal:1627",
-    "ImGuiNavLayer": "imgui_internal:1619",
-    "ImGuiNavMoveFlags_": "imgui_internal:1597",
-    "ImGuiNavRenderCursorFlags_": "imgui_internal:1583",
-    "ImGuiNextItemData": "imgui_internal:1241",
-    "ImGuiNextItemDataFlags_": "imgui_internal:1231",
-    "ImGuiNextWindowData": "imgui_internal:1202",
-    "ImGuiNextWindowDataFlags_": "imgui_internal:1183",
-    "ImGuiOldColumnData": "imgui_internal:1712",
-    "ImGuiOldColumnFlags_": "imgui_internal:1692",
-    "ImGuiOldColumns": "imgui_internal:1722",
-    "ImGuiOnceUponAFrame": "imgui:2635",
-    "ImGuiPayload": "imgui:2600",
-    "ImGuiPlatformIO": "imgui:3707",
-    "ImGuiPlatformImeData": "imgui:3813",
-    "ImGuiPlatformMonitor": "imgui:3803",
-    "ImGuiPlotType": "imgui_internal:1032",
-    "ImGuiPopupData": "imgui_internal:1343",
-    "ImGuiPopupFlags_": "imgui:1260",
-    "ImGuiPopupPositionPolicy": "imgui_internal:1335",
-    "ImGuiPtrOrIndex": "imgui_internal:1322",
-    "ImGuiScrollFlags_": "imgui_internal:1569",
-    "ImGuiSelectableFlagsPrivate_": "imgui_internal:953",
-    "ImGuiSelectableFlags_": "imgui:1278",
-    "ImGuiSelectionBasicStorage": "imgui:2987",
-    "ImGuiSelectionExternalStorage": "imgui:3010",
-    "ImGuiSelectionRequest": "imgui:2961",
-    "ImGuiSelectionRequestType": "imgui:2953",
-    "ImGuiSeparatorFlags_": "imgui_internal:974",
-    "ImGuiSettingsHandler": "imgui_internal:2048",
-    "ImGuiShrinkWidthItem": "imgui_internal:1315",
-    "ImGuiSizeCallbackData": "imgui:2569",
-    "ImGuiSliderFlagsPrivate_": "imgui_internal:946",
-    "ImGuiSliderFlags_": "imgui:1854",
-    "ImGuiSortDirection": "imgui:1471",
-    "ImGuiStackLevelInfo": "imgui_internal:2168",
-    "ImGuiStorage": "imgui:2707",
-    "ImGuiStoragePair": "imgui:2690",
-    "ImGuiStyle": "imgui:2196",
-    "ImGuiStyleMod": "imgui_internal:1046",
-    "ImGuiStyleVar_": "imgui:1756",
-    "ImGuiTabBar": "imgui_internal:2844",
-    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2807",
-    "ImGuiTabBarFlags_": "imgui:1310",
-    "ImGuiTabItem": "imgui_internal:2824",
-    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2815",
-    "ImGuiTabItemFlags_": "imgui:1327",
-    "ImGuiTable": "imgui_internal:2991",
-    "ImGuiTableBgTarget_": "imgui:2050",
-    "ImGuiTableCellData": "imgui_internal:2959",
-    "ImGuiTableColumn": "imgui_internal:2899",
-    "ImGuiTableColumnFlags_": "imgui:1997",
-    "ImGuiTableColumnSettings": "imgui_internal:3138",
-    "ImGuiTableColumnSortSpecs": "imgui:2072",
-    "ImGuiTableFlags_": "imgui:1944",
-    "ImGuiTableHeaderData": "imgui_internal:2968",
-    "ImGuiTableInstanceData": "imgui_internal:2978",
-    "ImGuiTableRowFlags_": "imgui:2035",
-    "ImGuiTableSettings": "imgui_internal:3162",
-    "ImGuiTableSortSpecs": "imgui:2062",
-    "ImGuiTableTempData": "imgui_internal:3115",
-    "ImGuiTextBuffer": "imgui:2670",
-    "ImGuiTextFilter": "imgui:2643",
-    "ImGuiTextFlags_": "imgui_internal:992",
-    "ImGuiTextIndex": "imgui_internal:730",
-    "ImGuiTextRange": "imgui:2653",
-    "ImGuiTooltipFlags_": "imgui_internal:998",
-    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:967",
-    "ImGuiTreeNodeFlags_": "imgui:1225",
-    "ImGuiTreeNodeStackData": "imgui_internal:1280",
-    "ImGuiTypingSelectFlags_": "imgui_internal:1655",
-    "ImGuiTypingSelectRequest": "imgui_internal:1663",
-    "ImGuiTypingSelectState": "imgui_internal:1674",
-    "ImGuiViewport": "imgui:3622",
-    "ImGuiViewportFlags_": "imgui:3594",
-    "ImGuiViewportP": "imgui_internal:1977",
-    "ImGuiWindow": "imgui_internal:2655",
-    "ImGuiWindowClass": "imgui:2584",
-    "ImGuiWindowDockStyle": "imgui_internal:1955",
-    "ImGuiWindowDockStyleCol": "imgui_internal:1941",
-    "ImGuiWindowFlags_": "imgui:1101",
-    "ImGuiWindowRefreshFlags_": "imgui_internal:1174",
-    "ImGuiWindowSettings": "imgui_internal:2029",
-    "ImGuiWindowStackData": "imgui_internal:1307",
-    "ImGuiWindowTempData": "imgui_internal:2605",
-    "ImRect": "imgui_internal:532",
-    "ImVec1": "imgui_internal:514",
-    "ImVec2": "imgui:296",
-    "ImVec2ih": "imgui_internal:522",
-    "ImVec4": "imgui:309"
+    "ImGuiGroupData": "imgui_internal:1074",
+    "ImGuiHoveredFlagsPrivate_": "imgui_internal:903",
+    "ImGuiHoveredFlags_": "imgui:1364",
+    "ImGuiIDStackTool": "imgui_internal:2199",
+    "ImGuiIO": "imgui:2292",
+    "ImGuiInputEvent": "imgui_internal:1433",
+    "ImGuiInputEventAppFocused": "imgui_internal:1431",
+    "ImGuiInputEventKey": "imgui_internal:1429",
+    "ImGuiInputEventMouseButton": "imgui_internal:1427",
+    "ImGuiInputEventMousePos": "imgui_internal:1425",
+    "ImGuiInputEventMouseViewport": "imgui_internal:1428",
+    "ImGuiInputEventMouseWheel": "imgui_internal:1426",
+    "ImGuiInputEventText": "imgui_internal:1430",
+    "ImGuiInputEventType": "imgui_internal:1401",
+    "ImGuiInputFlagsPrivate_": "imgui_internal:1500",
+    "ImGuiInputFlags_": "imgui:1620",
+    "ImGuiInputSource": "imgui_internal:1414",
+    "ImGuiInputTextCallbackData": "imgui:2546",
+    "ImGuiInputTextDeactivatedState": "imgui_internal:1110",
+    "ImGuiInputTextFlagsPrivate_": "imgui_internal:911",
+    "ImGuiInputTextFlags_": "imgui:1189",
+    "ImGuiInputTextState": "imgui_internal:1132",
+    "ImGuiItemFlagsPrivate_": "imgui_internal:853",
+    "ImGuiItemFlags_": "imgui:1176",
+    "ImGuiItemStatusFlags_": "imgui_internal:877",
+    "ImGuiKey": "imgui:1493",
+    "ImGuiKeyData": "imgui:2284",
+    "ImGuiKeyOwnerData": "imgui_internal:1487",
+    "ImGuiKeyRoutingData": "imgui_internal:1461",
+    "ImGuiKeyRoutingTable": "imgui_internal:1475",
+    "ImGuiLastItemData": "imgui_internal:1267",
+    "ImGuiLayoutType_": "imgui_internal:1011",
+    "ImGuiListClipper": "imgui:2775",
+    "ImGuiListClipperData": "imgui_internal:1557",
+    "ImGuiListClipperRange": "imgui_internal:1544",
+    "ImGuiLocEntry": "imgui_internal:2103",
+    "ImGuiLocKey": "imgui_internal:2085",
+    "ImGuiLogFlags_": "imgui_internal:1018",
+    "ImGuiMenuColumns": "imgui_internal:1092",
+    "ImGuiMetricsConfig": "imgui_internal:2169",
+    "ImGuiMouseButton_": "imgui:1879",
+    "ImGuiMouseCursor_": "imgui:1889",
+    "ImGuiMouseSource": "imgui:1908",
+    "ImGuiMultiSelectFlags_": "imgui:2927",
+    "ImGuiMultiSelectIO": "imgui:2954",
+    "ImGuiMultiSelectState": "imgui_internal:1819",
+    "ImGuiMultiSelectTempData": "imgui_internal:1794",
+    "ImGuiNavItemData": "imgui_internal:1642",
+    "ImGuiNavLayer": "imgui_internal:1634",
+    "ImGuiNavMoveFlags_": "imgui_internal:1612",
+    "ImGuiNavRenderCursorFlags_": "imgui_internal:1598",
+    "ImGuiNextItemData": "imgui_internal:1247",
+    "ImGuiNextItemDataFlags_": "imgui_internal:1237",
+    "ImGuiNextWindowData": "imgui_internal:1208",
+    "ImGuiNextWindowDataFlags_": "imgui_internal:1189",
+    "ImGuiOldColumnData": "imgui_internal:1727",
+    "ImGuiOldColumnFlags_": "imgui_internal:1707",
+    "ImGuiOldColumns": "imgui_internal:1737",
+    "ImGuiOnceUponAFrame": "imgui:2646",
+    "ImGuiPayload": "imgui:2611",
+    "ImGuiPlatformIO": "imgui:3724",
+    "ImGuiPlatformImeData": "imgui:3830",
+    "ImGuiPlatformMonitor": "imgui:3820",
+    "ImGuiPlotType": "imgui_internal:1037",
+    "ImGuiPopupData": "imgui_internal:1358",
+    "ImGuiPopupFlags_": "imgui:1268",
+    "ImGuiPopupPositionPolicy": "imgui_internal:1350",
+    "ImGuiPtrOrIndex": "imgui_internal:1328",
+    "ImGuiScrollFlags_": "imgui_internal:1584",
+    "ImGuiSelectableFlagsPrivate_": "imgui_internal:958",
+    "ImGuiSelectableFlags_": "imgui:1286",
+    "ImGuiSelectionBasicStorage": "imgui:3000",
+    "ImGuiSelectionExternalStorage": "imgui:3023",
+    "ImGuiSelectionRequest": "imgui:2974",
+    "ImGuiSelectionRequestType": "imgui:2966",
+    "ImGuiSeparatorFlags_": "imgui_internal:979",
+    "ImGuiSettingsHandler": "imgui_internal:2065",
+    "ImGuiShrinkWidthItem": "imgui_internal:1321",
+    "ImGuiSizeCallbackData": "imgui:2580",
+    "ImGuiSliderFlagsPrivate_": "imgui_internal:951",
+    "ImGuiSliderFlags_": "imgui:1863",
+    "ImGuiSortDirection": "imgui:1480",
+    "ImGuiStackLevelInfo": "imgui_internal:2187",
+    "ImGuiStorage": "imgui:2718",
+    "ImGuiStoragePair": "imgui:2701",
+    "ImGuiStyle": "imgui:2206",
+    "ImGuiStyleMod": "imgui_internal:1051",
+    "ImGuiStyleVar_": "imgui:1765",
+    "ImGuiTabBar": "imgui_internal:2862",
+    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2825",
+    "ImGuiTabBarFlags_": "imgui:1318",
+    "ImGuiTabItem": "imgui_internal:2842",
+    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2833",
+    "ImGuiTabItemFlags_": "imgui:1335",
+    "ImGuiTable": "imgui_internal:3009",
+    "ImGuiTableBgTarget_": "imgui:2060",
+    "ImGuiTableCellData": "imgui_internal:2977",
+    "ImGuiTableColumn": "imgui_internal:2917",
+    "ImGuiTableColumnFlags_": "imgui:2007",
+    "ImGuiTableColumnSettings": "imgui_internal:3156",
+    "ImGuiTableColumnSortSpecs": "imgui:2082",
+    "ImGuiTableFlags_": "imgui:1954",
+    "ImGuiTableHeaderData": "imgui_internal:2986",
+    "ImGuiTableInstanceData": "imgui_internal:2996",
+    "ImGuiTableRowFlags_": "imgui:2045",
+    "ImGuiTableSettings": "imgui_internal:3180",
+    "ImGuiTableSortSpecs": "imgui:2072",
+    "ImGuiTableTempData": "imgui_internal:3133",
+    "ImGuiTextBuffer": "imgui:2681",
+    "ImGuiTextFilter": "imgui:2654",
+    "ImGuiTextFlags_": "imgui_internal:997",
+    "ImGuiTextIndex": "imgui_internal:736",
+    "ImGuiTextRange": "imgui:2664",
+    "ImGuiTooltipFlags_": "imgui_internal:1003",
+    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:972",
+    "ImGuiTreeNodeFlags_": "imgui:1231",
+    "ImGuiTreeNodeStackData": "imgui_internal:1286",
+    "ImGuiTypingSelectFlags_": "imgui_internal:1670",
+    "ImGuiTypingSelectRequest": "imgui_internal:1678",
+    "ImGuiTypingSelectState": "imgui_internal:1689",
+    "ImGuiViewport": "imgui:3639",
+    "ImGuiViewportFlags_": "imgui:3611",
+    "ImGuiViewportP": "imgui_internal:1994",
+    "ImGuiWindow": "imgui_internal:2673",
+    "ImGuiWindowClass": "imgui:2595",
+    "ImGuiWindowDockStyle": "imgui_internal:1972",
+    "ImGuiWindowDockStyleCol": "imgui_internal:1958",
+    "ImGuiWindowFlags_": "imgui:1104",
+    "ImGuiWindowRefreshFlags_": "imgui_internal:1180",
+    "ImGuiWindowSettings": "imgui_internal:2046",
+    "ImGuiWindowStackData": "imgui_internal:1313",
+    "ImGuiWindowTempData": "imgui_internal:2623",
+    "ImRect": "imgui_internal:538",
+    "ImVec1": "imgui_internal:520",
+    "ImVec2": "imgui:297",
+    "ImVec2ih": "imgui_internal:528",
+    "ImVec4": "imgui:310"
+  },
+  "nonPOD": {
+    "ImBitArray": true,
+    "ImColor": true,
+    "ImDrawCmd": true,
+    "ImDrawData": true,
+    "ImDrawDataBuilder": true,
+    "ImDrawList": true,
+    "ImDrawListSharedData": true,
+    "ImDrawListSplitter": true,
+    "ImFont": true,
+    "ImFontAtlas": true,
+    "ImFontAtlasCustomRect": true,
+    "ImFontConfig": true,
+    "ImFontGlyphRangesBuilder": true,
+    "ImGuiBoxSelectState": true,
+    "ImGuiComboPreviewData": true,
+    "ImGuiContext": true,
+    "ImGuiContextHook": true,
+    "ImGuiDebugAllocInfo": true,
+    "ImGuiDockContext": true,
+    "ImGuiDockNode": true,
+    "ImGuiErrorRecoveryState": true,
+    "ImGuiIDStackTool": true,
+    "ImGuiIO": true,
+    "ImGuiInputEvent": true,
+    "ImGuiInputTextCallbackData": true,
+    "ImGuiInputTextDeactivatedState": true,
+    "ImGuiInputTextState": true,
+    "ImGuiKeyOwnerData": true,
+    "ImGuiKeyRoutingData": true,
+    "ImGuiKeyRoutingTable": true,
+    "ImGuiLastItemData": true,
+    "ImGuiListClipper": true,
+    "ImGuiListClipperData": true,
+    "ImGuiMenuColumns": true,
+    "ImGuiMultiSelectState": true,
+    "ImGuiMultiSelectTempData": true,
+    "ImGuiNavItemData": true,
+    "ImGuiNextItemData": true,
+    "ImGuiNextWindowData": true,
+    "ImGuiOldColumnData": true,
+    "ImGuiOldColumns": true,
+    "ImGuiOnceUponAFrame": true,
+    "ImGuiPayload": true,
+    "ImGuiPlatformIO": true,
+    "ImGuiPlatformImeData": true,
+    "ImGuiPlatformMonitor": true,
+    "ImGuiPopupData": true,
+    "ImGuiPtrOrIndex": true,
+    "ImGuiSelectionBasicStorage": true,
+    "ImGuiSelectionExternalStorage": true,
+    "ImGuiSettingsHandler": true,
+    "ImGuiStackLevelInfo": true,
+    "ImGuiStoragePair": true,
+    "ImGuiStyle": true,
+    "ImGuiStyleMod": true,
+    "ImGuiTabBar": true,
+    "ImGuiTabItem": true,
+    "ImGuiTable": true,
+    "ImGuiTableColumn": true,
+    "ImGuiTableColumnSettings": true,
+    "ImGuiTableColumnSortSpecs": true,
+    "ImGuiTableInstanceData": true,
+    "ImGuiTableSettings": true,
+    "ImGuiTableSortSpecs": true,
+    "ImGuiTableTempData": true,
+    "ImGuiTextBuffer": true,
+    "ImGuiTextFilter": true,
+    "ImGuiTextRange": true,
+    "ImGuiTypingSelectState": true,
+    "ImGuiViewport": true,
+    "ImGuiViewportP": true,
+    "ImGuiWindow": true,
+    "ImGuiWindowClass": true,
+    "ImGuiWindowSettings": true,
+    "ImPool": true,
+    "ImRect": true,
+    "ImSpan": true,
+    "ImSpanAllocator": true,
+    "ImVec1": true,
+    "ImVec2": true,
+    "ImVec2ih": true,
+    "ImVec4": true,
+    "ImVector": true
  },
  "structs": {
    "ImBitVector": [
@@ -5509,6 +5615,10 @@
        "name": "TexUvWhitePixel",
        "type": "ImVec2"
      },
+      {
+        "name": "TexUvLines",
+        "type": "const ImVec4*"
+      },
      {
        "name": "Font",
        "type": "ImFont*"
@@ -5555,10 +5665,6 @@
        "name": "CircleSegmentCounts[64]",
        "size": 64,
        "type": "ImU8"
-      },
-      {
-        "name": "TexUvLines",
-        "type": "const ImVec4*"
      }
    ],
    "ImDrawListSplitter": [
@@ -5631,16 +5737,16 @@
        "type": "short"
      },
      {
-        "name": "FallbackChar",
-        "type": "ImWchar"
+        "name": "EllipsisCharCount",
+        "type": "short"
      },
      {
        "name": "EllipsisChar",
        "type": "ImWchar"
      },
      {
-        "name": "EllipsisCharCount",
-        "type": "short"
+        "name": "FallbackChar",
+        "type": "ImWchar"
      },
      {
        "name": "EllipsisWidth",
@@ -5771,14 +5877,6 @@
      }
    ],
    "ImFontAtlasCustomRect": [
-      {
-        "name": "Width",
-        "type": "unsigned short"
-      },
-      {
-        "name": "Height",
-        "type": "unsigned short"
-      },
      {
        "name": "X",
        "type": "unsigned short"
@@ -5787,6 +5885,14 @@
        "name": "Y",
        "type": "unsigned short"
      },
+      {
+        "name": "Width",
+        "type": "unsigned short"
+      },
+      {
+        "name": "Height",
+        "type": "unsigned short"
+      },
      {
        "bitfield": "31",
        "name": "GlyphID",
@@ -6131,6 +6237,10 @@
        "name": "FrameCountRendered",
        "type": "int"
      },
+      {
+        "name": "WithinEndChildID",
+        "type": "ImGuiID"
+      },
      {
        "name": "WithinFrameScope",
        "type": "bool"
@@ -6139,10 +6249,6 @@
        "name": "WithinFrameScopeWithImplicitWindow",
        "type": "bool"
      },
-      {
-        "name": "WithinEndChild",
-        "type": "bool"
-      },
      {
        "name": "GcCompactAll",
        "type": "bool"
@@ -6364,16 +6470,12 @@
        "type": "ImGuiID"
      },
      {
-        "name": "ActiveIdPreviousFrameIsAlive",
-        "type": "bool"
+        "name": "DeactivatedItemData",
+        "type": "ImGuiDeactivatedItemData"
      },
      {
-        "name": "ActiveIdPreviousFrameHasBeenEditedBefore",
-        "type": "bool"
-      },
-      {
-        "name": "ActiveIdPreviousFrameWindow",
-        "type": "ImGuiWindow*"
+        "name": "ActiveIdValueOnActivation",
+        "type": "ImGuiDataTypeStorage"
      },
      {
        "name": "LastActiveId",
@@ -7419,6 +7521,24 @@
        "type": "ImU32"
      }
    ],
+    "ImGuiDeactivatedItemData": [
+      {
+        "name": "ID",
+        "type": "ImGuiID"
+      },
+      {
+        "name": "ElapseFrame",
+        "type": "int"
+      },
+      {
+        "name": "HasBeenEditedBefore",
+        "type": "bool"
+      },
+      {
+        "name": "IsAlive",
+        "type": "bool"
+      }
+    ],
    "ImGuiDebugAllocEntry": [
      {
        "name": "FrameCount",
@@ -7752,7 +7872,7 @@
        "type": "ImGuiID"
      },
      {
-        "name": "BackupActiveIdPreviousFrameIsAlive",
+        "name": "BackupDeactivatedIdIsAlive",
        "type": "bool"
      },
      {
@@ -8411,6 +8531,10 @@
        "name": "Stb",
        "type": "ImStbTexteditState*"
      },
+      {
+        "name": "Flags",
+        "type": "ImGuiInputTextFlags"
+      },
      {
        "name": "ID",
        "type": "ImGuiID"
@@ -8419,6 +8543,10 @@
        "name": "TextLen",
        "type": "int"
      },
+      {
+        "name": "TextSrc",
+        "type": "const char*"
+      },
      {
        "name": "TextA",
        "template_type": "char",
@@ -8459,11 +8587,7 @@
        "type": "bool"
      },
      {
-        "name": "Flags",
-        "type": "ImGuiInputTextFlags"
-      },
-      {
-        "name": "ReloadUserBuf",
+        "name": "WantReloadUserBuf",
        "type": "bool"
      },
      {
--- a/generator/output/structs_and_enums.lua
+++ b/generator/output/structs_and_enums.lua
--- a/generator/output/typedefs_dict.json
+++ b/generator/output/typedefs_dict.json
@@ -45,6 +45,7 @@
  "ImGuiDataTypeInfo": "struct ImGuiDataTypeInfo",
  "ImGuiDataTypeStorage": "struct ImGuiDataTypeStorage",
  "ImGuiDataVarInfo": "struct ImGuiDataVarInfo",
+  "ImGuiDeactivatedItemData": "struct ImGuiDeactivatedItemData",
  "ImGuiDebugAllocEntry": "struct ImGuiDebugAllocEntry",
  "ImGuiDebugAllocInfo": "struct ImGuiDebugAllocInfo",
  "ImGuiDebugLogFlags": "int",
--- a/generator/output/typedefs_dict.lua
+++ b/generator/output/typedefs_dict.lua
@@ -1,207 +1,207 @@
-local defs = {}
-defs["ImBitArrayForNamedKeys"] = "ImBitArray<ImGuiKey_NamedKey_COUNT, -ImGuiKey_NamedKey_BEGIN>"
-defs["ImBitArrayPtr"] = "ImU32*"
-defs["ImBitVector"] = "struct ImBitVector"
-defs["ImColor"] = "struct ImColor"
-defs["ImDrawCallback"] = "void (*)(const ImDrawList* parent_list, const ImDrawCmd* cmd);"
-defs["ImDrawChannel"] = "struct ImDrawChannel"
-defs["ImDrawCmd"] = "struct ImDrawCmd"
-defs["ImDrawCmdHeader"] = "struct ImDrawCmdHeader"
-defs["ImDrawData"] = "struct ImDrawData"
-defs["ImDrawDataBuilder"] = "struct ImDrawDataBuilder"
-defs["ImDrawFlags"] = "int"
-defs["ImDrawIdx"] = "unsigned short"
-defs["ImDrawList"] = "struct ImDrawList"
-defs["ImDrawListFlags"] = "int"
-defs["ImDrawListSharedData"] = "struct ImDrawListSharedData"
-defs["ImDrawListSplitter"] = "struct ImDrawListSplitter"
-defs["ImDrawVert"] = "struct ImDrawVert"
-defs["ImFileHandle"] = "FILE*"
-defs["ImFont"] = "struct ImFont"
-defs["ImFontAtlas"] = "struct ImFontAtlas"
-defs["ImFontAtlasCustomRect"] = "struct ImFontAtlasCustomRect"
-defs["ImFontAtlasFlags"] = "int"
-defs["ImFontBuilderIO"] = "struct ImFontBuilderIO"
-defs["ImFontConfig"] = "struct ImFontConfig"
-defs["ImFontGlyph"] = "struct ImFontGlyph"
-defs["ImFontGlyphRangesBuilder"] = "struct ImFontGlyphRangesBuilder"
-defs["ImGuiActivateFlags"] = "int"
-defs["ImGuiBackendFlags"] = "int"
-defs["ImGuiBoxSelectState"] = "struct ImGuiBoxSelectState"
-defs["ImGuiButtonFlags"] = "int"
-defs["ImGuiChildFlags"] = "int"
-defs["ImGuiCol"] = "int"
-defs["ImGuiColorEditFlags"] = "int"
-defs["ImGuiColorMod"] = "struct ImGuiColorMod"
-defs["ImGuiComboFlags"] = "int"
-defs["ImGuiComboPreviewData"] = "struct ImGuiComboPreviewData"
-defs["ImGuiCond"] = "int"
-defs["ImGuiConfigFlags"] = "int"
-defs["ImGuiContext"] = "struct ImGuiContext"
-defs["ImGuiContextHook"] = "struct ImGuiContextHook"
-defs["ImGuiContextHookCallback"] = "void (*)(ImGuiContext* ctx, ImGuiContextHook* hook);"
-defs["ImGuiDataAuthority"] = "int"
-defs["ImGuiDataType"] = "int"
-defs["ImGuiDataTypeInfo"] = "struct ImGuiDataTypeInfo"
-defs["ImGuiDataTypeStorage"] = "struct ImGuiDataTypeStorage"
-defs["ImGuiDataVarInfo"] = "struct ImGuiDataVarInfo"
-defs["ImGuiDebugAllocEntry"] = "struct ImGuiDebugAllocEntry"
-defs["ImGuiDebugAllocInfo"] = "struct ImGuiDebugAllocInfo"
-defs["ImGuiDebugLogFlags"] = "int"
-defs["ImGuiDockContext"] = "struct ImGuiDockContext"
-defs["ImGuiDockNode"] = "struct ImGuiDockNode"
-defs["ImGuiDockNodeFlags"] = "int"
-defs["ImGuiDockNodeSettings"] = "struct ImGuiDockNodeSettings"
-defs["ImGuiDockRequest"] = "struct ImGuiDockRequest"
-defs["ImGuiDragDropFlags"] = "int"
-defs["ImGuiErrorCallback"] = "void (*)(ImGuiContext* ctx, void* user_data, const char* msg);"
-defs["ImGuiErrorRecoveryState"] = "struct ImGuiErrorRecoveryState"
-defs["ImGuiFocusRequestFlags"] = "int"
-defs["ImGuiFocusScopeData"] = "struct ImGuiFocusScopeData"
-defs["ImGuiFocusedFlags"] = "int"
-defs["ImGuiGroupData"] = "struct ImGuiGroupData"
-defs["ImGuiHoveredFlags"] = "int"
-defs["ImGuiID"] = "unsigned int"
-defs["ImGuiIDStackTool"] = "struct ImGuiIDStackTool"
-defs["ImGuiIO"] = "struct ImGuiIO"
-defs["ImGuiInputEvent"] = "struct ImGuiInputEvent"
-defs["ImGuiInputEventAppFocused"] = "struct ImGuiInputEventAppFocused"
-defs["ImGuiInputEventKey"] = "struct ImGuiInputEventKey"
-defs["ImGuiInputEventMouseButton"] = "struct ImGuiInputEventMouseButton"
-defs["ImGuiInputEventMousePos"] = "struct ImGuiInputEventMousePos"
-defs["ImGuiInputEventMouseViewport"] = "struct ImGuiInputEventMouseViewport"
-defs["ImGuiInputEventMouseWheel"] = "struct ImGuiInputEventMouseWheel"
-defs["ImGuiInputEventText"] = "struct ImGuiInputEventText"
-defs["ImGuiInputFlags"] = "int"
-defs["ImGuiInputTextCallback"] = "int (*)(ImGuiInputTextCallbackData* data);"
-defs["ImGuiInputTextCallbackData"] = "struct ImGuiInputTextCallbackData"
-defs["ImGuiInputTextDeactivateData"] = "struct ImGuiInputTextDeactivateData"
-defs["ImGuiInputTextDeactivatedState"] = "struct ImGuiInputTextDeactivatedState"
-defs["ImGuiInputTextFlags"] = "int"
-defs["ImGuiInputTextState"] = "struct ImGuiInputTextState"
-defs["ImGuiItemFlags"] = "int"
-defs["ImGuiItemStatusFlags"] = "int"
-defs["ImGuiKeyChord"] = "int"
-defs["ImGuiKeyData"] = "struct ImGuiKeyData"
-defs["ImGuiKeyOwnerData"] = "struct ImGuiKeyOwnerData"
-defs["ImGuiKeyRoutingData"] = "struct ImGuiKeyRoutingData"
-defs["ImGuiKeyRoutingIndex"] = "ImS16"
-defs["ImGuiKeyRoutingTable"] = "struct ImGuiKeyRoutingTable"
-defs["ImGuiLastItemData"] = "struct ImGuiLastItemData"
-defs["ImGuiLayoutType"] = "int"
-defs["ImGuiListClipper"] = "struct ImGuiListClipper"
-defs["ImGuiListClipperData"] = "struct ImGuiListClipperData"
-defs["ImGuiListClipperRange"] = "struct ImGuiListClipperRange"
-defs["ImGuiLocEntry"] = "struct ImGuiLocEntry"
-defs["ImGuiLogFlags"] = "int"
-defs["ImGuiMemAllocFunc"] = "void* (*)(size_t sz, void* user_data);"
-defs["ImGuiMemFreeFunc"] = "void (*)(void* ptr, void* user_data);"
-defs["ImGuiMenuColumns"] = "struct ImGuiMenuColumns"
-defs["ImGuiMetricsConfig"] = "struct ImGuiMetricsConfig"
-defs["ImGuiMouseButton"] = "int"
-defs["ImGuiMouseCursor"] = "int"
-defs["ImGuiMultiSelectFlags"] = "int"
-defs["ImGuiMultiSelectIO"] = "struct ImGuiMultiSelectIO"
-defs["ImGuiMultiSelectState"] = "struct ImGuiMultiSelectState"
-defs["ImGuiMultiSelectTempData"] = "struct ImGuiMultiSelectTempData"
-defs["ImGuiNavItemData"] = "struct ImGuiNavItemData"
-defs["ImGuiNavMoveFlags"] = "int"
-defs["ImGuiNavRenderCursorFlags"] = "int"
-defs["ImGuiNextItemData"] = "struct ImGuiNextItemData"
-defs["ImGuiNextItemDataFlags"] = "int"
-defs["ImGuiNextWindowData"] = "struct ImGuiNextWindowData"
-defs["ImGuiNextWindowDataFlags"] = "int"
-defs["ImGuiOldColumnData"] = "struct ImGuiOldColumnData"
-defs["ImGuiOldColumnFlags"] = "int"
-defs["ImGuiOldColumns"] = "struct ImGuiOldColumns"
-defs["ImGuiOnceUponAFrame"] = "struct ImGuiOnceUponAFrame"
-defs["ImGuiPayload"] = "struct ImGuiPayload"
-defs["ImGuiPlatformIO"] = "struct ImGuiPlatformIO"
-defs["ImGuiPlatformImeData"] = "struct ImGuiPlatformImeData"
-defs["ImGuiPlatformMonitor"] = "struct ImGuiPlatformMonitor"
-defs["ImGuiPopupData"] = "struct ImGuiPopupData"
-defs["ImGuiPopupFlags"] = "int"
-defs["ImGuiPtrOrIndex"] = "struct ImGuiPtrOrIndex"
-defs["ImGuiScrollFlags"] = "int"
-defs["ImGuiSelectableFlags"] = "int"
-defs["ImGuiSelectionBasicStorage"] = "struct ImGuiSelectionBasicStorage"
-defs["ImGuiSelectionExternalStorage"] = "struct ImGuiSelectionExternalStorage"
-defs["ImGuiSelectionRequest"] = "struct ImGuiSelectionRequest"
-defs["ImGuiSelectionUserData"] = "ImS64"
-defs["ImGuiSeparatorFlags"] = "int"
-defs["ImGuiSettingsHandler"] = "struct ImGuiSettingsHandler"
-defs["ImGuiShrinkWidthItem"] = "struct ImGuiShrinkWidthItem"
-defs["ImGuiSizeCallback"] = "void (*)(ImGuiSizeCallbackData* data);"
-defs["ImGuiSizeCallbackData"] = "struct ImGuiSizeCallbackData"
-defs["ImGuiSliderFlags"] = "int"
-defs["ImGuiStackLevelInfo"] = "struct ImGuiStackLevelInfo"
-defs["ImGuiStorage"] = "struct ImGuiStorage"
-defs["ImGuiStoragePair"] = "struct ImGuiStoragePair"
-defs["ImGuiStyle"] = "struct ImGuiStyle"
-defs["ImGuiStyleMod"] = "struct ImGuiStyleMod"
-defs["ImGuiStyleVar"] = "int"
-defs["ImGuiTabBar"] = "struct ImGuiTabBar"
-defs["ImGuiTabBarFlags"] = "int"
-defs["ImGuiTabItem"] = "struct ImGuiTabItem"
-defs["ImGuiTabItemFlags"] = "int"
-defs["ImGuiTable"] = "struct ImGuiTable"
-defs["ImGuiTableBgTarget"] = "int"
-defs["ImGuiTableCellData"] = "struct ImGuiTableCellData"
-defs["ImGuiTableColumn"] = "struct ImGuiTableColumn"
-defs["ImGuiTableColumnFlags"] = "int"
-defs["ImGuiTableColumnIdx"] = "ImS16"
-defs["ImGuiTableColumnSettings"] = "struct ImGuiTableColumnSettings"
-defs["ImGuiTableColumnSortSpecs"] = "struct ImGuiTableColumnSortSpecs"
-defs["ImGuiTableColumnsSettings"] = "struct ImGuiTableColumnsSettings"
-defs["ImGuiTableDrawChannelIdx"] = "ImU16"
-defs["ImGuiTableFlags"] = "int"
-defs["ImGuiTableHeaderData"] = "struct ImGuiTableHeaderData"
-defs["ImGuiTableInstanceData"] = "struct ImGuiTableInstanceData"
-defs["ImGuiTableRowFlags"] = "int"
-defs["ImGuiTableSettings"] = "struct ImGuiTableSettings"
-defs["ImGuiTableSortSpecs"] = "struct ImGuiTableSortSpecs"
-defs["ImGuiTableTempData"] = "struct ImGuiTableTempData"
-defs["ImGuiTextBuffer"] = "struct ImGuiTextBuffer"
-defs["ImGuiTextFilter"] = "struct ImGuiTextFilter"
-defs["ImGuiTextFlags"] = "int"
-defs["ImGuiTextIndex"] = "struct ImGuiTextIndex"
-defs["ImGuiTextRange"] = "struct ImGuiTextRange"
-defs["ImGuiTooltipFlags"] = "int"
-defs["ImGuiTreeNodeFlags"] = "int"
-defs["ImGuiTreeNodeStackData"] = "struct ImGuiTreeNodeStackData"
-defs["ImGuiTypingSelectFlags"] = "int"
-defs["ImGuiTypingSelectRequest"] = "struct ImGuiTypingSelectRequest"
-defs["ImGuiTypingSelectState"] = "struct ImGuiTypingSelectState"
-defs["ImGuiViewport"] = "struct ImGuiViewport"
-defs["ImGuiViewportFlags"] = "int"
-defs["ImGuiViewportP"] = "struct ImGuiViewportP"
-defs["ImGuiWindow"] = "struct ImGuiWindow"
-defs["ImGuiWindowClass"] = "struct ImGuiWindowClass"
-defs["ImGuiWindowDockStyle"] = "struct ImGuiWindowDockStyle"
-defs["ImGuiWindowFlags"] = "int"
-defs["ImGuiWindowRefreshFlags"] = "int"
-defs["ImGuiWindowSettings"] = "struct ImGuiWindowSettings"
-defs["ImGuiWindowStackData"] = "struct ImGuiWindowStackData"
-defs["ImGuiWindowTempData"] = "struct ImGuiWindowTempData"
-defs["ImPoolIdx"] = "int"
-defs["ImRect"] = "struct ImRect"
-defs["ImS16"] = "signed short"
-defs["ImS32"] = "signed int"
-defs["ImS64"] = "signed long long"
-defs["ImS8"] = "signed char"
-defs["ImStbTexteditState"] = "ImStb::STB_TexteditState"
-defs["ImTextureID"] = "ImU64"
-defs["ImU16"] = "unsigned short"
-defs["ImU32"] = "unsigned int"
-defs["ImU64"] = "unsigned long long"
-defs["ImU8"] = "unsigned char"
-defs["ImVec1"] = "struct ImVec1"
-defs["ImVec2"] = "struct ImVec2"
-defs["ImVec2ih"] = "struct ImVec2ih"
-defs["ImVec4"] = "struct ImVec4"
-defs["ImWchar"] = "ImWchar16"
-defs["ImWchar16"] = "unsigned short"
-defs["ImWchar32"] = "unsigned int"
-defs["STB_TexteditState"] = "struct STB_TexteditState"
-
-return defs
+local t={
+  ImBitArrayForNamedKeys="ImBitArray<ImGuiKey_NamedKey_COUNT, -ImGuiKey_NamedKey_BEGIN>",
+  ImBitArrayPtr="ImU32*",
+  ImBitVector="struct ImBitVector",
+  ImColor="struct ImColor",
+  ImDrawCallback="void (*)(const ImDrawList* parent_list, const ImDrawCmd* cmd);",
+  ImDrawChannel="struct ImDrawChannel",
+  ImDrawCmd="struct ImDrawCmd",
+  ImDrawCmdHeader="struct ImDrawCmdHeader",
+  ImDrawData="struct ImDrawData",
+  ImDrawDataBuilder="struct ImDrawDataBuilder",
+  ImDrawFlags="int",
+  ImDrawIdx="unsigned short",
+  ImDrawList="struct ImDrawList",
+  ImDrawListFlags="int",
+  ImDrawListSharedData="struct ImDrawListSharedData",
+  ImDrawListSplitter="struct ImDrawListSplitter",
+  ImDrawVert="struct ImDrawVert",
+  ImFileHandle="FILE*",
+  ImFont="struct ImFont",
+  ImFontAtlas="struct ImFontAtlas",
+  ImFontAtlasCustomRect="struct ImFontAtlasCustomRect",
+  ImFontAtlasFlags="int",
+  ImFontBuilderIO="struct ImFontBuilderIO",
+  ImFontConfig="struct ImFontConfig",
+  ImFontGlyph="struct ImFontGlyph",
+  ImFontGlyphRangesBuilder="struct ImFontGlyphRangesBuilder",
+  ImGuiActivateFlags="int",
+  ImGuiBackendFlags="int",
+  ImGuiBoxSelectState="struct ImGuiBoxSelectState",
+  ImGuiButtonFlags="int",
+  ImGuiChildFlags="int",
+  ImGuiCol="int",
+  ImGuiColorEditFlags="int",
+  ImGuiColorMod="struct ImGuiColorMod",
+  ImGuiComboFlags="int",
+  ImGuiComboPreviewData="struct ImGuiComboPreviewData",
+  ImGuiCond="int",
+  ImGuiConfigFlags="int",
+  ImGuiContext="struct ImGuiContext",
+  ImGuiContextHook="struct ImGuiContextHook",
+  ImGuiContextHookCallback="void (*)(ImGuiContext* ctx, ImGuiContextHook* hook);",
+  ImGuiDataAuthority="int",
+  ImGuiDataType="int",
+  ImGuiDataTypeInfo="struct ImGuiDataTypeInfo",
+  ImGuiDataTypeStorage="struct ImGuiDataTypeStorage",
+  ImGuiDataVarInfo="struct ImGuiDataVarInfo",
+  ImGuiDeactivatedItemData="struct ImGuiDeactivatedItemData",
+  ImGuiDebugAllocEntry="struct ImGuiDebugAllocEntry",
+  ImGuiDebugAllocInfo="struct ImGuiDebugAllocInfo",
+  ImGuiDebugLogFlags="int",
+  ImGuiDockContext="struct ImGuiDockContext",
+  ImGuiDockNode="struct ImGuiDockNode",
+  ImGuiDockNodeFlags="int",
+  ImGuiDockNodeSettings="struct ImGuiDockNodeSettings",
+  ImGuiDockRequest="struct ImGuiDockRequest",
+  ImGuiDragDropFlags="int",
+  ImGuiErrorCallback="void (*)(ImGuiContext* ctx, void* user_data, const char* msg);",
+  ImGuiErrorRecoveryState="struct ImGuiErrorRecoveryState",
+  ImGuiFocusRequestFlags="int",
+  ImGuiFocusScopeData="struct ImGuiFocusScopeData",
+  ImGuiFocusedFlags="int",
+  ImGuiGroupData="struct ImGuiGroupData",
+  ImGuiHoveredFlags="int",
+  ImGuiID="unsigned int",
+  ImGuiIDStackTool="struct ImGuiIDStackTool",
+  ImGuiIO="struct ImGuiIO",
+  ImGuiInputEvent="struct ImGuiInputEvent",
+  ImGuiInputEventAppFocused="struct ImGuiInputEventAppFocused",
+  ImGuiInputEventKey="struct ImGuiInputEventKey",
+  ImGuiInputEventMouseButton="struct ImGuiInputEventMouseButton",
+  ImGuiInputEventMousePos="struct ImGuiInputEventMousePos",
+  ImGuiInputEventMouseViewport="struct ImGuiInputEventMouseViewport",
+  ImGuiInputEventMouseWheel="struct ImGuiInputEventMouseWheel",
+  ImGuiInputEventText="struct ImGuiInputEventText",
+  ImGuiInputFlags="int",
+  ImGuiInputTextCallback="int (*)(ImGuiInputTextCallbackData* data);",
+  ImGuiInputTextCallbackData="struct ImGuiInputTextCallbackData",
+  ImGuiInputTextDeactivateData="struct ImGuiInputTextDeactivateData",
+  ImGuiInputTextDeactivatedState="struct ImGuiInputTextDeactivatedState",
+  ImGuiInputTextFlags="int",
+  ImGuiInputTextState="struct ImGuiInputTextState",
+  ImGuiItemFlags="int",
+  ImGuiItemStatusFlags="int",
+  ImGuiKeyChord="int",
+  ImGuiKeyData="struct ImGuiKeyData",
+  ImGuiKeyOwnerData="struct ImGuiKeyOwnerData",
+  ImGuiKeyRoutingData="struct ImGuiKeyRoutingData",
+  ImGuiKeyRoutingIndex="ImS16",
+  ImGuiKeyRoutingTable="struct ImGuiKeyRoutingTable",
+  ImGuiLastItemData="struct ImGuiLastItemData",
+  ImGuiLayoutType="int",
+  ImGuiListClipper="struct ImGuiListClipper",
+  ImGuiListClipperData="struct ImGuiListClipperData",
+  ImGuiListClipperRange="struct ImGuiListClipperRange",
+  ImGuiLocEntry="struct ImGuiLocEntry",
+  ImGuiLogFlags="int",
+  ImGuiMemAllocFunc="void* (*)(size_t sz, void* user_data);",
+  ImGuiMemFreeFunc="void (*)(void* ptr, void* user_data);",
+  ImGuiMenuColumns="struct ImGuiMenuColumns",
+  ImGuiMetricsConfig="struct ImGuiMetricsConfig",
+  ImGuiMouseButton="int",
+  ImGuiMouseCursor="int",
+  ImGuiMultiSelectFlags="int",
+  ImGuiMultiSelectIO="struct ImGuiMultiSelectIO",
+  ImGuiMultiSelectState="struct ImGuiMultiSelectState",
+  ImGuiMultiSelectTempData="struct ImGuiMultiSelectTempData",
+  ImGuiNavItemData="struct ImGuiNavItemData",
+  ImGuiNavMoveFlags="int",
+  ImGuiNavRenderCursorFlags="int",
+  ImGuiNextItemData="struct ImGuiNextItemData",
+  ImGuiNextItemDataFlags="int",
+  ImGuiNextWindowData="struct ImGuiNextWindowData",
+  ImGuiNextWindowDataFlags="int",
+  ImGuiOldColumnData="struct ImGuiOldColumnData",
+  ImGuiOldColumnFlags="int",
+  ImGuiOldColumns="struct ImGuiOldColumns",
+  ImGuiOnceUponAFrame="struct ImGuiOnceUponAFrame",
+  ImGuiPayload="struct ImGuiPayload",
+  ImGuiPlatformIO="struct ImGuiPlatformIO",
+  ImGuiPlatformImeData="struct ImGuiPlatformImeData",
+  ImGuiPlatformMonitor="struct ImGuiPlatformMonitor",
+  ImGuiPopupData="struct ImGuiPopupData",
+  ImGuiPopupFlags="int",
+  ImGuiPtrOrIndex="struct ImGuiPtrOrIndex",
+  ImGuiScrollFlags="int",
+  ImGuiSelectableFlags="int",
+  ImGuiSelectionBasicStorage="struct ImGuiSelectionBasicStorage",
+  ImGuiSelectionExternalStorage="struct ImGuiSelectionExternalStorage",
+  ImGuiSelectionRequest="struct ImGuiSelectionRequest",
+  ImGuiSelectionUserData="ImS64",
+  ImGuiSeparatorFlags="int",
+  ImGuiSettingsHandler="struct ImGuiSettingsHandler",
+  ImGuiShrinkWidthItem="struct ImGuiShrinkWidthItem",
+  ImGuiSizeCallback="void (*)(ImGuiSizeCallbackData* data);",
+  ImGuiSizeCallbackData="struct ImGuiSizeCallbackData",
+  ImGuiSliderFlags="int",
+  ImGuiStackLevelInfo="struct ImGuiStackLevelInfo",
+  ImGuiStorage="struct ImGuiStorage",
+  ImGuiStoragePair="struct ImGuiStoragePair",
+  ImGuiStyle="struct ImGuiStyle",
+  ImGuiStyleMod="struct ImGuiStyleMod",
+  ImGuiStyleVar="int",
+  ImGuiTabBar="struct ImGuiTabBar",
+  ImGuiTabBarFlags="int",
+  ImGuiTabItem="struct ImGuiTabItem",
+  ImGuiTabItemFlags="int",
+  ImGuiTable="struct ImGuiTable",
+  ImGuiTableBgTarget="int",
+  ImGuiTableCellData="struct ImGuiTableCellData",
+  ImGuiTableColumn="struct ImGuiTableColumn",
+  ImGuiTableColumnFlags="int",
+  ImGuiTableColumnIdx="ImS16",
+  ImGuiTableColumnSettings="struct ImGuiTableColumnSettings",
+  ImGuiTableColumnSortSpecs="struct ImGuiTableColumnSortSpecs",
+  ImGuiTableColumnsSettings="struct ImGuiTableColumnsSettings",
+  ImGuiTableDrawChannelIdx="ImU16",
+  ImGuiTableFlags="int",
+  ImGuiTableHeaderData="struct ImGuiTableHeaderData",
+  ImGuiTableInstanceData="struct ImGuiTableInstanceData",
+  ImGuiTableRowFlags="int",
+  ImGuiTableSettings="struct ImGuiTableSettings",
+  ImGuiTableSortSpecs="struct ImGuiTableSortSpecs",
+  ImGuiTableTempData="struct ImGuiTableTempData",
+  ImGuiTextBuffer="struct ImGuiTextBuffer",
+  ImGuiTextFilter="struct ImGuiTextFilter",
+  ImGuiTextFlags="int",
+  ImGuiTextIndex="struct ImGuiTextIndex",
+  ImGuiTextRange="struct ImGuiTextRange",
+  ImGuiTooltipFlags="int",
+  ImGuiTreeNodeFlags="int",
+  ImGuiTreeNodeStackData="struct ImGuiTreeNodeStackData",
+  ImGuiTypingSelectFlags="int",
+  ImGuiTypingSelectRequest="struct ImGuiTypingSelectRequest",
+  ImGuiTypingSelectState="struct ImGuiTypingSelectState",
+  ImGuiViewport="struct ImGuiViewport",
+  ImGuiViewportFlags="int",
+  ImGuiViewportP="struct ImGuiViewportP",
+  ImGuiWindow="struct ImGuiWindow",
+  ImGuiWindowClass="struct ImGuiWindowClass",
+  ImGuiWindowDockStyle="struct ImGuiWindowDockStyle",
+  ImGuiWindowFlags="int",
+  ImGuiWindowRefreshFlags="int",
+  ImGuiWindowSettings="struct ImGuiWindowSettings",
+  ImGuiWindowStackData="struct ImGuiWindowStackData",
+  ImGuiWindowTempData="struct ImGuiWindowTempData",
+  ImPoolIdx="int",
+  ImRect="struct ImRect",
+  ImS16="signed short",
+  ImS32="signed int",
+  ImS64="signed long long",
+  ImS8="signed char",
+  ImStbTexteditState="ImStb::STB_TexteditState",
+  ImTextureID="ImU64",
+  ImU16="unsigned short",
+  ImU32="unsigned int",
+  ImU64="unsigned long long",
+  ImU8="unsigned char",
+  ImVec1="struct ImVec1",
+  ImVec2="struct ImVec2",
+  ImVec2ih="struct ImVec2ih",
+  ImVec4="struct ImVec4",
+  ImWchar="ImWchar16",
+  ImWchar16="unsigned short",
+  ImWchar32="unsigned int",
+  STB_TexteditState="struct STB_TexteditState"}
+ return t
--- a/2
+++ b/2
Author	SHA1	Message	Date
sonoro1234	9bc279c4d8	pull imgui docking 1.91.7 and generate	2025-01-21 15:59:46 +01:00
sonoro1234	46c47d5703	generator.lua: change for Used4kPagesMap -> Used8kPagesMap	2025-01-21 10:50:30 +01:00
sonoro1234	e5facd9083	cpp2ffi: better functypedef parsing Some checks failed Build / build (ubuntu-latest) (push) Failing after 4s Details Build / build (macOS-latest) (push) Has been cancelled Details Build / build (windows-latest) (push) Has been cancelled Details	2025-01-17 17:08:30 +01:00
sonoro1234	7d50243c50	better ftemplates repair	2025-01-08 16:49:42 +01:00
sonoro1234	7715efaa41	cpp2ffi: constexpr -> static const and ftemplates repair	2025-01-08 15:54:31 +01:00
sonoro1234	9cc8f27f61	cpp2ffi: autodetect nonPOD	2025-01-08 12:41:00 +01:00
sonoro1234	df65595422	generation	2025-01-08 10:46:11 +01:00
sonoro1234	2a0af76f16	cpp2ffi: git diffs are line oriented so Lua serializer uses pretty	2025-01-08 10:45:47 +01:00
sonoro1234	1053d1584f	cpp2ffi: final and operator keywords	2025-01-08 00:43:55 +01:00
sonoro1234	d83e8c5892	oops!! doing last commit complete (Always have to build before commiting)	2025-01-06 19:10:59 +01:00
sonoro1234	98b667f601	modify manual function for ImGuiTextBuffer issue #283	2025-01-06 18:19:54 +01:00
sonoro1234	d9982af929	generation with new lua serializer	2024-12-18 15:17:18 +01:00
sonoro1234	58763282f8	cpp2ffi: more compact lua serialization	2024-12-18 15:15:46 +01:00
sonoro1234	970c614802	pull imgui docking 1.91.6 and generate	2024-12-12 13:13:36 +01:00
sonoro1234	3d5b2e7650	dont break cimgui.h on comments generation	2024-11-19 07:54:41 +01:00