Merge branch 'docking_inter'

Allow use of zig cc in generator.lua

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.90.1 of Dear ImGui with internal api]
+* currently this wrapper is based on version [1.90.4 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.

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.90.1" 19010 from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.90.4" 19040 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 #ifdef IMGUI_ENABLE_FREETYPE
 #ifndef CIMGUI_FREETYPE
@@ -407,9 +407,9 @@ CIMGUI_API ImU32 igGetColorU32_Vec4(const ImVec4 col)
 {
     return ImGui::GetColorU32(col);
 }
-CIMGUI_API ImU32 igGetColorU32_U32(ImU32 col)
+CIMGUI_API ImU32 igGetColorU32_U32(ImU32 col,float alpha_mul)
 {
-    return ImGui::GetColorU32(col);
+    return ImGui::GetColorU32(col,alpha_mul);
 }
 CIMGUI_API const ImVec4* igGetStyleColorVec4(ImGuiCol idx)
 {
@@ -1583,6 +1583,10 @@ CIMGUI_API void igDebugFlashStyleColor(ImGuiCol idx)
 {
     return ImGui::DebugFlashStyleColor(idx);
 }
+CIMGUI_API void igDebugStartItemPicker()
+{
+    return ImGui::DebugStartItemPicker();
+}
 CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t sz_io,size_t sz_style,size_t sz_vec2,size_t sz_vec4,size_t sz_drawvert,size_t sz_drawidx)
 {
     return ImGui::DebugCheckVersionAndDataLayout(version_str,sz_io,sz_style,sz_vec2,sz_vec4,sz_drawvert,sz_drawidx);
@@ -3182,10 +3186,6 @@ CIMGUI_API void ImDrawDataBuilder_destroy(ImDrawDataBuilder* self)
 {
     IM_DELETE(self);
 }
-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);
@@ -3302,13 +3302,17 @@ CIMGUI_API void ImGuiInputTextState_SelectAll(ImGuiInputTextState* self)
 {
     return self->SelectAll();
 }
-CIMGUI_API ImGuiPopupData* ImGuiPopupData_ImGuiPopupData(void)
+CIMGUI_API void ImGuiInputTextState_ReloadUserBufAndSelectAll(ImGuiInputTextState* self)
 {
-    return IM_NEW(ImGuiPopupData)();
+    return self->ReloadUserBufAndSelectAll();
 }
-CIMGUI_API void ImGuiPopupData_destroy(ImGuiPopupData* self)
+CIMGUI_API void ImGuiInputTextState_ReloadUserBufAndKeepSelection(ImGuiInputTextState* self)
 {
-    IM_DELETE(self);
+    return self->ReloadUserBufAndKeepSelection();
+}
+CIMGUI_API void ImGuiInputTextState_ReloadUserBufAndMoveToEnd(ImGuiInputTextState* self)
+{
+    return self->ReloadUserBufAndMoveToEnd();
 }
 CIMGUI_API ImGuiNextWindowData* ImGuiNextWindowData_ImGuiNextWindowData(void)
 {
@@ -3370,6 +3374,18 @@ CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndex_Int(int index)
 {
     return IM_NEW(ImGuiPtrOrIndex)(index);
 }
+CIMGUI_API void* ImGuiDataVarInfo_GetVarPtr(ImGuiDataVarInfo* self,void* parent)
+{
+    return self->GetVarPtr(parent);
+}
+CIMGUI_API ImGuiPopupData* ImGuiPopupData_ImGuiPopupData(void)
+{
+    return IM_NEW(ImGuiPopupData)();
+}
+CIMGUI_API void ImGuiPopupData_destroy(ImGuiPopupData* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API ImGuiInputEvent* ImGuiInputEvent_ImGuiInputEvent(void)
 {
     return IM_NEW(ImGuiInputEvent)();
@@ -3734,6 +3750,10 @@ CIMGUI_API void igSetWindowHiddenAndSkipItemsForCurrentFrame(ImGuiWindow* window
 {
     return ImGui::SetWindowHiddenAndSkipItemsForCurrentFrame(window);
 }
+CIMGUI_API void igSetWindowParentWindowForFocusRoute(ImGuiWindow* window,ImGuiWindow* parent_window)
+{
+    return ImGui::SetWindowParentWindowForFocusRoute(window,parent_window);
+}
 CIMGUI_API void igWindowRectAbsToRel(ImRect *pOut,ImGuiWindow* window,const ImRect r)
 {
     *pOut = ImGui::WindowRectAbsToRel(window,r);
@@ -4186,6 +4206,10 @@ CIMGUI_API void igNavMoveRequestTryWrapping(ImGuiWindow* window,ImGuiNavMoveFlag
 {
     return ImGui::NavMoveRequestTryWrapping(window,move_flags);
 }
+CIMGUI_API void igNavHighlightActivated(ImGuiID id)
+{
+    return ImGui::NavHighlightActivated(id);
+}
 CIMGUI_API void igNavClearPreferredPosForAxis(ImGuiAxis axis)
 {
     return ImGui::NavClearPreferredPosForAxis(axis);
@@ -4206,6 +4230,10 @@ CIMGUI_API void igSetNavID(ImGuiID id,ImGuiNavLayer nav_layer,ImGuiID focus_scop
 {
     return ImGui::SetNavID(id,nav_layer,focus_scope_id,rect_rel);
 }
+CIMGUI_API void igSetNavFocusScope(ImGuiID focus_scope_id)
+{
+    return ImGui::SetNavFocusScope(focus_scope_id);
+}
 CIMGUI_API void igFocusItem()
 {
     return ImGui::FocusItem();
@@ -4242,9 +4270,13 @@ CIMGUI_API bool igIsAliasKey(ImGuiKey key)
 {
     return ImGui::IsAliasKey(key);
 }
-CIMGUI_API ImGuiKeyChord igConvertShortcutMod(ImGuiKeyChord key_chord)
+CIMGUI_API bool igIsModKey(ImGuiKey key)
 {
-    return ImGui::ConvertShortcutMod(key_chord);
+    return ImGui::IsModKey(key);
+}
+CIMGUI_API ImGuiKeyChord igFixupKeyChord(ImGuiContext* ctx,ImGuiKeyChord key_chord)
+{
+    return ImGui::FixupKeyChord(ctx,key_chord);
 }
 CIMGUI_API ImGuiKey igConvertSingleModFlagToKey(ImGuiContext* ctx,ImGuiKey key)
 {
@@ -4258,9 +4290,9 @@ CIMGUI_API ImGuiKeyData* igGetKeyData_Key(ImGuiKey key)
 {
     return ImGui::GetKeyData(key);
 }
-CIMGUI_API const char* igGetKeyChordName(ImGuiKeyChord key_chord,char* out_buf,int out_buf_size)
+CIMGUI_API const char* igGetKeyChordName(ImGuiKeyChord key_chord)
 {
-    return ImGui::GetKeyChordName(key_chord,out_buf,out_buf_size);
+    return ImGui::GetKeyChordName(key_chord);
 }
 CIMGUI_API ImGuiKey igMouseButtonToKey(ImGuiMouseButton button)
 {
@@ -4354,6 +4386,10 @@ CIMGUI_API bool igIsKeyChordPressed_ID(ImGuiKeyChord key_chord,ImGuiID owner_id,
 {
     return ImGui::IsKeyChordPressed(key_chord,owner_id,flags);
 }
+CIMGUI_API void igSetNextItemShortcut(ImGuiKeyChord key_chord)
+{
+    return ImGui::SetNextItemShortcut(key_chord);
+}
 CIMGUI_API bool igShortcut(ImGuiKeyChord key_chord,ImGuiID owner_id,ImGuiInputFlags flags)
 {
     return ImGui::Shortcut(key_chord,owner_id,flags);
@@ -4494,9 +4530,9 @@ CIMGUI_API void igTablePopBackgroundChannel()
 {
     return ImGui::TablePopBackgroundChannel();
 }
-CIMGUI_API void igTableAngledHeadersRowEx(float angle,float label_width)
+CIMGUI_API void igTableAngledHeadersRowEx(float angle,float max_label_width)
 {
-    return ImGui::TableAngledHeadersRowEx(angle,label_width);
+    return ImGui::TableAngledHeadersRowEx(angle,max_label_width);
 }
 CIMGUI_API ImGuiTable* igGetCurrentTable()
 {
@@ -5053,10 +5089,6 @@ CIMGUI_API void igDebugBreakButtonTooltip(bool keyboard_only,const char* descrip
 {
     return ImGui::DebugBreakButtonTooltip(keyboard_only,description_of_location);
 }
-CIMGUI_API void igDebugStartItemPicker()
-{
-    return ImGui::DebugStartItemPicker();
-}
 CIMGUI_API void igShowFontAtlas(ImFontAtlas* atlas)
 {
     return ImGui::ShowFontAtlas(atlas);

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.90.1" 19010 from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.90.4" 19040 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 #ifndef CIMGUI_INCLUDED
 #define CIMGUI_INCLUDED
@@ -291,10 +291,11 @@ typedef enum {
     ImGuiPopupFlags_MouseButtonMiddle = 2,
     ImGuiPopupFlags_MouseButtonMask_ = 0x1F,
     ImGuiPopupFlags_MouseButtonDefault_ = 1,
-    ImGuiPopupFlags_NoOpenOverExistingPopup = 1 << 5,
+    ImGuiPopupFlags_NoReopen = 1 << 5,
-    ImGuiPopupFlags_NoOpenOverItems = 1 << 6,
+    ImGuiPopupFlags_NoOpenOverExistingPopup = 1 << 7,
-    ImGuiPopupFlags_AnyPopupId = 1 << 7,
+    ImGuiPopupFlags_NoOpenOverItems = 1 << 8,
-    ImGuiPopupFlags_AnyPopupLevel = 1 << 8,
+    ImGuiPopupFlags_AnyPopupId = 1 << 10,
+    ImGuiPopupFlags_AnyPopupLevel = 1 << 11,
     ImGuiPopupFlags_AnyPopup = ImGuiPopupFlags_AnyPopupId | ImGuiPopupFlags_AnyPopupLevel,
 }ImGuiPopupFlags_;
 typedef enum {
@@ -978,7 +979,6 @@ struct ImGuiIO
     int MetricsRenderWindows;
     int MetricsActiveWindows;
     ImVec2 MouseDelta;
-    void* _UnusedPadding;
     ImGuiContext* Ctx;
     ImVec2 MousePos;
     bool MouseDown[5];
@@ -1325,6 +1325,7 @@ typedef enum {
 }ImGuiViewportFlags_;
 struct ImGuiViewport
 {
+    ImGuiID ID;
     ImGuiViewportFlags Flags;
     ImVec2 Pos;
     ImVec2 Size;
@@ -1605,34 +1606,6 @@ typedef enum {
     ImGuiPlotType_Lines,
     ImGuiPlotType_Histogram,
 }ImGuiPlotType;
-typedef enum {
-    ImGuiPopupPositionPolicy_Default,
-    ImGuiPopupPositionPolicy_ComboBox,
-    ImGuiPopupPositionPolicy_Tooltip,
-}ImGuiPopupPositionPolicy;
-struct ImGuiDataVarInfo
-{
-    ImGuiDataType Type;
-    ImU32 Count;
-    ImU32 Offset;
-};
-typedef struct ImGuiDataTypeTempStorage ImGuiDataTypeTempStorage;
-struct ImGuiDataTypeTempStorage
-{
-    ImU8 Data[8];
-};
-struct ImGuiDataTypeInfo
-{
-    size_t Size;
-    const char* Name;
-    const char* PrintFmt;
-    const char* ScanFmt;
-};
-typedef enum {
-    ImGuiDataType_String = ImGuiDataType_COUNT + 1,
-    ImGuiDataType_Pointer,
-    ImGuiDataType_ID,
-}ImGuiDataTypePrivate_;
 struct ImGuiColorMod
 {
     ImGuiCol Col;
@@ -1703,17 +1676,9 @@ struct ImGuiInputTextState
     bool SelectedAllMouseLock;
     bool Edited;
     ImGuiInputTextFlags Flags;
-};
+    bool ReloadUserBuf;
-struct ImGuiPopupData
+    int ReloadSelectionStart;
-{
+    int ReloadSelectionEnd;
-    ImGuiID PopupId;
-    ImGuiWindow* Window;
-    ImGuiWindow* BackupNavWindow;
-    int ParentNavLayer;
-    int OpenFrameCount;
-    ImGuiID OpenParentId;
-    ImVec2 OpenPopupPos;
-    ImVec2 OpenMousePos;
 };
 typedef enum {
     ImGuiNextWindowDataFlags_None = 0,
@@ -1751,15 +1716,17 @@ typedef enum {
     ImGuiNextItemDataFlags_None = 0,
     ImGuiNextItemDataFlags_HasWidth = 1 << 0,
     ImGuiNextItemDataFlags_HasOpen = 1 << 1,
+    ImGuiNextItemDataFlags_HasShortcut = 1 << 2,
 }ImGuiNextItemDataFlags_;
 struct ImGuiNextItemData
 {
     ImGuiNextItemDataFlags Flags;
     ImGuiItemFlags ItemFlags;
-    float Width;
     ImGuiSelectionUserData SelectionUserData;
-    ImGuiCond OpenCond;
+    float Width;
+    ImGuiKeyChord Shortcut;
     bool OpenVal;
+    ImGuiCond OpenCond : 8;
 };
 struct ImGuiLastItemData
 {
@@ -1809,6 +1776,45 @@ struct ImGuiPtrOrIndex
     void* Ptr;
     int Index;
 };
+struct ImGuiDataVarInfo
+{
+    ImGuiDataType Type;
+    ImU32 Count;
+    ImU32 Offset;
+};
+typedef struct ImGuiDataTypeTempStorage ImGuiDataTypeTempStorage;
+struct ImGuiDataTypeTempStorage
+{
+    ImU8 Data[8];
+};
+struct ImGuiDataTypeInfo
+{
+    size_t Size;
+    const char* Name;
+    const char* PrintFmt;
+    const char* ScanFmt;
+};
+typedef enum {
+    ImGuiDataType_String = ImGuiDataType_COUNT + 1,
+    ImGuiDataType_Pointer,
+    ImGuiDataType_ID,
+}ImGuiDataTypePrivate_;
+typedef enum {
+    ImGuiPopupPositionPolicy_Default,
+    ImGuiPopupPositionPolicy_ComboBox,
+    ImGuiPopupPositionPolicy_Tooltip,
+}ImGuiPopupPositionPolicy;
+struct ImGuiPopupData
+{
+    ImGuiID PopupId;
+    ImGuiWindow* Window;
+    ImGuiWindow* BackupNavWindow;
+    int ParentNavLayer;
+    int OpenFrameCount;
+    ImGuiID OpenParentId;
+    ImVec2 OpenPopupPos;
+    ImVec2 OpenMousePos;
+};
 typedef struct ImBitArray_ImGuiKey_NamedKey_COUNT__lessImGuiKey_NamedKey_BEGIN {ImU32 Storage[(ImGuiKey_NamedKey_COUNT+31)>>5];} ImBitArray_ImGuiKey_NamedKey_COUNT__lessImGuiKey_NamedKey_BEGIN;
 
 typedef ImBitArray_ImGuiKey_NamedKey_COUNT__lessImGuiKey_NamedKey_BEGIN ImBitArrayForNamedKeys;
@@ -1877,6 +1883,7 @@ struct ImGuiKeyRoutingData
 {
     ImGuiKeyRoutingIndex NextEntryIndex;
     ImU16 Mods;
+    ImU8 RoutingCurrScore;
     ImU8 RoutingNextScore;
     ImGuiID RoutingCurr;
     ImGuiID RoutingNext;
@@ -1911,23 +1918,22 @@ typedef enum {
     ImGuiInputFlags_CondHovered = 1 << 8,
     ImGuiInputFlags_CondActive = 1 << 9,
     ImGuiInputFlags_CondDefault_ = ImGuiInputFlags_CondHovered | ImGuiInputFlags_CondActive,
-    ImGuiInputFlags_CondMask_ = ImGuiInputFlags_CondHovered | ImGuiInputFlags_CondActive,
     ImGuiInputFlags_LockThisFrame = 1 << 10,
     ImGuiInputFlags_LockUntilRelease = 1 << 11,
     ImGuiInputFlags_RouteFocused = 1 << 12,
     ImGuiInputFlags_RouteGlobalLow = 1 << 13,
     ImGuiInputFlags_RouteGlobal = 1 << 14,
     ImGuiInputFlags_RouteGlobalHigh = 1 << 15,
-    ImGuiInputFlags_RouteMask_ = ImGuiInputFlags_RouteFocused | ImGuiInputFlags_RouteGlobal | ImGuiInputFlags_RouteGlobalLow | ImGuiInputFlags_RouteGlobalHigh,
     ImGuiInputFlags_RouteAlways = 1 << 16,
     ImGuiInputFlags_RouteUnlessBgFocused= 1 << 17,
-    ImGuiInputFlags_RouteExtraMask_ = ImGuiInputFlags_RouteAlways | ImGuiInputFlags_RouteUnlessBgFocused,
     ImGuiInputFlags_RepeatRateMask_ = ImGuiInputFlags_RepeatRateDefault | ImGuiInputFlags_RepeatRateNavMove | ImGuiInputFlags_RepeatRateNavTweak,
     ImGuiInputFlags_RepeatUntilMask_ = ImGuiInputFlags_RepeatUntilRelease | ImGuiInputFlags_RepeatUntilKeyModsChange | ImGuiInputFlags_RepeatUntilKeyModsChangeFromNone | ImGuiInputFlags_RepeatUntilOtherKeyPress,
     ImGuiInputFlags_RepeatMask_ = ImGuiInputFlags_Repeat | ImGuiInputFlags_RepeatRateMask_ | ImGuiInputFlags_RepeatUntilMask_,
+    ImGuiInputFlags_CondMask_ = ImGuiInputFlags_CondHovered | ImGuiInputFlags_CondActive,
+    ImGuiInputFlags_RouteMask_ = ImGuiInputFlags_RouteFocused | ImGuiInputFlags_RouteGlobal | ImGuiInputFlags_RouteGlobalLow | ImGuiInputFlags_RouteGlobalHigh,
     ImGuiInputFlags_SupportedByIsKeyPressed = ImGuiInputFlags_RepeatMask_,
     ImGuiInputFlags_SupportedByIsMouseClicked = ImGuiInputFlags_Repeat,
-    ImGuiInputFlags_SupportedByShortcut = ImGuiInputFlags_RepeatMask_ | ImGuiInputFlags_RouteMask_ | ImGuiInputFlags_RouteExtraMask_,
+    ImGuiInputFlags_SupportedByShortcut = ImGuiInputFlags_RepeatMask_ | ImGuiInputFlags_RouteMask_ | ImGuiInputFlags_RouteAlways | ImGuiInputFlags_RouteUnlessBgFocused,
     ImGuiInputFlags_SupportedBySetKeyOwner = ImGuiInputFlags_LockThisFrame | ImGuiInputFlags_LockUntilRelease,
     ImGuiInputFlags_SupportedBySetItemKeyOwner = ImGuiInputFlags_SupportedBySetKeyOwner | ImGuiInputFlags_CondMask_,
 }ImGuiInputFlags_;
@@ -1957,6 +1963,7 @@ typedef enum {
     ImGuiActivateFlags_PreferTweak = 1 << 1,
     ImGuiActivateFlags_TryToPreserveState = 1 << 2,
     ImGuiActivateFlags_FromTabbing = 1 << 3,
+    ImGuiActivateFlags_FromShortcut = 1 << 4,
 }ImGuiActivateFlags_;
 typedef enum {
     ImGuiScrollFlags_None = 0,
@@ -1972,8 +1979,7 @@ typedef enum {
 }ImGuiScrollFlags_;
 typedef enum {
     ImGuiNavHighlightFlags_None = 0,
-    ImGuiNavHighlightFlags_TypeDefault = 1 << 0,
+    ImGuiNavHighlightFlags_Compact = 1 << 1,
-    ImGuiNavHighlightFlags_TypeThin = 1 << 1,
     ImGuiNavHighlightFlags_AlwaysDraw = 1 << 2,
     ImGuiNavHighlightFlags_NoRounding = 1 << 3,
 }ImGuiNavHighlightFlags_;
@@ -2013,6 +2019,12 @@ struct ImGuiNavItemData
     float DistCenter;
     float DistAxial;
 };
+typedef struct ImGuiFocusScopeData ImGuiFocusScopeData;
+struct ImGuiFocusScopeData
+{
+    ImGuiID ID;
+    ImGuiID WindowID;
+};
 typedef enum {
     ImGuiTypingSelectFlags_None = 0,
     ImGuiTypingSelectFlags_AllowBackspace = 1 << 0,
@@ -2131,7 +2143,8 @@ typedef enum {
     ImGuiDebugLogFlags_EventClipper = 1 << 4,
     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_EventInputRouting = 1 << 7,
+    ImGuiDebugLogFlags_EventMask_ = ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventSelection | ImGuiDebugLogFlags_EventIO | ImGuiDebugLogFlags_EventInputRouting,
     ImGuiDebugLogFlags_OutputToTTY = 1 << 20,
     ImGuiDebugLogFlags_OutputToTestEngine = 1 << 21,
 }ImGuiDebugLogFlags_;
@@ -2163,6 +2176,8 @@ struct ImGuiMetricsConfig
     bool ShowAtlasTintedWithTextColor;
     int ShowWindowsRectsType;
     int ShowTablesRectsType;
+    int HighlightMonitorIdx;
+    ImGuiID HighlightViewportID;
 };
 typedef struct ImGuiStackLevelInfo ImGuiStackLevelInfo;
 struct ImGuiStackLevelInfo
@@ -2205,7 +2220,7 @@ typedef struct ImVector_ImGuiColorMod {int Size;int Capacity;ImGuiColorMod* Data
 
 typedef struct ImVector_ImGuiStyleMod {int Size;int Capacity;ImGuiStyleMod* Data;} ImVector_ImGuiStyleMod;
 
-typedef struct ImVector_ImGuiID {int Size;int Capacity;ImGuiID* Data;} ImVector_ImGuiID;
+typedef struct ImVector_ImGuiFocusScopeData {int Size;int Capacity;ImGuiFocusScopeData* Data;} ImVector_ImGuiFocusScopeData;
 
 typedef struct ImVector_ImGuiItemFlags {int Size;int Capacity;ImGuiItemFlags* Data;} ImVector_ImGuiItemFlags;
 
@@ -2235,6 +2250,8 @@ typedef struct ImVector_ImGuiPtrOrIndex {int Size;int Capacity;ImGuiPtrOrIndex*
 
 typedef struct ImVector_ImGuiShrinkWidthItem {int Size;int Capacity;ImGuiShrinkWidthItem* Data;} ImVector_ImGuiShrinkWidthItem;
 
+typedef struct ImVector_ImGuiID {int Size;int Capacity;ImGuiID* Data;} ImVector_ImGuiID;
+
 typedef struct ImVector_ImGuiSettingsHandler {int Size;int Capacity;ImGuiSettingsHandler* Data;} ImVector_ImGuiSettingsHandler;
 
 typedef struct ImChunkStream_ImGuiWindowSettings {ImVector_char Buf;} ImChunkStream_ImGuiWindowSettings;
@@ -2302,10 +2319,11 @@ struct ImGuiContext
     bool ActiveIdHasBeenPressedBefore;
     bool ActiveIdHasBeenEditedBefore;
     bool ActiveIdHasBeenEditedThisFrame;
+    bool ActiveIdFromShortcut;
+    int ActiveIdMouseButton : 8;
     ImVec2 ActiveIdClickOffset;
     ImGuiWindow* ActiveIdWindow;
     ImGuiInputSource ActiveIdSource;
-    int ActiveIdMouseButton;
     ImGuiID ActiveIdPreviousFrame;
     bool ActiveIdPreviousFrameIsAlive;
     bool ActiveIdPreviousFrameHasBeenEditedBefore;
@@ -2315,6 +2333,7 @@ struct ImGuiContext
     double LastKeyModsChangeTime;
     double LastKeyModsChangeFromNoneTime;
     double LastKeyboardKeyPressTime;
+    ImBitArrayForNamedKeys KeysMayBeCharInput;
     ImGuiKeyOwnerData KeysOwnerData[ImGuiKey_NamedKey_COUNT];
     ImGuiKeyRoutingTable KeysRoutingTable;
     ImU32 ActiveIdUsingNavDirMask;
@@ -2331,21 +2350,23 @@ struct ImGuiContext
     ImVector_ImGuiColorMod ColorStack;
     ImVector_ImGuiStyleMod StyleVarStack;
     ImVector_ImFontPtr FontStack;
-    ImVector_ImGuiID FocusScopeStack;
+    ImVector_ImGuiFocusScopeData FocusScopeStack;
     ImVector_ImGuiItemFlags ItemFlagsStack;
     ImVector_ImGuiGroupData GroupStack;
     ImVector_ImGuiPopupData OpenPopupStack;
     ImVector_ImGuiPopupData BeginPopupStack;
     ImVector_ImGuiNavTreeNodeData NavTreeNodeStack;
-    int BeginMenuCount;
     ImVector_ImGuiViewportPPtr Viewports;
     ImGuiWindow* NavWindow;
     ImGuiID NavId;
     ImGuiID NavFocusScopeId;
+    ImVector_ImGuiFocusScopeData NavFocusRoute;
     ImGuiID NavActivateId;
     ImGuiID NavActivateDownId;
     ImGuiID NavActivatePressedId;
     ImGuiActivateFlags NavActivateFlags;
+    ImGuiID NavHighlightActivatedId;
+    float NavHighlightActivatedTimer;
     ImGuiID NavJustMovedToId;
     ImGuiID NavJustMovedToFocusScopeId;
     ImGuiKeyChord NavJustMovedToKeyMods;
@@ -2388,6 +2409,7 @@ struct ImGuiContext
     float NavWindowingTimer;
     float NavWindowingHighlightAlpha;
     bool NavWindowingToggleLayer;
+    ImGuiKey NavWindowingToggleKey;
     ImVec2 NavWindowingAccumDeltaPos;
     ImVec2 NavWindowingAccumDeltaSize;
     float DimBgRatio;
@@ -2435,6 +2457,8 @@ struct ImGuiContext
     ImGuiInputTextDeactivatedState InputTextDeactivatedState;
     ImFont InputTextPasswordFont;
     ImGuiID TempInputId;
+    int BeginMenuDepth;
+    int BeginComboDepth;
     ImGuiColorEditFlags ColorEditOptions;
     ImGuiID ColorEditCurrentID;
     ImGuiID ColorEditSavedID;
@@ -2506,6 +2530,7 @@ struct ImGuiContext
     int WantCaptureKeyboardNextFrame;
     int WantTextInputNextFrame;
     ImVector_char TempBuffer;
+    char TempKeychordName[64];
 };
 struct ImGuiWindowTempData
 {
@@ -2541,6 +2566,7 @@ struct ImGuiWindowTempData
     int CurrentTableIdx;
     ImGuiLayoutType LayoutType;
     ImGuiLayoutType ParentLayoutType;
+    ImU32 ModalDimBgColor;
     float ItemWidth;
     float TextWrapPos;
     ImVector_float ItemWidthStack;
@@ -2635,6 +2661,7 @@ struct ImGuiWindow
     ImGuiWindow* RootWindowPopupTree;
     ImGuiWindow* RootWindowForTitleBarHighlight;
     ImGuiWindow* RootWindowForNav;
+    ImGuiWindow* ParentWindowForFocusRoute;
     ImGuiWindow* NavLastChildNavWindow;
     ImGuiID NavLastIds[ImGuiNavLayer_COUNT];
     ImRect NavRectRel[ImGuiNavLayer_COUNT];
@@ -2897,7 +2924,7 @@ struct ImGuiTableTempData
 {
     int TableIndex;
     float LastTimeActive;
-    float AngledheadersExtraWidth;
+    float AngledHeadersExtraWidth;
     ImVec2 UserOuterSize;
     ImDrawListSplitter DrawSplitter;
     ImRect HostBackupWorkRect;
@@ -2965,6 +2992,7 @@ typedef ImVector<ImFontConfig> ImVector_ImFontConfig;
 typedef ImVector<ImFontGlyph> ImVector_ImFontGlyph;
 typedef ImVector<ImGuiColorMod> ImVector_ImGuiColorMod;
 typedef ImVector<ImGuiContextHook> ImVector_ImGuiContextHook;
+typedef ImVector<ImGuiFocusScopeData> ImVector_ImGuiFocusScopeData;
 typedef ImVector<ImGuiGroupData> ImVector_ImGuiGroupData;
 typedef ImVector<ImGuiID> ImVector_ImGuiID;
 typedef ImVector<ImGuiInputEvent> ImVector_ImGuiInputEvent;
@@ -3097,7 +3125,7 @@ CIMGUI_API float igGetFontSize(void);
 CIMGUI_API void igGetFontTexUvWhitePixel(ImVec2 *pOut);
 CIMGUI_API ImU32 igGetColorU32_Col(ImGuiCol idx,float alpha_mul);
 CIMGUI_API ImU32 igGetColorU32_Vec4(const ImVec4 col);
-CIMGUI_API ImU32 igGetColorU32_U32(ImU32 col);
+CIMGUI_API ImU32 igGetColorU32_U32(ImU32 col,float alpha_mul);
 CIMGUI_API const ImVec4* igGetStyleColorVec4(ImGuiCol idx);
 CIMGUI_API void igGetCursorScreenPos(ImVec2 *pOut);
 CIMGUI_API void igSetCursorScreenPos(const ImVec2 pos);
@@ -3381,6 +3409,7 @@ CIMGUI_API void igSaveIniSettingsToDisk(const char* ini_filename);
 CIMGUI_API const char* igSaveIniSettingsToMemory(size_t* out_ini_size);
 CIMGUI_API void igDebugTextEncoding(const char* text);
 CIMGUI_API void igDebugFlashStyleColor(ImGuiCol idx);
+CIMGUI_API void igDebugStartItemPicker(void);
 CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t sz_io,size_t sz_style,size_t sz_vec2,size_t sz_vec4,size_t sz_drawvert,size_t sz_drawidx);
 CIMGUI_API void igSetAllocatorFunctions(ImGuiMemAllocFunc alloc_func,ImGuiMemFreeFunc free_func,void* user_data);
 CIMGUI_API void igGetAllocatorFunctions(ImGuiMemAllocFunc* p_alloc_func,ImGuiMemFreeFunc* p_free_func,void** p_user_data);
@@ -3779,7 +3808,6 @@ CIMGUI_API void ImDrawListSharedData_destroy(ImDrawListSharedData* self);
 CIMGUI_API void ImDrawListSharedData_SetCircleTessellationMaxError(ImDrawListSharedData* self,float max_error);
 CIMGUI_API ImDrawDataBuilder* ImDrawDataBuilder_ImDrawDataBuilder(void);
 CIMGUI_API void ImDrawDataBuilder_destroy(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);
@@ -3809,8 +3837,9 @@ CIMGUI_API int ImGuiInputTextState_GetCursorPos(ImGuiInputTextState* self);
 CIMGUI_API int ImGuiInputTextState_GetSelectionStart(ImGuiInputTextState* self);
 CIMGUI_API int ImGuiInputTextState_GetSelectionEnd(ImGuiInputTextState* self);
 CIMGUI_API void ImGuiInputTextState_SelectAll(ImGuiInputTextState* self);
-CIMGUI_API ImGuiPopupData* ImGuiPopupData_ImGuiPopupData(void);
+CIMGUI_API void ImGuiInputTextState_ReloadUserBufAndSelectAll(ImGuiInputTextState* self);
-CIMGUI_API void ImGuiPopupData_destroy(ImGuiPopupData* self);
+CIMGUI_API void ImGuiInputTextState_ReloadUserBufAndKeepSelection(ImGuiInputTextState* self);
+CIMGUI_API void ImGuiInputTextState_ReloadUserBufAndMoveToEnd(ImGuiInputTextState* self);
 CIMGUI_API ImGuiNextWindowData* ImGuiNextWindowData_ImGuiNextWindowData(void);
 CIMGUI_API void ImGuiNextWindowData_destroy(ImGuiNextWindowData* self);
 CIMGUI_API void ImGuiNextWindowData_ClearFlags(ImGuiNextWindowData* self);
@@ -3826,6 +3855,9 @@ CIMGUI_API void ImGuiStackSizes_CompareWithContextState(ImGuiStackSizes* self,Im
 CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndex_Ptr(void* ptr);
 CIMGUI_API void ImGuiPtrOrIndex_destroy(ImGuiPtrOrIndex* self);
 CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndex_Int(int index);
+CIMGUI_API void* ImGuiDataVarInfo_GetVarPtr(ImGuiDataVarInfo* self,void* parent);
+CIMGUI_API ImGuiPopupData* ImGuiPopupData_ImGuiPopupData(void);
+CIMGUI_API void ImGuiPopupData_destroy(ImGuiPopupData* self);
 CIMGUI_API ImGuiInputEvent* ImGuiInputEvent_ImGuiInputEvent(void);
 CIMGUI_API void ImGuiInputEvent_destroy(ImGuiInputEvent* self);
 CIMGUI_API ImGuiKeyRoutingData* ImGuiKeyRoutingData_ImGuiKeyRoutingData(void);
@@ -3917,6 +3949,7 @@ CIMGUI_API void igSetWindowSize_WindowPtr(ImGuiWindow* window,const ImVec2 size,
 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 igSetWindowHiddenAndSkipItemsForCurrentFrame(ImGuiWindow* window);
+CIMGUI_API void igSetWindowParentWindowForFocusRoute(ImGuiWindow* window,ImGuiWindow* parent_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 igWindowPosRelToAbs(ImVec2 *pOut,ImGuiWindow* window,const ImVec2 p);
@@ -4030,11 +4063,13 @@ CIMGUI_API void igNavMoveRequestResolveWithPastTreeNode(ImGuiNavItemData* result
 CIMGUI_API void igNavMoveRequestCancel(void);
 CIMGUI_API void igNavMoveRequestApplyResult(void);
 CIMGUI_API void igNavMoveRequestTryWrapping(ImGuiWindow* window,ImGuiNavMoveFlags move_flags);
+CIMGUI_API void igNavHighlightActivated(ImGuiID id);
 CIMGUI_API void igNavClearPreferredPosForAxis(ImGuiAxis axis);
 CIMGUI_API void igNavRestoreHighlightAfterMove(void);
 CIMGUI_API void igNavUpdateCurrentWindowIsScrollPushableX(void);
 CIMGUI_API void igSetNavWindow(ImGuiWindow* window);
 CIMGUI_API void igSetNavID(ImGuiID id,ImGuiNavLayer nav_layer,ImGuiID focus_scope_id,const ImRect rect_rel);
+CIMGUI_API void igSetNavFocusScope(ImGuiID focus_scope_id);
 CIMGUI_API void igFocusItem(void);
 CIMGUI_API void igActivateItemByID(ImGuiID id);
 CIMGUI_API bool igIsNamedKey(ImGuiKey key);
@@ -4044,11 +4079,12 @@ 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 ImGuiKeyChord igConvertShortcutMod(ImGuiKeyChord key_chord);
+CIMGUI_API bool igIsModKey(ImGuiKey key);
+CIMGUI_API ImGuiKeyChord igFixupKeyChord(ImGuiContext* ctx,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 const char* igGetKeyChordName(ImGuiKeyChord key_chord,char* out_buf,int out_buf_size);
+CIMGUI_API const char* igGetKeyChordName(ImGuiKeyChord key_chord);
 CIMGUI_API ImGuiKey igMouseButtonToKey(ImGuiMouseButton button);
 CIMGUI_API bool igIsMouseDragPastThreshold(ImGuiMouseButton button,float lock_threshold);
 CIMGUI_API void igGetKeyMagnitude2d(ImVec2 *pOut,ImGuiKey key_left,ImGuiKey key_right,ImGuiKey key_up,ImGuiKey key_down);
@@ -4072,6 +4108,7 @@ CIMGUI_API bool igIsMouseClicked_ID(ImGuiMouseButton button,ImGuiID owner_id,ImG
 CIMGUI_API bool igIsMouseReleased_ID(ImGuiMouseButton button,ImGuiID owner_id);
 CIMGUI_API bool igIsMouseDoubleClicked_ID(ImGuiMouseButton button,ImGuiID owner_id);
 CIMGUI_API bool igIsKeyChordPressed_ID(ImGuiKeyChord key_chord,ImGuiID owner_id,ImGuiInputFlags flags);
+CIMGUI_API void igSetNextItemShortcut(ImGuiKeyChord key_chord);
 CIMGUI_API bool igShortcut(ImGuiKeyChord key_chord,ImGuiID owner_id,ImGuiInputFlags flags);
 CIMGUI_API bool igSetShortcutRouting(ImGuiKeyChord key_chord,ImGuiID owner_id,ImGuiInputFlags flags);
 CIMGUI_API bool igTestShortcutRouting(ImGuiKeyChord key_chord,ImGuiID owner_id);
@@ -4107,7 +4144,7 @@ CIMGUI_API float igTableGetHeaderRowHeight(void);
 CIMGUI_API float igTableGetHeaderAngledMaxLabelWidth(void);
 CIMGUI_API void igTablePushBackgroundChannel(void);
 CIMGUI_API void igTablePopBackgroundChannel(void);
-CIMGUI_API void igTableAngledHeadersRowEx(float angle,float label_width);
+CIMGUI_API void igTableAngledHeadersRowEx(float angle,float max_label_width);
 CIMGUI_API ImGuiTable* igGetCurrentTable(void);
 CIMGUI_API ImGuiTable* igTableFindByID(ImGuiID id);
 CIMGUI_API bool igBeginTableEx(const char* name,ImGuiID id,int columns_count,ImGuiTableFlags flags,const ImVec2 outer_size,float inner_width);
@@ -4246,7 +4283,6 @@ CIMGUI_API void igDebugLocateItemResolveWithLastItem(void);
 CIMGUI_API void igDebugBreakClearData(void);
 CIMGUI_API bool igDebugBreakButton(const char* label,const char* description_of_location);
 CIMGUI_API void igDebugBreakButtonTooltip(bool keyboard_only,const char* description_of_location);
-CIMGUI_API void igDebugStartItemPicker(void);
 CIMGUI_API void igShowFontAtlas(ImFontAtlas* atlas);
 CIMGUI_API void igDebugHookIdInfo(ImGuiID id,ImGuiDataType data_type,const void* data_id,const void* data_id_end);
 CIMGUI_API void igDebugNodeColumns(ImGuiOldColumns* columns);

generator/generator.lua

@@ -33,7 +33,7 @@ if FREETYPE_GENERATION then
 	CFLAGS = CFLAGS .. " -DIMGUI_ENABLE_FREETYPE "
 end
 
-if COMPILER == "gcc" or COMPILER == "clang" then
+if COMPILER == "gcc" or COMPILER == "clang" or COMPILER == "zig cc" then
     CPRE = COMPILER..[[ -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ]] .. CFLAGS
     CTEST = COMPILER.." --version"
 elseif COMPILER == "cl" then

generator/output/cimgui_impl.h

@@ -47,9 +47,12 @@ CIMGUI_API void ImGui_ImplOpenGL2_DestroyDeviceObjects(void);
 
 typedef struct SDL_Window SDL_Window;
 typedef struct SDL_Renderer SDL_Renderer;
+typedef struct _SDL_GameController _SDL_GameController;
 struct SDL_Window;
 struct SDL_Renderer;
-typedef union SDL_Event SDL_Event;CIMGUI_API bool ImGui_ImplSDL2_InitForOpenGL(SDL_Window* window,void* sdl_gl_context);
+struct _SDL_GameController;
+typedef union SDL_Event SDL_Event;
+typedef enum { ImGui_ImplSDL2_GamepadMode_AutoFirst, ImGui_ImplSDL2_GamepadMode_AutoAll, ImGui_ImplSDL2_GamepadMode_Manual }ImGui_ImplSDL2_GamepadMode;CIMGUI_API bool ImGui_ImplSDL2_InitForOpenGL(SDL_Window* window,void* sdl_gl_context);
 CIMGUI_API bool ImGui_ImplSDL2_InitForVulkan(SDL_Window* window);
 CIMGUI_API bool ImGui_ImplSDL2_InitForD3D(SDL_Window* window);
 CIMGUI_API bool ImGui_ImplSDL2_InitForMetal(SDL_Window* window);
@@ -58,5 +61,6 @@ CIMGUI_API bool ImGui_ImplSDL2_InitForOther(SDL_Window* window);
 CIMGUI_API void ImGui_ImplSDL2_Shutdown(void);
 CIMGUI_API void ImGui_ImplSDL2_NewFrame(void);
 CIMGUI_API bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event);
+CIMGUI_API void ImGui_ImplSDL2_SetGamepadMode(ImGui_ImplSDL2_GamepadMode mode,struct _SDL_GameController** manual_gamepads_array,int manual_gamepads_count);
 
 #endif

generator/output/impl_definitions.json

@@ -684,7 +684,7 @@
       "cimguiname": "ImGui_ImplSDL2_InitForD3D",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForD3D",
-      "location": "imgui_impl_sdl2:31",
+      "location": "imgui_impl_sdl2:32",
       "ov_cimguiname": "ImGui_ImplSDL2_InitForD3D",
       "ret": "bool",
       "signature": "(SDL_Window*)",
@@ -705,7 +705,7 @@
       "cimguiname": "ImGui_ImplSDL2_InitForMetal",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForMetal",
-      "location": "imgui_impl_sdl2:32",
+      "location": "imgui_impl_sdl2:33",
       "ov_cimguiname": "ImGui_ImplSDL2_InitForMetal",
       "ret": "bool",
       "signature": "(SDL_Window*)",
@@ -730,7 +730,7 @@
       "cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForOpenGL",
-      "location": "imgui_impl_sdl2:29",
+      "location": "imgui_impl_sdl2:30",
       "ov_cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
       "ret": "bool",
       "signature": "(SDL_Window*,void*)",
@@ -751,7 +751,7 @@
       "cimguiname": "ImGui_ImplSDL2_InitForOther",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForOther",
-      "location": "imgui_impl_sdl2:34",
+      "location": "imgui_impl_sdl2:35",
       "ov_cimguiname": "ImGui_ImplSDL2_InitForOther",
       "ret": "bool",
       "signature": "(SDL_Window*)",
@@ -776,7 +776,7 @@
       "cimguiname": "ImGui_ImplSDL2_InitForSDLRenderer",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForSDLRenderer",
-      "location": "imgui_impl_sdl2:33",
+      "location": "imgui_impl_sdl2:34",
       "ov_cimguiname": "ImGui_ImplSDL2_InitForSDLRenderer",
       "ret": "bool",
       "signature": "(SDL_Window*,SDL_Renderer*)",
@@ -797,7 +797,7 @@
       "cimguiname": "ImGui_ImplSDL2_InitForVulkan",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_InitForVulkan",
-      "location": "imgui_impl_sdl2:30",
+      "location": "imgui_impl_sdl2:31",
       "ov_cimguiname": "ImGui_ImplSDL2_InitForVulkan",
       "ret": "bool",
       "signature": "(SDL_Window*)",
@@ -813,7 +813,7 @@
       "cimguiname": "ImGui_ImplSDL2_NewFrame",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_NewFrame",
-      "location": "imgui_impl_sdl2:36",
+      "location": "imgui_impl_sdl2:37",
       "ov_cimguiname": "ImGui_ImplSDL2_NewFrame",
       "ret": "void",
       "signature": "()",
@@ -834,13 +834,45 @@
       "cimguiname": "ImGui_ImplSDL2_ProcessEvent",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_ProcessEvent",
-      "location": "imgui_impl_sdl2:37",
+      "location": "imgui_impl_sdl2:38",
       "ov_cimguiname": "ImGui_ImplSDL2_ProcessEvent",
       "ret": "bool",
       "signature": "(const SDL_Event*)",
       "stname": ""
     }
   ],
+  "ImGui_ImplSDL2_SetGamepadMode": [
+    {
+      "args": "(ImGui_ImplSDL2_GamepadMode mode,struct _SDL_GameController** manual_gamepads_array,int manual_gamepads_count)",
+      "argsT": [
+        {
+          "name": "mode",
+          "type": "ImGui_ImplSDL2_GamepadMode"
+        },
+        {
+          "name": "manual_gamepads_array",
+          "type": "struct _SDL_GameController**"
+        },
+        {
+          "name": "manual_gamepads_count",
+          "type": "int"
+        }
+      ],
+      "argsoriginal": "(ImGui_ImplSDL2_GamepadMode mode,struct _SDL_GameController** manual_gamepads_array=((void*)0),int manual_gamepads_count=-1)",
+      "call_args": "(mode,manual_gamepads_array,manual_gamepads_count)",
+      "cimguiname": "ImGui_ImplSDL2_SetGamepadMode",
+      "defaults": {
+        "manual_gamepads_array": "NULL",
+        "manual_gamepads_count": "-1"
+      },
+      "funcname": "ImGui_ImplSDL2_SetGamepadMode",
+      "location": "imgui_impl_sdl2:43",
+      "ov_cimguiname": "ImGui_ImplSDL2_SetGamepadMode",
+      "ret": "void",
+      "signature": "(ImGui_ImplSDL2_GamepadMode,struct _SDL_GameController**,int)",
+      "stname": ""
+    }
+  ],
   "ImGui_ImplSDL2_Shutdown": [
     {
       "args": "()",
@@ -850,7 +882,7 @@
       "cimguiname": "ImGui_ImplSDL2_Shutdown",
       "defaults": {},
       "funcname": "ImGui_ImplSDL2_Shutdown",
-      "location": "imgui_impl_sdl2:35",
+      "location": "imgui_impl_sdl2:36",
       "ov_cimguiname": "ImGui_ImplSDL2_Shutdown",
       "ret": "void",
       "signature": "()",

generator/output/impl_definitions.lua

@@ -597,7 +597,7 @@ defs["ImGui_ImplSDL2_InitForD3D"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForD3D"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForD3D"][1]["funcname"] = "ImGui_ImplSDL2_InitForD3D"
-defs["ImGui_ImplSDL2_InitForD3D"][1]["location"] = "imgui_impl_sdl2:31"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["location"] = "imgui_impl_sdl2:32"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForD3D"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["signature"] = "(SDL_Window*)"
@@ -615,7 +615,7 @@ defs["ImGui_ImplSDL2_InitForMetal"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForMetal"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForMetal"][1]["funcname"] = "ImGui_ImplSDL2_InitForMetal"
-defs["ImGui_ImplSDL2_InitForMetal"][1]["location"] = "imgui_impl_sdl2:32"
+defs["ImGui_ImplSDL2_InitForMetal"][1]["location"] = "imgui_impl_sdl2:33"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForMetal"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["signature"] = "(SDL_Window*)"
@@ -636,7 +636,7 @@ defs["ImGui_ImplSDL2_InitForOpenGL"][1]["call_args"] = "(window,sdl_gl_context)"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForOpenGL"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["funcname"] = "ImGui_ImplSDL2_InitForOpenGL"
-defs["ImGui_ImplSDL2_InitForOpenGL"][1]["location"] = "imgui_impl_sdl2:29"
+defs["ImGui_ImplSDL2_InitForOpenGL"][1]["location"] = "imgui_impl_sdl2:30"
 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*)"
@@ -654,7 +654,7 @@ defs["ImGui_ImplSDL2_InitForOther"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForOther"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForOther"
 defs["ImGui_ImplSDL2_InitForOther"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForOther"][1]["funcname"] = "ImGui_ImplSDL2_InitForOther"
-defs["ImGui_ImplSDL2_InitForOther"][1]["location"] = "imgui_impl_sdl2:34"
+defs["ImGui_ImplSDL2_InitForOther"][1]["location"] = "imgui_impl_sdl2:35"
 defs["ImGui_ImplSDL2_InitForOther"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForOther"
 defs["ImGui_ImplSDL2_InitForOther"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForOther"][1]["signature"] = "(SDL_Window*)"
@@ -675,7 +675,7 @@ defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["call_args"] = "(window,renderer)"
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForSDLRenderer"
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["funcname"] = "ImGui_ImplSDL2_InitForSDLRenderer"
-defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["location"] = "imgui_impl_sdl2:33"
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["location"] = "imgui_impl_sdl2:34"
 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*)"
@@ -693,7 +693,7 @@ defs["ImGui_ImplSDL2_InitForVulkan"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForVulkan"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["funcname"] = "ImGui_ImplSDL2_InitForVulkan"
-defs["ImGui_ImplSDL2_InitForVulkan"][1]["location"] = "imgui_impl_sdl2:30"
+defs["ImGui_ImplSDL2_InitForVulkan"][1]["location"] = "imgui_impl_sdl2:31"
 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*)"
@@ -708,7 +708,7 @@ defs["ImGui_ImplSDL2_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplSDL2_NewFrame"][1]["cimguiname"] = "ImGui_ImplSDL2_NewFrame"
 defs["ImGui_ImplSDL2_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_NewFrame"][1]["funcname"] = "ImGui_ImplSDL2_NewFrame"
-defs["ImGui_ImplSDL2_NewFrame"][1]["location"] = "imgui_impl_sdl2:36"
+defs["ImGui_ImplSDL2_NewFrame"][1]["location"] = "imgui_impl_sdl2:37"
 defs["ImGui_ImplSDL2_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_NewFrame"
 defs["ImGui_ImplSDL2_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplSDL2_NewFrame"][1]["signature"] = "()"
@@ -726,12 +726,38 @@ defs["ImGui_ImplSDL2_ProcessEvent"][1]["call_args"] = "(event)"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["cimguiname"] = "ImGui_ImplSDL2_ProcessEvent"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["funcname"] = "ImGui_ImplSDL2_ProcessEvent"
-defs["ImGui_ImplSDL2_ProcessEvent"][1]["location"] = "imgui_impl_sdl2:37"
+defs["ImGui_ImplSDL2_ProcessEvent"][1]["location"] = "imgui_impl_sdl2:38"
 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*)"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["stname"] = ""
 defs["ImGui_ImplSDL2_ProcessEvent"]["(const SDL_Event*)"] = defs["ImGui_ImplSDL2_ProcessEvent"][1]
+defs["ImGui_ImplSDL2_SetGamepadMode"] = {}
+defs["ImGui_ImplSDL2_SetGamepadMode"][1] = {}
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["args"] = "(ImGui_ImplSDL2_GamepadMode mode,struct _SDL_GameController** manual_gamepads_array,int manual_gamepads_count)"
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["argsT"] = {}
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["argsT"][1] = {}
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["argsT"][1]["name"] = "mode"
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["argsT"][1]["type"] = "ImGui_ImplSDL2_GamepadMode"
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["argsT"][2] = {}
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["argsT"][2]["name"] = "manual_gamepads_array"
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["argsT"][2]["type"] = "struct _SDL_GameController**"
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["argsT"][3] = {}
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["argsT"][3]["name"] = "manual_gamepads_count"
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["argsT"][3]["type"] = "int"
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["argsoriginal"] = "(ImGui_ImplSDL2_GamepadMode mode,struct _SDL_GameController** manual_gamepads_array=((void*)0),int manual_gamepads_count=-1)"
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["call_args"] = "(mode,manual_gamepads_array,manual_gamepads_count)"
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["cimguiname"] = "ImGui_ImplSDL2_SetGamepadMode"
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["defaults"] = {}
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["defaults"]["manual_gamepads_array"] = "NULL"
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["defaults"]["manual_gamepads_count"] = "-1"
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["funcname"] = "ImGui_ImplSDL2_SetGamepadMode"
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["location"] = "imgui_impl_sdl2:43"
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_SetGamepadMode"
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["ret"] = "void"
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["signature"] = "(ImGui_ImplSDL2_GamepadMode,struct _SDL_GameController**,int)"
+defs["ImGui_ImplSDL2_SetGamepadMode"][1]["stname"] = ""
+defs["ImGui_ImplSDL2_SetGamepadMode"]["(ImGui_ImplSDL2_GamepadMode,struct _SDL_GameController**,int)"] = defs["ImGui_ImplSDL2_SetGamepadMode"][1]
 defs["ImGui_ImplSDL2_Shutdown"] = {}
 defs["ImGui_ImplSDL2_Shutdown"][1] = {}
 defs["ImGui_ImplSDL2_Shutdown"][1]["args"] = "()"
@@ -741,7 +767,7 @@ defs["ImGui_ImplSDL2_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplSDL2_Shutdown"][1]["cimguiname"] = "ImGui_ImplSDL2_Shutdown"
 defs["ImGui_ImplSDL2_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_Shutdown"][1]["funcname"] = "ImGui_ImplSDL2_Shutdown"
-defs["ImGui_ImplSDL2_Shutdown"][1]["location"] = "imgui_impl_sdl2:35"
+defs["ImGui_ImplSDL2_Shutdown"][1]["location"] = "imgui_impl_sdl2:36"
 defs["ImGui_ImplSDL2_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_Shutdown"
 defs["ImGui_ImplSDL2_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplSDL2_Shutdown"][1]["signature"] = "()"

generator/output/overloads.txt

@@ -114,7 +114,7 @@ igGetBackgroundDrawList	2
 igGetColorU32	3
 1	ImU32	igGetColorU32_Col (ImGuiCol,float)
 2	ImU32	igGetColorU32_Vec4 (const ImVec4)
-3	ImU32	igGetColorU32_U32 (ImU32)
+3	ImU32	igGetColorU32_U32 (ImU32,float)
 igGetForegroundDrawList	3
 1	ImDrawList*	igGetForegroundDrawList_Nil ()
 2	ImDrawList*	igGetForegroundDrawList_WindowPtr (ImGuiWindow*)

generator/output/structs_and_enums.json

@@ -146,6 +146,11 @@
         "calc_value": 8,
         "name": "ImGuiActivateFlags_FromTabbing",
         "value": "1 << 3"
+      },
+      {
+        "calc_value": 16,
+        "name": "ImGuiActivateFlags_FromShortcut",
+        "value": "1 << 4"
       }
     ],
     "ImGuiAxis": [
@@ -1078,9 +1083,14 @@
         "value": "1 << 6"
       },
       {
-        "calc_value": 127,
+        "calc_value": 128,
+        "name": "ImGuiDebugLogFlags_EventInputRouting",
+        "value": "1 << 7"
+      },
+      {
+        "calc_value": 255,
         "name": "ImGuiDebugLogFlags_EventMask_",
-        "value": "ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventSelection | ImGuiDebugLogFlags_EventIO"
+        "value": "ImGuiDebugLogFlags_EventActiveId | ImGuiDebugLogFlags_EventFocus | ImGuiDebugLogFlags_EventPopup | ImGuiDebugLogFlags_EventNav | ImGuiDebugLogFlags_EventClipper | ImGuiDebugLogFlags_EventSelection | ImGuiDebugLogFlags_EventIO | ImGuiDebugLogFlags_EventInputRouting"
       },
       {
         "calc_value": 1048576,
@@ -1453,11 +1463,6 @@
         "name": "ImGuiInputFlags_CondDefault_",
         "value": "ImGuiInputFlags_CondHovered | ImGuiInputFlags_CondActive"
       },
-      {
-        "calc_value": 768,
-        "name": "ImGuiInputFlags_CondMask_",
-        "value": "ImGuiInputFlags_CondHovered | ImGuiInputFlags_CondActive"
-      },
       {
         "calc_value": 1024,
         "name": "ImGuiInputFlags_LockThisFrame",
@@ -1488,11 +1493,6 @@
         "name": "ImGuiInputFlags_RouteGlobalHigh",
         "value": "1 << 15"
       },
-      {
-        "calc_value": 61440,
-        "name": "ImGuiInputFlags_RouteMask_",
-        "value": "ImGuiInputFlags_RouteFocused | ImGuiInputFlags_RouteGlobal | ImGuiInputFlags_RouteGlobalLow | ImGuiInputFlags_RouteGlobalHigh"
-      },
       {
         "calc_value": 65536,
         "name": "ImGuiInputFlags_RouteAlways",
@@ -1503,11 +1503,6 @@
         "name": "ImGuiInputFlags_RouteUnlessBgFocused",
         "value": "1 << 17"
       },
-      {
-        "calc_value": 196608,
-        "name": "ImGuiInputFlags_RouteExtraMask_",
-        "value": "ImGuiInputFlags_RouteAlways | ImGuiInputFlags_RouteUnlessBgFocused"
-      },
       {
         "calc_value": 14,
         "name": "ImGuiInputFlags_RepeatRateMask_",
@@ -1523,6 +1518,16 @@
         "name": "ImGuiInputFlags_RepeatMask_",
         "value": "ImGuiInputFlags_Repeat | ImGuiInputFlags_RepeatRateMask_ | ImGuiInputFlags_RepeatUntilMask_"
       },
+      {
+        "calc_value": 768,
+        "name": "ImGuiInputFlags_CondMask_",
+        "value": "ImGuiInputFlags_CondHovered | ImGuiInputFlags_CondActive"
+      },
+      {
+        "calc_value": 61440,
+        "name": "ImGuiInputFlags_RouteMask_",
+        "value": "ImGuiInputFlags_RouteFocused | ImGuiInputFlags_RouteGlobal | ImGuiInputFlags_RouteGlobalLow | ImGuiInputFlags_RouteGlobalHigh"
+      },
       {
         "calc_value": 255,
         "name": "ImGuiInputFlags_SupportedByIsKeyPressed",
@@ -1536,7 +1541,7 @@
       {
         "calc_value": 258303,
         "name": "ImGuiInputFlags_SupportedByShortcut",
-        "value": "ImGuiInputFlags_RepeatMask_ | ImGuiInputFlags_RouteMask_ | ImGuiInputFlags_RouteExtraMask_"
+        "value": "ImGuiInputFlags_RepeatMask_ | ImGuiInputFlags_RouteMask_ | ImGuiInputFlags_RouteAlways | ImGuiInputFlags_RouteUnlessBgFocused"
       },
       {
         "calc_value": 3072,
@@ -2869,14 +2874,9 @@
         "name": "ImGuiNavHighlightFlags_None",
         "value": "0"
       },
-      {
-        "calc_value": 1,
-        "name": "ImGuiNavHighlightFlags_TypeDefault",
-        "value": "1 << 0"
-      },
       {
         "calc_value": 2,
-        "name": "ImGuiNavHighlightFlags_TypeThin",
+        "name": "ImGuiNavHighlightFlags_Compact",
         "value": "1 << 1"
       },
       {
@@ -3009,6 +3009,11 @@
         "calc_value": 2,
         "name": "ImGuiNextItemDataFlags_HasOpen",
         "value": "1 << 1"
+      },
+      {
+        "calc_value": 4,
+        "name": "ImGuiNextItemDataFlags_HasShortcut",
+        "value": "1 << 2"
       }
     ],
     "ImGuiNextWindowDataFlags_": [
@@ -3140,26 +3145,31 @@
       },
       {
         "calc_value": 32,
-        "name": "ImGuiPopupFlags_NoOpenOverExistingPopup",
+        "name": "ImGuiPopupFlags_NoReopen",
         "value": "1 << 5"
       },
-      {
-        "calc_value": 64,
-        "name": "ImGuiPopupFlags_NoOpenOverItems",
-        "value": "1 << 6"
-      },
       {
         "calc_value": 128,
-        "name": "ImGuiPopupFlags_AnyPopupId",
+        "name": "ImGuiPopupFlags_NoOpenOverExistingPopup",
         "value": "1 << 7"
       },
       {
         "calc_value": 256,
-        "name": "ImGuiPopupFlags_AnyPopupLevel",
+        "name": "ImGuiPopupFlags_NoOpenOverItems",
         "value": "1 << 8"
       },
       {
-        "calc_value": 384,
+        "calc_value": 1024,
+        "name": "ImGuiPopupFlags_AnyPopupId",
+        "value": "1 << 10"
+      },
+      {
+        "calc_value": 2048,
+        "name": "ImGuiPopupFlags_AnyPopupLevel",
+        "value": "1 << 11"
+      },
+      {
+        "calc_value": 3072,
         "name": "ImGuiPopupFlags_AnyPopup",
         "value": "ImGuiPopupFlags_AnyPopupId | ImGuiPopupFlags_AnyPopupLevel"
       }
@@ -4364,176 +4374,177 @@
     "ImGuiMouseSource": "int"
   },
   "locations": {
-    "ImBitVector": "imgui_internal:599",
+    "ImBitVector": "imgui_internal:602",
-    "ImColor": "imgui:2544",
+    "ImColor": "imgui:2545",
-    "ImDrawChannel": "imgui:2634",
+    "ImDrawChannel": "imgui:2635",
-    "ImDrawCmd": "imgui:2593",
+    "ImDrawCmd": "imgui:2594",
-    "ImDrawCmdHeader": "imgui:2626",
+    "ImDrawCmdHeader": "imgui:2627",
-    "ImDrawData": "imgui:2828",
+    "ImDrawData": "imgui:2830",
     "ImDrawDataBuilder": "imgui_internal:788",
-    "ImDrawFlags_": "imgui:2660",
+    "ImDrawFlags_": "imgui:2661",
-    "ImDrawList": "imgui:2698",
+    "ImDrawList": "imgui:2699",
-    "ImDrawListFlags_": "imgui:2680",
+    "ImDrawListFlags_": "imgui:2681",
     "ImDrawListSharedData": "imgui_internal:765",
-    "ImDrawListSplitter": "imgui:2643",
+    "ImDrawListSplitter": "imgui:2644",
-    "ImDrawVert": "imgui:2611",
+    "ImDrawVert": "imgui:2612",
-    "ImFont": "imgui:3051",
+    "ImFont": "imgui:3053",
-    "ImFontAtlas": "imgui:2947",
+    "ImFontAtlas": "imgui:2949",
-    "ImFontAtlasCustomRect": "imgui:2909",
+    "ImFontAtlasCustomRect": "imgui:2911",
-    "ImFontAtlasFlags_": "imgui:2922",
+    "ImFontAtlasFlags_": "imgui:2924",
-    "ImFontBuilderIO": "imgui_internal:3471",
+    "ImFontBuilderIO": "imgui_internal:3532",
-    "ImFontConfig": "imgui:2852",
+    "ImFontConfig": "imgui:2854",
-    "ImFontGlyph": "imgui:2882",
+    "ImFontGlyph": "imgui:2884",
-    "ImFontGlyphRangesBuilder": "imgui:2894",
+    "ImFontGlyphRangesBuilder": "imgui:2896",
-    "ImGuiActivateFlags_": "imgui_internal:1495",
+    "ImGuiActivateFlags_": "imgui_internal:1529",
     "ImGuiAxis": "imgui_internal:975",
-    "ImGuiBackendFlags_": "imgui:1469",
+    "ImGuiBackendFlags_": "imgui:1474",
     "ImGuiButtonFlagsPrivate_": "imgui_internal:869",
-    "ImGuiButtonFlags_": "imgui:1580",
+    "ImGuiButtonFlags_": "imgui:1585",
-    "ImGuiChildFlags_": "imgui:1036",
+    "ImGuiChildFlags_": "imgui:1039",
-    "ImGuiCol_": "imgui:1479",
+    "ImGuiCol_": "imgui:1484",
-    "ImGuiColorEditFlags_": "imgui:1593",
+    "ImGuiColorEditFlags_": "imgui:1598",
-    "ImGuiColorMod": "imgui_internal:1026",
+    "ImGuiColorMod": "imgui_internal:989",
     "ImGuiComboFlagsPrivate_": "imgui_internal:894",
-    "ImGuiComboFlags_": "imgui:1146",
+    "ImGuiComboFlags_": "imgui:1151",
-    "ImGuiComboPreviewData": "imgui_internal:1043",
+    "ImGuiComboPreviewData": "imgui_internal:1006",
-    "ImGuiCond_": "imgui:1694",
+    "ImGuiCond_": "imgui:1699",
-    "ImGuiConfigFlags_": "imgui:1453",
+    "ImGuiConfigFlags_": "imgui:1458",
-    "ImGuiContext": "imgui_internal:1875",
+    "ImGuiContext": "imgui_internal:1918",
-    "ImGuiContextHook": "imgui_internal:1860",
+    "ImGuiContextHook": "imgui_internal:1903",
-    "ImGuiContextHookType": "imgui_internal:1858",
+    "ImGuiContextHookType": "imgui_internal:1901",
-    "ImGuiDataTypeInfo": "imgui_internal:1009",
+    "ImGuiDataTypeInfo": "imgui_internal:1263",
-    "ImGuiDataTypePrivate_": "imgui_internal:1018",
+    "ImGuiDataTypePrivate_": "imgui_internal:1272",
-    "ImGuiDataTypeTempStorage": "imgui_internal:1003",
+    "ImGuiDataTypeTempStorage": "imgui_internal:1257",
-    "ImGuiDataType_": "imgui:1266",
+    "ImGuiDataType_": "imgui:1271",
-    "ImGuiDataVarInfo": "imgui_internal:995",
+    "ImGuiDataVarInfo": "imgui_internal:1249",
-    "ImGuiDebugAllocEntry": "imgui_internal:1797",
+    "ImGuiDebugAllocEntry": "imgui_internal:1838",
-    "ImGuiDebugAllocInfo": "imgui_internal:1804",
+    "ImGuiDebugAllocInfo": "imgui_internal:1845",
-    "ImGuiDebugLogFlags_": "imgui_internal:1780",
+    "ImGuiDebugLogFlags_": "imgui_internal:1820",
-    "ImGuiDir_": "imgui:1282",
+    "ImGuiDir_": "imgui:1287",
-    "ImGuiDragDropFlags_": "imgui:1244",
+    "ImGuiDragDropFlags_": "imgui:1249",
     "ImGuiFocusRequestFlags_": "imgui_internal:938",
-    "ImGuiFocusedFlags_": "imgui:1192",
+    "ImGuiFocusScopeData": "imgui_internal:1606",
-    "ImGuiGroupData": "imgui_internal:1056",
+    "ImGuiFocusedFlags_": "imgui:1197",
+    "ImGuiGroupData": "imgui_internal:1019",
     "ImGuiHoveredFlagsPrivate_": "imgui_internal:852",
-    "ImGuiHoveredFlags_": "imgui:1206",
+    "ImGuiHoveredFlags_": "imgui:1211",
-    "ImGuiIDStackTool": "imgui_internal:1841",
+    "ImGuiIDStackTool": "imgui_internal:1884",
-    "ImGuiIO": "imgui:2049",
+    "ImGuiIO": "imgui:2054",
-    "ImGuiInputEvent": "imgui_internal:1342",
+    "ImGuiInputEvent": "imgui_internal:1365",
-    "ImGuiInputEventAppFocused": "imgui_internal:1340",
+    "ImGuiInputEventAppFocused": "imgui_internal:1363",
-    "ImGuiInputEventKey": "imgui_internal:1338",
+    "ImGuiInputEventKey": "imgui_internal:1361",
-    "ImGuiInputEventMouseButton": "imgui_internal:1337",
+    "ImGuiInputEventMouseButton": "imgui_internal:1360",
-    "ImGuiInputEventMousePos": "imgui_internal:1335",
+    "ImGuiInputEventMousePos": "imgui_internal:1358",
-    "ImGuiInputEventMouseWheel": "imgui_internal:1336",
+    "ImGuiInputEventMouseWheel": "imgui_internal:1359",
-    "ImGuiInputEventText": "imgui_internal:1339",
+    "ImGuiInputEventText": "imgui_internal:1362",
-    "ImGuiInputEventType": "imgui_internal:1311",
+    "ImGuiInputEventType": "imgui_internal:1334",
-    "ImGuiInputFlags_": "imgui_internal:1405",
+    "ImGuiInputFlags_": "imgui_internal:1429",
-    "ImGuiInputSource": "imgui_internal:1323",
+    "ImGuiInputSource": "imgui_internal:1346",
-    "ImGuiInputTextCallbackData": "imgui:2258",
+    "ImGuiInputTextCallbackData": "imgui:2259",
-    "ImGuiInputTextDeactivatedState": "imgui_internal:1092",
+    "ImGuiInputTextDeactivatedState": "imgui_internal:1055",
     "ImGuiInputTextFlagsPrivate_": "imgui_internal:860",
-    "ImGuiInputTextFlags_": "imgui:1051",
+    "ImGuiInputTextFlags_": "imgui:1054",
-    "ImGuiInputTextState": "imgui_internal:1102",
+    "ImGuiInputTextState": "imgui_internal:1065",
     "ImGuiItemFlags_": "imgui_internal:805",
     "ImGuiItemStatusFlags_": "imgui_internal:827",
-    "ImGuiKey": "imgui:1311",
+    "ImGuiKey": "imgui:1316",
-    "ImGuiKeyData": "imgui:2041",
+    "ImGuiKeyData": "imgui:2046",
-    "ImGuiKeyOwnerData": "imgui_internal:1393",
+    "ImGuiKeyOwnerData": "imgui_internal:1417",
-    "ImGuiKeyRoutingData": "imgui_internal:1368",
+    "ImGuiKeyRoutingData": "imgui_internal:1391",
-    "ImGuiKeyRoutingTable": "imgui_internal:1381",
+    "ImGuiKeyRoutingTable": "imgui_internal:1405",
-    "ImGuiLastItemData": "imgui_internal:1217",
+    "ImGuiLastItemData": "imgui_internal:1180",
     "ImGuiLayoutType_": "imgui_internal:959",
-    "ImGuiListClipper": "imgui:2458",
+    "ImGuiListClipper": "imgui:2459",
-    "ImGuiListClipperData": "imgui_internal:1479",
+    "ImGuiListClipperData": "imgui_internal:1513",
-    "ImGuiListClipperRange": "imgui_internal:1466",
+    "ImGuiListClipperRange": "imgui_internal:1500",
-    "ImGuiLocEntry": "imgui_internal:1769",
+    "ImGuiLocEntry": "imgui_internal:1809",
-    "ImGuiLocKey": "imgui_internal:1756",
+    "ImGuiLocKey": "imgui_internal:1796",
     "ImGuiLogType": "imgui_internal:965",
-    "ImGuiMenuColumns": "imgui_internal:1074",
+    "ImGuiMenuColumns": "imgui_internal:1037",
-    "ImGuiMetricsConfig": "imgui_internal:1814",
+    "ImGuiMetricsConfig": "imgui_internal:1855",
-    "ImGuiMouseButton_": "imgui:1654",
+    "ImGuiMouseButton_": "imgui:1659",
-    "ImGuiMouseCursor_": "imgui:1664",
+    "ImGuiMouseCursor_": "imgui:1669",
-    "ImGuiMouseSource": "imgui:1683",
+    "ImGuiMouseSource": "imgui:1688",
-    "ImGuiNavHighlightFlags_": "imgui_internal:1519",
+    "ImGuiNavHighlightFlags_": "imgui_internal:1554",
-    "ImGuiNavItemData": "imgui_internal:1556",
+    "ImGuiNavItemData": "imgui_internal:1590",
-    "ImGuiNavLayer": "imgui_internal:1549",
+    "ImGuiNavLayer": "imgui_internal:1583",
-    "ImGuiNavMoveFlags_": "imgui_internal:1528",
+    "ImGuiNavMoveFlags_": "imgui_internal:1562",
-    "ImGuiNavTreeNodeData": "imgui_internal:1234",
+    "ImGuiNavTreeNodeData": "imgui_internal:1197",
-    "ImGuiNextItemData": "imgui_internal:1202",
+    "ImGuiNextItemData": "imgui_internal:1164",
-    "ImGuiNextItemDataFlags_": "imgui_internal:1195",
+    "ImGuiNextItemDataFlags_": "imgui_internal:1156",
-    "ImGuiNextWindowData": "imgui_internal:1168",
+    "ImGuiNextWindowData": "imgui_internal:1129",
-    "ImGuiNextWindowDataFlags_": "imgui_internal:1153",
+    "ImGuiNextWindowDataFlags_": "imgui_internal:1114",
-    "ImGuiOldColumnData": "imgui_internal:1634",
+    "ImGuiOldColumnData": "imgui_internal:1674",
-    "ImGuiOldColumnFlags_": "imgui_internal:1614",
+    "ImGuiOldColumnFlags_": "imgui_internal:1654",
-    "ImGuiOldColumns": "imgui_internal:1644",
+    "ImGuiOldColumns": "imgui_internal:1684",
-    "ImGuiOnceUponAFrame": "imgui:2334",
+    "ImGuiOnceUponAFrame": "imgui:2335",
-    "ImGuiPayload": "imgui:2299",
+    "ImGuiPayload": "imgui:2300",
-    "ImGuiPlatformImeData": "imgui:3147",
+    "ImGuiPlatformImeData": "imgui:3150",
     "ImGuiPlotType": "imgui_internal:982",
-    "ImGuiPopupData": "imgui_internal:1139",
+    "ImGuiPopupData": "imgui_internal:1291",
-    "ImGuiPopupFlags_": "imgui:1115",
+    "ImGuiPopupFlags_": "imgui:1118",
-    "ImGuiPopupPositionPolicy": "imgui_internal:988",
+    "ImGuiPopupPositionPolicy": "imgui_internal:1283",
-    "ImGuiPtrOrIndex": "imgui_internal:1273",
+    "ImGuiPtrOrIndex": "imgui_internal:1236",
-    "ImGuiScrollFlags_": "imgui_internal:1505",
+    "ImGuiScrollFlags_": "imgui_internal:1540",
     "ImGuiSelectableFlagsPrivate_": "imgui_internal:907",
-    "ImGuiSelectableFlags_": "imgui:1131",
+    "ImGuiSelectableFlags_": "imgui:1136",
     "ImGuiSeparatorFlags_": "imgui_internal:927",
-    "ImGuiSettingsHandler": "imgui_internal:1736",
+    "ImGuiSettingsHandler": "imgui_internal:1776",
-    "ImGuiShrinkWidthItem": "imgui_internal:1266",
+    "ImGuiShrinkWidthItem": "imgui_internal:1229",
-    "ImGuiSizeCallbackData": "imgui:2290",
+    "ImGuiSizeCallbackData": "imgui:2291",
     "ImGuiSliderFlagsPrivate_": "imgui_internal:900",
-    "ImGuiSliderFlags_": "imgui:1639",
+    "ImGuiSliderFlags_": "imgui:1644",
-    "ImGuiSortDirection_": "imgui:1293",
+    "ImGuiSortDirection_": "imgui:1298",
-    "ImGuiStackLevelInfo": "imgui_internal:1829",
+    "ImGuiStackLevelInfo": "imgui_internal:1872",
-    "ImGuiStackSizes": "imgui_internal:1241",
+    "ImGuiStackSizes": "imgui_internal:1204",
-    "ImGuiStorage": "imgui:2396",
+    "ImGuiStorage": "imgui:2397",
-    "ImGuiStoragePair": "imgui:2399",
+    "ImGuiStoragePair": "imgui:2400",
-    "ImGuiStyle": "imgui:1971",
+    "ImGuiStyle": "imgui:1976",
-    "ImGuiStyleMod": "imgui_internal:1033",
+    "ImGuiStyleMod": "imgui_internal:996",
-    "ImGuiStyleVar_": "imgui:1544",
+    "ImGuiStyleVar_": "imgui:1549",
-    "ImGuiTabBar": "imgui_internal:2600",
+    "ImGuiTabBar": "imgui_internal:2658",
-    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2565",
+    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2623",
-    "ImGuiTabBarFlags_": "imgui:1161",
+    "ImGuiTabBarFlags_": "imgui:1166",
-    "ImGuiTabItem": "imgui_internal:2581",
+    "ImGuiTabItem": "imgui_internal:2639",
-    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2573",
+    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2631",
-    "ImGuiTabItemFlags_": "imgui:1177",
+    "ImGuiTabItemFlags_": "imgui:1182",
-    "ImGuiTable": "imgui_internal:2735",
+    "ImGuiTable": "imgui_internal:2793",
-    "ImGuiTableBgTarget_": "imgui:1835",
+    "ImGuiTableBgTarget_": "imgui:1840",
-    "ImGuiTableCellData": "imgui_internal:2713",
+    "ImGuiTableCellData": "imgui_internal:2771",
-    "ImGuiTableColumn": "imgui_internal:2654",
+    "ImGuiTableColumn": "imgui_internal:2712",
-    "ImGuiTableColumnFlags_": "imgui:1782",
+    "ImGuiTableColumnFlags_": "imgui:1787",
-    "ImGuiTableColumnSettings": "imgui_internal:2880",
+    "ImGuiTableColumnSettings": "imgui_internal:2938",
-    "ImGuiTableColumnSortSpecs": "imgui:1857",
+    "ImGuiTableColumnSortSpecs": "imgui:1862",
-    "ImGuiTableFlags_": "imgui:1729",
+    "ImGuiTableFlags_": "imgui:1734",
-    "ImGuiTableInstanceData": "imgui_internal:2721",
+    "ImGuiTableInstanceData": "imgui_internal:2779",
-    "ImGuiTableRowFlags_": "imgui:1820",
+    "ImGuiTableRowFlags_": "imgui:1825",
-    "ImGuiTableSettings": "imgui_internal:2904",
+    "ImGuiTableSettings": "imgui_internal:2962",
-    "ImGuiTableSortSpecs": "imgui:1847",
+    "ImGuiTableSortSpecs": "imgui:1852",
-    "ImGuiTableTempData": "imgui_internal:2858",
+    "ImGuiTableTempData": "imgui_internal:2916",
-    "ImGuiTextBuffer": "imgui:2369",
+    "ImGuiTextBuffer": "imgui:2370",
-    "ImGuiTextFilter": "imgui:2342",
+    "ImGuiTextFilter": "imgui:2343",
     "ImGuiTextFlags_": "imgui_internal:945",
     "ImGuiTextIndex": "imgui_internal:722",
-    "ImGuiTextRange": "imgui:2352",
+    "ImGuiTextRange": "imgui:2353",
     "ImGuiTooltipFlags_": "imgui_internal:951",
     "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:921",
-    "ImGuiTreeNodeFlags_": "imgui:1081",
+    "ImGuiTreeNodeFlags_": "imgui:1084",
-    "ImGuiTypingSelectFlags_": "imgui_internal:1577",
+    "ImGuiTypingSelectFlags_": "imgui_internal:1617",
-    "ImGuiTypingSelectRequest": "imgui_internal:1585",
+    "ImGuiTypingSelectRequest": "imgui_internal:1625",
-    "ImGuiTypingSelectState": "imgui_internal:1596",
+    "ImGuiTypingSelectState": "imgui_internal:1636",
-    "ImGuiViewport": "imgui:3124",
+    "ImGuiViewport": "imgui:3126",
-    "ImGuiViewportFlags_": "imgui:3109",
+    "ImGuiViewportFlags_": "imgui:3111",
-    "ImGuiViewportP": "imgui_internal:1690",
+    "ImGuiViewportP": "imgui_internal:1730",
-    "ImGuiWindow": "imgui_internal:2438",
+    "ImGuiWindow": "imgui_internal:2495",
-    "ImGuiWindowFlags_": "imgui:987",
+    "ImGuiWindowFlags_": "imgui:990",
-    "ImGuiWindowSettings": "imgui_internal:1722",
+    "ImGuiWindowSettings": "imgui_internal:1762",
-    "ImGuiWindowStackData": "imgui_internal:1259",
+    "ImGuiWindowStackData": "imgui_internal:1222",
-    "ImGuiWindowTempData": "imgui_internal:2389",
+    "ImGuiWindowTempData": "imgui_internal:2445",
-    "ImRect": "imgui_internal:521",
+    "ImRect": "imgui_internal:524",
-    "ImVec1": "imgui_internal:503",
+    "ImVec1": "imgui_internal:506",
-    "ImVec2": "imgui:261",
+    "ImVec2": "imgui:263",
-    "ImVec2ih": "imgui_internal:511",
+    "ImVec2ih": "imgui_internal:514",
-    "ImVec4": "imgui:274",
+    "ImVec4": "imgui:276",
     "STB_TexteditState": "imstb_textedit:321",
     "StbTexteditRow": "imstb_textedit:368",
     "StbUndoRecord": "imstb_textedit:303",
@@ -5445,6 +5456,15 @@
         "name": "ActiveIdHasBeenEditedThisFrame",
         "type": "bool"
       },
+      {
+        "name": "ActiveIdFromShortcut",
+        "type": "bool"
+      },
+      {
+        "bitfield": "8",
+        "name": "ActiveIdMouseButton",
+        "type": "int"
+      },
       {
         "name": "ActiveIdClickOffset",
         "type": "ImVec2"
@@ -5457,10 +5477,6 @@
         "name": "ActiveIdSource",
         "type": "ImGuiInputSource"
       },
-      {
-        "name": "ActiveIdMouseButton",
-        "type": "int"
-      },
       {
         "name": "ActiveIdPreviousFrame",
         "type": "ImGuiID"
@@ -5497,6 +5513,10 @@
         "name": "LastKeyboardKeyPressTime",
         "type": "double"
       },
+      {
+        "name": "KeysMayBeCharInput",
+        "type": "ImBitArrayForNamedKeys"
+      },
       {
         "name": "KeysOwnerData[ImGuiKey_NamedKey_COUNT]",
         "size": 154,
@@ -5567,8 +5587,8 @@
       },
       {
         "name": "FocusScopeStack",
-        "template_type": "ImGuiID",
+        "template_type": "ImGuiFocusScopeData",
-        "type": "ImVector_ImGuiID"
+        "type": "ImVector_ImGuiFocusScopeData"
       },
       {
         "name": "ItemFlagsStack",
@@ -5595,10 +5615,6 @@
         "template_type": "ImGuiNavTreeNodeData",
         "type": "ImVector_ImGuiNavTreeNodeData"
       },
-      {
-        "name": "BeginMenuCount",
-        "type": "int"
-      },
       {
         "name": "Viewports",
         "template_type": "ImGuiViewportP*",
@@ -5616,6 +5632,11 @@
         "name": "NavFocusScopeId",
         "type": "ImGuiID"
       },
+      {
+        "name": "NavFocusRoute",
+        "template_type": "ImGuiFocusScopeData",
+        "type": "ImVector_ImGuiFocusScopeData"
+      },
       {
         "name": "NavActivateId",
         "type": "ImGuiID"
@@ -5632,6 +5653,14 @@
         "name": "NavActivateFlags",
         "type": "ImGuiActivateFlags"
       },
+      {
+        "name": "NavHighlightActivatedId",
+        "type": "ImGuiID"
+      },
+      {
+        "name": "NavHighlightActivatedTimer",
+        "type": "float"
+      },
       {
         "name": "NavJustMovedToId",
         "type": "ImGuiID"
@@ -5800,6 +5829,10 @@
         "name": "NavWindowingToggleLayer",
         "type": "bool"
       },
+      {
+        "name": "NavWindowingToggleKey",
+        "type": "ImGuiKey"
+      },
       {
         "name": "NavWindowingAccumDeltaPos",
         "type": "ImVec2"
@@ -5998,6 +6031,14 @@
         "name": "TempInputId",
         "type": "ImGuiID"
       },
+      {
+        "name": "BeginMenuDepth",
+        "type": "int"
+      },
+      {
+        "name": "BeginComboDepth",
+        "type": "int"
+      },
       {
         "name": "ColorEditOptions",
         "type": "ImGuiColorEditFlags"
@@ -6290,6 +6331,11 @@
         "name": "TempBuffer",
         "template_type": "char",
         "type": "ImVector_char"
+      },
+      {
+        "name": "TempKeychordName[64]",
+        "size": 64,
+        "type": "char"
       }
     ],
     "ImGuiContextHook": [
@@ -6386,6 +6432,16 @@
         "type": "ImGuiDebugAllocEntry"
       }
     ],
+    "ImGuiFocusScopeData": [
+      {
+        "name": "ID",
+        "type": "ImGuiID"
+      },
+      {
+        "name": "WindowID",
+        "type": "ImGuiID"
+      }
+    ],
     "ImGuiGroupData": [
       {
         "name": "WindowID",
@@ -6688,10 +6744,6 @@
         "name": "MouseDelta",
         "type": "ImVec2"
       },
-      {
-        "name": "_UnusedPadding",
-        "type": "void*"
-      },
       {
         "name": "Ctx",
         "type": "ImGuiContext*"
@@ -7066,6 +7118,18 @@
       {
         "name": "Flags",
         "type": "ImGuiInputTextFlags"
+      },
+      {
+        "name": "ReloadUserBuf",
+        "type": "bool"
+      },
+      {
+        "name": "ReloadSelectionStart",
+        "type": "int"
+      },
+      {
+        "name": "ReloadSelectionEnd",
+        "type": "int"
       }
     ],
     "ImGuiKeyData": [
@@ -7113,6 +7177,10 @@
         "name": "Mods",
         "type": "ImU16"
       },
+      {
+        "name": "RoutingCurrScore",
+        "type": "ImU8"
+      },
       {
         "name": "RoutingNextScore",
         "type": "ImU8"
@@ -7337,6 +7405,14 @@
       {
         "name": "ShowTablesRectsType",
         "type": "int"
+      },
+      {
+        "name": "HighlightMonitorIdx",
+        "type": "int"
+      },
+      {
+        "name": "HighlightViewportID",
+        "type": "ImGuiID"
       }
     ],
     "ImGuiNavItemData": [
@@ -7400,21 +7476,26 @@
         "name": "ItemFlags",
         "type": "ImGuiItemFlags"
       },
-      {
-        "name": "Width",
-        "type": "float"
-      },
       {
         "name": "SelectionUserData",
         "type": "ImGuiSelectionUserData"
       },
       {
-        "name": "OpenCond",
+        "name": "Width",
-        "type": "ImGuiCond"
+        "type": "float"
+      },
+      {
+        "name": "Shortcut",
+        "type": "ImGuiKeyChord"
       },
       {
         "name": "OpenVal",
         "type": "bool"
+      },
+      {
+        "bitfield": "8",
+        "name": "OpenCond",
+        "type": "ImGuiCond"
       }
     ],
     "ImGuiNextWindowData": [
@@ -8991,7 +9072,7 @@
         "type": "float"
       },
       {
-        "name": "AngledheadersExtraWidth",
+        "name": "AngledHeadersExtraWidth",
         "type": "float"
       },
       {
@@ -9133,6 +9214,10 @@
       }
     ],
     "ImGuiViewport": [
+      {
+        "name": "ID",
+        "type": "ImGuiID"
+      },
       {
         "name": "Flags",
         "type": "ImGuiViewportFlags"
@@ -9564,6 +9649,10 @@
         "name": "RootWindowForNav",
         "type": "ImGuiWindow*"
       },
+      {
+        "name": "ParentWindowForFocusRoute",
+        "type": "ImGuiWindow*"
+      },
       {
         "name": "NavLastChildNavWindow",
         "type": "ImGuiWindow*"
@@ -9774,6 +9863,10 @@
         "name": "ParentLayoutType",
         "type": "ImGuiLayoutType"
       },
+      {
+        "name": "ModalDimBgColor",
+        "type": "ImU32"
+      },
       {
         "name": "ItemWidth",
         "type": "float"
@@ -10086,6 +10179,7 @@
       "ImFontGlyph": true,
       "ImGuiColorMod": true,
       "ImGuiContextHook": true,
+      "ImGuiFocusScopeData": true,
       "ImGuiGroupData": true,
       "ImGuiID": true,
       "ImGuiInputEvent": true,

generator/output/typedefs_dict.json

@@ -50,6 +50,7 @@
   "ImGuiDragDropFlags": "int",
   "ImGuiErrorLogCallback": "void(*)(void* user_data,const char* fmt,...);",
   "ImGuiFocusRequestFlags": "int",
+  "ImGuiFocusScopeData": "struct ImGuiFocusScopeData",
   "ImGuiFocusedFlags": "int",
   "ImGuiGroupData": "struct ImGuiGroupData",
   "ImGuiHoveredFlags": "int",

generator/output/typedefs_dict.lua

@@ -50,6 +50,7 @@ defs["ImGuiDir"] = "int"
 defs["ImGuiDragDropFlags"] = "int"
 defs["ImGuiErrorLogCallback"] = "void(*)(void* user_data,const char* fmt,...);"
 defs["ImGuiFocusRequestFlags"] = "int"
+defs["ImGuiFocusScopeData"] = "struct ImGuiFocusScopeData"
 defs["ImGuiFocusedFlags"] = "int"
 defs["ImGuiGroupData"] = "struct ImGuiGroupData"
 defs["ImGuiHoveredFlags"] = "int"