Merge branch 'docking_inter'

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

@@ -11,7 +11,13 @@
 #include <GL/gl.h>
 #include <GL/glu.h>
 
-
+#ifdef IMGUI_HAS_IMSTR
+#define igBegin SigBegin
+#define igSliderFloat SigSliderFloat
+#define igCheckbox SigCheckbox
+#define igColorEdit3 SigColorEdit3
+#define igButton SigButton
+#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.80" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.81" from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 
 #include "./imgui/imgui.h"
@@ -941,6 +941,14 @@ CIMGUI_API bool igSelectableBoolPtr(const char* label,bool* p_selected,ImGuiSele
 {
     return ImGui::Selectable(label,p_selected,flags,size);
 }
+CIMGUI_API bool igBeginListBox(const char* label,const ImVec2 size)
+{
+    return ImGui::BeginListBox(label,size);
+}
+CIMGUI_API void igEndListBox()
+{
+    return ImGui::EndListBox();
+}
 CIMGUI_API bool igListBoxStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int height_in_items)
 {
     return ImGui::ListBox(label,current_item,items,items_count,height_in_items);
@@ -949,18 +957,6 @@ CIMGUI_API bool igListBoxFnBoolPtr(const char* label,int* current_item,bool(*ite
 {
     return ImGui::ListBox(label,current_item,items_getter,data,items_count,height_in_items);
 }
-CIMGUI_API bool igListBoxHeaderVec2(const char* label,const ImVec2 size)
-{
-    return ImGui::ListBoxHeader(label,size);
-}
-CIMGUI_API bool igListBoxHeaderInt(const char* label,int items_count,int height_in_items)
-{
-    return ImGui::ListBoxHeader(label,items_count,height_in_items);
-}
-CIMGUI_API void igListBoxFooter()
-{
-    return ImGui::ListBoxFooter();
-}
 CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride)
 {
     return ImGui::PlotLines(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride);
@@ -1336,6 +1332,10 @@ CIMGUI_API void igSetItemAllowOverlap()
 {
     return ImGui::SetItemAllowOverlap();
 }
+CIMGUI_API ImGuiViewport* igGetMainViewport()
+{
+    return ImGui::GetMainViewport();
+}
 CIMGUI_API bool igIsRectVisibleNil(const ImVec2 size)
 {
     return ImGui::IsRectVisible(size);
@@ -1352,7 +1352,7 @@ CIMGUI_API int igGetFrameCount()
 {
     return ImGui::GetFrameCount();
 }
-CIMGUI_API ImDrawList* igGetBackgroundDrawList()
+CIMGUI_API ImDrawList* igGetBackgroundDrawListNil()
 {
     return ImGui::GetBackgroundDrawList();
 }
@@ -2412,6 +2412,22 @@ CIMGUI_API bool ImFont_IsGlyphRangeUnused(ImFont* self,unsigned int c_begin,unsi
 {
     return self->IsGlyphRangeUnused(c_begin,c_last);
 }
+CIMGUI_API ImGuiViewport* ImGuiViewport_ImGuiViewport(void)
+{
+    return IM_NEW(ImGuiViewport)();
+}
+CIMGUI_API void ImGuiViewport_destroy(ImGuiViewport* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImGuiViewport_GetCenter(ImVec2 *pOut,ImGuiViewport* self)
+{
+    *pOut = self->GetCenter();
+}
+CIMGUI_API void ImGuiViewport_GetWorkCenter(ImVec2 *pOut,ImGuiViewport* self)
+{
+    *pOut = self->GetWorkCenter();
+}
 CIMGUI_API ImGuiID igImHashData(const void* data,size_t data_size,ImU32 seed)
 {
     return ImHashData(data,data_size,seed);
@@ -2904,6 +2920,10 @@ CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self)
 {
     return self->ClearFreeMemory();
 }
+CIMGUI_API int ImDrawDataBuilder_GetDrawListCount(ImDrawDataBuilder* self)
+{
+    return self->GetDrawListCount();
+}
 CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self)
 {
     return self->FlattenIntoSingleLayer();
@@ -3064,6 +3084,26 @@ CIMGUI_API void ImGuiOldColumns_destroy(ImGuiOldColumns* self)
 {
     IM_DELETE(self);
 }
+CIMGUI_API ImGuiViewportP* ImGuiViewportP_ImGuiViewportP(void)
+{
+    return IM_NEW(ImGuiViewportP)();
+}
+CIMGUI_API void ImGuiViewportP_destroy(ImGuiViewportP* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImGuiViewportP_GetMainRect(ImRect *pOut,ImGuiViewportP* self)
+{
+    *pOut = self->GetMainRect();
+}
+CIMGUI_API void ImGuiViewportP_GetWorkRect(ImRect *pOut,ImGuiViewportP* self)
+{
+    *pOut = self->GetWorkRect();
+}
+CIMGUI_API void ImGuiViewportP_UpdateWorkRect(ImGuiViewportP* self)
+{
+    return self->UpdateWorkRect();
+}
 CIMGUI_API ImGuiWindowSettings* ImGuiWindowSettings_ImGuiWindowSettings(void)
 {
     return IM_NEW(ImGuiWindowSettings)();
@@ -3348,6 +3388,14 @@ CIMGUI_API ImDrawList* igGetForegroundDrawListWindowPtr(ImGuiWindow* window)
 {
     return ImGui::GetForegroundDrawList(window);
 }
+CIMGUI_API ImDrawList* igGetBackgroundDrawListViewportPtr(ImGuiViewport* viewport)
+{
+    return ImGui::GetBackgroundDrawList(viewport);
+}
+CIMGUI_API ImDrawList* igGetForegroundDrawListViewportPtr(ImGuiViewport* viewport)
+{
+    return ImGui::GetForegroundDrawList(viewport);
+}
 CIMGUI_API void igInitialize(ImGuiContext* context)
 {
     return ImGui::Initialize(context);
@@ -3372,10 +3420,14 @@ CIMGUI_API void igUpdateMouseMovingWindowEndFrame()
 {
     return ImGui::UpdateMouseMovingWindowEndFrame();
 }
-CIMGUI_API void igAddContextHook(ImGuiContext* context,const ImGuiContextHook* hook)
+CIMGUI_API ImGuiID igAddContextHook(ImGuiContext* context,const ImGuiContextHook* hook)
 {
     return ImGui::AddContextHook(context,hook);
 }
+CIMGUI_API void igRemoveContextHook(ImGuiContext* context,ImGuiID hook_to_remove)
+{
+    return ImGui::RemoveContextHook(context,hook_to_remove);
+}
 CIMGUI_API void igCallContextHooks(ImGuiContext* context,ImGuiContextHookType type)
 {
     return ImGui::CallContextHooks(context,type);
@@ -3560,6 +3612,14 @@ CIMGUI_API void igLogToBuffer(int auto_open_depth)
 {
     return ImGui::LogToBuffer(auto_open_depth);
 }
+CIMGUI_API void igLogRenderedText(const ImVec2* ref_pos,const char* text,const char* text_end)
+{
+    return ImGui::LogRenderedText(ref_pos,text,text_end);
+}
+CIMGUI_API void igLogSetNextTextDecoration(const char* prefix,const char* suffix)
+{
+    return ImGui::LogSetNextTextDecoration(prefix,suffix);
+}
 CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2 size_arg,bool border,ImGuiWindowFlags flags)
 {
     return ImGui::BeginChildEx(name,id,size_arg,border,flags);
@@ -3752,6 +3812,10 @@ CIMGUI_API void igTableOpenContextMenu(int column_n)
 {
     return ImGui::TableOpenContextMenu(column_n);
 }
+CIMGUI_API void igTableSetColumnEnabled(int column_n,bool enabled)
+{
+    return ImGui::TableSetColumnEnabled(column_n,enabled);
+}
 CIMGUI_API void igTableSetColumnWidth(int column_n,float width)
 {
     return ImGui::TableSetColumnWidth(column_n,width);
@@ -4000,10 +4064,6 @@ CIMGUI_API const char* igFindRenderedTextEnd(const char* text,const char* text_e
 {
     return ImGui::FindRenderedTextEnd(text,text_end);
 }
-CIMGUI_API void igLogRenderedText(const ImVec2* ref_pos,const char* text,const char* text_end)
-{
-    return ImGui::LogRenderedText(ref_pos,text,text_end);
-}
 CIMGUI_API void igRenderArrow(ImDrawList* draw_list,ImVec2 pos,ImU32 col,ImGuiDir dir,float scale)
 {
     return ImGui::RenderArrow(draw_list,pos,col,dir,scale);
@@ -4216,9 +4276,9 @@ CIMGUI_API void igDebugNodeDrawList(ImGuiWindow* window,const ImDrawList* draw_l
 {
     return ImGui::DebugNodeDrawList(window,draw_list,label);
 }
-CIMGUI_API void igDebugNodeDrawCmdShowMeshAndBoundingBox(ImGuiWindow* window,const ImDrawList* draw_list,const ImDrawCmd* draw_cmd,bool show_mesh,bool show_aabb)
+CIMGUI_API void igDebugNodeDrawCmdShowMeshAndBoundingBox(ImDrawList* out_draw_list,const ImDrawList* draw_list,const ImDrawCmd* draw_cmd,bool show_mesh,bool show_aabb)
 {
-    return ImGui::DebugNodeDrawCmdShowMeshAndBoundingBox(window,draw_list,draw_cmd,show_mesh,show_aabb);
+    return ImGui::DebugNodeDrawCmdShowMeshAndBoundingBox(out_draw_list,draw_list,draw_cmd,show_mesh,show_aabb);
 }
 CIMGUI_API void igDebugNodeStorage(ImGuiStorage* storage,const char* label)
 {
@@ -4248,9 +4308,17 @@ CIMGUI_API void igDebugNodeWindowsList(ImVector_ImGuiWindowPtr* windows,const ch
 {
     return ImGui::DebugNodeWindowsList(windows,label);
 }
-CIMGUI_API bool igImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas)
+CIMGUI_API void igDebugNodeViewport(ImGuiViewportP* viewport)
 {
-    return ImFontAtlasBuildWithStbTruetype(atlas);
+    return ImGui::DebugNodeViewport(viewport);
+}
+CIMGUI_API void igDebugRenderViewportThumbnail(ImDrawList* draw_list,ImGuiViewportP* viewport,const ImRect bb)
+{
+    return ImGui::DebugRenderViewportThumbnail(draw_list,viewport,bb);
+}
+CIMGUI_API const ImFontBuilderIO* igImFontAtlasGetBuilderForStbTruetype()
+{
+    return ImFontAtlasGetBuilderForStbTruetype();
 }
 CIMGUI_API void igImFontAtlasBuildInit(ImFontAtlas* atlas)
 {
@@ -4268,9 +4336,13 @@ CIMGUI_API void igImFontAtlasBuildFinish(ImFontAtlas* atlas)
 {
     return ImFontAtlasBuildFinish(atlas);
 }
-CIMGUI_API void igImFontAtlasBuildRender1bppRectFromString(ImFontAtlas* atlas,int atlas_x,int atlas_y,int w,int h,const char* in_str,char in_marker_char,unsigned char in_marker_pixel_value)
+CIMGUI_API void igImFontAtlasBuildRender8bppRectFromString(ImFontAtlas* atlas,int x,int y,int w,int h,const char* in_str,char in_marker_char,unsigned char in_marker_pixel_value)
 {
-    return ImFontAtlasBuildRender1bppRectFromString(atlas,atlas_x,atlas_y,w,h,in_str,in_marker_char,in_marker_pixel_value);
+    return ImFontAtlasBuildRender8bppRectFromString(atlas,x,y,w,h,in_str,in_marker_char,in_marker_pixel_value);
+}
+CIMGUI_API void igImFontAtlasBuildRender32bppRectFromString(ImFontAtlas* atlas,int x,int y,int w,int h,const char* in_str,char in_marker_char,unsigned int in_marker_pixel_value)
+{
+    return ImFontAtlasBuildRender32bppRectFromString(atlas,x,y,w,h,in_str,in_marker_char,in_marker_pixel_value);
 }
 CIMGUI_API void igImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256],float in_multiply_factor)
 {

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.80" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.81" from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 #ifndef CIMGUI_INCLUDED
 #define CIMGUI_INCLUDED
@@ -44,6 +44,7 @@ typedef unsigned __int64 ImU64;
 #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
 typedef struct ImGuiTableColumnSettings ImGuiTableColumnSettings;
 typedef struct ImGuiTableCellData ImGuiTableCellData;
+typedef struct ImGuiViewportP ImGuiViewportP;
 typedef struct ImGuiPtrOrIndex ImGuiPtrOrIndex;
 typedef struct ImGuiShrinkWidthItem ImGuiShrinkWidthItem;
 typedef struct ImGuiDataTypeTempStorage ImGuiDataTypeTempStorage;
@@ -88,6 +89,7 @@ typedef struct ImGuiStoragePair ImGuiStoragePair;
 typedef struct ImGuiTextRange ImGuiTextRange;
 typedef struct ImVec4 ImVec4;
 typedef struct ImVec2 ImVec2;
+typedef struct ImGuiViewport ImGuiViewport;
 typedef struct ImGuiTextFilter ImGuiTextFilter;
 typedef struct ImGuiTextBuffer ImGuiTextBuffer;
 typedef struct ImGuiTableColumnSortSpecs ImGuiTableColumnSortSpecs;
@@ -105,6 +107,7 @@ typedef struct ImColor ImColor;
 typedef struct ImFontGlyphRangesBuilder ImFontGlyphRangesBuilder;
 typedef struct ImFontGlyph ImFontGlyph;
 typedef struct ImFontConfig ImFontConfig;
+typedef struct ImFontBuilderIO ImFontBuilderIO;
 typedef struct ImFontAtlas ImFontAtlas;
 typedef struct ImFont ImFont;
 typedef struct ImDrawVert ImDrawVert;
@@ -124,6 +127,7 @@ struct ImDrawListSplitter;
 struct ImDrawVert;
 struct ImFont;
 struct ImFontAtlas;
+struct ImFontBuilderIO;
 struct ImFontConfig;
 struct ImFontGlyph;
 struct ImFontGlyphRangesBuilder;
@@ -141,6 +145,7 @@ struct ImGuiTableSortSpecs;
 struct ImGuiTableColumnSortSpecs;
 struct ImGuiTextBuffer;
 struct ImGuiTextFilter;
+struct ImGuiViewport;
 typedef int ImGuiCol;
 typedef int ImGuiCond;
 typedef int ImGuiDataType;
@@ -174,6 +179,7 @@ typedef int ImGuiTableFlags;
 typedef int ImGuiTableColumnFlags;
 typedef int ImGuiTableRowFlags;
 typedef int ImGuiTreeNodeFlags;
+typedef int ImGuiViewportFlags;
 typedef int ImGuiWindowFlags;
 typedef void* ImTextureID;
 typedef unsigned int ImGuiID;
@@ -275,6 +281,7 @@ typedef struct ImVector_ImGuiStyleMod {int Size;int Capacity;ImGuiStyleMod* Data
 typedef struct ImVector_ImGuiTabItem {int Size;int Capacity;ImGuiTabItem* Data;} ImVector_ImGuiTabItem;
 typedef struct ImVector_ImGuiTableColumnSortSpecs {int Size;int Capacity;ImGuiTableColumnSortSpecs* Data;} ImVector_ImGuiTableColumnSortSpecs;
 typedef struct ImVector_ImGuiTextRange {int Size;int Capacity;ImGuiTextRange* Data;} ImVector_ImGuiTextRange;
+typedef struct ImVector_ImGuiViewportPPtr {int Size;int Capacity;ImGuiViewportP** Data;} ImVector_ImGuiViewportPPtr;
 typedef struct ImVector_ImGuiWindowPtr {int Size;int Capacity;ImGuiWindow** Data;} ImVector_ImGuiWindowPtr;
 typedef struct ImVector_ImTextureID {int Size;int Capacity;ImTextureID* Data;} ImVector_ImTextureID;
 typedef struct ImVector_ImU32 {int Size;int Capacity;ImU32* Data;} ImVector_ImU32;
@@ -1079,10 +1086,10 @@ struct ImDrawList
 struct ImDrawData
 {
     bool Valid;
-    ImDrawList** CmdLists;
     int CmdListsCount;
     int TotalIdxCount;
     int TotalVtxCount;
+    ImDrawList** CmdLists;
     ImVec2 DisplayPos;
     ImVec2 DisplaySize;
     ImVec2 FramebufferScale;
@@ -1103,7 +1110,7 @@ struct ImFontConfig
     float GlyphMinAdvanceX;
     float GlyphMaxAdvanceX;
     bool MergeMode;
-    unsigned int RasterizerFlags;
+    unsigned int FontBuilderFlags;
     float RasterizerMultiply;
     ImWchar EllipsisChar;
     char Name[40];
@@ -1111,8 +1118,9 @@ struct ImFontConfig
 };
 struct ImFontGlyph
 {
-    unsigned int Codepoint : 31;
+    unsigned int Colored : 1;
     unsigned int Visible : 1;
+    unsigned int Codepoint : 30;
     float AdvanceX;
     float X0, Y0, X1, Y1;
     float U0, V0, U1, V1;
@@ -1153,6 +1161,8 @@ struct ImFontAtlas
     ImVector_ImFontAtlasCustomRect CustomRects;
     ImVector_ImFontConfig ConfigData;
     ImVec4 TexUvLines[(63) + 1];
+    const ImFontBuilderIO* FontBuilderIO;
+    unsigned int FontBuilderFlags;
     int PackIdMouseCursors;
     int PackIdLines;
 };
@@ -1175,6 +1185,20 @@ struct ImFont
     int MetricsTotalSurface;
     ImU8 Used4kPagesMap[(0xFFFF +1)/4096/8];
 };
+typedef enum {
+    ImGuiViewportFlags_None = 0,
+    ImGuiViewportFlags_IsPlatformWindow = 1 << 0,
+    ImGuiViewportFlags_IsPlatformMonitor = 1 << 1,
+    ImGuiViewportFlags_OwnedByApp = 1 << 2
+}ImGuiViewportFlags_;
+struct ImGuiViewport
+{
+    ImGuiViewportFlags Flags;
+    ImVec2 Pos;
+    ImVec2 Size;
+    ImVec2 WorkPos;
+    ImVec2 WorkSize;
+};
 struct StbUndoRecord
 {
    int where;
@@ -1560,6 +1584,18 @@ struct ImGuiOldColumns
     ImVector_ImGuiOldColumnData Columns;
     ImDrawListSplitter Splitter;
 };
+struct ImGuiViewportP
+{
+    ImGuiViewport _ImGuiViewport;
+    int DrawListsLastFrame[2];
+    ImDrawList* DrawLists[2];
+    ImDrawData DrawDataP;
+    ImDrawDataBuilder DrawDataBuilder;
+    ImVec2 WorkOffsetMin;
+    ImVec2 WorkOffsetMax;
+    ImVec2 CurrWorkOffsetMin;
+    ImVec2 CurrWorkOffsetMax;
+};
 struct ImGuiWindowSettings
 {
     ImGuiID ID;
@@ -1600,9 +1636,10 @@ struct ImGuiStackSizes
     short SizeOfGroupStack;
     short SizeOfBeginPopupStack;
 };
-typedef enum { ImGuiContextHookType_NewFramePre, ImGuiContextHookType_NewFramePost, ImGuiContextHookType_EndFramePre, ImGuiContextHookType_EndFramePost, ImGuiContextHookType_RenderPre, ImGuiContextHookType_RenderPost, ImGuiContextHookType_Shutdown }ImGuiContextHookType;
+typedef enum { ImGuiContextHookType_NewFramePre, ImGuiContextHookType_NewFramePost, ImGuiContextHookType_EndFramePre, ImGuiContextHookType_EndFramePost, ImGuiContextHookType_RenderPre, ImGuiContextHookType_RenderPost, ImGuiContextHookType_Shutdown, ImGuiContextHookType_PendingRemoval_ }ImGuiContextHookType;
 struct ImGuiContextHook
 {
+    ImGuiID HookId;
     ImGuiContextHookType Type;
     ImGuiID Owner;
     ImGuiContextHookCallback Callback;
@@ -1684,6 +1721,7 @@ struct ImGuiContext
     ImVector_ImGuiGroupData GroupStack;
     ImVector_ImGuiPopupData OpenPopupStack;
     ImVector_ImGuiPopupData BeginPopupStack;
+    ImVector_ImGuiViewportPPtr Viewports;
     ImGuiWindow* NavWindow;
     ImGuiID NavId;
     ImGuiID NavFocusScopeId;
@@ -1734,11 +1772,7 @@ struct ImGuiContext
     int FocusRequestNextCounterRegular;
     int FocusRequestNextCounterTabStop;
     bool FocusTabPressed;
-    ImDrawData DrawData;
-    ImDrawDataBuilder DrawDataBuilder;
     float DimBgRatio;
-    ImDrawList BackgroundDrawList;
-    ImDrawList ForegroundDrawList;
     ImGuiMouseCursor MouseCursor;
     bool DragDropActive;
     bool DragDropWithinSource;
@@ -1795,10 +1829,13 @@ struct ImGuiContext
     ImChunkStream_ImGuiWindowSettings SettingsWindows;
     ImChunkStream_ImGuiTableSettings SettingsTables;
     ImVector_ImGuiContextHook Hooks;
+    ImGuiID HookIdNext;
     bool LogEnabled;
     ImGuiLogType LogType;
     ImFileHandle LogFile;
     ImGuiTextBuffer LogBuffer;
+    const char* LogNextPrefix;
+    const char* LogNextSuffix;
     float LogLinePosY;
     bool LogLineFirstItem;
     int LogDepthRef;
@@ -2186,6 +2223,10 @@ struct ImGuiTableSettings
     ImGuiTableColumnIdx ColumnsCountMax;
     bool WantApply;
 };
+struct ImFontBuilderIO
+{
+    bool (*FontBuilder_Build)(ImFontAtlas* atlas);
+};
 #else
 struct GLFWwindow;
 struct SDL_Window;
@@ -2231,6 +2272,7 @@ typedef ImVector<ImGuiStyleMod> ImVector_ImGuiStyleMod;
 typedef ImVector<ImGuiTabItem> ImVector_ImGuiTabItem;
 typedef ImVector<ImGuiTableColumnSortSpecs> ImVector_ImGuiTableColumnSortSpecs;
 typedef ImVector<ImGuiTextRange> ImVector_ImGuiTextRange;
+typedef ImVector<ImGuiViewportP*> ImVector_ImGuiViewportPPtr;
 typedef ImVector<ImGuiWindow*> ImVector_ImGuiWindowPtr;
 typedef ImVector<ImTextureID> ImVector_ImTextureID;
 typedef ImVector<ImU32> ImVector_ImU32;
@@ -2465,11 +2507,10 @@ CIMGUI_API bool igCollapsingHeaderBoolPtr(const char* label,bool* p_visible,ImGu
 CIMGUI_API void igSetNextItemOpen(bool is_open,ImGuiCond cond);
 CIMGUI_API bool igSelectableBool(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size);
 CIMGUI_API bool igSelectableBoolPtr(const char* label,bool* p_selected,ImGuiSelectableFlags flags,const ImVec2 size);
+CIMGUI_API bool igBeginListBox(const char* label,const ImVec2 size);
+CIMGUI_API void igEndListBox(void);
 CIMGUI_API bool igListBoxStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int height_in_items);
 CIMGUI_API bool igListBoxFnBoolPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int height_in_items);
-CIMGUI_API bool igListBoxHeaderVec2(const char* label,const ImVec2 size);
-CIMGUI_API bool igListBoxHeaderInt(const char* label,int items_count,int height_in_items);
-CIMGUI_API void igListBoxFooter(void);
 CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride);
 CIMGUI_API void igPlotLinesFnFloatPtr(const char* label,float(*values_getter)(void* data,int idx),void* data,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size);
 CIMGUI_API void igPlotHistogramFloatPtr(const char* label,const float* values,int values_count,int values_offset,const char* overlay_text,float scale_min,float scale_max,ImVec2 graph_size,int stride);
@@ -2563,11 +2604,12 @@ CIMGUI_API void igGetItemRectMin(ImVec2 *pOut);
 CIMGUI_API void igGetItemRectMax(ImVec2 *pOut);
 CIMGUI_API void igGetItemRectSize(ImVec2 *pOut);
 CIMGUI_API void igSetItemAllowOverlap(void);
+CIMGUI_API ImGuiViewport* igGetMainViewport(void);
 CIMGUI_API bool igIsRectVisibleNil(const ImVec2 size);
 CIMGUI_API bool igIsRectVisibleVec2(const ImVec2 rect_min,const ImVec2 rect_max);
 CIMGUI_API double igGetTime(void);
 CIMGUI_API int igGetFrameCount(void);
-CIMGUI_API ImDrawList* igGetBackgroundDrawList(void);
+CIMGUI_API ImDrawList* igGetBackgroundDrawListNil(void);
 CIMGUI_API ImDrawList* igGetForegroundDrawListNil(void);
 CIMGUI_API ImDrawListSharedData* igGetDrawListSharedData(void);
 CIMGUI_API const char* igGetStyleColorName(ImGuiCol idx);
@@ -2832,6 +2874,10 @@ CIMGUI_API void ImFont_AddRemapChar(ImFont* self,ImWchar dst,ImWchar src,bool ov
 CIMGUI_API void ImFont_SetGlyphVisible(ImFont* self,ImWchar c,bool visible);
 CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c);
 CIMGUI_API bool ImFont_IsGlyphRangeUnused(ImFont* self,unsigned int c_begin,unsigned int c_last);
+CIMGUI_API ImGuiViewport* ImGuiViewport_ImGuiViewport(void);
+CIMGUI_API void ImGuiViewport_destroy(ImGuiViewport* self);
+CIMGUI_API void ImGuiViewport_GetCenter(ImVec2 *pOut,ImGuiViewport* self);
+CIMGUI_API void ImGuiViewport_GetWorkCenter(ImVec2 *pOut,ImGuiViewport* 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 ImU32 igImAlphaBlendColors(ImU32 col_a,ImU32 col_b);
@@ -2954,6 +3000,7 @@ CIMGUI_API void ImDrawListSharedData_destroy(ImDrawListSharedData* self);
 CIMGUI_API void ImDrawListSharedData_SetCircleSegmentMaxError(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);
 CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self);
 CIMGUI_API ImGuiStyleMod* ImGuiStyleMod_ImGuiStyleModInt(ImGuiStyleVar idx,int v);
 CIMGUI_API void ImGuiStyleMod_destroy(ImGuiStyleMod* self);
@@ -2994,6 +3041,11 @@ CIMGUI_API ImGuiOldColumnData* ImGuiOldColumnData_ImGuiOldColumnData(void);
 CIMGUI_API void ImGuiOldColumnData_destroy(ImGuiOldColumnData* self);
 CIMGUI_API ImGuiOldColumns* ImGuiOldColumns_ImGuiOldColumns(void);
 CIMGUI_API void ImGuiOldColumns_destroy(ImGuiOldColumns* self);
+CIMGUI_API ImGuiViewportP* ImGuiViewportP_ImGuiViewportP(void);
+CIMGUI_API void ImGuiViewportP_destroy(ImGuiViewportP* self);
+CIMGUI_API void ImGuiViewportP_GetMainRect(ImRect *pOut,ImGuiViewportP* self);
+CIMGUI_API void ImGuiViewportP_GetWorkRect(ImRect *pOut,ImGuiViewportP* self);
+CIMGUI_API void ImGuiViewportP_UpdateWorkRect(ImGuiViewportP* self);
 CIMGUI_API ImGuiWindowSettings* ImGuiWindowSettings_ImGuiWindowSettings(void);
 CIMGUI_API void ImGuiWindowSettings_destroy(ImGuiWindowSettings* self);
 CIMGUI_API char* ImGuiWindowSettings_GetName(ImGuiWindowSettings* self);
@@ -3065,13 +3117,16 @@ CIMGUI_API void igBringWindowToDisplayBack(ImGuiWindow* window);
 CIMGUI_API void igSetCurrentFont(ImFont* font);
 CIMGUI_API ImFont* igGetDefaultFont(void);
 CIMGUI_API ImDrawList* igGetForegroundDrawListWindowPtr(ImGuiWindow* window);
+CIMGUI_API ImDrawList* igGetBackgroundDrawListViewportPtr(ImGuiViewport* viewport);
+CIMGUI_API ImDrawList* igGetForegroundDrawListViewportPtr(ImGuiViewport* viewport);
 CIMGUI_API void igInitialize(ImGuiContext* context);
 CIMGUI_API void igShutdown(ImGuiContext* context);
 CIMGUI_API void igUpdateHoveredWindowAndCaptureFlags(void);
 CIMGUI_API void igStartMouseMovingWindow(ImGuiWindow* window);
 CIMGUI_API void igUpdateMouseMovingWindowNewFrame(void);
 CIMGUI_API void igUpdateMouseMovingWindowEndFrame(void);
-CIMGUI_API void igAddContextHook(ImGuiContext* context,const ImGuiContextHook* hook);
+CIMGUI_API ImGuiID igAddContextHook(ImGuiContext* context,const ImGuiContextHook* hook);
+CIMGUI_API void igRemoveContextHook(ImGuiContext* context,ImGuiID hook_to_remove);
 CIMGUI_API void igCallContextHooks(ImGuiContext* context,ImGuiContextHookType type);
 CIMGUI_API void igMarkIniSettingsDirtyNil(void);
 CIMGUI_API void igMarkIniSettingsDirtyWindowPtr(ImGuiWindow* window);
@@ -3118,6 +3173,8 @@ CIMGUI_API void igGetContentRegionMaxAbs(ImVec2 *pOut);
 CIMGUI_API void igShrinkWidths(ImGuiShrinkWidthItem* items,int count,float width_excess);
 CIMGUI_API void igLogBegin(ImGuiLogType type,int auto_open_depth);
 CIMGUI_API void igLogToBuffer(int auto_open_depth);
+CIMGUI_API void igLogRenderedText(const ImVec2* ref_pos,const char* text,const char* text_end);
+CIMGUI_API void igLogSetNextTextDecoration(const char* prefix,const char* suffix);
 CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2 size_arg,bool border,ImGuiWindowFlags flags);
 CIMGUI_API void igOpenPopupEx(ImGuiID id,ImGuiPopupFlags popup_flags);
 CIMGUI_API void igClosePopupToLevel(int remaining,bool restore_focus_to_window_under_popup);
@@ -3166,6 +3223,7 @@ CIMGUI_API ImGuiOldColumns* igFindOrCreateColumns(ImGuiWindow* window,ImGuiID id
 CIMGUI_API float igGetColumnOffsetFromNorm(const ImGuiOldColumns* columns,float offset_norm);
 CIMGUI_API float igGetColumnNormFromOffset(const ImGuiOldColumns* columns,float offset);
 CIMGUI_API void igTableOpenContextMenu(int column_n);
+CIMGUI_API void igTableSetColumnEnabled(int column_n,bool enabled);
 CIMGUI_API void igTableSetColumnWidth(int column_n,float width);
 CIMGUI_API void igTableSetColumnSortDirection(int column_n,ImGuiSortDirection sort_direction,bool append_to_sort_specs);
 CIMGUI_API int igTableGetHoveredColumn(void);
@@ -3228,7 +3286,6 @@ 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 igRenderNavHighlight(const ImRect bb,ImGuiID id,ImGuiNavHighlightFlags flags);
 CIMGUI_API const char* igFindRenderedTextEnd(const char* text,const char* text_end);
-CIMGUI_API void igLogRenderedText(const ImVec2* ref_pos,const char* text,const char* text_end);
 CIMGUI_API void igRenderArrow(ImDrawList* draw_list,ImVec2 pos,ImU32 col,ImGuiDir dir,float scale);
 CIMGUI_API void igRenderBullet(ImDrawList* draw_list,ImVec2 pos,ImU32 col);
 CIMGUI_API void igRenderCheckMark(ImDrawList* draw_list,ImVec2 pos,ImU32 col,float sz);
@@ -3282,7 +3339,7 @@ CIMGUI_API void igDebugDrawItemRect(ImU32 col);
 CIMGUI_API void igDebugStartItemPicker(void);
 CIMGUI_API void igDebugNodeColumns(ImGuiOldColumns* columns);
 CIMGUI_API void igDebugNodeDrawList(ImGuiWindow* window,const ImDrawList* draw_list,const char* label);
-CIMGUI_API void igDebugNodeDrawCmdShowMeshAndBoundingBox(ImGuiWindow* window,const ImDrawList* draw_list,const ImDrawCmd* draw_cmd,bool show_mesh,bool show_aabb);
+CIMGUI_API void igDebugNodeDrawCmdShowMeshAndBoundingBox(ImDrawList* out_draw_list,const ImDrawList* draw_list,const ImDrawCmd* draw_cmd,bool show_mesh,bool show_aabb);
 CIMGUI_API void igDebugNodeStorage(ImGuiStorage* storage,const char* label);
 CIMGUI_API void igDebugNodeTabBar(ImGuiTabBar* tab_bar,const char* label);
 CIMGUI_API void igDebugNodeTable(ImGuiTable* table);
@@ -3290,12 +3347,15 @@ 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 bool igImFontAtlasBuildWithStbTruetype(ImFontAtlas* atlas);
+CIMGUI_API void igDebugNodeViewport(ImGuiViewportP* viewport);
+CIMGUI_API void igDebugRenderViewportThumbnail(ImDrawList* draw_list,ImGuiViewportP* viewport,const ImRect bb);
+CIMGUI_API const ImFontBuilderIO* igImFontAtlasGetBuilderForStbTruetype(void);
 CIMGUI_API void igImFontAtlasBuildInit(ImFontAtlas* atlas);
 CIMGUI_API void igImFontAtlasBuildSetupFont(ImFontAtlas* atlas,ImFont* font,ImFontConfig* font_config,float ascent,float descent);
 CIMGUI_API void igImFontAtlasBuildPackCustomRects(ImFontAtlas* atlas,void* stbrp_context_opaque);
 CIMGUI_API void igImFontAtlasBuildFinish(ImFontAtlas* atlas);
-CIMGUI_API void igImFontAtlasBuildRender1bppRectFromString(ImFontAtlas* atlas,int atlas_x,int atlas_y,int w,int h,const char* in_str,char in_marker_char,unsigned char in_marker_pixel_value);
+CIMGUI_API void igImFontAtlasBuildRender8bppRectFromString(ImFontAtlas* atlas,int x,int y,int w,int h,const char* in_str,char in_marker_char,unsigned char in_marker_pixel_value);
+CIMGUI_API void igImFontAtlasBuildRender32bppRectFromString(ImFontAtlas* atlas,int x,int y,int w,int h,const char* in_str,char in_marker_char,unsigned int in_marker_pixel_value);
 CIMGUI_API void igImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256],float in_multiply_factor);
 CIMGUI_API void igImFontAtlasBuildMultiplyRectAlpha8(const unsigned char table[256],unsigned char* pixels,int x,int y,int w,int h,int stride);
 

generator/cpp2ffi.lua

@@ -165,8 +165,11 @@ local function parse_enum_value(value, allenums,dontpost)
 		--already in allenums
 		if allenums[clean(value)] then return allenums[clean(value)] end
 		--must be several and operators
-		--precedence order (hope not ())
+		------------precedence order (hope not ())
-		assert(not value:match("[%(%)]"))
+		--first drop outer ()
+		value = value:gsub("^(%()",""):gsub("(%))$","")
+		assert(not value:match("[%(%)]"),value)
+		
 		local several,seps = strsplit(value,"([<>&|~%+]+)") 
 		--M.prtable(value,several,seps)
 		assert(#seps+1==#several)
@@ -182,6 +185,9 @@ local function parse_enum_value(value, allenums,dontpost)
 				local val2 = clean(several[i+1])
 				if allenums[val1] then val1 = allenums[val1] end
 				if allenums[val2] then val2 = allenums[val2] end
+				--clean 1u
+				if type(val1)=="string" then val1 = val1:gsub("(%d)(u)$","%1") end
+				if type(val2)=="string" then val2 = val2:gsub("(%d)(u)$","%1") end
 				--for getting numbers from "1ULL"
 				if type(val1)=="string" then val1 = loadstring("return "..val1)() end
 				if type(val2)=="string" then val2 = loadstring("return "..val2)() end
@@ -414,14 +420,13 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
 end
 M.parseItems = parseItems
 local function name_overloadsAlgo(v)
+
     local aa = {}
     local bb = {}
     local done = {}
     local maxnum = 0
     for i,t in ipairs(v) do
         bb[i] = ""
-        --local signature = t.signature:sub(2,-2) -- without parenthesis
-		--inside parenthesis
 		local signature = t.signature:match("%b()")
 		signature = signature:sub(2,-2)
 		--add const function
@@ -430,47 +435,52 @@ local function name_overloadsAlgo(v)
 		end
         aa[i] = {}
         local num = 1
-        --for typec in t.signature:gmatch(".-([^,%(%s]+)[,%)]") do
-        --for typec in t.signature:gmatch(".-([^,%(]+)[,%)]") do
-        --for typec in signature:gmatch(".-([^,]+),?") do
         for typec in signature:gsub("(%(.-%))", function(x) return x:gsub(",","\0") end):gmatch(".-([^,]+),?") do
-            --typec = typec:gsub
             aa[i][num] = typec:gsub("%z+", ",")
             num = num + 1
         end
         num = num - 1
         maxnum = (num > maxnum) and num or maxnum
     end
-    
+
     for l=1,maxnum do
         local keys = {}
         local diferent = true
         local equal = true
         for i=1,#v do
             aa[i][l] = aa[i][l] or "nil"
-            keys[aa[i][l]] = 1 + (aa[i][l] and keys[aa[i][l]] or 0)
+            keys[aa[i][l]] = 1 + (keys[aa[i][l]] or 0)
             if not done[i] then
-            for j=i+1,#v do
+                for j=i+1,#v do
-                if not done[j] then
+                    if not done[j] then
-                if aa[i][l] == aa[j][l] then
+                        if aa[i][l] == aa[j][l] then
-                    diferent = false
+                            diferent = false
-                else
+                        else
-                    equal = false
+                            equal = false
+                        end
+                    end
                 end
-                end
-            end
             end
         end
         if not equal then -- not all the same
             for i=1,#v do
                 if not done[i] then
                     bb[i] = bb[i]..(aa[i][l]=="nil" and "" or aa[i][l])
-                    if keys[aa[i][l]] == 1 then
+                    -- if keys[aa[i][l]] == 1 then
-                        done[i] = true
+                        -- done[i] = true
-                    end
+                    -- end
                 end
             end
         end
+		--test done
+		for i=1,#v do
+			done[i] = true
+			for j=1,#v do
+				if i~=j and bb[i]==bb[j] then
+					done[i] = false
+				end
+			end
+		end
     end
 	--avoid empty postfix which will be reserved to generic
 	for i,v in ipairs(bb) do if v=="" then bb[i]="Nil" end end
@@ -493,6 +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("Im","")
     typ = typ:gsub("[<>]","")
     return typ
@@ -769,6 +780,84 @@ local function AdjustArguments(FP)
         end
     end
 end
+local function ADDIMSTR_S(FP)
+    local defsT = FP.defsT
+    local newcdefs = {}
+    for numcdef,t in ipairs(FP.funcdefs) do
+		newcdefs[#newcdefs+1] = t
+        if t.cimguiname then
+        local cimf = defsT[t.cimguiname]
+        local defT = cimf[t.signature]
+
+        --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
+		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
+		if isIMSTR then
+            --passing as a pointer arg
+            local defT2 = {}
+            --first strings
+            for k,v in pairs(defT) do
+                defT2[k] = v
+            end
+            --then argsT table
+            defT2.argsT = {}
+            for k,v in ipairs(defT.argsT) do
+				local typ = v.type == "ImStr" and "const char*" or v.type
+                table.insert(defT2.argsT,{type=typ,name=v.name})
+            end
+			--defaults table
+			defT2.defaults = {}
+			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
+			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
+					if v.ret then --function pointer
+						caar = caar .. name .. ","
+					else
+						local callname = v.reftoptr and "*"..name or name 
+						caar = caar .. callname .. ","
+					end
+				end
+				caar = caar:sub(1,-2)..")"
+			else
+				caar = "()"
+			end
+			defT2.call_args = caar --:gsub("ImStr%(([^%(%)]+)%)","%1") --unwrap
+			------------------
+            defT2.signature = defT.signature:gsub("ImStr","const char*") --.."_S"
+            defT2.ov_cimguiname = defT2.ov_cimguiname .. "_Strv"
+            defT2.isIMSTR_S = 1
+			-- check there is not an equal version in imgui_stname
+			local doadd = true
+			for i,dd in ipairs(cimf) do
+				if dd.signature == defT2.signature then 
+					doadd = false;
+					print("skip _S addition",defT2.cimguiname)
+					break 
+				end
+			end
+			--add _S version
+			if doadd then
+			cimf[#cimf+1] = defT2
+			cimf[defT2.signature] = defT2
+			newcdefs[#newcdefs+1] = {stname=t.stname,funcname=t.funcname,args=defT2.args,signature=defT2.signature,cimguiname=defT2.cimguiname,ret =defT2.ret}
+			end
+        end
+		else print("not cimguiname in");M.prtable(t)
+        end
+    end
+	FP.funcdefs = newcdefs
+end
 local function ADDnonUDT(FP)
     local defsT = FP.defsT
     --local newcdefs = {}
@@ -1491,6 +1580,7 @@ function M.Parser()
         for k,v in pairs(self.alltypes) do print(k, typetoStr(k) ) end
     end
     function par:compute_overloads()
+		--ADDIMSTR_S(self)
         local strt = {}
         local numoverloaded = 0
         self.alltypes = {}
@@ -1506,8 +1596,15 @@ function M.Parser()
                 for i,t in ipairs(v) do
                     --take overloaded name from manual table or algorythm
                     t.ov_cimguiname = self.getCname_overload(t.stname,t.funcname,t.signature,t.namespace) or k..typetoStr(post[i])
+					--check ...
+					if( t.ov_cimguiname:match"%.%.%.") then
+						print("... in ov",t.ov_cimguiname)
+						for i,dd in ipairs(v) do
+							print(dd.signature,post[i])
+						end
+						error"Bad check ..."
+					end
                     table.insert(strt,string.format("%d\t%s\t%s %s",i,t.ret,t.ov_cimguiname,t.signature))
-                    --M.prtable(typesc[i],post)
                 end
                 --check not two names are equal (produced by bad cimguiname_overload)
                 for i=1,#v-1 do 
@@ -1525,8 +1622,10 @@ function M.Parser()
 		end)
         --print(numoverloaded, "overloaded")
         table.insert(strt,string.format("%d overloaded",numoverloaded))
+		ADDIMSTR_S(self)
 		AdjustArguments(self)
 		ADDnonUDT(self)
+
 		--ADDdestructors(self)
         self.overloadstxt  = table.concat(strt,"\n")
     end

generator/generator.lua

@@ -313,6 +313,9 @@ local function cimgui_generation(parser)
 	if gdefines.IMGUI_HAS_DOCK then
 		cstructsstr = cstructsstr.."\n#define IMGUI_HAS_DOCK       1\n"
 	end
+	if gdefines.IMGUI_HAS_IMSTR then
+		cstructsstr = cstructsstr.."\n#define IMGUI_HAS_IMSTR       1\n"
+	end
 	
     hstrfile = hstrfile:gsub([[#include "imgui_structs%.h"]],cstructsstr)
     local cfuncsstr = func_header_generate(parser)
@@ -333,13 +336,13 @@ end
 --------------------------------------------------------
 --get imgui.h version and IMGUI_HAS_DOCK--------------------------
 --get some defines wont work for cl ----------------
-gdefines = get_defines{"IMGUI_VERSION","FLT_MAX","FLT_MIN","IMGUI_HAS_DOCK"}
+gdefines = get_defines{"IMGUI_VERSION","FLT_MAX","FLT_MIN","IMGUI_HAS_DOCK","IMGUI_HAS_IMSTR"}
 --this will work for cl
 local pipe,err = io.open("../imgui/imgui.h","r")
 if not pipe then
     error("could not open file:"..err)
 end
-local imgui_version,has_dock
+local imgui_version,has_dock,has_imstr 
 while true do
     local line = pipe:read"*l"
 	if not line then break end
@@ -349,11 +352,15 @@ while true do
 	if not has_dock then
 		has_dock = line:match([[#define%s+IMGUI_HAS_DOCK]])--%s*(".+")]])
 	end
-    if imgui_version and has_dock then break end
+	if not has_imstr then
+		has_imstr = line:match([[#define%s+IMGUI_HAS_IMSTR]])--%s*(".+")]])
+	end
+    if imgui_version and has_dock and has_imstr then break end
 end
 pipe:close()
 
 if has_dock then gdefines.IMGUI_HAS_DOCK = true end
+if has_imstr then gdefines.IMGUI_HAS_IMSTR = true end
 
 cimgui_header = cimgui_header:gsub("XXX",imgui_version)
 if INTERNAL_GENERATION then
@@ -369,6 +376,7 @@ if gdefines.IMGUI_HAS_DOCK then
 ]]
 	
 end
+print("IMGUI_HAS_IMSTR",gdefines.IMGUI_HAS_IMSTR)
 print("IMGUI_HAS_DOCK",gdefines.IMGUI_HAS_DOCK)
 print("IMGUI_VERSION",imgui_version)
 

generator/output/cimgui_impl.h

@@ -6,6 +6,7 @@ struct GLFWwindow;
 struct SDL_Window;
 typedef union SDL_Event SDL_Event;CIMGUI_API bool ImGui_ImplGlfw_InitForOpenGL(GLFWwindow* window,bool install_callbacks);
 CIMGUI_API bool ImGui_ImplGlfw_InitForVulkan(GLFWwindow* window,bool install_callbacks);
+CIMGUI_API bool ImGui_ImplGlfw_InitForOther(GLFWwindow* window,bool install_callbacks);
 CIMGUI_API void ImGui_ImplGlfw_Shutdown();
 CIMGUI_API void ImGui_ImplGlfw_NewFrame();
 CIMGUI_API void ImGui_ImplGlfw_MouseButtonCallback(GLFWwindow* window,int button,int action,int mods);

generator/output/impl_definitions.json

@@ -17,7 +17,7 @@
       "cimguiname": "ImGui_ImplGlfw_CharCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_CharCallback",
-      "location": "imgui_impl_glfw:35",
+      "location": "imgui_impl_glfw:36",
       "ov_cimguiname": "ImGui_ImplGlfw_CharCallback",
       "ret": "void",
       "signature": "(GLFWwindow*,unsigned int)",
@@ -49,6 +49,31 @@
       "stname": ""
     }
   ],
+  "ImGui_ImplGlfw_InitForOther": [
+    {
+      "args": "(GLFWwindow* window,bool install_callbacks)",
+      "argsT": [
+        {
+          "name": "window",
+          "type": "GLFWwindow*"
+        },
+        {
+          "name": "install_callbacks",
+          "type": "bool"
+        }
+      ],
+      "argsoriginal": "(GLFWwindow* window,bool install_callbacks)",
+      "call_args": "(window,install_callbacks)",
+      "cimguiname": "ImGui_ImplGlfw_InitForOther",
+      "defaults": {},
+      "funcname": "ImGui_ImplGlfw_InitForOther",
+      "location": "imgui_impl_glfw:26",
+      "ov_cimguiname": "ImGui_ImplGlfw_InitForOther",
+      "ret": "bool",
+      "signature": "(GLFWwindow*,bool)",
+      "stname": ""
+    }
+  ],
   "ImGui_ImplGlfw_InitForVulkan": [
     {
       "args": "(GLFWwindow* window,bool install_callbacks)",
@@ -104,7 +129,7 @@
       "cimguiname": "ImGui_ImplGlfw_KeyCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_KeyCallback",
-      "location": "imgui_impl_glfw:34",
+      "location": "imgui_impl_glfw:35",
       "ov_cimguiname": "ImGui_ImplGlfw_KeyCallback",
       "ret": "void",
       "signature": "(GLFWwindow*,int,int,int,int)",
@@ -137,7 +162,7 @@
       "cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_MouseButtonCallback",
-      "location": "imgui_impl_glfw:32",
+      "location": "imgui_impl_glfw:33",
       "ov_cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
       "ret": "void",
       "signature": "(GLFWwindow*,int,int,int)",
@@ -153,7 +178,7 @@
       "cimguiname": "ImGui_ImplGlfw_NewFrame",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_NewFrame",
-      "location": "imgui_impl_glfw:27",
+      "location": "imgui_impl_glfw:28",
       "ov_cimguiname": "ImGui_ImplGlfw_NewFrame",
       "ret": "void",
       "signature": "()",
@@ -182,7 +207,7 @@
       "cimguiname": "ImGui_ImplGlfw_ScrollCallback",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_ScrollCallback",
-      "location": "imgui_impl_glfw:33",
+      "location": "imgui_impl_glfw:34",
       "ov_cimguiname": "ImGui_ImplGlfw_ScrollCallback",
       "ret": "void",
       "signature": "(GLFWwindow*,double,double)",
@@ -198,7 +223,7 @@
       "cimguiname": "ImGui_ImplGlfw_Shutdown",
       "defaults": {},
       "funcname": "ImGui_ImplGlfw_Shutdown",
-      "location": "imgui_impl_glfw:26",
+      "location": "imgui_impl_glfw:27",
       "ov_cimguiname": "ImGui_ImplGlfw_Shutdown",
       "ret": "void",
       "signature": "()",

generator/output/impl_definitions.lua

@@ -14,7 +14,7 @@ defs["ImGui_ImplGlfw_CharCallback"][1]["call_args"] = "(window,c)"
 defs["ImGui_ImplGlfw_CharCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_CharCallback"
 defs["ImGui_ImplGlfw_CharCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_CharCallback"][1]["funcname"] = "ImGui_ImplGlfw_CharCallback"
-defs["ImGui_ImplGlfw_CharCallback"][1]["location"] = "imgui_impl_glfw:35"
+defs["ImGui_ImplGlfw_CharCallback"][1]["location"] = "imgui_impl_glfw:36"
 defs["ImGui_ImplGlfw_CharCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_CharCallback"
 defs["ImGui_ImplGlfw_CharCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_CharCallback"][1]["signature"] = "(GLFWwindow*,unsigned int)"
@@ -41,6 +41,27 @@ defs["ImGui_ImplGlfw_InitForOpenGL"][1]["ret"] = "bool"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["signature"] = "(GLFWwindow*,bool)"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["stname"] = ""
 defs["ImGui_ImplGlfw_InitForOpenGL"]["(GLFWwindow*,bool)"] = defs["ImGui_ImplGlfw_InitForOpenGL"][1]
+defs["ImGui_ImplGlfw_InitForOther"] = {}
+defs["ImGui_ImplGlfw_InitForOther"][1] = {}
+defs["ImGui_ImplGlfw_InitForOther"][1]["args"] = "(GLFWwindow* window,bool install_callbacks)"
+defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"] = {}
+defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][1] = {}
+defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][1]["name"] = "window"
+defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][1]["type"] = "GLFWwindow*"
+defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][2] = {}
+defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][2]["name"] = "install_callbacks"
+defs["ImGui_ImplGlfw_InitForOther"][1]["argsT"][2]["type"] = "bool"
+defs["ImGui_ImplGlfw_InitForOther"][1]["argsoriginal"] = "(GLFWwindow* window,bool install_callbacks)"
+defs["ImGui_ImplGlfw_InitForOther"][1]["call_args"] = "(window,install_callbacks)"
+defs["ImGui_ImplGlfw_InitForOther"][1]["cimguiname"] = "ImGui_ImplGlfw_InitForOther"
+defs["ImGui_ImplGlfw_InitForOther"][1]["defaults"] = {}
+defs["ImGui_ImplGlfw_InitForOther"][1]["funcname"] = "ImGui_ImplGlfw_InitForOther"
+defs["ImGui_ImplGlfw_InitForOther"][1]["location"] = "imgui_impl_glfw:26"
+defs["ImGui_ImplGlfw_InitForOther"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_InitForOther"
+defs["ImGui_ImplGlfw_InitForOther"][1]["ret"] = "bool"
+defs["ImGui_ImplGlfw_InitForOther"][1]["signature"] = "(GLFWwindow*,bool)"
+defs["ImGui_ImplGlfw_InitForOther"][1]["stname"] = ""
+defs["ImGui_ImplGlfw_InitForOther"]["(GLFWwindow*,bool)"] = defs["ImGui_ImplGlfw_InitForOther"][1]
 defs["ImGui_ImplGlfw_InitForVulkan"] = {}
 defs["ImGui_ImplGlfw_InitForVulkan"][1] = {}
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["args"] = "(GLFWwindow* window,bool install_callbacks)"
@@ -86,7 +107,7 @@ defs["ImGui_ImplGlfw_KeyCallback"][1]["call_args"] = "(window,key,scancode,actio
 defs["ImGui_ImplGlfw_KeyCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_KeyCallback"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_KeyCallback"][1]["funcname"] = "ImGui_ImplGlfw_KeyCallback"
-defs["ImGui_ImplGlfw_KeyCallback"][1]["location"] = "imgui_impl_glfw:34"
+defs["ImGui_ImplGlfw_KeyCallback"][1]["location"] = "imgui_impl_glfw:35"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_KeyCallback"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["signature"] = "(GLFWwindow*,int,int,int,int)"
@@ -113,7 +134,7 @@ defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["call_args"] = "(window,button,act
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_MouseButtonCallback"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["funcname"] = "ImGui_ImplGlfw_MouseButtonCallback"
-defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["location"] = "imgui_impl_glfw:32"
+defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["location"] = "imgui_impl_glfw:33"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_MouseButtonCallback"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["signature"] = "(GLFWwindow*,int,int,int)"
@@ -128,7 +149,7 @@ defs["ImGui_ImplGlfw_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplGlfw_NewFrame"][1]["cimguiname"] = "ImGui_ImplGlfw_NewFrame"
 defs["ImGui_ImplGlfw_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_NewFrame"][1]["funcname"] = "ImGui_ImplGlfw_NewFrame"
-defs["ImGui_ImplGlfw_NewFrame"][1]["location"] = "imgui_impl_glfw:27"
+defs["ImGui_ImplGlfw_NewFrame"][1]["location"] = "imgui_impl_glfw:28"
 defs["ImGui_ImplGlfw_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_NewFrame"
 defs["ImGui_ImplGlfw_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_NewFrame"][1]["signature"] = "()"
@@ -152,7 +173,7 @@ defs["ImGui_ImplGlfw_ScrollCallback"][1]["call_args"] = "(window,xoffset,yoffset
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_ScrollCallback"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["funcname"] = "ImGui_ImplGlfw_ScrollCallback"
-defs["ImGui_ImplGlfw_ScrollCallback"][1]["location"] = "imgui_impl_glfw:33"
+defs["ImGui_ImplGlfw_ScrollCallback"][1]["location"] = "imgui_impl_glfw:34"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_ScrollCallback"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["signature"] = "(GLFWwindow*,double,double)"
@@ -167,7 +188,7 @@ defs["ImGui_ImplGlfw_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplGlfw_Shutdown"][1]["cimguiname"] = "ImGui_ImplGlfw_Shutdown"
 defs["ImGui_ImplGlfw_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_Shutdown"][1]["funcname"] = "ImGui_ImplGlfw_Shutdown"
-defs["ImGui_ImplGlfw_Shutdown"][1]["location"] = "imgui_impl_glfw:26"
+defs["ImGui_ImplGlfw_Shutdown"][1]["location"] = "imgui_impl_glfw:27"
 defs["ImGui_ImplGlfw_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_Shutdown"
 defs["ImGui_ImplGlfw_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_Shutdown"][1]["signature"] = "()"

generator/output/overloads.txt

@@ -112,13 +112,17 @@ igCombo	3
 1	bool	igComboStr_arr (const char*,int*,const char* const[],int,int)
 2	bool	igComboStr (const char*,int*,const char*,int)
 3	bool	igComboFnBoolPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int)
+igGetBackgroundDrawList	2
+1	ImDrawList*	igGetBackgroundDrawListNil ()
+2	ImDrawList*	igGetBackgroundDrawListViewportPtr (ImGuiViewport*)
 igGetColorU32	3
 1	ImU32	igGetColorU32Col (ImGuiCol,float)
 2	ImU32	igGetColorU32Vec4 (const ImVec4)
 3	ImU32	igGetColorU32U32 (ImU32)
-igGetForegroundDrawList	2
+igGetForegroundDrawList	3
 1	ImDrawList*	igGetForegroundDrawListNil ()
 2	ImDrawList*	igGetForegroundDrawListWindowPtr (ImGuiWindow*)
+3	ImDrawList*	igGetForegroundDrawListViewportPtr (ImGuiViewport*)
 igGetID	3
 1	ImGuiID	igGetIDStr (const char*)
 2	ImGuiID	igGetIDStrStr (const char*,const char*)
@@ -160,9 +164,6 @@ igItemSize	2
 igListBox	2
 1	bool	igListBoxStr_arr (const char*,int*,const char* const[],int,int)
 2	bool	igListBoxFnBoolPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int)
-igListBoxHeader	2
-1	bool	igListBoxHeaderVec2 (const char*,const ImVec2)
-2	bool	igListBoxHeaderInt (const char*,int,int)
 igMarkIniSettingsDirty	2
 1	void	igMarkIniSettingsDirtyNil ()
 2	void	igMarkIniSettingsDirtyWindowPtr (ImGuiWindow*)
@@ -244,4 +245,4 @@ igValue	4
 2	void	igValueInt (const char*,int)
 3	void	igValueUint (const char*,unsigned int)
 4	void	igValueFloat (const char*,float,const char*)
-172 overloaded
+173 overloaded

generator/output/structs_and_enums.json

@@ -844,6 +844,11 @@
         "calc_value": 6,
         "name": "ImGuiContextHookType_Shutdown",
         "value": "6"
+      },
+      {
+        "calc_value": 7,
+        "name": "ImGuiContextHookType_PendingRemoval_",
+        "value": "7"
       }
     ],
     "ImGuiDataTypePrivate_": [
@@ -2917,6 +2922,28 @@
         "value": "ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_NoAutoOpenOnLog"
       }
     ],
+    "ImGuiViewportFlags_": [
+      {
+        "calc_value": 0,
+        "name": "ImGuiViewportFlags_None",
+        "value": "0"
+      },
+      {
+        "calc_value": 1,
+        "name": "ImGuiViewportFlags_IsPlatformWindow",
+        "value": "1 << 0"
+      },
+      {
+        "calc_value": 2,
+        "name": "ImGuiViewportFlags_IsPlatformMonitor",
+        "value": "1 << 1"
+      },
+      {
+        "calc_value": 4,
+        "name": "ImGuiViewportFlags_OwnedByApp",
+        "value": "1 << 2"
+      }
+    ],
     "ImGuiWindowFlags_": [
       {
         "calc_value": 0,
@@ -3072,135 +3099,139 @@
   },
   "enumtypes": [],
   "locations": {
-    "ImBitVector": "imgui_internal:499",
+    "ImBitVector": "imgui_internal:506",
-    "ImColor": "imgui:2179",
+    "ImColor": "imgui:2197",
-    "ImDrawChannel": "imgui:2273",
+    "ImDrawChannel": "imgui:2291",
-    "ImDrawCmd": "imgui:2228",
+    "ImDrawCmd": "imgui:2246",
-    "ImDrawCmdHeader": "imgui:2265",
+    "ImDrawCmdHeader": "imgui:2283",
-    "ImDrawCornerFlags_": "imgui:2297",
+    "ImDrawCornerFlags_": "imgui:2315",
-    "ImDrawData": "imgui:2452",
+    "ImDrawData": "imgui:2471",
-    "ImDrawDataBuilder": "imgui_internal:643",
+    "ImDrawDataBuilder": "imgui_internal:651",
-    "ImDrawList": "imgui:2330",
+    "ImDrawList": "imgui:2349",
-    "ImDrawListFlags_": "imgui:2313",
+    "ImDrawListFlags_": "imgui:2331",
-    "ImDrawListSharedData": "imgui_internal:624",
+    "ImDrawListSharedData": "imgui_internal:632",
-    "ImDrawListSplitter": "imgui:2282",
+    "ImDrawListSplitter": "imgui:2300",
-    "ImDrawVert": "imgui:2250",
+    "ImDrawVert": "imgui:2268",
-    "ImFont": "imgui:2663",
+    "ImFont": "imgui:2686",
-    "ImFontAtlas": "imgui:2568",
+    "ImFontAtlas": "imgui:2587",
-    "ImFontAtlasCustomRect": "imgui:2530",
+    "ImFontAtlasCustomRect": "imgui:2549",
-    "ImFontAtlasFlags_": "imgui:2543",
+    "ImFontAtlasFlags_": "imgui:2562",
-    "ImFontConfig": "imgui:2475",
+    "ImFontBuilderIO": "imgui_internal:2525",
-    "ImFontGlyph": "imgui:2504",
+    "ImFontConfig": "imgui:2493",
-    "ImFontGlyphRangesBuilder": "imgui:2515",
+    "ImFontGlyph": "imgui:2522",
-    "ImGuiAxis": "imgui_internal:780",
+    "ImFontGlyphRangesBuilder": "imgui:2534",
-    "ImGuiBackendFlags_": "imgui:1355",
+    "ImGuiAxis": "imgui_internal:789",
-    "ImGuiButtonFlagsPrivate_": "imgui_internal:694",
+    "ImGuiBackendFlags_": "imgui:1369",
-    "ImGuiButtonFlags_": "imgui:1461",
+    "ImGuiButtonFlagsPrivate_": "imgui_internal:703",
-    "ImGuiCol_": "imgui:1365",
+    "ImGuiButtonFlags_": "imgui:1475",
-    "ImGuiColorEditFlags_": "imgui:1474",
+    "ImGuiCol_": "imgui:1379",
-    "ImGuiColorMod": "imgui_internal:887",
+    "ImGuiColorEditFlags_": "imgui:1488",
-    "ImGuiComboFlags_": "imgui:994",
+    "ImGuiColorMod": "imgui_internal:896",
-    "ImGuiCond_": "imgui:1566",
+    "ImGuiComboFlags_": "imgui:1008",
-    "ImGuiConfigFlags_": "imgui:1339",
+    "ImGuiCond_": "imgui:1580",
-    "ImGuiContext": "imgui_internal:1241",
+    "ImGuiConfigFlags_": "imgui:1353",
-    "ImGuiContextHook": "imgui_internal:1227",
+    "ImGuiContext": "imgui_internal:1268",
-    "ImGuiContextHookType": "imgui_internal:1225",
+    "ImGuiContextHook": "imgui_internal:1253",
-    "ImGuiDataTypeInfo": "imgui_internal:870",
+    "ImGuiContextHookType": "imgui_internal:1251",
-    "ImGuiDataTypePrivate_": "imgui_internal:879",
+    "ImGuiDataTypeInfo": "imgui_internal:879",
-    "ImGuiDataTypeTempStorage": "imgui_internal:864",
+    "ImGuiDataTypePrivate_": "imgui_internal:888",
-    "ImGuiDataType_": "imgui:1231",
+    "ImGuiDataTypeTempStorage": "imgui_internal:873",
-    "ImGuiDir_": "imgui:1247",
+    "ImGuiDataType_": "imgui:1245",
-    "ImGuiDragDropFlags_": "imgui:1209",
+    "ImGuiDir_": "imgui:1261",
-    "ImGuiFocusedFlags_": "imgui:1181",
+    "ImGuiDragDropFlags_": "imgui:1223",
-    "ImGuiGroupData": "imgui_internal:904",
+    "ImGuiFocusedFlags_": "imgui:1195",
-    "ImGuiHoveredFlags_": "imgui:1193",
+    "ImGuiGroupData": "imgui_internal:913",
-    "ImGuiIO": "imgui:1726",
+    "ImGuiHoveredFlags_": "imgui:1207",
-    "ImGuiInputReadMode": "imgui_internal:804",
+    "ImGuiIO": "imgui:1740",
-    "ImGuiInputSource": "imgui_internal:793",
+    "ImGuiInputReadMode": "imgui_internal:813",
-    "ImGuiInputTextCallbackData": "imgui:1868",
+    "ImGuiInputSource": "imgui_internal:802",
-    "ImGuiInputTextFlags_": "imgui:909",
+    "ImGuiInputTextCallbackData": "imgui:1882",
-    "ImGuiInputTextState": "imgui_internal:933",
+    "ImGuiInputTextFlags_": "imgui:923",
-    "ImGuiItemFlags_": "imgui_internal:658",
+    "ImGuiInputTextState": "imgui_internal:942",
-    "ImGuiItemStatusFlags_": "imgui_internal:673",
+    "ImGuiItemFlags_": "imgui_internal:667",
-    "ImGuiKeyModFlags_": "imgui:1294",
+    "ImGuiItemStatusFlags_": "imgui_internal:682",
-    "ImGuiKey_": "imgui:1266",
+    "ImGuiKeyModFlags_": "imgui:1308",
-    "ImGuiLastItemDataBackup": "imgui_internal:1804",
+    "ImGuiKey_": "imgui:1280",
-    "ImGuiLayoutType_": "imgui_internal:764",
+    "ImGuiLastItemDataBackup": "imgui_internal:1833",
-    "ImGuiListClipper": "imgui:2130",
+    "ImGuiLayoutType_": "imgui_internal:773",
-    "ImGuiLogType": "imgui_internal:770",
+    "ImGuiListClipper": "imgui:2148",
-    "ImGuiMenuColumns": "imgui_internal:919",
+    "ImGuiLogType": "imgui_internal:779",
-    "ImGuiMetricsConfig": "imgui_internal:1183",
+    "ImGuiMenuColumns": "imgui_internal:928",
-    "ImGuiMouseButton_": "imgui:1538",
+    "ImGuiMetricsConfig": "imgui_internal:1209",
-    "ImGuiMouseCursor_": "imgui:1548",
+    "ImGuiMouseButton_": "imgui:1552",
-    "ImGuiNavDirSourceFlags_": "imgui_internal:823",
+    "ImGuiMouseCursor_": "imgui:1562",
-    "ImGuiNavForward": "imgui_internal:843",
+    "ImGuiNavDirSourceFlags_": "imgui_internal:832",
-    "ImGuiNavHighlightFlags_": "imgui_internal:814",
+    "ImGuiNavForward": "imgui_internal:852",
-    "ImGuiNavInput_": "imgui:1307",
+    "ImGuiNavHighlightFlags_": "imgui_internal:823",
-    "ImGuiNavLayer": "imgui_internal:850",
+    "ImGuiNavInput_": "imgui:1321",
-    "ImGuiNavMoveFlags_": "imgui_internal:831",
+    "ImGuiNavLayer": "imgui_internal:859",
-    "ImGuiNavMoveResult": "imgui_internal:981",
+    "ImGuiNavMoveFlags_": "imgui_internal:840",
-    "ImGuiNextItemData": "imgui_internal:1038",
+    "ImGuiNavMoveResult": "imgui_internal:990",
-    "ImGuiNextItemDataFlags_": "imgui_internal:1031",
+    "ImGuiNextItemData": "imgui_internal:1047",
-    "ImGuiNextWindowData": "imgui_internal:1009",
+    "ImGuiNextItemDataFlags_": "imgui_internal:1040",
-    "ImGuiNextWindowDataFlags_": "imgui_internal:995",
+    "ImGuiNextWindowData": "imgui_internal:1018",
-    "ImGuiOldColumnData": "imgui_internal:1090",
+    "ImGuiNextWindowDataFlags_": "imgui_internal:1004",
-    "ImGuiOldColumnFlags_": "imgui_internal:1070",
+    "ImGuiOldColumnData": "imgui_internal:1099",
-    "ImGuiOldColumns": "imgui_internal:1100",
+    "ImGuiOldColumnFlags_": "imgui_internal:1079",
-    "ImGuiOnceUponAFrame": "imgui:2008",
+    "ImGuiOldColumns": "imgui_internal:1109",
-    "ImGuiPayload": "imgui:1908",
+    "ImGuiOnceUponAFrame": "imgui:2026",
-    "ImGuiPlotType": "imgui_internal:787",
+    "ImGuiPayload": "imgui:1922",
-    "ImGuiPopupData": "imgui_internal:968",
+    "ImGuiPlotType": "imgui_internal:796",
-    "ImGuiPopupFlags_": "imgui:967",
+    "ImGuiPopupData": "imgui_internal:977",
-    "ImGuiPopupPositionPolicy": "imgui_internal:857",
+    "ImGuiPopupFlags_": "imgui:981",
-    "ImGuiPtrOrIndex": "imgui_internal:1056",
+    "ImGuiPopupPositionPolicy": "imgui_internal:866",
-    "ImGuiSelectableFlagsPrivate_": "imgui_internal:724",
+    "ImGuiPtrOrIndex": "imgui_internal:1065",
-    "ImGuiSelectableFlags_": "imgui:983",
+    "ImGuiSelectableFlagsPrivate_": "imgui_internal:733",
-    "ImGuiSeparatorFlags_": "imgui_internal:742",
+    "ImGuiSelectableFlags_": "imgui:997",
-    "ImGuiSettingsHandler": "imgui_internal:1164",
+    "ImGuiSeparatorFlags_": "imgui_internal:751",
-    "ImGuiShrinkWidthItem": "imgui_internal:1050",
+    "ImGuiSettingsHandler": "imgui_internal:1190",
-    "ImGuiSizeCallbackData": "imgui:1899",
+    "ImGuiShrinkWidthItem": "imgui_internal:1059",
-    "ImGuiSliderFlagsPrivate_": "imgui_internal:717",
+    "ImGuiSizeCallbackData": "imgui:1913",
-    "ImGuiSliderFlags_": "imgui:1521",
+    "ImGuiSliderFlagsPrivate_": "imgui_internal:726",
-    "ImGuiSortDirection_": "imgui:1258",
+    "ImGuiSliderFlags_": "imgui:1535",
-    "ImGuiStackSizes": "imgui_internal:1205",
+    "ImGuiSortDirection_": "imgui:1272",
-    "ImGuiStorage": "imgui:2070",
+    "ImGuiStackSizes": "imgui_internal:1231",
-    "ImGuiStoragePair": "imgui:2073",
+    "ImGuiStorage": "imgui:2088",
-    "ImGuiStyle": "imgui:1672",
+    "ImGuiStoragePair": "imgui:2091",
-    "ImGuiStyleMod": "imgui_internal:894",
+    "ImGuiStyle": "imgui:1686",
-    "ImGuiStyleVar_": "imgui:1430",
+    "ImGuiStyleMod": "imgui_internal:903",
-    "ImGuiTabBar": "imgui_internal:1854",
+    "ImGuiStyleVar_": "imgui:1444",
-    "ImGuiTabBarFlagsPrivate_": "imgui_internal:1821",
+    "ImGuiTabBar": "imgui_internal:1883",
-    "ImGuiTabBarFlags_": "imgui:1008",
+    "ImGuiTabBarFlagsPrivate_": "imgui_internal:1850",
-    "ImGuiTabItem": "imgui_internal:1836",
+    "ImGuiTabBarFlags_": "imgui:1022",
-    "ImGuiTabItemFlagsPrivate_": "imgui_internal:1829",
+    "ImGuiTabItem": "imgui_internal:1865",
-    "ImGuiTabItemFlags_": "imgui:1024",
+    "ImGuiTabItemFlagsPrivate_": "imgui_internal:1858",
-    "ImGuiTable": "imgui_internal:1980",
+    "ImGuiTabItemFlags_": "imgui:1038",
-    "ImGuiTableBgTarget_": "imgui:1172",
+    "ImGuiTable": "imgui_internal:2009",
-    "ImGuiTableCellData": "imgui_internal:1973",
+    "ImGuiTableBgTarget_": "imgui:1186",
-    "ImGuiTableColumn": "imgui_internal:1915",
+    "ImGuiTableCellData": "imgui_internal:2002",
-    "ImGuiTableColumnFlags_": "imgui:1117",
+    "ImGuiTableColumn": "imgui_internal:1944",
-    "ImGuiTableColumnSettings": "imgui_internal:2098",
+    "ImGuiTableColumnFlags_": "imgui:1131",
-    "ImGuiTableColumnSortSpecs": "imgui:1930",
+    "ImGuiTableColumnSettings": "imgui_internal:2127",
-    "ImGuiTableFlags_": "imgui:1060",
+    "ImGuiTableColumnSortSpecs": "imgui:1944",
-    "ImGuiTableRowFlags_": "imgui:1157",
+    "ImGuiTableFlags_": "imgui:1074",
-    "ImGuiTableSettings": "imgui_internal:2122",
+    "ImGuiTableRowFlags_": "imgui:1171",
-    "ImGuiTableSortSpecs": "imgui:1944",
+    "ImGuiTableSettings": "imgui_internal:2151",
-    "ImGuiTextBuffer": "imgui:2043",
+    "ImGuiTableSortSpecs": "imgui:1958",
-    "ImGuiTextFilter": "imgui:2016",
+    "ImGuiTextBuffer": "imgui:2061",
-    "ImGuiTextFlags_": "imgui_internal:750",
+    "ImGuiTextFilter": "imgui:2034",
-    "ImGuiTextRange": "imgui:2026",
+    "ImGuiTextFlags_": "imgui_internal:759",
-    "ImGuiTooltipFlags_": "imgui_internal:756",
+    "ImGuiTextRange": "imgui:2044",
-    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:737",
+    "ImGuiTooltipFlags_": "imgui_internal:765",
-    "ImGuiTreeNodeFlags_": "imgui:938",
+    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:746",
-    "ImGuiWindow": "imgui_internal:1692",
+    "ImGuiTreeNodeFlags_": "imgui:952",
-    "ImGuiWindowFlags_": "imgui:869",
+    "ImGuiViewport": "imgui:2757",
-    "ImGuiWindowSettings": "imgui_internal:1152",
+    "ImGuiViewportFlags_": "imgui:2742",
-    "ImGuiWindowTempData": "imgui_internal:1636",
+    "ImGuiViewportP": "imgui_internal:1152",
-    "ImRect": "imgui_internal:430",
+    "ImGuiWindow": "imgui_internal:1721",
-    "ImVec1": "imgui_internal:412",
+    "ImGuiWindowFlags_": "imgui:883",
-    "ImVec2": "imgui:223",
+    "ImGuiWindowSettings": "imgui_internal:1178",
-    "ImVec2ih": "imgui_internal:420",
+    "ImGuiWindowTempData": "imgui_internal:1665",
-    "ImVec4": "imgui:236",
+    "ImRect": "imgui_internal:437",
+    "ImVec1": "imgui_internal:419",
+    "ImVec2": "imgui:227",
+    "ImVec2ih": "imgui_internal:427",
+    "ImVec4": "imgui:240",
     "STB_TexteditState": "imstb_textedit:317",
     "StbTexteditRow": "imstb_textedit:364",
     "StbUndoRecord": "imstb_textedit:299",
@@ -3281,10 +3312,6 @@
         "name": "Valid",
         "type": "bool"
       },
-      {
-        "name": "CmdLists",
-        "type": "ImDrawList**"
-      },
       {
         "name": "CmdListsCount",
         "type": "int"
@@ -3297,6 +3324,10 @@
         "name": "TotalVtxCount",
         "type": "int"
       },
+      {
+        "name": "CmdLists",
+        "type": "ImDrawList**"
+      },
       {
         "name": "DisplayPos",
         "type": "ImVec2"
@@ -3598,6 +3629,14 @@
         "size": 64,
         "type": "ImVec4"
       },
+      {
+        "name": "FontBuilderIO",
+        "type": "const ImFontBuilderIO*"
+      },
+      {
+        "name": "FontBuilderFlags",
+        "type": "unsigned int"
+      },
       {
         "name": "PackIdMouseCursors",
         "type": "int"
@@ -3641,6 +3680,12 @@
         "type": "ImFont*"
       }
     ],
+    "ImFontBuilderIO": [
+      {
+        "name": "FontBuilder_Build",
+        "type": "bool(*)(ImFontAtlas* atlas)"
+      }
+    ],
     "ImFontConfig": [
       {
         "name": "FontData",
@@ -3699,7 +3744,7 @@
         "type": "bool"
       },
       {
-        "name": "RasterizerFlags",
+        "name": "FontBuilderFlags",
         "type": "unsigned int"
       },
       {
@@ -3722,8 +3767,8 @@
     ],
     "ImFontGlyph": [
       {
-        "bitfield": "31",
+        "bitfield": "1",
-        "name": "Codepoint",
+        "name": "Colored",
         "type": "unsigned int"
       },
       {
@@ -3731,6 +3776,11 @@
         "name": "Visible",
         "type": "unsigned int"
       },
+      {
+        "bitfield": "30",
+        "name": "Codepoint",
+        "type": "unsigned int"
+      },
       {
         "name": "AdvanceX",
         "type": "float"
@@ -4094,6 +4144,11 @@
         "template_type": "ImGuiPopupData",
         "type": "ImVector_ImGuiPopupData"
       },
+      {
+        "name": "Viewports",
+        "template_type": "ImGuiViewportP*",
+        "type": "ImVector_ImGuiViewportPPtr"
+      },
       {
         "name": "NavWindow",
         "type": "ImGuiWindow*"
@@ -4298,26 +4353,10 @@
         "name": "FocusTabPressed",
         "type": "bool"
       },
-      {
-        "name": "DrawData",
-        "type": "ImDrawData"
-      },
-      {
-        "name": "DrawDataBuilder",
-        "type": "ImDrawDataBuilder"
-      },
       {
         "name": "DimBgRatio",
         "type": "float"
       },
-      {
-        "name": "BackgroundDrawList",
-        "type": "ImDrawList"
-      },
-      {
-        "name": "ForegroundDrawList",
-        "type": "ImDrawList"
-      },
       {
         "name": "MouseCursor",
         "type": "ImGuiMouseCursor"
@@ -4558,6 +4597,10 @@
         "template_type": "ImGuiContextHook",
         "type": "ImVector_ImGuiContextHook"
       },
+      {
+        "name": "HookIdNext",
+        "type": "ImGuiID"
+      },
       {
         "name": "LogEnabled",
         "type": "bool"
@@ -4574,6 +4617,14 @@
         "name": "LogBuffer",
         "type": "ImGuiTextBuffer"
       },
+      {
+        "name": "LogNextPrefix",
+        "type": "const char*"
+      },
+      {
+        "name": "LogNextSuffix",
+        "type": "const char*"
+      },
       {
         "name": "LogLinePosY",
         "type": "float"
@@ -4638,6 +4689,10 @@
       }
     ],
     "ImGuiContextHook": [
+      {
+        "name": "HookId",
+        "type": "ImGuiID"
+      },
       {
         "name": "Type",
         "type": "ImGuiContextHookType"
@@ -6785,6 +6840,68 @@
         "type": "const char*"
       }
     ],
+    "ImGuiViewport": [
+      {
+        "name": "Flags",
+        "type": "ImGuiViewportFlags"
+      },
+      {
+        "name": "Pos",
+        "type": "ImVec2"
+      },
+      {
+        "name": "Size",
+        "type": "ImVec2"
+      },
+      {
+        "name": "WorkPos",
+        "type": "ImVec2"
+      },
+      {
+        "name": "WorkSize",
+        "type": "ImVec2"
+      }
+    ],
+    "ImGuiViewportP": [
+      {
+        "name": "_ImGuiViewport",
+        "type": "ImGuiViewport"
+      },
+      {
+        "name": "DrawListsLastFrame[2]",
+        "size": 2,
+        "type": "int"
+      },
+      {
+        "name": "DrawLists[2]",
+        "size": 2,
+        "type": "ImDrawList*"
+      },
+      {
+        "name": "DrawDataP",
+        "type": "ImDrawData"
+      },
+      {
+        "name": "DrawDataBuilder",
+        "type": "ImDrawDataBuilder"
+      },
+      {
+        "name": "WorkOffsetMin",
+        "type": "ImVec2"
+      },
+      {
+        "name": "WorkOffsetMax",
+        "type": "ImVec2"
+      },
+      {
+        "name": "CurrWorkOffsetMin",
+        "type": "ImVec2"
+      },
+      {
+        "name": "CurrWorkOffsetMax",
+        "type": "ImVec2"
+      }
+    ],
     "ImGuiWindow": [
       {
         "name": "Name",

generator/output/typedefs_dict.json

@@ -19,6 +19,7 @@
   "ImFontAtlas": "struct ImFontAtlas",
   "ImFontAtlasCustomRect": "struct ImFontAtlasCustomRect",
   "ImFontAtlasFlags": "int",
+  "ImFontBuilderIO": "struct ImFontBuilderIO",
   "ImFontConfig": "struct ImFontConfig",
   "ImFontGlyph": "struct ImFontGlyph",
   "ImFontGlyphRangesBuilder": "struct ImFontGlyphRangesBuilder",
@@ -114,6 +115,9 @@
   "ImGuiTextRange": "struct ImGuiTextRange",
   "ImGuiTooltipFlags": "int",
   "ImGuiTreeNodeFlags": "int",
+  "ImGuiViewport": "struct ImGuiViewport",
+  "ImGuiViewportFlags": "int",
+  "ImGuiViewportP": "struct ImGuiViewportP",
   "ImGuiWindow": "struct ImGuiWindow",
   "ImGuiWindowFlags": "int",
   "ImGuiWindowSettings": "struct ImGuiWindowSettings",

generator/output/typedefs_dict.lua

@@ -19,6 +19,7 @@ defs["ImFont"] = "struct ImFont"
 defs["ImFontAtlas"] = "struct ImFontAtlas"
 defs["ImFontAtlasCustomRect"] = "struct ImFontAtlasCustomRect"
 defs["ImFontAtlasFlags"] = "int"
+defs["ImFontBuilderIO"] = "struct ImFontBuilderIO"
 defs["ImFontConfig"] = "struct ImFontConfig"
 defs["ImFontGlyph"] = "struct ImFontGlyph"
 defs["ImFontGlyphRangesBuilder"] = "struct ImFontGlyphRangesBuilder"
@@ -114,6 +115,9 @@ defs["ImGuiTextFlags"] = "int"
 defs["ImGuiTextRange"] = "struct ImGuiTextRange"
 defs["ImGuiTooltipFlags"] = "int"
 defs["ImGuiTreeNodeFlags"] = "int"
+defs["ImGuiViewport"] = "struct ImGuiViewport"
+defs["ImGuiViewportFlags"] = "int"
+defs["ImGuiViewportP"] = "struct ImGuiViewportP"
 defs["ImGuiWindow"] = "struct ImGuiWindow"
 defs["ImGuiWindowFlags"] = "int"
 defs["ImGuiWindowSettings"] = "struct ImGuiWindowSettings"

test/main.c

@@ -2,6 +2,14 @@
 #include <assert.h>
 #include "../cimgui.h"
 
+#ifdef IMGUI_HAS_IMSTR
+#define igBegin SigBegin
+#define igSliderFloat SigSliderFloat
+#define igCheckbox SigCheckbox
+#define igColorEdit3 SigColorEdit3
+#define igButton SigButton
+#endif
+
 int main(void)
 {
   assert(igDebugCheckVersionAndDataLayout(igGetVersion(), sizeof(ImGuiIO), sizeof(ImGuiStyle),