Merge branch 'docking_inter'

pull imgui 1.89.5 and generate
Merge pull request #238 from gucio321/sh-generator-pass-cmdline-args
2025-08-10 20:08:31 +01:00 · 2023-04-18 10:43:06 +02:00 · 2023-04-18 10:35:57 +02:00 · 2023-04-17 18:30:44 +02:00 · 2023-04-17 17:13:38 +02:00 · 2023-04-17 10:13:09 +00:00
21 changed files with 6516 additions and 4673 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,6 +30,8 @@ jobs:
        elif [ "$GITHUB_OS" == "windows-latest" ];
        then
          vcpkg install luajit
+          echo "/C/vcpkg/packages/luajit_x86-windows/tools" >> $GITHUB_PATH
+          echo "/C/vcpkg/packages/luajit_x86-windows/bin"   >> $GITHUB_PATH
        fi

    - name: Download Submodules
@@ -47,7 +49,6 @@ jobs:
    - name: Generate Bindings
      shell: bash
      run: |
-        export PATH=$PATH:/C/vcpkg/packages/luajit_x86-windows/tools/:/C/vcpkg/packages/luajit_x86-windows/bin/
        cd ./generator
        bash ./generator.sh

--- 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.1 of Dear ImGui with internal api]
+* currently this wrapper is based on version [1.89.5 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
@@ -66,7 +66,7 @@ endif(WIN32)


 #sdl2
-list(APPEND IMGUI_SOURCES ${BAKENDS_FOLDER}imgui_impl_sdl.cpp)
+list(APPEND IMGUI_SOURCES ${BAKENDS_FOLDER}imgui_impl_sdl2.cpp)
 if(DEFINED SDL_PATH)
 	message(STATUS "SDL_PATH defined as " ${SDL_PATH})
 	FIND_PACKAGE(SDL2 PATHS ${SDL_PATH})
@@ -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
@@ -55,7 +55,7 @@ list(APPEND IMGUI_LIBRARIES Vulkan::Vulkan)
 list(APPEND IMGUI_SOURCES ${BACKENDS_FOLDER}imgui_impl_vulkan.cpp)

 #sdl2
-list(APPEND IMGUI_SOURCES ${BACKENDS_FOLDER}imgui_impl_sdl.cpp)
+list(APPEND IMGUI_SOURCES ${BACKENDS_FOLDER}imgui_impl_sdl2.cpp)
 if(DEFINED SDL_PATH)
 	message(STATUS "SDL_PATH defined as " ${SDL_PATH})
 	FIND_PACKAGE(SDL2 PATHS ${SDL_PATH})
@@ -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.1 WIP" 18910 from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.89.5" 18950 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 #ifdef IMGUI_ENABLE_FREETYPE
 #ifndef CIMGUI_FREETYPE
@@ -347,13 +347,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)
 {
@@ -609,6 +609,10 @@ CIMGUI_API void igBulletTextV(const char* fmt,va_list args)
 {
    return ImGui::BulletTextV(fmt,args);
 }
+CIMGUI_API void igSeparatorText(const char* label)
+{
+    return ImGui::SeparatorText(label);
+}
 CIMGUI_API bool igButton(const char* label,const ImVec2 size)
 {
    return ImGui::Button(label,size);
@@ -1037,7 +1041,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();
 }
@@ -1352,6 +1356,10 @@ CIMGUI_API bool igIsAnyItemFocused()
 {
    return ImGui::IsAnyItemFocused();
 }
+CIMGUI_API ImGuiID igGetItemID()
+{
+    return ImGui::GetItemID();
+}
 CIMGUI_API void igGetItemRectMin(ImVec2 *pOut)
 {
    *pOut = ImGui::GetItemRectMin();
@@ -1604,9 +1612,13 @@ CIMGUI_API void ImGuiIO_AddMouseButtonEvent(ImGuiIO* self,int button,bool down)
 {
    return self->AddMouseButtonEvent(button,down);
 }
-CIMGUI_API void ImGuiIO_AddMouseWheelEvent(ImGuiIO* self,float wh_x,float wh_y)
+CIMGUI_API void ImGuiIO_AddMouseWheelEvent(ImGuiIO* self,float wheel_x,float wheel_y)
 {
-    return self->AddMouseWheelEvent(wh_x,wh_y);
+    return self->AddMouseWheelEvent(wheel_x,wheel_y);
+}
+CIMGUI_API void ImGuiIO_AddMouseSourceEvent(ImGuiIO* self,ImGuiMouseSource source)
+{
+    return self->AddMouseSourceEvent(source);
 }
 CIMGUI_API void ImGuiIO_AddFocusEvent(ImGuiIO* self,bool focused)
 {
@@ -2544,11 +2556,11 @@ CIMGUI_API ImGuiKey igGetKeyIndex(ImGuiKey key)
 {
    return ImGui::GetKeyIndex(key);
 }
-CIMGUI_API ImGuiID igImHashData(const void* data,size_t data_size,ImU32 seed)
+CIMGUI_API ImGuiID igImHashData(const void* data,size_t data_size,ImGuiID seed)
 {
    return ImHashData(data,data_size,seed);
 }
-CIMGUI_API ImGuiID igImHashStr(const char* data,size_t data_size,ImU32 seed)
+CIMGUI_API ImGuiID igImHashStr(const char* data,size_t data_size,ImGuiID seed)
 {
    return ImHashStr(data,data_size,seed);
 }
@@ -2855,6 +2867,10 @@ CIMGUI_API bool igImIsFloatAboveGuaranteedIntegerPrecision(float f)
 {
    return ImIsFloatAboveGuaranteedIntegerPrecision(f);
 }
+CIMGUI_API float igImExponentialMovingAverage(float avg,float sample,int n)
+{
+    return ImExponentialMovingAverage(avg,sample,n);
+}
 CIMGUI_API void igImBezierCubicCalc(ImVec2 *pOut,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,float t)
 {
    *pOut = ImBezierCubicCalc(p1,p2,p3,p4,t);
@@ -3039,6 +3055,14 @@ CIMGUI_API void ImRect_ToVec4(ImVec4 *pOut,ImRect* self)
 {
    *pOut = self->ToVec4();
 }
+CIMGUI_API size_t igImBitArrayGetStorageSizeInBytes(int bitcount)
+{
+    return ImBitArrayGetStorageSizeInBytes(bitcount);
+}
+CIMGUI_API void igImBitArrayClearAllBits(ImU32* arr,int bitcount)
+{
+    return ImBitArrayClearAllBits(arr,bitcount);
+}
 CIMGUI_API bool igImBitArrayTestBit(const ImU32* arr,int n)
 {
    return ImBitArrayTestBit(arr,n);
@@ -3123,6 +3147,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);
@@ -3167,6 +3195,18 @@ CIMGUI_API void ImGuiMenuColumns_CalcNextTotalWidth(ImGuiMenuColumns* self,bool
 {
    return self->CalcNextTotalWidth(update_offsets);
 }
+CIMGUI_API ImGuiInputTextDeactivatedState* ImGuiInputTextDeactivatedState_ImGuiInputTextDeactivatedState(void)
+{
+    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)();
@@ -3275,13 +3315,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)
 {
@@ -3431,14 +3471,6 @@ CIMGUI_API void ImGuiSettingsHandler_destroy(ImGuiSettingsHandler* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API ImGuiMetricsConfig* ImGuiMetricsConfig_ImGuiMetricsConfig(void)
-{
-    return IM_NEW(ImGuiMetricsConfig)();
-}
-CIMGUI_API void ImGuiMetricsConfig_destroy(ImGuiMetricsConfig* self)
-{
-    IM_DELETE(self);
-}
 CIMGUI_API ImGuiStackLevelInfo* ImGuiStackLevelInfo_ImGuiStackLevelInfo(void)
 {
    return IM_NEW(ImGuiStackLevelInfo)();
@@ -3535,14 +3567,6 @@ CIMGUI_API void ImGuiTabBar_destroy(ImGuiTabBar* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API int ImGuiTabBar_GetTabOrder(ImGuiTabBar* self,const ImGuiTabItem* tab)
-{
-    return self->GetTabOrder(tab);
-}
-CIMGUI_API const char* ImGuiTabBar_GetTabName(ImGuiTabBar* self,const ImGuiTabItem* tab)
-{
-    return self->GetTabName(tab);
-}
 CIMGUI_API ImGuiTableColumn* ImGuiTableColumn_ImGuiTableColumn(void)
 {
    return IM_NEW(ImGuiTableColumn)();
@@ -3651,6 +3675,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);
@@ -3767,18 +3795,6 @@ CIMGUI_API void igClearIniSettings()
 {
    return ImGui::ClearIniSettings();
 }
-CIMGUI_API ImGuiWindowSettings* igCreateNewWindowSettings(const char* name)
-{
-    return ImGui::CreateNewWindowSettings(name);
-}
-CIMGUI_API ImGuiWindowSettings* igFindWindowSettings(ImGuiID id)
-{
-    return ImGui::FindWindowSettings(id);
-}
-CIMGUI_API ImGuiWindowSettings* igFindOrCreateWindowSettings(const char* name)
-{
-    return ImGui::FindOrCreateWindowSettings(name);
-}
 CIMGUI_API void igAddSettingsHandler(const ImGuiSettingsHandler* handler)
 {
    return ImGui::AddSettingsHandler(handler);
@@ -3791,6 +3807,22 @@ CIMGUI_API ImGuiSettingsHandler* igFindSettingsHandler(const char* type_name)
 {
    return ImGui::FindSettingsHandler(type_name);
 }
+CIMGUI_API ImGuiWindowSettings* igCreateNewWindowSettings(const char* name)
+{
+    return ImGui::CreateNewWindowSettings(name);
+}
+CIMGUI_API ImGuiWindowSettings* igFindWindowSettingsByID(ImGuiID id)
+{
+    return ImGui::FindWindowSettingsByID(id);
+}
+CIMGUI_API ImGuiWindowSettings* igFindWindowSettingsByWindow(ImGuiWindow* window)
+{
+    return ImGui::FindWindowSettingsByWindow(window);
+}
+CIMGUI_API void igClearWindowSettings(const char* name)
+{
+    return ImGui::ClearWindowSettings(name);
+}
 CIMGUI_API void igLocalizeRegisterEntries(const ImGuiLocEntry* entries,int count)
 {
    return ImGui::LocalizeRegisterEntries(entries,count);
@@ -3831,10 +3863,6 @@ CIMGUI_API void igScrollToBringRectIntoView(ImGuiWindow* window,const ImRect rec
 {
    return ImGui::ScrollToBringRectIntoView(window,rect);
 }
-CIMGUI_API ImGuiID igGetItemID()
-{
-    return ImGui::GetItemID();
-}
 CIMGUI_API ImGuiItemStatusFlags igGetItemStatusFlags()
 {
    return ImGui::GetItemStatusFlags();
@@ -3883,10 +3911,14 @@ CIMGUI_API void igPushOverrideID(ImGuiID id)
 {
    return ImGui::PushOverrideID(id);
 }
-CIMGUI_API ImGuiID igGetIDWithSeed(const char* str_id_begin,const char* str_id_end,ImGuiID seed)
+CIMGUI_API ImGuiID igGetIDWithSeed_Str(const char* str_id_begin,const char* str_id_end,ImGuiID seed)
 {
    return ImGui::GetIDWithSeed(str_id_begin,str_id_end,seed);
 }
+CIMGUI_API ImGuiID igGetIDWithSeed_Int(int n,ImGuiID seed)
+{
+    return ImGui::GetIDWithSeed(n,seed);
+}
 CIMGUI_API void igItemSize_Vec2(const ImVec2 size,float text_baseline_y)
 {
    return ImGui::ItemSize(size,text_baseline_y);
@@ -3903,6 +3935,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);
@@ -3943,6 +3979,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);
@@ -3987,7 +4027,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);
 }
@@ -4111,11 +4151,19 @@ CIMGUI_API bool igIsAliasKey(ImGuiKey key)
 {
    return ImGui::IsAliasKey(key);
 }
-CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiKey key)
+CIMGUI_API ImGuiKeyChord igConvertShortcutMod(ImGuiKeyChord key_chord)
 {
-    return ImGui::ConvertSingleModFlagToKey(key);
+    return ImGui::ConvertShortcutMod(key_chord);
 }
-CIMGUI_API ImGuiKeyData* igGetKeyData(ImGuiKey key)
+CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiContext* ctx,ImGuiKey key)
+{
+    return ImGui::ConvertSingleModFlagToKey(ctx,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);
 }
@@ -4131,9 +4179,9 @@ CIMGUI_API bool igIsMouseDragPastThreshold(ImGuiMouseButton button,float lock_th
 {
    return ImGui::IsMouseDragPastThreshold(button,lock_threshold);
 }
-CIMGUI_API void igGetKeyVector2d(ImVec2 *pOut,ImGuiKey key_left,ImGuiKey key_right,ImGuiKey key_up,ImGuiKey key_down)
+CIMGUI_API void igGetKeyMagnitude2d(ImVec2 *pOut,ImGuiKey key_left,ImGuiKey key_right,ImGuiKey key_up,ImGuiKey key_down)
 {
-    *pOut = ImGui::GetKeyVector2d(key_left,key_right,key_up,key_down);
+    *pOut = ImGui::GetKeyMagnitude2d(key_left,key_right,key_up,key_down);
 }
 CIMGUI_API float igGetNavTweakPressedAmount(ImGuiAxis axis)
 {
@@ -4163,6 +4211,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);
@@ -4171,9 +4223,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)
 {
@@ -4371,6 +4423,10 @@ CIMGUI_API ImGuiTableInstanceData* igTableGetInstanceData(ImGuiTable* table,int
 {
    return ImGui::TableGetInstanceData(table,instance_no);
 }
+CIMGUI_API ImGuiID igTableGetInstanceID(ImGuiTable* table,int instance_no)
+{
+    return ImGui::TableGetInstanceID(table,instance_no);
+}
 CIMGUI_API void igTableSortSpecsSanitize(ImGuiTable* table)
 {
    return ImGui::TableSortSpecsSanitize(table);
@@ -4415,7 +4471,7 @@ CIMGUI_API const char* igTableGetColumnName_TablePtr(const ImGuiTable* table,int
 {
    return ImGui::TableGetColumnName(table,column_n);
 }
-CIMGUI_API ImGuiID igTableGetColumnResizeID(const ImGuiTable* table,int column_n,int instance_no)
+CIMGUI_API ImGuiID igTableGetColumnResizeID(ImGuiTable* table,int column_n,int instance_no)
 {
    return ImGui::TableGetColumnResizeID(table,column_n,instance_no);
 }
@@ -4475,6 +4531,10 @@ CIMGUI_API ImGuiTableSettings* igTableSettingsFindByID(ImGuiID id)
 {
    return ImGui::TableSettingsFindByID(id);
 }
+CIMGUI_API ImGuiTabBar* igGetCurrentTabBar()
+{
+    return ImGui::GetCurrentTabBar();
+}
 CIMGUI_API bool igBeginTabBarEx(ImGuiTabBar* tab_bar,const ImRect bb,ImGuiTabBarFlags flags)
 {
    return ImGui::BeginTabBarEx(tab_bar,bb,flags);
@@ -4483,6 +4543,22 @@ CIMGUI_API ImGuiTabItem* igTabBarFindTabByID(ImGuiTabBar* tab_bar,ImGuiID tab_id
 {
    return ImGui::TabBarFindTabByID(tab_bar,tab_id);
 }
+CIMGUI_API ImGuiTabItem* igTabBarFindTabByOrder(ImGuiTabBar* tab_bar,int order)
+{
+    return ImGui::TabBarFindTabByOrder(tab_bar,order);
+}
+CIMGUI_API ImGuiTabItem* igTabBarGetCurrentTab(ImGuiTabBar* tab_bar)
+{
+    return ImGui::TabBarGetCurrentTab(tab_bar);
+}
+CIMGUI_API int igTabBarGetTabOrder(ImGuiTabBar* tab_bar,ImGuiTabItem* tab)
+{
+    return ImGui::TabBarGetTabOrder(tab_bar,tab);
+}
+CIMGUI_API const char* igTabBarGetTabName(ImGuiTabBar* tab_bar,ImGuiTabItem* tab)
+{
+    return ImGui::TabBarGetTabName(tab_bar,tab);
+}
 CIMGUI_API void igTabBarRemoveTab(ImGuiTabBar* tab_bar,ImGuiID tab_id)
 {
    return ImGui::TabBarRemoveTab(tab_bar,tab_id);
@@ -4491,11 +4567,15 @@ CIMGUI_API void igTabBarCloseTab(ImGuiTabBar* tab_bar,ImGuiTabItem* tab)
 {
    return ImGui::TabBarCloseTab(tab_bar,tab);
 }
-CIMGUI_API void igTabBarQueueReorder(ImGuiTabBar* tab_bar,const ImGuiTabItem* tab,int offset)
+CIMGUI_API void igTabBarQueueFocus(ImGuiTabBar* tab_bar,ImGuiTabItem* tab)
+{
+    return ImGui::TabBarQueueFocus(tab_bar,tab);
+}
+CIMGUI_API void igTabBarQueueReorder(ImGuiTabBar* tab_bar,ImGuiTabItem* tab,int offset)
 {
    return ImGui::TabBarQueueReorder(tab_bar,tab,offset);
 }
-CIMGUI_API void igTabBarQueueReorderFromMousePos(ImGuiTabBar* tab_bar,const ImGuiTabItem* tab,ImVec2 mouse_pos)
+CIMGUI_API void igTabBarQueueReorderFromMousePos(ImGuiTabBar* tab_bar,ImGuiTabItem* tab,ImVec2 mouse_pos)
 {
    return ImGui::TabBarQueueReorderFromMousePos(tab_bar,tab,mouse_pos);
 }
@@ -4503,14 +4583,18 @@ CIMGUI_API bool igTabBarProcessReorder(ImGuiTabBar* tab_bar)
 {
    return ImGui::TabBarProcessReorder(tab_bar);
 }
-CIMGUI_API bool igTabItemEx(ImGuiTabBar* tab_bar,const char* label,bool* p_open,ImGuiTabItemFlags flags)
+CIMGUI_API bool igTabItemEx(ImGuiTabBar* tab_bar,const char* label,bool* p_open,ImGuiTabItemFlags flags,ImGuiWindow* docked_window)
 {
-    return ImGui::TabItemEx(tab_bar,label,p_open,flags);
+    return ImGui::TabItemEx(tab_bar,label,p_open,flags,docked_window);
 }
-CIMGUI_API void igTabItemCalcSize(ImVec2 *pOut,const char* label,bool has_close_button_or_unsaved_marker)
+CIMGUI_API void igTabItemCalcSize_Str(ImVec2 *pOut,const char* label,bool has_close_button_or_unsaved_marker)
 {
    *pOut = ImGui::TabItemCalcSize(label,has_close_button_or_unsaved_marker);
 }
+CIMGUI_API void igTabItemCalcSize_WindowPtr(ImVec2 *pOut,ImGuiWindow* window)
+{
+    *pOut = ImGui::TabItemCalcSize(window);
+}
 CIMGUI_API void igTabItemBackground(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImU32 col)
 {
    return ImGui::TabItemBackground(draw_list,bb,flags,col);
@@ -4595,6 +4679,30 @@ CIMGUI_API bool igButtonEx(const char* label,const ImVec2 size_arg,ImGuiButtonFl
 {
    return ImGui::ButtonEx(label,size_arg,flags);
 }
+CIMGUI_API bool igArrowButtonEx(const char* str_id,ImGuiDir dir,ImVec2 size_arg,ImGuiButtonFlags flags)
+{
+    return ImGui::ArrowButtonEx(str_id,dir,size_arg,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)
+{
+    return ImGui::ImageButtonEx(id,texture_id,size,uv0,uv1,bg_col,tint_col,flags);
+}
+CIMGUI_API void igSeparatorEx(ImGuiSeparatorFlags flags)
+{
+    return ImGui::SeparatorEx(flags);
+}
+CIMGUI_API void igSeparatorTextEx(ImGuiID id,const char* label,const char* label_end,float extra_width)
+{
+    return ImGui::SeparatorTextEx(id,label,label_end,extra_width);
+}
+CIMGUI_API bool igCheckboxFlags_S64Ptr(const char* label,ImS64* flags,ImS64 flags_value)
+{
+    return ImGui::CheckboxFlags(label,flags,flags_value);
+}
+CIMGUI_API bool igCheckboxFlags_U64Ptr(const char* label,ImU64* flags,ImU64 flags_value)
+{
+    return ImGui::CheckboxFlags(label,flags,flags_value);
+}
 CIMGUI_API bool igCloseButton(ImGuiID id,const ImVec2 pos)
 {
    return ImGui::CloseButton(id,pos);
@@ -4603,10 +4711,6 @@ CIMGUI_API bool igCollapseButton(ImGuiID id,const ImVec2 pos)
 {
    return ImGui::CollapseButton(id,pos);
 }
-CIMGUI_API bool igArrowButtonEx(const char* str_id,ImGuiDir dir,ImVec2 size_arg,ImGuiButtonFlags flags)
-{
-    return ImGui::ArrowButtonEx(str_id,dir,size_arg,flags);
-}
 CIMGUI_API void igScrollbar(ImGuiAxis axis)
 {
    return ImGui::Scrollbar(axis);
@@ -4615,10 +4719,6 @@ CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,ImS64* p
 {
    return ImGui::ScrollbarEx(bb,id,axis,p_scroll_v,avail_v,contents_v,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)
-{
-    return ImGui::ImageButtonEx(id,texture_id,size,uv0,uv1,bg_col,tint_col);
-}
 CIMGUI_API void igGetWindowScrollbarRect(ImRect *pOut,ImGuiWindow* window,ImGuiAxis axis)
 {
    *pOut = ImGui::GetWindowScrollbarRect(window,axis);
@@ -4635,18 +4735,6 @@ CIMGUI_API ImGuiID igGetWindowResizeBorderID(ImGuiWindow* window,ImGuiDir dir)
 {
    return ImGui::GetWindowResizeBorderID(window,dir);
 }
-CIMGUI_API void igSeparatorEx(ImGuiSeparatorFlags flags)
-{
-    return ImGui::SeparatorEx(flags);
-}
-CIMGUI_API bool igCheckboxFlags_S64Ptr(const char* label,ImS64* flags,ImS64 flags_value)
-{
-    return ImGui::CheckboxFlags(label,flags,flags_value);
-}
-CIMGUI_API bool igCheckboxFlags_U64Ptr(const char* label,ImU64* flags,ImU64 flags_value)
-{
-    return ImGui::CheckboxFlags(label,flags,flags_value);
-}
 CIMGUI_API bool igButtonBehavior(const ImRect bb,ImGuiID id,bool* out_hovered,bool* out_held,ImGuiButtonFlags flags)
 {
    return ImGui::ButtonBehavior(bb,id,out_hovered,out_held,flags);
@@ -4659,9 +4747,9 @@ CIMGUI_API bool igSliderBehavior(const ImRect bb,ImGuiID id,ImGuiDataType data_t
 {
    return ImGui::SliderBehavior(bb,id,data_type,p_v,p_min,p_max,format,flags,out_grab_bb);
 }
-CIMGUI_API bool igSplitterBehavior(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* size1,float* size2,float min_size1,float min_size2,float hover_extend,float hover_visibility_delay)
+CIMGUI_API bool igSplitterBehavior(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* size1,float* size2,float min_size1,float min_size2,float hover_extend,float hover_visibility_delay,ImU32 bg_col)
 {
-    return ImGui::SplitterBehavior(bb,id,axis,size1,size2,min_size1,min_size2,hover_extend,hover_visibility_delay);
+    return ImGui::SplitterBehavior(bb,id,axis,size1,size2,min_size1,min_size2,hover_extend,hover_visibility_delay,bg_col);
 }
 CIMGUI_API bool igTreeNodeBehavior(ImGuiID id,ImGuiTreeNodeFlags flags,const char* label,const char* label_end)
 {
@@ -4707,6 +4795,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);
@@ -4735,9 +4827,9 @@ CIMGUI_API void igColorPickerOptionsPopup(const float* ref_col,ImGuiColorEditFla
 {
    return ImGui::ColorPickerOptionsPopup(ref_col,flags);
 }
-CIMGUI_API int igPlotEx(ImGuiPlotType plot_type,const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 frame_size)
+CIMGUI_API int igPlotEx(ImGuiPlotType plot_type,const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,const ImVec2 size_arg)
 {
-    return ImGui::PlotEx(plot_type,label,values_getter,data,values_count,values_offset,overlay_text,scale_min,scale_max,frame_size);
+    return ImGui::PlotEx(plot_type,label,values_getter,data,values_count,values_offset,overlay_text,scale_min,scale_max,size_arg);
 }
 CIMGUI_API void igShadeVertsLinearColorGradientKeepAlpha(ImDrawList* draw_list,int vert_start_idx,int vert_end_idx,ImVec2 gradient_p0,ImVec2 gradient_p1,ImU32 col0,ImU32 col1)
 {
@@ -4870,6 +4962,10 @@ CIMGUI_API void igDebugNodeViewport(ImGuiViewportP* viewport)
 {
    return ImGui::DebugNodeViewport(viewport);
 }
+CIMGUI_API void igDebugRenderKeyboardPreview(ImDrawList* draw_list)
+{
+    return ImGui::DebugRenderKeyboardPreview(draw_list);
+}
 CIMGUI_API void igDebugRenderViewportThumbnail(ImDrawList* draw_list,ImGuiViewportP* viewport,const ImRect bb)
 {
    return ImGui::DebugRenderViewportThumbnail(draw_list,viewport,bb);
--- 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.1 WIP" 18910 from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.89.5" 18950 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 #ifndef CIMGUI_INCLUDED
 #define CIMGUI_INCLUDED
@@ -75,9 +75,11 @@ 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 ImGuiGroupData ImGuiGroupData;
 typedef struct ImGuiInputTextState ImGuiInputTextState;
+typedef struct ImGuiInputTextDeactivateData ImGuiInputTextDeactivateData;
 typedef struct ImGuiLastItemData ImGuiLastItemData;
 typedef struct ImGuiLocEntry ImGuiLocEntry;
 typedef struct ImGuiMenuColumns ImGuiMenuColumns;
@@ -612,8 +614,8 @@ ImGuiMod_Ctrl=1 << 12,
 ImGuiMod_Shift=1 << 13,
 ImGuiMod_Alt=1 << 14,
 ImGuiMod_Super=1 << 15,
-ImGuiMod_Mask_=0xF000,
-ImGuiMod_Shortcut=ImGuiMod_Ctrl,
+ImGuiMod_Shortcut=1 << 11,
+ImGuiMod_Mask_=0xF800,
 ImGuiKey_NamedKey_BEGIN=512,
 ImGuiKey_NamedKey_END=ImGuiKey_COUNT,
 ImGuiKey_NamedKey_COUNT=ImGuiKey_NamedKey_END - ImGuiKey_NamedKey_BEGIN,
@@ -725,6 +727,9 @@ typedef enum {
    ImGuiStyleVar_TabRounding,
    ImGuiStyleVar_ButtonTextAlign,
    ImGuiStyleVar_SelectableTextAlign,
+    ImGuiStyleVar_SeparatorTextBorderSize,
+    ImGuiStyleVar_SeparatorTextAlign,
+    ImGuiStyleVar_SeparatorTextPadding,
    ImGuiStyleVar_COUNT
 }ImGuiStyleVar_;
 typedef enum {
@@ -793,6 +798,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,
@@ -834,6 +845,9 @@ struct ImGuiStyle
    ImGuiDir ColorButtonPosition;
    ImVec2 ButtonTextAlign;
    ImVec2 SelectableTextAlign;
+    float SeparatorTextBorderSize;
+    ImVec2 SeparatorTextAlign;
+    ImVec2 SeparatorTextPadding;
    ImVec2 DisplayWindowPadding;
    ImVec2 DisplaySafeAreaPadding;
    float MouseCursorScale;
@@ -884,6 +898,8 @@ struct ImGuiIO
    bool ConfigWindowsResizeFromEdges;
    bool ConfigWindowsMoveFromTitleBarOnly;
    float ConfigMemoryCompactTimer;
+    bool ConfigDebugBeginReturnValueOnce;
+    bool ConfigDebugBeginReturnValueLoop;
    const char* BackendPlatformName;
    const char* BackendRendererName;
    void* BackendPlatformUserData;
@@ -911,10 +927,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;
    bool KeyCtrl;
    bool KeyShift;
    bool KeyAlt;
@@ -932,6 +950,7 @@ struct ImGuiIO
    bool MouseReleased[5];
    bool MouseDownOwned[5];
    bool MouseDownOwnedUnlessPopupClose[5];
+    bool MouseWheelRequestAxisSwap;
    float MouseDownDuration[5];
    float MouseDownDurationPrev[5];
    float MouseDragMaxDistanceSqr[5];
@@ -945,6 +964,7 @@ struct ImGuiIO
 };
 struct ImGuiInputTextCallbackData
 {
+    ImGuiContext* Ctx;
    ImGuiInputTextFlags EventFlag;
    ImGuiInputTextFlags Flags;
    void* UserData;
@@ -1031,6 +1051,7 @@ struct ImGuiStorage
 typedef struct ImGuiStoragePair ImGuiStoragePair;
 struct ImGuiListClipper
 {
+    ImGuiContext* Ctx;
    int DisplayStart;
    int DisplayEnd;
    int ItemsCount;
@@ -1209,6 +1230,7 @@ struct ImFontAtlas
    int TexDesiredWidth;
    int TexGlyphPadding;
    bool Locked;
+    void* UserData;
    bool TexReady;
    bool TexPixelsUseColors;
    unsigned char* TexPixelsAlpha8;
@@ -1243,7 +1265,9 @@ struct ImFont
    short ConfigDataCount;
    ImWchar FallbackChar;
    ImWchar EllipsisChar;
-    ImWchar DotChar;
+    short EllipsisCharCount;
+    float EllipsisWidth;
+    float EllipsisCharStep;
    bool DirtyLookupTables;
    float Scale;
    float Ascent, Descent;
@@ -1278,9 +1302,11 @@ struct ImDrawListSharedData;
 struct ImGuiColorMod;
 struct ImGuiContext;
 struct ImGuiContextHook;
+struct ImGuiDataVarInfo;
 struct ImGuiDataTypeInfo;
 struct ImGuiGroupData;
 struct ImGuiInputTextState;
+struct ImGuiInputTextDeactivateData;
 struct ImGuiLastItemData;
 struct ImGuiLocEntry;
 struct ImGuiMenuColumns;
@@ -1378,6 +1404,7 @@ struct ImRect
    ImVec2 Min;
    ImVec2 Max;
 };
+typedef ImU32* ImBitArrayPtr;
 struct ImBitVector
 {
    ImVector_ImU32 Storage;
@@ -1477,10 +1504,9 @@ typedef enum {
    ImGuiSelectableFlags_SelectOnClick = 1 << 22,
    ImGuiSelectableFlags_SelectOnRelease = 1 << 23,
    ImGuiSelectableFlags_SpanAvailWidth = 1 << 24,
-    ImGuiSelectableFlags_DrawHoveredWhenHeld = 1 << 25,
-    ImGuiSelectableFlags_SetNavIdOnHover = 1 << 26,
-    ImGuiSelectableFlags_NoPadWithHalfSpacing = 1 << 27,
-    ImGuiSelectableFlags_NoSetKeyOwner = 1 << 28,
+    ImGuiSelectableFlags_SetNavIdOnHover = 1 << 25,
+    ImGuiSelectableFlags_NoPadWithHalfSpacing = 1 << 26,
+    ImGuiSelectableFlags_NoSetKeyOwner = 1 << 27,
 }ImGuiSelectableFlagsPrivate_;
 typedef enum {
    ImGuiTreeNodeFlags_ClipLabelForTrailingButton = 1 << 20,
@@ -1524,6 +1550,12 @@ typedef enum {
    ImGuiPopupPositionPolicy_ComboBox,
    ImGuiPopupPositionPolicy_Tooltip,
 }ImGuiPopupPositionPolicy;
+struct ImGuiDataVarInfo
+{
+    ImGuiDataType Type;
+    ImU32 Count;
+    ImU32 Offset;
+};
 typedef struct ImGuiDataTypeTempStorage ImGuiDataTypeTempStorage;
 struct ImGuiDataTypeTempStorage
 {
@@ -1586,8 +1618,15 @@ struct ImGuiMenuColumns
    ImU16 OffsetMark;
    ImU16 Widths[4];
 };
+typedef struct ImGuiInputTextDeactivatedState ImGuiInputTextDeactivatedState;
+struct ImGuiInputTextDeactivatedState
+{
+    ImGuiID ID;
+    ImVector_char TextA;
+};
 struct ImGuiInputTextState
 {
+    ImGuiContext* Ctx;
    ImGuiID ID;
    int CurLenW, CurLenA;
    ImVector_ImWchar TextW;
@@ -1716,20 +1755,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 ImGuiInputEventKey ImGuiInputEventKey;
 struct ImGuiInputEventKey
@@ -1748,6 +1786,7 @@ struct ImGuiInputEvent
 {
    ImGuiInputEventType Type;
    ImGuiInputSource Source;
+    ImU32 EventId;
    union
    {
        ImGuiInputEventMousePos MousePos;
@@ -1944,6 +1983,7 @@ struct ImGuiWindowSettings
    ImVec2ih Size;
    bool Collapsed;
    bool WantApply;
+    bool WantDelete;
 };
 struct ImGuiSettingsHandler
 {
@@ -1979,8 +2019,9 @@ typedef enum {
    ImGuiDebugLogFlags_EventPopup = 1 << 2,
    ImGuiDebugLogFlags_EventNav = 1 << 3,
    ImGuiDebugLogFlags_EventClipper = 1 << 4,
-    ImGuiDebugLogFlags_EventIO = 1 << 5,
-    ImGuiDebugLogFlags_EventMask_ = ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventIO,
+    ImGuiDebugLogFlags_EventSelection = 1 << 5,
+    ImGuiDebugLogFlags_EventIO = 1 << 6,
+    ImGuiDebugLogFlags_EventMask_ = ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventSelection | ImGuiDebugLogFlags_EventIO,
    ImGuiDebugLogFlags_OutputToTTY = 1 << 10,
 }ImGuiDebugLogFlags_;
 struct ImGuiMetricsConfig
@@ -1992,6 +2033,7 @@ struct ImGuiMetricsConfig
    bool ShowTablesRects;
    bool ShowDrawCmdMesh;
    bool ShowDrawCmdBoundingBoxes;
+    bool ShowAtlasTintedWithTextColor;
    int ShowWindowsRectsType;
    int ShowTablesRectsType;
 };
@@ -2077,8 +2119,6 @@ struct ImGuiContext
    bool Initialized;
    bool FontAtlasOwnedByContext;
    ImGuiIO IO;
-    ImVector_ImGuiInputEvent InputEventsQueue;
-    ImVector_ImGuiInputEvent InputEventsTrail;
    ImGuiStyle Style;
    ImFont* Font;
    float FontSize;
@@ -2094,6 +2134,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;
@@ -2107,7 +2151,10 @@ struct ImGuiContext
    ImGuiWindow* MovingWindow;
    ImGuiWindow* WheelingWindow;
    ImVec2 WheelingWindowRefMousePos;
+    int WheelingWindowStartFrame;
    float WheelingWindowReleaseTimer;
+    ImVec2 WheelingWindowWheelRemainder;
+    ImVec2 WheelingAxisAvg;
    ImGuiID DebugHookIdInfo;
    ImGuiID HoveredId;
    ImGuiID HoveredIdPreviousFrame;
@@ -2161,7 +2208,6 @@ struct ImGuiContext
    ImGuiID NavActivateId;
    ImGuiID NavActivateDownId;
    ImGuiID NavActivatePressedId;
-    ImGuiID NavActivateInputId;
    ImGuiActivateFlags NavActivateFlags;
    ImGuiID NavJustMovedToId;
    ImGuiID NavJustMovedToFocusScopeId;
@@ -2244,12 +2290,15 @@ struct ImGuiContext
    float HoverDelayClearTimer;
    ImVec2 MouseLastValidPos;
    ImGuiInputTextState InputTextState;
+    ImGuiInputTextDeactivatedState InputTextDeactivatedState;
    ImFont InputTextPasswordFont;
    ImGuiID TempInputId;
    ImGuiColorEditFlags ColorEditOptions;
-    float ColorEditLastHue;
-    float ColorEditLastSat;
-    ImU32 ColorEditLastColor;
+    ImGuiID ColorEditCurrentID;
+    ImGuiID ColorEditSavedID;
+    float ColorEditSavedHue;
+    float ColorEditSavedSat;
+    ImU32 ColorEditSavedColor;
    ImVec4 ColorPickerRef;
    ImGuiComboPreviewData ComboPreviewData;
    float SliderGrabClickOffset;
@@ -2290,7 +2339,9 @@ struct ImGuiContext
    ImGuiDebugLogFlags DebugLogFlags;
    ImGuiTextBuffer DebugLogBuf;
    ImGuiTextIndex DebugLogIndex;
+    ImU8 DebugLogClipperAutoDisableFrames;
    ImU8 DebugLocateFrames;
+    ImS8 DebugBeginReturnValueCullDepth;
    bool DebugItemPickerActive;
    ImU8 DebugItemPickerMouseButton;
    ImGuiID DebugItemPickerBreakId;
@@ -2347,6 +2398,7 @@ typedef struct ImVector_ImGuiOldColumns {int Size;int Capacity;ImGuiOldColumns*

 struct ImGuiWindow
 {
+    ImGuiContext* Ctx;
    char* Name;
    ImGuiID ID;
    ImGuiWindowFlags Flags;
@@ -2360,6 +2412,9 @@ struct ImGuiWindow
    ImVec2 WindowPadding;
    float WindowRounding;
    float WindowBorderSize;
+    float DecoOuterSizeX1, DecoOuterSizeY1;
+    float DecoOuterSizeX2, DecoOuterSizeY2;
+    float DecoInnerSizeX1, DecoInnerSizeY1;
    int NameBufLen;
    ImGuiID MoveId;
    ImGuiID ChildId;
@@ -2496,8 +2551,8 @@ struct ImGuiTabBar
    ImVec2 BackupCursorPos;
    ImGuiTextBuffer TabsNames;
 };
-typedef ImS8 ImGuiTableColumnIdx;
-typedef ImU8 ImGuiTableDrawChannelIdx;
+typedef ImS16 ImGuiTableColumnIdx;
+typedef ImU16 ImGuiTableDrawChannelIdx;
 struct ImGuiTableColumn
 {
    ImGuiTableColumnFlags Flags;
@@ -2550,8 +2605,10 @@ struct ImGuiTableCellData
 };
 struct ImGuiTableInstanceData
 {
+    ImGuiID TableInstanceID;
    float LastOuterHeight;
    float LastFirstRowHeight;
+    float LastFrozenHeight;
 };
 typedef struct ImSpan_ImGuiTableColumn {ImGuiTableColumn* Data;ImGuiTableColumn* DataEnd;} ImSpan_ImGuiTableColumn;

@@ -2572,10 +2629,9 @@ struct ImGuiTable
    ImSpan_ImGuiTableColumn Columns;
    ImSpan_ImGuiTableColumnIdx DisplayOrderToIndex;
    ImSpan_ImGuiTableCellData RowCellData;
-    ImU64 EnabledMaskByDisplayOrder;
-    ImU64 EnabledMaskByIndex;
-    ImU64 VisibleMaskByIndex;
-    ImU64 RequestOutputMaskByIndex;
+    ImBitArrayPtr EnabledMaskByDisplayOrder;
+    ImBitArrayPtr EnabledMaskByIndex;
+    ImBitArrayPtr VisibleMaskByIndex;
    ImGuiTableFlags SettingsLoadedFlags;
    int SettingsOffset;
    int LastFrameActive;
@@ -2667,6 +2723,8 @@ struct ImGuiTable
    bool IsResetDisplayOrderRequest;
    bool IsUnfrozenRows;
    bool IsDefaultSizingPolicy;
+    bool HasScrollbarYCurr;
+    bool HasScrollbarYPrev;
    bool MemoryCompacted;
    bool HostSkipItems;
 };
@@ -2857,8 +2915,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);
@@ -2918,6 +2976,7 @@ CIMGUI_API void igLabelText(const char* label,const char* fmt,...);
 CIMGUI_API void igLabelTextV(const char* label,const char* fmt,va_list args);
 CIMGUI_API void igBulletText(const char* fmt,...);
 CIMGUI_API void igBulletTextV(const char* fmt,va_list args);
+CIMGUI_API void igSeparatorText(const char* label);
 CIMGUI_API bool igButton(const char* label,const ImVec2 size);
 CIMGUI_API bool igSmallButton(const char* label);
 CIMGUI_API bool igInvisibleButton(const char* str_id,const ImVec2 size,ImGuiButtonFlags flags);
@@ -3021,7 +3080,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);
@@ -3099,6 +3158,7 @@ CIMGUI_API bool igIsItemToggledOpen(void);
 CIMGUI_API bool igIsAnyItemHovered(void);
 CIMGUI_API bool igIsAnyItemActive(void);
 CIMGUI_API bool igIsAnyItemFocused(void);
+CIMGUI_API ImGuiID igGetItemID(void);
 CIMGUI_API void igGetItemRectMin(ImVec2 *pOut);
 CIMGUI_API void igGetItemRectMax(ImVec2 *pOut);
 CIMGUI_API void igGetItemRectSize(ImVec2 *pOut);
@@ -3162,7 +3222,8 @@ CIMGUI_API void ImGuiIO_AddKeyEvent(ImGuiIO* self,ImGuiKey key,bool down);
 CIMGUI_API void ImGuiIO_AddKeyAnalogEvent(ImGuiIO* self,ImGuiKey key,bool down,float v);
 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 wh_x,float wh_y);
+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_AddFocusEvent(ImGuiIO* self,bool focused);
 CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,unsigned int c);
 CIMGUI_API void ImGuiIO_AddInputCharacterUTF16(ImGuiIO* self,ImWchar16 c);
@@ -3397,8 +3458,8 @@ CIMGUI_API void ImGuiViewport_GetWorkCenter(ImVec2 *pOut,ImGuiViewport* self);
 CIMGUI_API ImGuiPlatformImeData* ImGuiPlatformImeData_ImGuiPlatformImeData(void);
 CIMGUI_API void ImGuiPlatformImeData_destroy(ImGuiPlatformImeData* self);
 CIMGUI_API ImGuiKey igGetKeyIndex(ImGuiKey key);
-CIMGUI_API ImGuiID igImHashData(const void* data,size_t data_size,ImU32 seed);
-CIMGUI_API ImGuiID igImHashStr(const char* data,size_t data_size,ImU32 seed);
+CIMGUI_API ImGuiID igImHashData(const void* data,size_t data_size,ImGuiID seed);
+CIMGUI_API ImGuiID igImHashStr(const char* data,size_t data_size,ImGuiID seed);
 CIMGUI_API void igImQsort(void* base,size_t count,size_t size_of_element,int(*compare_func)(void const*,void const*));
 CIMGUI_API ImU32 igImAlphaBlendColors(ImU32 col_a,ImU32 col_b);
 CIMGUI_API bool igImIsPowerOfTwo_Int(int v);
@@ -3473,6 +3534,7 @@ CIMGUI_API void igImRotate(ImVec2 *pOut,const ImVec2 v,float cos_a,float sin_a);
 CIMGUI_API float igImLinearSweep(float current,float target,float speed);
 CIMGUI_API void igImMul(ImVec2 *pOut,const ImVec2 lhs,const ImVec2 rhs);
 CIMGUI_API bool igImIsFloatAboveGuaranteedIntegerPrecision(float f);
+CIMGUI_API float igImExponentialMovingAverage(float avg,float sample,int n);
 CIMGUI_API void igImBezierCubicCalc(ImVec2 *pOut,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,float t);
 CIMGUI_API void igImBezierCubicClosestPoint(ImVec2 *pOut,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,const ImVec2 p,int num_segments);
 CIMGUI_API void igImBezierCubicClosestPointCasteljau(ImVec2 *pOut,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,const ImVec2 p,float tess_tol);
@@ -3519,6 +3581,8 @@ CIMGUI_API void ImRect_ClipWithFull(ImRect* self,const ImRect r);
 CIMGUI_API void ImRect_Floor(ImRect* self);
 CIMGUI_API bool ImRect_IsInverted(ImRect* self);
 CIMGUI_API void ImRect_ToVec4(ImVec4 *pOut,ImRect* self);
+CIMGUI_API size_t igImBitArrayGetStorageSizeInBytes(int bitcount);
+CIMGUI_API void igImBitArrayClearAllBits(ImU32* arr,int bitcount);
 CIMGUI_API bool igImBitArrayTestBit(const ImU32* arr,int n);
 CIMGUI_API void igImBitArrayClearBit(ImU32* arr,int n);
 CIMGUI_API void igImBitArraySetBit(ImU32* arr,int n);
@@ -3540,6 +3604,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);
@@ -3551,6 +3616,9 @@ 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 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);
@@ -3578,8 +3646,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);
@@ -3617,8 +3685,6 @@ CIMGUI_API void ImGuiWindowSettings_destroy(ImGuiWindowSettings* self);
 CIMGUI_API char* ImGuiWindowSettings_GetName(ImGuiWindowSettings* self);
 CIMGUI_API ImGuiSettingsHandler* ImGuiSettingsHandler_ImGuiSettingsHandler(void);
 CIMGUI_API void ImGuiSettingsHandler_destroy(ImGuiSettingsHandler* self);
-CIMGUI_API ImGuiMetricsConfig* ImGuiMetricsConfig_ImGuiMetricsConfig(void);
-CIMGUI_API void ImGuiMetricsConfig_destroy(ImGuiMetricsConfig* self);
 CIMGUI_API ImGuiStackLevelInfo* ImGuiStackLevelInfo_ImGuiStackLevelInfo(void);
 CIMGUI_API void ImGuiStackLevelInfo_destroy(ImGuiStackLevelInfo* self);
 CIMGUI_API ImGuiStackTool* ImGuiStackTool_ImGuiStackTool(void);
@@ -3643,8 +3709,6 @@ CIMGUI_API ImGuiTabItem* ImGuiTabItem_ImGuiTabItem(void);
 CIMGUI_API void ImGuiTabItem_destroy(ImGuiTabItem* self);
 CIMGUI_API ImGuiTabBar* ImGuiTabBar_ImGuiTabBar(void);
 CIMGUI_API void ImGuiTabBar_destroy(ImGuiTabBar* self);
-CIMGUI_API int ImGuiTabBar_GetTabOrder(ImGuiTabBar* self,const ImGuiTabItem* tab);
-CIMGUI_API const char* ImGuiTabBar_GetTabName(ImGuiTabBar* self,const ImGuiTabItem* tab);
 CIMGUI_API ImGuiTableColumn* ImGuiTableColumn_ImGuiTableColumn(void);
 CIMGUI_API void ImGuiTableColumn_destroy(ImGuiTableColumn* self);
 CIMGUI_API ImGuiTableInstanceData* ImGuiTableInstanceData_ImGuiTableInstanceData(void);
@@ -3672,6 +3736,7 @@ 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);
@@ -3701,12 +3766,13 @@ CIMGUI_API void igSetWindowViewport(ImGuiWindow* window,ImGuiViewportP* viewport
 CIMGUI_API void igMarkIniSettingsDirty_Nil(void);
 CIMGUI_API void igMarkIniSettingsDirty_WindowPtr(ImGuiWindow* window);
 CIMGUI_API void igClearIniSettings(void);
-CIMGUI_API ImGuiWindowSettings* igCreateNewWindowSettings(const char* name);
-CIMGUI_API ImGuiWindowSettings* igFindWindowSettings(ImGuiID id);
-CIMGUI_API ImGuiWindowSettings* igFindOrCreateWindowSettings(const char* name);
 CIMGUI_API void igAddSettingsHandler(const ImGuiSettingsHandler* handler);
 CIMGUI_API void igRemoveSettingsHandler(const char* type_name);
 CIMGUI_API ImGuiSettingsHandler* igFindSettingsHandler(const char* type_name);
+CIMGUI_API ImGuiWindowSettings* igCreateNewWindowSettings(const char* name);
+CIMGUI_API ImGuiWindowSettings* igFindWindowSettingsByID(ImGuiID id);
+CIMGUI_API ImGuiWindowSettings* igFindWindowSettingsByWindow(ImGuiWindow* window);
+CIMGUI_API void igClearWindowSettings(const char* name);
 CIMGUI_API void igLocalizeRegisterEntries(const ImGuiLocEntry* entries,int count);
 CIMGUI_API const char* igLocalizeGetMsg(ImGuiLocKey key);
 CIMGUI_API void igSetScrollX_WindowPtr(ImGuiWindow* window,float scroll_x);
@@ -3717,7 +3783,6 @@ CIMGUI_API void igScrollToItem(ImGuiScrollFlags flags);
 CIMGUI_API void igScrollToRect(ImGuiWindow* window,const ImRect rect,ImGuiScrollFlags flags);
 CIMGUI_API void igScrollToRectEx(ImVec2 *pOut,ImGuiWindow* window,const ImRect rect,ImGuiScrollFlags flags);
 CIMGUI_API void igScrollToBringRectIntoView(ImGuiWindow* window,const ImRect rect);
-CIMGUI_API ImGuiID igGetItemID(void);
 CIMGUI_API ImGuiItemStatusFlags igGetItemStatusFlags(void);
 CIMGUI_API ImGuiItemFlags igGetItemFlags(void);
 CIMGUI_API ImGuiID igGetActiveID(void);
@@ -3730,11 +3795,13 @@ CIMGUI_API void igSetHoveredID(ImGuiID id);
 CIMGUI_API void igKeepAliveID(ImGuiID id);
 CIMGUI_API void igMarkItemEdited(ImGuiID id);
 CIMGUI_API void igPushOverrideID(ImGuiID id);
-CIMGUI_API ImGuiID igGetIDWithSeed(const char* str_id_begin,const char* str_id_end,ImGuiID seed);
+CIMGUI_API ImGuiID igGetIDWithSeed_Str(const char* str_id_begin,const char* str_id_end,ImGuiID seed);
+CIMGUI_API ImGuiID igGetIDWithSeed_Int(int n,ImGuiID seed);
 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);
@@ -3745,6 +3812,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);
@@ -3756,7 +3824,7 @@ 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);
@@ -3787,12 +3855,14 @@ CIMGUI_API bool igIsKeyboardKey(ImGuiKey key);
 CIMGUI_API bool igIsGamepadKey(ImGuiKey key);
 CIMGUI_API bool igIsMouseKey(ImGuiKey key);
 CIMGUI_API bool igIsAliasKey(ImGuiKey key);
-CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiKey key);
-CIMGUI_API ImGuiKeyData* igGetKeyData(ImGuiKey key);
+CIMGUI_API ImGuiKeyChord igConvertShortcutMod(ImGuiKeyChord key_chord);
+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);
-CIMGUI_API void igGetKeyVector2d(ImVec2 *pOut,ImGuiKey key_left,ImGuiKey key_right,ImGuiKey key_up,ImGuiKey key_down);
+CIMGUI_API void igGetKeyMagnitude2d(ImVec2 *pOut,ImGuiKey key_left,ImGuiKey key_right,ImGuiKey key_up,ImGuiKey key_down);
 CIMGUI_API float igGetNavTweakPressedAmount(ImGuiAxis axis);
 CIMGUI_API int igCalcTypematicRepeatAmount(float t0,float t1,float repeat_delay,float repeat_rate);
 CIMGUI_API void igGetTypematicRepeatRate(ImGuiInputFlags flags,float* repeat_delay,float* repeat_rate);
@@ -3800,9 +3870,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);
@@ -3852,6 +3923,7 @@ CIMGUI_API void igTableDrawContextMenu(ImGuiTable* table);
 CIMGUI_API bool igTableBeginContextMenuPopup(ImGuiTable* table);
 CIMGUI_API void igTableMergeDrawChannels(ImGuiTable* table);
 CIMGUI_API ImGuiTableInstanceData* igTableGetInstanceData(ImGuiTable* table,int instance_no);
+CIMGUI_API ImGuiID igTableGetInstanceID(ImGuiTable* table,int instance_no);
 CIMGUI_API void igTableSortSpecsSanitize(ImGuiTable* table);
 CIMGUI_API void igTableSortSpecsBuild(ImGuiTable* table);
 CIMGUI_API ImGuiSortDirection igTableGetColumnNextSortDirection(ImGuiTableColumn* column);
@@ -3863,7 +3935,7 @@ CIMGUI_API void igTableBeginCell(ImGuiTable* table,int column_n);
 CIMGUI_API void igTableEndCell(ImGuiTable* table);
 CIMGUI_API void igTableGetCellBgRect(ImRect *pOut,const ImGuiTable* table,int column_n);
 CIMGUI_API const char* igTableGetColumnName_TablePtr(const ImGuiTable* table,int column_n);
-CIMGUI_API ImGuiID igTableGetColumnResizeID(const ImGuiTable* table,int column_n,int instance_no);
+CIMGUI_API ImGuiID igTableGetColumnResizeID(ImGuiTable* table,int column_n,int instance_no);
 CIMGUI_API float igTableGetMaxColumnWidth(const ImGuiTable* table,int column_n);
 CIMGUI_API void igTableSetColumnWidthAutoSingle(ImGuiTable* table,int column_n);
 CIMGUI_API void igTableSetColumnWidthAutoAll(ImGuiTable* table);
@@ -3878,15 +3950,22 @@ CIMGUI_API ImGuiTableSettings* igTableGetBoundSettings(ImGuiTable* table);
 CIMGUI_API void igTableSettingsAddSettingsHandler(void);
 CIMGUI_API ImGuiTableSettings* igTableSettingsCreate(ImGuiID id,int columns_count);
 CIMGUI_API ImGuiTableSettings* igTableSettingsFindByID(ImGuiID id);
+CIMGUI_API ImGuiTabBar* igGetCurrentTabBar(void);
 CIMGUI_API bool igBeginTabBarEx(ImGuiTabBar* tab_bar,const ImRect bb,ImGuiTabBarFlags flags);
 CIMGUI_API ImGuiTabItem* igTabBarFindTabByID(ImGuiTabBar* tab_bar,ImGuiID tab_id);
+CIMGUI_API ImGuiTabItem* igTabBarFindTabByOrder(ImGuiTabBar* tab_bar,int order);
+CIMGUI_API ImGuiTabItem* igTabBarGetCurrentTab(ImGuiTabBar* tab_bar);
+CIMGUI_API int igTabBarGetTabOrder(ImGuiTabBar* tab_bar,ImGuiTabItem* tab);
+CIMGUI_API const char* igTabBarGetTabName(ImGuiTabBar* tab_bar,ImGuiTabItem* tab);
 CIMGUI_API void igTabBarRemoveTab(ImGuiTabBar* tab_bar,ImGuiID tab_id);
 CIMGUI_API void igTabBarCloseTab(ImGuiTabBar* tab_bar,ImGuiTabItem* tab);
-CIMGUI_API void igTabBarQueueReorder(ImGuiTabBar* tab_bar,const ImGuiTabItem* tab,int offset);
-CIMGUI_API void igTabBarQueueReorderFromMousePos(ImGuiTabBar* tab_bar,const ImGuiTabItem* tab,ImVec2 mouse_pos);
+CIMGUI_API void igTabBarQueueFocus(ImGuiTabBar* tab_bar,ImGuiTabItem* tab);
+CIMGUI_API void igTabBarQueueReorder(ImGuiTabBar* tab_bar,ImGuiTabItem* tab,int offset);
+CIMGUI_API void igTabBarQueueReorderFromMousePos(ImGuiTabBar* tab_bar,ImGuiTabItem* tab,ImVec2 mouse_pos);
 CIMGUI_API bool igTabBarProcessReorder(ImGuiTabBar* tab_bar);
-CIMGUI_API bool igTabItemEx(ImGuiTabBar* tab_bar,const char* label,bool* p_open,ImGuiTabItemFlags flags);
-CIMGUI_API void igTabItemCalcSize(ImVec2 *pOut,const char* label,bool has_close_button_or_unsaved_marker);
+CIMGUI_API bool igTabItemEx(ImGuiTabBar* tab_bar,const char* label,bool* p_open,ImGuiTabItemFlags flags,ImGuiWindow* docked_window);
+CIMGUI_API void igTabItemCalcSize_Str(ImVec2 *pOut,const char* label,bool has_close_button_or_unsaved_marker);
+CIMGUI_API void igTabItemCalcSize_WindowPtr(ImVec2 *pOut,ImGuiWindow* window);
 CIMGUI_API void igTabItemBackground(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImU32 col);
 CIMGUI_API void igTabItemLabelAndCloseButton(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImVec2 frame_padding,const char* label,ImGuiID tab_id,ImGuiID close_button_id,bool is_contents_visible,bool* out_just_closed,bool* out_text_clipped);
 CIMGUI_API void igRenderText(ImVec2 pos,const char* text,const char* text_end,bool hide_text_after_hash);
@@ -3908,23 +3987,24 @@ CIMGUI_API void igRenderRectFilledRangeH(ImDrawList* draw_list,const ImRect rect
 CIMGUI_API void igRenderRectFilledWithHole(ImDrawList* draw_list,const ImRect outer,const ImRect inner,ImU32 col,float rounding);
 CIMGUI_API void igTextEx(const char* text,const char* text_end,ImGuiTextFlags flags);
 CIMGUI_API bool igButtonEx(const char* label,const ImVec2 size_arg,ImGuiButtonFlags flags);
+CIMGUI_API bool igArrowButtonEx(const char* str_id,ImGuiDir dir,ImVec2 size_arg,ImGuiButtonFlags flags);
+CIMGUI_API bool igImageButtonEx(ImGuiID id,ImTextureID texture_id,const ImVec2 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 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);
 CIMGUI_API bool igCloseButton(ImGuiID id,const ImVec2 pos);
 CIMGUI_API bool igCollapseButton(ImGuiID id,const ImVec2 pos);
-CIMGUI_API bool igArrowButtonEx(const char* str_id,ImGuiDir dir,ImVec2 size_arg,ImGuiButtonFlags flags);
 CIMGUI_API void igScrollbar(ImGuiAxis axis);
 CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,ImS64* p_scroll_v,ImS64 avail_v,ImS64 contents_v,ImDrawFlags flags);
-CIMGUI_API bool igImageButtonEx(ImGuiID id,ImTextureID texture_id,const ImVec2 size,const ImVec2 uv0,const ImVec2 uv1,const ImVec4 bg_col,const ImVec4 tint_col);
 CIMGUI_API void igGetWindowScrollbarRect(ImRect *pOut,ImGuiWindow* window,ImGuiAxis axis);
 CIMGUI_API ImGuiID igGetWindowScrollbarID(ImGuiWindow* window,ImGuiAxis axis);
 CIMGUI_API ImGuiID igGetWindowResizeCornerID(ImGuiWindow* window,int n);
 CIMGUI_API ImGuiID igGetWindowResizeBorderID(ImGuiWindow* window,ImGuiDir dir);
-CIMGUI_API void igSeparatorEx(ImGuiSeparatorFlags flags);
-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);
 CIMGUI_API bool igButtonBehavior(const ImRect bb,ImGuiID id,bool* out_hovered,bool* out_held,ImGuiButtonFlags flags);
 CIMGUI_API bool igDragBehavior(ImGuiID id,ImGuiDataType data_type,void* p_v,float v_speed,const void* p_min,const void* p_max,const char* format,ImGuiSliderFlags flags);
 CIMGUI_API bool igSliderBehavior(const ImRect bb,ImGuiID id,ImGuiDataType data_type,void* p_v,const void* p_min,const void* p_max,const char* format,ImGuiSliderFlags flags,ImRect* out_grab_bb);
-CIMGUI_API bool igSplitterBehavior(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* size1,float* size2,float min_size1,float min_size2,float hover_extend,float hover_visibility_delay);
+CIMGUI_API bool igSplitterBehavior(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* size1,float* size2,float min_size1,float min_size2,float hover_extend,float hover_visibility_delay,ImU32 bg_col);
 CIMGUI_API bool igTreeNodeBehavior(ImGuiID id,ImGuiTreeNodeFlags flags,const char* label,const char* label_end);
 CIMGUI_API void igTreePushOverrideID(ImGuiID id);
 CIMGUI_API void igTreeNodeSetOpen(ImGuiID id,bool open);
@@ -3936,6 +4016,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);
@@ -3943,7 +4024,7 @@ CIMGUI_API ImGuiInputTextState* igGetInputTextState(ImGuiID id);
 CIMGUI_API void igColorTooltip(const char* text,const float* col,ImGuiColorEditFlags flags);
 CIMGUI_API void igColorEditOptionsPopup(const float* col,ImGuiColorEditFlags flags);
 CIMGUI_API void igColorPickerOptionsPopup(const float* ref_col,ImGuiColorEditFlags flags);
-CIMGUI_API int igPlotEx(ImGuiPlotType plot_type,const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 frame_size);
+CIMGUI_API int igPlotEx(ImGuiPlotType plot_type,const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,const ImVec2 size_arg);
 CIMGUI_API void igShadeVertsLinearColorGradientKeepAlpha(ImDrawList* draw_list,int vert_start_idx,int vert_end_idx,ImVec2 gradient_p0,ImVec2 gradient_p1,ImU32 col0,ImU32 col1);
 CIMGUI_API void igShadeVertsLinearUV(ImDrawList* draw_list,int vert_start_idx,int vert_end_idx,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,bool clamp);
 CIMGUI_API void igGcCompactTransientMiscBuffers(void);
@@ -3976,6 +4057,7 @@ CIMGUI_API void igDebugNodeWindowSettings(ImGuiWindowSettings* settings);
 CIMGUI_API void igDebugNodeWindowsList(ImVector_ImGuiWindowPtr* windows,const char* label);
 CIMGUI_API void igDebugNodeWindowsListByBeginStackParent(ImGuiWindow** windows,int windows_size,ImGuiWindow* parent_in_begin_stack);
 CIMGUI_API void igDebugNodeViewport(ImGuiViewportP* viewport);
+CIMGUI_API void igDebugRenderKeyboardPreview(ImDrawList* draw_list);
 CIMGUI_API void igDebugRenderViewportThumbnail(ImDrawList* draw_list,ImGuiViewportP* viewport,const ImRect bb);
 CIMGUI_API bool igIsKeyPressedMap(ImGuiKey key,bool repeat);
 CIMGUI_API const ImFontBuilderIO* igImFontAtlasGetBuilderForStbTruetype(void);
--- a/generator/cpp2ffi.lua
+++ b/generator/cpp2ffi.lua
@@ -436,10 +436,11 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
 							-- end
 							--error"no entry in linenumdict"
 							--take locat from parent
-							if itparent.locat then
+							if itparent and itparent.locat then
 								loca = itparent.locat
 							else
-								error"no entry in linenumdict"
+								loca = 0
+								--error"no entry in linenumdict"
 							end
 						end
 					else
@@ -985,15 +986,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
--- 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 sdl
+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
@@ -75,6 +77,9 @@ local cimgui_manuals = {
    --igColorConvertRGBtoHSV = true,
    --igColorConvertHSVtoRGB = true
 }
+local cimgui_skipped = {
+	 --igShowDemoWindow = true
+}
 --------------------------------------------------------------------------
 --this table is a dictionary to force a naming of function overloading (instead of algorythmic generated)
 --first level is cimguiname without postfix, second level is the signature of the function, value is the
@@ -246,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)
@@ -288,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)

@@ -304,9 +314,12 @@ local function parseImGuiHeader(header,names)
 	end
 	parser.cname_overloads = cimgui_overloads
 	parser.manuals = cimgui_manuals
+	parser.skipped = cimgui_skipped
 	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
--- 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,7 +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)
-luajit ./generator.lua gcc "internal" glfw opengl3 opengl2 sdl
+#
+
+# 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
+
+echo "CFLAGS: " $CFLAGS
+echo "TARGETS: " $TARGETS
+
+luajit$suffix ./generator.lua gcc "$TARGETS" $CFLAGS
--- a/generator/output/cimgui_impl.h
+++ b/generator/output/cimgui_impl.h
@@ -10,6 +10,7 @@ CIMGUI_API void ImGui_ImplGlfw_Shutdown(void);
 CIMGUI_API void ImGui_ImplGlfw_NewFrame(void);
 CIMGUI_API void ImGui_ImplGlfw_InstallCallbacks(GLFWwindow* window);
 CIMGUI_API void ImGui_ImplGlfw_RestoreCallbacks(GLFWwindow* window);
+CIMGUI_API void ImGui_ImplGlfw_SetCallbacksChainForAllWindows(bool chain_for_all_windows);
 CIMGUI_API void ImGui_ImplGlfw_WindowFocusCallback(GLFWwindow* window,int focused);
 CIMGUI_API void ImGui_ImplGlfw_CursorEnterCallback(GLFWwindow* window,int entered);
 CIMGUI_API void ImGui_ImplGlfw_CursorPosCallback(GLFWwindow* window,double x,double y);
@@ -42,7 +43,7 @@ CIMGUI_API bool ImGui_ImplOpenGL2_CreateDeviceObjects(void);
 CIMGUI_API void ImGui_ImplOpenGL2_DestroyDeviceObjects(void);

 #endif
-#ifdef CIMGUI_USE_SDL
+#ifdef CIMGUI_USE_SDL2

 typedef struct SDL_Window SDL_Window;
 typedef struct SDL_Renderer SDL_Renderer;
--- 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:41",
+      "location": "imgui_impl_glfw:46",
      "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:36",
+      "location": "imgui_impl_glfw:41",
      "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:37",
+      "location": "imgui_impl_glfw:42",
      "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:22",
+      "location": "imgui_impl_glfw:23",
      "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:24",
+      "location": "imgui_impl_glfw:25",
      "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:23",
+      "location": "imgui_impl_glfw:24",
      "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:31",
+      "location": "imgui_impl_glfw:32",
      "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:40",
+      "location": "imgui_impl_glfw:45",
      "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:42",
+      "location": "imgui_impl_glfw:47",
      "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:38",
+      "location": "imgui_impl_glfw:43",
      "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:26",
+      "location": "imgui_impl_glfw:27",
      "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:32",
+      "location": "imgui_impl_glfw:33",
      "ov_cimguiname": "ImGui_ImplGlfw_RestoreCallbacks",
      "ret": "void",
      "signature": "(GLFWwindow*)",
@@ -328,13 +328,34 @@
      "cimguiname": "ImGui_ImplGlfw_ScrollCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_ScrollCallback",
-      "location": "imgui_impl_glfw:39",
+      "location": "imgui_impl_glfw:44",
      "ov_cimguiname": "ImGui_ImplGlfw_ScrollCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,double,double)",
      "stname": ""
    }
  ],
+  "ImGui_ImplGlfw_SetCallbacksChainForAllWindows": [
+    {
+      "args": "(bool chain_for_all_windows)",
+      "argsT": [
+        {
+          "name": "chain_for_all_windows",
+          "type": "bool"
+        }
+      ],
+      "argsoriginal": "(bool chain_for_all_windows)",
+      "call_args": "(chain_for_all_windows)",
+      "cimguiname": "ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
+      "defaults": {},
+      "funcname": "ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
+      "location": "imgui_impl_glfw:37",
+      "ov_cimguiname": "ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
+      "ret": "void",
+      "signature": "(bool)",
+      "stname": ""
+    }
+  ],
  "ImGui_ImplGlfw_Shutdown": [
    {
      "args": "()",
@@ -344,7 +365,7 @@
      "cimguiname": "ImGui_ImplGlfw_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_Shutdown",
-      "location": "imgui_impl_glfw:25",
+      "location": "imgui_impl_glfw:26",
      "ov_cimguiname": "ImGui_ImplGlfw_Shutdown",
      "ret": "void",
      "signature": "()",
@@ -369,7 +390,7 @@
      "cimguiname": "ImGui_ImplGlfw_WindowFocusCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_WindowFocusCallback",
-      "location": "imgui_impl_glfw:35",
+      "location": "imgui_impl_glfw:40",
      "ov_cimguiname": "ImGui_ImplGlfw_WindowFocusCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int)",
@@ -663,7 +684,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForD3D",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForD3D",
-      "location": "imgui_impl_sdl:27",
+      "location": "imgui_impl_sdl2:27",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForD3D",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -684,7 +705,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForMetal",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForMetal",
-      "location": "imgui_impl_sdl:28",
+      "location": "imgui_impl_sdl2:28",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForMetal",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -709,7 +730,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForOpenGL",
-      "location": "imgui_impl_sdl:25",
+      "location": "imgui_impl_sdl2:25",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
      "ret": "bool",
      "signature": "(SDL_Window*,void*)",
@@ -734,7 +755,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForSDLRenderer",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForSDLRenderer",
-      "location": "imgui_impl_sdl:29",
+      "location": "imgui_impl_sdl2:29",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForSDLRenderer",
      "ret": "bool",
      "signature": "(SDL_Window*,SDL_Renderer*)",
@@ -755,7 +776,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForVulkan",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForVulkan",
-      "location": "imgui_impl_sdl:26",
+      "location": "imgui_impl_sdl2:26",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForVulkan",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -771,7 +792,7 @@
      "cimguiname": "ImGui_ImplSDL2_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_NewFrame",
-      "location": "imgui_impl_sdl:31",
+      "location": "imgui_impl_sdl2:31",
      "ov_cimguiname": "ImGui_ImplSDL2_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -792,7 +813,7 @@
      "cimguiname": "ImGui_ImplSDL2_ProcessEvent",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_ProcessEvent",
-      "location": "imgui_impl_sdl:32",
+      "location": "imgui_impl_sdl2:32",
      "ov_cimguiname": "ImGui_ImplSDL2_ProcessEvent",
      "ret": "bool",
      "signature": "(const SDL_Event*)",
@@ -808,7 +829,7 @@
      "cimguiname": "ImGui_ImplSDL2_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_Shutdown",
-      "location": "imgui_impl_sdl:30",
+      "location": "imgui_impl_sdl2:30",
      "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:41"
+defs["ImGui_ImplGlfw_CharCallback"][1]["location"] = "imgui_impl_glfw:46"
 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:36"
+defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["location"] = "imgui_impl_glfw:41"
 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:37"
+defs["ImGui_ImplGlfw_CursorPosCallback"][1]["location"] = "imgui_impl_glfw:42"
 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:22"
+defs["ImGui_ImplGlfw_InitForOpenGL"][1]["location"] = "imgui_impl_glfw:23"
 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:24"
+defs["ImGui_ImplGlfw_InitForOther"][1]["location"] = "imgui_impl_glfw:25"
 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:23"
+defs["ImGui_ImplGlfw_InitForVulkan"][1]["location"] = "imgui_impl_glfw:24"
 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:31"
+defs["ImGui_ImplGlfw_InstallCallbacks"][1]["location"] = "imgui_impl_glfw:32"
 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:40"
+defs["ImGui_ImplGlfw_KeyCallback"][1]["location"] = "imgui_impl_glfw:45"
 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:42"
+defs["ImGui_ImplGlfw_MonitorCallback"][1]["location"] = "imgui_impl_glfw:47"
 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:38"
+defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["location"] = "imgui_impl_glfw:43"
 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:26"
+defs["ImGui_ImplGlfw_NewFrame"][1]["location"] = "imgui_impl_glfw:27"
 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:32"
+defs["ImGui_ImplGlfw_RestoreCallbacks"][1]["location"] = "imgui_impl_glfw:33"
 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,12 +275,30 @@ 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:39"
+defs["ImGui_ImplGlfw_ScrollCallback"][1]["location"] = "imgui_impl_glfw:44"
 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)"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["stname"] = ""
 defs["ImGui_ImplGlfw_ScrollCallback"]["(GLFWwindow*,double,double)"] = defs["ImGui_ImplGlfw_ScrollCallback"][1]
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"] = {}
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1] = {}
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["args"] = "(bool chain_for_all_windows)"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["argsT"] = {}
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["argsT"][1] = {}
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["argsT"][1]["name"] = "chain_for_all_windows"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["argsT"][1]["type"] = "bool"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["argsoriginal"] = "(bool chain_for_all_windows)"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["call_args"] = "(chain_for_all_windows)"
+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:37"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_SetCallbacksChainForAllWindows"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["ret"] = "void"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["signature"] = "(bool)"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["stname"] = ""
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"]["(bool)"] = defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]
 defs["ImGui_ImplGlfw_Shutdown"] = {}
 defs["ImGui_ImplGlfw_Shutdown"][1] = {}
 defs["ImGui_ImplGlfw_Shutdown"][1]["args"] = "()"
@@ -290,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:25"
+defs["ImGui_ImplGlfw_Shutdown"][1]["location"] = "imgui_impl_glfw:26"
 defs["ImGui_ImplGlfw_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_Shutdown"
 defs["ImGui_ImplGlfw_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_Shutdown"][1]["signature"] = "()"
@@ -311,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:35"
+defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["location"] = "imgui_impl_glfw:40"
 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)"
@@ -579,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_sdl:27"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["location"] = "imgui_impl_sdl2:27"
 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*)"
@@ -597,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_sdl:28"
+defs["ImGui_ImplSDL2_InitForMetal"][1]["location"] = "imgui_impl_sdl2:28"
 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*)"
@@ -618,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_sdl:25"
+defs["ImGui_ImplSDL2_InitForOpenGL"][1]["location"] = "imgui_impl_sdl2:25"
 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*)"
@@ -639,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_sdl:29"
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["location"] = "imgui_impl_sdl2:29"
 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*)"
@@ -657,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_sdl:26"
+defs["ImGui_ImplSDL2_InitForVulkan"][1]["location"] = "imgui_impl_sdl2:26"
 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*)"
@@ -672,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_sdl:31"
+defs["ImGui_ImplSDL2_NewFrame"][1]["location"] = "imgui_impl_sdl2:31"
 defs["ImGui_ImplSDL2_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_NewFrame"
 defs["ImGui_ImplSDL2_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplSDL2_NewFrame"][1]["signature"] = "()"
@@ -690,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_sdl:32"
+defs["ImGui_ImplSDL2_ProcessEvent"][1]["location"] = "imgui_impl_sdl2:32"
 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*)"
@@ -705,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_sdl:30"
+defs["ImGui_ImplSDL2_Shutdown"][1]["location"] = "imgui_impl_sdl2:30"
 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
@@ -123,6 +123,12 @@ igGetID	3
 1	ImGuiID	igGetID_Str (const char*)
 2	ImGuiID	igGetID_StrStr (const char*,const char*)
 3	ImGuiID	igGetID_Ptr (const void*)
+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)
@@ -244,6 +250,9 @@ igSetWindowSize	3
 1	void	igSetWindowSize_Vec2 (const ImVec2,ImGuiCond)
 2	void	igSetWindowSize_Str (const char*,const ImVec2,ImGuiCond)
 3	void	igSetWindowSize_WindowPtr (ImGuiWindow*,const ImVec2,ImGuiCond)
+igTabItemCalcSize	2
+1	ImVec2	igTabItemCalcSize_Str (const char*,bool)
+2	ImVec2	igTabItemCalcSize_WindowPtr (ImGuiWindow*)
 igTableGcCompactTransientBuffers	2
 1	void	igTableGcCompactTransientBuffers_TablePtr (ImGuiTable*)
 2	void	igTableGcCompactTransientBuffers_TableTempDataPtr (ImGuiTableTempData*)
@@ -272,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*)
-191 overloaded
+197 overloaded
--- a/generator/output/structs_and_enums.json
+++ b/generator/output/structs_and_enums.json
@@ -1012,13 +1012,18 @@
      },
      {
        "calc_value": 32,
-        "name": "ImGuiDebugLogFlags_EventIO",
+        "name": "ImGuiDebugLogFlags_EventSelection",
        "value": "1 << 5"
      },
      {
-        "calc_value": 63,
+        "calc_value": 64,
+        "name": "ImGuiDebugLogFlags_EventIO",
+        "value": "1 << 6"
+      },
+      {
+        "calc_value": 127,
        "name": "ImGuiDebugLogFlags_EventMask_",
-        "value": "ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventIO"
+        "value": "ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventSelection | ImGuiDebugLogFlags_EventIO"
      },
      {
        "calc_value": 1024,
@@ -1416,13 +1421,8 @@
      },
      {
        "calc_value": 5,
-        "name": "ImGuiInputSource_Nav",
-        "value": "5"
-      },
-      {
-        "calc_value": 6,
        "name": "ImGuiInputSource_COUNT",
-        "value": "6"
+        "value": "5"
      }
    ],
    "ImGuiInputTextFlagsPrivate_": [
@@ -2405,14 +2405,14 @@
        "value": "1 << 15"
      },
      {
-        "calc_value": 61440,
-        "name": "ImGuiMod_Mask_",
-        "value": "0xF000"
+        "calc_value": 2048,
+        "name": "ImGuiMod_Shortcut",
+        "value": "1 << 11"
      },
      {
-        "calc_value": 4096,
-        "name": "ImGuiMod_Shortcut",
-        "value": "ImGuiMod_Ctrl"
+        "calc_value": 63488,
+        "name": "ImGuiMod_Mask_",
+        "value": "0xF800"
      },
      {
        "calc_value": 512,
@@ -2600,6 +2600,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,
@@ -3065,23 +3087,18 @@
      },
      {
        "calc_value": 33554432,
-        "name": "ImGuiSelectableFlags_DrawHoveredWhenHeld",
+        "name": "ImGuiSelectableFlags_SetNavIdOnHover",
        "value": "1 << 25"
      },
      {
        "calc_value": 67108864,
-        "name": "ImGuiSelectableFlags_SetNavIdOnHover",
+        "name": "ImGuiSelectableFlags_NoPadWithHalfSpacing",
        "value": "1 << 26"
      },
      {
        "calc_value": 134217728,
-        "name": "ImGuiSelectableFlags_NoPadWithHalfSpacing",
-        "value": "1 << 27"
-      },
-      {
-        "calc_value": 268435456,
        "name": "ImGuiSelectableFlags_NoSetKeyOwner",
-        "value": "1 << 28"
+        "value": "1 << 27"
      }
    ],
    "ImGuiSelectableFlags_": [
@@ -3327,8 +3344,23 @@
      },
      {
        "calc_value": 25,
-        "name": "ImGuiStyleVar_COUNT",
+        "name": "ImGuiStyleVar_SeparatorTextBorderSize",
        "value": "25"
+      },
+      {
+        "calc_value": 26,
+        "name": "ImGuiStyleVar_SeparatorTextAlign",
+        "value": "26"
+      },
+      {
+        "calc_value": 27,
+        "name": "ImGuiStyleVar_SeparatorTextPadding",
+        "value": "27"
+      },
+      {
+        "calc_value": 28,
+        "name": "ImGuiStyleVar_COUNT",
+        "value": "28"
      }
    ],
    "ImGuiTabBarFlagsPrivate_": [
@@ -4112,172 +4144,176 @@
  },
  "enumtypes": {
    "ImGuiKey": "int",
-    "ImGuiLocKey": "int"
+    "ImGuiLocKey": "int",
+    "ImGuiMouseSource": "int"
  },
  "locations": {
-    "ImBitVector": "imgui_internal:583",
-    "ImColor": "imgui:2346",
-    "ImDrawChannel": "imgui:2436",
-    "ImDrawCmd": "imgui:2395",
-    "ImDrawCmdHeader": "imgui:2428",
-    "ImDrawData": "imgui:2628",
-    "ImDrawDataBuilder": "imgui_internal:772",
-    "ImDrawFlags_": "imgui:2462",
-    "ImDrawList": "imgui:2500",
-    "ImDrawListFlags_": "imgui:2482",
-    "ImDrawListSharedData": "imgui_internal:749",
-    "ImDrawListSplitter": "imgui:2445",
-    "ImDrawVert": "imgui:2413",
-    "ImFont": "imgui:2846",
-    "ImFontAtlas": "imgui:2744",
-    "ImFontAtlasCustomRect": "imgui:2706",
-    "ImFontAtlasFlags_": "imgui:2719",
-    "ImFontBuilderIO": "imgui_internal:3180",
-    "ImFontConfig": "imgui:2650",
-    "ImFontGlyph": "imgui:2679",
-    "ImFontGlyphRangesBuilder": "imgui:2691",
-    "ImGuiActivateFlags_": "imgui_internal:1407",
+    "ImBitVector": "imgui_internal:581",
+    "ImColor": "imgui:2403",
+    "ImDrawChannel": "imgui:2493",
+    "ImDrawCmd": "imgui:2452",
+    "ImDrawCmdHeader": "imgui:2485",
+    "ImDrawData": "imgui:2684",
+    "ImDrawDataBuilder": "imgui_internal:771",
+    "ImDrawFlags_": "imgui:2519",
+    "ImDrawList": "imgui:2557",
+    "ImDrawListFlags_": "imgui:2539",
+    "ImDrawListSharedData": "imgui_internal:748",
+    "ImDrawListSplitter": "imgui:2502",
+    "ImDrawVert": "imgui:2470",
+    "ImFont": "imgui:2903",
+    "ImFontAtlas": "imgui:2800",
+    "ImFontAtlasCustomRect": "imgui:2762",
+    "ImFontAtlasFlags_": "imgui:2775",
+    "ImFontBuilderIO": "imgui_internal:3239",
+    "ImFontConfig": "imgui:2706",
+    "ImFontGlyph": "imgui:2735",
+    "ImFontGlyphRangesBuilder": "imgui:2747",
+    "ImGuiActivateFlags_": "imgui_internal:1426",
    "ImGuiAxis": "imgui_internal:939",
    "ImGuiBackendFlags_": "imgui:1510",
-    "ImGuiButtonFlagsPrivate_": "imgui_internal:843",
-    "ImGuiButtonFlags_": "imgui:1617",
+    "ImGuiButtonFlagsPrivate_": "imgui_internal:844",
+    "ImGuiButtonFlags_": "imgui:1620",
    "ImGuiCol_": "imgui:1520",
-    "ImGuiColorEditFlags_": "imgui:1630",
-    "ImGuiColorMod": "imgui_internal:982",
-    "ImGuiComboFlagsPrivate_": "imgui_internal:868",
-    "ImGuiComboFlags_": "imgui:1079",
-    "ImGuiComboPreviewData": "imgui_internal:999",
-    "ImGuiCond_": "imgui:1721",
+    "ImGuiColorEditFlags_": "imgui:1633",
+    "ImGuiColorMod": "imgui_internal:990",
+    "ImGuiComboFlagsPrivate_": "imgui_internal:869",
+    "ImGuiComboFlags_": "imgui:1080",
+    "ImGuiComboPreviewData": "imgui_internal:1007",
+    "ImGuiCond_": "imgui:1734",
    "ImGuiConfigFlags_": "imgui:1494",
-    "ImGuiContext": "imgui_internal:1726",
-    "ImGuiContextHook": "imgui_internal:1711",
-    "ImGuiContextHookType": "imgui_internal:1709",
-    "ImGuiDataTypeInfo": "imgui_internal:965",
-    "ImGuiDataTypePrivate_": "imgui_internal:974",
-    "ImGuiDataTypeTempStorage": "imgui_internal:959",
-    "ImGuiDataType_": "imgui:1316",
-    "ImGuiDebugLogFlags_": "imgui_internal:1645",
-    "ImGuiDir_": "imgui:1332",
-    "ImGuiDragDropFlags_": "imgui:1294",
-    "ImGuiFocusedFlags_": "imgui:1256",
-    "ImGuiGroupData": "imgui_internal:1012",
-    "ImGuiHoveredFlags_": "imgui:1270",
-    "ImGuiIO": "imgui:1898",
-    "ImGuiInputEvent": "imgui_internal:1266",
-    "ImGuiInputEventAppFocused": "imgui_internal:1264",
-    "ImGuiInputEventKey": "imgui_internal:1262",
-    "ImGuiInputEventMouseButton": "imgui_internal:1261",
-    "ImGuiInputEventMousePos": "imgui_internal:1259",
-    "ImGuiInputEventMouseWheel": "imgui_internal:1260",
-    "ImGuiInputEventText": "imgui_internal:1263",
-    "ImGuiInputEventType": "imgui_internal:1234",
-    "ImGuiInputFlags_": "imgui_internal:1328",
-    "ImGuiInputSource": "imgui_internal:1246",
-    "ImGuiInputTextCallbackData": "imgui:2071",
-    "ImGuiInputTextFlagsPrivate_": "imgui_internal:834",
-    "ImGuiInputTextFlags_": "imgui:991",
-    "ImGuiInputTextState": "imgui_internal:1047",
-    "ImGuiItemFlags_": "imgui_internal:791",
-    "ImGuiItemStatusFlags_": "imgui_internal:811",
-    "ImGuiKey": "imgui:1353",
-    "ImGuiKeyData": "imgui:1890",
-    "ImGuiKeyOwnerData": "imgui_internal:1316",
-    "ImGuiKeyRoutingData": "imgui_internal:1291",
-    "ImGuiKeyRoutingTable": "imgui_internal:1304",
-    "ImGuiLastItemData": "imgui_internal:1153",
+    "ImGuiContext": "imgui_internal:1740",
+    "ImGuiContextHook": "imgui_internal:1725",
+    "ImGuiContextHookType": "imgui_internal:1723",
+    "ImGuiDataTypeInfo": "imgui_internal:973",
+    "ImGuiDataTypePrivate_": "imgui_internal:982",
+    "ImGuiDataTypeTempStorage": "imgui_internal:967",
+    "ImGuiDataType_": "imgui:1317",
+    "ImGuiDataVarInfo": "imgui_internal:959",
+    "ImGuiDebugLogFlags_": "imgui_internal:1665",
+    "ImGuiDir_": "imgui:1333",
+    "ImGuiDragDropFlags_": "imgui:1295",
+    "ImGuiFocusedFlags_": "imgui:1257",
+    "ImGuiGroupData": "imgui_internal:1020",
+    "ImGuiHoveredFlags_": "imgui:1271",
+    "ImGuiIO": "imgui:1914",
+    "ImGuiInputEvent": "imgui_internal:1284",
+    "ImGuiInputEventAppFocused": "imgui_internal:1282",
+    "ImGuiInputEventKey": "imgui_internal:1280",
+    "ImGuiInputEventMouseButton": "imgui_internal:1279",
+    "ImGuiInputEventMousePos": "imgui_internal:1277",
+    "ImGuiInputEventMouseWheel": "imgui_internal:1278",
+    "ImGuiInputEventText": "imgui_internal:1281",
+    "ImGuiInputEventType": "imgui_internal:1253",
+    "ImGuiInputFlags_": "imgui_internal:1347",
+    "ImGuiInputSource": "imgui_internal:1265",
+    "ImGuiInputTextCallbackData": "imgui:2100",
+    "ImGuiInputTextDeactivatedState": "imgui_internal:1054",
+    "ImGuiInputTextFlagsPrivate_": "imgui_internal:835",
+    "ImGuiInputTextFlags_": "imgui:994",
+    "ImGuiInputTextState": "imgui_internal:1064",
+    "ImGuiItemFlags_": "imgui_internal:790",
+    "ImGuiItemStatusFlags_": "imgui_internal:810",
+    "ImGuiKey": "imgui:1356",
+    "ImGuiKeyData": "imgui:1906",
+    "ImGuiKeyOwnerData": "imgui_internal:1335",
+    "ImGuiKeyRoutingData": "imgui_internal:1310",
+    "ImGuiKeyRoutingTable": "imgui_internal:1323",
+    "ImGuiLastItemData": "imgui_internal:1171",
    "ImGuiLayoutType_": "imgui_internal:923",
-    "ImGuiListClipper": "imgui:2295",
-    "ImGuiListClipperData": "imgui_internal:1391",
-    "ImGuiListClipperRange": "imgui_internal:1378",
-    "ImGuiLocEntry": "imgui_internal:1634",
-    "ImGuiLocKey": "imgui_internal:1622",
+    "ImGuiListClipper": "imgui:2325",
+    "ImGuiListClipperData": "imgui_internal:1410",
+    "ImGuiListClipperRange": "imgui_internal:1397",
+    "ImGuiLocEntry": "imgui_internal:1654",
+    "ImGuiLocKey": "imgui_internal:1642",
    "ImGuiLogType": "imgui_internal:929",
-    "ImGuiMenuColumns": "imgui_internal:1028",
-    "ImGuiMetricsConfig": "imgui_internal:1659",
-    "ImGuiMouseButton_": "imgui:1693",
-    "ImGuiMouseCursor_": "imgui:1703",
-    "ImGuiNavHighlightFlags_": "imgui_internal:1430",
+    "ImGuiMenuColumns": "imgui_internal:1036",
+    "ImGuiMetricsConfig": "imgui_internal:1680",
+    "ImGuiMouseButton_": "imgui:1694",
+    "ImGuiMouseCursor_": "imgui:1704",
+    "ImGuiMouseSource": "imgui:1723",
+    "ImGuiNavHighlightFlags_": "imgui_internal:1449",
    "ImGuiNavInput": "imgui:1485",
-    "ImGuiNavItemData": "imgui_internal:1464",
-    "ImGuiNavLayer": "imgui_internal:1457",
-    "ImGuiNavMoveFlags_": "imgui_internal:1439",
-    "ImGuiNextItemData": "imgui_internal:1140",
-    "ImGuiNextItemDataFlags_": "imgui_internal:1133",
-    "ImGuiNextWindowData": "imgui_internal:1111",
-    "ImGuiNextWindowDataFlags_": "imgui_internal:1097",
-    "ImGuiOldColumnData": "imgui_internal:1504",
-    "ImGuiOldColumnFlags_": "imgui_internal:1484",
-    "ImGuiOldColumns": "imgui_internal:1514",
-    "ImGuiOnceUponAFrame": "imgui:2170",
-    "ImGuiPayload": "imgui:2111",
-    "ImGuiPlatformImeData": "imgui:2940",
+    "ImGuiNavItemData": "imgui_internal:1483",
+    "ImGuiNavLayer": "imgui_internal:1476",
+    "ImGuiNavMoveFlags_": "imgui_internal:1458",
+    "ImGuiNextItemData": "imgui_internal:1158",
+    "ImGuiNextItemDataFlags_": "imgui_internal:1151",
+    "ImGuiNextWindowData": "imgui_internal:1129",
+    "ImGuiNextWindowDataFlags_": "imgui_internal:1115",
+    "ImGuiOldColumnData": "imgui_internal:1523",
+    "ImGuiOldColumnFlags_": "imgui_internal:1503",
+    "ImGuiOldColumns": "imgui_internal:1533",
+    "ImGuiOnceUponAFrame": "imgui:2200",
+    "ImGuiPayload": "imgui:2141",
+    "ImGuiPlatformImeData": "imgui:2999",
    "ImGuiPlotType": "imgui_internal:946",
-    "ImGuiPopupData": "imgui_internal:1083",
-    "ImGuiPopupFlags_": "imgui:1052",
+    "ImGuiPopupData": "imgui_internal:1101",
+    "ImGuiPopupFlags_": "imgui:1053",
    "ImGuiPopupPositionPolicy": "imgui_internal:952",
-    "ImGuiPtrOrIndex": "imgui_internal:1197",
-    "ImGuiScrollFlags_": "imgui_internal:1416",
-    "ImGuiSelectableFlagsPrivate_": "imgui_internal:881",
-    "ImGuiSelectableFlags_": "imgui:1068",
+    "ImGuiPtrOrIndex": "imgui_internal:1215",
+    "ImGuiScrollFlags_": "imgui_internal:1435",
+    "ImGuiSelectableFlagsPrivate_": "imgui_internal:882",
+    "ImGuiSelectableFlags_": "imgui:1069",
    "ImGuiSeparatorFlags_": "imgui_internal:901",
-    "ImGuiSettingsHandler": "imgui_internal:1602",
-    "ImGuiShrinkWidthItem": "imgui_internal:1190",
-    "ImGuiSizeCallbackData": "imgui:2102",
-    "ImGuiSliderFlagsPrivate_": "imgui_internal:874",
-    "ImGuiSliderFlags_": "imgui:1676",
-    "ImGuiSortDirection_": "imgui:1343",
-    "ImGuiStackLevelInfo": "imgui_internal:1680",
-    "ImGuiStackSizes": "imgui_internal:1165",
-    "ImGuiStackTool": "imgui_internal:1692",
-    "ImGuiStorage": "imgui:2232",
-    "ImGuiStoragePair": "imgui:2235",
-    "ImGuiStyle": "imgui:1833",
-    "ImGuiStyleMod": "imgui_internal:989",
+    "ImGuiSettingsHandler": "imgui_internal:1622",
+    "ImGuiShrinkWidthItem": "imgui_internal:1208",
+    "ImGuiSizeCallbackData": "imgui:2132",
+    "ImGuiSliderFlagsPrivate_": "imgui_internal:875",
+    "ImGuiSliderFlags_": "imgui:1679",
+    "ImGuiSortDirection_": "imgui:1344",
+    "ImGuiStackLevelInfo": "imgui_internal:1694",
+    "ImGuiStackSizes": "imgui_internal:1183",
+    "ImGuiStackTool": "imgui_internal:1706",
+    "ImGuiStorage": "imgui:2262",
+    "ImGuiStoragePair": "imgui:2265",
+    "ImGuiStyle": "imgui:1846",
+    "ImGuiStyleMod": "imgui_internal:997",
    "ImGuiStyleVar_": "imgui:1585",
-    "ImGuiTabBar": "imgui_internal:2381",
-    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2346",
-    "ImGuiTabBarFlags_": "imgui:1093",
-    "ImGuiTabItem": "imgui_internal:2362",
-    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2354",
-    "ImGuiTabItemFlags_": "imgui:1109",
-    "ImGuiTable": "imgui_internal:2515",
-    "ImGuiTableBgTarget_": "imgui:1247",
-    "ImGuiTableCellData": "imgui_internal:2499",
-    "ImGuiTableColumn": "imgui_internal:2440",
-    "ImGuiTableColumnFlags_": "imgui:1195",
-    "ImGuiTableColumnSettings": "imgui_internal:2650",
-    "ImGuiTableColumnSortSpecs": "imgui:2133",
-    "ImGuiTableFlags_": "imgui:1144",
-    "ImGuiTableInstanceData": "imgui_internal:2506",
-    "ImGuiTableRowFlags_": "imgui:1232",
-    "ImGuiTableSettings": "imgui_internal:2674",
-    "ImGuiTableSortSpecs": "imgui:2147",
-    "ImGuiTableTempData": "imgui_internal:2629",
-    "ImGuiTextBuffer": "imgui:2205",
-    "ImGuiTextFilter": "imgui:2178",
+    "ImGuiTabBar": "imgui_internal:2420",
+    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2385",
+    "ImGuiTabBarFlags_": "imgui:1094",
+    "ImGuiTabItem": "imgui_internal:2401",
+    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2393",
+    "ImGuiTabItemFlags_": "imgui:1110",
+    "ImGuiTable": "imgui_internal:2549",
+    "ImGuiTableBgTarget_": "imgui:1248",
+    "ImGuiTableCellData": "imgui_internal:2531",
+    "ImGuiTableColumn": "imgui_internal:2472",
+    "ImGuiTableColumnFlags_": "imgui:1196",
+    "ImGuiTableColumnSettings": "imgui_internal:2685",
+    "ImGuiTableColumnSortSpecs": "imgui:2163",
+    "ImGuiTableFlags_": "imgui:1145",
+    "ImGuiTableInstanceData": "imgui_internal:2538",
+    "ImGuiTableRowFlags_": "imgui:1233",
+    "ImGuiTableSettings": "imgui_internal:2709",
+    "ImGuiTableSortSpecs": "imgui:2177",
+    "ImGuiTableTempData": "imgui_internal:2664",
+    "ImGuiTextBuffer": "imgui:2235",
+    "ImGuiTextFilter": "imgui:2208",
    "ImGuiTextFlags_": "imgui_internal:909",
-    "ImGuiTextIndex": "imgui_internal:706",
-    "ImGuiTextRange": "imgui:2188",
+    "ImGuiTextIndex": "imgui_internal:705",
+    "ImGuiTextRange": "imgui:2218",
    "ImGuiTooltipFlags_": "imgui_internal:915",
    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:896",
-    "ImGuiTreeNodeFlags_": "imgui:1023",
-    "ImGuiViewport": "imgui:2917",
-    "ImGuiViewportFlags_": "imgui:2902",
-    "ImGuiViewportP": "imgui_internal:1557",
-    "ImGuiWindow": "imgui_internal:2225",
-    "ImGuiWindowFlags_": "imgui:953",
-    "ImGuiWindowSettings": "imgui_internal:1590",
-    "ImGuiWindowStackData": "imgui_internal:1183",
-    "ImGuiWindowTempData": "imgui_internal:2177",
-    "ImRect": "imgui_internal:511",
-    "ImVec1": "imgui_internal:493",
-    "ImVec2": "imgui:253",
-    "ImVec2ih": "imgui_internal:501",
-    "ImVec4": "imgui:266",
-    "STB_TexteditState": "imstb_textedit:319",
-    "StbTexteditRow": "imstb_textedit:366",
-    "StbUndoRecord": "imstb_textedit:301",
-    "StbUndoState": "imstb_textedit:310"
+    "ImGuiTreeNodeFlags_": "imgui:1024",
+    "ImGuiViewport": "imgui:2976",
+    "ImGuiViewportFlags_": "imgui:2961",
+    "ImGuiViewportP": "imgui_internal:1576",
+    "ImGuiWindow": "imgui_internal:2260",
+    "ImGuiWindowFlags_": "imgui:956",
+    "ImGuiWindowSettings": "imgui_internal:1609",
+    "ImGuiWindowStackData": "imgui_internal:1201",
+    "ImGuiWindowTempData": "imgui_internal:2212",
+    "ImRect": "imgui_internal:504",
+    "ImVec1": "imgui_internal:486",
+    "ImVec2": "imgui:254",
+    "ImVec2ih": "imgui_internal:494",
+    "ImVec4": "imgui:267",
+    "STB_TexteditState": "imstb_textedit:320",
+    "StbTexteditRow": "imstb_textedit:367",
+    "StbUndoRecord": "imstb_textedit:302",
+    "StbUndoState": "imstb_textedit:311"
  },
  "structs": {
    "ImBitVector": [
@@ -4590,8 +4626,16 @@
        "type": "ImWchar"
      },
      {
-        "name": "DotChar",
-        "type": "ImWchar"
+        "name": "EllipsisCharCount",
+        "type": "short"
+      },
+      {
+        "name": "EllipsisWidth",
+        "type": "float"
+      },
+      {
+        "name": "EllipsisCharStep",
+        "type": "float"
      },
      {
        "name": "DirtyLookupTables",
@@ -4640,6 +4684,10 @@
        "name": "Locked",
        "type": "bool"
      },
+      {
+        "name": "UserData",
+        "type": "void*"
+      },
      {
        "name": "TexReady",
        "type": "bool"
@@ -4937,16 +4985,6 @@
        "name": "IO",
        "type": "ImGuiIO"
      },
-      {
-        "name": "InputEventsQueue",
-        "template_type": "ImGuiInputEvent",
-        "type": "ImVector_ImGuiInputEvent"
-      },
-      {
-        "name": "InputEventsTrail",
-        "template_type": "ImGuiInputEvent",
-        "type": "ImVector_ImGuiInputEvent"
-      },
      {
        "name": "Style",
        "type": "ImGuiStyle"
@@ -5007,6 +5045,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*",
@@ -5063,10 +5119,22 @@
        "name": "WheelingWindowRefMousePos",
        "type": "ImVec2"
      },
+      {
+        "name": "WheelingWindowStartFrame",
+        "type": "int"
+      },
      {
        "name": "WheelingWindowReleaseTimer",
        "type": "float"
      },
+      {
+        "name": "WheelingWindowWheelRemainder",
+        "type": "ImVec2"
+      },
+      {
+        "name": "WheelingAxisAvg",
+        "type": "ImVec2"
+      },
      {
        "name": "DebugHookIdInfo",
        "type": "ImGuiID"
@@ -5289,10 +5357,6 @@
        "name": "NavActivatePressedId",
        "type": "ImGuiID"
      },
-      {
-        "name": "NavActivateInputId",
-        "type": "ImGuiID"
-      },
      {
        "name": "NavActivateFlags",
        "type": "ImGuiActivateFlags"
@@ -5631,6 +5695,10 @@
        "name": "InputTextState",
        "type": "ImGuiInputTextState"
      },
+      {
+        "name": "InputTextDeactivatedState",
+        "type": "ImGuiInputTextDeactivatedState"
+      },
      {
        "name": "InputTextPasswordFont",
        "type": "ImFont"
@@ -5644,15 +5712,23 @@
        "type": "ImGuiColorEditFlags"
      },
      {
-        "name": "ColorEditLastHue",
+        "name": "ColorEditCurrentID",
+        "type": "ImGuiID"
+      },
+      {
+        "name": "ColorEditSavedID",
+        "type": "ImGuiID"
+      },
+      {
+        "name": "ColorEditSavedHue",
        "type": "float"
      },
      {
-        "name": "ColorEditLastSat",
+        "name": "ColorEditSavedSat",
        "type": "float"
      },
      {
-        "name": "ColorEditLastColor",
+        "name": "ColorEditSavedColor",
        "type": "ImU32"
      },
      {
@@ -5822,10 +5898,18 @@
        "name": "DebugLogIndex",
        "type": "ImGuiTextIndex"
      },
+      {
+        "name": "DebugLogClipperAutoDisableFrames",
+        "type": "ImU8"
+      },
      {
        "name": "DebugLocateFrames",
        "type": "ImU8"
      },
+      {
+        "name": "DebugBeginReturnValueCullDepth",
+        "type": "ImS8"
+      },
      {
        "name": "DebugItemPickerActive",
        "type": "bool"
@@ -5928,6 +6012,20 @@
        "type": "ImU8"
      }
    ],
