Merge branch 'docking_inter'

pull imgui docking 1.91.7 and generate
generator.lua: change for Used4kPagesMap -> Used8kPagesMap
2025-08-11 04:18:29 +01:00 · 2025-01-21 16:06:26 +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
26 changed files with 46018 additions and 42924 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,10 +26,10 @@ set(IMGUI_FREETYPE "no" CACHE STRING "Build with freetype library")
 set(IMGUI_LIBRARIES )

 if(IMGUI_FREETYPE)
+	message(STATUS "Building with freetype")
 	FIND_PACKAGE(freetype REQUIRED PATHS ${FREETYPE_PATH})
 	list(APPEND IMGUI_LIBRARIES freetype)
 	list(APPEND IMGUI_SOURCES imgui/misc/freetype/imgui_freetype.cpp)
-	add_definitions("-DCIMGUI_FREETYPE=1")
 endif(IMGUI_FREETYPE)

 #add library and link
@@ -39,6 +39,16 @@ else (IMGUI_STATIC)
    add_library(cimgui SHARED ${IMGUI_SOURCES})
 endif (IMGUI_STATIC)

+if(IMGUI_FREETYPE)
+	target_compile_definitions(cimgui PUBLIC IMGUI_ENABLE_FREETYPE)
+	target_compile_definitions(cimgui PUBLIC IMGUI_ENABLE_STB_TRUETYPE)
+endif(IMGUI_FREETYPE)
+
+if(IMGUI_WCHAR32)
+	target_compile_definitions(cimgui PUBLIC IMGUI_USE_WCHAR32)
+endif(IMGUI_WCHAR32)
+
+add_definitions("-DIMGUI_USER_CONFIG=\"../cimconfig.h\"")
 target_compile_definitions(cimgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS=1)
 if (WIN32)
    target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API=extern\t\"C\"\t__declspec\(dllexport\))
--- 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.3 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.
@@ -24,7 +24,7 @@ Notes:
  * `git submodule update --init --recursive` (If already cloned)
 * compile 
  * using makefile on linux/macOS/mingw (Or use CMake to generate project)
-  * cmake options are IMGUI_STATIC (compiling as static library), IMGUI_FREETYPE (for using Freetype2) and FREETYPE_PATH (Freetype2 cmake install location) (only if cimgui is generated with freetype option)
+  * cmake options are IMGUI_STATIC (compiling as static library), IMGUI_FREETYPE (for using Freetype2) and FREETYPE_PATH (Freetype2 cmake install location) and IMGUI_WCHAR32
  * or as in https://github.com/sonoro1234/LuaJIT-ImGui/tree/master/build
  
  For compiling with backends there are now examples with SDL2 and opengl3/vulkan in folder backend_test.
