pull imgui master 1.82

# Conflicts:
#	cimgui.cpp
#	cimgui.h
#	generator/output/definitions.json
#	generator/output/definitions.lua
#	generator/output/structs_and_enums.json
#	generator/output/structs_and_enums.lua
#	imgui

CMakeLists.txt

@@ -40,6 +40,7 @@ endif (IMGUI_STATIC)
 target_compile_definitions(cimgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS=1)
 if (WIN32)
     target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API=extern\t\"C\"\t__declspec\(dllexport\))
+    list(APPEND IMGUI_LIBRARIES imm32)
 else (WIN32)
     target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API=extern\t\"C\"\t)
 endif (WIN32)

Makefile

@@ -6,6 +6,7 @@ OBJS = cimgui.o
 OBJS += ./imgui/imgui.o
 OBJS += ./imgui/imgui_draw.o
 OBJS += ./imgui/imgui_demo.o
+OBJS += ./imgui/imgui_tables.o
 OBJS += ./imgui/imgui_widgets.o
 
 CXXFLAGS=-O2 -fno-exceptions -fno-rtti

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

backend_test/main.c

@@ -12,11 +12,11 @@
 #include <GL/glu.h>
 
 #ifdef IMGUI_HAS_IMSTR
-#define igBegin SigBegin
-#define igSliderFloat SigSliderFloat
-#define igCheckbox SigCheckbox
-#define igColorEdit3 SigColorEdit3
-#define igButton SigButton
+#define igBegin igBegin_Strv
+#define igSliderFloat igSliderFloat_Strv
+#define igCheckbox igCheckbox_Strv
+#define igColorEdit3 igColorEdit3_Strv
+#define igButton igButton_Strv
 #endif
 
 SDL_Window *window = NULL;

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.81" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.82" from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 
 #include "./imgui/imgui.h"
@@ -1100,7 +1100,7 @@ CIMGUI_API bool igTableSetColumnIndex(int column_n)
 {
     return ImGui::TableSetColumnIndex(column_n);
 }
-CIMGUI_API void igTableSetupColumn(const char* label,ImGuiTableColumnFlags flags,float init_width_or_weight,ImU32 user_id)
+CIMGUI_API void igTableSetupColumn(const char* label,ImGuiTableColumnFlags flags,float init_width_or_weight,ImGuiID user_id)
 {
     return ImGui::TableSetupColumn(label,flags,init_width_or_weight,user_id);
 }
@@ -1220,6 +1220,10 @@ CIMGUI_API void igLogButtons()
 {
     return ImGui::LogButtons();
 }
+CIMGUI_API void igLogTextV(const char* fmt,va_list args)
+{
+    return ImGui::LogTextV(fmt,args);
+}
 CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags)
 {
     return ImGui::BeginDragDropSource(flags);
@@ -1520,10 +1524,14 @@ CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t
 {
     return ImGui::DebugCheckVersionAndDataLayout(version_str,sz_io,sz_style,sz_vec2,sz_vec4,sz_drawvert,sz_drawidx);
 }
-CIMGUI_API void igSetAllocatorFunctions(void*(*alloc_func)(size_t sz,void* user_data),void(*free_func)(void* ptr,void* user_data),void* user_data)
+CIMGUI_API void igSetAllocatorFunctions(ImGuiMemAllocFunc alloc_func,ImGuiMemFreeFunc free_func,void* user_data)
 {
     return ImGui::SetAllocatorFunctions(alloc_func,free_func,user_data);
 }
+CIMGUI_API void igGetAllocatorFunctions(ImGuiMemAllocFunc* p_alloc_func,ImGuiMemFreeFunc* p_free_func,void** p_user_data)
+{
+    return ImGui::GetAllocatorFunctions(p_alloc_func,p_free_func,p_user_data);
+}
 CIMGUI_API void* igMemAlloc(size_t size)
 {
     return ImGui::MemAlloc(size);
@@ -1940,13 +1948,13 @@ CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 p1,const ImVec2
 {
     return self->AddLine(p1,p2,col,thickness);
 }
-CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners,float thickness)
+CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawFlags flags,float thickness)
 {
-    return self->AddRect(p_min,p_max,col,rounding,rounding_corners,thickness);
+    return self->AddRect(p_min,p_max,col,rounding,flags,thickness);
 }
-CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners)
+CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawFlags flags)
 {
-    return self->AddRectFilled(p_min,p_max,col,rounding,rounding_corners);
+    return self->AddRectFilled(p_min,p_max,col,rounding,flags);
 }
 CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left)
 {
@@ -1992,9 +2000,9 @@ CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,fl
 {
     return self->AddText(font,font_size,pos,col,text_begin,text_end,wrap_width,cpu_fine_clip_rect);
 }
-CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness)
+CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,ImDrawFlags flags,float thickness)
 {
-    return self->AddPolyline(points,num_points,col,closed,thickness);
+    return self->AddPolyline(points,num_points,col,flags,thickness);
 }
 CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col)
 {
@@ -2016,9 +2024,9 @@ CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_textur
 {
     return self->AddImageQuad(user_texture_id,p1,p2,p3,p4,uv1,uv2,uv3,uv4,col);
 }
-CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners)
+CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col,float rounding,ImDrawFlags flags)
 {
-    return self->AddImageRounded(user_texture_id,p_min,p_max,uv_min,uv_max,col,rounding,rounding_corners);
+    return self->AddImageRounded(user_texture_id,p_min,p_max,uv_min,uv_max,col,rounding,flags);
 }
 CIMGUI_API void ImDrawList_PathClear(ImDrawList* self)
 {
@@ -2036,9 +2044,9 @@ CIMGUI_API void ImDrawList_PathFillConvex(ImDrawList* self,ImU32 col)
 {
     return self->PathFillConvex(col);
 }
-CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,bool closed,float thickness)
+CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,ImDrawFlags flags,float thickness)
 {
-    return self->PathStroke(col,closed,thickness);
+    return self->PathStroke(col,flags,thickness);
 }
 CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments)
 {
@@ -2056,9 +2064,9 @@ CIMGUI_API void ImDrawList_PathBezierQuadraticCurveTo(ImDrawList* self,const ImV
 {
     return self->PathBezierQuadraticCurveTo(p2,p3,num_segments);
 }
-CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawCornerFlags rounding_corners)
+CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawFlags flags)
 {
-    return self->PathRect(rect_min,rect_max,rounding,rounding_corners);
+    return self->PathRect(rect_min,rect_max,rounding,flags);
 }
 CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data)
 {
@@ -2140,6 +2148,18 @@ CIMGUI_API void ImDrawList__OnChangedVtxOffset(ImDrawList* self)
 {
     return self->_OnChangedVtxOffset();
 }
+CIMGUI_API int ImDrawList__CalcCircleAutoSegmentCount(ImDrawList* self,float radius)
+{
+    return self->_CalcCircleAutoSegmentCount(radius);
+}
+CIMGUI_API void ImDrawList__PathArcToFastEx(ImDrawList* self,const ImVec2 center,float radius,int a_min_sample,int a_max_sample,int a_step)
+{
+    return self->_PathArcToFastEx(center,radius,a_min_sample,a_max_sample,a_step);
+}
+CIMGUI_API void ImDrawList__PathArcToN(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments)
+{
+    return self->_PathArcToN(center,radius,a_min,a_max,num_segments);
+}
 CIMGUI_API ImDrawData* ImDrawData_ImDrawData(void)
 {
     return IM_NEW(ImDrawData)();
@@ -2788,6 +2808,10 @@ CIMGUI_API float ImRect_GetHeight(ImRect* self)
 {
     return self->GetHeight();
 }
+CIMGUI_API float ImRect_GetArea(ImRect* self)
+{
+    return self->GetArea();
+}
 CIMGUI_API void ImRect_GetTL(ImVec2 *pOut,ImRect* self)
 {
     *pOut = self->GetTL();
@@ -2908,9 +2932,9 @@ CIMGUI_API void ImDrawListSharedData_destroy(ImDrawListSharedData* self)
 {
     IM_DELETE(self);
 }
-CIMGUI_API void ImDrawListSharedData_SetCircleSegmentMaxError(ImDrawListSharedData* self,float max_error)
+CIMGUI_API void ImDrawListSharedData_SetCircleTessellationMaxError(ImDrawListSharedData* self,float max_error)
 {
-    return self->SetCircleSegmentMaxError(max_error);
+    return self->SetCircleTessellationMaxError(max_error);
 }
 CIMGUI_API void ImDrawDataBuilder_Clear(ImDrawDataBuilder* self)
 {
@@ -3696,13 +3720,9 @@ CIMGUI_API void igActivateItem(ImGuiID id)
 {
     return ImGui::ActivateItem(id);
 }
-CIMGUI_API void igSetNavID(ImGuiID id,int nav_layer,ImGuiID focus_scope_id)
+CIMGUI_API void igSetNavID(ImGuiID id,int nav_layer,ImGuiID focus_scope_id,const ImRect rect_rel)
 {
-    return ImGui::SetNavID(id,nav_layer,focus_scope_id);
-}
-CIMGUI_API void igSetNavIDWithRectRel(ImGuiID id,int nav_layer,ImGuiID focus_scope_id,const ImRect rect_rel)
-{
-    return ImGui::SetNavIDWithRectRel(id,nav_layer,focus_scope_id,rect_rel);
+    return ImGui::SetNavID(id,nav_layer,focus_scope_id,rect_rel);
 }
 CIMGUI_API void igPushFocusScope(ImGuiID id)
 {
@@ -3840,6 +3860,10 @@ CIMGUI_API void igTablePopBackgroundChannel()
 {
     return ImGui::TablePopBackgroundChannel();
 }
+CIMGUI_API ImGuiTable* igGetCurrentTable()
+{
+    return ImGui::GetCurrentTable();
+}
 CIMGUI_API ImGuiTable* igTableFindByID(ImGuiID id)
 {
     return ImGui::TableFindByID(id);
@@ -4052,9 +4076,9 @@ CIMGUI_API void igRenderFrameBorder(ImVec2 p_min,ImVec2 p_max,float rounding)
 {
     return ImGui::RenderFrameBorder(p_min,p_max,rounding);
 }
-CIMGUI_API void igRenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list,ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,float grid_step,ImVec2 grid_off,float rounding,int rounding_corners_flags)
+CIMGUI_API void igRenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list,ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,float grid_step,ImVec2 grid_off,float rounding,ImDrawFlags flags)
 {
-    return ImGui::RenderColorRectWithAlphaCheckerboard(draw_list,p_min,p_max,fill_col,grid_step,grid_off,rounding,rounding_corners_flags);
+    return ImGui::RenderColorRectWithAlphaCheckerboard(draw_list,p_min,p_max,fill_col,grid_step,grid_off,rounding,flags);
 }
 CIMGUI_API void igRenderNavHighlight(const ImRect bb,ImGuiID id,ImGuiNavHighlightFlags flags)
 {
@@ -4116,9 +4140,9 @@ 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,ImDrawCornerFlags rounding_corners)
+CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* p_scroll_v,float avail_v,float contents_v,ImDrawFlags flags)
 {
-    return ImGui::ScrollbarEx(bb,id,axis,p_scroll_v,avail_v,contents_v,rounding_corners);
+    return ImGui::ScrollbarEx(bb,id,axis,p_scroll_v,avail_v,contents_v,flags);
 }
 CIMGUI_API bool igImageButtonEx(ImGuiID id,ImTextureID texture_id,const ImVec2 size,const ImVec2 uv0,const ImVec2 uv1,const ImVec2 padding,const ImVec4 bg_col,const ImVec4 tint_col)
 {

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.81" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.82" from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 #ifndef CIMGUI_INCLUDED
 #define CIMGUI_INCLUDED
@@ -157,7 +157,7 @@ typedef int ImGuiMouseCursor;
 typedef int ImGuiSortDirection;
 typedef int ImGuiStyleVar;
 typedef int ImGuiTableBgTarget;
-typedef int ImDrawCornerFlags;
+typedef int ImDrawFlags;
 typedef int ImDrawListFlags;
 typedef int ImFontAtlasFlags;
 typedef int ImGuiBackendFlags;
@@ -185,6 +185,8 @@ typedef void* ImTextureID;
 typedef unsigned int ImGuiID;
 typedef int (*ImGuiInputTextCallback)(ImGuiInputTextCallbackData* data);
 typedef void (*ImGuiSizeCallback)(ImGuiSizeCallbackData* data);
+typedef void* (*ImGuiMemAllocFunc)(size_t sz, void* user_data);
+typedef void (*ImGuiMemFreeFunc)(void* ptr, void* user_data);
 typedef unsigned short ImWchar16;
 typedef unsigned int ImWchar32;
 typedef ImWchar16 ImWchar;
@@ -347,7 +349,7 @@ typedef enum {
     ImGuiInputTextFlags_AllowTabInput = 1 << 10,
     ImGuiInputTextFlags_CtrlEnterForNewLine = 1 << 11,
     ImGuiInputTextFlags_NoHorizontalScroll = 1 << 12,
-    ImGuiInputTextFlags_AlwaysInsertMode = 1 << 13,
+    ImGuiInputTextFlags_AlwaysOverwrite = 1 << 13,
     ImGuiInputTextFlags_ReadOnly = 1 << 14,
     ImGuiInputTextFlags_Password = 1 << 15,
     ImGuiInputTextFlags_NoUndoRedo = 1 << 16,
@@ -835,7 +837,7 @@ struct ImGuiStyle
     bool AntiAliasedLinesUseTex;
     bool AntiAliasedFill;
     float CurveTessellationTol;
-    float CircleSegmentMaxError;
+    float CircleTessellationMaxError;
     ImVec4 Colors[ImGuiCol_COUNT];
 };
 struct ImGuiIO
@@ -1047,17 +1049,21 @@ struct ImDrawListSplitter
     ImVector_ImDrawChannel _Channels;
 };
 typedef enum {
-    ImDrawCornerFlags_None = 0,
-    ImDrawCornerFlags_TopLeft = 1 << 0,
-    ImDrawCornerFlags_TopRight = 1 << 1,
-    ImDrawCornerFlags_BotLeft = 1 << 2,
-    ImDrawCornerFlags_BotRight = 1 << 3,
-    ImDrawCornerFlags_Top = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_TopRight,
-    ImDrawCornerFlags_Bot = ImDrawCornerFlags_BotLeft | ImDrawCornerFlags_BotRight,
-    ImDrawCornerFlags_Left = ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_BotLeft,
-    ImDrawCornerFlags_Right = ImDrawCornerFlags_TopRight | ImDrawCornerFlags_BotRight,
-    ImDrawCornerFlags_All = 0xF
-}ImDrawCornerFlags_;
+    ImDrawFlags_None = 0,
+    ImDrawFlags_Closed = 1 << 0,
+    ImDrawFlags_RoundCornersTopLeft = 1 << 4,
+    ImDrawFlags_RoundCornersTopRight = 1 << 5,
+    ImDrawFlags_RoundCornersBottomLeft = 1 << 6,
+    ImDrawFlags_RoundCornersBottomRight = 1 << 7,
+    ImDrawFlags_RoundCornersNone = 1 << 8,
+    ImDrawFlags_RoundCornersTop = ImDrawFlags_RoundCornersTopLeft | ImDrawFlags_RoundCornersTopRight,
+    ImDrawFlags_RoundCornersBottom = ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersBottomRight,
+    ImDrawFlags_RoundCornersLeft = ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersTopLeft,
+    ImDrawFlags_RoundCornersRight = ImDrawFlags_RoundCornersBottomRight | ImDrawFlags_RoundCornersTopRight,
+    ImDrawFlags_RoundCornersAll = ImDrawFlags_RoundCornersTopLeft | ImDrawFlags_RoundCornersTopRight | ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersBottomRight,
+    ImDrawFlags_RoundCornersDefault_ = ImDrawFlags_RoundCornersAll,
+    ImDrawFlags_RoundCornersMask_ = ImDrawFlags_RoundCornersAll | ImDrawFlags_RoundCornersNone
+}ImDrawFlags_;
 typedef enum {
     ImDrawListFlags_None = 0,
     ImDrawListFlags_AntiAliasedLines = 1 << 0,
@@ -1146,11 +1152,12 @@ typedef enum {
 }ImFontAtlasFlags_;
 struct ImFontAtlas
 {
-    bool Locked;
     ImFontAtlasFlags Flags;
     ImTextureID TexID;
     int TexDesiredWidth;
     int TexGlyphPadding;
+    bool Locked;
+    bool TexPixelsUseColors;
     unsigned char* TexPixelsAlpha8;
     unsigned int* TexPixelsRGBA32;
     int TexWidth;
@@ -1261,7 +1268,8 @@ struct ImDrawListSharedData
     float CircleSegmentMaxError;
     ImVec4 ClipRectFullscreen;
     ImDrawListFlags InitialFlags;
-    ImVec2 ArcFastVtx[12 * 1];
+    ImVec2 ArcFastVtx[48];
+    float ArcFastRadiusCutoff;
     ImU8 CircleSegmentCounts[64];
     const ImVec4* TexUvLines;
 };
@@ -1289,7 +1297,8 @@ typedef enum {
     ImGuiItemStatusFlags_ToggledSelection = 1 << 3,
     ImGuiItemStatusFlags_ToggledOpen = 1 << 4,
     ImGuiItemStatusFlags_HasDeactivated = 1 << 5,
-    ImGuiItemStatusFlags_Deactivated = 1 << 6
+    ImGuiItemStatusFlags_Deactivated = 1 << 6,
+    ImGuiItemStatusFlags_HoveredWindow = 1 << 7
 }ImGuiItemStatusFlags_;
 typedef enum {
     ImGuiButtonFlags_PressedOnClick = 1 << 4,
@@ -1364,9 +1373,9 @@ typedef enum {
 typedef enum {
     ImGuiInputSource_None = 0,
     ImGuiInputSource_Mouse,
+    ImGuiInputSource_Keyboard,
+    ImGuiInputSource_Gamepad,
     ImGuiInputSource_Nav,
-    ImGuiInputSource_NavKeyboard,
-    ImGuiInputSource_NavGamepad,
     ImGuiInputSource_COUNT
 }ImGuiInputSource;
 typedef enum {
@@ -1452,6 +1461,7 @@ struct ImGuiGroupData
     float BackupCurrLineTextBaseOffset;
     ImGuiID BackupActiveIdIsAlive;
     bool BackupActiveIdPreviousFrameIsAlive;
+    bool BackupHoveredIdIsAlive;
     bool EmitItem;
 };
 struct ImGuiMenuColumns
@@ -1674,7 +1684,6 @@ struct ImGuiContext
     int WindowsActiveCount;
     ImGuiWindow* CurrentWindow;
     ImGuiWindow* HoveredWindow;
-    ImGuiWindow* HoveredRootWindow;
     ImGuiWindow* HoveredWindowUnderMovingWindow;
     ImGuiWindow* MovingWindow;
     ImGuiWindow* WheelingWindow;
@@ -1765,13 +1774,13 @@ struct ImGuiContext
     float NavWindowingTimer;
     float NavWindowingHighlightAlpha;
     bool NavWindowingToggleLayer;
-    ImGuiWindow* FocusRequestCurrWindow;
-    ImGuiWindow* FocusRequestNextWindow;
-    int FocusRequestCurrCounterRegular;
-    int FocusRequestCurrCounterTabStop;
-    int FocusRequestNextCounterRegular;
-    int FocusRequestNextCounterTabStop;
-    bool FocusTabPressed;
+    ImGuiWindow* TabFocusRequestCurrWindow;
+    ImGuiWindow* TabFocusRequestNextWindow;
+    int TabFocusRequestCurrCounterRegular;
+    int TabFocusRequestCurrCounterTabStop;
+    int TabFocusRequestNextCounterRegular;
+    int TabFocusRequestNextCounterTabStop;
+    bool TabFocusPressed;
     float DimBgRatio;
     ImGuiMouseCursor MouseCursor;
     bool DragDropActive;
@@ -2175,9 +2184,10 @@ struct ImGuiTable
     ImGuiTableColumnIdx HeldHeaderColumn;
     ImGuiTableColumnIdx ReorderColumn;
     ImGuiTableColumnIdx ReorderColumnDir;
+    ImGuiTableColumnIdx LeftMostEnabledColumn;
+    ImGuiTableColumnIdx RightMostEnabledColumn;
     ImGuiTableColumnIdx LeftMostStretchedColumn;
     ImGuiTableColumnIdx RightMostStretchedColumn;
-    ImGuiTableColumnIdx RightMostEnabledColumn;
     ImGuiTableColumnIdx ContextPopupColumn;
     ImGuiTableColumnIdx FreezeRowsRequest;
     ImGuiTableColumnIdx FreezeRowsCount;
@@ -2546,7 +2556,7 @@ CIMGUI_API void igEndTable(void);
 CIMGUI_API void igTableNextRow(ImGuiTableRowFlags row_flags,float min_row_height);
 CIMGUI_API bool igTableNextColumn(void);
 CIMGUI_API bool igTableSetColumnIndex(int column_n);
-CIMGUI_API void igTableSetupColumn(const char* label,ImGuiTableColumnFlags flags,float init_width_or_weight,ImU32 user_id);
+CIMGUI_API void igTableSetupColumn(const char* label,ImGuiTableColumnFlags flags,float init_width_or_weight,ImGuiID user_id);
 CIMGUI_API void igTableSetupScrollFreeze(int cols,int rows);
 CIMGUI_API void igTableHeadersRow(void);
 CIMGUI_API void igTableHeader(const char* label);
@@ -2576,6 +2586,7 @@ CIMGUI_API void igLogToFile(int auto_open_depth,const char* filename);
 CIMGUI_API void igLogToClipboard(int auto_open_depth);
 CIMGUI_API void igLogFinish(void);
 CIMGUI_API void igLogButtons(void);
+CIMGUI_API void igLogTextV(const char* fmt,va_list args);
 CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags);
 CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t sz,ImGuiCond cond);
 CIMGUI_API void igEndDragDropSource(void);
@@ -2651,7 +2662,8 @@ CIMGUI_API void igLoadIniSettingsFromMemory(const char* ini_data,size_t ini_size
 CIMGUI_API void igSaveIniSettingsToDisk(const char* ini_filename);
 CIMGUI_API const char* igSaveIniSettingsToMemory(size_t* out_ini_size);
 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(void*(*alloc_func)(size_t sz,void* user_data),void(*free_func)(void* ptr,void* user_data),void* user_data);
+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);
 CIMGUI_API void* igMemAlloc(size_t size);
 CIMGUI_API void igMemFree(void* ptr);
 CIMGUI_API ImGuiStyle* ImGuiStyle_ImGuiStyle(void);
@@ -2756,8 +2768,8 @@ CIMGUI_API void ImDrawList_PopTextureID(ImDrawList* self);
 CIMGUI_API void ImDrawList_GetClipRectMin(ImVec2 *pOut,ImDrawList* self);
 CIMGUI_API void ImDrawList_GetClipRectMax(ImVec2 *pOut,ImDrawList* self);
 CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,ImU32 col,float thickness);
-CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners,float thickness);
-CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners);
+CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawFlags flags,float thickness);
+CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawFlags flags);
 CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left);
 CIMGUI_API void ImDrawList_AddQuad(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness);
 CIMGUI_API void ImDrawList_AddQuadFilled(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col);
