pull imgui 1.89.6 and generate

clean debug output
solve union with comments #241
2025-08-10 20:08:31 +01:00 · 2023-06-18 18:57:27 +02:00 · 2023-06-18 18:56:17 +02:00 · 2023-06-18 18:50:28 +02:00 · 2023-04-22 14:03:40 +02:00 · 2023-04-18 10:35:57 +02:00
19 changed files with 5566 additions and 4327 deletions
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ History:
 Initially cimgui was developed by Stephan Dilly as hand-written code but lately turned into an auto-generated version by sonoro1234 in order to keep up with imgui more easily (letting the user select the desired branch and commit)

 Notes:
-* currently this wrapper is based on version [1.89.3 of Dear ImGui with internal api]
+* currently this wrapper is based on version [1.89.6 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.
@@ -42,8 +42,9 @@ Notes:
 * 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 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 or -DIMGUI_USE_WCHAR32)
+* 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
 * C interface is exposed by cimgui.h when you define CIMGUI_DEFINE_ENUMS_AND_STRUCTS
 * with your prefered language you can use the lua or json files generated as in:
--- a/backend_test/example_sdl_opengl3/CMakeLists.txt
+++ b/backend_test/example_sdl_opengl3/CMakeLists.txt
@@ -103,7 +103,7 @@ target_link_libraries(cimgui_sdl ${IMGUI_LIBRARIES} ${IMGUI_SDL_LIBRARY})
 #using library
 include_directories(../../generator/output/)
 add_executable(test_sdl main.c)
-target_compile_definitions(test_sdl PUBLIC -DCIMGUI_USE_OPENGL3 -DCIMGUI_USE_SDL)
+target_compile_definitions(test_sdl PUBLIC -DCIMGUI_USE_OPENGL3 -DCIMGUI_USE_SDL2)
 if (MINGW)
 target_link_options(test_sdl PRIVATE "-mconsole")
 endif()
--- a/backend_test/example_sdl_vulkan/CMakeLists.txt
+++ b/backend_test/example_sdl_vulkan/CMakeLists.txt
@@ -92,7 +92,7 @@ target_link_libraries(cimgui_sdl ${IMGUI_LIBRARIES} ${IMGUI_SDL_LIBRARY})
 #using library
 include_directories(../../generator/output/)
 add_executable(test_sdl main.c)
-target_compile_definitions(test_sdl PUBLIC -DCIMGUI_USE_VULKAN -DCIMGUI_USE_SDL)
+target_compile_definitions(test_sdl PUBLIC -DCIMGUI_USE_VULKAN -DCIMGUI_USE_SDL2)
 if (MINGW)
 target_link_options(test_sdl PRIVATE "-mconsole")
 endif()
--- a/cimgui.cpp
+++ b/cimgui.cpp
@@ -1,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.89.3" 18930 from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.89.6" 18960 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 //docking branch
 #ifdef IMGUI_ENABLE_FREETYPE
@@ -360,13 +360,13 @@ CIMGUI_API void igPopStyleVar(int count)
 {
    return ImGui::PopStyleVar(count);
 }
-CIMGUI_API void igPushAllowKeyboardFocus(bool allow_keyboard_focus)
+CIMGUI_API void igPushTabStop(bool tab_stop)
 {
-    return ImGui::PushAllowKeyboardFocus(allow_keyboard_focus);
+    return ImGui::PushTabStop(tab_stop);
 }