@@ -37,12 +37,12 @@ Notes:
 * you will need LuaJIT (https://github.com/LuaJIT/LuaJIT.git better 2.1 branch) or precompiled for linux/macOS/windows in https://luapower.com/luajit/download
 * you need to use also a C++ compiler for doing preprocessing: gcc (In windows MinGW-W64-builds for example), clang or cl (MSVC). (this repo was done with gcc)
 * update `imgui` folder to the version you desire.
-* edit `generator/generator.bat` on windows, or `generator/generator.sh` on linux, to choose between gcc, clang, or cl and to choose desired backends and whether imgui_internal is generated or not, Freetype2 is used or not and comments are generated or not and if constructors are generated also with versions performing just initialization of structs provided by yourself (_Construct is added to the constructor names)
+* edit `generator/generator.bat` on windows, or `generator/generator.sh` on linux, to choose between gcc, clang, or cl and to choose desired backends and whether imgui_internal is generated or not, comments are generated or not and if constructors are generated also with versions performing just initialization of structs provided by yourself (_Construct is added to the constructor names)
 * the defaults of generator are gcc as compiler, imgui_internal included and sdl, glfw, vulkan, opengl2 and opengl3 as backends.
 * edit config_generator.lua for adding includes needed by your chosen backends (vulkan needs that).
 * Run generator.bat or generator.sh with gcc, clang or cl and LuaJIT on your PATH.
 * as a result some files are generated: `cimgui.cpp`, `cimgui.h` and `cimgui_impl.h` for compiling and some lua/json files with information about the binding: `definitions.json` with function info, `structs_and_enums.json` with struct and enum info, `impl_definitions.json` with functions from the backends info. 
-* You can pass compiler flags to generator.sh or generator.bat by editing them at the end of the call to further specify the compiler behavior. (e.g. -DIMGUI_USER_CONFIG or -DIMGUI_USE_WCHAR32)
+* You can pass compiler flags to generator.sh or generator.bat by editing them at the end of the call to further specify the compiler behavior. (e.g. -DIMGUI_USER_CONFIG)
 * You are able to pass any extra argument to generator.sh (.bat) in the command-line.
 * If you are using different options than cimgui repo and if you want to keep them after a cimgui update, you can keep them in a copy of generator.sh (.bat) outside of cimgui folder where `cd cimgui/generator` is used before luajit call. See https://github.com/cimgui/cimgui/issues/232#issuecomment-1497059497
 # generate binding
--- a/backend_test/example_glfw_dx11/CMakeLists.txt
+++ b/backend_test/example_glfw_dx11/CMakeLists.txt
@@ -23,6 +23,7 @@ else()
 endif()

 include_directories(../../imgui)
+add_definitions("-DIMGUI_USER_CONFIG=\"../cimconfig.h\"")
 add_definitions("-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS=1")

 include_directories(../../)
--- a/backend_test/example_glfw_opengl3/CMakeLists.txt
+++ b/backend_test/example_glfw_opengl3/CMakeLists.txt
@@ -23,6 +23,7 @@ else()
 endif()

 include_directories(../../imgui)
+add_definitions("-DIMGUI_USER_CONFIG=\"../cimconfig.h\"")
 add_definitions("-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS=1")

 include_directories(../../)
--- a/backend_test/example_sdl_opengl3/CMakeLists.txt
+++ b/backend_test/example_sdl_opengl3/CMakeLists.txt
@@ -22,6 +22,7 @@ else()
 endif()

 include_directories(../../imgui)
+add_definitions("-DIMGUI_USER_CONFIG=\"../cimconfig.h\"")
 add_definitions("-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS=1")

 include_directories(../../)
--- a/backend_test/example_sdl_vulkan/CMakeLists.txt
+++ b/backend_test/example_sdl_vulkan/CMakeLists.txt
@@ -19,6 +19,7 @@ else()
 endif()

 include_directories(../../imgui)
+add_definitions("-DIMGUI_USER_CONFIG=\"../cimconfig.h\"")
 add_definitions("-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS=1")

 include_directories(../../)
--- a/cimconfig.h
+++ b/cimconfig.h
@@ -0,0 +1 @@
+#undef NDEBUG
--- a/cimgui.cpp
+++ b/cimgui.cpp
@@ -1,15 +1,8 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.91.3" 19130 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
-#ifdef IMGUI_ENABLE_FREETYPE
-#ifndef CIMGUI_FREETYPE
-#error "IMGUI_FREETYPE should be defined for Freetype linking"
-#endif
-#else
-#ifdef CIMGUI_FREETYPE
-#error "IMGUI_FREETYPE should not be defined without freetype generated cimgui"
-#endif
-#endif
+//with imgui_freetype.h api
+
 #include "./imgui/imgui.h"
 #ifdef IMGUI_ENABLE_FREETYPE
 #include "./imgui/misc/freetype/imgui_freetype.h"
@@ -1351,6 +1344,10 @@ CIMGUI_API void igSetKeyboardFocusHere(int offset)
 {
    return ImGui::SetKeyboardFocusHere(offset);
 }
+CIMGUI_API void igSetNavCursorVisible(bool visible)
+{
+    return ImGui::SetNavCursorVisible(visible);
+}
 CIMGUI_API void igSetNextItemAllowOverlap()
 {
    return ImGui::SetNextItemAllowOverlap();
@@ -2230,7 +2227,7 @@ CIMGUI_API void ImDrawList_AddText_Vec2(ImDrawList* self,const ImVec2 pos,ImU32
 {
    return self->AddText(pos,col,text_begin,text_end);
 }
-CIMGUI_API void ImDrawList_AddText_FontPtr(ImDrawList* self,const ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect)
+CIMGUI_API void ImDrawList_AddText_FontPtr(ImDrawList* self,ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect)
 {
    return self->AddText(font,font_size,pos,col,text_begin,text_end,wrap_width,cpu_fine_clip_rect);
 }
@@ -2314,9 +2311,9 @@ CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const
 {
    return self->PathRect(rect_min,rect_max,rounding,flags);
 }
-CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data)
+CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* userdata,size_t userdata_size)
 {
-    return self->AddCallback(callback,callback_data);
+    return self->AddCallback(callback,userdata,userdata_size);
 }
 CIMGUI_API void ImDrawList_AddDrawCmd(ImDrawList* self)
 {
@@ -3849,6 +3846,10 @@ CIMGUI_API ImGuiTableColumnSettings* ImGuiTableSettings_GetColumnSettings(ImGuiT
 {
    return self->GetColumnSettings();
 }
+CIMGUI_API ImGuiIO* igGetIOEx(ImGuiContext* ctx)
+{
+    return &ImGui::GetIOEx(ctx);
+}
 CIMGUI_API ImGuiWindow* igGetCurrentWindowRead()
 {
    return ImGui::GetCurrentWindowRead();
@@ -4037,6 +4038,10 @@ CIMGUI_API void igCallContextHooks(ImGuiContext* context,ImGuiContextHookType ty
 {
    return ImGui::CallContextHooks(context,type);
 }
+CIMGUI_API void igScaleWindowsInViewport(ImGuiViewportP* viewport,float scale)
+{
+    return ImGui::ScaleWindowsInViewport(viewport,scale);
+}
 CIMGUI_API void igSetWindowViewport(ImGuiWindow* window,ImGuiViewportP* viewport)
 {
    return ImGui::SetWindowViewport(window,viewport);
@@ -4233,9 +4238,9 @@ CIMGUI_API void igEndDisabledOverrideReenable()
 {
    return ImGui::EndDisabledOverrideReenable();
 }
-CIMGUI_API void igLogBegin(ImGuiLogType type,int auto_open_depth)
+CIMGUI_API void igLogBegin(ImGuiLogFlags flags,int auto_open_depth)
 {
-    return ImGui::LogBegin(type,auto_open_depth);
+    return ImGui::LogBegin(flags,auto_open_depth);
 }
 CIMGUI_API void igLogToBuffer(int auto_open_depth)
 {
@@ -4381,9 +4386,9 @@ CIMGUI_API void igNavClearPreferredPosForAxis(ImGuiAxis axis)
 {
    return ImGui::NavClearPreferredPosForAxis(axis);
 }
-CIMGUI_API void igNavRestoreHighlightAfterMove()
+CIMGUI_API void igSetNavCursorVisibleAfterMove()
 {
-    return ImGui::NavRestoreHighlightAfterMove();
+    return ImGui::SetNavCursorVisibleAfterMove();
 }
 CIMGUI_API void igNavUpdateCurrentWindowIsScrollPushableX()
 {
@@ -4997,9 +5002,9 @@ CIMGUI_API void igRenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list,ImV
 {
    return ImGui::RenderColorRectWithAlphaCheckerboard(draw_list,p_min,p_max,fill_col,grid_step,grid_off,rounding,flags);
 }
-CIMGUI_API void igRenderNavHighlight(const ImRect bb,ImGuiID id,ImGuiNavHighlightFlags flags)
+CIMGUI_API void igRenderNavCursor(const ImRect bb,ImGuiID id,ImGuiNavRenderCursorFlags flags)
 {
-    return ImGui::RenderNavHighlight(bb,id,flags);
+    return ImGui::RenderNavCursor(bb,id,flags);
 }
 CIMGUI_API const char* igFindRenderedTextEnd(const char* text,const char* text_end)
 {
@@ -5045,9 +5050,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)
 {
@@ -5077,9 +5082,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)
 {
@@ -5429,11 +5434,23 @@ CIMGUI_API void igImFontAtlasBuildMultiplyRectAlpha8(const unsigned char table[2
 {
    return ImFontAtlasBuildMultiplyRectAlpha8(table,pixels,x,y,w,h,stride);
 }
+#ifdef IMGUI_ENABLE_FREETYPE
+CIMGUI_API const ImFontBuilderIO* ImGuiFreeType_GetBuilderForFreeType()
+{
+    return ImGuiFreeType::GetBuilderForFreeType();
+}
+
+CIMGUI_API void ImGuiFreeType_SetAllocatorFunctions(void*(*alloc_func)(size_t sz,void* user_data),void(*free_func)(void* ptr,void* user_data),void* user_data)
+{
+    return ImGuiFreeType::SetAllocatorFunctions(alloc_func,free_func,user_data);
+}
+
+#endif



 /////////////////////////////manual written functions
-CIMGUI_API void igLogText(CONST char *fmt, ...)
+CIMGUI_API void igLogText(const char *fmt, ...)
 {
    char buffer[256];
    va_list args;
@@ -5443,11 +5460,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,6 +1,7 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.91.3" 19130 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
 #ifndef CIMGUI_INCLUDED
 #define CIMGUI_INCLUDED
 #include <stdio.h>
@@ -84,6 +85,7 @@ typedef struct ImGuiColorMod ImGuiColorMod;
 typedef struct ImGuiContextHook ImGuiContextHook;
 typedef struct ImGuiDataVarInfo ImGuiDataVarInfo;
 typedef struct ImGuiDataTypeInfo ImGuiDataTypeInfo;
+typedef struct ImGuiDeactivatedItemData ImGuiDeactivatedItemData;
 typedef struct ImGuiErrorRecoveryState ImGuiErrorRecoveryState;
 typedef struct ImGuiGroupData ImGuiGroupData;
 typedef struct ImGuiInputTextState ImGuiInputTextState;
@@ -198,11 +200,22 @@ typedef int ImGuiTableRowFlags;
 typedef int ImGuiTreeNodeFlags;
 typedef int ImGuiViewportFlags;
 typedef int ImGuiWindowFlags;
-typedef void* ImTextureID;
+typedef ImU64 ImTextureID;
 typedef unsigned short ImDrawIdx;
 typedef unsigned int ImWchar32;
 typedef unsigned short ImWchar16;
+
+#ifdef IMGUI_USE_WCHAR32            
+typedef ImWchar32 ImWchar;
+#else
 typedef ImWchar16 ImWchar;
+#endif
+#ifdef IMGUI_USE_WCHAR32
+#define IM_UNICODE_CODEPOINT_MAX     0x10FFFF   
+#else
+#define IM_UNICODE_CODEPOINT_MAX     0xFFFF  
+#endif
+	
 typedef ImS64 ImGuiSelectionUserData;
 typedef int (*ImGuiInputTextCallback)(ImGuiInputTextCallbackData* data);
 typedef void (*ImGuiSizeCallback)(ImGuiSizeCallbackData* data);
@@ -288,12 +301,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,
@@ -310,9 +324,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 {
@@ -433,6 +448,7 @@ typedef enum {
    ImGuiDataType_Float,
    ImGuiDataType_Double,
    ImGuiDataType_Bool,
+    ImGuiDataType_String,
    ImGuiDataType_COUNT
 }ImGuiDataType_;
 typedef enum {
@@ -450,6 +466,7 @@ ImGuiSortDirection_Descending=2,
 }ImGuiSortDirection;
 typedef enum {
 ImGuiKey_None=0,
+ImGuiKey_NamedKey_BEGIN=512,
 ImGuiKey_Tab=512,
 ImGuiKey_LeftArrow=513,
 ImGuiKey_RightArrow=514,
@@ -604,18 +621,14 @@ ImGuiKey_ReservedForModCtrl=662,
 ImGuiKey_ReservedForModShift=663,
 ImGuiKey_ReservedForModAlt=664,
 ImGuiKey_ReservedForModSuper=665,
-ImGuiKey_COUNT=666,
+ImGuiKey_NamedKey_END=666,
 ImGuiMod_None=0,
 ImGuiMod_Ctrl=1 << 12,
 ImGuiMod_Shift=1 << 13,
 ImGuiMod_Alt=1 << 14,
 ImGuiMod_Super=1 << 15,
 ImGuiMod_Mask_=0xF000,
-ImGuiKey_NamedKey_BEGIN=512,
-ImGuiKey_NamedKey_END=ImGuiKey_COUNT,
 ImGuiKey_NamedKey_COUNT=ImGuiKey_NamedKey_END - ImGuiKey_NamedKey_BEGIN,
-ImGuiKey_KeysData_SIZE=ImGuiKey_NamedKey_COUNT,
-ImGuiKey_KeysData_OFFSET=ImGuiKey_NamedKey_BEGIN,
 }ImGuiKey;
 typedef enum {
    ImGuiInputFlags_None = 0,
@@ -634,8 +647,6 @@ typedef enum {
    ImGuiConfigFlags_None = 0,
    ImGuiConfigFlags_NavEnableKeyboard = 1 << 0,
    ImGuiConfigFlags_NavEnableGamepad = 1 << 1,
-    ImGuiConfigFlags_NavEnableSetMousePos = 1 << 2,
-    ImGuiConfigFlags_NavNoCaptureKeyboard = 1 << 3,
    ImGuiConfigFlags_NoMouse = 1 << 4,
    ImGuiConfigFlags_NoMouseCursorChange = 1 << 5,
    ImGuiConfigFlags_NoKeyboard = 1 << 6,
@@ -702,7 +713,7 @@ typedef enum {
    ImGuiCol_TextLink,
    ImGuiCol_TextSelectedBg,
    ImGuiCol_DragDropTarget,
-    ImGuiCol_NavHighlight,
+    ImGuiCol_NavCursor,
    ImGuiCol_NavWindowingHighlight,
    ImGuiCol_NavWindowingDimBg,
    ImGuiCol_ModalWindowDimBg,
@@ -750,6 +761,7 @@ typedef enum {
    ImGuiButtonFlags_MouseButtonRight = 1 << 1,
    ImGuiButtonFlags_MouseButtonMiddle = 1 << 2,
    ImGuiButtonFlags_MouseButtonMask_ = ImGuiButtonFlags_MouseButtonLeft | ImGuiButtonFlags_MouseButtonRight | ImGuiButtonFlags_MouseButtonMiddle,
+    ImGuiButtonFlags_EnableNav = 1 << 3,
 }ImGuiButtonFlags_;
 typedef enum {
    ImGuiColorEditFlags_None = 0,
@@ -790,6 +802,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_;
@@ -997,15 +1010,22 @@ struct ImGuiIO
    bool FontAllowUserScaling;
    ImFont* FontDefault;
    ImVec2 DisplayFramebufferScale;
+    bool ConfigNavSwapGamepadButtons;
+    bool ConfigNavMoveSetMousePos;
+    bool ConfigNavCaptureKeyboard;
+    bool ConfigNavEscapeClearFocusItem;
+    bool ConfigNavEscapeClearFocusWindow;
+    bool ConfigNavCursorVisibleAuto;
+    bool ConfigNavCursorVisibleAlways;
    bool MouseDrawCursor;
    bool ConfigMacOSXBehaviors;
-    bool ConfigNavSwapGamepadButtons;
    bool ConfigInputTrickleEventQueue;
    bool ConfigInputTextCursorBlink;
    bool ConfigInputTextEnterKeepActive;
    bool ConfigDragClickToInputText;
    bool ConfigWindowsResizeFromEdges;
    bool ConfigWindowsMoveFromTitleBarOnly;
+    bool ConfigWindowsCopyContentsWithCtrlC;
    bool ConfigScrollbarScrollByPage;
    float ConfigMemoryCompactTimer;
    float MouseDoubleClickTime;
@@ -1052,7 +1072,7 @@ struct ImGuiIO
    bool KeyAlt;
    bool KeySuper;
    ImGuiKeyChord KeyMods;
-    ImGuiKeyData KeysData[ImGuiKey_KeysData_SIZE];
+    ImGuiKeyData KeysData[ImGuiKey_NamedKey_COUNT];
    bool WantCaptureMouseUnlessPopupClose;
    ImVec2 MousePosPrev;
    ImVec2 MouseClickedPos[5];
@@ -1072,8 +1092,6 @@ struct ImGuiIO
    float PenPressure;
    bool AppFocusLost;
    bool AppAcceptingEvents;
-    ImS8 BackendUsingLegacyKeyArrays;
-    bool BackendUsingLegacyNavInputArray;
    ImWchar16 InputQueueSurrogate;
    ImVector_ImWchar InputQueueCharacters;
 };
@@ -1230,6 +1248,8 @@ struct ImDrawCmd
    unsigned int ElemCount;
    ImDrawCallback UserCallback;
    void* UserCallbackData;
+    int UserCallbackDataSize;
+    int UserCallbackDataOffset;
 };
 struct ImDrawVert
 {
@@ -1292,6 +1312,8 @@ typedef struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_Im

 typedef struct ImVector_ImTextureID {int Size;int Capacity;ImTextureID* Data;} ImVector_ImTextureID;

+typedef struct ImVector_ImU8 {int Size;int Capacity;ImU8* Data;} ImVector_ImU8;
+
 struct ImDrawList
 {
    ImVector_ImDrawCmd CmdBuffer;
@@ -1307,6 +1329,7 @@ struct ImDrawList
    ImDrawListSplitter _Splitter;
    ImVector_ImVec4 _ClipRectStack;
    ImVector_ImTextureID _TextureIdStack;
+    ImVector_ImU8 _CallbacksDataBuf;
    float _FringeScale;
    const char* _OwnerName;
 };
@@ -1365,9 +1388,10 @@ struct ImFontGlyphRangesBuilder
 typedef struct ImFontAtlasCustomRect ImFontAtlasCustomRect;
 struct ImFontAtlasCustomRect
 {
-    unsigned short Width, Height;
    unsigned short X, Y;
-    unsigned int GlyphID;
+    unsigned short Width, Height;
+    unsigned int GlyphID : 31;
+    unsigned int GlyphColored : 1;
    float GlyphAdvanceX;
    ImVec2 GlyphOffset;
    ImFont* Font;
@@ -1424,16 +1448,16 @@ 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;
    float Scale;
    float Ascent, Descent;
    int MetricsTotalSurface;
-    ImU8 Used4kPagesMap[(0xFFFF +1)/4096/8];
+    ImU8 Used4kPagesMap[(IM_UNICODE_CODEPOINT_MAX +1)/4096/8];
 };
 typedef enum {
    ImGuiViewportFlags_None = 0,
@@ -1462,6 +1486,7 @@ struct ImGuiPlatformIO
    void (*Platform_SetImeDataFn)(ImGuiContext* ctx, ImGuiViewport* viewport, ImGuiPlatformImeData* data);
    void* Platform_ImeUserData;
    ImWchar Platform_LocaleDecimalPoint;
+    void* Renderer_RenderState;
 };
 struct ImGuiPlatformImeData
 {
@@ -1479,6 +1504,7 @@ struct ImGuiContext;
 struct ImGuiContextHook;
 struct ImGuiDataVarInfo;
 struct ImGuiDataTypeInfo;
+struct ImGuiDeactivatedItemData;
 struct ImGuiErrorRecoveryState;
 struct ImGuiGroupData;
 struct ImGuiInputTextState;
@@ -1518,7 +1544,8 @@ typedef int ImGuiDebugLogFlags;
 typedef int ImGuiFocusRequestFlags;
 typedef int ImGuiItemStatusFlags;
 typedef int ImGuiOldColumnFlags;
-typedef int ImGuiNavHighlightFlags;
+typedef int ImGuiLogFlags;
+typedef int ImGuiNavRenderCursorFlags;
 typedef int ImGuiNavMoveFlags;
 typedef int ImGuiNextItemDataFlags;
 typedef int ImGuiNextWindowDataFlags;
@@ -1562,6 +1589,7 @@ struct ImGuiTextIndex
 struct ImDrawListSharedData
 {
    ImVec2 TexUvWhitePixel;
+    const ImVec4* TexUvLines;
    ImFont* Font;
    float FontSize;
    float FontScale;
@@ -1573,7 +1601,6 @@ struct ImDrawListSharedData
    ImVec2 ArcFastVtx[48];
    float ArcFastRadiusCutoff;
    ImU8 CircleSegmentCounts[64];
-    const ImVec4* TexUvLines;
 };
 struct ImDrawDataBuilder
 {
@@ -1599,8 +1626,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 {
@@ -1609,6 +1635,8 @@ typedef enum {
    ImGuiItemFlags_MixedValue = 1 << 12,
    ImGuiItemFlags_NoWindowHoverableCheck = 1 << 13,
    ImGuiItemFlags_AllowOverlap = 1 << 14,
+    ImGuiItemFlags_NoNavDisableMouseHover = 1 << 15,
+    ImGuiItemFlags_NoMarkEdited = 1 << 16,
    ImGuiItemFlags_Inputable = 1 << 20,
    ImGuiItemFlags_HasSelectionUserData = 1 << 21,
    ImGuiItemFlags_IsMultiSelect = 1 << 22,
@@ -1635,9 +1663,8 @@ typedef enum {
 }ImGuiHoveredFlagsPrivate_;
 typedef enum {
    ImGuiInputTextFlags_Multiline = 1 << 26,
-    ImGuiInputTextFlags_NoMarkEdited = 1 << 27,
-    ImGuiInputTextFlags_MergedItem = 1 << 28,
-    ImGuiInputTextFlags_LocalizeDecimalPoint= 1 << 29,
+    ImGuiInputTextFlags_MergedItem = 1 << 27,
+    ImGuiInputTextFlags_LocalizeDecimalPoint= 1 << 28,
 }ImGuiInputTextFlagsPrivate_;
 typedef enum {
    ImGuiButtonFlags_PressedOnClick = 1 << 4,
@@ -1646,12 +1673,10 @@ typedef enum {
    ImGuiButtonFlags_PressedOnRelease = 1 << 7,
    ImGuiButtonFlags_PressedOnDoubleClick = 1 << 8,
    ImGuiButtonFlags_PressedOnDragDropHold = 1 << 9,
-    ImGuiButtonFlags_Repeat = 1 << 10,
    ImGuiButtonFlags_FlattenChildren = 1 << 11,
    ImGuiButtonFlags_AllowOverlap = 1 << 12,
-    ImGuiButtonFlags_DontClosePopups = 1 << 13,
    ImGuiButtonFlags_AlignTextBaseLine = 1 << 15,
-    ImGuiButtonFlags_NoKeyModifiers = 1 << 16,
+    ImGuiButtonFlags_NoKeyModsAllowed = 1 << 16,
    ImGuiButtonFlags_NoHoldingActiveId = 1 << 17,
    ImGuiButtonFlags_NoNavFocus = 1 << 18,
    ImGuiButtonFlags_NoHoveredOnFocus = 1 << 19,
@@ -1706,12 +1731,13 @@ typedef enum {
    ImGuiLayoutType_Vertical = 1
 }ImGuiLayoutType_;
 typedef enum {
-    ImGuiLogType_None = 0,
-    ImGuiLogType_TTY,
-    ImGuiLogType_File,
-    ImGuiLogType_Buffer,
-    ImGuiLogType_Clipboard,
-}ImGuiLogType;
+    ImGuiLogFlags_None = 0,
+    ImGuiLogFlags_OutputTTY = 1 << 0,
+    ImGuiLogFlags_OutputFile = 1 << 1,
+    ImGuiLogFlags_OutputBuffer = 1 << 2,
+    ImGuiLogFlags_OutputClipboard = 1 << 3,
+    ImGuiLogFlags_OutputMask_ = ImGuiLogFlags_OutputTTY | ImGuiLogFlags_OutputFile | ImGuiLogFlags_OutputBuffer | ImGuiLogFlags_OutputClipboard,
+}ImGuiLogFlags_;
 typedef enum {
    ImGuiAxis_None = -1,
    ImGuiAxis_X = 0,
@@ -1752,7 +1778,7 @@ struct ImGuiGroupData
    ImVec2 BackupCurrLineSize;
    float BackupCurrLineTextBaseOffset;
    ImGuiID BackupActiveIdIsAlive;
-    bool BackupActiveIdPreviousFrameIsAlive;
+    bool BackupDeactivatedIdIsAlive;
    bool BackupHoveredIdIsAlive;
    bool BackupIsSameLine;
    bool EmitItem;
@@ -1779,19 +1805,20 @@ struct ImGuiInputTextState
 {
    ImGuiContext* Ctx;
    ImStbTexteditState* Stb;
+    ImGuiInputTextFlags Flags;
    ImGuiID ID;
-    int CurLenA;
+    int TextLen;
+    const char* TextSrc;
    ImVector_char TextA;
-    ImVector_char InitialTextA;
+    ImVector_char TextToRevertTo;
    ImVector_char CallbackTextBackup;
-    int BufCapacityA;
+    int BufCapacity;
    ImVec2 Scroll;
    float CursorAnim;
    bool CursorFollow;
    bool SelectedAllMouseLock;
    bool Edited;
-    ImGuiInputTextFlags Flags;
-    bool ReloadUserBuf;
+    bool WantReloadUserBuf;
    int ReloadSelectionStart;
    int ReloadSelectionEnd;
 };
@@ -1844,7 +1871,7 @@ typedef enum {
 }ImGuiNextItemDataFlags_;
 struct ImGuiNextItemData
 {
-    ImGuiNextItemDataFlags Flags;
+    ImGuiNextItemDataFlags HasFlags;
    ImGuiItemFlags ItemFlags;
    ImGuiID FocusScopeId;
    ImGuiSelectionUserData SelectionUserData;
@@ -1859,7 +1886,7 @@ struct ImGuiNextItemData
 struct ImGuiLastItemData
 {
    ImGuiID ID;
-    ImGuiItemFlags InFlags;
+    ImGuiItemFlags ItemFlags;
    ImGuiItemStatusFlags StatusFlags;
    ImRect Rect;
    ImRect NavRect;
@@ -1871,7 +1898,7 @@ struct ImGuiTreeNodeStackData
 {
    ImGuiID ID;
    ImGuiTreeNodeFlags TreeFlags;
-    ImGuiItemFlags InFlags;
+    ImGuiItemFlags ItemFlags;
    ImRect NavRect;
 };
 struct ImGuiErrorRecoveryState
@@ -1909,6 +1936,13 @@ struct ImGuiPtrOrIndex
    void* Ptr;
    int Index;
 };
+struct ImGuiDeactivatedItemData
+{
+    ImGuiID ID;
+    int ElapseFrame;
+    bool HasBeenEditedBefore;
+    bool IsAlive;
+};
 typedef enum {
    ImGuiPopupPositionPolicy_Default,
    ImGuiPopupPositionPolicy_ComboBox,
@@ -2081,11 +2115,11 @@ typedef enum {
    ImGuiScrollFlags_MaskY_ = ImGuiScrollFlags_KeepVisibleEdgeY | ImGuiScrollFlags_KeepVisibleCenterY | ImGuiScrollFlags_AlwaysCenterY,
 }ImGuiScrollFlags_;
 typedef enum {
-    ImGuiNavHighlightFlags_None = 0,
-    ImGuiNavHighlightFlags_Compact = 1 << 1,
-    ImGuiNavHighlightFlags_AlwaysDraw = 1 << 2,
-    ImGuiNavHighlightFlags_NoRounding = 1 << 3,
-}ImGuiNavHighlightFlags_;
+    ImGuiNavRenderCursorFlags_None = 0,
+    ImGuiNavRenderCursorFlags_Compact = 1 << 1,
+    ImGuiNavRenderCursorFlags_AlwaysDraw = 1 << 2,
+    ImGuiNavRenderCursorFlags_NoRounding = 1 << 3,
+}ImGuiNavRenderCursorFlags_;
 typedef enum {
    ImGuiNavMoveFlags_None = 0,
    ImGuiNavMoveFlags_LoopX = 1 << 0,
@@ -2103,7 +2137,7 @@ typedef enum {
    ImGuiNavMoveFlags_IsPageMove = 1 << 11,
    ImGuiNavMoveFlags_Activate = 1 << 12,
    ImGuiNavMoveFlags_NoSelect = 1 << 13,
-    ImGuiNavMoveFlags_NoSetNavHighlight = 1 << 14,
+    ImGuiNavMoveFlags_NoSetNavCursorVisible = 1 << 14,
    ImGuiNavMoveFlags_NoClearActiveId = 1 << 15,
 }ImGuiNavMoveFlags_;
 typedef enum {
@@ -2117,7 +2151,7 @@ struct ImGuiNavItemData
    ImGuiID ID;
    ImGuiID FocusScopeId;
    ImRect RectRel;
-    ImGuiItemFlags InFlags;
+    ImGuiItemFlags ItemFlags;
    float DistBox;
    float DistCenter;
    float DistAxial;
@@ -2299,10 +2333,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_;
@@ -2441,9 +2476,9 @@ struct ImGuiContext
    int FrameCount;
    int FrameCountEnded;
    int FrameCountRendered;
+    ImGuiID WithinEndChildID;
    bool WithinFrameScope;
    bool WithinFrameScopeWithImplicitWindow;
-    bool WithinEndChild;
    bool GcCompactAll;
    bool TestEngineHookItems;
    void* TestEngine;
@@ -2497,9 +2532,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;
@@ -2529,8 +2563,12 @@ struct ImGuiContext
    ImVector_ImGuiPopupData BeginPopupStack;
    ImVector_ImGuiTreeNodeStackData TreeNodeStack;
    ImVector_ImGuiViewportPPtr Viewports;
-    ImGuiWindow* NavWindow;
+    bool NavCursorVisible;
+    bool NavHighlightItemUnderNav;
+    bool NavMousePosDirty;
+    bool NavIdIsAlive;
    ImGuiID NavId;
+    ImGuiWindow* NavWindow;
    ImGuiID NavFocusScopeId;
    ImGuiNavLayer NavLayer;
    ImGuiID NavActivateId;
@@ -2544,10 +2582,7 @@ struct ImGuiContext
    ImGuiActivateFlags NavNextActivateFlags;
    ImGuiInputSource NavInputSource;
    ImGuiSelectionUserData NavLastValidSelectionUserData;
-    bool NavIdIsAlive;
-    bool NavMousePosDirty;
-    bool NavDisableHighlight;
-    bool NavDisableMouseHover;
+    ImS8 NavCursorHideFrames;
    bool NavAnyRequest;
    bool NavInitRequest;
    bool NavInitRequestFromMove;
@@ -2660,7 +2695,6 @@ struct ImGuiContext
    float DragSpeedDefaultRatio;
    float DisabledAlphaBackup;
    short DisabledStackSize;
-    short LockMarkEdited;
    short TooltipOverrideCount;
    ImGuiWindow* TooltipPreviousWindow;
    ImVector_char ClipboardHandlerData;
@@ -2678,7 +2712,8 @@ struct ImGuiContext
    ImGuiID HookIdNext;
    const char* LocalizationTable[ImGuiLocKey_COUNT];
    bool LogEnabled;
-    ImGuiLogType LogType;
+    ImGuiLogFlags LogFlags;
+    ImGuiWindow* LogWindow;
    ImFileHandle LogFile;
    ImGuiTextBuffer LogBuffer;
    const char* LogNextPrefix;
@@ -3167,6 +3202,22 @@ struct ImFontBuilderIO
 {
    bool (*FontBuilder_Build)(ImFontAtlas* atlas);
 };
+#ifdef IMGUI_ENABLE_FREETYPE
+struct ImFontAtlas;
+struct ImFontBuilderIO;
+typedef enum {
+    ImGuiFreeTypeBuilderFlags_NoHinting = 1 << 0,
+    ImGuiFreeTypeBuilderFlags_NoAutoHint = 1 << 1,
+    ImGuiFreeTypeBuilderFlags_ForceAutoHint = 1 << 2,
+    ImGuiFreeTypeBuilderFlags_LightHinting = 1 << 3,
+    ImGuiFreeTypeBuilderFlags_MonoHinting = 1 << 4,
+    ImGuiFreeTypeBuilderFlags_Bold = 1 << 5,
+    ImGuiFreeTypeBuilderFlags_Oblique = 1 << 6,
+    ImGuiFreeTypeBuilderFlags_Monochrome = 1 << 7,
+    ImGuiFreeTypeBuilderFlags_LoadColor = 1 << 8,
+    ImGuiFreeTypeBuilderFlags_Bitmap = 1 << 9
+}ImGuiFreeTypeBuilderFlags;
+#endif
 #define ImDrawCallback_ResetRenderState       (ImDrawCallback)(-8)

 #else
@@ -3228,6 +3279,7 @@ typedef ImVector<ImGuiWindow*> ImVector_ImGuiWindowPtr;
 typedef ImVector<ImGuiWindowStackData> ImVector_ImGuiWindowStackData;
 typedef ImVector<ImTextureID> ImVector_ImTextureID;
 typedef ImVector<ImU32> ImVector_ImU32;
+typedef ImVector<ImU8> ImVector_ImU8;
 typedef ImVector<ImVec2> ImVector_ImVec2;
 typedef ImVector<ImVec4> ImVector_ImVec4;
 typedef ImVector<ImWchar> ImVector_ImWchar;
@@ -3559,6 +3611,7 @@ CIMGUI_API void igPushClipRect(const ImVec2 clip_rect_min,const ImVec2 clip_rect
 CIMGUI_API void igPopClipRect(void);
 CIMGUI_API void igSetItemDefaultFocus(void);
 CIMGUI_API void igSetKeyboardFocusHere(int offset);
+CIMGUI_API void igSetNavCursorVisible(bool visible);
 CIMGUI_API void igSetNextItemAllowOverlap(void);
 CIMGUI_API bool igIsItemHovered(ImGuiHoveredFlags flags);
 CIMGUI_API bool igIsItemActive(void);
@@ -3778,7 +3831,7 @@ CIMGUI_API void ImDrawList_AddNgonFilled(ImDrawList* self,const ImVec2 center,fl
 CIMGUI_API void ImDrawList_AddEllipse(ImDrawList* self,const ImVec2 center,const ImVec2 radius,ImU32 col,float rot,int num_segments,float thickness);
 CIMGUI_API void ImDrawList_AddEllipseFilled(ImDrawList* self,const ImVec2 center,const ImVec2 radius,ImU32 col,float rot,int num_segments);
 CIMGUI_API void ImDrawList_AddText_Vec2(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end);
-CIMGUI_API void ImDrawList_AddText_FontPtr(ImDrawList* self,const ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect);
+CIMGUI_API void ImDrawList_AddText_FontPtr(ImDrawList* self,ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect);
 CIMGUI_API void ImDrawList_AddBezierCubic(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness,int num_segments);
 CIMGUI_API void ImDrawList_AddBezierQuadratic(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col,float thickness,int num_segments);
 CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,ImDrawFlags flags,float thickness);
@@ -3799,7 +3852,7 @@ CIMGUI_API void ImDrawList_PathEllipticalArcTo(ImDrawList* self,const ImVec2 cen
 CIMGUI_API void ImDrawList_PathBezierCubicCurveTo(ImDrawList* self,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,int num_segments);
 CIMGUI_API void ImDrawList_PathBezierQuadraticCurveTo(ImDrawList* self,const ImVec2 p2,const ImVec2 p3,int num_segments);
 CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawFlags flags);
-CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data);
+CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* userdata,size_t userdata_size);
 CIMGUI_API void ImDrawList_AddDrawCmd(ImDrawList* self);
 CIMGUI_API ImDrawList* ImDrawList_CloneOutput(ImDrawList* self);
 CIMGUI_API void ImDrawList_ChannelsSplit(ImDrawList* self,int count);
@@ -4181,6 +4234,7 @@ CIMGUI_API void ImGuiTableColumnSettings_destroy(ImGuiTableColumnSettings* self)
 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 ImGuiWindow* igGetCurrentWindowRead(void);
 CIMGUI_API ImGuiWindow* igGetCurrentWindow(void);
 CIMGUI_API ImGuiWindow* igFindWindowByID(ImGuiID id);
@@ -4228,6 +4282,7 @@ CIMGUI_API void igUpdateMouseMovingWindowEndFrame(void);
 CIMGUI_API ImGuiID igAddContextHook(ImGuiContext* context,const ImGuiContextHook* hook);
 CIMGUI_API void igRemoveContextHook(ImGuiContext* context,ImGuiID hook_to_remove);
 CIMGUI_API void igCallContextHooks(ImGuiContext* context,ImGuiContextHookType type);
+CIMGUI_API void igScaleWindowsInViewport(ImGuiViewportP* viewport,float scale);
 CIMGUI_API void igSetWindowViewport(ImGuiWindow* window,ImGuiViewportP* viewport);
 CIMGUI_API void igMarkIniSettingsDirty_Nil(void);
 CIMGUI_API void igMarkIniSettingsDirty_WindowPtr(ImGuiWindow* window);
@@ -4277,7 +4332,7 @@ CIMGUI_API void igShrinkWidths(ImGuiShrinkWidthItem* items,int count,float width
 CIMGUI_API const ImGuiDataVarInfo* igGetStyleVarInfo(ImGuiStyleVar idx);
 CIMGUI_API void igBeginDisabledOverrideReenable(void);
 CIMGUI_API void igEndDisabledOverrideReenable(void);
-CIMGUI_API void igLogBegin(ImGuiLogType type,int auto_open_depth);
+CIMGUI_API void igLogBegin(ImGuiLogFlags flags,int auto_open_depth);
 CIMGUI_API void igLogToBuffer(int auto_open_depth);
 CIMGUI_API void igLogRenderedText(const ImVec2* ref_pos,const char* text,const char* text_end);
 CIMGUI_API void igLogSetNextTextDecoration(const char* prefix,const char* suffix);
@@ -4314,7 +4369,7 @@ CIMGUI_API void igNavMoveRequestApplyResult(void);
 CIMGUI_API void igNavMoveRequestTryWrapping(ImGuiWindow* window,ImGuiNavMoveFlags move_flags);
 CIMGUI_API void igNavHighlightActivated(ImGuiID id);
 CIMGUI_API void igNavClearPreferredPosForAxis(ImGuiAxis axis);
-CIMGUI_API void igNavRestoreHighlightAfterMove(void);
+CIMGUI_API void igSetNavCursorVisibleAfterMove(void);
 CIMGUI_API void igNavUpdateCurrentWindowIsScrollPushableX(void);
 CIMGUI_API void igSetNavWindow(ImGuiWindow* window);
 CIMGUI_API void igSetNavID(ImGuiID id,ImGuiNavLayer nav_layer,ImGuiID focus_scope_id,const ImRect rect_rel);
@@ -4468,7 +4523,7 @@ CIMGUI_API void igRenderTextEllipsis(ImDrawList* draw_list,const ImVec2 pos_min,
 CIMGUI_API void igRenderFrame(ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,bool borders,float rounding);
 CIMGUI_API void igRenderFrameBorder(ImVec2 p_min,ImVec2 p_max,float rounding);
 CIMGUI_API void igRenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list,ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,float grid_step,ImVec2 grid_off,float rounding,ImDrawFlags flags);
-CIMGUI_API void igRenderNavHighlight(const ImRect bb,ImGuiID id,ImGuiNavHighlightFlags flags);
+CIMGUI_API void igRenderNavCursor(const ImRect bb,ImGuiID id,ImGuiNavRenderCursorFlags flags);
 CIMGUI_API const char* igFindRenderedTextEnd(const char* text,const char* text_end);
 CIMGUI_API void igRenderMouseCursor(ImVec2 pos,float scale,ImGuiMouseCursor mouse_cursor,ImU32 col_fill,ImU32 col_border,ImU32 col_shadow);
 CIMGUI_API void igRenderArrow(ImDrawList* draw_list,ImVec2 pos,ImU32 col,ImGuiDir dir,float scale);
@@ -4480,7 +4535,7 @@ CIMGUI_API void igRenderRectFilledWithHole(ImDrawList* draw_list,const ImRect ou
 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);
@@ -4488,7 +4543,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);
 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);
@@ -4576,13 +4631,17 @@ CIMGUI_API void igImFontAtlasBuildRender8bppRectFromString(ImFontAtlas* atlas,in
 CIMGUI_API void igImFontAtlasBuildRender32bppRectFromString(ImFontAtlas* atlas,int x,int y,int w,int h,const char* in_str,char in_marker_char,unsigned int in_marker_pixel_value);
 CIMGUI_API void igImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256],float in_multiply_factor);
 CIMGUI_API void igImFontAtlasBuildMultiplyRectAlpha8(const unsigned char table[256],unsigned char* pixels,int x,int y,int w,int h,int stride);
+#ifdef IMGUI_ENABLE_FREETYPE
+CIMGUI_API const ImFontBuilderIO* ImGuiFreeType_GetBuilderForFreeType(void);
+CIMGUI_API void ImGuiFreeType_SetAllocatorFunctions(void*(*alloc_func)(size_t sz,void* user_data),void(*free_func)(void* ptr,void* user_data),void* user_data);
+#endif


 /////////////////////////hand written functions
 //no LogTextV
-CIMGUI_API void igLogText(CONST char *fmt, ...);
+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
@@ -1,12 +1,4 @@
-#ifdef IMGUI_ENABLE_FREETYPE
-#ifndef CIMGUI_FREETYPE
-#error "IMGUI_FREETYPE should be defined for Freetype linking"
-#endif
-#else
-#ifdef CIMGUI_FREETYPE
-#error "IMGUI_FREETYPE should not be defined without freetype generated cimgui"
-#endif
-#endif
+
 #include "./imgui/imgui.h"
 #ifdef IMGUI_ENABLE_FREETYPE
 #include "./imgui/misc/freetype/imgui_freetype.h"
@@ -20,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;
@@ -30,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
@@ -47,9 +47,9 @@ typedef union SDL_Event SDL_Event;

 /////////////////////////hand written functions
 //no LogTextV
-CIMGUI_API void igLogText(CONST char *fmt, ...);
+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
@@ -432,20 +435,15 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
 							loca = table.remove(loca,1)
 						end
 						if not loca then
-							print("not loca",string.format("%q , %q ",itemold,itemfirstline),#itemfirstline)
-							-- for k,v in pairs(linenumdict) do
-								-- if k:match(itemfirstline) then
-									-- print(string.format("%q",k),#k)
-								-- end
-							-- end
-							--error"no entry in linenumdict"
 							--take locat from parent
 							if itparent and itparent.locat then
 								loca = itparent.locat
+								print("parent loca",string.format("%q , %q ",itemold,itemfirstline),#itemfirstline,loca)
 							else
 								loca = 0
-								--error"no entry in linenumdict"
+								print("not loca",string.format("%q , %q ",itemold,itemfirstline),#itemfirstline,loca)
 							end
+							
 						end
 					else
 						error"no linenumdict"
@@ -481,7 +479,7 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
 	end
 	return itemarr,items
 end
-M.parseItems = parseItems
+--M.parseItems = parseItems
 local function name_overloadsAlgo(v)

    local aa = {} -- args
@@ -605,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"
@@ -673,14 +671,18 @@ local function CleanImU32(def)
 	for i=1,#bb do res = res + bb[i] end 
 	return res
 end
+local function moveptr(line)
+	line = line:gsub("%s*%*","%*")
+	line = line:gsub("%*([%w_])","%* %1")
+	line = line:gsub("(%(%*)%s","%1")
+	return line
+end
 local function parseFunction(self,stname,itt,namespace,locat)

 	local lineorig,comment = split_comment(itt.item)
 	line = clean_spaces(lineorig)
 	--move *
-	line = line:gsub("%s*%*","%*")
-	line = line:gsub("%*([%w_])","%* %1")
-	line = line:gsub("(%(%*)%s","%1")
+	line = moveptr(line)

 	--print(line)
    --clean implemetation
@@ -719,6 +721,21 @@ local function parseFunction(self,stname,itt,namespace,locat)
 		error"parseFunction not getting args"
    end
 	
+	--get manuals args and ret
+	local cname = self.getCname(stname,funcname, namespace) --cimguiname
+	local manpars = self.manuals[cname]
+	local ismanual
+    if manpars then
+		if type(manpars) == "boolean" then
+			print("warning: unable to get args and ret from "..cname)
+			print("did you forgot to use set_manuals? ")
+		else
+			ismanual = true
+			args, ret = manpars.args, manpars.ret
+			args = moveptr(args)
+			ret = moveptr(ret)
+		end
+	end
 	
 	local argsp = args:sub(2,-2)..","
 	local argsTa = {}
@@ -734,6 +751,8 @@ local function parseFunction(self,stname,itt,namespace,locat)
 			argsTa[#argsTa+1] = tynam
 		end
 	end
+	
+	
 	--- templates in args
 	for i,ar in ipairs(argsTa) do
 		--TODO several diferent templates
@@ -747,7 +766,7 @@ local function parseFunction(self,stname,itt,namespace,locat)
 		end
 	    argsTa[i] = te and code2 or ar --ar:gsub("<([%w_%*%s]+)>",te) --ImVector
 	end
-	
+
 	--get typ, name and defaults
 	local functype_re =        "^%s*[%w%s%*]+%(%*%s*[%w_]+%)%([^%(%)]*%)"
    local functype_reex =     "^(%s*[%w%s%*]+)%(%*%s*([%w_]+)%)(%([^%(%)]*%))"
@@ -807,6 +826,7 @@ local function parseFunction(self,stname,itt,namespace,locat)
        end
 	end
 	
+
 	local argsArr = argsTa2

 	--recreate argscsinpars, call_args and signature from argsArr
@@ -838,7 +858,7 @@ local function parseFunction(self,stname,itt,namespace,locat)
 		caar = "()"
 		signat = "()" .. (extraconst or "")
 	end
-
+	--if ismanual then print("manual",asp, caar, signat) end
    ------------------------------
    
    if not ret and stname then --must be constructors
@@ -871,6 +891,9 @@ local function parseFunction(self,stname,itt,namespace,locat)
 			ar.default = nil
 		end
 	end
+	
+	--if ismanual then M.prtable(argsArr) end
+	
 	defT.templated = self.typenames[stname] and true
 	defT.namespace = namespace
    defT.cimguiname = cimguiname
@@ -901,6 +924,7 @@ local function parseFunction(self,stname,itt,namespace,locat)
        -- end
    end
 	defsT[cimguiname][signat] = defT
+	
 end
 local function itemsCount(items)
 	print"------------items"
@@ -913,8 +937,8 @@ end

 local function AdjustArguments(FP)
    for fun,defs in pairs(FP.defsT) do
-        --struct function but no constructors or static functions
-        if defs[1].stname~="" and defs[1].ret and not defs[1].is_static_function then
+        --struct function but no constructors or static functions or manuals
+        if defs[1].stname~="" and defs[1].ret and not defs[1].is_static_function and not defs[1].manual then
            --print("adjusting",fun)
            for i,def in ipairs(defs) do
                local empty = def.args:match("^%(%)") --no args
@@ -1021,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
@@ -1035,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 = {}
@@ -1111,14 +1174,15 @@ local function ADDdestructors(FP)
 					error"names should be equal"
 				end
 				local def = {}
+				local isrealdestructor = keep_dest_locat[defT[1].stname] and true
 				def.stname = defT[1].stname
 				def.templated = defT[1].templated
-				def.location = keep_dest_locat[defT[1].stname]
+				def.location = keep_dest_locat[defT[1].stname] or defT[1].location
 				def.ret = "void"
 				def.ov_cimguiname = def.stname.."_destroy"
 				def.cimguiname = def.ov_cimguiname
 				def.destructor = true
-				def.realdestructor = def.location and true
+				def.realdestructor = isrealdestructor
 				def.args = "("..def.stname.."* self)"
 				def.call_args = "(self)"
 				def.signature = "("..def.stname.."*)"
@@ -1270,7 +1334,7 @@ function M.Parser()
 							self.typedefs_dict[key] = linet
 						elseif not line:match"typedef%s*struct" then --discard typedef struct
 							print("typedef not found")
-							print(key,value,line)
+							print(key,value,line,cdef[1],cdef[2])
 						end
 					end
 				end
@@ -1295,6 +1359,7 @@ function M.Parser()
 				it.name = it.item:match("class%s+(%S+)")
 				print("cleaning class",it.name)
 				it.item = it.item:gsub("private:.+};$","};")
+				--it.item = it.item:gsub("private:","")
 				it.item = it.item:gsub("public:","")
 				it.item = it.item:gsub("enum%s*class","enum")
 			end
@@ -1343,7 +1408,7 @@ function M.Parser()
 		return table.concat(txtclean)
 	end
 	function par:parseItems()
-		self:initTypedefsDict()
+		--self:initTypedefsDict()
 		
 		self.linenumdict = {}
 		local cdefs2 = {}
@@ -1402,12 +1467,27 @@ 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
 	
 	function par:printItems()
 		printItems(items)
 	end
+	function par:set_manuals(manuals, modulen, erase)
+		erase = erase or {"CIMGUI_API"}
+		local moddata = read_data("./"..modulen.."_template.h")
+		for k,v in pairs(manuals) do
+			local ret = moddata:match("([^%(%):,\n;]+[%*%s])%s?~?"..k.."%b()")
+			for i,ww in ipairs(erase) do
+				ret = ret:gsub(ww,"")
+			end
+			local args = moddata:match(k.."%s*(%b())")
+			manuals[k] = {args = args, ret = ret}
+			--print(k,args,ret)
+		end
+		self.manuals = manuals
+	end
 	par.parseFunction = parseFunction
 	local uniques = {}
 	local function check_unique_typedefs(l,uniques)
@@ -1434,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
@@ -1492,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
@@ -1553,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
@@ -1582,8 +1667,9 @@ function M.Parser()
 		if parnam~="" then parnam = parnam:sub(1,-3) end
 		return parnam
 	end
-	
-
+	function par:header_text_insert(tab,txt,it)
+		table.insert(tab, txt)
+	end
 	function par:gen_structs_and_enums()
 		print"--------------gen_structs_and_enums"
 		--M.prtable(self.typenames)
@@ -1619,20 +1705,23 @@ 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 = ""
 						end
 					end
 					--table.insert(outtabpre,it2)
-					table.insert(outtab,it2)
+					--table.insert(outtab,it2)
+					self:header_text_insert(outtab, it2, it)
 					-- add typedef after struct name
 					if it.re_name == "vardef_re" and it.item:match"^%s*struct" then
 						local stname = it.item:match("struct%s*(%S+)%s*;")
 						--table.insert(typedefs_table,"typedef struct "..stname.." "..stname..";\n")
 						local tst = "\ntypedef struct "..stname.." "..stname..";"
 						if check_unique_typedefs(tst,uniques) then
-							table.insert(outtabpre,tst)
+							--table.insert(outtabpre,tst)
+							self:header_text_insert(outtabpre ,tst, it)
 						end
 						self.typedefs_dict[stname]="struct "..stname
 						if it.parent then --must be struct name; inside namespace
@@ -1658,11 +1747,15 @@ function M.Parser()
 							end
 						end
 						enumbody = "{"..enumbody.."\n}"
-						table.insert(outtab,"\ntypedef enum ".. enumbody..enumname..";"..extraenums)
+						--table.insert(outtab,"\ntypedef enum ".. enumbody..enumname..";"..extraenums)
+						local it2 = "\ntypedef enum ".. enumbody..enumname..";"..extraenums
+						self:header_text_insert(outtab, it2, it)
 					else
 						local enumbody = it.item:match"(%b{})"
 						enumbody = clean_comments(enumbody)
-						table.insert(outtab,"\ntypedef enum ".. enumbody..enumname..";")
+						--table.insert(outtab,"\ntypedef enum ".. enumbody..enumname..";")
+						local it2 = "\ntypedef enum ".. enumbody..enumname..";"
+						self:header_text_insert(outtab, it2, it)
 					end
 					if it.parent then
 						if it.parent.re_name == "namespace_re" then
@@ -1674,7 +1767,8 @@ function M.Parser()
 					end
 				else --unamed enum just repeat declaration
 					local cl_item = clean_comments(it.item)
-					table.insert(outtab,cl_item)
+					--table.insert(outtab,cl_item)
+					self:header_text_insert(outtab, cl_item, it)
 					print("unnamed enum",cl_item)
 				end
 			elseif it.re_name == "struct_re" or it.re_name == "typedef_st_re" or it.re_name == "class_re" then
@@ -1686,12 +1780,14 @@ function M.Parser()
 					--table.insert(typedefs_table,"typedef struct "..structname.." "..structname..";\n")
 					local tst = "\ntypedef struct "..structname.." "..structname..";"
 						if check_unique_typedefs(tst,uniques) then
-							table.insert(outtab,tst)
+							--table.insert(outtab,tst)
+							self:header_text_insert(outtab, tst, it)
 						end
 					self.typedefs_dict[structname]="struct "..structname
 					--dont insert child structs as they are inserted before parent struct
 					if not (it.parent and it.parent.re_name == "struct_re") then
-						table.insert(outtab,predec .. cleanst)
+						--table.insert(outtab,predec .. cleanst)
+						self:header_text_insert(outtab, predec .. cleanst, it)
 					end
 				end
 				if it.parent  then --and (it.parent.re_name == "struct_re" or it.parent.re_name == "typedef_st_re" then
@@ -1724,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
@@ -1732,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
 		
@@ -1864,7 +1964,7 @@ function M.Parser()
 	function par:gen_structs_and_enums_table()
 		print"--------------gen_structs_and_enums_table"
 		local outtab = {enums={},structs={},locations={},enumtypes={},struct_comments={},enum_comments={}}
-		self.typedefs_table = {}
+		--self.typedefs_table = {}
 		local enumsordered = {}
 		unnamed_enum_counter = 0
 		self.templated_structs = {}
@@ -1887,7 +1987,31 @@ function M.Parser()
 				if it.re_name == "typedef_re" and not it.parent then
 					local typedefdef,typedefname = it.item:match"typedef(.+)%s([^%s;]+);$"
 					typedefname = strip(typedefname)
-					self.typedefs_table[typedefname] = strip(typedefdef)
+					--self.typedefs_table[typedefname] = strip(typedefdef)
+					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("%(%*%s*([%w_]+)%)%s*%([^%(%)]*%)")
+					if key then
+						local linet = it.item
+						linet = linet:gsub("[\n%s]+typedef ","")
+						linet = linet:gsub("%(%*("..key..")%)","(*)")
+						self.typedefs_dict[key] = linet
+						--print("functypedef_re",1,linet)--,clean_functypedef(line))
+					else
+						--try function typedef
+						key = it.item:match("%(([%w_]+)%)%([^%(%)]*%)")
+						if key then
+							local linet = it.item
+							linet = linet:gsub("typedef ","")
+							linet = linet:gsub("%(("..key..")%)","()")
+							self.typedefs_dict[key] = linet
+							print("functypedef_re",2, it.item)
+						else
+							print("func typedef not found")
+							print(it.item)
+						end
+					end
 				end
 			elseif it.re_name == "enum_re" then
 				enums_for_table(it, outtab, enumsordered)
@@ -1918,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
@@ -2163,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],",")
@@ -2206,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)
    
@@ -2268,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+(.+)$"
@@ -2358,7 +2588,8 @@ local function location(file,locpathT,defines,COMPILER,keepemptylines)
 end
 M.location = location
 ---------------------- C writing functions
-local function ImGui_f_implementation(outtab,def)
+local function ImGui_f_implementation(def)
+	local outtab = {}
    local ptret = def.retref and "&" or ""
    table.insert(outtab,"CIMGUI_API".." "..def.ret.." "..def.ov_cimguiname..def.args.."\n")
    table.insert(outtab,"{\n")
@@ -2385,8 +2616,10 @@ local function ImGui_f_implementation(outtab,def)
        table.insert(outtab,"    return "..ptret..namespace..def.funcname..def.call_args..";\n")
    end
    table.insert(outtab,"}\n")
+	return table.concat(outtab, "")
 end
-local function struct_f_implementation(outtab,def)
+local function struct_f_implementation(def)
+	local outtab = {}
    local empty = def.args:match("^%(%)") --no args
    local ptret = def.retref and "&" or ""

@@ -2415,6 +2648,7 @@ local function struct_f_implementation(outtab,def)
        table.insert(outtab,"    return "..ptret.."self->"..def.funcname..def.call_args..";\n")
    end
    table.insert(outtab,"}\n")
+	return table.concat(outtab, "")
 end
 local function func_implementation(FP)

@@ -2432,31 +2666,38 @@ local function func_implementation(FP)
        local manual = FP.get_manuals(def)
        if not custom and not manual and not def.templated and not FP.get_skipped(def) then 
            if def.constructor then
+				local tab = {}
                assert(def.stname ~= "","constructor without struct")
                local empty = def.args:match("^%(%)") --no args
-                table.insert(outtab,"CIMGUI_API "..def.stname.."* "..def.ov_cimguiname..(empty and "(void)" or def.args).."\n")
-                table.insert(outtab,"{\n")
-                table.insert(outtab,"    return IM_NEW("..def.stname..")"..def.call_args..";\n")
-                table.insert(outtab,"}\n")
+                table.insert(tab,"CIMGUI_API "..def.stname.."* "..def.ov_cimguiname..(empty and "(void)" or def.args).."\n")
+                table.insert(tab,"{\n")
+                table.insert(tab,"    return IM_NEW("..def.stname..")"..def.call_args..";\n")
+                table.insert(tab,"}\n")
 				if FP.CONSTRUCTORS_GENERATION then
-					table.insert(outtab,"CIMGUI_API void "..def.ov_cimguiname.."_Construct("..def.stname.."* self"..(empty and "" or ","..def.args:sub(2,-2))..")\n")
-					table.insert(outtab,"{\n")
-					table.insert(outtab,"    IM_PLACEMENT_NEW(self)"..def.stname..def.call_args..";\n")
-					table.insert(outtab,"}\n")
+					table.insert(tab,"CIMGUI_API void "..def.ov_cimguiname.."_Construct("..def.stname.."* self"..(empty and "" or ","..def.args:sub(2,-2))..")\n")
+					table.insert(tab,"{\n")
+					table.insert(tab,"    IM_PLACEMENT_NEW(self)"..def.stname..def.call_args..";\n")
+					table.insert(tab,"}\n")
 				end
+				table.insert(outtab, table.concat(tab, ""))
            elseif def.destructor then
+				local tab = {}
                local args = "("..def.stname.."* self)"
                local fname = def.stname.."_destroy" 
-                table.insert(outtab,"CIMGUI_API void "..fname..args.."\n")
-                table.insert(outtab,"{\n")
-                table.insert(outtab,"    IM_DELETE(self);\n")
-                table.insert(outtab,"}\n")
+                table.insert(tab,"CIMGUI_API void "..fname..args.."\n")
+                table.insert(tab,"{\n")
+                table.insert(tab,"    IM_DELETE(self);\n")
+                table.insert(tab,"}\n")
+				table.insert(outtab, table.concat(tab, ""))
            elseif def.stname == "" or def.is_static_function then
-                ImGui_f_implementation(outtab,def)
+                table.insert(outtab, ImGui_f_implementation(def))
            else -- stname
-                struct_f_implementation(outtab,def)
+                table.insert(outtab, struct_f_implementation(def))
            end
        end
+		if FP.custom_function_post then
+			FP:custom_function_post(outtab, def)
+		end
        until true
    end
    return table.concat(outtab)
@@ -2479,7 +2720,9 @@ local function func_header_generate_structs(FP)

    local outtab = {}

-	table_do_sorted(FP.embeded_structs,function(k,v) table.insert(outtab,"typedef "..v.." "..k..";\n") end)
+	table_do_sorted(FP.embeded_structs,function(k,v) 
+		table.insert(outtab,"typedef "..v.." "..k..";\n") 
+	end)
 	
 	table_do_sorted(FP.embeded_enums,function(k,v) table.insert(outtab,"typedef "..v.." "..k..";\n") end)
 	
@@ -2516,7 +2759,7 @@ local function func_header_generate_funcs(FP)
                assert(def.stname ~= "","constructor without struct")
                table.insert(outtab,"CIMGUI_API "..def.stname.."* "..def.ov_cimguiname ..(empty and "(void)" or def.args)..";"..addcoment.."\n")
 				if FP.CONSTRUCTORS_GENERATION then
-					table.insert(outtab,"CIMGUI_API void "..def.ov_cimguiname.."_Construct("..def.stname.."* self"..(empty and "" or ","..def.args:sub(2,-2))..");\n")
+					outtab[#outtab] = outtab[#outtab].."\nCIMGUI_API void "..def.ov_cimguiname.."_Construct("..def.stname.."* self"..(empty and "" or ","..def.args:sub(2,-2))..");\n"
 				end
            elseif def.destructor then
                table.insert(outtab,"CIMGUI_API void "..def.ov_cimguiname..def.args..";"..addcoment.."\n")
@@ -2529,9 +2772,13 @@ local function func_header_generate_funcs(FP)
                end
            end 
        end
+		if FP.custom_function_post then
+			FP:custom_function_post(outtab, def)
+		end
        else --not cimguiname
            table.insert(outtab,t.comment:gsub("%%","%%%%").."\n")-- %% substitution for gsub
        end
+		
    end

    return outtab
--- a/generator/generator.bat
+++ b/generator/generator.bat
@@ -15,11 +15,12 @@ set PATH=%PATH%;C:\anima;C:\mingws\i686-7.2.0-release-posix-dwarf-rt_v5-rev1\min
 :: set PATH=%PATH%;C:\luaGL\sources\luajit-master\luajit-master\bin\mingw32;C:\mingw32\bin;
 ::process  files
 :: arg[1] compiler name gcc, clang or cl
-:: arg[2] options as words in one string: internal for imgui_internal generation, freetype for freetype generation, comments for comments generation, nochar to skip char* function version, noimstrv to skip imstrv
+:: arg[2] options as words in one string: internal for imgui_internal generation, comments for comments generation, nochar to skip char* function version, noimstrv to skip imstrv
 :: "constructors" adds the _Construct version of constructors
-:: examples: "" "internal" "internal freetype comments"
-:: arg[3..n] name of implementations to generate and/or CFLAGS (e.g. -DIMGUI_USER_CONFIG or -DIMGUI_USE_WCHAR32)
-luajit ./generator.lua gcc "internal noimstrv" glfw opengl3 opengl2 sdl2 %*
+:: examples: "" "internal" "internal comments"
+:: arg[3..n] name of implementations to generate and/or CFLAGS (e.g. -DIMGUI_USER_CONFIG) 
+::-DIMGUI_USE_WCHAR32 should not be used (is discarded)
+luajit ./generator.lua gcc "internal noimstrv" glfw opengl3 opengl2 sdl2 sdl3 -DIMGUI_USE_WCHAR32 %*

 ::leave console open
 cmd /k
--- a/generator/generator.lua
+++ b/generator/generator.lua
@@ -7,7 +7,7 @@ assert(bit,"Must use LuaJIT")
 local script_args = {...}
 local COMPILER = script_args[1]
 local INTERNAL_GENERATION = script_args[2]:match("internal") and true or false
-local FREETYPE_GENERATION = script_args[2]:match("freetype") and true or false
+local FREETYPE_GENERATION = true --script_args[2]:match("freetype") and true or false
 local COMMENTS_GENERATION = script_args[2]:match("comments") and true or false
 local CONSTRUCTORS_GENERATION = script_args[2]:match("constructors") and true or false
 local NOCHAR = script_args[2]:match("nochar") and true or false
@@ -19,6 +19,9 @@ local CPRE,CTEST
 local implementations = {}
 for i=3,#script_args do
    if script_args[i]:match(COMPILER == "cl" and "^/" or "^%-") then
+		if script_args[i]:match("IMGUI_USE_WCHAR32") then
+			script_args[i] = "" --dont use this define
+		end
        local key, value = script_args[i]:match("^(.+)=(.+)$")
        if key and value then
            CFLAGS = CFLAGS .. " " .. key .. "=\"" .. value:gsub("\"", "\\\"") .. "\"";
@@ -31,11 +34,11 @@ for i=3,#script_args do
 end

 if FREETYPE_GENERATION then
-	CFLAGS = CFLAGS .. " -DIMGUI_ENABLE_FREETYPE "
+	CFLAGS = CFLAGS .. " -DIMGUI_ENABLE_FREETYPE -DIMGUI_ENABLE_STB_TRUETYPE" --both builders
 end

 if COMPILER == "gcc" or COMPILER == "clang" or COMPILER == "zig cc" then
-    CPRE = COMPILER..[[ -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ]] .. CFLAGS
+    CPRE = COMPILER..[[ -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API=""  ]] .. CFLAGS
    CTEST = COMPILER.." --version"
 elseif COMPILER == "cl" then
    CPRE = COMPILER..[[ /E /DIMGUI_DISABLE_OBSOLETE_FUNCTIONS /DIMGUI_DEBUG_PARANOID /DIMGUI_API="" /DIMGUI_IMPL_API="" ]] .. CFLAGS
@@ -214,6 +217,27 @@ local function DefsByStruct(FP)
    FP.defsBystruct = structs
 end  

+local function colapse_defines(str, define)
+	local num = 1
+	while num > 0 do
+		str,num = str:gsub("(#ifdef "..define..".+)".."(#endif\n+#ifdef "..define.."\n)", "%1")
+	end
+	return str
+end
+local wchardefine =
+[[
+
+#ifdef IMGUI_USE_WCHAR32            
+typedef ImWchar32 ImWchar;
+#else
+typedef ImWchar16 ImWchar;
+#endif
+#ifdef IMGUI_USE_WCHAR32
+#define IM_UNICODE_CODEPOINT_MAX     0x10FFFF   
+#else
+#define IM_UNICODE_CODEPOINT_MAX     0xFFFF  
+#endif
+	]]

 --generate cimgui.cpp cimgui.h 
 local function cimgui_generation(parser)
@@ -261,18 +285,27 @@ local function cimgui_generation(parser)
 		end
 	end
 	
+	cstructsstr = colapse_defines(cstructsstr, "IMGUI_ENABLE_FREETYPE")
+	
    hstrfile = hstrfile:gsub([[#include "imgui_structs%.h"]],cstructsstr)
    local cfuncsstr = func_header_generate(parser)
+	cfuncsstr = colapse_defines(cfuncsstr, "IMGUI_ENABLE_FREETYPE")
    hstrfile = hstrfile:gsub([[#include "auto_funcs%.h"]],cfuncsstr)
+	--patch hstrfile for ImWchar
+	local num
+	hstrfile, num = hstrfile:gsub("typedef ImWchar16 ImWchar;", wchardefine)
+	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
    local cimplem = func_implementation(parser)
-
+	cimplem = colapse_defines(cimplem, "IMGUI_ENABLE_FREETYPE")
    local hstrfile = read_data"./cimgui_template.cpp"

    hstrfile = hstrfile:gsub([[#include "auto_funcs%.cpp"]],cimplem)
-	local ftdef = FREETYPE_GENERATION and "#define IMGUI_ENABLE_FREETYPE\n" or ""
+	local ftdef = "" --FREETYPE_GENERATION and "#define IMGUI_ENABLE_FREETYPE\n" or ""
    save_data("./output/cimgui.cpp",cimgui_header, ftdef, hstrfile)

 end
@@ -307,6 +340,20 @@ print("NOIMSTRV",NOIMSTRV)
 print("IMGUI_HAS_DOCK",gdefines.IMGUI_HAS_DOCK)
 print("IMGUI_VERSION",gdefines.IMGUI_VERSION)

+local function custom_function_post(self, outtab, def)
+	assert(def.location)
+	if def.location:match("imgui_freetype") then 
+		outtab[#outtab] = "#ifdef IMGUI_ENABLE_FREETYPE\n"..outtab[#outtab].."\n#endif\n"
+	end
+end
+local function header_text_insert(self, outtab, txt, it)
+	assert(it.locat)
+	if it.locat:match("imgui_freetype") then 
+		table.insert(outtab, "\n#ifdef IMGUI_ENABLE_FREETYPE"..txt.."\n#endif")
+	else
+		table.insert(outtab, txt)
+	end
+end

 --funtion for parsing imgui headers
 local function parseImGuiHeader(header,names)
@@ -318,7 +365,8 @@ local function parseImGuiHeader(header,names)
 		return pre..funcname
 	end
 	parser.cname_overloads = cimgui_overloads
-	parser.manuals = cimgui_manuals
+	--parser.manuals = cimgui_manuals
+	parser:set_manuals(cimgui_manuals, "cimgui")
 	parser.skipped = cimgui_skipped
 	parser.UDTs = {"ImVec2","ImVec4","ImColor","ImRect"}
 	--parser.gen_template_typedef = gen_template_typedef --use auto
@@ -326,6 +374,8 @@ local function parseImGuiHeader(header,names)
 	parser.CONSTRUCTORS_GENERATION = CONSTRUCTORS_GENERATION
 	parser.NOCHAR = NOCHAR
 	parser.NOIMSTRV = NOIMSTRV
+	parser.custom_function_post = custom_function_post
+	parser.header_text_insert = header_text_insert
 	local defines = parser:take_lines(CPRE..header,names,COMPILER)
 	
 	return parser
--- a/generator/generator.sh
+++ b/generator/generator.sh
@@ -13,10 +13,11 @@

 #process  files
 # arg[1] compiler name gcc, clang, or cl
-# arg[2] options as words in one string: internal for imgui_internal generation, freetype for freetype generation, comments for comments generation, nochar to skip char* function version, noimstrv to skip imstrv
+# arg[2] options as words in one string: internal for imgui_internal generation, comments for comments generation, nochar to skip char* function version, noimstrv to skip imstrv
 # "constructors" adds the _Construct version of constructors
-# examples: "" "internal" "internal freetype" "comments internal"
-# arg[3..n] name of implementations to generate and/or CLFLAGS (e.g. -DIMGUI_USER_CONFIG or -DIMGUI_USE_WCHAR32)
+# examples: "" "internal" "comments internal"
+# arg[3..n] name of implementations to generate and/or CLFLAGS (e.g. -DIMGUI_USER_CONFIG)
+# -DIMGUI_USE_WCHAR32 should not be used as it is generated for both ImWchar
 #

 # parse command line arguments
@@ -24,7 +25,7 @@
 POSITIONAL_ARGS=()

 TARGETS="internal noimstrv"
-CFLAGS="glfw opengl3 opengl2 sdl2"
+CFLAGS="glfw opengl3 opengl2 sdl2 sdl3"

 help() {
        cat <<EOF
--- a/generator/output/cimgui_impl.h
+++ b/generator/output/cimgui_impl.h
@@ -65,3 +65,25 @@ CIMGUI_API bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event);
 CIMGUI_API void ImGui_ImplSDL2_SetGamepadMode(ImGui_ImplSDL2_GamepadMode mode,struct _SDL_GameController** manual_gamepads_array,int manual_gamepads_count);

 #endif
+#ifdef CIMGUI_USE_SDL3
+
+typedef struct SDL_Window SDL_Window;
+typedef struct SDL_Renderer SDL_Renderer;
+typedef struct SDL_Gamepad SDL_Gamepad;
+struct SDL_Window;
+struct SDL_Renderer;
+struct SDL_Gamepad;
+typedef union SDL_Event SDL_Event;
+typedef enum { ImGui_ImplSDL3_GamepadMode_AutoFirst, ImGui_ImplSDL3_GamepadMode_AutoAll, ImGui_ImplSDL3_GamepadMode_Manual }ImGui_ImplSDL3_GamepadMode;CIMGUI_API bool ImGui_ImplSDL3_InitForOpenGL(SDL_Window* window,void* sdl_gl_context);
+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);
+CIMGUI_API bool ImGui_ImplSDL3_ProcessEvent(const SDL_Event* event);
+CIMGUI_API void ImGui_ImplSDL3_SetGamepadMode(ImGui_ImplSDL3_GamepadMode mode,SDL_Gamepad** manual_gamepads_array,int manual_gamepads_count);
+
+#endif
--- 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:36",
+      "location": "imgui_impl_opengl2:38",
      "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:34",
+      "location": "imgui_impl_opengl2:36",
      "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:37",
+      "location": "imgui_impl_opengl2:39",
      "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:35",
+      "location": "imgui_impl_opengl2:37",
      "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:28",
+      "location": "imgui_impl_opengl2:30",
      "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:30",
+      "location": "imgui_impl_opengl2:32",
      "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:31",
+      "location": "imgui_impl_opengl2:33",
      "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:29",
+      "location": "imgui_impl_opengl2:31",
      "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",
@@ -909,5 +909,245 @@
      "signature": "()",
      "stname": ""
    }
+  ],
+  "ImGui_ImplSDL3_InitForD3D": [
+    {
+      "args": "(SDL_Window* window)",
+      "argsT": [
+        {
+          "name": "window",
+          "type": "SDL_Window*"
+        }
+      ],
+      "argsoriginal": "(SDL_Window* window)",
+      "call_args": "(window)",
+      "cimguiname": "ImGui_ImplSDL3_InitForD3D",
+      "defaults": {},
+      "funcname": "ImGui_ImplSDL3_InitForD3D",
+      "location": "imgui_impl_sdl3:35",
+      "ov_cimguiname": "ImGui_ImplSDL3_InitForD3D",
+      "ret": "bool",
+      "signature": "(SDL_Window*)",
+      "stname": ""
+    }
+  ],
+  "ImGui_ImplSDL3_InitForMetal": [
+    {
+      "args": "(SDL_Window* window)",
+      "argsT": [
+        {
+          "name": "window",
+          "type": "SDL_Window*"
+        }
+      ],
+      "argsoriginal": "(SDL_Window* window)",
+      "call_args": "(window)",
+      "cimguiname": "ImGui_ImplSDL3_InitForMetal",
+      "defaults": {},
+      "funcname": "ImGui_ImplSDL3_InitForMetal",
+      "location": "imgui_impl_sdl3:36",
+      "ov_cimguiname": "ImGui_ImplSDL3_InitForMetal",
+      "ret": "bool",
+      "signature": "(SDL_Window*)",
+      "stname": ""
+    }
+  ],
+  "ImGui_ImplSDL3_InitForOpenGL": [
+    {
+      "args": "(SDL_Window* window,void* sdl_gl_context)",
+      "argsT": [
+        {
+          "name": "window",
+          "type": "SDL_Window*"
+        },
+        {
+          "name": "sdl_gl_context",
+          "type": "void*"
+        }
+      ],
+      "argsoriginal": "(SDL_Window* window,void* sdl_gl_context)",
+      "call_args": "(window,sdl_gl_context)",
+      "cimguiname": "ImGui_ImplSDL3_InitForOpenGL",
+      "defaults": {},
+      "funcname": "ImGui_ImplSDL3_InitForOpenGL",
+      "location": "imgui_impl_sdl3:33",
+      "ov_cimguiname": "ImGui_ImplSDL3_InitForOpenGL",
+      "ret": "bool",
+      "signature": "(SDL_Window*,void*)",
+      "stname": ""
+    }
+  ],
+  "ImGui_ImplSDL3_InitForOther": [
+    {
+      "args": "(SDL_Window* window)",
+      "argsT": [
+        {
+          "name": "window",
+          "type": "SDL_Window*"
+        }
+      ],
+      "argsoriginal": "(SDL_Window* window)",
+      "call_args": "(window)",
+      "cimguiname": "ImGui_ImplSDL3_InitForOther",
+      "defaults": {},
+      "funcname": "ImGui_ImplSDL3_InitForOther",
+      "location": "imgui_impl_sdl3:39",
+      "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:38",
+      "ov_cimguiname": "ImGui_ImplSDL3_InitForSDLGPU",
+      "ret": "bool",
+      "signature": "(SDL_Window*)",
+      "stname": ""
+    }
+  ],
+  "ImGui_ImplSDL3_InitForSDLRenderer": [
+    {
+      "args": "(SDL_Window* window,SDL_Renderer* renderer)",
+      "argsT": [
+        {
+          "name": "window",
+          "type": "SDL_Window*"
+        },
+        {
+          "name": "renderer",
+          "type": "SDL_Renderer*"
+        }
+      ],
+      "argsoriginal": "(SDL_Window* window,SDL_Renderer* renderer)",
+      "call_args": "(window,renderer)",
+      "cimguiname": "ImGui_ImplSDL3_InitForSDLRenderer",
+      "defaults": {},
+      "funcname": "ImGui_ImplSDL3_InitForSDLRenderer",
+      "location": "imgui_impl_sdl3:37",
+      "ov_cimguiname": "ImGui_ImplSDL3_InitForSDLRenderer",
+      "ret": "bool",
+      "signature": "(SDL_Window*,SDL_Renderer*)",
+      "stname": ""
+    }
+  ],
+  "ImGui_ImplSDL3_InitForVulkan": [
+    {
+      "args": "(SDL_Window* window)",
+      "argsT": [
+        {
+          "name": "window",
+          "type": "SDL_Window*"
+        }
+      ],
+      "argsoriginal": "(SDL_Window* window)",
+      "call_args": "(window)",
+      "cimguiname": "ImGui_ImplSDL3_InitForVulkan",
+      "defaults": {},
+      "funcname": "ImGui_ImplSDL3_InitForVulkan",
+      "location": "imgui_impl_sdl3:34",
+      "ov_cimguiname": "ImGui_ImplSDL3_InitForVulkan",
+      "ret": "bool",
+      "signature": "(SDL_Window*)",
+      "stname": ""
+    }
+  ],
+  "ImGui_ImplSDL3_NewFrame": [
+    {
+      "args": "()",
+      "argsT": [],
+      "argsoriginal": "()",
+      "call_args": "()",
+      "cimguiname": "ImGui_ImplSDL3_NewFrame",
+      "defaults": {},
+      "funcname": "ImGui_ImplSDL3_NewFrame",
+      "location": "imgui_impl_sdl3:41",
+      "ov_cimguiname": "ImGui_ImplSDL3_NewFrame",
+      "ret": "void",
+      "signature": "()",
+      "stname": ""
+    }
+  ],
+  "ImGui_ImplSDL3_ProcessEvent": [
+    {
+      "args": "(const SDL_Event* event)",
+      "argsT": [
+        {
+          "name": "event",
+          "type": "const SDL_Event*"
+        }
+      ],
+      "argsoriginal": "(const SDL_Event* event)",
+      "call_args": "(event)",
+      "cimguiname": "ImGui_ImplSDL3_ProcessEvent",
+      "defaults": {},
+      "funcname": "ImGui_ImplSDL3_ProcessEvent",
+      "location": "imgui_impl_sdl3:42",
+      "ov_cimguiname": "ImGui_ImplSDL3_ProcessEvent",
+      "ret": "bool",
+      "signature": "(const SDL_Event*)",
+      "stname": ""
+    }
+  ],
+  "ImGui_ImplSDL3_SetGamepadMode": [
+    {
+      "args": "(ImGui_ImplSDL3_GamepadMode mode,SDL_Gamepad** manual_gamepads_array,int manual_gamepads_count)",
+      "argsT": [
+        {
+          "name": "mode",
+          "type": "ImGui_ImplSDL3_GamepadMode"
+        },
+        {
+          "name": "manual_gamepads_array",
+          "type": "SDL_Gamepad**"
+        },
+        {
+          "name": "manual_gamepads_count",
+          "type": "int"
+        }
+      ],
+      "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": "nullptr",
+        "manual_gamepads_count": "-1"
+      },
+      "funcname": "ImGui_ImplSDL3_SetGamepadMode",
+      "location": "imgui_impl_sdl3:47",
+      "ov_cimguiname": "ImGui_ImplSDL3_SetGamepadMode",
+      "ret": "void",
+      "signature": "(ImGui_ImplSDL3_GamepadMode,SDL_Gamepad**,int)",
+      "stname": ""
+    }
+  ],
+  "ImGui_ImplSDL3_Shutdown": [
+    {
+      "args": "()",
+      "argsT": [],
+      "argsoriginal": "()",
+      "call_args": "()",
+      "cimguiname": "ImGui_ImplSDL3_Shutdown",
+      "defaults": {},
+      "funcname": "ImGui_ImplSDL3_Shutdown",
+      "location": "imgui_impl_sdl3:40",
+      "ov_cimguiname": "ImGui_ImplSDL3_Shutdown",
+      "ret": "void",
+      "signature": "()",
+      "stname": ""
+    }
  ]
 }
--- a/generator/output/impl_definitions.lua
+++ b/generator/output/impl_definitions.lua
--- a/generator/output/overloads.txt
+++ b/generator/output/overloads.txt
@@ -7,7 +7,7 @@ ImColor_ImColor	5
 5	nil	ImColor_ImColor_U32 (ImU32)
 ImDrawList_AddText	2
 1	void	ImDrawList_AddText_Vec2 (const ImVec2,ImU32,const char*,const char*)
-2	void	ImDrawList_AddText_FontPtr (const ImFont*,float,const ImVec2,ImU32,const char*,const char*,float,const ImVec4*)
+2	void	ImDrawList_AddText_FontPtr (ImFont*,float,const ImVec2,ImU32,const char*,const char*,float,const ImVec4*)
 ImGuiPtrOrIndex_ImGuiPtrOrIndex	2
 1	nil	ImGuiPtrOrIndex_ImGuiPtrOrIndex_Ptr (void*)
 2	nil	ImGuiPtrOrIndex_ImGuiPtrOrIndex_Int (int)
--- a/generator/output/structs_and_enums.json
+++ b/generator/output/structs_and_enums.json
--- 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
@@ -1,9 +1,9 @@
 {
-  "ImBitArrayForNamedKeys": "ImBitArray<ImGuiKey_NamedKey_COUNT,-ImGuiKey_NamedKey_BEGIN>",
+  "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);",
+  "ImDrawCallback": "void (*)(const ImDrawList* parent_list, const ImDrawCmd* cmd);",
  "ImDrawChannel": "struct ImDrawChannel",
  "ImDrawCmd": "struct ImDrawCmd",
  "ImDrawCmdHeader": "struct ImDrawCmdHeader",
@@ -39,16 +39,17 @@
  "ImGuiConfigFlags": "int",
  "ImGuiContext": "struct ImGuiContext",
  "ImGuiContextHook": "struct ImGuiContextHook",
-  "ImGuiContextHookCallback": "void(*)(ImGuiContext* ctx,ImGuiContextHook* hook);",
+  "ImGuiContextHookCallback": "void (*)(ImGuiContext* ctx, ImGuiContextHook* hook);",
  "ImGuiDataType": "int",
  "ImGuiDataTypeInfo": "struct ImGuiDataTypeInfo",
  "ImGuiDataTypeStorage": "struct ImGuiDataTypeStorage",
  "ImGuiDataVarInfo": "struct ImGuiDataVarInfo",
+  "ImGuiDeactivatedItemData": "struct ImGuiDeactivatedItemData",
  "ImGuiDebugAllocEntry": "struct ImGuiDebugAllocEntry",
  "ImGuiDebugAllocInfo": "struct ImGuiDebugAllocInfo",
  "ImGuiDebugLogFlags": "int",
  "ImGuiDragDropFlags": "int",
-  "ImGuiErrorCallback": "void(*)(ImGuiContext* ctx,void* user_data,const char* msg);",
+  "ImGuiErrorCallback": "void (*)(ImGuiContext* ctx, void* user_data, const char* msg);",
  "ImGuiErrorRecoveryState": "struct ImGuiErrorRecoveryState",
  "ImGuiFocusRequestFlags": "int",
  "ImGuiFocusScopeData": "struct ImGuiFocusScopeData",
@@ -66,7 +67,7 @@
  "ImGuiInputEventMouseWheel": "struct ImGuiInputEventMouseWheel",
  "ImGuiInputEventText": "struct ImGuiInputEventText",
  "ImGuiInputFlags": "int",
-  "ImGuiInputTextCallback": "int(*)(ImGuiInputTextCallbackData* data);",
+  "ImGuiInputTextCallback": "int (*)(ImGuiInputTextCallbackData* data);",
  "ImGuiInputTextCallbackData": "struct ImGuiInputTextCallbackData",
  "ImGuiInputTextDeactivateData": "struct ImGuiInputTextDeactivateData",
  "ImGuiInputTextDeactivatedState": "struct ImGuiInputTextDeactivatedState",
@@ -86,8 +87,9 @@
  "ImGuiListClipperData": "struct ImGuiListClipperData",
  "ImGuiListClipperRange": "struct ImGuiListClipperRange",
  "ImGuiLocEntry": "struct ImGuiLocEntry",
-  "ImGuiMemAllocFunc": "void*(*)(size_t sz,void* user_data);",
-  "ImGuiMemFreeFunc": "void(*)(void* ptr,void* user_data);",
+  "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",
@@ -96,9 +98,9 @@
  "ImGuiMultiSelectIO": "struct ImGuiMultiSelectIO",
  "ImGuiMultiSelectState": "struct ImGuiMultiSelectState",
  "ImGuiMultiSelectTempData": "struct ImGuiMultiSelectTempData",
-  "ImGuiNavHighlightFlags": "int",
  "ImGuiNavItemData": "struct ImGuiNavItemData",
  "ImGuiNavMoveFlags": "int",
+  "ImGuiNavRenderCursorFlags": "int",
  "ImGuiNextItemData": "struct ImGuiNextItemData",
  "ImGuiNextItemDataFlags": "int",
  "ImGuiNextWindowData": "struct ImGuiNextWindowData",
@@ -122,7 +124,7 @@
  "ImGuiSeparatorFlags": "int",
  "ImGuiSettingsHandler": "struct ImGuiSettingsHandler",
  "ImGuiShrinkWidthItem": "struct ImGuiShrinkWidthItem",
-  "ImGuiSizeCallback": "void(*)(ImGuiSizeCallbackData* data);",
+  "ImGuiSizeCallback": "void (*)(ImGuiSizeCallbackData* data);",
  "ImGuiSizeCallbackData": "struct ImGuiSizeCallbackData",
  "ImGuiSliderFlags": "int",
  "ImGuiStackLevelInfo": "struct ImGuiStackLevelInfo",
@@ -179,7 +181,7 @@
  "ImS64": "signed long long",
  "ImS8": "signed char",
  "ImStbTexteditState": "ImStb::STB_TexteditState",
-  "ImTextureID": "void*",
+  "ImTextureID": "ImU64",
  "ImU16": "unsigned short",
  "ImU32": "unsigned int",
  "ImU64": "unsigned long long",
@@ -191,8 +193,5 @@
  "ImWchar": "ImWchar16",
  "ImWchar16": "unsigned short",
  "ImWchar32": "unsigned int",
-  "STB_TexteditState": "struct STB_TexteditState",
-  "const_iterator": "const value_type*",
-  "iterator": "value_type*",
-  "value_type": "T"
+  "STB_TexteditState": "struct STB_TexteditState"
 }
--- a/generator/output/typedefs_dict.lua
+++ b/generator/output/typedefs_dict.lua
@@ -1,199 +1,197 @@
-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["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["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["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["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["ImGuiNavHighlightFlags"] = "int"
-defs["ImGuiNavItemData"] = "struct ImGuiNavItemData"
-defs["ImGuiNavMoveFlags"] = "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["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["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"] = "void*"
-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"
-defs["const_iterator"] = "const value_type*"
-defs["iterator"] = "value_type*"
-defs["value_type"] = "T"
-
-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);",
+  ImGuiDataType="int",
+  ImGuiDataTypeInfo="struct ImGuiDataTypeInfo",
+  ImGuiDataTypeStorage="struct ImGuiDataTypeStorage",
+  ImGuiDataVarInfo="struct ImGuiDataVarInfo",
+  ImGuiDeactivatedItemData="struct ImGuiDeactivatedItemData",
+  ImGuiDebugAllocEntry="struct ImGuiDebugAllocEntry",
+  ImGuiDebugAllocInfo="struct ImGuiDebugAllocInfo",
+  ImGuiDebugLogFlags="int",
+  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",
+  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",
+  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",
+  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	1427639147	Merge branch 'docking_inter'	2025-01-21 16:06:26 +01:00
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	e3b48a15f0	Merge branch 'docking_inter'	2024-12-12 13:20:21 +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
sonoro1234	8ec6558ecc	Merge branch 'docking_inter'	2024-11-18 18:26:51 +01:00
sonoro1234	4e89eac938	pull imgui docking 1.91.5 and generate	2024-11-18 18:20:25 +01:00
sonoro1234	bd2ea2acbb	cpp2ffi: move typedefs_dict to gen_structs_and_enums_table	2024-11-06 16:36:29 +01:00
sonoro1234	69d3b29392	update README.md	2024-11-05 16:34:30 +01:00
sonoro1234	1c3d694f36	generator: _destroy functions get location IMGUI_USE_FREETYPE and IMGUI_USE_WCHAR32 are build options now. cmake takes IMGUI_FREETYPE and IMGUI_WCHAR32	2024-11-05 16:30:47 +01:00
sonoro1234	be19fd11eb	cpp2ffi.lua, generator ... :get manual funcs args and ret	2024-11-01 13:47:14 +01:00
sonoro1234	fdd07821bb	CMakeLists.txt: add cimconfig.h to #undef NDEBUG even in release mode https://github.com/ocornut/imgui/issues/8078	2024-10-21 09:59:59 +02:00
sonoro1234	43429513a8	Merge branch 'docking_inter'	2024-10-19 12:05:11 +02:00
sonoro1234	7640b00d27	pull imgui docking 1.91.4 and generate	2024-10-19 11:48:14 +02:00
sonoro1234	90f2147dbe	generator: add sdl3 and generate	2024-10-12 11:52:55 +02:00