@@ -2769,23 +2781,23 @@ CIMGUI_API void ImDrawList_AddNgon(ImDrawList* self,const ImVec2 center,float ra
 CIMGUI_API void ImDrawList_AddNgonFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments);
 CIMGUI_API void ImDrawList_AddTextVec2(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end);
 CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect);
-CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness);
+CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,ImDrawFlags flags,float thickness);
 CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col);
 CIMGUI_API void ImDrawList_AddBezierCubic(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness,int num_segments);
 CIMGUI_API void ImDrawList_AddBezierQuadratic(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col,float thickness,int num_segments);
 CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col);
 CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,const ImVec2 uv1,const ImVec2 uv2,const ImVec2 uv3,const ImVec2 uv4,ImU32 col);
-CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners);
+CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col,float rounding,ImDrawFlags flags);
 CIMGUI_API void ImDrawList_PathClear(ImDrawList* self);
 CIMGUI_API void ImDrawList_PathLineTo(ImDrawList* self,const ImVec2 pos);
 CIMGUI_API void ImDrawList_PathLineToMergeDuplicate(ImDrawList* self,const ImVec2 pos);
 CIMGUI_API void ImDrawList_PathFillConvex(ImDrawList* self,ImU32 col);
-CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,bool closed,float thickness);
+CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,ImDrawFlags flags,float thickness);
 CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments);
 CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 center,float radius,int a_min_of_12,int a_max_of_12);
 CIMGUI_API void ImDrawList_PathBezierCubicCurveTo(ImDrawList* self,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,int num_segments);
 CIMGUI_API void ImDrawList_PathBezierQuadraticCurveTo(ImDrawList* self,const ImVec2 p2,const ImVec2 p3,int num_segments);
-CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawCornerFlags rounding_corners);
+CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawFlags flags);
 CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data);
 CIMGUI_API void ImDrawList_AddDrawCmd(ImDrawList* self);
 CIMGUI_API ImDrawList* ImDrawList_CloneOutput(ImDrawList* self);
@@ -2806,6 +2818,9 @@ CIMGUI_API void ImDrawList__PopUnusedDrawCmd(ImDrawList* self);
 CIMGUI_API void ImDrawList__OnChangedClipRect(ImDrawList* self);
 CIMGUI_API void ImDrawList__OnChangedTextureID(ImDrawList* self);
 CIMGUI_API void ImDrawList__OnChangedVtxOffset(ImDrawList* self);
+CIMGUI_API int ImDrawList__CalcCircleAutoSegmentCount(ImDrawList* self,float radius);
+CIMGUI_API void ImDrawList__PathArcToFastEx(ImDrawList* self,const ImVec2 center,float radius,int a_min_sample,int a_max_sample,int a_step);
+CIMGUI_API void ImDrawList__PathArcToN(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments);
 CIMGUI_API ImDrawData* ImDrawData_ImDrawData(void);
 CIMGUI_API void ImDrawData_destroy(ImDrawData* self);
 CIMGUI_API void ImDrawData_Clear(ImDrawData* self);
@@ -2967,6 +2982,7 @@ CIMGUI_API void ImRect_GetCenter(ImVec2 *pOut,ImRect* self);
 CIMGUI_API void ImRect_GetSize(ImVec2 *pOut,ImRect* self);
 CIMGUI_API float ImRect_GetWidth(ImRect* self);
 CIMGUI_API float ImRect_GetHeight(ImRect* self);
+CIMGUI_API float ImRect_GetArea(ImRect* self);
 CIMGUI_API void ImRect_GetTL(ImVec2 *pOut,ImRect* self);
 CIMGUI_API void ImRect_GetTR(ImVec2 *pOut,ImRect* self);
 CIMGUI_API void ImRect_GetBL(ImVec2 *pOut,ImRect* self);
@@ -2997,7 +3013,7 @@ CIMGUI_API void ImBitVector_SetBit(ImBitVector* self,int n);
 CIMGUI_API void ImBitVector_ClearBit(ImBitVector* self,int n);
 CIMGUI_API ImDrawListSharedData* ImDrawListSharedData_ImDrawListSharedData(void);
 CIMGUI_API void ImDrawListSharedData_destroy(ImDrawListSharedData* self);
-CIMGUI_API void ImDrawListSharedData_SetCircleSegmentMaxError(ImDrawListSharedData* self,float max_error);
+CIMGUI_API void ImDrawListSharedData_SetCircleTessellationMaxError(ImDrawListSharedData* self,float max_error);
 CIMGUI_API void ImDrawDataBuilder_Clear(ImDrawDataBuilder* self);
 CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self);
 CIMGUI_API int ImDrawDataBuilder_GetDrawListCount(ImDrawDataBuilder* self);
@@ -3194,8 +3210,7 @@ CIMGUI_API float igGetNavInputAmount(ImGuiNavInput n,ImGuiInputReadMode mode);
 CIMGUI_API void igGetNavInputAmount2d(ImVec2 *pOut,ImGuiNavDirSourceFlags dir_sources,ImGuiInputReadMode mode,float slow_factor,float fast_factor);
 CIMGUI_API int igCalcTypematicRepeatAmount(float t0,float t1,float repeat_delay,float repeat_rate);
 CIMGUI_API void igActivateItem(ImGuiID id);
-CIMGUI_API void igSetNavID(ImGuiID id,int nav_layer,ImGuiID focus_scope_id);
-CIMGUI_API void igSetNavIDWithRectRel(ImGuiID id,int nav_layer,ImGuiID focus_scope_id,const ImRect rect_rel);
+CIMGUI_API void igSetNavID(ImGuiID id,int nav_layer,ImGuiID focus_scope_id,const ImRect rect_rel);
 CIMGUI_API void igPushFocusScope(ImGuiID id);
 CIMGUI_API void igPopFocusScope(void);
 CIMGUI_API ImGuiID igGetFocusedFocusScope(void);
@@ -3230,6 +3245,7 @@ CIMGUI_API int igTableGetHoveredColumn(void);
 CIMGUI_API float igTableGetHeaderRowHeight(void);
 CIMGUI_API void igTablePushBackgroundChannel(void);
 CIMGUI_API void igTablePopBackgroundChannel(void);
+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);
 CIMGUI_API void igTableBeginInitMemory(ImGuiTable* table,int columns_count);
@@ -3283,7 +3299,7 @@ CIMGUI_API void igRenderTextClippedEx(ImDrawList* draw_list,const ImVec2 pos_min
 CIMGUI_API void igRenderTextEllipsis(ImDrawList* draw_list,const ImVec2 pos_min,const ImVec2 pos_max,float clip_max_x,float ellipsis_max_x,const char* text,const char* text_end,const ImVec2* text_size_if_known);
 CIMGUI_API void igRenderFrame(ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,bool border,float rounding);
 CIMGUI_API void igRenderFrameBorder(ImVec2 p_min,ImVec2 p_max,float rounding);
-CIMGUI_API void igRenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list,ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,float grid_step,ImVec2 grid_off,float rounding,int rounding_corners_flags);
+CIMGUI_API void igRenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list,ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,float grid_step,ImVec2 grid_off,float rounding,ImDrawFlags flags);
 CIMGUI_API void igRenderNavHighlight(const ImRect bb,ImGuiID id,ImGuiNavHighlightFlags flags);
 CIMGUI_API const char* igFindRenderedTextEnd(const char* text,const char* text_end);
 CIMGUI_API void igRenderArrow(ImDrawList* draw_list,ImVec2 pos,ImU32 col,ImGuiDir dir,float scale);
@@ -3299,7 +3315,7 @@ CIMGUI_API bool igCloseButton(ImGuiID id,const ImVec2 pos);
 CIMGUI_API bool igCollapseButton(ImGuiID id,const ImVec2 pos);
 CIMGUI_API bool igArrowButtonEx(const char* str_id,ImGuiDir dir,ImVec2 size_arg,ImGuiButtonFlags flags);
 CIMGUI_API void igScrollbar(ImGuiAxis axis);
-CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* p_scroll_v,float avail_v,float contents_v,ImDrawCornerFlags rounding_corners);
+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 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);

generator/cpp2ffi.lua

@@ -287,7 +287,7 @@ local function getRE()
 	typedef_re = "^\n*%s*(typedef[^;]+;)",
 	typedef_st_re = "^\n*(typedef%s+struct%s*%b{}.-;)",
 	functypedef_re = "^\n*%s*(typedef[%w%s%*_]+%(%s*%*%s*[%w_]+%s*%)%s*%b()%s*;)",
-	functypedef_re = "^\n*%s*(typedef[%w%s%*_]+%([^*]*%*%s*[%w_]+%s*%)%s*%b()%s*;)",
+	functypedef_re = "^\n*%s*(typedef[%w%s%*_]+%([^*]*%*?%s*[%w_]+%s*%)%s*%b()%s*;)",
 	--vardef_re = "^\n*([^;{}%(%)]+;)",
 	--change for things as
 	--[[ImU8 Used4kPagesMap[((sizeof(ImWchar16) == 2 ? 0xFFFF : 0x10FFFF)+1)/4096/8];]]
@@ -503,7 +503,7 @@ local function typetoStr(typ)
     typ = typ:gsub("float","Float")
     typ = typ:gsub("uInt","Uint")
     typ = typ:gsub("ImGui","")