-CIMGUI_API void igPopAllowKeyboardFocus()
+CIMGUI_API void igPopTabStop()
 {
-    return ImGui::PopAllowKeyboardFocus();
+    return ImGui::PopTabStop();
 }
 CIMGUI_API void igPushButtonRepeat(bool repeat)
 {
@@ -1054,7 +1054,7 @@ CIMGUI_API bool igMenuItem_BoolPtr(const char* label,const char* shortcut,bool*
 {
    return ImGui::MenuItem(label,shortcut,p_selected,enabled);
 }
-CIMGUI_API void igBeginTooltip()
+CIMGUI_API bool igBeginTooltip()
 {
    return ImGui::BeginTooltip();
 }
@@ -1685,6 +1685,10 @@ CIMGUI_API void ImGuiIO_AddMouseWheelEvent(ImGuiIO* self,float wheel_x,float whe
 {
    return self->AddMouseWheelEvent(wheel_x,wheel_y);
 }
+CIMGUI_API void ImGuiIO_AddMouseSourceEvent(ImGuiIO* self,ImGuiMouseSource source)
+{
+    return self->AddMouseSourceEvent(source);
+}
 CIMGUI_API void ImGuiIO_AddMouseViewportEvent(ImGuiIO* self,ImGuiID id)
 {
    return self->AddMouseViewportEvent(id);
@@ -2001,9 +2005,9 @@ CIMGUI_API bool ImGuiListClipper_Step(ImGuiListClipper* self)
 {
    return self->Step();
 }
-CIMGUI_API void ImGuiListClipper_ForceDisplayRangeByIndices(ImGuiListClipper* self,int item_min,int item_max)
+CIMGUI_API void ImGuiListClipper_IncludeRangeByIndices(ImGuiListClipper* self,int item_begin,int item_end)
 {
-    return self->ForceDisplayRangeByIndices(item_min,item_max);
+    return self->IncludeRangeByIndices(item_begin,item_end);
 }
 CIMGUI_API ImColor* ImColor_ImColor_Nil(void)
 {
@@ -3000,10 +3004,6 @@ CIMGUI_API float igImTriangleArea(const ImVec2 a,const ImVec2 b,const ImVec2 c)
 {
    return ImTriangleArea(a,b,c);
 }
-CIMGUI_API ImGuiDir igImGetDirQuadrantFromDelta(float dx,float dy)
-{
-    return ImGetDirQuadrantFromDelta(dx,dy);
-}
 CIMGUI_API ImVec1* ImVec1_ImVec1_Nil(void)
 {
    return IM_NEW(ImVec1)();
@@ -3240,6 +3240,10 @@ CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self
 {
    return self->FlattenIntoSingleLayer();
 }
+CIMGUI_API void* ImGuiDataVarInfo_GetVarPtr(ImGuiDataVarInfo* self,void* parent)
+{
+    return self->GetVarPtr(parent);
+}
 CIMGUI_API ImGuiStyleMod* ImGuiStyleMod_ImGuiStyleMod_Int(ImGuiStyleVar idx,int v)
 {
    return IM_NEW(ImGuiStyleMod)(idx,v);
@@ -3284,9 +3288,21 @@ CIMGUI_API void ImGuiMenuColumns_CalcNextTotalWidth(ImGuiMenuColumns* self,bool
 {
    return self->CalcNextTotalWidth(update_offsets);
 }
-CIMGUI_API ImGuiInputTextState* ImGuiInputTextState_ImGuiInputTextState(ImGuiContext* ctx)
+CIMGUI_API ImGuiInputTextDeactivatedState* ImGuiInputTextDeactivatedState_ImGuiInputTextDeactivatedState(void)
 {
-    return IM_NEW(ImGuiInputTextState)(ctx);
+    return IM_NEW(ImGuiInputTextDeactivatedState)();
+}
+CIMGUI_API void ImGuiInputTextDeactivatedState_destroy(ImGuiInputTextDeactivatedState* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImGuiInputTextDeactivatedState_ClearFreeMemory(ImGuiInputTextDeactivatedState* self)
+{
+    return self->ClearFreeMemory();
+}
+CIMGUI_API ImGuiInputTextState* ImGuiInputTextState_ImGuiInputTextState(void)
+{
+    return IM_NEW(ImGuiInputTextState)();
 }
 CIMGUI_API void ImGuiInputTextState_destroy(ImGuiInputTextState* self)
 {
@@ -3392,13 +3408,13 @@ CIMGUI_API void ImGuiStackSizes_destroy(ImGuiStackSizes* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API void ImGuiStackSizes_SetToCurrentState(ImGuiStackSizes* self)
+CIMGUI_API void ImGuiStackSizes_SetToContextState(ImGuiStackSizes* self,ImGuiContext* ctx)
 {
-    return self->SetToCurrentState();
+    return self->SetToContextState(ctx);
 }
-CIMGUI_API void ImGuiStackSizes_CompareWithCurrentState(ImGuiStackSizes* self)
+CIMGUI_API void ImGuiStackSizes_CompareWithContextState(ImGuiStackSizes* self,ImGuiContext* ctx)
 {
-    return self->CompareWithCurrentState();
+    return self->CompareWithContextState(ctx);
 }
 CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndex_Ptr(void* ptr)
 {
@@ -3820,6 +3836,10 @@ CIMGUI_API void igSetWindowHitTestHole(ImGuiWindow* window,const ImVec2 pos,cons
 {
    return ImGui::SetWindowHitTestHole(window,pos,size);
 }
+CIMGUI_API void igSetWindowHiddendAndSkipItemsForCurrentFrame(ImGuiWindow* window)
+{
+    return ImGui::SetWindowHiddendAndSkipItemsForCurrentFrame(window);
+}
 CIMGUI_API void igWindowRectAbsToRel(ImRect *pOut,ImGuiWindow* window,const ImRect r)
 {
    *pOut = ImGui::WindowRectAbsToRel(window,r);
@@ -3828,13 +3848,17 @@ CIMGUI_API void igWindowRectRelToAbs(ImRect *pOut,ImGuiWindow* window,const ImRe
 {
    *pOut = ImGui::WindowRectRelToAbs(window,r);
 }
-CIMGUI_API void igFocusWindow(ImGuiWindow* window)
+CIMGUI_API void igWindowPosRelToAbs(ImVec2 *pOut,ImGuiWindow* window,const ImVec2 p)
 {
-    return ImGui::FocusWindow(window);
+    *pOut = ImGui::WindowPosRelToAbs(window,p);
 }
-CIMGUI_API void igFocusTopMostWindowUnderOne(ImGuiWindow* under_this_window,ImGuiWindow* ignore_window)
+CIMGUI_API void igFocusWindow(ImGuiWindow* window,ImGuiFocusRequestFlags flags)
 {
-    return ImGui::FocusTopMostWindowUnderOne(under_this_window,ignore_window);
+    return ImGui::FocusWindow(window,flags);
+}
+CIMGUI_API void igFocusTopMostWindowUnderOne(ImGuiWindow* under_this_window,ImGuiWindow* ignore_window,ImGuiViewport* filter_viewport,ImGuiFocusRequestFlags flags)
+{
+    return ImGui::FocusTopMostWindowUnderOne(under_this_window,ignore_window,filter_viewport,flags);
 }
 CIMGUI_API void igBringWindowToFocusFront(ImGuiWindow* window)
 {
@@ -4096,6 +4120,10 @@ CIMGUI_API bool igItemHoverable(const ImRect bb,ImGuiID id)
 {
    return ImGui::ItemHoverable(bb,id);
 }
+CIMGUI_API bool igIsWindowContentHoverable(ImGuiWindow* window,ImGuiHoveredFlags flags)
+{
+    return ImGui::IsWindowContentHoverable(window,flags);
+}
 CIMGUI_API bool igIsClippedEx(const ImRect bb,ImGuiID id)
 {
    return ImGui::IsClippedEx(bb,id);
@@ -4136,6 +4164,10 @@ CIMGUI_API void igPopItemFlag()
 {
    return ImGui::PopItemFlag();
 }
+CIMGUI_API const ImGuiDataVarInfo* igGetStyleVarInfo(ImGuiStyleVar idx)
+{
+    return ImGui::GetStyleVarInfo(idx);
+}
 CIMGUI_API void igLogBegin(ImGuiLogType type,int auto_open_depth)
 {
    return ImGui::LogBegin(type,auto_open_depth);
@@ -4180,7 +4212,7 @@ CIMGUI_API bool igBeginPopupEx(ImGuiID id,ImGuiWindowFlags extra_flags)
 {
    return ImGui::BeginPopupEx(id,extra_flags);
 }
-CIMGUI_API void igBeginTooltipEx(ImGuiTooltipFlags tooltip_flags,ImGuiWindowFlags extra_window_flags)
+CIMGUI_API bool igBeginTooltipEx(ImGuiTooltipFlags tooltip_flags,ImGuiWindowFlags extra_window_flags)
 {
    return ImGui::BeginTooltipEx(tooltip_flags,extra_window_flags);
 }
@@ -4196,6 +4228,10 @@ CIMGUI_API ImGuiWindow* igGetTopMostAndVisiblePopupModal()
 {
    return ImGui::GetTopMostAndVisiblePopupModal();
 }
+CIMGUI_API ImGuiWindow* igFindBlockingModal(ImGuiWindow* window)
+{
+    return ImGui::FindBlockingModal(window);
+}
 CIMGUI_API void igFindBestWindowPosForPopup(ImVec2 *pOut,ImGuiWindow* window)
 {
    *pOut = ImGui::FindBestWindowPosForPopup(window);
@@ -4264,6 +4300,14 @@ CIMGUI_API void igNavMoveRequestTryWrapping(ImGuiWindow* window,ImGuiNavMoveFlag
 {
    return ImGui::NavMoveRequestTryWrapping(window,move_flags);
 }
+CIMGUI_API void igNavClearPreferredPosForAxis(ImGuiAxis axis)
+{
+    return ImGui::NavClearPreferredPosForAxis(axis);
+}
+CIMGUI_API void igNavUpdateCurrentWindowIsScrollPushableX()
+{
+    return ImGui::NavUpdateCurrentWindowIsScrollPushableX();
+}
 CIMGUI_API void igActivateItem(ImGuiID id)
 {
    return ImGui::ActivateItem(id);
@@ -4308,11 +4352,15 @@ CIMGUI_API ImGuiKeyChord igConvertShortcutMod(ImGuiKeyChord key_chord)
 {
    return ImGui::ConvertShortcutMod(key_chord);
 }
-CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiKey key)
+CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiContext* ctx,ImGuiKey key)
 {
-    return ImGui::ConvertSingleModFlagToKey(key);
+    return ImGui::ConvertSingleModFlagToKey(ctx,key);
 }
-CIMGUI_API ImGuiKeyData* igGetKeyData(ImGuiKey key)
+CIMGUI_API ImGuiKeyData* igGetKeyData_ContextPtr(ImGuiContext* ctx,ImGuiKey key)
+{
+    return ImGui::GetKeyData(ctx,key);
+}
+CIMGUI_API ImGuiKeyData* igGetKeyData_Key(ImGuiKey key)
 {
    return ImGui::GetKeyData(key);
 }
@@ -4360,6 +4408,10 @@ CIMGUI_API void igSetKeyOwner(ImGuiKey key,ImGuiID owner_id,ImGuiInputFlags flag
 {
    return ImGui::SetKeyOwner(key,owner_id,flags);
 }
+CIMGUI_API void igSetKeyOwnersForKeyChord(ImGuiKeyChord key,ImGuiID owner_id,ImGuiInputFlags flags)
+{
+    return ImGui::SetKeyOwnersForKeyChord(key,owner_id,flags);
+}
 CIMGUI_API void igSetItemKeyOwner(ImGuiKey key,ImGuiInputFlags flags)
 {
    return ImGui::SetItemKeyOwner(key,flags);
@@ -4368,9 +4420,9 @@ CIMGUI_API bool igTestKeyOwner(ImGuiKey key,ImGuiID owner_id)
 {
    return ImGui::TestKeyOwner(key,owner_id);
 }
-CIMGUI_API ImGuiKeyOwnerData* igGetKeyOwnerData(ImGuiKey key)
+CIMGUI_API ImGuiKeyOwnerData* igGetKeyOwnerData(ImGuiContext* ctx,ImGuiKey key)
 {
-    return ImGui::GetKeyOwnerData(key);
+    return ImGui::GetKeyOwnerData(ctx,key);
 }
 CIMGUI_API bool igIsKeyDown_ID(ImGuiKey key,ImGuiID owner_id)
 {
@@ -4472,6 +4524,10 @@ CIMGUI_API ImGuiDockNode* igDockContextFindNodeByID(ImGuiContext* ctx,ImGuiID id
 {
    return ImGui::DockContextFindNodeByID(ctx,id);
 }
+CIMGUI_API void igDockNodeWindowMenuHandler_Default(ImGuiContext* ctx,ImGuiDockNode* node,ImGuiTabBar* tab_bar)
+{
+    return ImGui::DockNodeWindowMenuHandler_Default(ctx,node,tab_bar);
+}
 CIMGUI_API bool igDockNodeBeginAmendTabBar(ImGuiDockNode* node)
 {
    return ImGui::DockNodeBeginAmendTabBar(node);
@@ -5012,9 +5068,9 @@ CIMGUI_API bool igImageButtonEx(ImGuiID id,ImTextureID texture_id,const ImVec2 s
 {
    return ImGui::ImageButtonEx(id,texture_id,size,uv0,uv1,bg_col,tint_col,flags);
 }
-CIMGUI_API void igSeparatorEx(ImGuiSeparatorFlags flags)
+CIMGUI_API void igSeparatorEx(ImGuiSeparatorFlags flags,float thickness)
 {
-    return ImGui::SeparatorEx(flags);
+    return ImGui::SeparatorEx(flags,thickness);
 }
 CIMGUI_API void igSeparatorTextEx(ImGuiID id,const char* label,const char* label_end,float extra_width)
 {
@@ -5120,6 +5176,10 @@ CIMGUI_API bool igInputTextEx(const char* label,const char* hint,char* buf,int b
 {
    return ImGui::InputTextEx(label,hint,buf,buf_size,size_arg,flags,callback,user_data);
 }
+CIMGUI_API void igInputTextDeactivateHook(ImGuiID id)
+{
+    return ImGui::InputTextDeactivateHook(id);
+}
 CIMGUI_API bool igTempInputText(const ImRect bb,ImGuiID id,const char* label,char* buf,int buf_size,ImGuiInputTextFlags flags)
 {
    return ImGui::TempInputText(bb,id,label,buf,buf_size,flags);
--- a/cimgui.h
+++ b/cimgui.h
@@ -1,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.89.3" 18930 from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.89.6" 18960 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 //docking branch
 #ifndef CIMGUI_INCLUDED
@@ -79,6 +79,7 @@ typedef struct ImRect ImRect;
 typedef struct ImDrawDataBuilder ImDrawDataBuilder;
 typedef struct ImGuiColorMod ImGuiColorMod;
 typedef struct ImGuiContextHook ImGuiContextHook;
+typedef struct ImGuiDataVarInfo ImGuiDataVarInfo;
 typedef struct ImGuiDataTypeInfo ImGuiDataTypeInfo;
 typedef struct ImGuiDockContext ImGuiDockContext;
 typedef struct ImGuiDockRequest ImGuiDockRequest;
@@ -86,6 +87,7 @@ typedef struct ImGuiDockNode ImGuiDockNode;
 typedef struct ImGuiDockNodeSettings ImGuiDockNodeSettings;
 typedef struct ImGuiGroupData ImGuiGroupData;
 typedef struct ImGuiInputTextState ImGuiInputTextState;
+typedef struct ImGuiInputTextDeactivateData ImGuiInputTextDeactivateData;
 typedef struct ImGuiLastItemData ImGuiLastItemData;
 typedef struct ImGuiLocEntry ImGuiLocEntry;
 typedef struct ImGuiMenuColumns ImGuiMenuColumns;
@@ -832,6 +834,12 @@ typedef enum {
    ImGuiMouseCursor_NotAllowed,
    ImGuiMouseCursor_COUNT
 }ImGuiMouseCursor_;
+typedef enum {
+ImGuiMouseSource_Mouse=0,
+ImGuiMouseSource_TouchScreen=1,
+ImGuiMouseSource_Pen=2,
+ImGuiMouseSource_COUNT=3,
+}ImGuiMouseSource;
 typedef enum {
    ImGuiCond_None = 0,
    ImGuiCond_Always = 1 << 0,
@@ -934,6 +942,9 @@ struct ImGuiIO
    bool ConfigWindowsResizeFromEdges;
    bool ConfigWindowsMoveFromTitleBarOnly;
    float ConfigMemoryCompactTimer;
+    bool ConfigDebugBeginReturnValueOnce;
+    bool ConfigDebugBeginReturnValueLoop;
+    bool ConfigDebugIgnoreFocusLoss;
    const char* BackendPlatformName;
    const char* BackendRendererName;
    void* BackendPlatformUserData;
@@ -961,10 +972,12 @@ struct ImGuiIO
    int KeyMap[ImGuiKey_COUNT];
    bool KeysDown[ImGuiKey_COUNT];
    float NavInputs[ImGuiNavInput_COUNT];
+    ImGuiContext* Ctx;
    ImVec2 MousePos;
    bool MouseDown[5];
    float MouseWheel;
    float MouseWheelH;
+    ImGuiMouseSource MouseSource;
    ImGuiID MouseHoveredViewport;
    bool KeyCtrl;
    bool KeyShift;
@@ -983,6 +996,7 @@ struct ImGuiIO
    bool MouseReleased[5];
    bool MouseDownOwned[5];
    bool MouseDownOwnedUnlessPopupClose[5];
+    bool MouseWheelRequestAxisSwap;
    float MouseDownDuration[5];
    float MouseDownDurationPrev[5];
    ImVec2 MouseDragMaxDistanceAbs[5];
@@ -997,6 +1011,7 @@ struct ImGuiIO
 };
 struct ImGuiInputTextCallbackData
 {
+    ImGuiContext* Ctx;
    ImGuiInputTextFlags EventFlag;
    ImGuiInputTextFlags Flags;
    void* UserData;
@@ -1094,6 +1109,7 @@ struct ImGuiStorage
 typedef struct ImGuiStoragePair ImGuiStoragePair;
 struct ImGuiListClipper
 {
+    ImGuiContext* Ctx;
    int DisplayStart;
    int DisplayEnd;
    int ItemsCount;
@@ -1328,10 +1344,11 @@ typedef enum {
    ImGuiViewportFlags_NoFocusOnClick = 1 << 6,
    ImGuiViewportFlags_NoInputs = 1 << 7,
    ImGuiViewportFlags_NoRendererClear = 1 << 8,
-    ImGuiViewportFlags_TopMost = 1 << 9,
-    ImGuiViewportFlags_Minimized = 1 << 10,
-    ImGuiViewportFlags_NoAutoMerge = 1 << 11,
-    ImGuiViewportFlags_CanHostOtherWindows = 1 << 12,
+    ImGuiViewportFlags_NoAutoMerge = 1 << 9,
+    ImGuiViewportFlags_TopMost = 1 << 10,
+    ImGuiViewportFlags_CanHostOtherWindows = 1 << 11,
+    ImGuiViewportFlags_IsMinimized = 1 << 12,
+    ImGuiViewportFlags_IsFocused = 1 << 13,
 }ImGuiViewportFlags_;
 struct ImGuiViewport
 {
@@ -1390,6 +1407,7 @@ struct ImGuiPlatformMonitor
    ImVec2 MainPos, MainSize;
    ImVec2 WorkPos, WorkSize;
    float DpiScale;
+    void* PlatformHandle;
 };
 struct ImGuiPlatformImeData
 {
@@ -1404,6 +1422,7 @@ struct ImDrawListSharedData;
 struct ImGuiColorMod;
 struct ImGuiContext;
 struct ImGuiContextHook;
+struct ImGuiDataVarInfo;
 struct ImGuiDataTypeInfo;
 struct ImGuiDockContext;
 struct ImGuiDockRequest;
@@ -1411,6 +1430,7 @@ struct ImGuiDockNode;
 struct ImGuiDockNodeSettings;
 struct ImGuiGroupData;
 struct ImGuiInputTextState;
+struct ImGuiInputTextDeactivateData;
 struct ImGuiLastItemData;
 struct ImGuiLocEntry;
 struct ImGuiMenuColumns;
@@ -1439,6 +1459,7 @@ typedef int ImGuiDataAuthority;
 typedef int ImGuiLayoutType;
 typedef int ImGuiActivateFlags;
 typedef int ImGuiDebugLogFlags;
+typedef int ImGuiFocusRequestFlags;
 typedef int ImGuiInputFlags;
 typedef int ImGuiItemFlags;
 typedef int ImGuiItemStatusFlags;
@@ -1622,6 +1643,11 @@ typedef enum {
    ImGuiSeparatorFlags_Vertical = 1 << 1,
    ImGuiSeparatorFlags_SpanAllColumns = 1 << 2,
 }ImGuiSeparatorFlags_;
+typedef enum {
+    ImGuiFocusRequestFlags_None = 0,
+    ImGuiFocusRequestFlags_RestoreFocusedChild = 1 << 0,
+    ImGuiFocusRequestFlags_UnlessBelowModal = 1 << 1,
+}ImGuiFocusRequestFlags_;
 typedef enum {
    ImGuiTextFlags_None = 0,
    ImGuiTextFlags_NoWidthForLargeClippedText = 1 << 0,
@@ -1655,6 +1681,12 @@ typedef enum {
    ImGuiPopupPositionPolicy_ComboBox,
    ImGuiPopupPositionPolicy_Tooltip,
 }ImGuiPopupPositionPolicy;
+struct ImGuiDataVarInfo
+{
+    ImGuiDataType Type;
+    ImU32 Count;
+    ImU32 Offset;
+};
 typedef struct ImGuiDataTypeTempStorage ImGuiDataTypeTempStorage;
 struct ImGuiDataTypeTempStorage
 {
@@ -1717,6 +1749,12 @@ struct ImGuiMenuColumns
    ImU16 OffsetMark;
    ImU16 Widths[4];
 };
+typedef struct ImGuiInputTextDeactivatedState ImGuiInputTextDeactivatedState;
+struct ImGuiInputTextDeactivatedState
+{
+    ImGuiID ID;
+    ImVector_char TextA;
+};
 struct ImGuiInputTextState
 {
    ImGuiContext* Ctx;
@@ -1857,20 +1895,19 @@ typedef enum {
    ImGuiInputSource_Keyboard,
    ImGuiInputSource_Gamepad,
    ImGuiInputSource_Clipboard,
-    ImGuiInputSource_Nav,
    ImGuiInputSource_COUNT
 }ImGuiInputSource;
 typedef struct ImGuiInputEventMousePos ImGuiInputEventMousePos;
 struct ImGuiInputEventMousePos
-{ float PosX, PosY;
+{ float PosX, PosY; ImGuiMouseSource MouseSource;
 };
 typedef struct ImGuiInputEventMouseWheel ImGuiInputEventMouseWheel;
 struct ImGuiInputEventMouseWheel
-{ float WheelX, WheelY;
+{ float WheelX, WheelY; ImGuiMouseSource MouseSource;
 };
 typedef struct ImGuiInputEventMouseButton ImGuiInputEventMouseButton;
 struct ImGuiInputEventMouseButton
-{ int Button; bool Down;
+{ int Button; bool Down; ImGuiMouseSource MouseSource;
 };
 typedef struct ImGuiInputEventMouseViewport ImGuiInputEventMouseViewport;
 struct ImGuiInputEventMouseViewport
@@ -1893,6 +1930,7 @@ struct ImGuiInputEvent
 {
    ImGuiInputEventType Type;
    ImGuiInputSource Source;
+    ImU32 EventId;
    union
    {
        ImGuiInputEventMousePos MousePos;
@@ -2009,6 +2047,7 @@ typedef enum {
    ImGuiNavMoveFlags_LoopY = 1 << 1,
    ImGuiNavMoveFlags_WrapX = 1 << 2,
    ImGuiNavMoveFlags_WrapY = 1 << 3,
+    ImGuiNavMoveFlags_WrapMask_ = ImGuiNavMoveFlags_LoopX | ImGuiNavMoveFlags_LoopY | ImGuiNavMoveFlags_WrapX | ImGuiNavMoveFlags_WrapY,
    ImGuiNavMoveFlags_AllowCurrentNavId = 1 << 4,
    ImGuiNavMoveFlags_AlsoScoreVisibleSet = 1 << 5,
    ImGuiNavMoveFlags_ScrollToEdgeY = 1 << 6,
@@ -2177,15 +2216,16 @@ typedef struct ImGuiViewportP ImGuiViewportP;
 struct ImGuiViewportP
 {
    ImGuiViewport _ImGuiViewport;
+    ImGuiWindow* Window;
    int Idx;
    int LastFrameActive;
-    int LastFrontMostStampCount;
+    int LastFocusedStampCount;
    ImGuiID LastNameHash;
    ImVec2 LastPos;
    float Alpha;
    float LastAlpha;
+    bool LastFocusedHadNavWindow;
    short PlatformMonitor;
-    ImGuiWindow* Window;
    int DrawListsLastFrame[2];
    ImDrawList* DrawLists[2];
    ImDrawData DrawDataP;
@@ -2247,10 +2287,11 @@ typedef enum {
    ImGuiDebugLogFlags_EventPopup = 1 << 2,
    ImGuiDebugLogFlags_EventNav = 1 << 3,
    ImGuiDebugLogFlags_EventClipper = 1 << 4,
-    ImGuiDebugLogFlags_EventIO = 1 << 5,
-    ImGuiDebugLogFlags_EventDocking = 1 << 6,
-    ImGuiDebugLogFlags_EventViewport = 1 << 7,
-    ImGuiDebugLogFlags_EventMask_ = ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventIO | ImGuiDebugLogFlags_EventDocking | ImGuiDebugLogFlags_EventViewport,
+    ImGuiDebugLogFlags_EventSelection = 1 << 5,
+    ImGuiDebugLogFlags_EventIO = 1 << 6,
+    ImGuiDebugLogFlags_EventDocking = 1 << 7,
+    ImGuiDebugLogFlags_EventViewport = 1 << 8,
+    ImGuiDebugLogFlags_EventMask_ = ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventSelection | ImGuiDebugLogFlags_EventIO | ImGuiDebugLogFlags_EventDocking | ImGuiDebugLogFlags_EventViewport,
    ImGuiDebugLogFlags_OutputToTTY = 1 << 10,
 }ImGuiDebugLogFlags_;
 struct ImGuiMetricsConfig
@@ -2348,8 +2389,6 @@ struct ImGuiContext
    bool FontAtlasOwnedByContext;
    ImGuiIO IO;
    ImGuiPlatformIO PlatformIO;
-    ImVector_ImGuiInputEvent InputEventsQueue;
-    ImVector_ImGuiInputEvent InputEventsTrail;
    ImGuiStyle Style;
    ImGuiConfigFlags ConfigFlagsCurrFrame;
    ImGuiConfigFlags ConfigFlagsLastFrame;
@@ -2368,6 +2407,10 @@ struct ImGuiContext
    bool GcCompactAll;
    bool TestEngineHookItems;
    void* TestEngine;
+    ImVector_ImGuiInputEvent InputEventsQueue;
+    ImVector_ImGuiInputEvent InputEventsTrail;
+    ImGuiMouseSource InputEventsNextMouseSource;
+    ImU32 InputEventsNextEventId;
    ImVector_ImGuiWindowPtr Windows;
    ImVector_ImGuiWindowPtr WindowsFocusOrder;
    ImVector_ImGuiWindowPtr WindowsTempSortBuffer;
@@ -2438,14 +2481,13 @@ struct ImGuiContext
    ImGuiViewportP* MouseLastHoveredViewport;
    ImGuiID PlatformLastFocusedViewportId;
    ImGuiPlatformMonitor FallbackMonitor;
-    int ViewportFrontMostStampCount;
+    int ViewportFocusedStampCount;
    ImGuiWindow* NavWindow;
    ImGuiID NavId;
    ImGuiID NavFocusScopeId;
    ImGuiID NavActivateId;
    ImGuiID NavActivateDownId;
    ImGuiID NavActivatePressedId;
-    ImGuiID NavActivateInputId;
    ImGuiActivateFlags NavActivateFlags;
    ImGuiID NavJustMovedToId;
    ImGuiID NavJustMovedToFocusScopeId;
@@ -2461,8 +2503,7 @@ struct ImGuiContext
    bool NavAnyRequest;
    bool NavInitRequest;
    bool NavInitRequestFromMove;
-    ImGuiID NavInitResultId;
-    ImRect NavInitResultRectRel;
+    ImGuiNavItemData NavInitResult;
    bool NavMoveSubmitted;
    bool NavMoveScoringItems;
    bool NavMoveForwardToNextFrame;
@@ -2528,6 +2569,7 @@ struct ImGuiContext
    float HoverDelayClearTimer;
    ImVec2 MouseLastValidPos;
    ImGuiInputTextState InputTextState;
+    ImGuiInputTextDeactivatedState InputTextDeactivatedState;
    ImFont InputTextPasswordFont;
    ImGuiID TempInputId;
    ImGuiColorEditFlags ColorEditOptions;
@@ -2555,6 +2597,7 @@ struct ImGuiContext
    ImGuiID PlatformImeViewport;
    char PlatformLocaleDecimalPoint;
    ImGuiDockContext DockContext;
+    void (*DockNodeWindowMenuHandler)(ImGuiContext* ctx, ImGuiDockNode* node, ImGuiTabBar* tab_bar);
    bool SettingsLoaded;
    float SettingsDirtyTimer;
    ImGuiTextBuffer SettingsIniData;
@@ -2578,7 +2621,9 @@ struct ImGuiContext
    ImGuiDebugLogFlags DebugLogFlags;
    ImGuiTextBuffer DebugLogBuf;
    ImGuiTextIndex DebugLogIndex;
+    ImU8 DebugLogClipperAutoDisableFrames;
    ImU8 DebugLocateFrames;
+    ImS8 DebugBeginReturnValueCullDepth;
    bool DebugItemPickerActive;
    ImU8 DebugItemPickerMouseButton;
    ImGuiID DebugItemPickerBreakId;
@@ -2614,8 +2659,9 @@ struct ImGuiWindowTempData
    ImGuiNavLayer NavLayerCurrent;
    short NavLayersActiveMask;
    short NavLayersActiveMaskNext;
+    bool NavIsScrollPushableX;
    bool NavHideHighlightOneFrame;
-    bool NavHasScroll;
+    bool NavWindowHasScrollY;
    bool MenuBarAppending;
    ImVec2 MenuBarOffset;
    ImGuiMenuColumns MenuColumns;
@@ -2636,6 +2682,7 @@ typedef struct ImVector_ImGuiOldColumns {int Size;int Capacity;ImGuiOldColumns*

 struct ImGuiWindow
 {
+    ImGuiContext* Ctx;
    char* Name;
    ImGuiID ID;
    ImGuiWindowFlags Flags, FlagsPreviousFrame;
@@ -2732,6 +2779,7 @@ struct ImGuiWindow
    ImGuiWindow* NavLastChildNavWindow;
    ImGuiID NavLastIds[ImGuiNavLayer_COUNT];
    ImRect NavRectRel[ImGuiNavLayer_COUNT];
+    ImVec2 NavPreferredScoringPosRel[ImGuiNavLayer_COUNT];
    ImGuiID NavRootFocusScopeId;
    int MemoryDrawListIdxCapacity;
    int MemoryDrawListVtxCapacity;
@@ -3186,8 +3234,8 @@ CIMGUI_API void igPopStyleColor(int count);
 CIMGUI_API void igPushStyleVar_Float(ImGuiStyleVar idx,float val);
 CIMGUI_API void igPushStyleVar_Vec2(ImGuiStyleVar idx,const ImVec2 val);
 CIMGUI_API void igPopStyleVar(int count);
-CIMGUI_API void igPushAllowKeyboardFocus(bool allow_keyboard_focus);
-CIMGUI_API void igPopAllowKeyboardFocus(void);
+CIMGUI_API void igPushTabStop(bool tab_stop);
+CIMGUI_API void igPopTabStop(void);
 CIMGUI_API void igPushButtonRepeat(bool repeat);
 CIMGUI_API void igPopButtonRepeat(void);
 CIMGUI_API void igPushItemWidth(float item_width);
@@ -3351,7 +3399,7 @@ CIMGUI_API bool igBeginMenu(const char* label,bool enabled);
 CIMGUI_API void igEndMenu(void);
 CIMGUI_API bool igMenuItem_Bool(const char* label,const char* shortcut,bool selected,bool enabled);
 CIMGUI_API bool igMenuItem_BoolPtr(const char* label,const char* shortcut,bool* p_selected,bool enabled);
-CIMGUI_API void igBeginTooltip(void);
+CIMGUI_API bool igBeginTooltip(void);
 CIMGUI_API void igEndTooltip(void);
 CIMGUI_API void igSetTooltip(const char* fmt,...);
 CIMGUI_API void igSetTooltipV(const char* fmt,va_list args);
@@ -3508,6 +3556,7 @@ CIMGUI_API void ImGuiIO_AddKeyAnalogEvent(ImGuiIO* self,ImGuiKey key,bool down,f
 CIMGUI_API void ImGuiIO_AddMousePosEvent(ImGuiIO* self,float x,float y);
 CIMGUI_API void ImGuiIO_AddMouseButtonEvent(ImGuiIO* self,int button,bool down);
 CIMGUI_API void ImGuiIO_AddMouseWheelEvent(ImGuiIO* self,float wheel_x,float wheel_y);
+CIMGUI_API void ImGuiIO_AddMouseSourceEvent(ImGuiIO* self,ImGuiMouseSource source);
 CIMGUI_API void ImGuiIO_AddMouseViewportEvent(ImGuiIO* self,ImGuiID id);
 CIMGUI_API void ImGuiIO_AddFocusEvent(ImGuiIO* self,bool focused);
 CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,unsigned int c);
@@ -3587,7 +3636,7 @@ CIMGUI_API void ImGuiListClipper_destroy(ImGuiListClipper* self);
 CIMGUI_API void ImGuiListClipper_Begin(ImGuiListClipper* self,int items_count,float items_height);
 CIMGUI_API void ImGuiListClipper_End(ImGuiListClipper* self);
 CIMGUI_API bool ImGuiListClipper_Step(ImGuiListClipper* self);
-CIMGUI_API void ImGuiListClipper_ForceDisplayRangeByIndices(ImGuiListClipper* self,int item_min,int item_max);
+CIMGUI_API void ImGuiListClipper_IncludeRangeByIndices(ImGuiListClipper* self,int item_begin,int item_end);
 CIMGUI_API ImColor* ImColor_ImColor_Nil(void);
 CIMGUI_API void ImColor_destroy(ImColor* self);
 CIMGUI_API ImColor* ImColor_ImColor_Float(float r,float g,float b,float a);
@@ -3835,7 +3884,6 @@ CIMGUI_API bool igImTriangleContainsPoint(const ImVec2 a,const ImVec2 b,const Im
 CIMGUI_API void igImTriangleClosestPoint(ImVec2 *pOut,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 p);
 CIMGUI_API void igImTriangleBarycentricCoords(const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 p,float* out_u,float* out_v,float* out_w);
 CIMGUI_API float igImTriangleArea(const ImVec2 a,const ImVec2 b,const ImVec2 c);
-CIMGUI_API ImGuiDir igImGetDirQuadrantFromDelta(float dx,float dy);
 CIMGUI_API ImVec1* ImVec1_ImVec1_Nil(void);
 CIMGUI_API void ImVec1_destroy(ImVec1* self);
 CIMGUI_API ImVec1* ImVec1_ImVec1_Float(float _x);
@@ -3895,6 +3943,7 @@ CIMGUI_API void ImDrawDataBuilder_Clear(ImDrawDataBuilder* self);
 CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self);
 CIMGUI_API int ImDrawDataBuilder_GetDrawListCount(ImDrawDataBuilder* self);
 CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self);
+CIMGUI_API void* ImGuiDataVarInfo_GetVarPtr(ImGuiDataVarInfo* self,void* parent);
 CIMGUI_API ImGuiStyleMod* ImGuiStyleMod_ImGuiStyleMod_Int(ImGuiStyleVar idx,int v);
 CIMGUI_API void ImGuiStyleMod_destroy(ImGuiStyleMod* self);
 CIMGUI_API ImGuiStyleMod* ImGuiStyleMod_ImGuiStyleMod_Float(ImGuiStyleVar idx,float v);
@@ -3906,7 +3955,10 @@ CIMGUI_API void ImGuiMenuColumns_destroy(ImGuiMenuColumns* self);
 CIMGUI_API void ImGuiMenuColumns_Update(ImGuiMenuColumns* self,float spacing,bool window_reappearing);
 CIMGUI_API float ImGuiMenuColumns_DeclColumns(ImGuiMenuColumns* self,float w_icon,float w_label,float w_shortcut,float w_mark);
 CIMGUI_API void ImGuiMenuColumns_CalcNextTotalWidth(ImGuiMenuColumns* self,bool update_offsets);
-CIMGUI_API ImGuiInputTextState* ImGuiInputTextState_ImGuiInputTextState(ImGuiContext* ctx);
+CIMGUI_API ImGuiInputTextDeactivatedState* ImGuiInputTextDeactivatedState_ImGuiInputTextDeactivatedState(void);
+CIMGUI_API void ImGuiInputTextDeactivatedState_destroy(ImGuiInputTextDeactivatedState* self);
+CIMGUI_API void ImGuiInputTextDeactivatedState_ClearFreeMemory(ImGuiInputTextDeactivatedState* self);
+CIMGUI_API ImGuiInputTextState* ImGuiInputTextState_ImGuiInputTextState(void);
 CIMGUI_API void ImGuiInputTextState_destroy(ImGuiInputTextState* self);
 CIMGUI_API void ImGuiInputTextState_ClearText(ImGuiInputTextState* self);
 CIMGUI_API void ImGuiInputTextState_ClearFreeMemory(ImGuiInputTextState* self);
@@ -3933,8 +3985,8 @@ CIMGUI_API ImGuiLastItemData* ImGuiLastItemData_ImGuiLastItemData(void);
 CIMGUI_API void ImGuiLastItemData_destroy(ImGuiLastItemData* self);
 CIMGUI_API ImGuiStackSizes* ImGuiStackSizes_ImGuiStackSizes(void);
 CIMGUI_API void ImGuiStackSizes_destroy(ImGuiStackSizes* self);
-CIMGUI_API void ImGuiStackSizes_SetToCurrentState(ImGuiStackSizes* self);
-CIMGUI_API void ImGuiStackSizes_CompareWithCurrentState(ImGuiStackSizes* self);
+CIMGUI_API void ImGuiStackSizes_SetToContextState(ImGuiStackSizes* self,ImGuiContext* ctx);
+CIMGUI_API void ImGuiStackSizes_CompareWithContextState(ImGuiStackSizes* self,ImGuiContext* ctx);
 CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndex_Ptr(void* ptr);
 CIMGUI_API void ImGuiPtrOrIndex_destroy(ImGuiPtrOrIndex* self);
 CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndex_Int(int index);
@@ -4040,10 +4092,12 @@ CIMGUI_API void igSetWindowPos_WindowPtr(ImGuiWindow* window,const ImVec2 pos,Im
 CIMGUI_API void igSetWindowSize_WindowPtr(ImGuiWindow* window,const ImVec2 size,ImGuiCond cond);
 CIMGUI_API void igSetWindowCollapsed_WindowPtr(ImGuiWindow* window,bool collapsed,ImGuiCond cond);
 CIMGUI_API void igSetWindowHitTestHole(ImGuiWindow* window,const ImVec2 pos,const ImVec2 size);
+CIMGUI_API void igSetWindowHiddendAndSkipItemsForCurrentFrame(ImGuiWindow* window);
 CIMGUI_API void igWindowRectAbsToRel(ImRect *pOut,ImGuiWindow* window,const ImRect r);
 CIMGUI_API void igWindowRectRelToAbs(ImRect *pOut,ImGuiWindow* window,const ImRect r);
-CIMGUI_API void igFocusWindow(ImGuiWindow* window);
-CIMGUI_API void igFocusTopMostWindowUnderOne(ImGuiWindow* under_this_window,ImGuiWindow* ignore_window);
+CIMGUI_API void igWindowPosRelToAbs(ImVec2 *pOut,ImGuiWindow* window,const ImVec2 p);
+CIMGUI_API void igFocusWindow(ImGuiWindow* window,ImGuiFocusRequestFlags flags);
+CIMGUI_API void igFocusTopMostWindowUnderOne(ImGuiWindow* under_this_window,ImGuiWindow* ignore_window,ImGuiViewport* filter_viewport,ImGuiFocusRequestFlags flags);
 CIMGUI_API void igBringWindowToFocusFront(ImGuiWindow* window);
 CIMGUI_API void igBringWindowToDisplayFront(ImGuiWindow* window);
 CIMGUI_API void igBringWindowToDisplayBack(ImGuiWindow* window);
@@ -4109,6 +4163,7 @@ CIMGUI_API void igItemSize_Vec2(const ImVec2 size,float text_baseline_y);
 CIMGUI_API void igItemSize_Rect(const ImRect bb,float text_baseline_y);
 CIMGUI_API bool igItemAdd(const ImRect bb,ImGuiID id,const ImRect* nav_bb,ImGuiItemFlags extra_flags);
 CIMGUI_API bool igItemHoverable(const ImRect bb,ImGuiID id);
+CIMGUI_API bool igIsWindowContentHoverable(ImGuiWindow* window,ImGuiHoveredFlags flags);
 CIMGUI_API bool igIsClippedEx(const ImRect bb,ImGuiID id);
 CIMGUI_API void igSetLastItemData(ImGuiID item_id,ImGuiItemFlags in_flags,ImGuiItemStatusFlags status_flags,const ImRect item_rect);
 CIMGUI_API void igCalcItemSize(ImVec2 *pOut,ImVec2 size,float default_w,float default_h);
@@ -4119,6 +4174,7 @@ CIMGUI_API void igGetContentRegionMaxAbs(ImVec2 *pOut);
 CIMGUI_API void igShrinkWidths(ImGuiShrinkWidthItem* items,int count,float width_excess);
 CIMGUI_API void igPushItemFlag(ImGuiItemFlags option,bool enabled);
 CIMGUI_API void igPopItemFlag(void);
+CIMGUI_API const ImGuiDataVarInfo* igGetStyleVarInfo(ImGuiStyleVar idx);
 CIMGUI_API void igLogBegin(ImGuiLogType type,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);
@@ -4130,10 +4186,11 @@ CIMGUI_API void igClosePopupsOverWindow(ImGuiWindow* ref_window,bool restore_foc
 CIMGUI_API void igClosePopupsExceptModals(void);
 CIMGUI_API bool igIsPopupOpen_ID(ImGuiID id,ImGuiPopupFlags popup_flags);
 CIMGUI_API bool igBeginPopupEx(ImGuiID id,ImGuiWindowFlags extra_flags);
-CIMGUI_API void igBeginTooltipEx(ImGuiTooltipFlags tooltip_flags,ImGuiWindowFlags extra_window_flags);
+CIMGUI_API bool igBeginTooltipEx(ImGuiTooltipFlags tooltip_flags,ImGuiWindowFlags extra_window_flags);
 CIMGUI_API void igGetPopupAllowedExtentRect(ImRect *pOut,ImGuiWindow* window);
 CIMGUI_API ImGuiWindow* igGetTopMostPopupModal(void);
 CIMGUI_API ImGuiWindow* igGetTopMostAndVisiblePopupModal(void);
+CIMGUI_API ImGuiWindow* igFindBlockingModal(ImGuiWindow* window);
 CIMGUI_API void igFindBestWindowPosForPopup(ImVec2 *pOut,ImGuiWindow* window);
 CIMGUI_API void igFindBestWindowPosForPopupEx(ImVec2 *pOut,const ImVec2 ref_pos,const ImVec2 size,ImGuiDir* last_dir,const ImRect r_outer,const ImRect r_avoid,ImGuiPopupPositionPolicy policy);
 CIMGUI_API bool igBeginViewportSideBar(const char* name,ImGuiViewport* viewport,ImGuiDir dir,float size,ImGuiWindowFlags window_flags);
@@ -4151,6 +4208,8 @@ CIMGUI_API void igNavMoveRequestResolveWithLastItem(ImGuiNavItemData* result);
 CIMGUI_API void igNavMoveRequestCancel(void);
 CIMGUI_API void igNavMoveRequestApplyResult(void);
 CIMGUI_API void igNavMoveRequestTryWrapping(ImGuiWindow* window,ImGuiNavMoveFlags move_flags);
+CIMGUI_API void igNavClearPreferredPosForAxis(ImGuiAxis axis);
+CIMGUI_API void igNavUpdateCurrentWindowIsScrollPushableX(void);
 CIMGUI_API void igActivateItem(ImGuiID id);
 CIMGUI_API void igSetNavWindow(ImGuiWindow* window);
 CIMGUI_API void igSetNavID(ImGuiID id,ImGuiNavLayer nav_layer,ImGuiID focus_scope_id,const ImRect rect_rel);
@@ -4162,8 +4221,9 @@ CIMGUI_API bool igIsGamepadKey(ImGuiKey key);
 CIMGUI_API bool igIsMouseKey(ImGuiKey key);
 CIMGUI_API bool igIsAliasKey(ImGuiKey key);
 CIMGUI_API ImGuiKeyChord igConvertShortcutMod(ImGuiKeyChord key_chord);
-CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiKey key);
-CIMGUI_API ImGuiKeyData* igGetKeyData(ImGuiKey key);
+CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiContext* ctx,ImGuiKey key);
+CIMGUI_API ImGuiKeyData* igGetKeyData_ContextPtr(ImGuiContext* ctx,ImGuiKey key);
+CIMGUI_API ImGuiKeyData* igGetKeyData_Key(ImGuiKey key);
 CIMGUI_API void igGetKeyChordName(ImGuiKeyChord key_chord,char* out_buf,int out_buf_size);
 CIMGUI_API ImGuiKey igMouseButtonToKey(ImGuiMouseButton button);
 CIMGUI_API bool igIsMouseDragPastThreshold(ImGuiMouseButton button,float lock_threshold);
@@ -4175,9 +4235,10 @@ CIMGUI_API void igSetActiveIdUsingAllKeyboardKeys(void);
 CIMGUI_API bool igIsActiveIdUsingNavDir(ImGuiDir dir);
 CIMGUI_API ImGuiID igGetKeyOwner(ImGuiKey key);
 CIMGUI_API void igSetKeyOwner(ImGuiKey key,ImGuiID owner_id,ImGuiInputFlags flags);
+CIMGUI_API void igSetKeyOwnersForKeyChord(ImGuiKeyChord key,ImGuiID owner_id,ImGuiInputFlags flags);
 CIMGUI_API void igSetItemKeyOwner(ImGuiKey key,ImGuiInputFlags flags);
 CIMGUI_API bool igTestKeyOwner(ImGuiKey key,ImGuiID owner_id);
-CIMGUI_API ImGuiKeyOwnerData* igGetKeyOwnerData(ImGuiKey key);
+CIMGUI_API ImGuiKeyOwnerData* igGetKeyOwnerData(ImGuiContext* ctx,ImGuiKey key);
 CIMGUI_API bool igIsKeyDown_ID(ImGuiKey key,ImGuiID owner_id);
 CIMGUI_API bool igIsKeyPressed_ID(ImGuiKey key,ImGuiID owner_id,ImGuiInputFlags flags);
 CIMGUI_API bool igIsKeyReleased_ID(ImGuiKey key,ImGuiID owner_id);
@@ -4203,6 +4264,7 @@ CIMGUI_API void igDockContextProcessUndockWindow(ImGuiContext* ctx,ImGuiWindow*
 CIMGUI_API void igDockContextProcessUndockNode(ImGuiContext* ctx,ImGuiDockNode* node);
 CIMGUI_API bool igDockContextCalcDropPosForDocking(ImGuiWindow* target,ImGuiDockNode* target_node,ImGuiWindow* payload_window,ImGuiDockNode* payload_node,ImGuiDir split_dir,bool split_outer,ImVec2* out_pos);
 CIMGUI_API ImGuiDockNode* igDockContextFindNodeByID(ImGuiContext* ctx,ImGuiID id);
+CIMGUI_API void igDockNodeWindowMenuHandler_Default(ImGuiContext* ctx,ImGuiDockNode* node,ImGuiTabBar* tab_bar);
 CIMGUI_API bool igDockNodeBeginAmendTabBar(ImGuiDockNode* node);
 CIMGUI_API void igDockNodeEndAmendTabBar(void);
 CIMGUI_API ImGuiDockNode* igDockNodeGetRootNode(ImGuiDockNode* node);
@@ -4338,7 +4400,7 @@ CIMGUI_API void igTextEx(const char* text,const char* text_end,ImGuiTextFlags fl
 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 size,const ImVec2 uv0,const ImVec2 uv1,const ImVec4 bg_col,const ImVec4 tint_col,ImGuiButtonFlags flags);
-CIMGUI_API void igSeparatorEx(ImGuiSeparatorFlags 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);
 CIMGUI_API bool igCheckboxFlags_U64Ptr(const char* label,ImU64* flags,ImU64 flags_value);
@@ -4365,6 +4427,7 @@ CIMGUI_API bool igDataTypeApplyFromText(const char* buf,ImGuiDataType data_type,
 CIMGUI_API int igDataTypeCompare(ImGuiDataType data_type,const void* arg_1,const void* arg_2);
 CIMGUI_API bool igDataTypeClamp(ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max);
 CIMGUI_API bool igInputTextEx(const char* label,const char* hint,char* buf,int buf_size,const ImVec2 size_arg,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data);
+CIMGUI_API void igInputTextDeactivateHook(ImGuiID id);
 CIMGUI_API bool igTempInputText(const ImRect bb,ImGuiID id,const char* label,char* buf,int buf_size,ImGuiInputTextFlags flags);
 CIMGUI_API bool igTempInputScalar(const ImRect bb,ImGuiID id,const char* label,ImGuiDataType data_type,void* p_data,const char* format,const void* p_clamp_min,const void* p_clamp_max);
 CIMGUI_API bool igTempInputIsActive(ImGuiID id);
--- a/generator/cpp2ffi.lua
+++ b/generator/cpp2ffi.lua
@@ -68,6 +68,7 @@ local function ToStr(t,dometatables)
 	_ToStr(t,strTG,recG,nameG)
 	return table.concat(strTG)
 end
+M.ToStr = ToStr
 function M.prtable(...)
 	for i=1, select('#', ...) do
 		local t = select(i, ...)
@@ -345,7 +346,7 @@ local function getRE()
 	return res,resN
 end
 local function isLeaf(re)
-	return (re ~= "typedef_st_re" and re ~= "struct_re" and re~="namespace_re" and re~="class_re")
+	return (re ~= "typedef_st_re" and re ~= "struct_re" and re~="namespace_re" and re~="class_re" and re~="union_re")
 end
 M.getRE = getRE
 --takes preprocesed file in table cdefsor and returns items
@@ -986,15 +987,28 @@ local function ADDIMSTR_S(FP)
 				if dd.signature == defT2.signature then 
 					doadd = false;
 					print("skip _S addition",defT2.cimguiname)
+					--M.prtable(defT2)
 					break 
 				end
 			end
+			--delete imstrv generation
+			if FP.NOIMSTRV then
+				newcdefs[#newcdefs] = nil
+				cimf[t.signature] = nil
+				for i,v in ipairs(cimf) do
+					if v.signature == t.signature then
+						table.remove(cimf, i)
+						break
+					end
+				end
+			end
 			--add _S version
-			if doadd then
+			if doadd and not FP.NOCHAR then
 			cimf[#cimf+1] = defT2
 			cimf[defT2.signature] = defT2
 			newcdefs[#newcdefs+1] = {stname=t.stname,funcname=t.funcname,args=defT2.args,signature=defT2.signature,cimguiname=defT2.cimguiname,ret =defT2.ret}
 			end
+			
        end
 		else print("not cimguiname in");M.prtable(t)
        end
@@ -1296,6 +1310,21 @@ function M.Parser()
 		end
 		return itsarr
 	end
+	local function sanitize_comments(txt)
+		local txtclean = {}
+		local reg = "//[^\n\r]+"
+		local ini = 1
+		local i,e,a = txt:find(reg,ini)
+		while i do
+			table.insert(txtclean,txt:sub(ini,i-1))
+			local com = txt:sub(i,e):gsub("[{}]+","")
+			table.insert(txtclean,com)
+			ini = e + 1
+			i,e,a = txt:find(reg,ini)
+		end
+		table.insert(txtclean,txt:sub(ini,-1))
+		return table.concat(txtclean)
+	end
 	function par:parseItems()
 		self:initTypedefsDict()
 		
@@ -1317,8 +1346,11 @@ function M.Parser()
 			table.insert(cdefs2,cdef[1])
 		end
 		local txt = table.concat(cdefs2,"\n")
+		--save_data("./preprocode"..tostring(self):gsub("table: ","")..".c",txt)
 		--clean bad positioned comments inside functionD_re
 		if self.COMMENTS_GENERATION then
+		print"cleaning { and } inside comments"
+			txt = sanitize_comments(txt)
 		print"cleaning comments inside functionD_re--------------"
 		---[[
 		local nn = 0
@@ -1344,6 +1376,7 @@ function M.Parser()
 		print("end cleaning ------------------------------",nn)
 		txt = table.concat(txtclean)
 		end
+		--save_data("./preparse"..tostring(self):gsub("table: ","")..".c",txt)
 		--]]
 		self.itemsarr = par:parseItemsR2(txt)
 		itemsarr = self.itemsarr
@@ -1417,33 +1450,43 @@ function M.Parser()
 			return "" 
 		end --here we avoid empty structs
 		for j,it in ipairs(itlist) do
-			if (it.re_name == "vardef_re" or it.re_name == "functype_re" or it.re_name == "union_re") then
-			if  not (it.re_name == "vardef_re" and it.item:match"static") then --skip static variables
-				local it2 = it.item --:gsub("<([%w_]+)>","_%1") --templates
-				--local ttype,template = it.item:match("([^%s,%(%)]+)%s*<(.+)>")
-				local ttype,template,te,code2 =  check_template(it2)  --it.item:match"([^%s,%(%)]+)%s*<(.+)>"
-				if template then
-					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
+			if (it.re_name == "vardef_re" or it.re_name == "functype_re") then -- or it.re_name == "union_re") then
+				if  not (it.re_name == "vardef_re" and it.item:match"static") then --skip static variables
+				
+					local it2 = it.item --:gsub("<([%w_]+)>","_%1") --templates
+					--local ttype,template = it.item:match("([^%s,%(%)]+)%s*<(.+)>")
+					local ttype,template,te,code2 =  check_template(it2)  --it.item:match"([^%s,%(%)]+)%s*<(.+)>"
+					if template then
+						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
 					end
-					if doheader then
-						local templatetypedef = self:gentemplatetypedef(ttype, template,self.templates[ttype][template])
-						predeclare = predeclare .. templatetypedef
+					--clean mutable
+					it2 = it2:gsub("mutable","")
+					--clean namespaces
+					it2 = it2:gsub("%w+::","")
+					--clean initializations
+					if it.re_name == "vardef_re" then
+						it2 = it2:gsub("%s*=.+;",";")
 					end
+					table.insert(outtab,it2)
+					table.insert(commtab,{above=it.prevcomments,sameline=it.comments})--it.comments or "")
 				end
-				--clean mutable
-				it2 = it2:gsub("mutable","")
-				--clean namespaces
-				it2 = it2:gsub("%w+::","")
-				--clean initializations
-				if it.re_name == "vardef_re" then
-					it2 = it2:gsub("%s*=.+;",";")
-				end
-				table.insert(outtab,it2)
-				table.insert(commtab,{above=it.prevcomments,sameline=it.comments})--it.comments or "")
+			elseif it.re_name == "union_re" then
+				local com = ""
+				for _,ch in ipairs(it.childs) do
+					com = com .. (ch.comments or "")
 				end
+				local item = clean_comments(it.item)
+				table.insert(outtab,item)
+				com = (com ~= "") and com or nil
+				table.insert(commtab,{above=it.prevcomments,sameline=com})
 			elseif it.re_name == "struct_re" then
 				--check if has declaration
 				local decl = it.item:match"%b{}%s*([^%s}{]+)%s*;"
@@ -1453,12 +1496,12 @@ function M.Parser()
 				end
 				local cleanst,structname,strtab,comstab,predec = self:clean_structR1(it,doheader)
 				if doheader then
-				local tst = "\ntypedef struct "..structname.." "..structname..";\n"
-						if check_unique_typedefs(tst,uniques) then
-							--table.insert(outtab,tst)
-							--print("xxxxxxxxxxxxxxxinsert typedef",structname)
-							cleanst = cleanst .. tst
-						end
+					local tst = "\ntypedef struct "..structname.." "..structname..";\n"
+					if check_unique_typedefs(tst,uniques) then
+						--table.insert(outtab,tst)
+						--print("xxxxxxxxxxxxxxxinsert typedef",structname)
+						cleanst = cleanst .. tst
+					end
 				end
 				predeclare = predeclare .. predec .. cleanst
 			elseif it.re_name == "enum_re" then
--- a/generator/generator.bat
+++ b/generator/generator.bat
@@ -15,10 +15,10 @@ 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
+:: 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
 :: 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" glfw opengl3 opengl2 sdl2
+luajit ./generator.lua gcc "internal noimstrv" glfw opengl3 opengl2 sdl2 %*

 ::leave console open
 cmd /k
--- a/generator/generator.lua
+++ b/generator/generator.lua
@@ -9,6 +9,8 @@ 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 COMMENTS_GENERATION = script_args[2]:match("comments") and true or false
+local NOCHAR = script_args[2]:match("nochar") and true or false
+local NOIMSTRV = script_args[2]:match("noimstrv") and true or false
 local IMGUI_PATH = os.getenv"IMGUI_PATH" or "../imgui"
 local CFLAGS = ""
 local CPRE,CTEST
@@ -249,7 +251,9 @@ local function cimgui_generation(parser)
 		cstructsstr = cstructsstr.."\n#define IMGUI_HAS_DOCK       1\n"
 	end
 	if gdefines.IMGUI_HAS_IMSTR then
+		if not (NOCHAR or NOIMSTRV) then
 		cstructsstr = cstructsstr.."\n#define IMGUI_HAS_IMSTR       1\n"
+		end
 	end
 	
    hstrfile = hstrfile:gsub([[#include "imgui_structs%.h"]],cstructsstr)
@@ -291,7 +295,10 @@ if gdefines.IMGUI_HAS_DOCK then
 ]]
 	
 end
+assert(not NOCHAR or not NOIMSTRV,"nochar and noimstrv cant be set at the same time")
 print("IMGUI_HAS_IMSTR",gdefines.IMGUI_HAS_IMSTR)
+print("NOCHAR",NOCHAR)
+print("NOIMSTRV",NOIMSTRV)
 print("IMGUI_HAS_DOCK",gdefines.IMGUI_HAS_DOCK)
 print("IMGUI_VERSION",gdefines.IMGUI_VERSION)

@@ -311,6 +318,8 @@ local function parseImGuiHeader(header,names)
 	parser.UDTs = {"ImVec2","ImVec4","ImColor","ImRect"}
 	--parser.gen_template_typedef = gen_template_typedef --use auto
 	parser.COMMENTS_GENERATION = COMMENTS_GENERATION
+	parser.NOCHAR = NOCHAR
+	parser.NOIMSTRV = NOIMSTRV
 	local defines = parser:take_lines(CPRE..header,names,COMPILER)
 	
 	return parser
@@ -340,6 +349,8 @@ local parser1 = parseImGuiHeader(extra_includes .. [[headers.h]],headersT)
 os.remove("headers.h")
 parser1:do_parse()

+--to debug items parsing
+--save_data("./itemsarr2.txt",cpp2ffi.ToStr(parser1.itemsarr))
 save_data("./output/overloads.txt",parser1.overloadstxt)
 cimgui_generation(parser1)

--- a/generator/generator.sh
+++ b/generator/generator.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#!/bin/bash

 # this script must be executed in this directory
 # all the output goes to generator/output folder
@@ -13,13 +13,65 @@

 #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
+# 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
 # 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)
+#
+
+# parse command line arguments
+# ref: https://stackoverflow.com/questions/192249/how-do-i-parse-command-line-arguments-in-bash
+POSITIONAL_ARGS=()
+
+TARGETS="internal noimstrv"
+CFLAGS="glfw opengl3 opengl2 sdl2"
+
+help() {
+        cat <<EOF
+Usage of generator.sh:
+   -t --target    specify which imgui features should be generated
+                  (default: $TARGETS)
+   -c --cflags    specify additional gcc flags
+                  (default: $CFLAGS
+   -h --help      show this message and exit
+EOF
+}
+
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    -c|--cflags)
+      CFLAGS="$2"
+      shift # past argument
+      shift # past value
+      ;;
+    -t|--target)
+      TARGETS="$2"
+      shift # past argument
+      shift # past value
+      ;;
+    -h|--help)
+      help
+      exit 0
+      ;;
+    -*|--*)
+      echo "Unknown option $1"
+      help
+      exit 1
+      ;;
+    *)
+      POSITIONAL_ARGS+=("$1") # save positional arg
+      shift # past argument
+      ;;
+  esac
+done
+
+set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters

 if [[ "$OSTYPE" == "cygwin" || "$OSTYPE" == "msys" || "$OSTYPE" == "win32" ]];
 then
  suffix='.exe'
 fi

-luajit$suffix ./generator.lua gcc "internal" glfw opengl3 opengl2 sdl2
+echo "CFLAGS: " $CFLAGS
+echo "TARGETS: " $TARGETS
+
+luajit$suffix ./generator.lua gcc "$TARGETS" $CFLAGS
--- 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
@@ -17,7 +17,7 @@
      "cimguiname": "ImGui_ImplGlfw_CharCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_CharCallback",
-      "location": "imgui_impl_glfw:50",
+      "location": "imgui_impl_glfw:51",
      "ov_cimguiname": "ImGui_ImplGlfw_CharCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,unsigned int)",
@@ -42,7 +42,7 @@
      "cimguiname": "ImGui_ImplGlfw_CursorEnterCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_CursorEnterCallback",
-      "location": "imgui_impl_glfw:45",
+      "location": "imgui_impl_glfw:46",
      "ov_cimguiname": "ImGui_ImplGlfw_CursorEnterCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int)",
@@ -71,7 +71,7 @@
      "cimguiname": "ImGui_ImplGlfw_CursorPosCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_CursorPosCallback",
-      "location": "imgui_impl_glfw:46",
+      "location": "imgui_impl_glfw:47",
      "ov_cimguiname": "ImGui_ImplGlfw_CursorPosCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,double,double)",
@@ -96,7 +96,7 @@
      "cimguiname": "ImGui_ImplGlfw_InitForOpenGL",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_InitForOpenGL",
-      "location": "imgui_impl_glfw:27",
+      "location": "imgui_impl_glfw:28",
      "ov_cimguiname": "ImGui_ImplGlfw_InitForOpenGL",
      "ret": "bool",
      "signature": "(GLFWwindow*,bool)",
@@ -121,7 +121,7 @@
      "cimguiname": "ImGui_ImplGlfw_InitForOther",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_InitForOther",
-      "location": "imgui_impl_glfw:29",
+      "location": "imgui_impl_glfw:30",
      "ov_cimguiname": "ImGui_ImplGlfw_InitForOther",
      "ret": "bool",
      "signature": "(GLFWwindow*,bool)",
@@ -146,7 +146,7 @@
      "cimguiname": "ImGui_ImplGlfw_InitForVulkan",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_InitForVulkan",
-      "location": "imgui_impl_glfw:28",
+      "location": "imgui_impl_glfw:29",
      "ov_cimguiname": "ImGui_ImplGlfw_InitForVulkan",
      "ret": "bool",
      "signature": "(GLFWwindow*,bool)",
@@ -167,7 +167,7 @@
      "cimguiname": "ImGui_ImplGlfw_InstallCallbacks",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_InstallCallbacks",
-      "location": "imgui_impl_glfw:36",
+      "location": "imgui_impl_glfw:37",
      "ov_cimguiname": "ImGui_ImplGlfw_InstallCallbacks",
      "ret": "void",
      "signature": "(GLFWwindow*)",
@@ -204,7 +204,7 @@
      "cimguiname": "ImGui_ImplGlfw_KeyCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_KeyCallback",
-      "location": "imgui_impl_glfw:49",
+      "location": "imgui_impl_glfw:50",
      "ov_cimguiname": "ImGui_ImplGlfw_KeyCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int,int,int,int)",
@@ -229,7 +229,7 @@
      "cimguiname": "ImGui_ImplGlfw_MonitorCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_MonitorCallback",
-      "location": "imgui_impl_glfw:51",
+      "location": "imgui_impl_glfw:52",
      "ov_cimguiname": "ImGui_ImplGlfw_MonitorCallback",
      "ret": "void",
      "signature": "(GLFWmonitor*,int)",
@@ -262,7 +262,7 @@
      "cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_MouseButtonCallback",
-      "location": "imgui_impl_glfw:47",
+      "location": "imgui_impl_glfw:48",
      "ov_cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int,int,int)",
@@ -278,7 +278,7 @@
      "cimguiname": "ImGui_ImplGlfw_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_NewFrame",
-      "location": "imgui_impl_glfw:31",
+      "location": "imgui_impl_glfw:32",
      "ov_cimguiname": "ImGui_ImplGlfw_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -299,7 +299,7 @@
      "cimguiname": "ImGui_ImplGlfw_RestoreCallbacks",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_RestoreCallbacks",
-      "location": "imgui_impl_glfw:37",
+      "location": "imgui_impl_glfw:38",
      "ov_cimguiname": "ImGui_ImplGlfw_RestoreCallbacks",
      "ret": "void",
      "signature": "(GLFWwindow*)",
@@ -328,7 +328,7 @@
      "cimguiname": "ImGui_ImplGlfw_ScrollCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_ScrollCallback",
-      "location": "imgui_impl_glfw:48",
+      "location": "imgui_impl_glfw:49",
      "ov_cimguiname": "ImGui_ImplGlfw_ScrollCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,double,double)",
@@ -349,7 +349,7 @@
      "cimguiname": "ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
-      "location": "imgui_impl_glfw:41",
+      "location": "imgui_impl_glfw:42",
      "ov_cimguiname": "ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
      "ret": "void",
      "signature": "(bool)",
@@ -365,7 +365,7 @@
      "cimguiname": "ImGui_ImplGlfw_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_Shutdown",
-      "location": "imgui_impl_glfw:30",
+      "location": "imgui_impl_glfw:31",
      "ov_cimguiname": "ImGui_ImplGlfw_Shutdown",
      "ret": "void",
      "signature": "()",
@@ -390,7 +390,7 @@
      "cimguiname": "ImGui_ImplGlfw_WindowFocusCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_WindowFocusCallback",
-      "location": "imgui_impl_glfw:44",
+      "location": "imgui_impl_glfw:45",
      "ov_cimguiname": "ImGui_ImplGlfw_WindowFocusCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int)",
@@ -539,7 +539,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
-      "location": "imgui_impl_opengl3:33",
+      "location": "imgui_impl_opengl3:38",
      "ov_cimguiname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
      "ret": "bool",
      "signature": "()",
@@ -555,7 +555,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_CreateFontsTexture",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_CreateFontsTexture",
-      "location": "imgui_impl_opengl3:31",
+      "location": "imgui_impl_opengl3:36",
      "ov_cimguiname": "ImGui_ImplOpenGL3_CreateFontsTexture",
      "ret": "bool",
      "signature": "()",
@@ -571,7 +571,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
-      "location": "imgui_impl_opengl3:34",
+      "location": "imgui_impl_opengl3:39",
      "ov_cimguiname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
      "ret": "void",
      "signature": "()",
@@ -587,7 +587,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
-      "location": "imgui_impl_opengl3:32",
+      "location": "imgui_impl_opengl3:37",
      "ov_cimguiname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
      "ret": "void",
      "signature": "()",
@@ -610,7 +610,7 @@
        "glsl_version": "nullptr"
      },
      "funcname": "ImGui_ImplOpenGL3_Init",
-      "location": "imgui_impl_opengl3:25",
+      "location": "imgui_impl_opengl3:30",
      "ov_cimguiname": "ImGui_ImplOpenGL3_Init",
      "ret": "bool",
      "signature": "(const char*)",
@@ -626,7 +626,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_NewFrame",
-      "location": "imgui_impl_opengl3:27",
+      "location": "imgui_impl_opengl3:32",
      "ov_cimguiname": "ImGui_ImplOpenGL3_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -647,7 +647,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_RenderDrawData",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_RenderDrawData",
-      "location": "imgui_impl_opengl3:28",
+      "location": "imgui_impl_opengl3:33",
      "ov_cimguiname": "ImGui_ImplOpenGL3_RenderDrawData",
      "ret": "void",
      "signature": "(ImDrawData*)",
@@ -663,7 +663,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplOpenGL3_Shutdown",
-      "location": "imgui_impl_opengl3:26",
+      "location": "imgui_impl_opengl3:31",
      "ov_cimguiname": "ImGui_ImplOpenGL3_Shutdown",
      "ret": "void",
      "signature": "()",
@@ -684,7 +684,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForD3D",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForD3D",
-      "location": "imgui_impl_sdl2:29",
+      "location": "imgui_impl_sdl2:30",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForD3D",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -705,7 +705,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForMetal",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForMetal",
-      "location": "imgui_impl_sdl2:30",
+      "location": "imgui_impl_sdl2:31",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForMetal",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -730,7 +730,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForOpenGL",
-      "location": "imgui_impl_sdl2:27",
+      "location": "imgui_impl_sdl2:28",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
      "ret": "bool",
      "signature": "(SDL_Window*,void*)",
@@ -755,7 +755,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForSDLRenderer",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForSDLRenderer",
-      "location": "imgui_impl_sdl2:31",
+      "location": "imgui_impl_sdl2:32",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForSDLRenderer",
      "ret": "bool",
      "signature": "(SDL_Window*,SDL_Renderer*)",
@@ -776,7 +776,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForVulkan",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForVulkan",
-      "location": "imgui_impl_sdl2:28",
+      "location": "imgui_impl_sdl2:29",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForVulkan",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -792,7 +792,7 @@
      "cimguiname": "ImGui_ImplSDL2_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_NewFrame",
-      "location": "imgui_impl_sdl2:33",
+      "location": "imgui_impl_sdl2:34",
      "ov_cimguiname": "ImGui_ImplSDL2_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -813,7 +813,7 @@
      "cimguiname": "ImGui_ImplSDL2_ProcessEvent",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_ProcessEvent",
-      "location": "imgui_impl_sdl2:34",
+      "location": "imgui_impl_sdl2:35",
      "ov_cimguiname": "ImGui_ImplSDL2_ProcessEvent",
      "ret": "bool",
      "signature": "(const SDL_Event*)",
@@ -829,7 +829,7 @@
      "cimguiname": "ImGui_ImplSDL2_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_Shutdown",
-      "location": "imgui_impl_sdl2:32",
+      "location": "imgui_impl_sdl2:33",
      "ov_cimguiname": "ImGui_ImplSDL2_Shutdown",
      "ret": "void",
      "signature": "()",
--- a/generator/output/impl_definitions.lua
+++ b/generator/output/impl_definitions.lua
@@ -14,7 +14,7 @@ defs["ImGui_ImplGlfw_CharCallback"][1]["call_args"] = "(window,c)"
 defs["ImGui_ImplGlfw_CharCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_CharCallback"
 defs["ImGui_ImplGlfw_CharCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_CharCallback"][1]["funcname"] = "ImGui_ImplGlfw_CharCallback"
-defs["ImGui_ImplGlfw_CharCallback"][1]["location"] = "imgui_impl_glfw:50"
+defs["ImGui_ImplGlfw_CharCallback"][1]["location"] = "imgui_impl_glfw:51"
 defs["ImGui_ImplGlfw_CharCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_CharCallback"
 defs["ImGui_ImplGlfw_CharCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_CharCallback"][1]["signature"] = "(GLFWwindow*,unsigned int)"
@@ -35,7 +35,7 @@ defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["call_args"] = "(window,entered)"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_CursorEnterCallback"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["funcname"] = "ImGui_ImplGlfw_CursorEnterCallback"
-defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["location"] = "imgui_impl_glfw:45"
+defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["location"] = "imgui_impl_glfw:46"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_CursorEnterCallback"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["signature"] = "(GLFWwindow*,int)"
@@ -59,7 +59,7 @@ defs["ImGui_ImplGlfw_CursorPosCallback"][1]["call_args"] = "(window,x,y)"
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_CursorPosCallback"
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["funcname"] = "ImGui_ImplGlfw_CursorPosCallback"
-defs["ImGui_ImplGlfw_CursorPosCallback"][1]["location"] = "imgui_impl_glfw:46"
+defs["ImGui_ImplGlfw_CursorPosCallback"][1]["location"] = "imgui_impl_glfw:47"
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_CursorPosCallback"
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["signature"] = "(GLFWwindow*,double,double)"
@@ -80,7 +80,7 @@ defs["ImGui_ImplGlfw_InitForOpenGL"][1]["call_args"] = "(window,install_callback
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["cimguiname"] = "ImGui_ImplGlfw_InitForOpenGL"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["funcname"] = "ImGui_ImplGlfw_InitForOpenGL"
-defs["ImGui_ImplGlfw_InitForOpenGL"][1]["location"] = "imgui_impl_glfw:27"
+defs["ImGui_ImplGlfw_InitForOpenGL"][1]["location"] = "imgui_impl_glfw:28"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_InitForOpenGL"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["ret"] = "bool"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["signature"] = "(GLFWwindow*,bool)"
@@ -101,7 +101,7 @@ defs["ImGui_ImplGlfw_InitForOther"][1]["call_args"] = "(window,install_callbacks
 defs["ImGui_ImplGlfw_InitForOther"][1]["cimguiname"] = "ImGui_ImplGlfw_InitForOther"
 defs["ImGui_ImplGlfw_InitForOther"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_InitForOther"][1]["funcname"] = "ImGui_ImplGlfw_InitForOther"
-defs["ImGui_ImplGlfw_InitForOther"][1]["location"] = "imgui_impl_glfw:29"
+defs["ImGui_ImplGlfw_InitForOther"][1]["location"] = "imgui_impl_glfw:30"
 defs["ImGui_ImplGlfw_InitForOther"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_InitForOther"
 defs["ImGui_ImplGlfw_InitForOther"][1]["ret"] = "bool"
 defs["ImGui_ImplGlfw_InitForOther"][1]["signature"] = "(GLFWwindow*,bool)"
@@ -122,7 +122,7 @@ defs["ImGui_ImplGlfw_InitForVulkan"][1]["call_args"] = "(window,install_callback
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["cimguiname"] = "ImGui_ImplGlfw_InitForVulkan"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["funcname"] = "ImGui_ImplGlfw_InitForVulkan"
-defs["ImGui_ImplGlfw_InitForVulkan"][1]["location"] = "imgui_impl_glfw:28"
+defs["ImGui_ImplGlfw_InitForVulkan"][1]["location"] = "imgui_impl_glfw:29"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_InitForVulkan"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["ret"] = "bool"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["signature"] = "(GLFWwindow*,bool)"
@@ -140,7 +140,7 @@ defs["ImGui_ImplGlfw_InstallCallbacks"][1]["call_args"] = "(window)"
 defs["ImGui_ImplGlfw_InstallCallbacks"][1]["cimguiname"] = "ImGui_ImplGlfw_InstallCallbacks"
 defs["ImGui_ImplGlfw_InstallCallbacks"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_InstallCallbacks"][1]["funcname"] = "ImGui_ImplGlfw_InstallCallbacks"
-defs["ImGui_ImplGlfw_InstallCallbacks"][1]["location"] = "imgui_impl_glfw:36"
+defs["ImGui_ImplGlfw_InstallCallbacks"][1]["location"] = "imgui_impl_glfw:37"
 defs["ImGui_ImplGlfw_InstallCallbacks"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_InstallCallbacks"
 defs["ImGui_ImplGlfw_InstallCallbacks"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_InstallCallbacks"][1]["signature"] = "(GLFWwindow*)"
@@ -170,7 +170,7 @@ defs["ImGui_ImplGlfw_KeyCallback"][1]["call_args"] = "(window,key,scancode,actio
 defs["ImGui_ImplGlfw_KeyCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_KeyCallback"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_KeyCallback"][1]["funcname"] = "ImGui_ImplGlfw_KeyCallback"
-defs["ImGui_ImplGlfw_KeyCallback"][1]["location"] = "imgui_impl_glfw:49"
+defs["ImGui_ImplGlfw_KeyCallback"][1]["location"] = "imgui_impl_glfw:50"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_KeyCallback"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["signature"] = "(GLFWwindow*,int,int,int,int)"
@@ -191,7 +191,7 @@ defs["ImGui_ImplGlfw_MonitorCallback"][1]["call_args"] = "(monitor,event)"
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_MonitorCallback"
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["funcname"] = "ImGui_ImplGlfw_MonitorCallback"
-defs["ImGui_ImplGlfw_MonitorCallback"][1]["location"] = "imgui_impl_glfw:51"
+defs["ImGui_ImplGlfw_MonitorCallback"][1]["location"] = "imgui_impl_glfw:52"
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_MonitorCallback"
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["signature"] = "(GLFWmonitor*,int)"
@@ -218,7 +218,7 @@ defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["call_args"] = "(window,button,act
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_MouseButtonCallback"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["funcname"] = "ImGui_ImplGlfw_MouseButtonCallback"
-defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["location"] = "imgui_impl_glfw:47"
+defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["location"] = "imgui_impl_glfw:48"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_MouseButtonCallback"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["signature"] = "(GLFWwindow*,int,int,int)"
@@ -233,7 +233,7 @@ defs["ImGui_ImplGlfw_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplGlfw_NewFrame"][1]["cimguiname"] = "ImGui_ImplGlfw_NewFrame"
 defs["ImGui_ImplGlfw_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_NewFrame"][1]["funcname"] = "ImGui_ImplGlfw_NewFrame"
-defs["ImGui_ImplGlfw_NewFrame"][1]["location"] = "imgui_impl_glfw:31"
+defs["ImGui_ImplGlfw_NewFrame"][1]["location"] = "imgui_impl_glfw:32"
 defs["ImGui_ImplGlfw_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_NewFrame"
 defs["ImGui_ImplGlfw_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_NewFrame"][1]["signature"] = "()"
@@ -251,7 +251,7 @@ defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["call_args"] = "(window)"
 defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["cimguiname"] = "ImGui_ImplGlfw_RestoreCallbacks"
 defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["funcname"] = "ImGui_ImplGlfw_RestoreCallbacks"
-defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["location"] = "imgui_impl_glfw:37"
+defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["location"] = "imgui_impl_glfw:38"
 defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_RestoreCallbacks"
 defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["signature"] = "(GLFWwindow*)"
@@ -275,7 +275,7 @@ defs["ImGui_ImplGlfw_ScrollCallback"][1]["call_args"] = "(window,xoffset,yoffset
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_ScrollCallback"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["funcname"] = "ImGui_ImplGlfw_ScrollCallback"
-defs["ImGui_ImplGlfw_ScrollCallback"][1]["location"] = "imgui_impl_glfw:48"
+defs["ImGui_ImplGlfw_ScrollCallback"][1]["location"] = "imgui_impl_glfw:49"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_ScrollCallback"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["signature"] = "(GLFWwindow*,double,double)"
@@ -293,7 +293,7 @@ defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["call_args"] = "(chain_
 defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["cimguiname"] = "ImGui_ImplGlfw_SetCallbacksChainForAllWindows"
 defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["funcname"] = "ImGui_ImplGlfw_SetCallbacksChainForAllWindows"
-defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["location"] = "imgui_impl_glfw:41"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["location"] = "imgui_impl_glfw:42"
 defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_SetCallbacksChainForAllWindows"
 defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["signature"] = "(bool)"
@@ -308,7 +308,7 @@ defs["ImGui_ImplGlfw_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplGlfw_Shutdown"][1]["cimguiname"] = "ImGui_ImplGlfw_Shutdown"
 defs["ImGui_ImplGlfw_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_Shutdown"][1]["funcname"] = "ImGui_ImplGlfw_Shutdown"
-defs["ImGui_ImplGlfw_Shutdown"][1]["location"] = "imgui_impl_glfw:30"
+defs["ImGui_ImplGlfw_Shutdown"][1]["location"] = "imgui_impl_glfw:31"
 defs["ImGui_ImplGlfw_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_Shutdown"
 defs["ImGui_ImplGlfw_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_Shutdown"][1]["signature"] = "()"
@@ -329,7 +329,7 @@ defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["call_args"] = "(window,focused)"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_WindowFocusCallback"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["funcname"] = "ImGui_ImplGlfw_WindowFocusCallback"
-defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["location"] = "imgui_impl_glfw:44"
+defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["location"] = "imgui_impl_glfw:45"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_WindowFocusCallback"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["signature"] = "(GLFWwindow*,int)"
@@ -467,7 +467,7 @@ defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL3_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL3_CreateDeviceObjects"
-defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["location"] = "imgui_impl_opengl3:33"
+defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["location"] = "imgui_impl_opengl3:38"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["signature"] = "()"
@@ -482,7 +482,7 @@ defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL3_CreateFontsTexture"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL3_CreateFontsTexture"
-defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["location"] = "imgui_impl_opengl3:31"
+defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["location"] = "imgui_impl_opengl3:36"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_CreateFontsTexture"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["signature"] = "()"
@@ -497,7 +497,7 @@ defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL3_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL3_DestroyDeviceObjects"
-defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["location"] = "imgui_impl_opengl3:34"
+defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["location"] = "imgui_impl_opengl3:39"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["signature"] = "()"
@@ -512,7 +512,7 @@ defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL3_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL3_DestroyFontsTexture"
-defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["location"] = "imgui_impl_opengl3:32"
+defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["location"] = "imgui_impl_opengl3:37"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["signature"] = "()"
@@ -531,7 +531,7 @@ defs["ImGui_ImplOpenGL3_Init"][1]["cimguiname"] = "ImGui_ImplOpenGL3_Init"
 defs["ImGui_ImplOpenGL3_Init"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_Init"][1]["defaults"]["glsl_version"] = "nullptr"
 defs["ImGui_ImplOpenGL3_Init"][1]["funcname"] = "ImGui_ImplOpenGL3_Init"
-defs["ImGui_ImplOpenGL3_Init"][1]["location"] = "imgui_impl_opengl3:25"
+defs["ImGui_ImplOpenGL3_Init"][1]["location"] = "imgui_impl_opengl3:30"
 defs["ImGui_ImplOpenGL3_Init"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_Init"
 defs["ImGui_ImplOpenGL3_Init"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL3_Init"][1]["signature"] = "(const char*)"
@@ -546,7 +546,7 @@ defs["ImGui_ImplOpenGL3_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["cimguiname"] = "ImGui_ImplOpenGL3_NewFrame"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["funcname"] = "ImGui_ImplOpenGL3_NewFrame"
-defs["ImGui_ImplOpenGL3_NewFrame"][1]["location"] = "imgui_impl_opengl3:27"
+defs["ImGui_ImplOpenGL3_NewFrame"][1]["location"] = "imgui_impl_opengl3:32"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_NewFrame"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["signature"] = "()"
@@ -564,7 +564,7 @@ defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["call_args"] = "(draw_data)"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["cimguiname"] = "ImGui_ImplOpenGL3_RenderDrawData"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["funcname"] = "ImGui_ImplOpenGL3_RenderDrawData"
-defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["location"] = "imgui_impl_opengl3:28"
+defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["location"] = "imgui_impl_opengl3:33"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_RenderDrawData"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["signature"] = "(ImDrawData*)"
@@ -579,7 +579,7 @@ defs["ImGui_ImplOpenGL3_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["cimguiname"] = "ImGui_ImplOpenGL3_Shutdown"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["funcname"] = "ImGui_ImplOpenGL3_Shutdown"
-defs["ImGui_ImplOpenGL3_Shutdown"][1]["location"] = "imgui_impl_opengl3:26"
+defs["ImGui_ImplOpenGL3_Shutdown"][1]["location"] = "imgui_impl_opengl3:31"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_Shutdown"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["signature"] = "()"
@@ -597,7 +597,7 @@ defs["ImGui_ImplSDL2_InitForD3D"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForD3D"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForD3D"][1]["funcname"] = "ImGui_ImplSDL2_InitForD3D"
-defs["ImGui_ImplSDL2_InitForD3D"][1]["location"] = "imgui_impl_sdl2:29"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["location"] = "imgui_impl_sdl2:30"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForD3D"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["signature"] = "(SDL_Window*)"
@@ -615,7 +615,7 @@ defs["ImGui_ImplSDL2_InitForMetal"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForMetal"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForMetal"][1]["funcname"] = "ImGui_ImplSDL2_InitForMetal"
-defs["ImGui_ImplSDL2_InitForMetal"][1]["location"] = "imgui_impl_sdl2:30"
+defs["ImGui_ImplSDL2_InitForMetal"][1]["location"] = "imgui_impl_sdl2:31"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForMetal"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["signature"] = "(SDL_Window*)"
@@ -636,7 +636,7 @@ defs["ImGui_ImplSDL2_InitForOpenGL"][1]["call_args"] = "(window,sdl_gl_context)"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForOpenGL"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["funcname"] = "ImGui_ImplSDL2_InitForOpenGL"
-defs["ImGui_ImplSDL2_InitForOpenGL"][1]["location"] = "imgui_impl_sdl2:27"
+defs["ImGui_ImplSDL2_InitForOpenGL"][1]["location"] = "imgui_impl_sdl2:28"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForOpenGL"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["signature"] = "(SDL_Window*,void*)"
@@ -657,7 +657,7 @@ defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["call_args"] = "(window,renderer)"
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForSDLRenderer"
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["funcname"] = "ImGui_ImplSDL2_InitForSDLRenderer"
-defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["location"] = "imgui_impl_sdl2:31"
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["location"] = "imgui_impl_sdl2:32"
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForSDLRenderer"
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["signature"] = "(SDL_Window*,SDL_Renderer*)"
@@ -675,7 +675,7 @@ defs["ImGui_ImplSDL2_InitForVulkan"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForVulkan"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["funcname"] = "ImGui_ImplSDL2_InitForVulkan"
-defs["ImGui_ImplSDL2_InitForVulkan"][1]["location"] = "imgui_impl_sdl2:28"
+defs["ImGui_ImplSDL2_InitForVulkan"][1]["location"] = "imgui_impl_sdl2:29"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForVulkan"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["signature"] = "(SDL_Window*)"
@@ -690,7 +690,7 @@ defs["ImGui_ImplSDL2_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplSDL2_NewFrame"][1]["cimguiname"] = "ImGui_ImplSDL2_NewFrame"
 defs["ImGui_ImplSDL2_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_NewFrame"][1]["funcname"] = "ImGui_ImplSDL2_NewFrame"
-defs["ImGui_ImplSDL2_NewFrame"][1]["location"] = "imgui_impl_sdl2:33"
+defs["ImGui_ImplSDL2_NewFrame"][1]["location"] = "imgui_impl_sdl2:34"
 defs["ImGui_ImplSDL2_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_NewFrame"
 defs["ImGui_ImplSDL2_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplSDL2_NewFrame"][1]["signature"] = "()"
@@ -708,7 +708,7 @@ defs["ImGui_ImplSDL2_ProcessEvent"][1]["call_args"] = "(event)"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["cimguiname"] = "ImGui_ImplSDL2_ProcessEvent"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["funcname"] = "ImGui_ImplSDL2_ProcessEvent"
-defs["ImGui_ImplSDL2_ProcessEvent"][1]["location"] = "imgui_impl_sdl2:34"
+defs["ImGui_ImplSDL2_ProcessEvent"][1]["location"] = "imgui_impl_sdl2:35"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_ProcessEvent"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["signature"] = "(const SDL_Event*)"
@@ -723,7 +723,7 @@ defs["ImGui_ImplSDL2_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplSDL2_Shutdown"][1]["cimguiname"] = "ImGui_ImplSDL2_Shutdown"
 defs["ImGui_ImplSDL2_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_Shutdown"][1]["funcname"] = "ImGui_ImplSDL2_Shutdown"
-defs["ImGui_ImplSDL2_Shutdown"][1]["location"] = "imgui_impl_sdl2:32"
+defs["ImGui_ImplSDL2_Shutdown"][1]["location"] = "imgui_impl_sdl2:33"
 defs["ImGui_ImplSDL2_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_Shutdown"
 defs["ImGui_ImplSDL2_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplSDL2_Shutdown"][1]["signature"] = "()"
--- a/generator/output/overloads.txt
+++ b/generator/output/overloads.txt
@@ -126,6 +126,9 @@ igGetID	3
 igGetIDWithSeed	2
 1	ImGuiID	igGetIDWithSeed_Str (const char*,const char*,ImGuiID)
 2	ImGuiID	igGetIDWithSeed_Int (int,ImGuiID)
+igGetKeyData	2
+1	ImGuiKeyData*	igGetKeyData_ContextPtr (ImGuiContext*,ImGuiKey)
+2	ImGuiKeyData*	igGetKeyData_Key (ImGuiKey)
 igImAbs	3
 1	int	igImAbs_Int (int)
 2	float	igImAbs_Float (float)
@@ -278,4 +281,4 @@ igValue	4
 2	void	igValue_Int (const char*,int)
 3	void	igValue_Uint (const char*,unsigned int)
 4	void	igValue_Float (const char*,float,const char*)
-195 overloaded
+197 overloaded
--- a/generator/output/structs_and_enums.json
+++ b/generator/output/structs_and_enums.json
@@ -1074,23 +1074,28 @@
      },
      {
        "calc_value": 32,
-        "name": "ImGuiDebugLogFlags_EventIO",
+        "name": "ImGuiDebugLogFlags_EventSelection",
        "value": "1 << 5"
      },
      {
        "calc_value": 64,
-        "name": "ImGuiDebugLogFlags_EventDocking",
+        "name": "ImGuiDebugLogFlags_EventIO",
        "value": "1 << 6"
      },
      {
        "calc_value": 128,
-        "name": "ImGuiDebugLogFlags_EventViewport",
+        "name": "ImGuiDebugLogFlags_EventDocking",
        "value": "1 << 7"
      },
      {
-        "calc_value": 255,
+        "calc_value": 256,
+        "name": "ImGuiDebugLogFlags_EventViewport",
+        "value": "1 << 8"
+      },
+      {
+        "calc_value": 511,
        "name": "ImGuiDebugLogFlags_EventMask_",
-        "value": "ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventIO | ImGuiDebugLogFlags_EventDocking | ImGuiDebugLogFlags_EventViewport"
+        "value": "ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventSelection | ImGuiDebugLogFlags_EventIO | ImGuiDebugLogFlags_EventDocking | ImGuiDebugLogFlags_EventViewport"
      },
      {
        "calc_value": 1024,
@@ -1343,6 +1348,23 @@
        "value": "ImGuiDragDropFlags_AcceptBeforeDelivery | ImGuiDragDropFlags_AcceptNoDrawDefaultRect"
      }
    ],
+    "ImGuiFocusRequestFlags_": [
+      {
+        "calc_value": 0,
+        "name": "ImGuiFocusRequestFlags_None",
+        "value": "0"
+      },
+      {
+        "calc_value": 1,
+        "name": "ImGuiFocusRequestFlags_RestoreFocusedChild",
+        "value": "1 << 0"
+      },
+      {
+        "calc_value": 2,
+        "name": "ImGuiFocusRequestFlags_UnlessBelowModal",
+        "value": "1 << 1"
+      }
+    ],
    "ImGuiFocusedFlags_": [
      {
        "calc_value": 0,
@@ -1659,13 +1681,8 @@
      },
      {
        "calc_value": 5,
-        "name": "ImGuiInputSource_Nav",
-        "value": "5"
-      },
-      {
-        "calc_value": 6,
        "name": "ImGuiInputSource_COUNT",
-        "value": "6"
+        "value": "5"
      }
    ],
    "ImGuiInputTextFlagsPrivate_": [
@@ -2848,6 +2865,28 @@
        "value": "9"
      }
    ],
+    "ImGuiMouseSource": [
+      {
+        "calc_value": 0,
+        "name": "ImGuiMouseSource_Mouse",
+        "value": "0"
+      },
+      {
+        "calc_value": 1,
+        "name": "ImGuiMouseSource_TouchScreen",
+        "value": "1"
+      },
+      {
+        "calc_value": 2,
+        "name": "ImGuiMouseSource_Pen",
+        "value": "2"
+      },
+      {
+        "calc_value": 3,
+        "name": "ImGuiMouseSource_COUNT",
+        "value": "3"
+      }
+    ],
    "ImGuiNavHighlightFlags_": [
      {
        "calc_value": 0,
@@ -3005,6 +3044,11 @@
        "name": "ImGuiNavMoveFlags_WrapY",
        "value": "1 << 3"
      },
+      {
+        "calc_value": 15,
+        "name": "ImGuiNavMoveFlags_WrapMask_",
+        "value": "ImGuiNavMoveFlags_LoopX | ImGuiNavMoveFlags_LoopY | ImGuiNavMoveFlags_WrapX | ImGuiNavMoveFlags_WrapY"
+      },
      {
        "calc_value": 16,
        "name": "ImGuiNavMoveFlags_AllowCurrentNavId",
@@ -4271,23 +4315,28 @@
      },
      {
        "calc_value": 512,
-        "name": "ImGuiViewportFlags_TopMost",
+        "name": "ImGuiViewportFlags_NoAutoMerge",
        "value": "1 << 9"
      },
      {
        "calc_value": 1024,
-        "name": "ImGuiViewportFlags_Minimized",
+        "name": "ImGuiViewportFlags_TopMost",
        "value": "1 << 10"
      },
      {
        "calc_value": 2048,
-        "name": "ImGuiViewportFlags_NoAutoMerge",
+        "name": "ImGuiViewportFlags_CanHostOtherWindows",
        "value": "1 << 11"
      },
      {
        "calc_value": 4096,
-        "name": "ImGuiViewportFlags_CanHostOtherWindows",
+        "name": "ImGuiViewportFlags_IsMinimized",
        "value": "1 << 12"
+      },
+      {
+        "calc_value": 8192,
+        "name": "ImGuiViewportFlags_IsFocused",
+        "value": "1 << 13"
      }
    ],
    "ImGuiWindowDockStyleCol": [
@@ -4492,180 +4541,185 @@
  },
  "enumtypes": {
    "ImGuiKey": "int",
-    "ImGuiLocKey": "int"
+    "ImGuiLocKey": "int",
+    "ImGuiMouseSource": "int"
  },
  "locations": {
-    "ImBitVector": "imgui_internal:605",
-    "ImColor": "imgui:2462",
-    "ImDrawChannel": "imgui:2552",
-    "ImDrawCmd": "imgui:2511",
-    "ImDrawCmdHeader": "imgui:2544",
-    "ImDrawData": "imgui:2744",
-    "ImDrawDataBuilder": "imgui_internal:795",
-    "ImDrawFlags_": "imgui:2578",
-    "ImDrawList": "imgui:2616",
-    "ImDrawListFlags_": "imgui:2598",
-    "ImDrawListSharedData": "imgui_internal:772",
-    "ImDrawListSplitter": "imgui:2561",
-    "ImDrawVert": "imgui:2529",
-    "ImFont": "imgui:2964",
-    "ImFontAtlas": "imgui:2861",
-    "ImFontAtlasCustomRect": "imgui:2823",
-    "ImFontAtlasFlags_": "imgui:2836",
-    "ImFontBuilderIO": "imgui_internal:3506",
-    "ImFontConfig": "imgui:2767",
-    "ImFontGlyph": "imgui:2796",
-    "ImFontGlyphRangesBuilder": "imgui:2808",
-    "ImGuiActivateFlags_": "imgui_internal:1441",
-    "ImGuiAxis": "imgui_internal:961",
-    "ImGuiBackendFlags_": "imgui:1577",
-    "ImGuiButtonFlagsPrivate_": "imgui_internal:866",
-    "ImGuiButtonFlags_": "imgui:1694",
-    "ImGuiCol_": "imgui:1592",
-    "ImGuiColorEditFlags_": "imgui:1707",
-    "ImGuiColorMod": "imgui_internal:1004",
-    "ImGuiComboFlagsPrivate_": "imgui_internal:891",
-    "ImGuiComboFlags_": "imgui:1125",
-    "ImGuiComboPreviewData": "imgui_internal:1021",
-    "ImGuiCond_": "imgui:1798",
-    "ImGuiConfigFlags_": "imgui:1552",
-    "ImGuiContext": "imgui_internal:1911",
-    "ImGuiContextHook": "imgui_internal:1896",
-    "ImGuiContextHookType": "imgui_internal:1894",
-    "ImGuiDataAuthority_": "imgui_internal:1612",
-    "ImGuiDataTypeInfo": "imgui_internal:987",
-    "ImGuiDataTypePrivate_": "imgui_internal:996",
-    "ImGuiDataTypeTempStorage": "imgui_internal:981",
-    "ImGuiDataType_": "imgui:1377",
-    "ImGuiDebugLogFlags_": "imgui_internal:1834",
-    "ImGuiDir_": "imgui:1393",
-    "ImGuiDockContext": "imgui_internal:1710",
-    "ImGuiDockNode": "imgui_internal:1628",
-    "ImGuiDockNodeFlagsPrivate_": "imgui_internal:1587",
-    "ImGuiDockNodeFlags_": "imgui:1342",
-    "ImGuiDockNodeState": "imgui_internal:1619",
-    "ImGuiDragDropFlags_": "imgui:1355",
-    "ImGuiFocusedFlags_": "imgui:1302",
-    "ImGuiGroupData": "imgui_internal:1034",
-    "ImGuiHoveredFlags_": "imgui:1316",
-    "ImGuiIO": "imgui:1978",
-    "ImGuiInputEvent": "imgui_internal:1299",
-    "ImGuiInputEventAppFocused": "imgui_internal:1297",
-    "ImGuiInputEventKey": "imgui_internal:1295",
-    "ImGuiInputEventMouseButton": "imgui_internal:1293",
-    "ImGuiInputEventMousePos": "imgui_internal:1291",
-    "ImGuiInputEventMouseViewport": "imgui_internal:1294",
-    "ImGuiInputEventMouseWheel": "imgui_internal:1292",
-    "ImGuiInputEventText": "imgui_internal:1296",
-    "ImGuiInputEventType": "imgui_internal:1265",
-    "ImGuiInputFlags_": "imgui_internal:1362",
-    "ImGuiInputSource": "imgui_internal:1278",
-    "ImGuiInputTextCallbackData": "imgui:2166",
-    "ImGuiInputTextFlagsPrivate_": "imgui_internal:857",
-    "ImGuiInputTextFlags_": "imgui:1037",
-    "ImGuiInputTextState": "imgui_internal:1069",
-    "ImGuiItemFlags_": "imgui_internal:814",
-    "ImGuiItemStatusFlags_": "imgui_internal:834",
+    "ImBitVector": "imgui_internal:591",
+    "ImColor": "imgui:2520",
+    "ImDrawChannel": "imgui:2610",
+    "ImDrawCmd": "imgui:2569",
+    "ImDrawCmdHeader": "imgui:2602",
+    "ImDrawData": "imgui:2801",
+    "ImDrawDataBuilder": "imgui_internal:781",
+    "ImDrawFlags_": "imgui:2636",
+    "ImDrawList": "imgui:2674",
+    "ImDrawListFlags_": "imgui:2656",
+    "ImDrawListSharedData": "imgui_internal:758",
+    "ImDrawListSplitter": "imgui:2619",
+    "ImDrawVert": "imgui:2587",
+    "ImFont": "imgui:3022",
+    "ImFontAtlas": "imgui:2918",
+    "ImFontAtlasCustomRect": "imgui:2880",
+    "ImFontAtlasFlags_": "imgui:2893",
+    "ImFontBuilderIO": "imgui_internal:3556",
+    "ImFontConfig": "imgui:2824",
+    "ImFontGlyph": "imgui:2853",
+    "ImFontGlyphRangesBuilder": "imgui:2865",
+    "ImGuiActivateFlags_": "imgui_internal:1458",
+    "ImGuiAxis": "imgui_internal:959",
+    "ImGuiBackendFlags_": "imgui:1578",
+    "ImGuiButtonFlagsPrivate_": "imgui_internal:854",
+    "ImGuiButtonFlags_": "imgui:1695",
+    "ImGuiCol_": "imgui:1593",
+    "ImGuiColorEditFlags_": "imgui:1708",
+    "ImGuiColorMod": "imgui_internal:1010",
+    "ImGuiComboFlagsPrivate_": "imgui_internal:879",
+    "ImGuiComboFlags_": "imgui:1124",
+    "ImGuiComboPreviewData": "imgui_internal:1027",
+    "ImGuiCond_": "imgui:1809",
+    "ImGuiConfigFlags_": "imgui:1553",
+    "ImGuiContext": "imgui_internal:1931",
+    "ImGuiContextHook": "imgui_internal:1916",
+    "ImGuiContextHookType": "imgui_internal:1914",
+    "ImGuiDataAuthority_": "imgui_internal:1630",
+    "ImGuiDataTypeInfo": "imgui_internal:993",
+    "ImGuiDataTypePrivate_": "imgui_internal:1002",
+    "ImGuiDataTypeTempStorage": "imgui_internal:987",
+    "ImGuiDataType_": "imgui:1376",
+    "ImGuiDataVarInfo": "imgui_internal:979",
+    "ImGuiDebugLogFlags_": "imgui_internal:1853",
+    "ImGuiDir_": "imgui:1392",
+    "ImGuiDockContext": "imgui_internal:1728",
+    "ImGuiDockNode": "imgui_internal:1646",
+    "ImGuiDockNodeFlagsPrivate_": "imgui_internal:1605",
+    "ImGuiDockNodeFlags_": "imgui:1341",
+    "ImGuiDockNodeState": "imgui_internal:1637",
+    "ImGuiDragDropFlags_": "imgui:1354",
+    "ImGuiFocusRequestFlags_": "imgui_internal:922",
+    "ImGuiFocusedFlags_": "imgui:1301",
+    "ImGuiGroupData": "imgui_internal:1040",
+    "ImGuiHoveredFlags_": "imgui:1315",
+    "ImGuiIO": "imgui:1989",
+    "ImGuiInputEvent": "imgui_internal:1314",
+    "ImGuiInputEventAppFocused": "imgui_internal:1312",
+    "ImGuiInputEventKey": "imgui_internal:1310",
+    "ImGuiInputEventMouseButton": "imgui_internal:1308",
+    "ImGuiInputEventMousePos": "imgui_internal:1306",
+    "ImGuiInputEventMouseViewport": "imgui_internal:1309",
+    "ImGuiInputEventMouseWheel": "imgui_internal:1307",
+    "ImGuiInputEventText": "imgui_internal:1311",
+    "ImGuiInputEventType": "imgui_internal:1281",
+    "ImGuiInputFlags_": "imgui_internal:1378",
+    "ImGuiInputSource": "imgui_internal:1294",
+    "ImGuiInputTextCallbackData": "imgui:2194",
+    "ImGuiInputTextDeactivatedState": "imgui_internal:1074",
+    "ImGuiInputTextFlagsPrivate_": "imgui_internal:845",
+    "ImGuiInputTextFlags_": "imgui:1038",
+    "ImGuiInputTextState": "imgui_internal:1084",
+    "ImGuiItemFlags_": "imgui_internal:800",
+    "ImGuiItemStatusFlags_": "imgui_internal:820",
    "ImGuiKey": "imgui:1415",
-    "ImGuiKeyData": "imgui:1970",
-    "ImGuiKeyOwnerData": "imgui_internal:1350",
-    "ImGuiKeyRoutingData": "imgui_internal:1325",
-    "ImGuiKeyRoutingTable": "imgui_internal:1338",
-    "ImGuiLastItemData": "imgui_internal:1184",
-    "ImGuiLayoutType_": "imgui_internal:945",
-    "ImGuiListClipper": "imgui:2411",
-    "ImGuiListClipperData": "imgui_internal:1425",
-    "ImGuiListClipperRange": "imgui_internal:1412",
-    "ImGuiLocEntry": "imgui_internal:1823",
-    "ImGuiLocKey": "imgui_internal:1810",
-    "ImGuiLogType": "imgui_internal:951",
-    "ImGuiMenuColumns": "imgui_internal:1050",
-    "ImGuiMetricsConfig": "imgui_internal:1850",
-    "ImGuiMouseButton_": "imgui:1770",
-    "ImGuiMouseCursor_": "imgui:1780",
-    "ImGuiNavHighlightFlags_": "imgui_internal:1464",
-    "ImGuiNavInput": "imgui:1543",
-    "ImGuiNavItemData": "imgui_internal:1498",
-    "ImGuiNavLayer": "imgui_internal:1491",
-    "ImGuiNavMoveFlags_": "imgui_internal:1473",
-    "ImGuiNextItemData": "imgui_internal:1171",
-    "ImGuiNextItemDataFlags_": "imgui_internal:1164",
-    "ImGuiNextWindowData": "imgui_internal:1137",
-    "ImGuiNextWindowDataFlags_": "imgui_internal:1120",
-    "ImGuiOldColumnData": "imgui_internal:1538",
-    "ImGuiOldColumnFlags_": "imgui_internal:1518",
-    "ImGuiOldColumns": "imgui_internal:1548",
-    "ImGuiOnceUponAFrame": "imgui:2286",
-    "ImGuiPayload": "imgui:2227",
-    "ImGuiPlatformIO": "imgui:3131",
-    "ImGuiPlatformImeData": "imgui:3203",
-    "ImGuiPlatformMonitor": "imgui:3194",
-    "ImGuiPlotType": "imgui_internal:968",
-    "ImGuiPopupData": "imgui_internal:1106",
-    "ImGuiPopupFlags_": "imgui:1098",
-    "ImGuiPopupPositionPolicy": "imgui_internal:974",
-    "ImGuiPtrOrIndex": "imgui_internal:1228",
-    "ImGuiScrollFlags_": "imgui_internal:1450",
-    "ImGuiSelectableFlagsPrivate_": "imgui_internal:904",
-    "ImGuiSelectableFlags_": "imgui:1114",
-    "ImGuiSeparatorFlags_": "imgui_internal:923",
-    "ImGuiSettingsHandler": "imgui_internal:1790",
-    "ImGuiShrinkWidthItem": "imgui_internal:1221",
-    "ImGuiSizeCallbackData": "imgui:2197",
-    "ImGuiSliderFlagsPrivate_": "imgui_internal:897",
-    "ImGuiSliderFlags_": "imgui:1753",
-    "ImGuiSortDirection_": "imgui:1404",
-    "ImGuiStackLevelInfo": "imgui_internal:1865",
-    "ImGuiStackSizes": "imgui_internal:1196",
-    "ImGuiStackTool": "imgui_internal:1877",
-    "ImGuiStorage": "imgui:2348",
-    "ImGuiStoragePair": "imgui:2351",
-    "ImGuiStyle": "imgui:1910",
-    "ImGuiStyleMod": "imgui_internal:1011",
-    "ImGuiStyleVar_": "imgui:1659",
-    "ImGuiTabBar": "imgui_internal:2629",
-    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2591",
-    "ImGuiTabBarFlags_": "imgui:1139",
-    "ImGuiTabItem": "imgui_internal:2609",
-    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2599",
-    "ImGuiTabItemFlags_": "imgui:1155",
-    "ImGuiTable": "imgui_internal:2758",
-    "ImGuiTableBgTarget_": "imgui:1293",
-    "ImGuiTableCellData": "imgui_internal:2740",
-    "ImGuiTableColumn": "imgui_internal:2681",
-    "ImGuiTableColumnFlags_": "imgui:1241",
-    "ImGuiTableColumnSettings": "imgui_internal:2894",
-    "ImGuiTableColumnSortSpecs": "imgui:2249",
-    "ImGuiTableFlags_": "imgui:1190",
-    "ImGuiTableInstanceData": "imgui_internal:2747",
-    "ImGuiTableRowFlags_": "imgui:1278",
-    "ImGuiTableSettings": "imgui_internal:2918",
-    "ImGuiTableSortSpecs": "imgui:2263",
-    "ImGuiTableTempData": "imgui_internal:2873",
-    "ImGuiTextBuffer": "imgui:2321",
-    "ImGuiTextFilter": "imgui:2294",
-    "ImGuiTextFlags_": "imgui_internal:931",
-    "ImGuiTextIndex": "imgui_internal:729",
-    "ImGuiTextRange": "imgui:2304",
-    "ImGuiTooltipFlags_": "imgui_internal:937",
-    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:918",
-    "ImGuiTreeNodeFlags_": "imgui:1069",
-    "ImGuiViewport": "imgui:3047",
-    "ImGuiViewportFlags_": "imgui:3022",
-    "ImGuiViewportP": "imgui_internal:1727",
-    "ImGuiWindow": "imgui_internal:2444",
-    "ImGuiWindowClass": "imgui:2212",
-    "ImGuiWindowDockStyle": "imgui_internal:1705",
-    "ImGuiWindowDockStyleCol": "imgui_internal:1694",
-    "ImGuiWindowFlags_": "imgui:996",
-    "ImGuiWindowSettings": "imgui_internal:1772",
-    "ImGuiWindowStackData": "imgui_internal:1214",
-    "ImGuiWindowTempData": "imgui_internal:2396",
-    "ImRect": "imgui_internal:528",
-    "ImVec1": "imgui_internal:510",
-    "ImVec2": "imgui:259",
-    "ImVec2ih": "imgui_internal:518",
-    "ImVec4": "imgui:272",
+    "ImGuiKeyData": "imgui:1981",
+    "ImGuiKeyOwnerData": "imgui_internal:1366",
+    "ImGuiKeyRoutingData": "imgui_internal:1341",
+    "ImGuiKeyRoutingTable": "imgui_internal:1354",
+    "ImGuiLastItemData": "imgui_internal:1199",
+    "ImGuiLayoutType_": "imgui_internal:943",
+    "ImGuiListClipper": "imgui:2440",
+    "ImGuiListClipperData": "imgui_internal:1442",
+    "ImGuiListClipperRange": "imgui_internal:1429",
+    "ImGuiLocEntry": "imgui_internal:1842",
+    "ImGuiLocKey": "imgui_internal:1829",
+    "ImGuiLogType": "imgui_internal:949",
+    "ImGuiMenuColumns": "imgui_internal:1056",
+    "ImGuiMetricsConfig": "imgui_internal:1870",
+    "ImGuiMouseButton_": "imgui:1769",
+    "ImGuiMouseCursor_": "imgui:1779",
+    "ImGuiMouseSource": "imgui:1798",
+    "ImGuiNavHighlightFlags_": "imgui_internal:1481",
+    "ImGuiNavInput": "imgui:1544",
+    "ImGuiNavItemData": "imgui_internal:1516",
+    "ImGuiNavLayer": "imgui_internal:1509",
+    "ImGuiNavMoveFlags_": "imgui_internal:1490",
+    "ImGuiNextItemData": "imgui_internal:1186",
+    "ImGuiNextItemDataFlags_": "imgui_internal:1179",
+    "ImGuiNextWindowData": "imgui_internal:1152",
+    "ImGuiNextWindowDataFlags_": "imgui_internal:1135",
+    "ImGuiOldColumnData": "imgui_internal:1556",
+    "ImGuiOldColumnFlags_": "imgui_internal:1536",
+    "ImGuiOldColumns": "imgui_internal:1566",
+    "ImGuiOnceUponAFrame": "imgui:2315",
+    "ImGuiPayload": "imgui:2256",
+    "ImGuiPlatformIO": "imgui:3192",
+    "ImGuiPlatformImeData": "imgui:3265",
+    "ImGuiPlatformMonitor": "imgui:3255",
+    "ImGuiPlotType": "imgui_internal:966",
+    "ImGuiPopupData": "imgui_internal:1121",
+    "ImGuiPopupFlags_": "imgui:1097",
+    "ImGuiPopupPositionPolicy": "imgui_internal:972",
+    "ImGuiPtrOrIndex": "imgui_internal:1243",
+    "ImGuiScrollFlags_": "imgui_internal:1467",
+    "ImGuiSelectableFlagsPrivate_": "imgui_internal:892",
+    "ImGuiSelectableFlags_": "imgui:1113",
+    "ImGuiSeparatorFlags_": "imgui_internal:911",
+    "ImGuiSettingsHandler": "imgui_internal:1809",
+    "ImGuiShrinkWidthItem": "imgui_internal:1236",
+    "ImGuiSizeCallbackData": "imgui:2226",
+    "ImGuiSliderFlagsPrivate_": "imgui_internal:885",
+    "ImGuiSliderFlags_": "imgui:1754",
+    "ImGuiSortDirection_": "imgui:1403",
+    "ImGuiStackLevelInfo": "imgui_internal:1885",
+    "ImGuiStackSizes": "imgui_internal:1211",
+    "ImGuiStackTool": "imgui_internal:1897",
+    "ImGuiStorage": "imgui:2377",
+    "ImGuiStoragePair": "imgui:2380",
+    "ImGuiStyle": "imgui:1921",
+    "ImGuiStyleMod": "imgui_internal:1017",
+    "ImGuiStyleVar_": "imgui:1660",
+    "ImGuiTabBar": "imgui_internal:2666",
+    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2628",
+    "ImGuiTabBarFlags_": "imgui:1138",
+    "ImGuiTabItem": "imgui_internal:2646",
+    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2636",
+    "ImGuiTabItemFlags_": "imgui:1154",
+    "ImGuiTable": "imgui_internal:2796",
+    "ImGuiTableBgTarget_": "imgui:1292",
+    "ImGuiTableCellData": "imgui_internal:2777",
+    "ImGuiTableColumn": "imgui_internal:2718",
+    "ImGuiTableColumnFlags_": "imgui:1240",
+    "ImGuiTableColumnSettings": "imgui_internal:2933",
+    "ImGuiTableColumnSortSpecs": "imgui:2278",
+    "ImGuiTableFlags_": "imgui:1189",
+    "ImGuiTableInstanceData": "imgui_internal:2784",
+    "ImGuiTableRowFlags_": "imgui:1277",
+    "ImGuiTableSettings": "imgui_internal:2957",
+    "ImGuiTableSortSpecs": "imgui:2292",
+    "ImGuiTableTempData": "imgui_internal:2912",
+    "ImGuiTextBuffer": "imgui:2350",
+    "ImGuiTextFilter": "imgui:2323",
+    "ImGuiTextFlags_": "imgui_internal:929",
+    "ImGuiTextIndex": "imgui_internal:715",
+    "ImGuiTextRange": "imgui:2333",
+    "ImGuiTooltipFlags_": "imgui_internal:935",
+    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:906",
+    "ImGuiTreeNodeFlags_": "imgui:1068",
+    "ImGuiViewport": "imgui:3108",
+    "ImGuiViewportFlags_": "imgui:3080",
+    "ImGuiViewportP": "imgui_internal:1745",
+    "ImGuiWindow": "imgui_internal:2479",
+    "ImGuiWindowClass": "imgui:2241",
+    "ImGuiWindowDockStyle": "imgui_internal:1723",
+    "ImGuiWindowDockStyleCol": "imgui_internal:1712",
+    "ImGuiWindowFlags_": "imgui:997",
+    "ImGuiWindowSettings": "imgui_internal:1791",
+    "ImGuiWindowStackData": "imgui_internal:1229",
+    "ImGuiWindowTempData": "imgui_internal:2430",
+    "ImRect": "imgui_internal:514",
+    "ImVec1": "imgui_internal:496",
+    "ImVec2": "imgui:260",
+    "ImVec2ih": "imgui_internal:504",
+    "ImVec4": "imgui:273",
    "STB_TexteditState": "imstb_textedit:320",
    "StbTexteditRow": "imstb_textedit:367",
    "StbUndoRecord": "imstb_textedit:302",
@@ -5349,16 +5403,6 @@
        "name": "PlatformIO",
        "type": "ImGuiPlatformIO"
      },
-      {
-        "name": "InputEventsQueue",
-        "template_type": "ImGuiInputEvent",
-        "type": "ImVector_ImGuiInputEvent"
-      },
-      {
-        "name": "InputEventsTrail",
-        "template_type": "ImGuiInputEvent",
-        "type": "ImVector_ImGuiInputEvent"
-      },
      {
        "name": "Style",
        "type": "ImGuiStyle"
@@ -5431,6 +5475,24 @@
        "name": "TestEngine",
        "type": "void*"
      },
+      {
+        "name": "InputEventsQueue",
+        "template_type": "ImGuiInputEvent",
+        "type": "ImVector_ImGuiInputEvent"
+      },
+      {
+        "name": "InputEventsTrail",
+        "template_type": "ImGuiInputEvent",
+        "type": "ImVector_ImGuiInputEvent"
+      },
+      {
+        "name": "InputEventsNextMouseSource",
+        "type": "ImGuiMouseSource"
+      },
+      {
+        "name": "InputEventsNextEventId",
+        "type": "ImU32"
+      },
      {
        "name": "Windows",
        "template_type": "ImGuiWindow*",
@@ -5726,7 +5788,7 @@
        "type": "ImGuiPlatformMonitor"
      },
      {
-        "name": "ViewportFrontMostStampCount",
+        "name": "ViewportFocusedStampCount",
        "type": "int"
      },
      {
@@ -5753,10 +5815,6 @@
        "name": "NavActivatePressedId",
        "type": "ImGuiID"
      },
-      {
-        "name": "NavActivateInputId",
-        "type": "ImGuiID"
-      },
      {
        "name": "NavActivateFlags",
        "type": "ImGuiActivateFlags"
@@ -5818,12 +5876,8 @@
        "type": "bool"
      },
      {
-        "name": "NavInitResultId",
-        "type": "ImGuiID"
-      },
-      {
-        "name": "NavInitResultRectRel",
-        "type": "ImRect"
+        "name": "NavInitResult",
+        "type": "ImGuiNavItemData"
      },
      {
        "name": "NavMoveSubmitted",
@@ -6095,6 +6149,10 @@
        "name": "InputTextState",
        "type": "ImGuiInputTextState"
      },
+      {
+        "name": "InputTextDeactivatedState",
+        "type": "ImGuiInputTextDeactivatedState"
+      },
      {
        "name": "InputTextPasswordFont",
        "type": "ImFont"
@@ -6205,6 +6263,10 @@
        "name": "DockContext",
        "type": "ImGuiDockContext"
      },
+      {
+        "name": "DockNodeWindowMenuHandler",
+        "type": "void(*)(ImGuiContext* ctx,ImGuiDockNode* node,ImGuiTabBar* tab_bar)"
+      },
      {
        "name": "SettingsLoaded",
        "type": "bool"
@@ -6302,10 +6364,18 @@
        "name": "DebugLogIndex",
        "type": "ImGuiTextIndex"
      },
+      {
+        "name": "DebugLogClipperAutoDisableFrames",
+        "type": "ImU8"
+      },
      {
        "name": "DebugLocateFrames",
        "type": "ImU8"
      },
+      {
+        "name": "DebugBeginReturnValueCullDepth",
+        "type": "ImS8"
+      },
      {
        "name": "DebugItemPickerActive",
        "type": "bool"
@@ -6412,6 +6482,20 @@
        "type": "ImU8"
      }
    ],
+    "ImGuiDataVarInfo": [
+      {
+        "name": "Type",
+        "type": "ImGuiDataType"
+      },
+      {
+        "name": "Count",
+        "type": "ImU32"
+      },
+      {
+        "name": "Offset",
+        "type": "ImU32"
+      }
+    ],
    "ImGuiDockContext": [
      {
        "name": "Nodes",
@@ -6809,6 +6893,18 @@
        "name": "ConfigMemoryCompactTimer",
        "type": "float"
      },
+      {
+        "name": "ConfigDebugBeginReturnValueOnce",
+        "type": "bool"
+      },
+      {
+        "name": "ConfigDebugBeginReturnValueLoop",
+        "type": "bool"
+      },
+      {
+        "name": "ConfigDebugIgnoreFocusLoss",
+        "type": "bool"
+      },
      {
        "name": "BackendPlatformName",
        "type": "const char*"
@@ -6920,6 +7016,10 @@
        "size": 16,
        "type": "float"
      },
+      {
+        "name": "Ctx",
+        "type": "ImGuiContext*"
+      },
      {
        "name": "MousePos",
        "type": "ImVec2"
@@ -6937,6 +7037,10 @@
        "name": "MouseWheelH",
        "type": "float"
      },
+      {
+        "name": "MouseSource",
+        "type": "ImGuiMouseSource"
+      },
      {
        "name": "MouseHoveredViewport",
        "type": "ImGuiID"
@@ -7019,6 +7123,10 @@
        "size": 5,
        "type": "bool"
      },
+      {
+        "name": "MouseWheelRequestAxisSwap",
+        "type": "bool"
+      },
      {
        "name": "MouseDownDuration[5]",
        "size": 5,
@@ -7078,6 +7186,10 @@
        "name": "Source",
        "type": "ImGuiInputSource"
      },
+      {
+        "name": "EventId",
+        "type": "ImU32"
+      },
      {
        "name": "",
        "type": "union { ImGuiInputEventMousePos MousePos; ImGuiInputEventMouseWheel MouseWheel; ImGuiInputEventMouseButton MouseButton; ImGuiInputEventMouseViewport MouseViewport; ImGuiInputEventKey Key; ImGuiInputEventText Text; ImGuiInputEventAppFocused AppFocused;}"
@@ -7115,6 +7227,10 @@
      {
        "name": "Down",
        "type": "bool"
+      },
+      {
+        "name": "MouseSource",
+        "type": "ImGuiMouseSource"
      }
    ],
    "ImGuiInputEventMousePos": [
@@ -7125,6 +7241,10 @@
      {
        "name": "PosY",
        "type": "float"
+      },
+      {
+        "name": "MouseSource",
+        "type": "ImGuiMouseSource"
      }
    ],
    "ImGuiInputEventMouseViewport": [
@@ -7141,6 +7261,10 @@
      {
        "name": "WheelY",
        "type": "float"
+      },
+      {
+        "name": "MouseSource",
+        "type": "ImGuiMouseSource"
      }
    ],
    "ImGuiInputEventText": [
@@ -7150,6 +7274,10 @@
      }
    ],
    "ImGuiInputTextCallbackData": [
+      {
+        "name": "Ctx",
+        "type": "ImGuiContext*"
+      },
      {
        "name": "EventFlag",
        "type": "ImGuiInputTextFlags"
@@ -7199,6 +7327,17 @@
        "type": "int"
      }
    ],
+    "ImGuiInputTextDeactivatedState": [
+      {
+        "name": "ID",
+        "type": "ImGuiID"
+      },
+      {
+        "name": "TextA",
+        "template_type": "char",
+        "type": "ImVector_char"
+      }
+    ],
    "ImGuiInputTextState": [
      {
        "name": "Ctx",
@@ -7370,6 +7509,10 @@
      }
    ],
    "ImGuiListClipper": [
+      {
+        "name": "Ctx",
+        "type": "ImGuiContext*"
+      },
      {
        "name": "DisplayStart",
        "type": "int"
@@ -7937,6 +8080,10 @@
      {
        "name": "DpiScale",
        "type": "float"
+      },
+      {
+        "name": "PlatformHandle",
+        "type": "void*"
      }
    ],
    "ImGuiPopupData": [
@@ -9421,6 +9568,10 @@
        "name": "_ImGuiViewport",
        "type": "ImGuiViewport"
      },
+      {
+        "name": "Window",
+        "type": "ImGuiWindow*"
+      },
      {
        "name": "Idx",
        "type": "int"
@@ -9430,7 +9581,7 @@
        "type": "int"
      },
      {
-        "name": "LastFrontMostStampCount",
+        "name": "LastFocusedStampCount",
        "type": "int"
      },
      {
@@ -9450,12 +9601,12 @@
        "type": "float"
      },
      {
-        "name": "PlatformMonitor",
-        "type": "short"
+        "name": "LastFocusedHadNavWindow",
+        "type": "bool"
      },
      {
-        "name": "Window",
-        "type": "ImGuiWindow*"
+        "name": "PlatformMonitor",
+        "type": "short"
      },
      {
        "name": "DrawListsLastFrame[2]",
@@ -9505,6 +9656,10 @@
      }
    ],
    "ImGuiWindow": [
+      {
+        "name": "Ctx",
+        "type": "ImGuiContext*"
+      },
      {
        "name": "Name",
        "type": "char*"
@@ -9921,6 +10076,11 @@
        "size": 2,
        "type": "ImRect"
      },
+      {
+        "name": "NavPreferredScoringPosRel[ImGuiNavLayer_COUNT]",
+        "size": 2,
+        "type": "ImVec2"
+      },
      {
        "name": "NavRootFocusScopeId",
        "type": "ImGuiID"
@@ -10160,12 +10320,16 @@
        "name": "NavLayersActiveMaskNext",
        "type": "short"
      },
+      {
+        "name": "NavIsScrollPushableX",
+        "type": "bool"
+      },
      {
        "name": "NavHideHighlightOneFrame",
        "type": "bool"
      },
      {
-        "name": "NavHasScroll",
+        "name": "NavWindowHasScrollY",
        "type": "bool"
      },
      {
--- a/generator/output/structs_and_enums.lua
+++ b/generator/output/structs_and_enums.lua
--- a/generator/output/typedefs_dict.json
+++ b/generator/output/typedefs_dict.json
@@ -42,6 +42,7 @@
  "ImGuiDataType": "int",
  "ImGuiDataTypeInfo": "struct ImGuiDataTypeInfo",
  "ImGuiDataTypeTempStorage": "struct ImGuiDataTypeTempStorage",
+  "ImGuiDataVarInfo": "struct ImGuiDataVarInfo",
  "ImGuiDebugLogFlags": "int",
  "ImGuiDir": "int",
  "ImGuiDockContext": "struct ImGuiDockContext",
@@ -51,6 +52,7 @@
  "ImGuiDockRequest": "struct ImGuiDockRequest",
  "ImGuiDragDropFlags": "int",
  "ImGuiErrorLogCallback": "void(*)(void* user_data,const char* fmt,...);",
+  "ImGuiFocusRequestFlags": "int",
  "ImGuiFocusedFlags": "int",
  "ImGuiGroupData": "struct ImGuiGroupData",
  "ImGuiHoveredFlags": "int",
@@ -67,6 +69,8 @@
  "ImGuiInputFlags": "int",
  "ImGuiInputTextCallback": "int(*)(ImGuiInputTextCallbackData* data);",
  "ImGuiInputTextCallbackData": "struct ImGuiInputTextCallbackData",
+  "ImGuiInputTextDeactivateData": "struct ImGuiInputTextDeactivateData",
+  "ImGuiInputTextDeactivatedState": "struct ImGuiInputTextDeactivatedState",
  "ImGuiInputTextFlags": "int",
  "ImGuiInputTextState": "struct ImGuiInputTextState",
  "ImGuiItemFlags": "int",
--- a/generator/output/typedefs_dict.lua
+++ b/generator/output/typedefs_dict.lua
@@ -42,6 +42,7 @@ defs["ImGuiDataAuthority"] = "int"
 defs["ImGuiDataType"] = "int"
 defs["ImGuiDataTypeInfo"] = "struct ImGuiDataTypeInfo"
 defs["ImGuiDataTypeTempStorage"] = "struct ImGuiDataTypeTempStorage"
+defs["ImGuiDataVarInfo"] = "struct ImGuiDataVarInfo"
 defs["ImGuiDebugLogFlags"] = "int"
 defs["ImGuiDir"] = "int"
 defs["ImGuiDockContext"] = "struct ImGuiDockContext"
@@ -51,6 +52,7 @@ defs["ImGuiDockNodeSettings"] = "struct ImGuiDockNodeSettings"
 defs["ImGuiDockRequest"] = "struct ImGuiDockRequest"
 defs["ImGuiDragDropFlags"] = "int"
 defs["ImGuiErrorLogCallback"] = "void(*)(void* user_data,const char* fmt,...);"
+defs["ImGuiFocusRequestFlags"] = "int"
 defs["ImGuiFocusedFlags"] = "int"
 defs["ImGuiGroupData"] = "struct ImGuiGroupData"
 defs["ImGuiHoveredFlags"] = "int"
@@ -67,6 +69,8 @@ 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"
--- a/2
+++ b/2
Author	SHA1	Message	Date
sonoro1234	55c6f914a7	pull imgui 1.89.6 and generate	2023-06-18 18:57:27 +02:00
sonoro1234	a5f9979d90	clean debug output	2023-06-18 18:56:17 +02:00
sonoro1234	a65bf47a5f	solve union with comments #241	2023-06-18 18:50:28 +02:00
sonoro1234	925d24572d	cpp2ffi: sanitize_comments to clean curly braces from comments	2023-04-22 14:03:40 +02:00
sonoro1234	ffda7805d2	pull imgui 1.89.5 and generate	2023-04-18 10:35:57 +02:00
Victor Bombi	9ae8e827fa	Merge pull request #238 from gucio321/sh-generator-pass-cmdline-args Sh generator: pass cmdline args	2023-04-17 18:30:44 +02:00
gucio321	9ac8211a3d	generator: add help page	2023-04-17 17:13:38 +02:00
M.Sz	0c22b34cb6	generator: set default values	2023-04-17 10:13:09 +00:00
M.Sz	e2093ffbc1	generator: remove unnecessary header comment	2023-04-17 07:15:34 +00:00
M.Sz	fa81118e09	generator: add -t/--tagret options	2023-04-17 07:13:26 +00:00
M.Sz	ff19d727b7	Revert "Revert "generattor: add --cflags command line flag"" This reverts commit `2ae35c8b46`.	2023-04-17 07:06:29 +00:00
sonoro1234	a0d46db2f2	readme: generation customization instructions	2023-04-05 11:02:47 +02:00
Victor Bombi	aad088b954	Merge pull request #233 from gucio321/sh-generator-pass-cmdline-args generator.sh (.bat): pass extra command-line arguments.	2023-04-05 10:52:56 +02:00
gucio321	9d1e63d306	generator.bat: pass cmd line arguments to luajit	2023-04-05 10:49:45 +02:00
gucio321	2ae35c8b46	Revert "generattor: add --cflags command line flag" This reverts commit `4d19dd5e17`.	2023-04-05 10:49:02 +02:00
gucio321	4d19dd5e17	generattor: add --cflags command line flag	2023-04-05 10:30:26 +02:00
sonoro1234	2b9eaf3eff	readme: edit cflags	2023-04-05 09:27:19 +02:00
gucio321	27aedcd3c4	generator: pass command-line arguments to GCC	2023-04-05 09:26:19 +02:00
sonoro1234	e25f9f6844	add generator options "nochar" and "noimstrv" according to issue #186	2023-03-24 17:23:28 +01:00
sonoro1234	2c8eab86f7	pull imgui 1.89.4 and generate	2023-03-14 17:52:56 +01:00
sonoro1234	ce1015bb84	backends: CIMGUI_USE_SDL is now CIMGUI_USE_SDL2	2023-02-20 20:14:51 +01:00