+    "ImGuiDataVarInfo": [
+      {
+        "name": "Type",
+        "type": "ImGuiDataType"
+      },
+      {
+        "name": "Count",
+        "type": "ImU32"
+      },
+      {
+        "name": "Offset",
+        "type": "ImU32"
+      }
+    ],
    "ImGuiGroupData": [
      {
        "name": "WindowID",
@@ -6091,6 +6189,14 @@
        "name": "ConfigMemoryCompactTimer",
        "type": "float"
      },
+      {
+        "name": "ConfigDebugBeginReturnValueOnce",
+        "type": "bool"
+      },
+      {
+        "name": "ConfigDebugBeginReturnValueLoop",
+        "type": "bool"
+      },
      {
        "name": "BackendPlatformName",
        "type": "const char*"
@@ -6202,6 +6308,10 @@
        "size": 16,
        "type": "float"
      },
+      {
+        "name": "Ctx",
+        "type": "ImGuiContext*"
+      },
      {
        "name": "MousePos",
        "type": "ImVec2"
@@ -6219,6 +6329,10 @@
        "name": "MouseWheelH",
        "type": "float"
      },
+      {
+        "name": "MouseSource",
+        "type": "ImGuiMouseSource"
+      },
      {
        "name": "KeyCtrl",
        "type": "bool"
@@ -6297,6 +6411,10 @@
        "size": 5,
        "type": "bool"
      },
+      {
+        "name": "MouseWheelRequestAxisSwap",
+        "type": "bool"
+      },
      {
        "name": "MouseDownDuration[5]",
        "size": 5,
@@ -6351,6 +6469,10 @@
        "name": "Source",
        "type": "ImGuiInputSource"
      },
+      {
+        "name": "EventId",
+        "type": "ImU32"
+      },
      {
        "name": "",
        "type": "union { ImGuiInputEventMousePos MousePos; ImGuiInputEventMouseWheel MouseWheel; ImGuiInputEventMouseButton MouseButton; ImGuiInputEventKey Key; ImGuiInputEventText Text; ImGuiInputEventAppFocused AppFocused;}"
@@ -6388,6 +6510,10 @@
      {
        "name": "Down",
        "type": "bool"
+      },
+      {
+        "name": "MouseSource",
+        "type": "ImGuiMouseSource"
      }
    ],
    "ImGuiInputEventMousePos": [
@@ -6398,6 +6524,10 @@
      {
        "name": "PosY",
        "type": "float"
+      },
+      {
+        "name": "MouseSource",
+        "type": "ImGuiMouseSource"
      }
    ],
    "ImGuiInputEventMouseWheel": [
@@ -6408,6 +6538,10 @@
      {
        "name": "WheelY",
        "type": "float"
+      },
+      {
+        "name": "MouseSource",
+        "type": "ImGuiMouseSource"
      }
    ],
    "ImGuiInputEventText": [
@@ -6417,6 +6551,10 @@
      }
    ],
    "ImGuiInputTextCallbackData": [
+      {
+        "name": "Ctx",
+        "type": "ImGuiContext*"
+      },
      {
        "name": "EventFlag",
        "type": "ImGuiInputTextFlags"
@@ -6466,7 +6604,22 @@
        "type": "int"
      }
    ],