-    typ = typ:gsub("ImStr","STR")
+    --typ = typ:gsub("ImStr","STR")
     typ = typ:gsub("Im","")
     typ = typ:gsub("[<>]","")
     return typ
@@ -792,7 +792,7 @@ local function ADDIMSTR_S(FP)
         --if isIMSTR return generate _S version
 		local isIMSTR = false
 		for i,arg in ipairs(defT.argsT) do
-			if arg.type == "ImStr" then isIMSTR=true;break end
+			if arg.type == "ImStrv" then isIMSTR=true;break end
 		end
         --if defT.ret=="ImVec2" or defT.ret=="ImVec4" or defT.ret=="ImColor" then
 		--if isIMSTR then print(t.cimguiname,defT.ov_cimguiname,defT.argsoriginal,"isIMSTR") end
@@ -806,7 +806,7 @@ local function ADDIMSTR_S(FP)
             --then argsT table
             defT2.argsT = {}
             for k,v in ipairs(defT.argsT) do
-				local typ = v.type == "ImStr" and "const char*" or v.type
+				local typ = v.type == "ImStrv" and "const char*" or v.type
                 table.insert(defT2.argsT,{type=typ,name=v.name})
             end
 			--defaults table
@@ -814,13 +814,13 @@ local function ADDIMSTR_S(FP)
 			for k,v in pairs(defT.defaults) do
 				defT2.defaults[k] = v
             end
-            defT2.args = defT2.args:gsub("ImStr","const char*")
-			--recreate call_args for wrapping into ImStr
+            defT2.args = defT2.args:gsub("ImStrv","const char*")
+			--recreate call_args for wrapping into ImStrv
 			local caar
 			if #defT.argsT > 0 then
 				caar = "("
 				for i,v in ipairs(defT.argsT) do
-					local name = v.name --v.type == "ImStr" and "ImStr("..v.name..")" or v.name --wrap
+					local name = v.name 
 					if v.ret then --function pointer
 						caar = caar .. name .. ","
 					else
@@ -832,9 +832,9 @@ local function ADDIMSTR_S(FP)
 			else
 				caar = "()"
 			end
-			defT2.call_args = caar --:gsub("ImStr%(([^%(%)]+)%)","%1") --unwrap
+			defT2.call_args = caar 
 			------------------
-            defT2.signature = defT.signature:gsub("ImStr","const char*") --.."_S"
+            defT2.signature = defT.signature:gsub("ImStrv","const char*") --.."_S"
             defT2.ov_cimguiname = defT2.ov_cimguiname .. "_Strv"
             defT2.isIMSTR_S = 1
 			-- check there is not an equal version in imgui_stname
@@ -1084,16 +1084,25 @@ function M.Parser()
 				local value,key = line:match("typedef%s+(.+)%s+([%w_]+);")
 				if key and value then
 					self.typedefs_dict[key] = value
-				else --try function typedef
+				else --try function pointer typedef
 					local key = line:match("%(%*([%w_]+)%)%([^%(%)]*%)")
 					if key then
 						local linet = line
 						linet = linet:gsub("typedef ","")
 						linet = linet:gsub("%(%*("..key..")%)","(*)")
 						self.typedefs_dict[key] = linet
-					elseif not line:match"typedef%s*struct" then --discard typedef struct
-						print("typedef not found")
-						print(key,value,line)
+					else
+						--try function typedef
+						key = line:match("%(([%w_]+)%)%([^%(%)]*%)")
+						if key then
+							local linet = line
+							linet = linet:gsub("typedef ","")
+							linet = linet:gsub("%(("..key..")%)","()")
+							self.typedefs_dict[key] = linet
+						elseif not line:match"typedef%s*struct" then --discard typedef struct
+							print("typedef not found")
+							print(key,value,line)
+						end
 					end
 				end
 			end

generator/output/structs_and_enums.json

