pull imgui 1.86 and generate

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.85 of Dear ImGui with internal api]
+* currently this wrapper is based on version [1.86 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.85" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.86" from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 //docking branch
 
@@ -1441,10 +1441,6 @@ CIMGUI_API ImGuiStorage* igGetStateStorage()
 {
     return ImGui::GetStateStorage();
 }
-CIMGUI_API void igCalcListClipping(int items_count,float items_height,int* out_items_display_start,int* out_items_display_end)
-{
-    return ImGui::CalcListClipping(items_count,items_height,out_items_display_start,out_items_display_end);
-}
 CIMGUI_API bool igBeginChildFrame(ImGuiID id,const ImVec2 size,ImGuiWindowFlags flags)
 {
     return ImGui::BeginChildFrame(id,size,flags);
@@ -1513,6 +1509,10 @@ CIMGUI_API bool igIsMouseDoubleClicked(ImGuiMouseButton button)
 {
     return ImGui::IsMouseDoubleClicked(button);
 }
+CIMGUI_API int igGetMouseClickedCount(ImGuiMouseButton button)
+{
+    return ImGui::GetMouseClickedCount(button);
+}
 CIMGUI_API bool igIsMouseHoveringRect(const ImVec2 r_min,const ImVec2 r_max,bool clip)
 {
     return ImGui::IsMouseHoveringRect(r_min,r_max,clip);
@@ -1941,6 +1941,10 @@ CIMGUI_API bool ImGuiListClipper_Step(ImGuiListClipper* self)
 {
     return self->Step();
 }
+CIMGUI_API void ImGuiListClipper_ForceDisplayRangeByIndices(ImGuiListClipper* self,int item_min,int item_max)
+{
+    return self->ForceDisplayRangeByIndices(item_min,item_max);
+}
 CIMGUI_API ImColor* ImColor_ImColor_Nil(void)
 {
     return IM_NEW(ImColor)();
@@ -2577,6 +2581,10 @@ CIMGUI_API ImGuiID igImHashStr(const char* data,size_t data_size,ImU32 seed)
 {
     return ImHashStr(data,data_size,seed);
 }
+CIMGUI_API void igImQsort(void* base,size_t count,size_t size_of_element,int(*compare_func)(void const*,void const*))
+{
+    return ImQsort(base,count,size_of_element,compare_func);
+}
 CIMGUI_API ImU32 igImAlphaBlendColors(ImU32 col_a,ImU32 col_b)
 {
     return ImAlphaBlendColors(col_a,col_b);
@@ -2845,6 +2853,10 @@ CIMGUI_API void igImMul(ImVec2 *pOut,const ImVec2 lhs,const ImVec2 rhs)
 {
     *pOut = ImMul(lhs,rhs);
 }
+CIMGUI_API bool igImIsFloatAboveGuaranteedIntegerPrecision(float f)
+{
+    return ImIsFloatAboveGuaranteedIntegerPrecision(f);
+}
 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);
@@ -3265,6 +3277,26 @@ CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndex_Int(int index)
 {
     return IM_NEW(ImGuiPtrOrIndex)(index);
 }
+CIMGUI_API ImGuiListClipperRange ImGuiListClipperRange_FromIndices(int min,int max)
+{
+    return ImGuiListClipperRange::FromIndices(min,max);
+}
+CIMGUI_API ImGuiListClipperRange ImGuiListClipperRange_FromPositions(float y1,float y2,int off_min,int off_max)
+{
+    return ImGuiListClipperRange::FromPositions(y1,y2,off_min,off_max);
+}
+CIMGUI_API ImGuiListClipperData* ImGuiListClipperData_ImGuiListClipperData(void)
+{
+    return IM_NEW(ImGuiListClipperData)();
+}
+CIMGUI_API void ImGuiListClipperData_destroy(ImGuiListClipperData* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImGuiListClipperData_Reset(ImGuiListClipperData* self,ImGuiListClipper* clipper)
+{
+    return self->Reset(clipper);
+}
 CIMGUI_API ImGuiNavItemData* ImGuiNavItemData_ImGuiNavItemData(void)
 {
     return IM_NEW(ImGuiNavItemData)();
@@ -3609,6 +3641,10 @@ CIMGUI_API bool igIsWindowChildOf(ImGuiWindow* window,ImGuiWindow* potential_par
 {
     return ImGui::IsWindowChildOf(window,potential_parent,popup_hierarchy,dock_hierarchy);
 }
+CIMGUI_API bool igIsWindowWithinBeginStackOf(ImGuiWindow* window,ImGuiWindow* potential_parent)
+{
+    return ImGui::IsWindowWithinBeginStackOf(window,potential_parent);
+}
 CIMGUI_API bool igIsWindowAbove(ImGuiWindow* potential_above,ImGuiWindow* potential_below)
 {
     return ImGui::IsWindowAbove(potential_above,potential_below);
@@ -3633,6 +3669,14 @@ CIMGUI_API void igSetWindowHitTestHole(ImGuiWindow* window,const ImVec2 pos,cons
 {
     return ImGui::SetWindowHitTestHole(window,pos,size);
 }
+CIMGUI_API void igWindowRectAbsToRel(ImRect *pOut,ImGuiWindow* window,const ImRect r)
+{
+    *pOut = ImGui::WindowRectAbsToRel(window,r);
+}
+CIMGUI_API void igWindowRectRelToAbs(ImRect *pOut,ImGuiWindow* window,const ImRect r)
+{
+    *pOut = ImGui::WindowRectRelToAbs(window,r);
+}
 CIMGUI_API void igFocusWindow(ImGuiWindow* window)
 {
     return ImGui::FocusWindow(window);
@@ -3653,6 +3697,18 @@ CIMGUI_API void igBringWindowToDisplayBack(ImGuiWindow* window)
 {
     return ImGui::BringWindowToDisplayBack(window);
 }
+CIMGUI_API void igBringWindowToDisplayBehind(ImGuiWindow* window,ImGuiWindow* above_window)
+{
+    return ImGui::BringWindowToDisplayBehind(window,above_window);
+}
+CIMGUI_API int igFindWindowDisplayIndex(ImGuiWindow* window)
+{
+    return ImGui::FindWindowDisplayIndex(window);
+}
+CIMGUI_API ImGuiWindow* igFindBottomMostVisibleWindowWithinBeginStack(ImGuiWindow* window)
+{
+    return ImGui::FindBottomMostVisibleWindowWithinBeginStack(window);
+}
 CIMGUI_API void igSetCurrentFont(ImFont* font)
 {
     return ImGui::SetCurrentFont(font);
@@ -3861,10 +3917,6 @@ CIMGUI_API bool igItemHoverable(const ImRect bb,ImGuiID id)
 {
     return ImGui::ItemHoverable(bb,id);
 }
-CIMGUI_API void igItemInputable(ImGuiWindow* window,ImGuiID id)
-{
-    return ImGui::ItemInputable(window,id);
-}
 CIMGUI_API bool igIsClippedEx(const ImRect bb,ImGuiID id)
 {
     return ImGui::IsClippedEx(bb,id);
@@ -3949,9 +4001,9 @@ CIMGUI_API bool igBeginPopupEx(ImGuiID id,ImGuiWindowFlags extra_flags)
 {
     return ImGui::BeginPopupEx(id,extra_flags);
 }
-CIMGUI_API void igBeginTooltipEx(ImGuiWindowFlags extra_flags,ImGuiTooltipFlags tooltip_flags)
+CIMGUI_API void igBeginTooltipEx(ImGuiTooltipFlags tooltip_flags,ImGuiWindowFlags extra_window_flags)
 {
-    return ImGui::BeginTooltipEx(extra_flags,tooltip_flags);
+    return ImGui::BeginTooltipEx(tooltip_flags,extra_window_flags);
 }
 CIMGUI_API void igGetPopupAllowedExtentRect(ImRect *pOut,ImGuiWindow* window)
 {
@@ -3961,6 +4013,10 @@ CIMGUI_API ImGuiWindow* igGetTopMostPopupModal()
 {
     return ImGui::GetTopMostPopupModal();
 }
+CIMGUI_API ImGuiWindow* igGetTopMostAndVisiblePopupModal()
+{
+    return ImGui::GetTopMostAndVisiblePopupModal();
+}
 CIMGUI_API void igFindBestWindowPosForPopup(ImVec2 *pOut,ImGuiWindow* window)
 {
     *pOut = ImGui::FindBestWindowPosForPopup(window);
@@ -4013,9 +4069,9 @@ CIMGUI_API void igNavMoveRequestForward(ImGuiDir move_dir,ImGuiDir clip_dir,ImGu
 {
     return ImGui::NavMoveRequestForward(move_dir,clip_dir,move_flags,scroll_flags);
 }
-CIMGUI_API void igNavMoveRequestResolveWithLastItem()
+CIMGUI_API void igNavMoveRequestResolveWithLastItem(ImGuiNavItemData* result)
 {
-    return ImGui::NavMoveRequestResolveWithLastItem();
+    return ImGui::NavMoveRequestResolveWithLastItem(result);
 }
 CIMGUI_API void igNavMoveRequestCancel()
 {
@@ -4129,6 +4185,10 @@ CIMGUI_API void igDockContextNewFrameUpdateDocking(ImGuiContext* ctx)
 {
     return ImGui::DockContextNewFrameUpdateDocking(ctx);
 }
+CIMGUI_API void igDockContextEndFrame(ImGuiContext* ctx)
+{
+    return ImGui::DockContextEndFrame(ctx);
+}
 CIMGUI_API ImGuiID igDockContextGenNodeID(ImGuiContext* ctx)
 {
     return ImGui::DockContextGenNodeID(ctx);
@@ -4161,6 +4221,10 @@ CIMGUI_API ImGuiDockNode* igDockNodeGetRootNode(ImGuiDockNode* node)
 {
     return ImGui::DockNodeGetRootNode(node);
 }
+CIMGUI_API bool igDockNodeIsInHierarchyOf(ImGuiDockNode* node,ImGuiDockNode* parent)
+{
+    return ImGui::DockNodeIsInHierarchyOf(node,parent);
+}
 CIMGUI_API int igDockNodeGetDepth(const ImGuiDockNode* node)
 {
     return ImGui::DockNodeGetDepth(node);
@@ -4605,6 +4669,10 @@ CIMGUI_API void igRenderRectFilledWithHole(ImDrawList* draw_list,ImRect outer,Im
 {
     return ImGui::RenderRectFilledWithHole(draw_list,outer,inner,col,rounding);
 }
+CIMGUI_API ImDrawFlags igCalcRoundingFlagsForRectInRect(const ImRect r_in,const ImRect r_outer,float threshold)
+{
+    return ImGui::CalcRoundingFlagsForRectInRect(r_in,r_outer,threshold);
+}
 CIMGUI_API void igTextEx(const char* text,const char* text_end,ImGuiTextFlags flags)
 {
     return ImGui::TextEx(text,text_end,flags);
@@ -4629,7 +4697,7 @@ CIMGUI_API void igScrollbar(ImGuiAxis axis)
 {
     return ImGui::Scrollbar(axis);
 }
-CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* p_scroll_v,float avail_v,float contents_v,ImDrawFlags flags)
+CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,ImS64* p_scroll_v,ImS64 avail_v,ImS64 contents_v,ImDrawFlags flags)
 {
     return ImGui::ScrollbarEx(bb,id,axis,p_scroll_v,avail_v,contents_v,flags);
 }
@@ -4677,9 +4745,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)
 {
@@ -4845,6 +4913,10 @@ CIMGUI_API void igDebugNodeWindowsList(ImVector_ImGuiWindowPtr* windows,const ch
 {
     return ImGui::DebugNodeWindowsList(windows,label);
 }
+CIMGUI_API void igDebugNodeWindowsListByBeginStackParent(ImGuiWindow** windows,int windows_size,ImGuiWindow* parent_in_begin_stack)
+{
+    return ImGui::DebugNodeWindowsListByBeginStackParent(windows,windows_size,parent_in_begin_stack);
+}
 CIMGUI_API void igDebugNodeViewport(ImGuiViewportP* viewport)
 {
     return ImGui::DebugNodeViewport(viewport);

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.85" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.86" from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 //docking branch
 #ifndef CIMGUI_INCLUDED
@@ -46,6 +46,8 @@ typedef struct ImGuiStackTool ImGuiStackTool;
 typedef struct ImGuiStackLevelInfo ImGuiStackLevelInfo;
 typedef struct ImGuiViewportP ImGuiViewportP;
 typedef struct ImGuiWindowDockStyle ImGuiWindowDockStyle;
+typedef struct ImGuiListClipperData ImGuiListClipperData;
+typedef struct ImGuiListClipperRange ImGuiListClipperRange;
 typedef struct ImGuiPtrOrIndex ImGuiPtrOrIndex;
 typedef struct ImGuiShrinkWidthItem ImGuiShrinkWidthItem;
 typedef struct ImGuiWindowStackData ImGuiWindowStackData;
@@ -297,6 +299,8 @@ typedef struct ImVector_ImGuiDockRequest {int Size;int Capacity;ImGuiDockRequest
 typedef struct ImVector_ImGuiGroupData {int Size;int Capacity;ImGuiGroupData* Data;} ImVector_ImGuiGroupData;
 typedef struct ImVector_ImGuiID {int Size;int Capacity;ImGuiID* Data;} ImVector_ImGuiID;
 typedef struct ImVector_ImGuiItemFlags {int Size;int Capacity;ImGuiItemFlags* Data;} ImVector_ImGuiItemFlags;
+typedef struct ImVector_ImGuiListClipperData {int Size;int Capacity;ImGuiListClipperData* Data;} ImVector_ImGuiListClipperData;
+typedef struct ImVector_ImGuiListClipperRange {int Size;int Capacity;ImGuiListClipperRange* Data;} ImVector_ImGuiListClipperRange;
 typedef struct ImVector_ImGuiOldColumnData {int Size;int Capacity;ImGuiOldColumnData* Data;} ImVector_ImGuiOldColumnData;
 typedef struct ImVector_ImGuiOldColumns {int Size;int Capacity;ImGuiOldColumns* Data;} ImVector_ImGuiOldColumns;
 typedef struct ImVector_ImGuiPlatformMonitor {int Size;int Capacity;ImGuiPlatformMonitor* Data;} ImVector_ImGuiPlatformMonitor;
@@ -973,10 +977,11 @@ struct ImGuiIO
     double MouseClickedTime[5];
     bool MouseClicked[5];
     bool MouseDoubleClicked[5];
+    ImU16 MouseClickedCount[5];
+    ImU16 MouseClickedLastCount[5];
     bool MouseReleased[5];
     bool MouseDownOwned[5];
     bool MouseDownOwnedUnlessPopupClose[5];
-    bool MouseDownWasDoubleClick[5];
     float MouseDownDuration[5];
     float MouseDownDurationPrev[5];
     ImVec2 MouseDragMaxDistanceAbs[5];
@@ -1084,10 +1089,9 @@ struct ImGuiListClipper
     int DisplayStart;
     int DisplayEnd;
     int ItemsCount;
-    int StepNo;
-    int ItemsFrozen;
     float ItemsHeight;
     float StartPosY;
+    void* TempData;
 };
 struct ImColor
 {
@@ -1614,8 +1618,6 @@ struct ImGuiInputTextState
     bool SelectedAllMouseLock;
     bool Edited;
     ImGuiInputTextFlags Flags;
-    ImGuiInputTextCallback UserCallback;
-    void* UserCallbackData;
 };
 struct ImGuiPopupData
 {
@@ -1714,6 +1716,22 @@ struct ImGuiPtrOrIndex
     void* Ptr;
     int Index;
 };
+struct ImGuiListClipperRange
+{
+    int Min;
+    int Max;
+    bool PosToIndexConvert;
+    ImS8 PosToIndexOffsetMin;
+    ImS8 PosToIndexOffsetMax;
+};
+struct ImGuiListClipperData
+{
+    ImGuiListClipper* ListClipper;
+    float LossynessOffset;
+    int StepNo;
+    int ItemsFrozen;
+    ImVector_ImGuiListClipperRange Ranges;
+};
 typedef enum {
     ImGuiActivateFlags_None = 0,
     ImGuiActivateFlags_PreferInput = 1 << 0,
@@ -1741,9 +1759,10 @@ typedef enum {
 }ImGuiNavHighlightFlags_;
 typedef enum {
     ImGuiNavDirSourceFlags_None = 0,
-    ImGuiNavDirSourceFlags_Keyboard = 1 << 0,
+    ImGuiNavDirSourceFlags_RawKeyboard = 1 << 0,
-    ImGuiNavDirSourceFlags_PadDPad = 1 << 1,
+    ImGuiNavDirSourceFlags_Keyboard = 1 << 1,
-    ImGuiNavDirSourceFlags_PadLStick = 1 << 2
+    ImGuiNavDirSourceFlags_PadDPad = 1 << 2,
+    ImGuiNavDirSourceFlags_PadLStick = 1 << 3
 }ImGuiNavDirSourceFlags_;
 typedef enum {
     ImGuiNavMoveFlags_None = 0,
@@ -1756,9 +1775,10 @@ typedef enum {
     ImGuiNavMoveFlags_ScrollToEdgeY = 1 << 6,
     ImGuiNavMoveFlags_Forwarded = 1 << 7,
     ImGuiNavMoveFlags_DebugNoResult = 1 << 8,
-    ImGuiNavMoveFlags_Tabbing = 1 << 9,
+    ImGuiNavMoveFlags_FocusApi = 1 << 9,
-    ImGuiNavMoveFlags_Activate = 1 << 10,
+    ImGuiNavMoveFlags_Tabbing = 1 << 10,
-    ImGuiNavMoveFlags_DontSetNavHighlight = 1 << 11
+    ImGuiNavMoveFlags_Activate = 1 << 11,
+    ImGuiNavMoveFlags_DontSetNavHighlight = 1 << 12
 }ImGuiNavMoveFlags_;
 typedef enum {
     ImGuiNavLayer_Main = 0,
@@ -1858,6 +1878,7 @@ struct ImGuiDockNode
     ImVec2 SizeRef;
     ImGuiAxis SplitAxis;
     ImGuiWindowClass WindowClass;
+    ImU32 LastBgColor;
     ImGuiWindow* HostWindow;
     ImGuiWindow* VisibleWindow;
     ImGuiDockNode* CentralNode;
@@ -1874,6 +1895,7 @@ struct ImGuiDockNode
     ImGuiDataAuthority AuthorityForViewport :3;
     bool IsVisible :1;
     bool IsFocused :1;
+    bool IsBgDrawnThisFrame :1;
     bool HasCloseButton :1;
     bool HasWindowMenuButton :1;
     bool HasCentralNodeChild :1;
@@ -1882,7 +1904,6 @@ struct ImGuiDockNode
     bool WantMouseMove :1;
     bool WantHiddenTabBarUpdate :1;
     bool WantHiddenTabBarToggle :1;
-    bool MarkedForPosSizeWrite :1;
 };
 typedef enum {
     ImGuiWindowDockStyleCol_Text,
@@ -2072,6 +2093,7 @@ struct ImGuiContext
     ImVector_ImGuiGroupData GroupStack;
     ImVector_ImGuiPopupData OpenPopupStack;
     ImVector_ImGuiPopupData BeginPopupStack;
+    int BeginMenuCount;
     ImVector_ImGuiViewportPPtr Viewports;
     float CurrentDpiScale;
     ImGuiViewportP* CurrentViewport;
@@ -2088,7 +2110,6 @@ struct ImGuiContext
     ImGuiID NavActivatePressedId;
     ImGuiID NavActivateInputId;
     ImGuiActivateFlags NavActivateFlags;
-    ImGuiID NavJustTabbedId;
     ImGuiID NavJustMovedToId;
     ImGuiID NavJustMovedToFocusScopeId;
     ImGuiKeyModFlags NavJustMovedToKeyMods;
@@ -2096,7 +2117,6 @@ struct ImGuiContext
     ImGuiActivateFlags NavNextActivateFlags;
     ImGuiInputSource NavInputSource;
     ImGuiNavLayer NavLayer;
-    int NavIdTabCounter;
     bool NavIdIsAlive;
     bool NavMousePosDirty;
     bool NavDisableHighlight;
@@ -2116,22 +2136,20 @@ struct ImGuiContext
     ImGuiDir NavMoveDirForDebug;
     ImGuiDir NavMoveClipDir;
     ImRect NavScoringRect;
+    ImRect NavScoringNoClipRect;
     int NavScoringDebugCount;
-    int NavTabbingInputableRemaining;
+    int NavTabbingDir;
+    int NavTabbingCounter;
     ImGuiNavItemData NavMoveResultLocal;
     ImGuiNavItemData NavMoveResultLocalVisible;
     ImGuiNavItemData NavMoveResultOther;
+    ImGuiNavItemData NavTabbingResultFirst;
     ImGuiWindow* NavWindowingTarget;
     ImGuiWindow* NavWindowingTargetAnim;
     ImGuiWindow* NavWindowingListWindow;
     float NavWindowingTimer;
     float NavWindowingHighlightAlpha;
     bool NavWindowingToggleLayer;
-    ImGuiWindow* TabFocusRequestCurrWindow;
-    ImGuiWindow* TabFocusRequestNextWindow;
-    int TabFocusRequestCurrCounterTabStop;
-    int TabFocusRequestNextCounterTabStop;
-    bool TabFocusPressed;
     float DimBgRatio;
     ImGuiMouseCursor MouseCursor;
     bool DragDropActive;
@@ -2151,10 +2169,12 @@ struct ImGuiContext
     ImGuiID DragDropHoldJustPressedId;
     ImVector_unsigned_char DragDropPayloadBufHeap;
     unsigned char DragDropPayloadBufLocal[16];
+    int ClipperTempDataStacked;
+    ImVector_ImGuiListClipperData ClipperTempData;
     ImGuiTable* CurrentTable;
-    int CurrentTableStackIdx;
+    int TablesTempDataStacked;
+    ImVector_ImGuiTableTempData TablesTempData;
     ImPool_ImGuiTable Tables;
-    ImVector_ImGuiTableTempData TablesTempDataStack;
     ImVector_float TablesLastTimeActive;
     ImVector_ImDrawChannel DrawChannelsTempMergeBuffer;
     ImGuiTabBar* CurrentTabBar;
@@ -2234,6 +2254,7 @@ struct ImGuiWindowTempData
     ImVec1 Indent;
     ImVec1 ColumnsOffset;
     ImVec1 GroupOffset;
+    ImVec2 CursorStartPosLossyness;
     ImGuiNavLayer NavLayerCurrent;
     short NavLayersActiveMask;
     short NavLayersActiveMaskNext;
@@ -2251,7 +2272,6 @@ struct ImGuiWindowTempData
     int CurrentTableIdx;
     ImGuiLayoutType LayoutType;
     ImGuiLayoutType ParentLayoutType;
-    int FocusCounterTabStop;
     float ItemWidth;
     float TextWrapPos;
     ImVector_float ItemWidthStack;
@@ -2296,6 +2316,7 @@ struct ImGuiWindow
     bool Appearing;
     bool Hidden;
     bool IsFallbackWindow;
+    bool IsExplicitChild;
     bool HasCloseButton;
     signed char ResizeBorderHeld;
     short BeginCount;
@@ -2340,6 +2361,7 @@ struct ImGuiWindow
     ImDrawList* DrawList;
     ImDrawList DrawListInst;
     ImGuiWindow* ParentWindow;
+    ImGuiWindow* ParentWindowInBeginStack;
     ImGuiWindow* RootWindow;
     ImGuiWindow* RootWindowPopupTree;
     ImGuiWindow* RootWindowDockTree;
@@ -2656,6 +2678,8 @@ typedef ImVector<ImGuiDockRequest> ImVector_ImGuiDockRequest;
 typedef ImVector<ImGuiGroupData> ImVector_ImGuiGroupData;
 typedef ImVector<ImGuiID> ImVector_ImGuiID;
 typedef ImVector<ImGuiItemFlags> ImVector_ImGuiItemFlags;
+typedef ImVector<ImGuiListClipperData> ImVector_ImGuiListClipperData;
+typedef ImVector<ImGuiListClipperRange> ImVector_ImGuiListClipperRange;
 typedef ImVector<ImGuiOldColumnData> ImVector_ImGuiOldColumnData;
 typedef ImVector<ImGuiOldColumns> ImVector_ImGuiOldColumns;
 typedef ImVector<ImGuiPlatformMonitor> ImVector_ImGuiPlatformMonitor;
@@ -3032,7 +3056,6 @@ CIMGUI_API ImDrawListSharedData* igGetDrawListSharedData(void);
 CIMGUI_API const char* igGetStyleColorName(ImGuiCol idx);
 CIMGUI_API void igSetStateStorage(ImGuiStorage* storage);
 CIMGUI_API ImGuiStorage* igGetStateStorage(void);
-CIMGUI_API void igCalcListClipping(int items_count,float items_height,int* out_items_display_start,int* out_items_display_end);
 CIMGUI_API bool igBeginChildFrame(ImGuiID id,const ImVec2 size,ImGuiWindowFlags flags);
 CIMGUI_API void igEndChildFrame(void);
 CIMGUI_API void igCalcTextSize(ImVec2 *pOut,const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width);
@@ -3050,6 +3073,7 @@ CIMGUI_API bool igIsMouseDown(ImGuiMouseButton button);
 CIMGUI_API bool igIsMouseClicked(ImGuiMouseButton button,bool repeat);
 CIMGUI_API bool igIsMouseReleased(ImGuiMouseButton button);
 CIMGUI_API bool igIsMouseDoubleClicked(ImGuiMouseButton button);
+CIMGUI_API int igGetMouseClickedCount(ImGuiMouseButton button);
 CIMGUI_API bool igIsMouseHoveringRect(const ImVec2 r_min,const ImVec2 r_max,bool clip);
 CIMGUI_API bool igIsMousePosValid(const ImVec2* mouse_pos);
 CIMGUI_API bool igIsAnyMouseDown(void);
@@ -3157,6 +3181,7 @@ CIMGUI_API void ImGuiListClipper_destroy(ImGuiListClipper* self);
 CIMGUI_API void ImGuiListClipper_Begin(ImGuiListClipper* self,int items_count,float items_height);
 CIMGUI_API void ImGuiListClipper_End(ImGuiListClipper* self);
 CIMGUI_API bool ImGuiListClipper_Step(ImGuiListClipper* self);
+CIMGUI_API void ImGuiListClipper_ForceDisplayRangeByIndices(ImGuiListClipper* self,int item_min,int item_max);
 CIMGUI_API ImColor* ImColor_ImColor_Nil(void);
 CIMGUI_API void ImColor_destroy(ImColor* self);
 CIMGUI_API ImColor* ImColor_ImColor_Int(int r,int g,int b,int a);
@@ -3316,6 +3341,7 @@ CIMGUI_API ImGuiPlatformMonitor* ImGuiPlatformMonitor_ImGuiPlatformMonitor(void)
 CIMGUI_API void ImGuiPlatformMonitor_destroy(ImGuiPlatformMonitor* self);
 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 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);
 CIMGUI_API bool igImIsPowerOfTwo_U64(ImU64 v);
@@ -3382,6 +3408,7 @@ CIMGUI_API float igImDot(const ImVec2 a,const ImVec2 b);
 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 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);
@@ -3487,6 +3514,11 @@ CIMGUI_API void ImGuiStackSizes_CompareWithCurrentState(ImGuiStackSizes* self);
 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 ImGuiListClipperRange ImGuiListClipperRange_FromIndices(int min,int max);
+CIMGUI_API ImGuiListClipperRange ImGuiListClipperRange_FromPositions(float y1,float y2,int off_min,int off_max);
+CIMGUI_API ImGuiListClipperData* ImGuiListClipperData_ImGuiListClipperData(void);
+CIMGUI_API void ImGuiListClipperData_destroy(ImGuiListClipperData* self);
+CIMGUI_API void ImGuiListClipperData_Reset(ImGuiListClipperData* self,ImGuiListClipper* clipper);
 CIMGUI_API ImGuiNavItemData* ImGuiNavItemData_ImGuiNavItemData(void);
 CIMGUI_API void ImGuiNavItemData_destroy(ImGuiNavItemData* self);
 CIMGUI_API void ImGuiNavItemData_Clear(ImGuiNavItemData* self);
@@ -3573,17 +3605,23 @@ CIMGUI_API ImGuiWindow* igFindWindowByName(const char* name);
 CIMGUI_API void igUpdateWindowParentAndRootLinks(ImGuiWindow* window,ImGuiWindowFlags flags,ImGuiWindow* parent_window);
 CIMGUI_API void igCalcWindowNextAutoFitSize(ImVec2 *pOut,ImGuiWindow* window);
 CIMGUI_API bool igIsWindowChildOf(ImGuiWindow* window,ImGuiWindow* potential_parent,bool popup_hierarchy,bool dock_hierarchy);
+CIMGUI_API bool igIsWindowWithinBeginStackOf(ImGuiWindow* window,ImGuiWindow* potential_parent);
 CIMGUI_API bool igIsWindowAbove(ImGuiWindow* potential_above,ImGuiWindow* potential_below);
 CIMGUI_API bool igIsWindowNavFocusable(ImGuiWindow* window);
 CIMGUI_API void igSetWindowPos_WindowPtr(ImGuiWindow* window,const ImVec2 pos,ImGuiCond cond);
 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 igWindowRectAbsToRel(ImRect *pOut,ImGuiWindow* window,const ImRect r);
+CIMGUI_API void igWindowRectRelToAbs(ImRect *pOut,ImGuiWindow* window,const ImRect r);
 CIMGUI_API void igFocusWindow(ImGuiWindow* window);
 CIMGUI_API void igFocusTopMostWindowUnderOne(ImGuiWindow* under_this_window,ImGuiWindow* ignore_window);
 CIMGUI_API void igBringWindowToFocusFront(ImGuiWindow* window);
 CIMGUI_API void igBringWindowToDisplayFront(ImGuiWindow* window);
 CIMGUI_API void igBringWindowToDisplayBack(ImGuiWindow* window);
+CIMGUI_API void igBringWindowToDisplayBehind(ImGuiWindow* window,ImGuiWindow* above_window);
+CIMGUI_API int igFindWindowDisplayIndex(ImGuiWindow* window);
+CIMGUI_API ImGuiWindow* igFindBottomMostVisibleWindowWithinBeginStack(ImGuiWindow* window);
 CIMGUI_API void igSetCurrentFont(ImFont* font);
 CIMGUI_API ImFont* igGetDefaultFont(void);
 CIMGUI_API ImDrawList* igGetForegroundDrawList_WindowPtr(ImGuiWindow* window);
@@ -3636,7 +3674,6 @@ 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 void igItemInputable(ImGuiWindow* window,ImGuiID id);
 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);
@@ -3658,9 +3695,10 @@ 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(ImGuiWindowFlags extra_flags,ImGuiTooltipFlags tooltip_flags);
+CIMGUI_API void igBeginTooltipEx(ImGuiTooltipFlags tooltip_flags,ImGuiWindowFlags extra_window_flags);
 CIMGUI_API void igGetPopupAllowedExtentRect(ImRect *pOut,ImGuiWindow* window);
 CIMGUI_API ImGuiWindow* igGetTopMostPopupModal(void);
+CIMGUI_API ImGuiWindow* igGetTopMostAndVisiblePopupModal(void);
 CIMGUI_API void igFindBestWindowPosForPopup(ImVec2 *pOut,ImGuiWindow* window);
 CIMGUI_API void igFindBestWindowPosForPopupEx(ImVec2 *pOut,const ImVec2 ref_pos,const ImVec2 size,ImGuiDir* last_dir,const ImRect r_outer,const ImRect r_avoid,ImGuiPopupPositionPolicy policy);
 CIMGUI_API bool igBeginViewportSideBar(const char* name,ImGuiViewport* viewport,ImGuiDir dir,float size,ImGuiWindowFlags window_flags);
@@ -3674,7 +3712,7 @@ CIMGUI_API void igNavInitRequestApplyResult(void);
 CIMGUI_API bool igNavMoveRequestButNoResultYet(void);
 CIMGUI_API void igNavMoveRequestSubmit(ImGuiDir move_dir,ImGuiDir clip_dir,ImGuiNavMoveFlags move_flags,ImGuiScrollFlags scroll_flags);
 CIMGUI_API void igNavMoveRequestForward(ImGuiDir move_dir,ImGuiDir clip_dir,ImGuiNavMoveFlags move_flags,ImGuiScrollFlags scroll_flags);
-CIMGUI_API void igNavMoveRequestResolveWithLastItem(void);
+CIMGUI_API void igNavMoveRequestResolveWithLastItem(ImGuiNavItemData* result);
 CIMGUI_API void igNavMoveRequestCancel(void);
 CIMGUI_API void igNavMoveRequestApplyResult(void);
 CIMGUI_API void igNavMoveRequestTryWrapping(ImGuiWindow* window,ImGuiNavMoveFlags move_flags);
@@ -3703,6 +3741,7 @@ CIMGUI_API void igDockContextClearNodes(ImGuiContext* ctx,ImGuiID root_id,bool c
 CIMGUI_API void igDockContextRebuildNodes(ImGuiContext* ctx);
 CIMGUI_API void igDockContextNewFrameUpdateUndocking(ImGuiContext* ctx);
 CIMGUI_API void igDockContextNewFrameUpdateDocking(ImGuiContext* ctx);
+CIMGUI_API void igDockContextEndFrame(ImGuiContext* ctx);
 CIMGUI_API ImGuiID igDockContextGenNodeID(ImGuiContext* ctx);
 CIMGUI_API void igDockContextQueueDock(ImGuiContext* ctx,ImGuiWindow* target,ImGuiDockNode* target_node,ImGuiWindow* payload,ImGuiDir split_dir,float split_ratio,bool split_outer);
 CIMGUI_API void igDockContextQueueUndockWindow(ImGuiContext* ctx,ImGuiWindow* window);
@@ -3711,6 +3750,7 @@ CIMGUI_API bool igDockContextCalcDropPosForDocking(ImGuiWindow* target,ImGuiDock
 CIMGUI_API bool igDockNodeBeginAmendTabBar(ImGuiDockNode* node);
 CIMGUI_API void igDockNodeEndAmendTabBar(void);
 CIMGUI_API ImGuiDockNode* igDockNodeGetRootNode(ImGuiDockNode* node);
+CIMGUI_API bool igDockNodeIsInHierarchyOf(ImGuiDockNode* node,ImGuiDockNode* parent);
 CIMGUI_API int igDockNodeGetDepth(const ImGuiDockNode* node);
 CIMGUI_API ImGuiID igDockNodeGetWindowMenuButtonId(const ImGuiDockNode* node);
 CIMGUI_API ImGuiDockNode* igGetWindowDockNode(void);
@@ -3822,13 +3862,14 @@ CIMGUI_API void igRenderArrowPointingAt(ImDrawList* draw_list,ImVec2 pos,ImVec2
 CIMGUI_API void igRenderArrowDockMenu(ImDrawList* draw_list,ImVec2 p_min,float sz,ImU32 col);
 CIMGUI_API void igRenderRectFilledRangeH(ImDrawList* draw_list,const ImRect rect,ImU32 col,float x_start_norm,float x_end_norm,float rounding);
 CIMGUI_API void igRenderRectFilledWithHole(ImDrawList* draw_list,ImRect outer,ImRect inner,ImU32 col,float rounding);
+CIMGUI_API ImDrawFlags igCalcRoundingFlagsForRectInRect(const ImRect r_in,const ImRect r_outer,float threshold);
 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 igCloseButton(ImGuiID id,const ImVec2 pos);
 CIMGUI_API bool igCollapseButton(ImGuiID id,const ImVec2 pos,ImGuiDockNode* dock_node);
 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,float* p_scroll_v,float avail_v,float contents_v,ImDrawFlags flags);
+CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,ImS64* p_scroll_v,ImS64 avail_v,ImS64 contents_v,ImDrawFlags flags);
 CIMGUI_API bool igImageButtonEx(ImGuiID id,ImTextureID texture_id,const ImVec2 size,const ImVec2 uv0,const ImVec2 uv1,const ImVec2 padding,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);
@@ -3840,7 +3881,7 @@ CIMGUI_API bool igCheckboxFlags_U64Ptr(const char* label,ImU64* flags,ImU64 flag
 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 bool igTreeNodeBehaviorIsOpen(ImGuiID id,ImGuiTreeNodeFlags flags);
 CIMGUI_API void igTreePushOverrideID(ImGuiID id);
@@ -3882,6 +3923,7 @@ CIMGUI_API void igDebugNodeTableSettings(ImGuiTableSettings* settings);
 CIMGUI_API void igDebugNodeWindow(ImGuiWindow* window,const char* label);
 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 igDebugRenderViewportThumbnail(ImDrawList* draw_list,ImGuiViewportP* viewport,const ImRect bb);
 CIMGUI_API const ImFontBuilderIO* igImFontAtlasGetBuilderForStbTruetype(void);

generator/cpp2ffi.lua

@@ -376,7 +376,7 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
 							loca = table.remove(loca,1)
 						end
 						if not loca then
-							print(string.format("%q , %q ",itemold,itemfirstline),#itemfirstline)
+							print("not loca",string.format("%q , %q ",itemold,itemfirstline),#itemfirstline)
 							for k,v in pairs(linenumdict) do
 								if k:match(itemfirstline) then
 									print(string.format("%q",k),#k)
@@ -618,16 +618,18 @@ local function parseFunction(self,stname,itt,namespace,locat)
 	end
 	
 	--get typ, name and defaults
-	local functype_re =        "^%s*[%w%s%*]+%(%*[%w_]+%)%([^%(%)]*%)"
+	local functype_re =        "^%s*[%w%s%*]+%(%*%s*[%w_]+%)%([^%(%)]*%)"
-    local functype_reex =     "^(%s*[%w%s%*]+)%(%*([%w_]+)%)(%([^%(%)]*%))"
+    local functype_reex =     "^(%s*[%w%s%*]+)%(%*%s*([%w_]+)%)(%([^%(%)]*%))"
-    local functype_arg_rest = "^(%s*[%w%s%*]+%(%*[%w_]+%)%([^%(%)]*%)),*(.*)"
 	local argsTa2 = {}
 	local noname_counter = 0
 	for i,ar in ipairs(argsTa) do
 		local typ,name,retf,sigf,reftoptr,defa,ar1
+		local has_cdecl = ar:match"__cdecl"
+		if has_cdecl then ar = ar:gsub("__cdecl","") end
 		if ar:match(functype_re) then
 			local t1,namef,t2 = ar:match(functype_reex)
-            typ, name = t1.."(*)"..t2, namef
+			local f_ = has_cdecl and "(__cdecl*)" or "(*)"
+            typ, name = t1..f_..t2, namef
             retf = t1
             sigf = t2
 		else
@@ -662,7 +664,7 @@ local function parseFunction(self,stname,itt,namespace,locat)
                 name = name:gsub("(%[%d*%])","")
             end
 		end
-		argsTa2[i] = {type=typ,name=name,default=defa,reftoptr=reftoptr,ret=retf,signature=sigf}
+		argsTa2[i] = {type=typ,name=name,default=defa,reftoptr=reftoptr,ret=retf,signature=sigf,has_cdecl=has_cdecl}
 		if ar:match("&") and not ar:match("const") then
             --only post error if not manual
             local cname = self.getCname(stname,funcname, namespace) --cimguiname
@@ -682,9 +684,10 @@ local function parseFunction(self,stname,itt,namespace,locat)
 		signat = "("
 		for i,v in ipairs(argsArr) do
 			if v.ret then --function pointer
-				asp = asp .. v.ret .. "(*" .. v.name .. ")" .. v.signature .. ","
+				local f_ = v.has_cdecl and "(__cdecl*" or "(*"
+				asp = asp .. v.ret .. f_ .. v.name .. ")" .. v.signature .. ","
 				caar = caar .. v.name .. ","
-				signat = signat .. v.ret .. "(*)" .. clean_names_from_signature(self,v.signature) .. ","
+				signat = signat .. v.ret .. f_..")" .. clean_names_from_signature(self,v.signature) .. ","
 			else
 				local siz = v.type:match("(%[%d*%])") or ""
 				local typ = v.type:gsub("(%[%d*%])","")
@@ -1158,13 +1161,14 @@ function M.Parser()
 		local cdefs2 = {}
 		for i,cdef in ipairs(cdefs) do
 			if self.linenumdict[cdef[1]] then
-				--print("linenumdict alredy defined for", cdef[1],type(self.linenumdict[cdef[1]]))
+				--print("linenumdict already defined for", cdef[1],type(self.linenumdict[cdef[1]]))
 				if type(self.linenumdict[cdef[1]])=="string" then
 					self.linenumdict[cdef[1]] = {self.linenumdict[cdef[1]], cdef[2]}
 				else -- must be table already
 					table.insert(self.linenumdict[cdef[1]],cdef[2])
 				end
 			else
+				--print("nuevo linenumdict es",cdef[1],cdef[2])
 				self.linenumdict[cdef[1]]=cdef[2]
 			end
 			table.insert(cdefs2,cdef[1])
@@ -2084,7 +2088,7 @@ end
 M.func_header_generate = func_header_generate
 --[=[
 -- tests
-local line = [[struct ImDrawListSharedData
+local code = [[struct ImDrawListSharedData
 {
     ImVec2 TexUvWhitePixel;
     ImFont* Font;
@@ -2098,11 +2102,16 @@ local line = [[struct ImDrawListSharedData
     ImDrawListSharedData();
     void SetCircleSegmentMaxError(float max_error);
 };]]
+local code = [[static inline void      ImQsort(void* base, size_t count, size_t size_of_element, int(__cdecl *compare_func)(void const*, void const*)) { if (count > 1) qsort(base, count, size_of_element, compare_func); }
+]]
 local parser = M.Parser()
-parser:insert(line)
+for line in code:gmatch("[^\n]+") do
+	print("inserting",line)
+	parser:insert(line,"11")
+end
 parser:do_parse()
---M.prtable(parser)
+M.prtable(parser)
-M.prtable(parser:gen_structs_and_enums_table())
+--M.prtable(parser:gen_structs_and_enums_table())
 --]=]
 --print(clean_spaces[[ImVec2 ArcFastVtx[12 * 1];]])
 

generator/output/structs_and_enums.json

@@ -1942,18 +1942,23 @@
       },
       {
         "calc_value": 1,
-        "name": "ImGuiNavDirSourceFlags_Keyboard",
+        "name": "ImGuiNavDirSourceFlags_RawKeyboard",
         "value": "1 << 0"
       },
       {
         "calc_value": 2,
-        "name": "ImGuiNavDirSourceFlags_PadDPad",
+        "name": "ImGuiNavDirSourceFlags_Keyboard",
         "value": "1 << 1"
       },
       {
         "calc_value": 4,
-        "name": "ImGuiNavDirSourceFlags_PadLStick",
+        "name": "ImGuiNavDirSourceFlags_PadDPad",
         "value": "1 << 2"
+      },
+      {
+        "calc_value": 8,
+        "name": "ImGuiNavDirSourceFlags_PadLStick",
+        "value": "1 << 3"
       }
     ],
     "ImGuiNavHighlightFlags_": [
@@ -2165,18 +2170,23 @@
       },
       {
         "calc_value": 512,
-        "name": "ImGuiNavMoveFlags_Tabbing",
+        "name": "ImGuiNavMoveFlags_FocusApi",
         "value": "1 << 9"
       },
       {
         "calc_value": 1024,
-        "name": "ImGuiNavMoveFlags_Activate",
+        "name": "ImGuiNavMoveFlags_Tabbing",
         "value": "1 << 10"
       },
       {
         "calc_value": 2048,
-        "name": "ImGuiNavMoveFlags_DontSetNavHighlight",
+        "name": "ImGuiNavMoveFlags_Activate",
         "value": "1 << 11"
+      },
+      {
+        "calc_value": 4096,
+        "name": "ImGuiNavMoveFlags_DontSetNavHighlight",
+        "value": "1 << 12"
       }
     ],
     "ImGuiNextItemDataFlags_": [
@@ -3605,157 +3615,159 @@
   },
   "enumtypes": [],
   "locations": {
-    "ImBitVector": "imgui_internal:559",
+    "ImBitVector": "imgui_internal:570",
-    "ImColor": "imgui:2344",
+    "ImColor": "imgui:2347",
-    "ImDrawChannel": "imgui:2434",
+    "ImDrawChannel": "imgui:2437",
-    "ImDrawCmd": "imgui:2393",
+    "ImDrawCmd": "imgui:2396",
-    "ImDrawCmdHeader": "imgui:2426",
+    "ImDrawCmdHeader": "imgui:2429",
-    "ImDrawData": "imgui:2624",
+    "ImDrawData": "imgui:2627",
-    "ImDrawDataBuilder": "imgui_internal:732",
+    "ImDrawDataBuilder": "imgui_internal:743",
-    "ImDrawFlags_": "imgui:2460",
+    "ImDrawFlags_": "imgui:2463",
-    "ImDrawList": "imgui:2498",
+    "ImDrawList": "imgui:2501",
-    "ImDrawListFlags_": "imgui:2480",
+    "ImDrawListFlags_": "imgui:2483",
-    "ImDrawListSharedData": "imgui_internal:712",
+    "ImDrawListSharedData": "imgui_internal:723",
-    "ImDrawListSplitter": "imgui:2443",
+    "ImDrawListSplitter": "imgui:2446",
-    "ImDrawVert": "imgui:2411",
+    "ImDrawVert": "imgui:2414",
-    "ImFont": "imgui:2843",
+    "ImFont": "imgui:2846",
-    "ImFontAtlas": "imgui:2741",
+    "ImFontAtlas": "imgui:2744",
-    "ImFontAtlasCustomRect": "imgui:2703",
+    "ImFontAtlasCustomRect": "imgui:2706",
-    "ImFontAtlasFlags_": "imgui:2716",
+    "ImFontAtlasFlags_": "imgui:2719",
-    "ImFontBuilderIO": "imgui_internal:3051",
+    "ImFontBuilderIO": "imgui_internal:3101",
-    "ImFontConfig": "imgui:2647",
+    "ImFontConfig": "imgui:2650",
-    "ImFontGlyph": "imgui:2676",
+    "ImFontGlyph": "imgui:2679",
-    "ImFontGlyphRangesBuilder": "imgui:2688",
+    "ImFontGlyphRangesBuilder": "imgui:2691",
-    "ImGuiActivateFlags_": "imgui_internal:1189",
+    "ImGuiActivateFlags_": "imgui_internal:1227",
-    "ImGuiAxis": "imgui_internal:888",
+    "ImGuiAxis": "imgui_internal:899",
     "ImGuiBackendFlags_": "imgui:1512",
-    "ImGuiButtonFlagsPrivate_": "imgui_internal:795",
+    "ImGuiButtonFlagsPrivate_": "imgui_internal:806",
     "ImGuiButtonFlags_": "imgui:1626",
     "ImGuiCol_": "imgui:1527",
     "ImGuiColorEditFlags_": "imgui:1639",
-    "ImGuiColorMod": "imgui_internal:953",
+    "ImGuiColorMod": "imgui_internal:964",
-    "ImGuiComboFlagsPrivate_": "imgui_internal:818",
+    "ImGuiComboFlagsPrivate_": "imgui_internal:829",
     "ImGuiComboFlags_": "imgui:1122",
-    "ImGuiComboPreviewData": "imgui_internal:970",
+    "ImGuiComboPreviewData": "imgui_internal:981",
     "ImGuiCond_": "imgui:1731",
     "ImGuiConfigFlags_": "imgui:1487",
-    "ImGuiContext": "imgui_internal:1629",
+    "ImGuiContext": "imgui_internal:1670",
-    "ImGuiContextHook": "imgui_internal:1614",
+    "ImGuiContextHook": "imgui_internal:1655",
-    "ImGuiContextHookType": "imgui_internal:1612",
+    "ImGuiContextHookType": "imgui_internal:1653",
-    "ImGuiDataAuthority_": "imgui_internal:1364",
+    "ImGuiDataAuthority_": "imgui_internal:1404",
-    "ImGuiDataTypeInfo": "imgui_internal:936",
+    "ImGuiDataTypeInfo": "imgui_internal:947",
-    "ImGuiDataTypePrivate_": "imgui_internal:945",
+    "ImGuiDataTypePrivate_": "imgui_internal:956",
-    "ImGuiDataTypeTempStorage": "imgui_internal:930",
+    "ImGuiDataTypeTempStorage": "imgui_internal:941",
     "ImGuiDataType_": "imgui:1380",
     "ImGuiDir_": "imgui:1396",
-    "ImGuiDockContext": "imgui_internal:1461",
+    "ImGuiDockContext": "imgui_internal:1502",
-    "ImGuiDockNode": "imgui_internal:1380",
+    "ImGuiDockNode": "imgui_internal:1420",
-    "ImGuiDockNodeFlagsPrivate_": "imgui_internal:1339",
+    "ImGuiDockNodeFlagsPrivate_": "imgui_internal:1379",
     "ImGuiDockNodeFlags_": "imgui:1345",
-    "ImGuiDockNodeState": "imgui_internal:1371",
+    "ImGuiDockNodeState": "imgui_internal:1411",
     "ImGuiDragDropFlags_": "imgui:1358",
     "ImGuiFocusedFlags_": "imgui:1311",
-    "ImGuiGroupData": "imgui_internal:983",
+    "ImGuiGroupData": "imgui_internal:994",
     "ImGuiHoveredFlags_": "imgui:1325",
     "ImGuiIO": "imgui:1897",
-    "ImGuiInputReadMode": "imgui_internal:913",
+    "ImGuiInputReadMode": "imgui_internal:924",
-    "ImGuiInputSource": "imgui_internal:901",
+    "ImGuiInputSource": "imgui_internal:912",
-    "ImGuiInputTextCallbackData": "imgui:2053",
+    "ImGuiInputTextCallbackData": "imgui:2054",
-    "ImGuiInputTextFlagsPrivate_": "imgui_internal:786",
+    "ImGuiInputTextFlagsPrivate_": "imgui_internal:797",
     "ImGuiInputTextFlags_": "imgui:1035",
-    "ImGuiInputTextState": "imgui_internal:1018",
+    "ImGuiInputTextState": "imgui_internal:1029",
-    "ImGuiItemFlags_": "imgui_internal:748",
+    "ImGuiItemFlags_": "imgui_internal:759",
-    "ImGuiItemStatusFlags_": "imgui_internal:763",
+    "ImGuiItemStatusFlags_": "imgui_internal:774",
     "ImGuiKeyModFlags_": "imgui:1443",
     "ImGuiKey_": "imgui:1415",
-    "ImGuiLastItemData": "imgui_internal:1133",
+    "ImGuiLastItemData": "imgui_internal:1142",
-    "ImGuiLayoutType_": "imgui_internal:872",
+    "ImGuiLayoutType_": "imgui_internal:883",
-    "ImGuiListClipper": "imgui:2295",
+    "ImGuiListClipper": "imgui:2299",
-    "ImGuiLogType": "imgui_internal:878",
+    "ImGuiListClipperData": "imgui_internal:1211",
-    "ImGuiMenuColumns": "imgui_internal:999",
+    "ImGuiListClipperRange": "imgui_internal:1198",
-    "ImGuiMetricsConfig": "imgui_internal:1560",
+    "ImGuiLogType": "imgui_internal:889",
+    "ImGuiMenuColumns": "imgui_internal:1010",
+    "ImGuiMetricsConfig": "imgui_internal:1601",
     "ImGuiMouseButton_": "imgui:1703",
     "ImGuiMouseCursor_": "imgui:1713",
-    "ImGuiNavDirSourceFlags_": "imgui_internal:1221",
+    "ImGuiNavDirSourceFlags_": "imgui_internal:1259",
-    "ImGuiNavHighlightFlags_": "imgui_internal:1212",
+    "ImGuiNavHighlightFlags_": "imgui_internal:1250",
     "ImGuiNavInput_": "imgui:1456",
-    "ImGuiNavItemData": "imgui_internal:1253",
+    "ImGuiNavItemData": "imgui_internal:1293",
-    "ImGuiNavLayer": "imgui_internal:1246",
+    "ImGuiNavLayer": "imgui_internal:1286",
-    "ImGuiNavMoveFlags_": "imgui_internal:1229",
+    "ImGuiNavMoveFlags_": "imgui_internal:1268",
-    "ImGuiNextItemData": "imgui_internal:1120",
+    "ImGuiNextItemData": "imgui_internal:1129",
-    "ImGuiNextItemDataFlags_": "imgui_internal:1113",
+    "ImGuiNextItemDataFlags_": "imgui_internal:1122",
-    "ImGuiNextWindowData": "imgui_internal:1086",
+    "ImGuiNextWindowData": "imgui_internal:1095",
-    "ImGuiNextWindowDataFlags_": "imgui_internal:1069",
+    "ImGuiNextWindowDataFlags_": "imgui_internal:1078",
-    "ImGuiOldColumnData": "imgui_internal:1293",
+    "ImGuiOldColumnData": "imgui_internal:1333",
-    "ImGuiOldColumnFlags_": "imgui_internal:1273",
+    "ImGuiOldColumnFlags_": "imgui_internal:1313",
-    "ImGuiOldColumns": "imgui_internal:1303",
+    "ImGuiOldColumns": "imgui_internal:1343",
-    "ImGuiOnceUponAFrame": "imgui:2173",
+    "ImGuiOnceUponAFrame": "imgui:2174",
-    "ImGuiPayload": "imgui:2114",
+    "ImGuiPayload": "imgui:2115",
-    "ImGuiPlatformIO": "imgui:3006",
+    "ImGuiPlatformIO": "imgui:3009",
-    "ImGuiPlatformMonitor": "imgui:3070",
+    "ImGuiPlatformMonitor": "imgui:3073",
-    "ImGuiPlotType": "imgui_internal:895",
+    "ImGuiPlotType": "imgui_internal:906",
-    "ImGuiPopupData": "imgui_internal:1056",
+    "ImGuiPopupData": "imgui_internal:1065",
     "ImGuiPopupFlags_": "imgui:1095",
-    "ImGuiPopupPositionPolicy": "imgui_internal:923",
+    "ImGuiPopupPositionPolicy": "imgui_internal:934",
-    "ImGuiPtrOrIndex": "imgui_internal:1176",
+    "ImGuiPtrOrIndex": "imgui_internal:1185",
-    "ImGuiScrollFlags_": "imgui_internal:1198",
+    "ImGuiScrollFlags_": "imgui_internal:1236",
-    "ImGuiSelectableFlagsPrivate_": "imgui_internal:831",
+    "ImGuiSelectableFlagsPrivate_": "imgui_internal:842",
     "ImGuiSelectableFlags_": "imgui:1111",
-    "ImGuiSeparatorFlags_": "imgui_internal:850",
+    "ImGuiSeparatorFlags_": "imgui_internal:861",
-    "ImGuiSettingsHandler": "imgui_internal:1541",
+    "ImGuiSettingsHandler": "imgui_internal:1582",
-    "ImGuiShrinkWidthItem": "imgui_internal:1170",
+    "ImGuiShrinkWidthItem": "imgui_internal:1179",
-    "ImGuiSizeCallbackData": "imgui:2084",
+    "ImGuiSizeCallbackData": "imgui:2085",
-    "ImGuiSliderFlagsPrivate_": "imgui_internal:824",
+    "ImGuiSliderFlagsPrivate_": "imgui_internal:835",
     "ImGuiSliderFlags_": "imgui:1686",
     "ImGuiSortDirection_": "imgui:1407",
-    "ImGuiStackLevelInfo": "imgui_internal:1586",
+    "ImGuiStackLevelInfo": "imgui_internal:1627",
-    "ImGuiStackSizes": "imgui_internal:1145",
+    "ImGuiStackSizes": "imgui_internal:1154",
-    "ImGuiStackTool": "imgui_internal:1597",
+    "ImGuiStackTool": "imgui_internal:1638",
-    "ImGuiStorage": "imgui:2235",
+    "ImGuiStorage": "imgui:2236",
-    "ImGuiStoragePair": "imgui:2238",
+    "ImGuiStoragePair": "imgui:2239",
     "ImGuiStyle": "imgui:1842",
-    "ImGuiStyleMod": "imgui_internal:960",
+    "ImGuiStyleMod": "imgui_internal:971",
     "ImGuiStyleVar_": "imgui:1594",
-    "ImGuiTabBar": "imgui_internal:2294",
+    "ImGuiTabBar": "imgui_internal:2334",
-    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2257",
+    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2297",
     "ImGuiTabBarFlags_": "imgui:1136",
-    "ImGuiTabItem": "imgui_internal:2275",
+    "ImGuiTabItem": "imgui_internal:2315",
-    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2265",
+    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2305",
     "ImGuiTabItemFlags_": "imgui:1152",
-    "ImGuiTable": "imgui_internal:2421",
+    "ImGuiTable": "imgui_internal:2461",
     "ImGuiTableBgTarget_": "imgui:1302",
-    "ImGuiTableCellData": "imgui_internal:2414",
+    "ImGuiTableCellData": "imgui_internal:2454",
-    "ImGuiTableColumn": "imgui_internal:2355",
+    "ImGuiTableColumn": "imgui_internal:2395",
     "ImGuiTableColumnFlags_": "imgui:1245",
-    "ImGuiTableColumnSettings": "imgui_internal:2555",
+    "ImGuiTableColumnSettings": "imgui_internal:2595",
-    "ImGuiTableColumnSortSpecs": "imgui:2136",
+    "ImGuiTableColumnSortSpecs": "imgui:2137",
     "ImGuiTableFlags_": "imgui:1188",
     "ImGuiTableRowFlags_": "imgui:1287",
-    "ImGuiTableSettings": "imgui_internal:2579",
+    "ImGuiTableSettings": "imgui_internal:2619",
-    "ImGuiTableSortSpecs": "imgui:2150",
+    "ImGuiTableSortSpecs": "imgui:2151",
-    "ImGuiTableTempData": "imgui_internal:2534",
+    "ImGuiTableTempData": "imgui_internal:2574",
-    "ImGuiTextBuffer": "imgui:2208",
+    "ImGuiTextBuffer": "imgui:2209",
-    "ImGuiTextFilter": "imgui:2181",
+    "ImGuiTextFilter": "imgui:2182",
-    "ImGuiTextFlags_": "imgui_internal:858",
+    "ImGuiTextFlags_": "imgui_internal:869",
-    "ImGuiTextRange": "imgui:2191",
+    "ImGuiTextRange": "imgui:2192",
-    "ImGuiTooltipFlags_": "imgui_internal:864",
+    "ImGuiTooltipFlags_": "imgui_internal:875",
-    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:845",
+    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:856",
     "ImGuiTreeNodeFlags_": "imgui:1066",
-    "ImGuiViewport": "imgui:2924",
+    "ImGuiViewport": "imgui:2927",
-    "ImGuiViewportFlags_": "imgui:2899",
+    "ImGuiViewportFlags_": "imgui:2902",
-    "ImGuiViewportP": "imgui_internal:1478",
+    "ImGuiViewportP": "imgui_internal:1519",
-    "ImGuiWindow": "imgui_internal:2115",
+    "ImGuiWindow": "imgui_internal:2153",
-    "ImGuiWindowClass": "imgui:2099",
+    "ImGuiWindowClass": "imgui:2100",
-    "ImGuiWindowDockStyle": "imgui_internal:1456",
+    "ImGuiWindowDockStyle": "imgui_internal:1497",
-    "ImGuiWindowDockStyleCol": "imgui_internal:1445",
+    "ImGuiWindowDockStyleCol": "imgui_internal:1486",
     "ImGuiWindowFlags_": "imgui:992",
-    "ImGuiWindowSettings": "imgui_internal:1524",
+    "ImGuiWindowSettings": "imgui_internal:1565",
-    "ImGuiWindowStackData": "imgui_internal:1163",
+    "ImGuiWindowStackData": "imgui_internal:1172",
-    "ImGuiWindowTempData": "imgui_internal:2068",
+    "ImGuiWindowTempData": "imgui_internal:2106",
-    "ImRect": "imgui_internal:488",
+    "ImRect": "imgui_internal:499",
-    "ImVec1": "imgui_internal:470",
+    "ImVec1": "imgui_internal:481",
     "ImVec2": "imgui:266",
-    "ImVec2ih": "imgui_internal:478",
+    "ImVec2ih": "imgui_internal:489",
     "ImVec4": "imgui:279",
     "STB_TexteditState": "imstb_textedit:317",
     "StbTexteditRow": "imstb_textedit:364",
@@ -4743,6 +4755,10 @@
         "template_type": "ImGuiPopupData",
         "type": "ImVector_ImGuiPopupData"
       },
+      {
+        "name": "BeginMenuCount",
+        "type": "int"
+      },
       {
         "name": "Viewports",
         "template_type": "ImGuiViewportP*",
@@ -4808,10 +4824,6 @@
         "name": "NavActivateFlags",
         "type": "ImGuiActivateFlags"
       },
-      {
-        "name": "NavJustTabbedId",
-        "type": "ImGuiID"
-      },
       {
         "name": "NavJustMovedToId",
         "type": "ImGuiID"
@@ -4840,10 +4852,6 @@
         "name": "NavLayer",
         "type": "ImGuiNavLayer"
       },
-      {
-        "name": "NavIdTabCounter",
-        "type": "int"
-      },
       {
         "name": "NavIdIsAlive",
         "type": "bool"
@@ -4920,12 +4928,20 @@
         "name": "NavScoringRect",
         "type": "ImRect"
       },
+      {
+        "name": "NavScoringNoClipRect",
+        "type": "ImRect"
+      },
       {
         "name": "NavScoringDebugCount",
         "type": "int"
       },
       {
-        "name": "NavTabbingInputableRemaining",
+        "name": "NavTabbingDir",
+        "type": "int"
+      },
+      {
+        "name": "NavTabbingCounter",
         "type": "int"
       },
       {
@@ -4940,6 +4956,10 @@
         "name": "NavMoveResultOther",
         "type": "ImGuiNavItemData"
       },
+      {
+        "name": "NavTabbingResultFirst",
+        "type": "ImGuiNavItemData"
+      },
       {
         "name": "NavWindowingTarget",
         "type": "ImGuiWindow*"
@@ -4964,26 +4984,6 @@
         "name": "NavWindowingToggleLayer",
         "type": "bool"
       },
-      {
-        "name": "TabFocusRequestCurrWindow",
-        "type": "ImGuiWindow*"
-      },
-      {
-        "name": "TabFocusRequestNextWindow",
-        "type": "ImGuiWindow*"
-      },
-      {
-        "name": "TabFocusRequestCurrCounterTabStop",
-        "type": "int"
-      },
-      {
-        "name": "TabFocusRequestNextCounterTabStop",
-        "type": "int"
-      },
-      {
-        "name": "TabFocusPressed",
-        "type": "bool"
-      },
       {
         "name": "DimBgRatio",
         "type": "float"
@@ -5062,24 +5062,33 @@
         "size": 16,
         "type": "unsigned char"
       },
+      {
+        "name": "ClipperTempDataStacked",
+        "type": "int"
+      },
+      {
+        "name": "ClipperTempData",
+        "template_type": "ImGuiListClipperData",
+        "type": "ImVector_ImGuiListClipperData"
+      },
       {
         "name": "CurrentTable",
         "type": "ImGuiTable*"
       },
       {
-        "name": "CurrentTableStackIdx",
+        "name": "TablesTempDataStacked",
         "type": "int"
       },
+      {
+        "name": "TablesTempData",
+        "template_type": "ImGuiTableTempData",
+        "type": "ImVector_ImGuiTableTempData"
+      },
       {
         "name": "Tables",
         "template_type": "ImGuiTable",
         "type": "ImPool_ImGuiTable"
       },
-      {
-        "name": "TablesTempDataStack",
-        "template_type": "ImGuiTableTempData",
-        "type": "ImVector_ImGuiTableTempData"
-      },
       {
         "name": "TablesLastTimeActive",
         "template_type": "float",
@@ -5480,6 +5489,10 @@
         "name": "WindowClass",
         "type": "ImGuiWindowClass"
       },
+      {
+        "name": "LastBgColor",
+        "type": "ImU32"
+      },
       {
         "name": "HostWindow",
         "type": "ImGuiWindow*"
@@ -5549,6 +5562,11 @@
         "name": "IsFocused",
         "type": "bool"
       },
+      {
+        "bitfield": "1",
+        "name": "IsBgDrawnThisFrame",
+        "type": "bool"
+      },
       {
         "bitfield": "1",
         "name": "HasCloseButton",
@@ -5588,11 +5606,6 @@
         "bitfield": "1",
         "name": "WantHiddenTabBarToggle",
         "type": "bool"
-      },
-      {
-        "bitfield": "1",
-        "name": "MarkedForPosSizeWrite",
-        "type": "bool"
       }
     ],
     "ImGuiGroupData": [
@@ -5950,6 +5963,16 @@
         "size": 5,
         "type": "bool"
       },
+      {
+        "name": "MouseClickedCount[5]",
+        "size": 5,
+        "type": "ImU16"
+      },
+      {
+        "name": "MouseClickedLastCount[5]",
+        "size": 5,
+        "type": "ImU16"
+      },
       {
         "name": "MouseReleased[5]",
         "size": 5,
@@ -5965,11 +5988,6 @@
         "size": 5,
         "type": "bool"
       },
-      {
-        "name": "MouseDownWasDoubleClick[5]",
-        "size": 5,
-        "type": "bool"
-      },
       {
         "name": "MouseDownDuration[5]",
         "size": 5,
@@ -6141,14 +6159,6 @@
       {
         "name": "Flags",
         "type": "ImGuiInputTextFlags"
-      },
-      {
-        "name": "UserCallback",
-        "type": "ImGuiInputTextCallback"
-      },
-      {
-        "name": "UserCallbackData",
-        "type": "void*"
       }
     ],
     "ImGuiLastItemData": [
@@ -6190,6 +6200,28 @@
         "name": "ItemsCount",
         "type": "int"
       },
+      {
+        "name": "ItemsHeight",
+        "type": "float"
+      },
+      {
+        "name": "StartPosY",
+        "type": "float"
+      },
+      {
+        "name": "TempData",
+        "type": "void*"
+      }
+    ],
+    "ImGuiListClipperData": [
+      {
+        "name": "ListClipper",
+        "type": "ImGuiListClipper*"
+      },
+      {
+        "name": "LossynessOffset",
+        "type": "float"
+      },
       {
         "name": "StepNo",
         "type": "int"
@@ -6199,12 +6231,31 @@
         "type": "int"
       },
       {
-        "name": "ItemsHeight",
+        "name": "Ranges",
-        "type": "float"
+        "template_type": "ImGuiListClipperRange",
+        "type": "ImVector_ImGuiListClipperRange"
+      }
+    ],
+    "ImGuiListClipperRange": [
+      {
+        "name": "Min",
+        "type": "int"
       },
       {
-        "name": "StartPosY",
+        "name": "Max",
-        "type": "float"
+        "type": "int"
+      },
+      {
+        "name": "PosToIndexConvert",
+        "type": "bool"
+      },
+      {
+        "name": "PosToIndexOffsetMin",
+        "type": "ImS8"
+      },
+      {
+        "name": "PosToIndexOffsetMax",
+        "type": "ImS8"
       }
     ],
     "ImGuiMenuColumns": [
@@ -8325,6 +8376,10 @@
         "name": "IsFallbackWindow",
         "type": "bool"
       },
+      {
+        "name": "IsExplicitChild",
+        "type": "bool"
+      },
       {
         "name": "HasCloseButton",
         "type": "bool"
@@ -8511,6 +8566,10 @@
         "name": "ParentWindow",
         "type": "ImGuiWindow*"
       },
+      {
+        "name": "ParentWindowInBeginStack",
+        "type": "ImGuiWindow*"
+      },
       {
         "name": "RootWindow",
         "type": "ImGuiWindow*"
@@ -8752,6 +8811,10 @@
         "name": "GroupOffset",
         "type": "ImVec1"
       },
+      {
+        "name": "CursorStartPosLossyness",
+        "type": "ImVec2"
+      },
       {
         "name": "NavLayerCurrent",
         "type": "ImGuiNavLayer"
@@ -8821,10 +8884,6 @@
         "name": "ParentLayoutType",
         "type": "ImGuiLayoutType"
       },
-      {
-        "name": "FocusCounterTabStop",
-        "type": "int"
-      },
       {
         "name": "ItemWidth",
         "type": "float"

generator/output/typedefs_dict.json

@@ -64,6 +64,8 @@
   "ImGuiLastItemData": "struct ImGuiLastItemData",
   "ImGuiLayoutType": "int",
   "ImGuiListClipper": "struct ImGuiListClipper",
+  "ImGuiListClipperData": "struct ImGuiListClipperData",
+  "ImGuiListClipperRange": "struct ImGuiListClipperRange",
   "ImGuiMemAllocFunc": "void*(*)(size_t sz,void* user_data);",
   "ImGuiMemFreeFunc": "void(*)(void* ptr,void* user_data);",
   "ImGuiMenuColumns": "struct ImGuiMenuColumns",

generator/output/typedefs_dict.lua

@@ -64,6 +64,8 @@ defs["ImGuiKeyModFlags"] = "int"
 defs["ImGuiLastItemData"] = "struct ImGuiLastItemData"
 defs["ImGuiLayoutType"] = "int"
 defs["ImGuiListClipper"] = "struct ImGuiListClipper"
+defs["ImGuiListClipperData"] = "struct ImGuiListClipperData"
+defs["ImGuiListClipperRange"] = "struct ImGuiListClipperRange"
 defs["ImGuiMemAllocFunc"] = "void*(*)(size_t sz,void* user_data);"
 defs["ImGuiMemFreeFunc"] = "void(*)(void* ptr,void* user_data);"
 defs["ImGuiMenuColumns"] = "struct ImGuiMenuColumns"