+    "ImGuiInputTextDeactivatedState": [
+      {
+        "name": "ID",
+        "type": "ImGuiID"
+      },
+      {
+        "name": "TextA",
+        "template_type": "char",
+        "type": "ImVector_char"
+      }
+    ],
    "ImGuiInputTextState": [
+      {
+        "name": "Ctx",
+        "type": "ImGuiContext*"
+      },
      {
        "name": "ID",
        "type": "ImGuiID"
@@ -6633,6 +6786,10 @@
      }
    ],
    "ImGuiListClipper": [
+      {
+        "name": "Ctx",
+        "type": "ImGuiContext*"
+      },
      {
        "name": "DisplayStart",
        "type": "int"
@@ -6777,6 +6934,10 @@
        "name": "ShowDrawCmdBoundingBoxes",
        "type": "bool"
      },
+      {
+        "name": "ShowAtlasTintedWithTextColor",
+        "type": "bool"
+      },
      {
        "name": "ShowWindowsRectsType",
        "type": "int"
@@ -7397,6 +7558,18 @@
        "name": "SelectableTextAlign",
        "type": "ImVec2"
      },
+      {
+        "name": "SeparatorTextBorderSize",
+        "type": "float"
+      },
+      {
+        "name": "SeparatorTextAlign",
+        "type": "ImVec2"
+      },
+      {
+        "name": "SeparatorTextPadding",
+        "type": "ImVec2"
+      },
      {
        "name": "DisplayWindowPadding",
        "type": "ImVec2"
@@ -7656,19 +7829,15 @@
      },
      {
        "name": "EnabledMaskByDisplayOrder",
-        "type": "ImU64"
+        "type": "ImBitArrayPtr"
      },
      {
        "name": "EnabledMaskByIndex",
-        "type": "ImU64"
+        "type": "ImBitArrayPtr"
      },
      {
        "name": "VisibleMaskByIndex",
-        "type": "ImU64"
-      },
-      {
-        "name": "RequestOutputMaskByIndex",
-        "type": "ImU64"
+        "type": "ImBitArrayPtr"
      },
      {
        "name": "SettingsLoadedFlags",
@@ -8039,6 +8208,14 @@
        "name": "IsDefaultSizingPolicy",
        "type": "bool"
      },
+      {
+        "name": "HasScrollbarYCurr",
+        "type": "bool"
+      },
+      {
+        "name": "HasScrollbarYPrev",
+        "type": "bool"
+      },
      {
        "name": "MemoryCompacted",
        "type": "bool"
@@ -8284,6 +8461,10 @@
      }
    ],
    "ImGuiTableInstanceData": [
+      {
+        "name": "TableInstanceID",
+        "type": "ImGuiID"
+      },
      {
        "name": "LastOuterHeight",
        "type": "float"
@@ -8291,6 +8472,10 @@
      {
        "name": "LastFirstRowHeight",
        "type": "float"
+      },
+      {
+        "name": "LastFrozenHeight",
+        "type": "float"
      }
    ],
    "ImGuiTableSettings": [
@@ -8494,6 +8679,10 @@
      }
    ],
    "ImGuiWindow": [
+      {
+        "name": "Ctx",
+        "type": "ImGuiContext*"
+      },
      {
        "name": "Name",
        "type": "char*"
@@ -8546,6 +8735,30 @@
        "name": "WindowBorderSize",
        "type": "float"
      },
+      {
+        "name": "DecoOuterSizeX1",
+        "type": "float"
+      },
+      {
+        "name": "DecoOuterSizeY1",
+        "type": "float"
+      },
+      {
+        "name": "DecoOuterSizeX2",
+        "type": "float"
+      },
+      {
+        "name": "DecoOuterSizeY2",
+        "type": "float"
+      },
+      {
+        "name": "DecoInnerSizeX1",
+        "type": "float"
+      },
+      {
+        "name": "DecoInnerSizeY1",
+        "type": "float"
+      },
      {
        "name": "NameBufLen",
        "type": "int"
@@ -8878,6 +9091,10 @@
      {
        "name": "WantApply",
        "type": "bool"
+      },
+      {
+        "name": "WantDelete",
+        "type": "bool"
      }
    ],
    "ImGuiWindowStackData": [
--- a/generator/output/structs_and_enums.lua
+++ b/generator/output/structs_and_enums.lua
--- a/generator/output/typedefs_dict.json
+++ b/generator/output/typedefs_dict.json
@@ -1,5 +1,6 @@
 {
  "ImBitArrayForNamedKeys": "ImBitArray<ImGuiKey_NamedKey_COUNT,-ImGuiKey_NamedKey_BEGIN>",
+  "ImBitArrayPtr": "ImU32*",
  "ImBitVector": "struct ImBitVector",
  "ImColor": "struct ImColor",
  "ImDrawCallback": "void(*)(const ImDrawList* parent_list,const ImDrawCmd* cmd);",
@@ -40,6 +41,7 @@
  "ImGuiDataType": "int",
  "ImGuiDataTypeInfo": "struct ImGuiDataTypeInfo",
  "ImGuiDataTypeTempStorage": "struct ImGuiDataTypeTempStorage",
+  "ImGuiDataVarInfo": "struct ImGuiDataVarInfo",
  "ImGuiDebugLogFlags": "int",
  "ImGuiDir": "int",
  "ImGuiDragDropFlags": "int",
@@ -59,6 +61,8 @@
  "ImGuiInputFlags": "int",
  "ImGuiInputTextCallback": "int(*)(ImGuiInputTextCallbackData* data);",
  "ImGuiInputTextCallbackData": "struct ImGuiInputTextCallbackData",
+  "ImGuiInputTextDeactivateData": "struct ImGuiInputTextDeactivateData",
+  "ImGuiInputTextDeactivatedState": "struct ImGuiInputTextDeactivatedState",
  "ImGuiInputTextFlags": "int",
  "ImGuiInputTextState": "struct ImGuiInputTextState",
  "ImGuiItemFlags": "int",
@@ -123,11 +127,11 @@
  "ImGuiTableCellData": "struct ImGuiTableCellData",
  "ImGuiTableColumn": "struct ImGuiTableColumn",
  "ImGuiTableColumnFlags": "int",
-  "ImGuiTableColumnIdx": "ImS8",
+  "ImGuiTableColumnIdx": "ImS16",
  "ImGuiTableColumnSettings": "struct ImGuiTableColumnSettings",
  "ImGuiTableColumnSortSpecs": "struct ImGuiTableColumnSortSpecs",
  "ImGuiTableColumnsSettings": "struct ImGuiTableColumnsSettings",
-  "ImGuiTableDrawChannelIdx": "ImU8",
+  "ImGuiTableDrawChannelIdx": "ImU16",
  "ImGuiTableFlags": "int",
  "ImGuiTableInstanceData": "struct ImGuiTableInstanceData",
  "ImGuiTableRowFlags": "int",
--- a/generator/output/typedefs_dict.lua
+++ b/generator/output/typedefs_dict.lua
@@ -1,5 +1,6 @@
 local defs = {}
 defs["ImBitArrayForNamedKeys"] = "ImBitArray<ImGuiKey_NamedKey_COUNT,-ImGuiKey_NamedKey_BEGIN>"
+defs["ImBitArrayPtr"] = "ImU32*"
 defs["ImBitVector"] = "struct ImBitVector"
 defs["ImColor"] = "struct ImColor"
 defs["ImDrawCallback"] = "void(*)(const ImDrawList* parent_list,const ImDrawCmd* cmd);"
@@ -40,6 +41,7 @@ defs["ImGuiContextHookCallback"] = "void(*)(ImGuiContext* ctx,ImGuiContextHook*
 defs["ImGuiDataType"] = "int"
 defs["ImGuiDataTypeInfo"] = "struct ImGuiDataTypeInfo"
 defs["ImGuiDataTypeTempStorage"] = "struct ImGuiDataTypeTempStorage"
+defs["ImGuiDataVarInfo"] = "struct ImGuiDataVarInfo"
 defs["ImGuiDebugLogFlags"] = "int"
 defs["ImGuiDir"] = "int"
 defs["ImGuiDragDropFlags"] = "int"
@@ -59,6 +61,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"
@@ -123,11 +127,11 @@ defs["ImGuiTableBgTarget"] = "int"
 defs["ImGuiTableCellData"] = "struct ImGuiTableCellData"
 defs["ImGuiTableColumn"] = "struct ImGuiTableColumn"
 defs["ImGuiTableColumnFlags"] = "int"
-defs["ImGuiTableColumnIdx"] = "ImS8"
+defs["ImGuiTableColumnIdx"] = "ImS16"
 defs["ImGuiTableColumnSettings"] = "struct ImGuiTableColumnSettings"
 defs["ImGuiTableColumnSortSpecs"] = "struct ImGuiTableColumnSortSpecs"
 defs["ImGuiTableColumnsSettings"] = "struct ImGuiTableColumnsSettings"
-defs["ImGuiTableDrawChannelIdx"] = "ImU8"
+defs["ImGuiTableDrawChannelIdx"] = "ImU16"
 defs["ImGuiTableFlags"] = "int"
 defs["ImGuiTableInstanceData"] = "struct ImGuiTableInstanceData"
 defs["ImGuiTableRowFlags"] = "int"
--- a/2
+++ b/2
Author	SHA1	Message	Date
sonoro1234	1bb9cd7347	Merge branch 'docking_inter'	2023-04-18 10:43:06 +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
sonoro1234	d24246adfd	Merge branch 'docking_inter'	2023-02-15 10:18:15 +01:00
sonoro1234	1187e22308	pull imgui 1.89.3 generate correct sdl2 backend inclusion	2023-02-15 09:55:35 +01:00
sonoro1234	5a857ee68d	cpp2ffi: dont error on not loca	2023-01-09 09:57:43 +01:00
sonoro1234	18e5891710	generator.lua add table cimgui_skipped	2023-01-08 14:38:06 +01:00
sonoro1234	6dba58d90f	merge from docking_inter	2023-01-07 11:34:35 +01:00
sonoro1234	56fdbf845b	pull imgui docking 1.89.2 and generate	2023-01-07 10:34:35 +01:00
sonoro1234	d159c2622d	correction after merge?!!	2022-12-15 10:44:29 +01:00
Victor Bombi	56892a4e3a	Merge pull request #227 from rokups/rk/fix-ci Fix windows CI builds (#226)	2022-12-15 10:29:40 +01:00
Rokas Kupstys	0a953b7102	Fix CI builds. For some reason bash on windows no longer recognizes luajit without .exe suffix. Fixes #226	2022-12-15 10:23:58 +02:00