@@ -1,55 +1,75 @@
 {
   "enums": {
-    "ImDrawCornerFlags_": [
+    "ImDrawFlags_": [
       {
         "calc_value": 0,
-        "name": "ImDrawCornerFlags_None",
+        "name": "ImDrawFlags_None",
         "value": "0"
       },
       {
         "calc_value": 1,
-        "name": "ImDrawCornerFlags_TopLeft",
+        "name": "ImDrawFlags_Closed",
         "value": "1 << 0"
       },
       {
-        "calc_value": 2,
-        "name": "ImDrawCornerFlags_TopRight",
-        "value": "1 << 1"
+        "calc_value": 16,
+        "name": "ImDrawFlags_RoundCornersTopLeft",
+        "value": "1 << 4"
       },
       {
-        "calc_value": 4,
-        "name": "ImDrawCornerFlags_BotLeft",
-        "value": "1 << 2"
+        "calc_value": 32,
+        "name": "ImDrawFlags_RoundCornersTopRight",
+        "value": "1 << 5"
       },
       {
-        "calc_value": 8,
-        "name": "ImDrawCornerFlags_BotRight",
-        "value": "1 << 3"
+        "calc_value": 64,
+        "name": "ImDrawFlags_RoundCornersBottomLeft",
+        "value": "1 << 6"
       },
       {
-        "calc_value": 3,
-        "name": "ImDrawCornerFlags_Top",
-        "value": "ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_TopRight"
+        "calc_value": 128,
+        "name": "ImDrawFlags_RoundCornersBottomRight",
+        "value": "1 << 7"
       },
       {
-        "calc_value": 12,
-        "name": "ImDrawCornerFlags_Bot",
-        "value": "ImDrawCornerFlags_BotLeft | ImDrawCornerFlags_BotRight"
+        "calc_value": 256,
+        "name": "ImDrawFlags_RoundCornersNone",
+        "value": "1 << 8"
       },
       {
-        "calc_value": 5,
-        "name": "ImDrawCornerFlags_Left",
-        "value": "ImDrawCornerFlags_TopLeft | ImDrawCornerFlags_BotLeft"
+        "calc_value": 48,
+        "name": "ImDrawFlags_RoundCornersTop",
+        "value": "ImDrawFlags_RoundCornersTopLeft | ImDrawFlags_RoundCornersTopRight"
       },
       {
-        "calc_value": 10,
-        "name": "ImDrawCornerFlags_Right",
-        "value": "ImDrawCornerFlags_TopRight | ImDrawCornerFlags_BotRight"
+        "calc_value": 192,
+        "name": "ImDrawFlags_RoundCornersBottom",
+        "value": "ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersBottomRight"
       },
       {
-        "calc_value": 15,
-        "name": "ImDrawCornerFlags_All",
-        "value": "0xF"
+        "calc_value": 80,
+        "name": "ImDrawFlags_RoundCornersLeft",
+        "value": "ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersTopLeft"
+      },
+      {
+        "calc_value": 160,
+        "name": "ImDrawFlags_RoundCornersRight",
+        "value": "ImDrawFlags_RoundCornersBottomRight | ImDrawFlags_RoundCornersTopRight"
+      },
+      {
+        "calc_value": 240,
+        "name": "ImDrawFlags_RoundCornersAll",
+        "value": "ImDrawFlags_RoundCornersTopLeft | ImDrawFlags_RoundCornersTopRight | ImDrawFlags_RoundCornersBottomLeft | ImDrawFlags_RoundCornersBottomRight"
+      },
+      {
+        "calc_value": 240,
+        "name": "ImDrawFlags_RoundCornersDefault_",
+        "value": "ImDrawFlags_RoundCornersAll"
+      },
+      {
+        "calc_value": 496,
+        "name": "ImDrawFlags_RoundCornersMask_",
+        "value": "ImDrawFlags_RoundCornersAll | ImDrawFlags_RoundCornersNone"
       }
     ],
     "ImDrawListFlags_": [
@@ -1138,17 +1158,17 @@
       },
       {
         "calc_value": 2,
-        "name": "ImGuiInputSource_Nav",
+        "name": "ImGuiInputSource_Keyboard",
         "value": "2"
       },
       {
         "calc_value": 3,
-        "name": "ImGuiInputSource_NavKeyboard",
+        "name": "ImGuiInputSource_Gamepad",
         "value": "3"
       },
       {
         "calc_value": 4,
-        "name": "ImGuiInputSource_NavGamepad",
+        "name": "ImGuiInputSource_Nav",
         "value": "4"
       },
       {
@@ -1230,7 +1250,7 @@
       },
       {
         "calc_value": 8192,
-        "name": "ImGuiInputTextFlags_AlwaysInsertMode",
+        "name": "ImGuiInputTextFlags_AlwaysOverwrite",
         "value": "1 << 13"
       },
       {
@@ -1366,6 +1386,11 @@
         "calc_value": 64,
         "name": "ImGuiItemStatusFlags_Deactivated",
         "value": "1 << 6"
+      },
+      {
+        "calc_value": 128,
+        "name": "ImGuiItemStatusFlags_HoveredWindow",
+        "value": "1 << 7"
       }
     ],
     "ImGuiKeyModFlags_": [
@@ -3099,139 +3124,139 @@
   },
   "enumtypes": [],
   "locations": {
-    "ImBitVector": "imgui_internal:506",
-    "ImColor": "imgui:2197",
-    "ImDrawChannel": "imgui:2291",
-    "ImDrawCmd": "imgui:2246",
-    "ImDrawCmdHeader": "imgui:2283",
-    "ImDrawCornerFlags_": "imgui:2315",
-    "ImDrawData": "imgui:2471",
-    "ImDrawDataBuilder": "imgui_internal:651",
-    "ImDrawList": "imgui:2349",
-    "ImDrawListFlags_": "imgui:2331",
-    "ImDrawListSharedData": "imgui_internal:632",
-    "ImDrawListSplitter": "imgui:2300",
-    "ImDrawVert": "imgui:2268",
-    "ImFont": "imgui:2686",
-    "ImFontAtlas": "imgui:2587",
-    "ImFontAtlasCustomRect": "imgui:2549",
-    "ImFontAtlasFlags_": "imgui:2562",
-    "ImFontBuilderIO": "imgui_internal:2525",
-    "ImFontConfig": "imgui:2493",
-    "ImFontGlyph": "imgui:2522",
-    "ImFontGlyphRangesBuilder": "imgui:2534",
-    "ImGuiAxis": "imgui_internal:789",
-    "ImGuiBackendFlags_": "imgui:1369",
-    "ImGuiButtonFlagsPrivate_": "imgui_internal:703",
-    "ImGuiButtonFlags_": "imgui:1475",
-    "ImGuiCol_": "imgui:1379",
-    "ImGuiColorEditFlags_": "imgui:1488",
-    "ImGuiColorMod": "imgui_internal:896",
-    "ImGuiComboFlags_": "imgui:1008",
-    "ImGuiCond_": "imgui:1580",
-    "ImGuiConfigFlags_": "imgui:1353",
-    "ImGuiContext": "imgui_internal:1268",
-    "ImGuiContextHook": "imgui_internal:1253",
-    "ImGuiContextHookType": "imgui_internal:1251",
-    "ImGuiDataTypeInfo": "imgui_internal:879",
-    "ImGuiDataTypePrivate_": "imgui_internal:888",
-    "ImGuiDataTypeTempStorage": "imgui_internal:873",
-    "ImGuiDataType_": "imgui:1245",
-    "ImGuiDir_": "imgui:1261",
-    "ImGuiDragDropFlags_": "imgui:1223",
-    "ImGuiFocusedFlags_": "imgui:1195",
-    "ImGuiGroupData": "imgui_internal:913",
-    "ImGuiHoveredFlags_": "imgui:1207",
-    "ImGuiIO": "imgui:1740",
-    "ImGuiInputReadMode": "imgui_internal:813",
-    "ImGuiInputSource": "imgui_internal:802",
-    "ImGuiInputTextCallbackData": "imgui:1882",
-    "ImGuiInputTextFlags_": "imgui:923",
-    "ImGuiInputTextState": "imgui_internal:942",
-    "ImGuiItemFlags_": "imgui_internal:667",
-    "ImGuiItemStatusFlags_": "imgui_internal:682",
-    "ImGuiKeyModFlags_": "imgui:1308",
-    "ImGuiKey_": "imgui:1280",
-    "ImGuiLastItemDataBackup": "imgui_internal:1833",
-    "ImGuiLayoutType_": "imgui_internal:773",
-    "ImGuiListClipper": "imgui:2148",
-    "ImGuiLogType": "imgui_internal:779",
-    "ImGuiMenuColumns": "imgui_internal:928",
-    "ImGuiMetricsConfig": "imgui_internal:1209",
-    "ImGuiMouseButton_": "imgui:1552",
-    "ImGuiMouseCursor_": "imgui:1562",
-    "ImGuiNavDirSourceFlags_": "imgui_internal:832",
-    "ImGuiNavForward": "imgui_internal:852",
-    "ImGuiNavHighlightFlags_": "imgui_internal:823",
-    "ImGuiNavInput_": "imgui:1321",
-    "ImGuiNavLayer": "imgui_internal:859",
-    "ImGuiNavMoveFlags_": "imgui_internal:840",
-    "ImGuiNavMoveResult": "imgui_internal:990",
-    "ImGuiNextItemData": "imgui_internal:1047",
-    "ImGuiNextItemDataFlags_": "imgui_internal:1040",
-    "ImGuiNextWindowData": "imgui_internal:1018",
-    "ImGuiNextWindowDataFlags_": "imgui_internal:1004",
-    "ImGuiOldColumnData": "imgui_internal:1099",
-    "ImGuiOldColumnFlags_": "imgui_internal:1079",
-    "ImGuiOldColumns": "imgui_internal:1109",
-    "ImGuiOnceUponAFrame": "imgui:2026",
-    "ImGuiPayload": "imgui:1922",
-    "ImGuiPlotType": "imgui_internal:796",
-    "ImGuiPopupData": "imgui_internal:977",
-    "ImGuiPopupFlags_": "imgui:981",
-    "ImGuiPopupPositionPolicy": "imgui_internal:866",
-    "ImGuiPtrOrIndex": "imgui_internal:1065",
-    "ImGuiSelectableFlagsPrivate_": "imgui_internal:733",
-    "ImGuiSelectableFlags_": "imgui:997",
-    "ImGuiSeparatorFlags_": "imgui_internal:751",
-    "ImGuiSettingsHandler": "imgui_internal:1190",
-    "ImGuiShrinkWidthItem": "imgui_internal:1059",
-    "ImGuiSizeCallbackData": "imgui:1913",
-    "ImGuiSliderFlagsPrivate_": "imgui_internal:726",
-    "ImGuiSliderFlags_": "imgui:1535",
-    "ImGuiSortDirection_": "imgui:1272",
-    "ImGuiStackSizes": "imgui_internal:1231",
-    "ImGuiStorage": "imgui:2088",
-    "ImGuiStoragePair": "imgui:2091",
-    "ImGuiStyle": "imgui:1686",
-    "ImGuiStyleMod": "imgui_internal:903",
-    "ImGuiStyleVar_": "imgui:1444",
-    "ImGuiTabBar": "imgui_internal:1883",
-    "ImGuiTabBarFlagsPrivate_": "imgui_internal:1850",
-    "ImGuiTabBarFlags_": "imgui:1022",
-    "ImGuiTabItem": "imgui_internal:1865",
-    "ImGuiTabItemFlagsPrivate_": "imgui_internal:1858",
-    "ImGuiTabItemFlags_": "imgui:1038",
-    "ImGuiTable": "imgui_internal:2009",
-    "ImGuiTableBgTarget_": "imgui:1186",
-    "ImGuiTableCellData": "imgui_internal:2002",
-    "ImGuiTableColumn": "imgui_internal:1944",
-    "ImGuiTableColumnFlags_": "imgui:1131",
-    "ImGuiTableColumnSettings": "imgui_internal:2127",
-    "ImGuiTableColumnSortSpecs": "imgui:1944",
-    "ImGuiTableFlags_": "imgui:1074",
-    "ImGuiTableRowFlags_": "imgui:1171",
-    "ImGuiTableSettings": "imgui_internal:2151",
-    "ImGuiTableSortSpecs": "imgui:1958",
-    "ImGuiTextBuffer": "imgui:2061",
-    "ImGuiTextFilter": "imgui:2034",
-    "ImGuiTextFlags_": "imgui_internal:759",
-    "ImGuiTextRange": "imgui:2044",
-    "ImGuiTooltipFlags_": "imgui_internal:765",
-    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:746",
-    "ImGuiTreeNodeFlags_": "imgui:952",
-    "ImGuiViewport": "imgui:2757",
-    "ImGuiViewportFlags_": "imgui:2742",
-    "ImGuiViewportP": "imgui_internal:1152",
-    "ImGuiWindow": "imgui_internal:1721",
-    "ImGuiWindowFlags_": "imgui:883",
-    "ImGuiWindowSettings": "imgui_internal:1178",
-    "ImGuiWindowTempData": "imgui_internal:1665",
-    "ImRect": "imgui_internal:437",
-    "ImVec1": "imgui_internal:419",
-    "ImVec2": "imgui:227",
-    "ImVec2ih": "imgui_internal:427",
-    "ImVec4": "imgui:240",
+    "ImBitVector": "imgui_internal:508",
+    "ImColor": "imgui:2167",
+    "ImDrawChannel": "imgui:2261",
+    "ImDrawCmd": "imgui:2216",
+    "ImDrawCmdHeader": "imgui:2253",
+    "ImDrawData": "imgui:2450",
+    "ImDrawDataBuilder": "imgui_internal:671",
+    "ImDrawFlags_": "imgui:2287",
+    "ImDrawList": "imgui:2325",
+    "ImDrawListFlags_": "imgui:2307",
+    "ImDrawListSharedData": "imgui_internal:651",
+    "ImDrawListSplitter": "imgui:2270",
+    "ImDrawVert": "imgui:2238",
+    "ImFont": "imgui:2667",
+    "ImFontAtlas": "imgui:2566",
+    "ImFontAtlasCustomRect": "imgui:2528",
+    "ImFontAtlasFlags_": "imgui:2541",
+    "ImFontBuilderIO": "imgui_internal:2546",
+    "ImFontConfig": "imgui:2472",
+    "ImFontGlyph": "imgui:2501",
+    "ImFontGlyphRangesBuilder": "imgui:2513",
+    "ImGuiAxis": "imgui_internal:810",
+    "ImGuiBackendFlags_": "imgui:1384",
+    "ImGuiButtonFlagsPrivate_": "imgui_internal:724",
+    "ImGuiButtonFlags_": "imgui:1490",
+    "ImGuiCol_": "imgui:1394",
+    "ImGuiColorEditFlags_": "imgui:1503",
+    "ImGuiColorMod": "imgui_internal:917",
+    "ImGuiComboFlags_": "imgui:1023",
+    "ImGuiCond_": "imgui:1595",
+    "ImGuiConfigFlags_": "imgui:1368",
+    "ImGuiContext": "imgui_internal:1290",
+    "ImGuiContextHook": "imgui_internal:1275",
+    "ImGuiContextHookType": "imgui_internal:1273",
+    "ImGuiDataTypeInfo": "imgui_internal:900",
+    "ImGuiDataTypePrivate_": "imgui_internal:909",
+    "ImGuiDataTypeTempStorage": "imgui_internal:894",
+    "ImGuiDataType_": "imgui:1260",
+    "ImGuiDir_": "imgui:1276",
+    "ImGuiDragDropFlags_": "imgui:1238",
+    "ImGuiFocusedFlags_": "imgui:1210",
+    "ImGuiGroupData": "imgui_internal:934",
+    "ImGuiHoveredFlags_": "imgui:1222",
+    "ImGuiIO": "imgui:1755",
+    "ImGuiInputReadMode": "imgui_internal:834",
+    "ImGuiInputSource": "imgui_internal:823",
+    "ImGuiInputTextCallbackData": "imgui:1897",
+    "ImGuiInputTextFlags_": "imgui:933",
+    "ImGuiInputTextState": "imgui_internal:964",
+    "ImGuiItemFlags_": "imgui_internal:687",
+    "ImGuiItemStatusFlags_": "imgui_internal:702",
+    "ImGuiKeyModFlags_": "imgui:1323",
+    "ImGuiKey_": "imgui:1295",
+    "ImGuiLastItemDataBackup": "imgui_internal:1853",
+    "ImGuiLayoutType_": "imgui_internal:794",
+    "ImGuiListClipper": "imgui:2118",
+    "ImGuiLogType": "imgui_internal:800",
+    "ImGuiMenuColumns": "imgui_internal:950",
+    "ImGuiMetricsConfig": "imgui_internal:1231",
+    "ImGuiMouseButton_": "imgui:1567",
+    "ImGuiMouseCursor_": "imgui:1577",
+    "ImGuiNavDirSourceFlags_": "imgui_internal:853",
+    "ImGuiNavForward": "imgui_internal:873",
+    "ImGuiNavHighlightFlags_": "imgui_internal:844",
+    "ImGuiNavInput_": "imgui:1336",
+    "ImGuiNavLayer": "imgui_internal:880",
+    "ImGuiNavMoveFlags_": "imgui_internal:861",
+    "ImGuiNavMoveResult": "imgui_internal:1012",
+    "ImGuiNextItemData": "imgui_internal:1069",
+    "ImGuiNextItemDataFlags_": "imgui_internal:1062",
+    "ImGuiNextWindowData": "imgui_internal:1040",
+    "ImGuiNextWindowDataFlags_": "imgui_internal:1026",
+    "ImGuiOldColumnData": "imgui_internal:1121",
+    "ImGuiOldColumnFlags_": "imgui_internal:1101",
+    "ImGuiOldColumns": "imgui_internal:1131",
+    "ImGuiOnceUponAFrame": "imgui:1996",
+    "ImGuiPayload": "imgui:1937",
+    "ImGuiPlotType": "imgui_internal:817",
+    "ImGuiPopupData": "imgui_internal:999",
+    "ImGuiPopupFlags_": "imgui:996",
+    "ImGuiPopupPositionPolicy": "imgui_internal:887",
+    "ImGuiPtrOrIndex": "imgui_internal:1087",
+    "ImGuiSelectableFlagsPrivate_": "imgui_internal:754",
+    "ImGuiSelectableFlags_": "imgui:1012",
+    "ImGuiSeparatorFlags_": "imgui_internal:772",
+    "ImGuiSettingsHandler": "imgui_internal:1212",
+    "ImGuiShrinkWidthItem": "imgui_internal:1081",
+    "ImGuiSizeCallbackData": "imgui:1928",
+    "ImGuiSliderFlagsPrivate_": "imgui_internal:747",
+    "ImGuiSliderFlags_": "imgui:1550",
+    "ImGuiSortDirection_": "imgui:1287",
+    "ImGuiStackSizes": "imgui_internal:1253",
+    "ImGuiStorage": "imgui:2058",
+    "ImGuiStoragePair": "imgui:2061",
+    "ImGuiStyle": "imgui:1701",
+    "ImGuiStyleMod": "imgui_internal:924",
+    "ImGuiStyleVar_": "imgui:1459",
+    "ImGuiTabBar": "imgui_internal:1903",
+    "ImGuiTabBarFlagsPrivate_": "imgui_internal:1870",
+    "ImGuiTabBarFlags_": "imgui:1037",
+    "ImGuiTabItem": "imgui_internal:1885",
+    "ImGuiTabItemFlagsPrivate_": "imgui_internal:1878",
+    "ImGuiTabItemFlags_": "imgui:1053",
+    "ImGuiTable": "imgui_internal:2029",
+    "ImGuiTableBgTarget_": "imgui:1201",
+    "ImGuiTableCellData": "imgui_internal:2022",
+    "ImGuiTableColumn": "imgui_internal:1964",
+    "ImGuiTableColumnFlags_": "imgui:1146",
+    "ImGuiTableColumnSettings": "imgui_internal:2148",
+    "ImGuiTableColumnSortSpecs": "imgui:1959",
+    "ImGuiTableFlags_": "imgui:1089",
+    "ImGuiTableRowFlags_": "imgui:1186",
+    "ImGuiTableSettings": "imgui_internal:2172",
+    "ImGuiTableSortSpecs": "imgui:1973",
+    "ImGuiTextBuffer": "imgui:2031",
+    "ImGuiTextFilter": "imgui:2004",
+    "ImGuiTextFlags_": "imgui_internal:780",
+    "ImGuiTextRange": "imgui:2014",
+    "ImGuiTooltipFlags_": "imgui_internal:786",
+    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:767",
+    "ImGuiTreeNodeFlags_": "imgui:967",
+    "ImGuiViewport": "imgui:2738",
+    "ImGuiViewportFlags_": "imgui:2723",
+    "ImGuiViewportP": "imgui_internal:1174",
+    "ImGuiWindow": "imgui_internal:1741",
+    "ImGuiWindowFlags_": "imgui:893",
+    "ImGuiWindowSettings": "imgui_internal:1200",
+    "ImGuiWindowTempData": "imgui_internal:1685",
+    "ImRect": "imgui_internal:438",
+    "ImVec1": "imgui_internal:420",
+    "ImVec2": "imgui:230",
+    "ImVec2ih": "imgui_internal:428",
+    "ImVec4": "imgui:243",
     "STB_TexteditState": "imstb_textedit:317",
     "StbTexteditRow": "imstb_textedit:364",
     "StbUndoRecord": "imstb_textedit:299",
@@ -3447,10 +3472,14 @@
         "type": "ImDrawListFlags"
       },
       {
-        "name": "ArcFastVtx[12*1]",
-        "size": 12,
+        "name": "ArcFastVtx[48]",
+        "size": 48,
         "type": "ImVec2"
       },
+      {
+        "name": "ArcFastRadiusCutoff",
+        "type": "float"
+      },
       {
         "name": "CircleSegmentCounts[64]",
         "size": 64,
@@ -3565,10 +3594,6 @@
       }
     ],
     "ImFontAtlas": [
-      {
-        "name": "Locked",
-        "type": "bool"
-      },
       {
         "name": "Flags",
         "type": "ImFontAtlasFlags"
@@ -3585,6 +3610,14 @@
         "name": "TexGlyphPadding",
         "type": "int"
       },
+      {
+        "name": "Locked",
+        "type": "bool"
+      },
+      {
+        "name": "TexPixelsUseColors",
+        "type": "bool"
+      },
       {
         "name": "TexPixelsAlpha8",
         "type": "unsigned char*"
@@ -3948,10 +3981,6 @@
         "name": "HoveredWindow",
         "type": "ImGuiWindow*"
       },
-      {
-        "name": "HoveredRootWindow",
-        "type": "ImGuiWindow*"
-      },
       {
         "name": "HoveredWindowUnderMovingWindow",
         "type": "ImGuiWindow*"
@@ -4326,31 +4355,31 @@
         "type": "bool"
       },
       {
-        "name": "FocusRequestCurrWindow",
+        "name": "TabFocusRequestCurrWindow",
         "type": "ImGuiWindow*"
       },
       {
-        "name": "FocusRequestNextWindow",
+        "name": "TabFocusRequestNextWindow",
         "type": "ImGuiWindow*"
       },
       {
-        "name": "FocusRequestCurrCounterRegular",
+        "name": "TabFocusRequestCurrCounterRegular",
         "type": "int"
       },
       {
-        "name": "FocusRequestCurrCounterTabStop",
+        "name": "TabFocusRequestCurrCounterTabStop",
         "type": "int"
       },
       {
-        "name": "FocusRequestNextCounterRegular",
+        "name": "TabFocusRequestNextCounterRegular",
         "type": "int"
       },
       {
-        "name": "FocusRequestNextCounterTabStop",
+        "name": "TabFocusRequestNextCounterTabStop",
         "type": "int"
       },
       {
-        "name": "FocusTabPressed",
+        "name": "TabFocusPressed",
         "type": "bool"
       },
       {
@@ -4772,6 +4801,10 @@
         "name": "BackupActiveIdPreviousFrameIsAlive",
         "type": "bool"
       },
+      {
+        "name": "BackupHoveredIdIsAlive",
+        "type": "bool"
+      },
       {
         "name": "EmitItem",
         "type": "bool"
@@ -5895,7 +5928,7 @@
         "type": "float"
       },
       {
-        "name": "CircleSegmentMaxError",
+        "name": "CircleTessellationMaxError",
         "type": "float"
       },
       {
@@ -6427,6 +6460,14 @@
         "name": "ReorderColumnDir",
         "type": "ImGuiTableColumnIdx"
       },
+      {
+        "name": "LeftMostEnabledColumn",
+        "type": "ImGuiTableColumnIdx"
+      },
+      {
+        "name": "RightMostEnabledColumn",
+        "type": "ImGuiTableColumnIdx"
+      },
       {
         "name": "LeftMostStretchedColumn",
         "type": "ImGuiTableColumnIdx"
@@ -6435,10 +6476,6 @@
         "name": "RightMostStretchedColumn",
         "type": "ImGuiTableColumnIdx"
       },
-      {
-        "name": "RightMostEnabledColumn",
-        "type": "ImGuiTableColumnIdx"
-      },
       {
         "name": "ContextPopupColumn",
         "type": "ImGuiTableColumnIdx"

generator/output/typedefs_dict.json

@@ -5,9 +5,9 @@
   "ImDrawChannel": "struct ImDrawChannel",
   "ImDrawCmd": "struct ImDrawCmd",
   "ImDrawCmdHeader": "struct ImDrawCmdHeader",
-  "ImDrawCornerFlags": "int",
   "ImDrawData": "struct ImDrawData",
   "ImDrawDataBuilder": "struct ImDrawDataBuilder",
+  "ImDrawFlags": "int",
   "ImDrawIdx": "unsigned short",
   "ImDrawList": "struct ImDrawList",
   "ImDrawListFlags": "int",
@@ -56,6 +56,8 @@
   "ImGuiLastItemDataBackup": "struct ImGuiLastItemDataBackup",
   "ImGuiLayoutType": "int",
   "ImGuiListClipper": "struct ImGuiListClipper",
+  "ImGuiMemAllocFunc": "void*(*)(size_t sz,void* user_data);",
+  "ImGuiMemFreeFunc": "void(*)(void* ptr,void* user_data);",
   "ImGuiMenuColumns": "struct ImGuiMenuColumns",
   "ImGuiMetricsConfig": "struct ImGuiMetricsConfig",
   "ImGuiMouseButton": "int",

generator/output/typedefs_dict.lua

@@ -5,9 +5,9 @@ defs["ImDrawCallback"] = "void(*)(const ImDrawList* parent_list,const ImDrawCmd*
 defs["ImDrawChannel"] = "struct ImDrawChannel"
 defs["ImDrawCmd"] = "struct ImDrawCmd"
 defs["ImDrawCmdHeader"] = "struct ImDrawCmdHeader"
-defs["ImDrawCornerFlags"] = "int"
 defs["ImDrawData"] = "struct ImDrawData"
 defs["ImDrawDataBuilder"] = "struct ImDrawDataBuilder"
+defs["ImDrawFlags"] = "int"
 defs["ImDrawIdx"] = "unsigned short"
 defs["ImDrawList"] = "struct ImDrawList"
 defs["ImDrawListFlags"] = "int"
@@ -56,6 +56,8 @@ defs["ImGuiKeyModFlags"] = "int"
 defs["ImGuiLastItemDataBackup"] = "struct ImGuiLastItemDataBackup"
 defs["ImGuiLayoutType"] = "int"
 defs["ImGuiListClipper"] = "struct ImGuiListClipper"
+defs["ImGuiMemAllocFunc"] = "void*(*)(size_t sz,void* user_data);"
+defs["ImGuiMemFreeFunc"] = "void(*)(void* ptr,void* user_data);"
 defs["ImGuiMenuColumns"] = "struct ImGuiMenuColumns"
 defs["ImGuiMetricsConfig"] = "struct ImGuiMetricsConfig"
 defs["ImGuiMouseButton"] = "int"

test/main.c

@@ -3,11 +3,11 @@
 #include "../cimgui.h"
 
 #ifdef IMGUI_HAS_IMSTR
-#define igBegin SigBegin
-#define igSliderFloat SigSliderFloat
-#define igCheckbox SigCheckbox
-#define igColorEdit3 SigColorEdit3
-#define igButton SigButton
+#define igBegin igBegin_Strv
+#define igSliderFloat igSliderFloat_Strv
+#define igCheckbox igCheckbox_Strv
+#define igColorEdit3 igColorEdit3_Strv
+#define igButton igButton_Strv
 #endif
 
 int main(void)