pull imgui master 1.77 and generate

readme: argsT when arg is function pointer
generation with non const ref to ptr
2025-08-10 20:08:31 +01:00 · 2020-06-29 18:55:13 +02:00 · 2020-06-08 18:03:20 +02:00 · 2020-06-06 11:42:25 +02:00 · 2020-06-06 11:41:33 +02:00 · 2020-06-05 20:46:02 +02:00
21 changed files with 4435 additions and 1503 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,9 +22,9 @@ endif (IMGUI_STATIC)

 target_compile_definitions(cimgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS=1)
 if (WIN32)
-    target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API="extern \"C\" __declspec\(dllexport\)")
+    target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API=extern\t\"C\"\t__declspec\(dllexport\))
 else (WIN32)
-    target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API="extern \"C\" ")
+    target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API=extern\t\"C\"\t)
 endif (WIN32)

 target_include_directories(cimgui PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ Notes:
  * cimguiname : the name without overloading (this should be used if there is not ov_cimguiname)
  * ret : the return type
  * retref : is set if original return type is a reference. (will be a pointer in cimgui)
-  * argsT : an array of collections (each one with type: argument type and name: the argument name)
+  * argsT : an array of collections (each one with type: argument type and name: the argument name, when the argument is a function pointer also ret: return type and signature: the function signature)
  * args : a string of argsT concatenated and separated by commas
  * call_args : a string with the argument names separated by commas for calling imgui function
  * defaults : a collection in which key is argument name and value is the default value.
@@ -61,6 +61,7 @@ Notes:
  * templated : is set if the function belongs to a templated class (ImVector)
  * templatedgen: is set if the function belongs to a struct generated from template (ImVector_ImWchar)
  * nonUDT : if present the original function was returning a user defined type so that signature has been changed to accept a pointer to the UDT as first argument.
+  * location : name of the header file this function comes from. (imgui, internal, imgui_impl_xxx)
 ### structs_and_enums description
 * Is is a collection with two items:
  * under key enums we get the enums collection in which each key is the enum tagname and the value is an array of the ordered values represented as a collection with keys
@@ -71,7 +72,8 @@ Notes:
    * type : the type of the struct member
    * template_type : if type has a template argument (as ImVector) here will be
    * name : the name of the struct member
-	* bitfield : the bitfield width (in case it is a bitfield)
+    * size : the number of array elements (when it is an array)
+    * bitfield : the bitfield width (in case it is a bitfield)
 # usage

 * use whatever method is in ImGui c++ namespace in the original [imgui.h](https://github.com/ocornut/imgui/blob/master/imgui.h) by prepending `ig`
--- a/cimgui.cpp
+++ b/cimgui.cpp
@@ -1,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.76" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.77" from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api

 #include "./imgui/imgui.h"
@@ -654,7 +654,7 @@ CIMGUI_API bool igComboStr(const char* label,int* current_item,const char* items
 {
    return ImGui::Combo(label,current_item,items_separated_by_zeros,popup_max_height_in_items);
 }
-CIMGUI_API bool igComboFnPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items)
+CIMGUI_API bool igComboFnBoolPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items)
 {
    return ImGui::Combo(label,current_item,items_getter,data,items_count,popup_max_height_in_items);
 }
@@ -938,7 +938,7 @@ CIMGUI_API bool igListBoxStr_arr(const char* label,int* current_item,const char*
 {
    return ImGui::ListBox(label,current_item,items,items_count,height_in_items);
 }
-CIMGUI_API bool igListBoxFnPtr(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 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)
 {
    return ImGui::ListBox(label,current_item,items_getter,data,items_count,height_in_items);
 }
@@ -958,7 +958,7 @@ CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int va
 {
    return ImGui::PlotLines(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride);
 }
-CIMGUI_API void igPlotLinesFnPtr(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 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)
 {
    return ImGui::PlotLines(label,values_getter,data,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size);
 }
@@ -966,7 +966,7 @@ CIMGUI_API void igPlotHistogramFloatPtr(const char* label,const float* values,in
 {
    return ImGui::PlotHistogram(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride);
 }
-CIMGUI_API void igPlotHistogramFnPtr(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 igPlotHistogramFnFloatPtr(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)
 {
    return ImGui::PlotHistogram(label,values_getter,data,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size);
 }
@@ -1037,26 +1037,10 @@ CIMGUI_API void igSetTooltipV(const char* fmt,va_list args)
 {
    return ImGui::SetTooltipV(fmt,args);
 }
-CIMGUI_API void igOpenPopup(const char* str_id)
-{
-    return ImGui::OpenPopup(str_id);
-}
 CIMGUI_API bool igBeginPopup(const char* str_id,ImGuiWindowFlags flags)
 {
    return ImGui::BeginPopup(str_id,flags);
 }
-CIMGUI_API bool igBeginPopupContextItem(const char* str_id,ImGuiMouseButton mouse_button)
-{
-    return ImGui::BeginPopupContextItem(str_id,mouse_button);
-}
-CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,ImGuiMouseButton mouse_button,bool also_over_items)
-{
-    return ImGui::BeginPopupContextWindow(str_id,mouse_button,also_over_items);
-}
-CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,ImGuiMouseButton mouse_button)
-{
-    return ImGui::BeginPopupContextVoid(str_id,mouse_button);
-}
 CIMGUI_API bool igBeginPopupModal(const char* name,bool* p_open,ImGuiWindowFlags flags)
 {
    return ImGui::BeginPopupModal(name,p_open,flags);
@@ -1065,18 +1049,34 @@ CIMGUI_API void igEndPopup()
 {
    return ImGui::EndPopup();
 }
-CIMGUI_API bool igOpenPopupOnItemClick(const char* str_id,ImGuiMouseButton mouse_button)
+CIMGUI_API void igOpenPopup(const char* str_id,ImGuiPopupFlags popup_flags)
 {
-    return ImGui::OpenPopupOnItemClick(str_id,mouse_button);
+    return ImGui::OpenPopup(str_id,popup_flags);
 }
-CIMGUI_API bool igIsPopupOpenStr(const char* str_id)
+CIMGUI_API bool igOpenPopupContextItem(const char* str_id,ImGuiPopupFlags popup_flags)
 {
-    return ImGui::IsPopupOpen(str_id);
+    return ImGui::OpenPopupContextItem(str_id,popup_flags);
 }
 CIMGUI_API void igCloseCurrentPopup()
 {
    return ImGui::CloseCurrentPopup();
 }
+CIMGUI_API bool igBeginPopupContextItem(const char* str_id,ImGuiPopupFlags popup_flags)
+{
+    return ImGui::BeginPopupContextItem(str_id,popup_flags);
+}
+CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,ImGuiPopupFlags popup_flags)
+{
+    return ImGui::BeginPopupContextWindow(str_id,popup_flags);
+}
+CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,ImGuiPopupFlags popup_flags)
+{
+    return ImGui::BeginPopupContextVoid(str_id,popup_flags);
+}
+CIMGUI_API bool igIsPopupOpenStr(const char* str_id,ImGuiPopupFlags flags)
+{
+    return ImGui::IsPopupOpen(str_id,flags);
+}
 CIMGUI_API void igColumns(int count,const char* id,bool border)
 {
    return ImGui::Columns(count,id,border);
@@ -1325,6 +1325,14 @@ CIMGUI_API ImU32 igColorConvertFloat4ToU32(const ImVec4 in)
 {
    return ImGui::ColorConvertFloat4ToU32(in);
 }
+CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float* out_h,float* out_s,float* out_v)
+{
+    return ImGui::ColorConvertRGBtoHSV(r,g,b,*out_h,*out_s,*out_v);
+}
+CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float* out_r,float* out_g,float* out_b)
+{
+    return ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b);
+}
 CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key)
 {
    return ImGui::GetKeyIndex(imgui_key);
@@ -1969,14 +1977,6 @@ CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* self,int n)
 {
    return self->ChannelsSetCurrent(n);
 }
-CIMGUI_API void ImDrawList_Clear(ImDrawList* self)
-{
-    return self->Clear();
-}
-CIMGUI_API void ImDrawList_ClearFreeMemory(ImDrawList* self)
-{
-    return self->ClearFreeMemory();
-}
 CIMGUI_API void ImDrawList_PrimReserve(ImDrawList* self,int idx_count,int vtx_count)
 {
    return self->PrimReserve(idx_count,vtx_count);
@@ -2009,13 +2009,29 @@ CIMGUI_API void ImDrawList_PrimVtx(ImDrawList* self,const ImVec2 pos,const ImVec
 {
    return self->PrimVtx(pos,uv,col);
 }
-CIMGUI_API void ImDrawList_UpdateClipRect(ImDrawList* self)
+CIMGUI_API void ImDrawList__ResetForNewFrame(ImDrawList* self)
 {
-    return self->UpdateClipRect();
+    return self->_ResetForNewFrame();
 }
-CIMGUI_API void ImDrawList_UpdateTextureID(ImDrawList* self)
+CIMGUI_API void ImDrawList__ClearFreeMemory(ImDrawList* self)
 {
-    return self->UpdateTextureID();
+    return self->_ClearFreeMemory();
+}
+CIMGUI_API void ImDrawList__PopUnusedDrawCmd(ImDrawList* self)
+{
+    return self->_PopUnusedDrawCmd();
+}
+CIMGUI_API void ImDrawList__OnChangedClipRect(ImDrawList* self)
+{
+    return self->_OnChangedClipRect();
+}
+CIMGUI_API void ImDrawList__OnChangedTextureID(ImDrawList* self)
+{
+    return self->_OnChangedTextureID();
+}
+CIMGUI_API void ImDrawList__OnChangedVtxOffset(ImDrawList* self)
+{
+    return self->_OnChangedVtxOffset();
 }
 CIMGUI_API ImDrawData* ImDrawData_ImDrawData(void)
 {
@@ -2193,9 +2209,9 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesVietnamese(ImFontAtlas* self
 {
    return self->GetGlyphRangesVietnamese();
 }
-CIMGUI_API int ImFontAtlas_AddCustomRectRegular(ImFontAtlas* self,unsigned int id,int width,int height)
+CIMGUI_API int ImFontAtlas_AddCustomRectRegular(ImFontAtlas* self,int width,int height)
 {
-    return self->AddCustomRectRegular(id,width,height);
+    return self->AddCustomRectRegular(width,height);
 }
 CIMGUI_API int ImFontAtlas_AddCustomRectFontGlyph(ImFontAtlas* self,ImFont* font,ImWchar id,int width,int height,float advance_x,const ImVec2 offset)
 {
@@ -2541,9 +2557,9 @@ CIMGUI_API void igImTriangleClosestPoint(ImVec2 *pOut,const ImVec2 a,const ImVec
 {
    *pOut = ImTriangleClosestPoint(a,b,c,p);
 }
-CIMGUI_API void igImTriangleBarycentricCoords(const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 p,float out_u,float out_v,float out_w)
+CIMGUI_API void igImTriangleBarycentricCoords(const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 p,float* out_u,float* out_v,float* out_w)
 {
-    return ImTriangleBarycentricCoords(a,b,c,p,out_u,out_v,out_w);
+    return ImTriangleBarycentricCoords(a,b,c,p,*out_u,*out_v,*out_w);
 }
 CIMGUI_API float igImTriangleArea(const ImVec2 a,const ImVec2 b,const ImVec2 c)
 {
@@ -2553,42 +2569,6 @@ CIMGUI_API ImGuiDir igImGetDirQuadrantFromDelta(float dx,float dy)
 {
    return ImGetDirQuadrantFromDelta(dx,dy);
 }
-CIMGUI_API bool igImBitArrayTestBit(const ImU32* arr,int n)
-{
-    return ImBitArrayTestBit(arr,n);
-}
-CIMGUI_API void igImBitArrayClearBit(ImU32* arr,int n)
-{
-    return ImBitArrayClearBit(arr,n);
-}
-CIMGUI_API void igImBitArraySetBit(ImU32* arr,int n)
-{
-    return ImBitArraySetBit(arr,n);
-}
-CIMGUI_API void igImBitArraySetBitRange(ImU32* arr,int n,int n2)
-{
-    return ImBitArraySetBitRange(arr,n,n2);
-}
-CIMGUI_API void ImBitVector_Create(ImBitVector* self,int sz)
-{
-    return self->Create(sz);
-}
-CIMGUI_API void ImBitVector_Clear(ImBitVector* self)
-{
-    return self->Clear();
-}
-CIMGUI_API bool ImBitVector_TestBit(ImBitVector* self,int n)
-{
-    return self->TestBit(n);
-}
-CIMGUI_API void ImBitVector_SetBit(ImBitVector* self,int n)
-{
-    return self->SetBit(n);
-}
-CIMGUI_API void ImBitVector_ClearBit(ImBitVector* self,int n)
-{
-    return self->ClearBit(n);
-}
 CIMGUI_API ImVec1* ImVec1_ImVec1Nil(void)
 {
    return IM_NEW(ImVec1)();
@@ -2725,6 +2705,70 @@ CIMGUI_API bool ImRect_IsInverted(ImRect* self)
 {
    return self->IsInverted();
 }
+CIMGUI_API void ImRect_ToVec4(ImVec4 *pOut,ImRect* self)
+{
+    *pOut = self->ToVec4();
+}
+CIMGUI_API bool igImBitArrayTestBit(const ImU32* arr,int n)
+{
+    return ImBitArrayTestBit(arr,n);
+}
+CIMGUI_API void igImBitArrayClearBit(ImU32* arr,int n)
+{
+    return ImBitArrayClearBit(arr,n);
+}
+CIMGUI_API void igImBitArraySetBit(ImU32* arr,int n)
+{
+    return ImBitArraySetBit(arr,n);
+}
+CIMGUI_API void igImBitArraySetBitRange(ImU32* arr,int n,int n2)
+{
+    return ImBitArraySetBitRange(arr,n,n2);
+}
+CIMGUI_API void ImBitVector_Create(ImBitVector* self,int sz)
+{
+    return self->Create(sz);
+}
+CIMGUI_API void ImBitVector_Clear(ImBitVector* self)
+{
+    return self->Clear();
+}
+CIMGUI_API bool ImBitVector_TestBit(ImBitVector* self,int n)
+{
+    return self->TestBit(n);
+}
+CIMGUI_API void ImBitVector_SetBit(ImBitVector* self,int n)
+{
+    return self->SetBit(n);
+}
+CIMGUI_API void ImBitVector_ClearBit(ImBitVector* self,int n)
+{
+    return self->ClearBit(n);
+}
+CIMGUI_API ImDrawListSharedData* ImDrawListSharedData_ImDrawListSharedData(void)
+{
+    return IM_NEW(ImDrawListSharedData)();
+}
+CIMGUI_API void ImDrawListSharedData_destroy(ImDrawListSharedData* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImDrawListSharedData_SetCircleSegmentMaxError(ImDrawListSharedData* self,float max_error)
+{
+    return self->SetCircleSegmentMaxError(max_error);
+}
+CIMGUI_API void ImDrawDataBuilder_Clear(ImDrawDataBuilder* self)
+{
+    return self->Clear();
+}
+CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self)
+{
+    return self->ClearFreeMemory();
+}
+CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self)
+{
+    return self->FlattenIntoSingleLayer();
+}
 CIMGUI_API ImGuiStyleMod* ImGuiStyleMod_ImGuiStyleModInt(ImGuiStyleVar idx,int v)
 {
    return IM_NEW(ImGuiStyleMod)(idx,v);
@@ -2809,26 +2853,6 @@ CIMGUI_API void ImGuiInputTextState_SelectAll(ImGuiInputTextState* self)
 {
    return self->SelectAll();
 }
-CIMGUI_API ImGuiWindowSettings* ImGuiWindowSettings_ImGuiWindowSettings(void)
-{
-    return IM_NEW(ImGuiWindowSettings)();
-}
-CIMGUI_API void ImGuiWindowSettings_destroy(ImGuiWindowSettings* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API char* ImGuiWindowSettings_GetName(ImGuiWindowSettings* self)
-{
-    return self->GetName();
-}
-CIMGUI_API ImGuiSettingsHandler* ImGuiSettingsHandler_ImGuiSettingsHandler(void)
-{
-    return IM_NEW(ImGuiSettingsHandler)();
-}
-CIMGUI_API void ImGuiSettingsHandler_destroy(ImGuiSettingsHandler* self)
-{
-    IM_DELETE(self);
-}
 CIMGUI_API ImGuiPopupData* ImGuiPopupData_ImGuiPopupData(void)
 {
    return IM_NEW(ImGuiPopupData)();
@@ -2837,50 +2861,6 @@ CIMGUI_API void ImGuiPopupData_destroy(ImGuiPopupData* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API ImGuiColumnData* ImGuiColumnData_ImGuiColumnData(void)
-{
-    return IM_NEW(ImGuiColumnData)();
-}
-CIMGUI_API void ImGuiColumnData_destroy(ImGuiColumnData* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API ImGuiColumns* ImGuiColumns_ImGuiColumns(void)
-{
-    return IM_NEW(ImGuiColumns)();
-}
-CIMGUI_API void ImGuiColumns_destroy(ImGuiColumns* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API void ImGuiColumns_Clear(ImGuiColumns* self)
-{
-    return self->Clear();
-}
-CIMGUI_API ImDrawListSharedData* ImDrawListSharedData_ImDrawListSharedData(void)
-{
-    return IM_NEW(ImDrawListSharedData)();
-}
-CIMGUI_API void ImDrawListSharedData_destroy(ImDrawListSharedData* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API void ImDrawListSharedData_SetCircleSegmentMaxError(ImDrawListSharedData* self,float max_error)
-{
-    return self->SetCircleSegmentMaxError(max_error);
-}
-CIMGUI_API void ImDrawDataBuilder_Clear(ImDrawDataBuilder* self)
-{
-    return self->Clear();
-}
-CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self)
-{
-    return self->ClearFreeMemory();
-}
-CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self)
-{
-    return self->FlattenIntoSingleLayer();
-}
 CIMGUI_API ImGuiNavMoveResult* ImGuiNavMoveResult_ImGuiNavMoveResult(void)
 {
    return IM_NEW(ImGuiNavMoveResult)();
@@ -2929,6 +2909,46 @@ CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndexInt(int index)
 {
    return IM_NEW(ImGuiPtrOrIndex)(index);
 }
+CIMGUI_API ImGuiColumnData* ImGuiColumnData_ImGuiColumnData(void)
+{
+    return IM_NEW(ImGuiColumnData)();
+}
+CIMGUI_API void ImGuiColumnData_destroy(ImGuiColumnData* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API ImGuiColumns* ImGuiColumns_ImGuiColumns(void)
+{
+    return IM_NEW(ImGuiColumns)();
+}
+CIMGUI_API void ImGuiColumns_destroy(ImGuiColumns* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImGuiColumns_Clear(ImGuiColumns* self)
+{
+    return self->Clear();
+}
+CIMGUI_API ImGuiWindowSettings* ImGuiWindowSettings_ImGuiWindowSettings(void)
+{
+    return IM_NEW(ImGuiWindowSettings)();
+}
+CIMGUI_API void ImGuiWindowSettings_destroy(ImGuiWindowSettings* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API char* ImGuiWindowSettings_GetName(ImGuiWindowSettings* self)
+{
+    return self->GetName();
+}
+CIMGUI_API ImGuiSettingsHandler* ImGuiSettingsHandler_ImGuiSettingsHandler(void)
+{
+    return IM_NEW(ImGuiSettingsHandler)();
+}
+CIMGUI_API void ImGuiSettingsHandler_destroy(ImGuiSettingsHandler* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API ImGuiContext* ImGuiContext_ImGuiContext(ImFontAtlas* shared_font_atlas)
 {
    return IM_NEW(ImGuiContext)(shared_font_atlas);
@@ -3157,6 +3177,10 @@ CIMGUI_API void igMarkIniSettingsDirtyWindowPtr(ImGuiWindow* window)
 {
    return ImGui::MarkIniSettingsDirty(window);
 }
+CIMGUI_API void igClearIniSettings()
+{
+    return ImGui::ClearIniSettings();
+}
 CIMGUI_API ImGuiWindowSettings* igCreateNewWindowSettings(const char* name)
 {
    return ImGui::CreateNewWindowSettings(name);
@@ -3173,6 +3197,10 @@ CIMGUI_API ImGuiSettingsHandler* igFindSettingsHandler(const char* type_name)
 {
    return ImGui::FindSettingsHandler(type_name);
 }
+CIMGUI_API void igSetNextWindowScroll(const ImVec2 scroll)
+{
+    return ImGui::SetNextWindowScroll(scroll);
+}
 CIMGUI_API void igSetScrollXWindowPtr(ImGuiWindow* window,float new_scroll_x)
 {
    return ImGui::SetScrollX(window,new_scroll_x);
@@ -3313,9 +3341,9 @@ CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2 size_arg
 {
    return ImGui::BeginChildEx(name,id,size_arg,border,flags);
 }
-CIMGUI_API void igOpenPopupEx(ImGuiID id)
+CIMGUI_API void igOpenPopupEx(ImGuiID id,ImGuiPopupFlags popup_flags)
 {
-    return ImGui::OpenPopupEx(id);
+    return ImGui::OpenPopupEx(id,popup_flags);
 }
 CIMGUI_API void igClosePopupToLevel(int remaining,bool restore_focus_to_window_under_popup)
 {
@@ -3325,9 +3353,9 @@ CIMGUI_API void igClosePopupsOverWindow(ImGuiWindow* ref_window,bool restore_foc
 {
    return ImGui::ClosePopupsOverWindow(ref_window,restore_focus_to_window_under_popup);
 }
-CIMGUI_API bool igIsPopupOpenID(ImGuiID id)
+CIMGUI_API bool igIsPopupOpenID(ImGuiID id,ImGuiPopupFlags popup_flags)
 {
-    return ImGui::IsPopupOpen(id);
+    return ImGui::IsPopupOpen(id,popup_flags);
 }
 CIMGUI_API bool igBeginPopupEx(ImGuiID id,ImGuiWindowFlags extra_flags)
 {
@@ -3449,6 +3477,10 @@ CIMGUI_API bool igIsDragDropPayloadBeingAccepted()
 {
    return ImGui::IsDragDropPayloadBeingAccepted();
 }
+CIMGUI_API void igSetWindowClipRectBeforeSetChannel(ImGuiWindow* window,const ImRect clip_rect)
+{
+    return ImGui::SetWindowClipRectBeforeSetChannel(window,clip_rect);
+}
 CIMGUI_API void igBeginColumns(const char* str_id,int count,ImGuiColumnsFlags flags)
 {
    return ImGui::BeginColumns(str_id,count,flags);
@@ -3517,9 +3549,9 @@ CIMGUI_API void igTabItemBackground(ImDrawList* draw_list,const ImRect bb,ImGuiT
 {
    return ImGui::TabItemBackground(draw_list,bb,flags,col);
 }
-CIMGUI_API bool igTabItemLabelAndCloseButton(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImVec2 frame_padding,const char* label,ImGuiID tab_id,ImGuiID close_button_id)
+CIMGUI_API bool igTabItemLabelAndCloseButton(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImVec2 frame_padding,const char* label,ImGuiID tab_id,ImGuiID close_button_id,bool is_contents_visible)
 {
-    return ImGui::TabItemLabelAndCloseButton(draw_list,bb,flags,frame_padding,label,tab_id,close_button_id);
+    return ImGui::TabItemLabelAndCloseButton(draw_list,bb,flags,frame_padding,label,tab_id,close_button_id,is_contents_visible);
 }
 CIMGUI_API void igRenderText(ImVec2 pos,const char* text,const char* text_end,bool hide_text_after_hash)
 {
@@ -3617,6 +3649,10 @@ CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* p
 {
    return ImGui::ScrollbarEx(bb,id,axis,p_scroll_v,avail_v,contents_v,rounding_corners);
 }
+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)
+{
+    return ImGui::ImageButtonEx(id,texture_id,size,uv0,uv1,padding,bg_col,tint_col);
+}
 CIMGUI_API void igGetWindowScrollbarRect(ImRect *pOut,ImGuiWindow* window,ImGuiAxis axis)
 {
    *pOut = ImGui::GetWindowScrollbarRect(window,axis);
@@ -3677,6 +3713,10 @@ CIMGUI_API bool igDataTypeApplyOpFromText(const char* buf,const char* initial_va
 {
    return ImGui::DataTypeApplyOpFromText(buf,initial_value_buf,data_type,p_data,format);
 }
+CIMGUI_API bool igDataTypeClamp(ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max)
+{
+    return ImGui::DataTypeClamp(data_type,p_data,p_min,p_max);
+}
 CIMGUI_API bool igInputTextEx(const char* label,const char* hint,char* buf,int buf_size,const ImVec2 size_arg,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data)
 {
    return ImGui::InputTextEx(label,hint,buf,buf_size,size_arg,flags,callback,user_data);
@@ -3685,9 +3725,9 @@ CIMGUI_API bool igTempInputText(const ImRect bb,ImGuiID id,const char* label,cha
 {
    return ImGui::TempInputText(bb,id,label,buf,buf_size,flags);
 }
-CIMGUI_API bool igTempInputScalar(const ImRect bb,ImGuiID id,const char* label,ImGuiDataType data_type,void* p_data,const char* format)
+CIMGUI_API bool igTempInputScalar(const ImRect bb,ImGuiID id,const char* label,ImGuiDataType data_type,void* p_data,const char* format,const void* p_clamp_min,const void* p_clamp_max)
 {
-    return ImGui::TempInputScalar(bb,id,label,data_type,p_data,format);
+    return ImGui::TempInputScalar(bb,id,label,data_type,p_data,format,p_clamp_min,p_clamp_max);
 }
 CIMGUI_API bool igTempInputIsActive(ImGuiID id)
 {
@@ -3791,14 +3831,7 @@ CIMGUI_API float igGET_FLT_MAX()
 {
    return FLT_MAX;
 }
-CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v)
-{
-    ImGui::ColorConvertRGBtoHSV(r,g,b,*out_h,*out_s,*out_v);
-}
-CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b)
-{
-    ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b);
-}
+

 CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
 {
--- a/cimgui.h
+++ b/cimgui.h
@@ -1,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.76" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.77" from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 #ifndef CIMGUI_INCLUDED
 #define CIMGUI_INCLUDED
@@ -46,6 +46,7 @@ typedef struct ImGuiStoragePair ImGuiStoragePair;
 typedef struct ImGuiTextRange ImGuiTextRange;
 typedef struct ImGuiPtrOrIndex ImGuiPtrOrIndex;
 typedef struct ImGuiShrinkWidthItem ImGuiShrinkWidthItem;
+typedef struct ImGuiDataTypeTempStorage ImGuiDataTypeTempStorage;
 typedef struct ImVec2ih ImVec2ih;
 typedef struct ImVec1 ImVec1;
 typedef struct ImFontAtlasCustomRect ImFontAtlasCustomRect;
@@ -97,7 +98,6 @@ typedef struct ImDrawList ImDrawList;
 typedef struct ImDrawData ImDrawData;
 typedef struct ImDrawCmd ImDrawCmd;
 typedef struct ImDrawChannel ImDrawChannel;
-
 struct ImDrawChannel;
 struct ImDrawCmd;
 struct ImDrawData;
@@ -143,6 +143,7 @@ typedef int ImGuiFocusedFlags;
 typedef int ImGuiHoveredFlags;
 typedef int ImGuiInputTextFlags;
 typedef int ImGuiKeyModFlags;
+typedef int ImGuiPopupFlags;
 typedef int ImGuiSelectableFlags;
 typedef int ImGuiTabBarFlags;
 typedef int ImGuiTabItemFlags;
@@ -360,6 +361,19 @@ typedef enum {
    ImGuiTreeNodeFlags_NavLeftJumpsBackHere = 1 << 13,
    ImGuiTreeNodeFlags_CollapsingHeader = ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_NoAutoOpenOnLog
 }ImGuiTreeNodeFlags_;
+typedef enum {
+    ImGuiPopupFlags_None = 0,
+    ImGuiPopupFlags_MouseButtonLeft = 0,
+    ImGuiPopupFlags_MouseButtonRight = 1,
+    ImGuiPopupFlags_MouseButtonMiddle = 2,
+    ImGuiPopupFlags_MouseButtonMask_ = 0x1F,
+    ImGuiPopupFlags_MouseButtonDefault_ = 1,
+    ImGuiPopupFlags_NoOpenOverExistingPopup = 1 << 5,
+    ImGuiPopupFlags_NoOpenOverItems = 1 << 6,
+    ImGuiPopupFlags_AnyPopupId = 1 << 7,
+    ImGuiPopupFlags_AnyPopupLevel = 1 << 8,
+    ImGuiPopupFlags_AnyPopup = ImGuiPopupFlags_AnyPopupId | ImGuiPopupFlags_AnyPopupLevel
+}ImGuiPopupFlags_;
 typedef enum {
    ImGuiSelectableFlags_None = 0,
    ImGuiSelectableFlags_DontClosePopups = 1 << 0,
@@ -397,7 +411,8 @@ typedef enum {
    ImGuiTabItemFlags_UnsavedDocument = 1 << 0,
    ImGuiTabItemFlags_SetSelected = 1 << 1,
    ImGuiTabItemFlags_NoCloseWithMiddleMouseButton = 1 << 2,
-    ImGuiTabItemFlags_NoPushId = 1 << 3
+    ImGuiTabItemFlags_NoPushId = 1 << 3,
+    ImGuiTabItemFlags_NoTooltip = 1 << 4
 }ImGuiTabItemFlags_;
 typedef enum {
    ImGuiFocusedFlags_None = 0,
@@ -655,6 +670,7 @@ typedef enum {
    ImGuiMouseCursor_COUNT
 }ImGuiMouseCursor_;
 typedef enum {
+    ImGuiCond_None = 0,
    ImGuiCond_Always = 1 << 0,
    ImGuiCond_Once = 1 << 1,
    ImGuiCond_FirstUseEver = 1 << 2,
@@ -687,6 +703,7 @@ struct ImGuiStyle
    float GrabRounding;
    float TabRounding;
    float TabBorderSize;
+    float TabMinWidthForUnselectedCloseButton;
    ImGuiDir ColorButtonPosition;
    ImVec2 ButtonTextAlign;
    ImVec2 SelectableTextAlign;
@@ -778,6 +795,7 @@ struct ImGuiIO
    float KeysDownDurationPrev[512];
    float NavInputsDownDuration[ImGuiNavInput_COUNT];
    float NavInputsDownDurationPrev[ImGuiNavInput_COUNT];
+    float PenPressure;
    ImWchar16 InputQueueSurrogate;
    ImVector_ImWchar InputQueueCharacters;
 };
@@ -848,11 +866,11 @@ struct ImColor
 };
 struct ImDrawCmd
 {
-    unsigned int ElemCount;
    ImVec4 ClipRect;
    ImTextureID TextureId;
    unsigned int VtxOffset;
    unsigned int IdxOffset;
+    unsigned int ElemCount;
    ImDrawCallback UserCallback;
    void* UserCallbackData;
 };
@@ -899,13 +917,13 @@ struct ImDrawList
    ImDrawListFlags Flags;
    const ImDrawListSharedData* _Data;
    const char* _OwnerName;
-    unsigned int _VtxCurrentOffset;
    unsigned int _VtxCurrentIdx;
    ImDrawVert* _VtxWritePtr;
    ImDrawIdx* _IdxWritePtr;
    ImVector_ImVec4 _ClipRectStack;
    ImVector_ImTextureID _TextureIdStack;
    ImVector_ImVec2 _Path;
+    ImDrawCmd _CmdHeader;
    ImDrawListSplitter _Splitter;
 };
 struct ImDrawData
@@ -955,9 +973,9 @@ struct ImFontGlyphRangesBuilder
 };
 struct ImFontAtlasCustomRect
 {
-    unsigned int ID;
    unsigned short Width, Height;
    unsigned short X, Y;
+    unsigned int GlyphID;
    float GlyphAdvanceX;
    ImVec2 GlyphOffset;
    ImFont* Font;
@@ -1005,10 +1023,60 @@ struct ImFont
    int MetricsTotalSurface;
    ImU8 Used4kPagesMap[(0xFFFF +1)/4096/8];
 };
+struct ImVec1
+{
+    float x;
+};
+struct ImVec2ih
+{
+    short x, y;
+};
+struct ImRect
+{
+    ImVec2 Min;
+    ImVec2 Max;
+};
 struct ImBitVector
 {
    ImVector_ImU32 Storage;
 };
+struct ImDrawListSharedData
+{
+    ImVec2 TexUvWhitePixel;
+    ImFont* Font;
+    float FontSize;
+    float CurveTessellationTol;
+    float CircleSegmentMaxError;
+    ImVec4 ClipRectFullscreen;
+    ImDrawListFlags InitialFlags;
+    ImVec2 ArcFastVtx[12 * 1];
+    ImU8 CircleSegmentCounts[64];
+};
+struct ImDrawDataBuilder
+{
+    ImVector_ImDrawListPtr Layers[2];
+};
+typedef enum {
+    ImGuiItemFlags_None = 0,
+    ImGuiItemFlags_NoTabStop = 1 << 0,
+    ImGuiItemFlags_ButtonRepeat = 1 << 1,
+    ImGuiItemFlags_Disabled = 1 << 2,
+    ImGuiItemFlags_NoNav = 1 << 3,
+    ImGuiItemFlags_NoNavDefaultFocus = 1 << 4,
+    ImGuiItemFlags_SelectableDontClosePopup = 1 << 5,
+    ImGuiItemFlags_MixedValue = 1 << 6,
+    ImGuiItemFlags_Default_ = 0
+}ImGuiItemFlags_;
+typedef enum {
+    ImGuiItemStatusFlags_None = 0,
+    ImGuiItemStatusFlags_HoveredRect = 1 << 0,
+    ImGuiItemStatusFlags_HasDisplayRect = 1 << 1,
+    ImGuiItemStatusFlags_Edited = 1 << 2,
+    ImGuiItemStatusFlags_ToggledSelection = 1 << 3,
+    ImGuiItemStatusFlags_ToggledOpen = 1 << 4,
+    ImGuiItemStatusFlags_HasDeactivated = 1 << 5,
+    ImGuiItemStatusFlags_Deactivated = 1 << 6
+}ImGuiItemStatusFlags_;
 typedef enum {
    ImGuiButtonFlags_None = 0,
    ImGuiButtonFlags_Repeat = 1 << 0,
@@ -1044,14 +1112,6 @@ typedef enum {
    ImGuiDragFlags_None = 0,
    ImGuiDragFlags_Vertical = 1 << 0
 }ImGuiDragFlags_;
-typedef enum {
-    ImGuiColumnsFlags_None = 0,
-    ImGuiColumnsFlags_NoBorder = 1 << 0,
-    ImGuiColumnsFlags_NoResize = 1 << 1,
-    ImGuiColumnsFlags_NoPreserveWidths = 1 << 2,
-    ImGuiColumnsFlags_NoForceWithinWindow = 1 << 3,
-    ImGuiColumnsFlags_GrowParentContentsSize= 1 << 4
-}ImGuiColumnsFlags_;
 typedef enum {
    ImGuiSelectableFlags_NoHoldingActiveID = 1 << 20,
    ImGuiSelectableFlags_SelectOnClick = 1 << 21,
@@ -1069,27 +1129,6 @@ typedef enum {
    ImGuiSeparatorFlags_Vertical = 1 << 1,
    ImGuiSeparatorFlags_SpanAllColumns = 1 << 2
 }ImGuiSeparatorFlags_;
-typedef enum {
-    ImGuiItemFlags_None = 0,
-    ImGuiItemFlags_NoTabStop = 1 << 0,
-    ImGuiItemFlags_ButtonRepeat = 1 << 1,
-    ImGuiItemFlags_Disabled = 1 << 2,
-    ImGuiItemFlags_NoNav = 1 << 3,
-    ImGuiItemFlags_NoNavDefaultFocus = 1 << 4,
-    ImGuiItemFlags_SelectableDontClosePopup = 1 << 5,
-    ImGuiItemFlags_MixedValue = 1 << 6,
-    ImGuiItemFlags_Default_ = 0
-}ImGuiItemFlags_;
-typedef enum {
-    ImGuiItemStatusFlags_None = 0,
-    ImGuiItemStatusFlags_HoveredRect = 1 << 0,
-    ImGuiItemStatusFlags_HasDisplayRect = 1 << 1,
-    ImGuiItemStatusFlags_Edited = 1 << 2,
-    ImGuiItemStatusFlags_ToggledSelection = 1 << 3,
-    ImGuiItemStatusFlags_ToggledOpen = 1 << 4,
-    ImGuiItemStatusFlags_HasDeactivated = 1 << 5,
-    ImGuiItemStatusFlags_Deactivated = 1 << 6
-}ImGuiItemStatusFlags_;
 typedef enum {
    ImGuiTextFlags_None = 0,
    ImGuiTextFlags_NoWidthForLargeClippedText = 1 << 0
@@ -1171,18 +1210,9 @@ typedef enum {
    ImGuiPopupPositionPolicy_Default,
    ImGuiPopupPositionPolicy_ComboBox
 }ImGuiPopupPositionPolicy;
-struct ImVec1
+struct ImGuiDataTypeTempStorage
 {
-    float x;
-};
-struct ImVec2ih
-{
-    short x, y;
-};
-struct ImRect
-{
-    ImVec2 Min;
-    ImVec2 Max;
+    ImU8 Data[8];
 };
 struct ImGuiDataTypeInfo
 {
@@ -1190,6 +1220,11 @@ struct ImGuiDataTypeInfo
    const char* PrintFmt;
    const char* ScanFmt;
 };
+typedef enum {
+    ImGuiDataType_String = ImGuiDataType_COUNT + 1,
+    ImGuiDataType_Pointer,
+    ImGuiDataType_ID
+}ImGuiDataTypePrivate_;
 struct ImGuiColorMod
 {
    ImGuiCol Col;
@@ -1236,22 +1271,6 @@ struct ImGuiInputTextState
    ImGuiInputTextCallback UserCallback;
    void* UserCallbackData;
 };
-struct ImGuiWindowSettings
-{
-    ImGuiID ID;
-    ImVec2ih Pos;
-    ImVec2ih Size;
-    bool Collapsed;
-};
-struct ImGuiSettingsHandler
-{
-    const char* TypeName;
-    ImGuiID TypeHash;
-    void* (*ReadOpenFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, const char* name);
-    void (*ReadLineFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, void* entry, const char* line);
-    void (*WriteAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* out_buf);
-    void* UserData;
-};
 struct ImGuiPopupData
 {
    ImGuiID PopupId;
@@ -1262,46 +1281,6 @@ struct ImGuiPopupData
    ImVec2 OpenPopupPos;
    ImVec2 OpenMousePos;
 };
-struct ImGuiColumnData
-{
-    float OffsetNorm;
-    float OffsetNormBeforeResize;
-    ImGuiColumnsFlags Flags;
-    ImRect ClipRect;
-};
-struct ImGuiColumns
-{
-    ImGuiID ID;
-    ImGuiColumnsFlags Flags;
-    bool IsFirstFrame;
-    bool IsBeingResized;
-    int Current;
-    int Count;
-    float OffMinX, OffMaxX;
-    float LineMinY, LineMaxY;
-    float HostCursorPosY;
-    float HostCursorMaxPosX;
-    ImRect HostClipRect;
-    ImRect HostWorkRect;
-    ImVector_ImGuiColumnData Columns;
-    ImDrawListSplitter Splitter;
-};
-struct ImDrawListSharedData
-{
-    ImVec2 TexUvWhitePixel;
-    ImFont* Font;
-    float FontSize;
-    float CurveTessellationTol;
-    float CircleSegmentMaxError;
-    ImVec4 ClipRectFullscreen;
-    ImDrawListFlags InitialFlags;
-    ImVec2 ArcFastVtx[12 * 1];
-    ImU8 CircleSegmentCounts[64];
-};
-struct ImDrawDataBuilder
-{
-    ImVector_ImDrawListPtr Layers[2];
-};
 struct ImGuiNavMoveResult
 {
    ImGuiWindow* Window;
@@ -1320,7 +1299,8 @@ typedef enum {
    ImGuiNextWindowDataFlags_HasCollapsed = 1 << 3,
    ImGuiNextWindowDataFlags_HasSizeConstraint = 1 << 4,
    ImGuiNextWindowDataFlags_HasFocus = 1 << 5,
-    ImGuiNextWindowDataFlags_HasBgAlpha = 1 << 6
+    ImGuiNextWindowDataFlags_HasBgAlpha = 1 << 6,
+    ImGuiNextWindowDataFlags_HasScroll = 1 << 7
 }ImGuiNextWindowDataFlags_;
 struct ImGuiNextWindowData
 {
@@ -1332,6 +1312,7 @@ struct ImGuiNextWindowData
    ImVec2 PosPivotVal;
    ImVec2 SizeVal;
    ImVec2 ContentSizeVal;
+    ImVec2 ScrollVal;
    bool CollapsedVal;
    ImRect SizeConstraintRect;
    ImGuiSizeCallback SizeCallback;
@@ -1362,6 +1343,59 @@ struct ImGuiPtrOrIndex
    void* Ptr;
    int Index;
 };
+typedef enum {
+    ImGuiColumnsFlags_None = 0,
+    ImGuiColumnsFlags_NoBorder = 1 << 0,
+    ImGuiColumnsFlags_NoResize = 1 << 1,
+    ImGuiColumnsFlags_NoPreserveWidths = 1 << 2,
+    ImGuiColumnsFlags_NoForceWithinWindow = 1 << 3,
+    ImGuiColumnsFlags_GrowParentContentsSize= 1 << 4
+}ImGuiColumnsFlags_;
+struct ImGuiColumnData
+{
+    float OffsetNorm;
+    float OffsetNormBeforeResize;
+    ImGuiColumnsFlags Flags;
+    ImRect ClipRect;
+};
+struct ImGuiColumns
+{
+    ImGuiID ID;
+    ImGuiColumnsFlags Flags;
+    bool IsFirstFrame;
+    bool IsBeingResized;
+    int Current;
+    int Count;
+    float OffMinX, OffMaxX;
+    float LineMinY, LineMaxY;
+    float HostCursorPosY;
+    float HostCursorMaxPosX;
+    ImRect HostInitialClipRect;
+    ImRect HostBackupClipRect;
+    ImRect HostWorkRect;
+    ImVector_ImGuiColumnData Columns;
+    ImDrawListSplitter Splitter;
+};
+struct ImGuiWindowSettings
+{
+    ImGuiID ID;
+    ImVec2ih Pos;
+    ImVec2ih Size;
+    bool Collapsed;
+    bool WantApply;
+};
+struct ImGuiSettingsHandler
+{
+    const char* TypeName;
+    ImGuiID TypeHash;
+    void (*ClearAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler);
+    void (*ReadInitFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler);
+    void* (*ReadOpenFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, const char* name);
+    void (*ReadLineFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, void* entry, const char* line);
+    void (*ApplyAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler);
+    void (*WriteAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* out_buf);
+    void* UserData;
+};
 struct ImGuiContext
 {
    bool Initialized;
@@ -1379,6 +1413,9 @@ struct ImGuiContext
    bool WithinFrameScope;
    bool WithinFrameScopeWithImplicitWindow;
    bool WithinEndChild;
+    bool TestEngineHookItems;
+    ImGuiID TestEngineHookIdInfo;
+    void* TestEngine;
    ImVector_ImGuiWindowPtr Windows;
    ImVector_ImGuiWindowPtr WindowsFocusOrder;
    ImVector_ImGuiWindowPtr WindowsTempSortBuffer;
@@ -1461,9 +1498,11 @@ struct ImGuiContext
    ImGuiNavMoveResult NavMoveResultLocal;
    ImGuiNavMoveResult NavMoveResultLocalVisibleSet;
    ImGuiNavMoveResult NavMoveResultOther;
+    ImGuiWindow* NavWrapRequestWindow;
+    ImGuiNavMoveFlags NavWrapRequestFlags;
    ImGuiWindow* NavWindowingTarget;
    ImGuiWindow* NavWindowingTargetAnim;
-    ImGuiWindow* NavWindowingList;
+    ImGuiWindow* NavWindowingListWindow;
    float NavWindowingTimer;
    float NavWindowingHighlightAlpha;
    bool NavWindowingToggleLayer;
@@ -1494,6 +1533,7 @@ struct ImGuiContext
    ImGuiID DragDropAcceptIdCurr;
    ImGuiID DragDropAcceptIdPrev;
    int DragDropAcceptFrameCount;
+    ImGuiID DragDropHoldJustPressedId;
    ImVector_unsigned_char DragDropPayloadBufHeap;
    unsigned char DragDropPayloadBufLocal[16];
    ImGuiTabBar* CurrentTabBar;
@@ -1927,7 +1967,7 @@ CIMGUI_API bool igBeginCombo(const char* label,const char* preview_value,ImGuiCo
 CIMGUI_API void igEndCombo(void);
 CIMGUI_API bool igComboStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int popup_max_height_in_items);
 CIMGUI_API bool igComboStr(const char* label,int* current_item,const char* items_separated_by_zeros,int popup_max_height_in_items);
-CIMGUI_API bool igComboFnPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items);
+CIMGUI_API bool igComboFnBoolPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items);
 CIMGUI_API bool igDragFloat(const char* label,float* v,float v_speed,float v_min,float v_max,const char* format,float power);
 CIMGUI_API bool igDragFloat2(const char* label,float v[2],float v_speed,float v_min,float v_max,const char* format,float power);
 CIMGUI_API bool igDragFloat3(const char* label,float v[3],float v_speed,float v_min,float v_max,const char* format,float power);
@@ -1994,14 +2034,14 @@ 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 igListBoxStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int height_in_items);
-CIMGUI_API bool igListBoxFnPtr(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 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 igPlotLinesFnPtr(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 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);
-CIMGUI_API void igPlotHistogramFnPtr(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 igPlotHistogramFnFloatPtr(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 igValueBool(const char* prefix,bool b);
 CIMGUI_API void igValueInt(const char* prefix,int v);
 CIMGUI_API void igValueUint(const char* prefix,unsigned int v);
@@ -2018,16 +2058,16 @@ CIMGUI_API void igBeginTooltip(void);
 CIMGUI_API void igEndTooltip(void);
 CIMGUI_API void igSetTooltip(const char* fmt,...);
 CIMGUI_API void igSetTooltipV(const char* fmt,va_list args);
-CIMGUI_API void igOpenPopup(const char* str_id);
 CIMGUI_API bool igBeginPopup(const char* str_id,ImGuiWindowFlags flags);
-CIMGUI_API bool igBeginPopupContextItem(const char* str_id,ImGuiMouseButton mouse_button);
-CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,ImGuiMouseButton mouse_button,bool also_over_items);
-CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,ImGuiMouseButton mouse_button);
 CIMGUI_API bool igBeginPopupModal(const char* name,bool* p_open,ImGuiWindowFlags flags);
 CIMGUI_API void igEndPopup(void);
-CIMGUI_API bool igOpenPopupOnItemClick(const char* str_id,ImGuiMouseButton mouse_button);
-CIMGUI_API bool igIsPopupOpenStr(const char* str_id);
+CIMGUI_API void igOpenPopup(const char* str_id,ImGuiPopupFlags popup_flags);
+CIMGUI_API bool igOpenPopupContextItem(const char* str_id,ImGuiPopupFlags popup_flags);
 CIMGUI_API void igCloseCurrentPopup(void);
+CIMGUI_API bool igBeginPopupContextItem(const char* str_id,ImGuiPopupFlags popup_flags);
+CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,ImGuiPopupFlags popup_flags);
+CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,ImGuiPopupFlags popup_flags);
+CIMGUI_API bool igIsPopupOpenStr(const char* str_id,ImGuiPopupFlags flags);
 CIMGUI_API void igColumns(int count,const char* id,bool border);
 CIMGUI_API void igNextColumn(void);
 CIMGUI_API int igGetColumnIndex(void);
@@ -2090,6 +2130,8 @@ CIMGUI_API void igEndChildFrame(void);
 CIMGUI_API void igCalcTextSize(ImVec2 *pOut,const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width);
 CIMGUI_API void igColorConvertU32ToFloat4(ImVec4 *pOut,ImU32 in);
 CIMGUI_API ImU32 igColorConvertFloat4ToU32(const ImVec4 in);
+CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float* out_h,float* out_s,float* out_v);
+CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float* out_r,float* out_g,float* out_b);
 CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key);
 CIMGUI_API bool igIsKeyDown(int user_key_index);
 CIMGUI_API bool igIsKeyPressed(int user_key_index,bool repeat);
@@ -2251,8 +2293,6 @@ CIMGUI_API ImDrawList* ImDrawList_CloneOutput(ImDrawList* self);
 CIMGUI_API void ImDrawList_ChannelsSplit(ImDrawList* self,int count);
 CIMGUI_API void ImDrawList_ChannelsMerge(ImDrawList* self);
 CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* self,int n);
-CIMGUI_API void ImDrawList_Clear(ImDrawList* self);
-CIMGUI_API void ImDrawList_ClearFreeMemory(ImDrawList* self);
 CIMGUI_API void ImDrawList_PrimReserve(ImDrawList* self,int idx_count,int vtx_count);
 CIMGUI_API void ImDrawList_PrimUnreserve(ImDrawList* self,int idx_count,int vtx_count);
 CIMGUI_API void ImDrawList_PrimRect(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col);
@@ -2261,8 +2301,12 @@ CIMGUI_API void ImDrawList_PrimQuadUV(ImDrawList* self,const ImVec2 a,const ImVe
 CIMGUI_API void ImDrawList_PrimWriteVtx(ImDrawList* self,const ImVec2 pos,const ImVec2 uv,ImU32 col);
 CIMGUI_API void ImDrawList_PrimWriteIdx(ImDrawList* self,ImDrawIdx idx);
 CIMGUI_API void ImDrawList_PrimVtx(ImDrawList* self,const ImVec2 pos,const ImVec2 uv,ImU32 col);
-CIMGUI_API void ImDrawList_UpdateClipRect(ImDrawList* self);
-CIMGUI_API void ImDrawList_UpdateTextureID(ImDrawList* self);
+CIMGUI_API void ImDrawList__ResetForNewFrame(ImDrawList* self);
+CIMGUI_API void ImDrawList__ClearFreeMemory(ImDrawList* self);
+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 ImDrawData* ImDrawData_ImDrawData(void);
 CIMGUI_API void ImDrawData_destroy(ImDrawData* self);
 CIMGUI_API void ImDrawData_Clear(ImDrawData* self);
@@ -2307,7 +2351,7 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseSimplifiedCommon(ImFo
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesCyrillic(ImFontAtlas* self);
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self);
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesVietnamese(ImFontAtlas* self);
-CIMGUI_API int ImFontAtlas_AddCustomRectRegular(ImFontAtlas* self,unsigned int id,int width,int height);
+CIMGUI_API int ImFontAtlas_AddCustomRectRegular(ImFontAtlas* self,int width,int height);
 CIMGUI_API int ImFontAtlas_AddCustomRectFontGlyph(ImFontAtlas* self,ImFont* font,ImWchar id,int width,int height,float advance_x,const ImVec2 offset);
 CIMGUI_API const ImFontAtlasCustomRect* ImFontAtlas_GetCustomRectByIndex(ImFontAtlas* self,int index);
 CIMGUI_API void ImFontAtlas_CalcCustomRectUV(ImFontAtlas* self,const ImFontAtlasCustomRect* rect,ImVec2* out_uv_min,ImVec2* out_uv_max);
@@ -2393,18 +2437,9 @@ CIMGUI_API void igImBezierClosestPointCasteljau(ImVec2 *pOut,const ImVec2 p1,con
 CIMGUI_API void igImLineClosestPoint(ImVec2 *pOut,const ImVec2 a,const ImVec2 b,const ImVec2 p);
 CIMGUI_API bool igImTriangleContainsPoint(const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 p);
 CIMGUI_API void igImTriangleClosestPoint(ImVec2 *pOut,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 p);
-CIMGUI_API void igImTriangleBarycentricCoords(const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 p,float out_u,float out_v,float out_w);
+CIMGUI_API void igImTriangleBarycentricCoords(const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 p,float* out_u,float* out_v,float* out_w);
 CIMGUI_API float igImTriangleArea(const ImVec2 a,const ImVec2 b,const ImVec2 c);
 CIMGUI_API ImGuiDir igImGetDirQuadrantFromDelta(float dx,float dy);
-CIMGUI_API bool igImBitArrayTestBit(const ImU32* arr,int n);
-CIMGUI_API void igImBitArrayClearBit(ImU32* arr,int n);
-CIMGUI_API void igImBitArraySetBit(ImU32* arr,int n);
-CIMGUI_API void igImBitArraySetBitRange(ImU32* arr,int n,int n2);
-CIMGUI_API void ImBitVector_Create(ImBitVector* self,int sz);
-CIMGUI_API void ImBitVector_Clear(ImBitVector* self);
-CIMGUI_API bool ImBitVector_TestBit(ImBitVector* self,int n);
-CIMGUI_API void ImBitVector_SetBit(ImBitVector* self,int n);
-CIMGUI_API void ImBitVector_ClearBit(ImBitVector* self,int n);
 CIMGUI_API ImVec1* ImVec1_ImVec1Nil(void);
 CIMGUI_API void ImVec1_destroy(ImVec1* self);
 CIMGUI_API ImVec1* ImVec1_ImVec1Float(float _x);
@@ -2439,6 +2474,22 @@ CIMGUI_API void ImRect_ClipWith(ImRect* self,const ImRect r);
 CIMGUI_API void ImRect_ClipWithFull(ImRect* self,const ImRect r);
 CIMGUI_API void ImRect_Floor(ImRect* self);
 CIMGUI_API bool ImRect_IsInverted(ImRect* self);
+CIMGUI_API void ImRect_ToVec4(ImVec4 *pOut,ImRect* self);
+CIMGUI_API bool igImBitArrayTestBit(const ImU32* arr,int n);
+CIMGUI_API void igImBitArrayClearBit(ImU32* arr,int n);
+CIMGUI_API void igImBitArraySetBit(ImU32* arr,int n);
+CIMGUI_API void igImBitArraySetBitRange(ImU32* arr,int n,int n2);
+CIMGUI_API void ImBitVector_Create(ImBitVector* self,int sz);
+CIMGUI_API void ImBitVector_Clear(ImBitVector* self);
+CIMGUI_API bool ImBitVector_TestBit(ImBitVector* self,int n);
+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 ImDrawDataBuilder_Clear(ImDrawDataBuilder* self);
+CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(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);
 CIMGUI_API ImGuiStyleMod* ImGuiStyleMod_ImGuiStyleModFloat(ImGuiStyleVar idx,float v);
@@ -2460,24 +2511,8 @@ CIMGUI_API void ImGuiInputTextState_CursorClamp(ImGuiInputTextState* self);
 CIMGUI_API bool ImGuiInputTextState_HasSelection(ImGuiInputTextState* self);
 CIMGUI_API void ImGuiInputTextState_ClearSelection(ImGuiInputTextState* self);
 CIMGUI_API void ImGuiInputTextState_SelectAll(ImGuiInputTextState* self);
-CIMGUI_API ImGuiWindowSettings* ImGuiWindowSettings_ImGuiWindowSettings(void);
-CIMGUI_API void ImGuiWindowSettings_destroy(ImGuiWindowSettings* self);
-CIMGUI_API char* ImGuiWindowSettings_GetName(ImGuiWindowSettings* self);
-CIMGUI_API ImGuiSettingsHandler* ImGuiSettingsHandler_ImGuiSettingsHandler(void);
-CIMGUI_API void ImGuiSettingsHandler_destroy(ImGuiSettingsHandler* self);
 CIMGUI_API ImGuiPopupData* ImGuiPopupData_ImGuiPopupData(void);
 CIMGUI_API void ImGuiPopupData_destroy(ImGuiPopupData* self);
-CIMGUI_API ImGuiColumnData* ImGuiColumnData_ImGuiColumnData(void);
-CIMGUI_API void ImGuiColumnData_destroy(ImGuiColumnData* self);
-CIMGUI_API ImGuiColumns* ImGuiColumns_ImGuiColumns(void);
-CIMGUI_API void ImGuiColumns_destroy(ImGuiColumns* self);
-CIMGUI_API void ImGuiColumns_Clear(ImGuiColumns* self);
-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 ImDrawDataBuilder_Clear(ImDrawDataBuilder* self);
-CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self);
-CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self);
 CIMGUI_API ImGuiNavMoveResult* ImGuiNavMoveResult_ImGuiNavMoveResult(void);
 CIMGUI_API void ImGuiNavMoveResult_destroy(ImGuiNavMoveResult* self);
 CIMGUI_API void ImGuiNavMoveResult_Clear(ImGuiNavMoveResult* self);
@@ -2490,6 +2525,16 @@ CIMGUI_API void ImGuiNextItemData_ClearFlags(ImGuiNextItemData* self);
 CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndexPtr(void* ptr);
 CIMGUI_API void ImGuiPtrOrIndex_destroy(ImGuiPtrOrIndex* self);
 CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndexInt(int index);
+CIMGUI_API ImGuiColumnData* ImGuiColumnData_ImGuiColumnData(void);
+CIMGUI_API void ImGuiColumnData_destroy(ImGuiColumnData* self);
+CIMGUI_API ImGuiColumns* ImGuiColumns_ImGuiColumns(void);
+CIMGUI_API void ImGuiColumns_destroy(ImGuiColumns* self);
+CIMGUI_API void ImGuiColumns_Clear(ImGuiColumns* self);
+CIMGUI_API ImGuiWindowSettings* ImGuiWindowSettings_ImGuiWindowSettings(void);
+CIMGUI_API void ImGuiWindowSettings_destroy(ImGuiWindowSettings* self);
+CIMGUI_API char* ImGuiWindowSettings_GetName(ImGuiWindowSettings* self);
+CIMGUI_API ImGuiSettingsHandler* ImGuiSettingsHandler_ImGuiSettingsHandler(void);
+CIMGUI_API void ImGuiSettingsHandler_destroy(ImGuiSettingsHandler* self);
 CIMGUI_API ImGuiContext* ImGuiContext_ImGuiContext(ImFontAtlas* shared_font_atlas);
 CIMGUI_API void ImGuiContext_destroy(ImGuiContext* self);
 CIMGUI_API ImGuiWindowTempData* ImGuiWindowTempData_ImGuiWindowTempData(void);
@@ -2547,10 +2592,12 @@ CIMGUI_API void igUpdateMouseMovingWindowNewFrame(void);
 CIMGUI_API void igUpdateMouseMovingWindowEndFrame(void);
 CIMGUI_API void igMarkIniSettingsDirtyNil(void);
 CIMGUI_API void igMarkIniSettingsDirtyWindowPtr(ImGuiWindow* window);
+CIMGUI_API void igClearIniSettings(void);
 CIMGUI_API ImGuiWindowSettings* igCreateNewWindowSettings(const char* name);
 CIMGUI_API ImGuiWindowSettings* igFindWindowSettings(ImGuiID id);
 CIMGUI_API ImGuiWindowSettings* igFindOrCreateWindowSettings(const char* name);
 CIMGUI_API ImGuiSettingsHandler* igFindSettingsHandler(const char* type_name);
+CIMGUI_API void igSetNextWindowScroll(const ImVec2 scroll);
 CIMGUI_API void igSetScrollXWindowPtr(ImGuiWindow* window,float new_scroll_x);
 CIMGUI_API void igSetScrollYWindowPtr(ImGuiWindow* window,float new_scroll_y);
 CIMGUI_API void igSetScrollFromPosXWindowPtr(ImGuiWindow* window,float local_x,float center_x_ratio);
@@ -2586,10 +2633,10 @@ CIMGUI_API void igShrinkWidths(ImGuiShrinkWidthItem* items,int count,float width
 CIMGUI_API void igLogBegin(ImGuiLogType type,int auto_open_depth);
 CIMGUI_API void igLogToBuffer(int auto_open_depth);
 CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2 size_arg,bool border,ImGuiWindowFlags flags);
-CIMGUI_API void igOpenPopupEx(ImGuiID id);
+CIMGUI_API void igOpenPopupEx(ImGuiID id,ImGuiPopupFlags popup_flags);
 CIMGUI_API void igClosePopupToLevel(int remaining,bool restore_focus_to_window_under_popup);
 CIMGUI_API void igClosePopupsOverWindow(ImGuiWindow* ref_window,bool restore_focus_to_window_under_popup);
-CIMGUI_API bool igIsPopupOpenID(ImGuiID id);
+CIMGUI_API bool igIsPopupOpenID(ImGuiID id,ImGuiPopupFlags popup_flags);
 CIMGUI_API bool igBeginPopupEx(ImGuiID id,ImGuiWindowFlags extra_flags);
 CIMGUI_API void igBeginTooltipEx(ImGuiWindowFlags extra_flags,ImGuiTooltipFlags tooltip_flags);
 CIMGUI_API ImGuiWindow* igGetTopMostPopupModal(void);
@@ -2620,6 +2667,7 @@ CIMGUI_API ImGuiKeyModFlags igGetMergedKeyModFlags(void);
 CIMGUI_API bool igBeginDragDropTargetCustom(const ImRect bb,ImGuiID id);
 CIMGUI_API void igClearDragDrop(void);
 CIMGUI_API bool igIsDragDropPayloadBeingAccepted(void);
+CIMGUI_API void igSetWindowClipRectBeforeSetChannel(ImGuiWindow* window,const ImRect clip_rect);
 CIMGUI_API void igBeginColumns(const char* str_id,int count,ImGuiColumnsFlags flags);
 CIMGUI_API void igEndColumns(void);
 CIMGUI_API void igPushColumnClipRect(int column_index);
@@ -2637,7 +2685,7 @@ CIMGUI_API void igTabBarQueueChangeTabOrder(ImGuiTabBar* tab_bar,const ImGuiTabI
 CIMGUI_API bool igTabItemEx(ImGuiTabBar* tab_bar,const char* label,bool* p_open,ImGuiTabItemFlags flags);
 CIMGUI_API void igTabItemCalcSize(ImVec2 *pOut,const char* label,bool has_close_button);
 CIMGUI_API void igTabItemBackground(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImU32 col);
-CIMGUI_API bool igTabItemLabelAndCloseButton(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImVec2 frame_padding,const char* label,ImGuiID tab_id,ImGuiID close_button_id);
+CIMGUI_API bool igTabItemLabelAndCloseButton(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImVec2 frame_padding,const char* label,ImGuiID tab_id,ImGuiID close_button_id,bool is_contents_visible);
 CIMGUI_API void igRenderText(ImVec2 pos,const char* text,const char* text_end,bool hide_text_after_hash);
 CIMGUI_API void igRenderTextWrapped(ImVec2 pos,const char* text,const char* text_end,float wrap_width);
 CIMGUI_API void igRenderTextClipped(const ImVec2 pos_min,const ImVec2 pos_max,const char* text,const char* text_end,const ImVec2* text_size_if_known,const ImVec2 align,const ImRect* clip_rect);
@@ -2662,6 +2710,7 @@ 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 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);
 CIMGUI_API ImGuiID igGetWindowResizeID(ImGuiWindow* window,int n);
@@ -2677,9 +2726,10 @@ CIMGUI_API const ImGuiDataTypeInfo* igDataTypeGetInfo(ImGuiDataType data_type);
 CIMGUI_API int igDataTypeFormatString(char* buf,int buf_size,ImGuiDataType data_type,const void* p_data,const char* format);
 CIMGUI_API void igDataTypeApplyOp(ImGuiDataType data_type,int op,void* output,void* arg_1,const void* arg_2);
 CIMGUI_API bool igDataTypeApplyOpFromText(const char* buf,const char* initial_value_buf,ImGuiDataType data_type,void* p_data,const char* format);
+CIMGUI_API bool igDataTypeClamp(ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max);
 CIMGUI_API bool igInputTextEx(const char* label,const char* hint,char* buf,int buf_size,const ImVec2 size_arg,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data);
 CIMGUI_API bool igTempInputText(const ImRect bb,ImGuiID id,const char* label,char* buf,int buf_size,ImGuiInputTextFlags flags);
-CIMGUI_API bool igTempInputScalar(const ImRect bb,ImGuiID id,const char* label,ImGuiDataType data_type,void* p_data,const char* format);
+CIMGUI_API bool igTempInputScalar(const ImRect bb,ImGuiID id,const char* label,ImGuiDataType data_type,void* p_data,const char* format,const void* p_clamp_min,const void* p_clamp_max);
 CIMGUI_API bool igTempInputIsActive(ImGuiID id);
 CIMGUI_API ImGuiInputTextState* igGetInputTextState(ImGuiID id);
 CIMGUI_API void igColorTooltip(const char* text,const float* col,ImGuiColorEditFlags flags);
@@ -2708,9 +2758,6 @@ CIMGUI_API void igLogText(CONST char *fmt, ...);
 CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const char *fmt, ...);
 //for getting FLT_MAX in bindings
 CIMGUI_API float igGET_FLT_MAX();
-//not const args from & to *
-CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v);
-CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b);


 CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create();
--- a/generator/cimgui_template.cpp
+++ b/generator/cimgui_template.cpp
@@ -31,14 +31,7 @@ CIMGUI_API float igGET_FLT_MAX()
 {
    return FLT_MAX;
 }
-CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v)
-{
-    ImGui::ColorConvertRGBtoHSV(r,g,b,*out_h,*out_s,*out_v);
-}
-CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b)
-{
-    ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b);
-}
+

 CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
 {
--- a/generator/cimgui_template.h
+++ b/generator/cimgui_template.h
@@ -55,9 +55,6 @@ CIMGUI_API void igLogText(CONST char *fmt, ...);
 CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const char *fmt, ...);
 //for getting FLT_MAX in bindings
 CIMGUI_API float igGET_FLT_MAX();
-//not const args from & to *
-CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v);
-CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b);


 CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create();
--- a/generator/cpp2ffi.lua
+++ b/generator/cpp2ffi.lua
@@ -280,7 +280,8 @@ local function getRE()
 end
 M.getRE = getRE
 --takes preprocesed file in table cdefsor and returns items
-local function parseItems(txt,dumpit)
+local function parseItems(txt,dumpit,loca)
+	--assert(loca)
 	--dumpit = true
 	local res,resN = getRE()
 	
@@ -297,7 +298,7 @@ local function parseItems(txt,dumpit)
 				item = txt:sub(i,e)
 				--if re~=functionD_re then --skip defined functions
 					item = item:gsub("extern __attribute__%(%(dllexport%)%) ","")
-					table.insert(itemarr,{re_name=re_name,item=item})
+					table.insert(itemarr,{re_name=re_name,item=item,locat=loca})
 				--end
 				items[re_name] = items[re_name] or {}
 				table.insert(items[re_name],item)
@@ -392,8 +393,10 @@ local function name_overloadsAlgo(v)
    return aa,bb
 end
 local function typetoStr(typ)
+	--print("typetoStr",typ)
    --typ = typ:gsub("[^%(%)]+%(%*?(.+)%).+","%1") -- funcs
-    typ = typ:gsub("[^%(%)]+%(%*?(.+)%).+","FnPtr")
+    --typ = typ:gsub("[^%(%)]+%(%*?(.+)%).+","FnPtr")
+    typ = typ:gsub("([^%(%)]+)%(%*?(.+)%).+","Fn%1Ptr")
    typ = typ:gsub("[%w_]+%[(%d*)%]","arr%1")
    typ = typ:gsub("%*","Ptr")
    typ = typ:gsub("void","")
@@ -410,7 +413,8 @@ local function typetoStr(typ)
    typ = typ:gsub("[<>]","")
    return typ
 end
-local function parseFunction(self,stname,lineorig,namespace)
+local function parseFunction(self,stname,lineorig,namespace,locat)
+
 	line = clean_spaces(lineorig)
 	--move *
 	line = line:gsub("%s*%*","%*")
@@ -478,16 +482,18 @@ local function parseFunction(self,stname,lineorig,namespace)
    local functype_arg_rest = "^(%s*[%w%s%*]+%(%*[%w_]+%)%([^%(%)]*%)),*(.*)"
    local rest = argscsinpars:sub(2,-2) --strip ()
    
+	
    while true do
    --local tt = strsplit(rest,",")
    --for ii,arg in ipairs(tt) do
    --for arg in argscsinpars:gmatch("[%(,]*([^,%(%)]+)[%),]") do
+		local reftoptr
 		if rest == "void" then break end
        local type,name,retf,sigf
        local arg,restt = rest:match(functype_arg_rest)
-        if arg then
+        if arg then -- if is function pointer
            local t1,namef,t2 = arg:match(functype_reex)
-            type=t1.."(*)"..t2;name=namef
+            type = t1.."(*)"..t2;name=namef
            retf = t1
            sigf = t2
            rest = restt
@@ -495,8 +501,13 @@ local function parseFunction(self,stname,lineorig,namespace)
            arg,restt = rest:match(",*([^,%(%)]+),*(.*)")
            if not arg then break end
            rest = restt
-            if arg:match("&") and arg:match("const") then
-                arg = arg:gsub("&","")
+            if arg:match("&") then
+				if arg:match("const") then
+					arg = arg:gsub("&","")
+				else
+					arg = arg:gsub("&","*")
+					reftoptr = true
+				end
            end
            if arg:match("%.%.%.") then 
                type="...";name="..."
@@ -506,7 +517,6 @@ local function parseFunction(self,stname,lineorig,namespace)

            if not type or not name then 
                print("failure arg detection",funcname,type,name,argscsinpars,arg)
-
            else
 				if name:match"%*" then print("**",funcname) end
                --float name[2] to float[2] name
@@ -517,17 +527,17 @@ local function parseFunction(self,stname,lineorig,namespace)
                end
            end
        end
-        table.insert(argsArr,{type=type,name=name,ret=retf,signature=sigf})
+        table.insert(argsArr,{type=type,name=name,ret=retf,signature=sigf,reftoptr=reftoptr})
        if arg:match("&") and not arg:match("const") then
            --only post error if not manual
-            local cname = self.getCname(stname,funcname) --cimguiname
+            local cname = self.getCname(stname,funcname, namespace) --cimguiname
            if not self.manuals[cname] then
                print("reference to no const arg in",funcname,argscsinpars,arg)
            end
        end
    end
    argscsinpars = argscsinpars:gsub("&","")
-    
+
    local signature = argscsinpars:gsub("([%w%s%*_]+)%s[%w_]+%s*([,%)])","%1%2")
    signature = signature:gsub("%s*([,%)])","%1") --space before , and )
    signature = signature:gsub(",%s*",",")--space after ,
@@ -538,6 +548,43 @@ local function parseFunction(self,stname,lineorig,namespace)
    local call_args = argscsinpars:gsub("([%w_]+%s[%w_]+)%[%d*%]","%1") --float[2]
    call_args = call_args:gsub("%(%*([%w_]+)%)%([^%(%)]*%)"," %1") --func type
    call_args = call_args:gsub("[^%(].-([%w_]+)%s*([,%)])","%1%2")
+	
+	--recreate argscsinpars from argsArr
+	local asp, caar
+	if #argsArr > 0 then
+		asp = "("
+		caar = "("
+		for i,v in ipairs(argsArr) do
+			if v.ret then --function pointer
+				asp = asp .. v.ret .. "(*" .. v.name .. ")" .. v.signature .. ","
+				caar = caar .. v.name .. ","
+			else
+				local siz = v.type:match("(%[%d*%])") or ""
+				local type = v.type:gsub("(%[%d*%])","")
+				asp = asp .. type .. (v.name~="..." and " "..v.name or "") .. siz .. ","
+				local callname = v.reftoptr and "*"..v.name or v.name 
+				caar = caar .. callname .. ","
+			end
+		end
+		asp = asp:sub(1,-2)..")"
+		caar = caar:sub(1,-2)..")"
+	else
+		asp = "()"
+		caar = "()"
+	end
+	--[[
+	if asp~=argscsinpars then
+		print("bad recontruction",funcname)
+		print(argscsinpars)
+		print(asp)
+	end
+	if caar~=call_args then
+		print("bad call_args",funcname)
+		print(call_args)
+		print(caar)
+	end
+	--]]
+    ------------------------------
    
    if not ret and stname then --must be constructors
        if not (stname == funcname or "~"..stname==funcname) then --break end
@@ -547,7 +594,7 @@ local function parseFunction(self,stname,lineorig,namespace)
        end
    end
    
-    local cimguiname = self.getCname(stname,funcname)
+    local cimguiname = self.getCname(stname,funcname, namespace)
    table.insert(self.funcdefs,{stname=stname,funcname=funcname,args=args,argsc=argscsinpars,signature=signature,cimguiname=cimguiname,call_args=call_args,ret =ret})
 	local defsT = self.defsT
 	            defsT[cimguiname] = defsT[cimguiname] or {}
@@ -565,9 +612,9 @@ local function parseFunction(self,stname,lineorig,namespace)
    defT.stname = stname
    defT.funcname = funcname
    defT.argsoriginal = args
-    defT.args=argscsinpars
+    defT.args= asp --argscsinpars
    defT.signature = signature
-    defT.call_args = call_args
+    defT.call_args = caar --call_args
    defT.isvararg = signature:match("%.%.%.%)$")
    defT.location = locat
    --defT.comment = "" --comment
@@ -767,16 +814,16 @@ function M.Parser()
 	par.manuals = {}
 	par.UDTs = {}

-	function par:insert(line)
-		table.insert(cdefs,line)
+	function par:insert(line,loca)
+		table.insert(cdefs,{line,loca})
 	end
-	function par.getCname(stname,funcname)
+	function par.getCname(stname,funcname, namespace)
 		if #stname == 0 then return funcname end --top level
 		local pre = stname.."_"
 		return pre..funcname
 	end
-	function par.getCname_overload(stname,funcname,signature)
-		local cname = par.getCname(stname,funcname)
+	function par.getCname_overload(stname,funcname,signature, namespace)
+		local cname = par.getCname(stname,funcname, namespace)
 		local ov_cname = par.cname_overloads[cname] and par.cname_overloads[cname][signature] --or cname
 		return ov_cname
 	end
@@ -793,7 +840,8 @@ function M.Parser()
 	end
 	function par:parseItems()
 		--typedefs dictionary
-		for i,line in ipairs(cdefs) do
+		for i,cdef in ipairs(cdefs) do
+			local line = cdef[1]
 			if line:match("typedef") then
 				line = clean_spaces(line)
 				local value,key = line:match("typedef%s+(.+)%s+([%w_]+);")
@@ -813,8 +861,26 @@ function M.Parser()
 				end
 			end
 		end
-		local txt = table.concat(cdefs,"\n")
-		itemsarr,items = parseItems(txt)
+		
+		itemsarr = {}
+		if self.separate_locations then
+			local located_cdefs = self:separate_locations(cdefs)
+			for i,lcdef in ipairs(located_cdefs) do
+				local txt = table.concat(lcdef[2],"\n")
+				local itemsarrT,itemsT = parseItems(txt,false,lcdef[1])
+				for i,it in ipairs(itemsarrT) do
+					table.insert(itemsarr,it)
+				end
+			end
+		else
+			local cdefs2 = {}
+			for i,cdef in ipairs(cdefs) do
+				table.insert(cdefs2,cdef[1])
+			end
+			local txt = table.concat(cdefs2,"\n")
+			itemsarr,items = parseItems(txt,false)
+		end
+		
 		self.itemsarr , self.items = itemsarr,items
 	end
 	function par:printItems()
@@ -826,14 +892,14 @@ function M.Parser()
 	function par:parseFunctions()
 		for i,it in ipairs(itemsarr) do
 			if it.re_name == "function_re" or it.re_name == "functionD_re" then
-				self:parseFunction("",it.item)
+				self:parseFunction("",it.item,nil,it.locat)
 			elseif it.re_name == "namespace_re" then
 				local nsp = it.item:match("%b{}"):sub(2,-2)
 				local namespace = it.item:match("namespace%s+(%S+)")
-				local nspparr,itemsnsp = parseItems(nsp)
+				local nspparr,itemsnsp = parseItems(nsp,false,it.locat)
 				for insp,itnsp in ipairs(nspparr) do
 					if itnsp.re_name == "function_re" or itnsp.re_name == "functionD_re" then
-						self:parseFunction("",itnsp.item,namespace)
+						self:parseFunction("",itnsp.item,namespace,itnsp.locat)
 					end
 				end
 			elseif it.re_name == "struct_re" then
@@ -845,20 +911,20 @@ function M.Parser()
 					self.typenames = self.typenames or {}
 					self.typenames[stname] = typename
 				end
-				local nspparr,itemsnsp = parseItems(nsp)
+				local nspparr,itemsnsp = parseItems(nsp,false,it.locat)
 				for insp,itnsp in ipairs(nspparr) do
 					if itnsp.re_name == "function_re" or itnsp.re_name == "functionD_re" then
-						self:parseFunction(stname,itnsp.item)
+						self:parseFunction(stname,itnsp.item,nil,itnsp.locat)
 					elseif itnsp.re_name == "struct_re" then
 						--get embeded_structs
 						local embededst = itnsp.item:match("struct%s+(%S+)")
 						self.embeded_structs[embededst] = stname.."::"..embededst
 						local nsp2 = strip_end(itnsp.item:match("%b{}"):sub(2,-2))
-						local itemsemarr,itemsem = parseItems(nsp2)
+						local itemsemarr,itemsem = parseItems(nsp2,false,itnsp.locat)
 						assert(not itemsem.struct_re,"two level embed struct")
 						for iemb,itemb in ipairs(itemsemarr) do
 							if itemb.re_name == "function_re" or itemb.re_name == "functionD_re" then
-								self:parseFunction(embededst,itemb.item)
+								self:parseFunction(embededst,itemb.item,nil,itemb.locat)
 							end
 						end
 					end
@@ -868,7 +934,8 @@ function M.Parser()
 		--require"anima"
 		--prtable(self.defsT)
 	end
-	function par:clean_struct(stru)
+	function par:clean_struct(stru, locat)
+		--assert(locat)
 		local outtab = {}
 		local iner = strip_end(stru:match("%b{}"):sub(2,-2))
 		local inistruct = clean_spaces(stru:match("(.-)%b{}"))
@@ -894,7 +961,7 @@ function M.Parser()
 		if derived then
 			table.insert(outtab,"\n    "..derived.." _"..derived..";")
 		end
-		local itlist,itemsin = parseItems(iner)
+		local itlist,itemsin = parseItems(iner, false,locat)
 		if #itlist == 0 then return "" end --here we avoid empty structs
 		for j,it in ipairs(itlist) do
 			if it.re_name == "vardef_re" or it.re_name == "functype_re" or it.re_name == "union_re" then
@@ -949,7 +1016,7 @@ function M.Parser()
 			if it.re_name == "namespace_re" then
 				local nsp = it.item:match("%b{}"):sub(2,-2)
 				local namespace = it.item:match("namespace%s+(%S+)")
-				local nspparr,itemsnsp = parseItems(nsp)
+				local nspparr,itemsnsp = parseItems(nsp, nil, it.locat )
 				for insp,itnsp in ipairs(nspparr) do
 					if itnsp.re_name == "struct_re"  or itnsp.re_name == "typedef_st_re" then
 						--print("in mamespace",itnsp.item,namespace)
@@ -965,7 +1032,7 @@ function M.Parser()
 				--print("enum is:",enumname, enumbody)
 				table.insert(outtab,"\ntypedef enum ".. enumbody..enumname..";")
 			elseif it.re_name == "struct_re" then
-				local cleanst,structname = self:clean_struct(it.item)
+				local cleanst,structname = self:clean_struct(it.item, it.locat)
 				
 				--if not structname then print("NO NAME",cleanst,it.item) end
 				
@@ -979,7 +1046,7 @@ function M.Parser()
 		end
 		--inner_structs
 		for i,it in ipairs(self.inerstructs) do
-			local cleanst,structname = self:clean_struct(it.item)
+			local cleanst,structname = self:clean_struct(it.item, it.locat)
 			if structname then
 			table.insert(outtab,cleanst)
 			table.insert(typedefs_table,"typedef struct "..structname.." "..structname..";\n")
@@ -1100,7 +1167,7 @@ function M.Parser()
 					end
 				end
 			elseif it.re_name == "struct_re" then
-				local cleanst,structname,strtab = self:clean_struct(it.item)
+				local cleanst,structname,strtab = self:clean_struct(it.item, it.locat)
 				--if not void stname or templated
 				--M.prtable(cleanst,structname,strtab)
 				if structname and not self.typenames[structname] then
@@ -1115,7 +1182,7 @@ function M.Parser()
 		--inner_structs

 		for i,it in ipairs(self.inerstructs) do
-			local cleanst,structname,strtab = self:clean_struct(it.item)
+			local cleanst,structname,strtab = self:clean_struct(it.item, it.locat)
 			if structname then --not empty struc
 				outtab.structs[structname] = {}
 				for j=3,#strtab-1 do
@@ -1193,13 +1260,13 @@ function M.Parser()
                local typesc,post = name_overloadsAlgo(v)
                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) or k..typetoStr(post[i])
+                    t.ov_cimguiname = self.getCname_overload(t.stname,t.funcname,t.signature,t.namespace) or k..typetoStr(post[i])
                    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 
-                    for j=i+1,#v-1 do
+                    for j=i+1,#v do
                        if v[i].ov_cimguiname == v[j].ov_cimguiname then
                          local t,tj = v[i],v[j]
                          print("Error caused by Bad overloading "..t.ov_cimguiname.." of function ",t.funcname,t.signature,"conflicts with ",tj.funcname,tj.signature)
--- a/generator/generator.lua
+++ b/generator/generator.lua
@@ -50,8 +50,8 @@ for i=3,#script_args do table.insert(implementations,script_args[i]) end
 local cimgui_manuals = {
    igLogText = true,
    ImGuiTextBuffer_appendf = true,
-    igColorConvertRGBtoHSV = true,
-    igColorConvertHSVtoRGB = true
+    --igColorConvertRGBtoHSV = true,
+    --igColorConvertHSVtoRGB = true
 }
 --------------------------------------------------------------------------
 --this table is a dictionary to force a naming of function overloading (instead of algorythmic generated)
@@ -428,8 +428,22 @@ gdefines = get_defines{"IMGUI_VERSION","FLT_MAX"}
 local function parseImGuiHeader(header,names)
 	--prepare parser
 	local parser = cpp2ffi.Parser()
-	parser.getCname = function(stname,funcname)
-		local pre = (stname == "") and "ig" or stname.."_"
+	
+	parser.separate_locations = function(self,cdefs)
+		local imguicdefs = {}
+		local othercdefs = {}
+		for i,cdef in ipairs(cdefs) do
+			if cdef[2]=="imgui" then
+				table.insert(imguicdefs,cdef[1])
+			else
+				table.insert(othercdefs,cdef[1])
+			end
+		end
+		return {{"imgui",imguicdefs},{"internal",othercdefs}}
+	end
+	
+	parser.getCname = function(stname,funcname,namespace)
+		local pre = (stname == "") and (namespace and (namespace=="ImGui" and "ig" or namespace.."_") or "ig") or stname.."_"
 		return pre..funcname
 	end
 	parser.cname_overloads = cimgui_overloads
@@ -538,6 +552,20 @@ if #implementations > 0 then
        end
        pipe:close()
    end
+	
+	parser2.separate_locations = function(self, cdefs)
+		local sepcdefs = {}
+		for i,impl in ipairs(implementations) do
+			sepcdefs[i] = {[[imgui_impl_]].. impl,{}}
+			for j,cdef in ipairs(cdefs) do
+				if cdef[2]==sepcdefs[i][1] then
+					table.insert(sepcdefs[i][2],cdef[1])
+				end
+			end
+		end
+		return sepcdefs
+	end
+	
    parser2:do_parse()

    -- save ./cimgui_impl.h
--- a/generator/output/cimgui.cpp
+++ b/generator/output/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.76" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.77" from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api

 #include "./imgui/imgui.h"
@@ -654,7 +654,7 @@ CIMGUI_API bool igComboStr(const char* label,int* current_item,const char* items
 {
    return ImGui::Combo(label,current_item,items_separated_by_zeros,popup_max_height_in_items);
 }
-CIMGUI_API bool igComboFnPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items)
+CIMGUI_API bool igComboFnBoolPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items)
 {
    return ImGui::Combo(label,current_item,items_getter,data,items_count,popup_max_height_in_items);
 }
@@ -938,7 +938,7 @@ CIMGUI_API bool igListBoxStr_arr(const char* label,int* current_item,const char*
 {
    return ImGui::ListBox(label,current_item,items,items_count,height_in_items);
 }
-CIMGUI_API bool igListBoxFnPtr(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 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)
 {
    return ImGui::ListBox(label,current_item,items_getter,data,items_count,height_in_items);
 }
@@ -958,7 +958,7 @@ CIMGUI_API void igPlotLinesFloatPtr(const char* label,const float* values,int va
 {
    return ImGui::PlotLines(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride);
 }
-CIMGUI_API void igPlotLinesFnPtr(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 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)
 {
    return ImGui::PlotLines(label,values_getter,data,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size);
 }
@@ -966,7 +966,7 @@ CIMGUI_API void igPlotHistogramFloatPtr(const char* label,const float* values,in
 {
    return ImGui::PlotHistogram(label,values,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size,stride);
 }
-CIMGUI_API void igPlotHistogramFnPtr(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 igPlotHistogramFnFloatPtr(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)
 {
    return ImGui::PlotHistogram(label,values_getter,data,values_count,values_offset,overlay_text,scale_min,scale_max,graph_size);
 }
@@ -1037,26 +1037,10 @@ CIMGUI_API void igSetTooltipV(const char* fmt,va_list args)
 {
    return ImGui::SetTooltipV(fmt,args);
 }
-CIMGUI_API void igOpenPopup(const char* str_id)
-{
-    return ImGui::OpenPopup(str_id);
-}
 CIMGUI_API bool igBeginPopup(const char* str_id,ImGuiWindowFlags flags)
 {
    return ImGui::BeginPopup(str_id,flags);
 }
-CIMGUI_API bool igBeginPopupContextItem(const char* str_id,ImGuiMouseButton mouse_button)
-{
-    return ImGui::BeginPopupContextItem(str_id,mouse_button);
-}
-CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,ImGuiMouseButton mouse_button,bool also_over_items)
-{
-    return ImGui::BeginPopupContextWindow(str_id,mouse_button,also_over_items);
-}
-CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,ImGuiMouseButton mouse_button)
-{
-    return ImGui::BeginPopupContextVoid(str_id,mouse_button);
-}
 CIMGUI_API bool igBeginPopupModal(const char* name,bool* p_open,ImGuiWindowFlags flags)
 {
    return ImGui::BeginPopupModal(name,p_open,flags);
@@ -1065,18 +1049,34 @@ CIMGUI_API void igEndPopup()
 {
    return ImGui::EndPopup();
 }
-CIMGUI_API bool igOpenPopupOnItemClick(const char* str_id,ImGuiMouseButton mouse_button)
+CIMGUI_API void igOpenPopup(const char* str_id,ImGuiPopupFlags popup_flags)
 {
-    return ImGui::OpenPopupOnItemClick(str_id,mouse_button);
+    return ImGui::OpenPopup(str_id,popup_flags);
 }
-CIMGUI_API bool igIsPopupOpenStr(const char* str_id)
+CIMGUI_API bool igOpenPopupContextItem(const char* str_id,ImGuiPopupFlags popup_flags)
 {
-    return ImGui::IsPopupOpen(str_id);
+    return ImGui::OpenPopupContextItem(str_id,popup_flags);
 }
 CIMGUI_API void igCloseCurrentPopup()
 {
    return ImGui::CloseCurrentPopup();
 }
+CIMGUI_API bool igBeginPopupContextItem(const char* str_id,ImGuiPopupFlags popup_flags)
+{
+    return ImGui::BeginPopupContextItem(str_id,popup_flags);
+}
+CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,ImGuiPopupFlags popup_flags)
+{
+    return ImGui::BeginPopupContextWindow(str_id,popup_flags);
+}
+CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,ImGuiPopupFlags popup_flags)
+{
+    return ImGui::BeginPopupContextVoid(str_id,popup_flags);
+}
+CIMGUI_API bool igIsPopupOpenStr(const char* str_id,ImGuiPopupFlags flags)
+{
+    return ImGui::IsPopupOpen(str_id,flags);
+}
 CIMGUI_API void igColumns(int count,const char* id,bool border)
 {
    return ImGui::Columns(count,id,border);
@@ -1325,6 +1325,14 @@ CIMGUI_API ImU32 igColorConvertFloat4ToU32(const ImVec4 in)
 {
    return ImGui::ColorConvertFloat4ToU32(in);
 }
+CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float* out_h,float* out_s,float* out_v)
+{
+    return ImGui::ColorConvertRGBtoHSV(r,g,b,*out_h,*out_s,*out_v);
+}
+CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float* out_r,float* out_g,float* out_b)
+{
+    return ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b);
+}
 CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key)
 {
    return ImGui::GetKeyIndex(imgui_key);
@@ -1969,14 +1977,6 @@ CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* self,int n)
 {
    return self->ChannelsSetCurrent(n);
 }
-CIMGUI_API void ImDrawList_Clear(ImDrawList* self)
-{
-    return self->Clear();
-}
-CIMGUI_API void ImDrawList_ClearFreeMemory(ImDrawList* self)
-{
-    return self->ClearFreeMemory();
-}
 CIMGUI_API void ImDrawList_PrimReserve(ImDrawList* self,int idx_count,int vtx_count)
 {
    return self->PrimReserve(idx_count,vtx_count);
@@ -2009,13 +2009,29 @@ CIMGUI_API void ImDrawList_PrimVtx(ImDrawList* self,const ImVec2 pos,const ImVec
 {
    return self->PrimVtx(pos,uv,col);
 }
-CIMGUI_API void ImDrawList_UpdateClipRect(ImDrawList* self)
+CIMGUI_API void ImDrawList__ResetForNewFrame(ImDrawList* self)
 {
-    return self->UpdateClipRect();
+    return self->_ResetForNewFrame();
 }
-CIMGUI_API void ImDrawList_UpdateTextureID(ImDrawList* self)
+CIMGUI_API void ImDrawList__ClearFreeMemory(ImDrawList* self)
 {
-    return self->UpdateTextureID();
+    return self->_ClearFreeMemory();
+}
+CIMGUI_API void ImDrawList__PopUnusedDrawCmd(ImDrawList* self)
+{
+    return self->_PopUnusedDrawCmd();
+}
+CIMGUI_API void ImDrawList__OnChangedClipRect(ImDrawList* self)
+{
+    return self->_OnChangedClipRect();
+}
+CIMGUI_API void ImDrawList__OnChangedTextureID(ImDrawList* self)
+{
+    return self->_OnChangedTextureID();
+}
+CIMGUI_API void ImDrawList__OnChangedVtxOffset(ImDrawList* self)
+{
+    return self->_OnChangedVtxOffset();
 }
 CIMGUI_API ImDrawData* ImDrawData_ImDrawData(void)
 {
@@ -2193,9 +2209,9 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesVietnamese(ImFontAtlas* self
 {
    return self->GetGlyphRangesVietnamese();
 }
-CIMGUI_API int ImFontAtlas_AddCustomRectRegular(ImFontAtlas* self,unsigned int id,int width,int height)
+CIMGUI_API int ImFontAtlas_AddCustomRectRegular(ImFontAtlas* self,int width,int height)
 {
-    return self->AddCustomRectRegular(id,width,height);
+    return self->AddCustomRectRegular(width,height);
 }
 CIMGUI_API int ImFontAtlas_AddCustomRectFontGlyph(ImFontAtlas* self,ImFont* font,ImWchar id,int width,int height,float advance_x,const ImVec2 offset)
 {
@@ -2541,9 +2557,9 @@ CIMGUI_API void igImTriangleClosestPoint(ImVec2 *pOut,const ImVec2 a,const ImVec
 {
    *pOut = ImTriangleClosestPoint(a,b,c,p);
 }
-CIMGUI_API void igImTriangleBarycentricCoords(const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 p,float out_u,float out_v,float out_w)
+CIMGUI_API void igImTriangleBarycentricCoords(const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 p,float* out_u,float* out_v,float* out_w)
 {
-    return ImTriangleBarycentricCoords(a,b,c,p,out_u,out_v,out_w);
+    return ImTriangleBarycentricCoords(a,b,c,p,*out_u,*out_v,*out_w);
 }
 CIMGUI_API float igImTriangleArea(const ImVec2 a,const ImVec2 b,const ImVec2 c)
 {
@@ -2553,42 +2569,6 @@ CIMGUI_API ImGuiDir igImGetDirQuadrantFromDelta(float dx,float dy)
 {
    return ImGetDirQuadrantFromDelta(dx,dy);
 }
-CIMGUI_API bool igImBitArrayTestBit(const ImU32* arr,int n)
-{
-    return ImBitArrayTestBit(arr,n);
-}
-CIMGUI_API void igImBitArrayClearBit(ImU32* arr,int n)
-{
-    return ImBitArrayClearBit(arr,n);
-}
-CIMGUI_API void igImBitArraySetBit(ImU32* arr,int n)
-{
-    return ImBitArraySetBit(arr,n);
-}
-CIMGUI_API void igImBitArraySetBitRange(ImU32* arr,int n,int n2)
-{
-    return ImBitArraySetBitRange(arr,n,n2);
-}
-CIMGUI_API void ImBitVector_Create(ImBitVector* self,int sz)
-{
-    return self->Create(sz);
-}
-CIMGUI_API void ImBitVector_Clear(ImBitVector* self)
-{
-    return self->Clear();
-}
-CIMGUI_API bool ImBitVector_TestBit(ImBitVector* self,int n)
-{
-    return self->TestBit(n);
-}
-CIMGUI_API void ImBitVector_SetBit(ImBitVector* self,int n)
-{
-    return self->SetBit(n);
-}
-CIMGUI_API void ImBitVector_ClearBit(ImBitVector* self,int n)
-{
-    return self->ClearBit(n);
-}
 CIMGUI_API ImVec1* ImVec1_ImVec1Nil(void)
 {
    return IM_NEW(ImVec1)();
@@ -2725,6 +2705,70 @@ CIMGUI_API bool ImRect_IsInverted(ImRect* self)
 {
    return self->IsInverted();
 }
+CIMGUI_API void ImRect_ToVec4(ImVec4 *pOut,ImRect* self)
+{
+    *pOut = self->ToVec4();
+}
+CIMGUI_API bool igImBitArrayTestBit(const ImU32* arr,int n)
+{
+    return ImBitArrayTestBit(arr,n);
+}
+CIMGUI_API void igImBitArrayClearBit(ImU32* arr,int n)
+{
+    return ImBitArrayClearBit(arr,n);
+}
+CIMGUI_API void igImBitArraySetBit(ImU32* arr,int n)
+{
+    return ImBitArraySetBit(arr,n);
+}
+CIMGUI_API void igImBitArraySetBitRange(ImU32* arr,int n,int n2)
+{
+    return ImBitArraySetBitRange(arr,n,n2);
+}
+CIMGUI_API void ImBitVector_Create(ImBitVector* self,int sz)
+{
+    return self->Create(sz);
+}
+CIMGUI_API void ImBitVector_Clear(ImBitVector* self)
+{
+    return self->Clear();
+}
+CIMGUI_API bool ImBitVector_TestBit(ImBitVector* self,int n)
+{
+    return self->TestBit(n);
+}
+CIMGUI_API void ImBitVector_SetBit(ImBitVector* self,int n)
+{
+    return self->SetBit(n);
+}
+CIMGUI_API void ImBitVector_ClearBit(ImBitVector* self,int n)
+{
+    return self->ClearBit(n);
+}
+CIMGUI_API ImDrawListSharedData* ImDrawListSharedData_ImDrawListSharedData(void)
+{
+    return IM_NEW(ImDrawListSharedData)();
+}
+CIMGUI_API void ImDrawListSharedData_destroy(ImDrawListSharedData* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImDrawListSharedData_SetCircleSegmentMaxError(ImDrawListSharedData* self,float max_error)
+{
+    return self->SetCircleSegmentMaxError(max_error);
+}
+CIMGUI_API void ImDrawDataBuilder_Clear(ImDrawDataBuilder* self)
+{
+    return self->Clear();
+}
+CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self)
+{
+    return self->ClearFreeMemory();
+}
+CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self)
+{
+    return self->FlattenIntoSingleLayer();
+}
 CIMGUI_API ImGuiStyleMod* ImGuiStyleMod_ImGuiStyleModInt(ImGuiStyleVar idx,int v)
 {
    return IM_NEW(ImGuiStyleMod)(idx,v);
@@ -2809,26 +2853,6 @@ CIMGUI_API void ImGuiInputTextState_SelectAll(ImGuiInputTextState* self)
 {
    return self->SelectAll();
 }
-CIMGUI_API ImGuiWindowSettings* ImGuiWindowSettings_ImGuiWindowSettings(void)
-{
-    return IM_NEW(ImGuiWindowSettings)();
-}
-CIMGUI_API void ImGuiWindowSettings_destroy(ImGuiWindowSettings* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API char* ImGuiWindowSettings_GetName(ImGuiWindowSettings* self)
-{
-    return self->GetName();
-}
-CIMGUI_API ImGuiSettingsHandler* ImGuiSettingsHandler_ImGuiSettingsHandler(void)
-{
-    return IM_NEW(ImGuiSettingsHandler)();
-}
-CIMGUI_API void ImGuiSettingsHandler_destroy(ImGuiSettingsHandler* self)
-{
-    IM_DELETE(self);
-}
 CIMGUI_API ImGuiPopupData* ImGuiPopupData_ImGuiPopupData(void)
 {
    return IM_NEW(ImGuiPopupData)();
@@ -2837,50 +2861,6 @@ CIMGUI_API void ImGuiPopupData_destroy(ImGuiPopupData* self)
 {
    IM_DELETE(self);
 }
-CIMGUI_API ImGuiColumnData* ImGuiColumnData_ImGuiColumnData(void)
-{
-    return IM_NEW(ImGuiColumnData)();
-}
-CIMGUI_API void ImGuiColumnData_destroy(ImGuiColumnData* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API ImGuiColumns* ImGuiColumns_ImGuiColumns(void)
-{
-    return IM_NEW(ImGuiColumns)();
-}
-CIMGUI_API void ImGuiColumns_destroy(ImGuiColumns* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API void ImGuiColumns_Clear(ImGuiColumns* self)
-{
-    return self->Clear();
-}
-CIMGUI_API ImDrawListSharedData* ImDrawListSharedData_ImDrawListSharedData(void)
-{
-    return IM_NEW(ImDrawListSharedData)();
-}
-CIMGUI_API void ImDrawListSharedData_destroy(ImDrawListSharedData* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API void ImDrawListSharedData_SetCircleSegmentMaxError(ImDrawListSharedData* self,float max_error)
-{
-    return self->SetCircleSegmentMaxError(max_error);
-}
-CIMGUI_API void ImDrawDataBuilder_Clear(ImDrawDataBuilder* self)
-{
-    return self->Clear();
-}
-CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self)
-{
-    return self->ClearFreeMemory();
-}
-CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self)
-{
-    return self->FlattenIntoSingleLayer();
-}
 CIMGUI_API ImGuiNavMoveResult* ImGuiNavMoveResult_ImGuiNavMoveResult(void)
 {
    return IM_NEW(ImGuiNavMoveResult)();
@@ -2929,6 +2909,46 @@ CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndexInt(int index)
 {
    return IM_NEW(ImGuiPtrOrIndex)(index);
 }
+CIMGUI_API ImGuiColumnData* ImGuiColumnData_ImGuiColumnData(void)
+{
+    return IM_NEW(ImGuiColumnData)();
+}
+CIMGUI_API void ImGuiColumnData_destroy(ImGuiColumnData* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API ImGuiColumns* ImGuiColumns_ImGuiColumns(void)
+{
+    return IM_NEW(ImGuiColumns)();
+}
+CIMGUI_API void ImGuiColumns_destroy(ImGuiColumns* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImGuiColumns_Clear(ImGuiColumns* self)
+{
+    return self->Clear();
+}
+CIMGUI_API ImGuiWindowSettings* ImGuiWindowSettings_ImGuiWindowSettings(void)
+{
+    return IM_NEW(ImGuiWindowSettings)();
+}
+CIMGUI_API void ImGuiWindowSettings_destroy(ImGuiWindowSettings* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API char* ImGuiWindowSettings_GetName(ImGuiWindowSettings* self)
+{
+    return self->GetName();
+}
+CIMGUI_API ImGuiSettingsHandler* ImGuiSettingsHandler_ImGuiSettingsHandler(void)
+{
+    return IM_NEW(ImGuiSettingsHandler)();
+}
+CIMGUI_API void ImGuiSettingsHandler_destroy(ImGuiSettingsHandler* self)
+{
+    IM_DELETE(self);
+}
 CIMGUI_API ImGuiContext* ImGuiContext_ImGuiContext(ImFontAtlas* shared_font_atlas)
 {
    return IM_NEW(ImGuiContext)(shared_font_atlas);
@@ -3157,6 +3177,10 @@ CIMGUI_API void igMarkIniSettingsDirtyWindowPtr(ImGuiWindow* window)
 {
    return ImGui::MarkIniSettingsDirty(window);
 }
+CIMGUI_API void igClearIniSettings()
+{
+    return ImGui::ClearIniSettings();
+}
 CIMGUI_API ImGuiWindowSettings* igCreateNewWindowSettings(const char* name)
 {
    return ImGui::CreateNewWindowSettings(name);
@@ -3173,6 +3197,10 @@ CIMGUI_API ImGuiSettingsHandler* igFindSettingsHandler(const char* type_name)
 {
    return ImGui::FindSettingsHandler(type_name);
 }
+CIMGUI_API void igSetNextWindowScroll(const ImVec2 scroll)
+{
+    return ImGui::SetNextWindowScroll(scroll);
+}
 CIMGUI_API void igSetScrollXWindowPtr(ImGuiWindow* window,float new_scroll_x)
 {
    return ImGui::SetScrollX(window,new_scroll_x);
@@ -3313,9 +3341,9 @@ CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2 size_arg
 {
    return ImGui::BeginChildEx(name,id,size_arg,border,flags);
 }
-CIMGUI_API void igOpenPopupEx(ImGuiID id)
+CIMGUI_API void igOpenPopupEx(ImGuiID id,ImGuiPopupFlags popup_flags)
 {
-    return ImGui::OpenPopupEx(id);
+    return ImGui::OpenPopupEx(id,popup_flags);
 }
 CIMGUI_API void igClosePopupToLevel(int remaining,bool restore_focus_to_window_under_popup)
 {
@@ -3325,9 +3353,9 @@ CIMGUI_API void igClosePopupsOverWindow(ImGuiWindow* ref_window,bool restore_foc
 {
    return ImGui::ClosePopupsOverWindow(ref_window,restore_focus_to_window_under_popup);
 }
-CIMGUI_API bool igIsPopupOpenID(ImGuiID id)
+CIMGUI_API bool igIsPopupOpenID(ImGuiID id,ImGuiPopupFlags popup_flags)
 {
-    return ImGui::IsPopupOpen(id);
+    return ImGui::IsPopupOpen(id,popup_flags);
 }
 CIMGUI_API bool igBeginPopupEx(ImGuiID id,ImGuiWindowFlags extra_flags)
 {
@@ -3449,6 +3477,10 @@ CIMGUI_API bool igIsDragDropPayloadBeingAccepted()
 {
    return ImGui::IsDragDropPayloadBeingAccepted();
 }
+CIMGUI_API void igSetWindowClipRectBeforeSetChannel(ImGuiWindow* window,const ImRect clip_rect)
+{
+    return ImGui::SetWindowClipRectBeforeSetChannel(window,clip_rect);
+}
 CIMGUI_API void igBeginColumns(const char* str_id,int count,ImGuiColumnsFlags flags)
 {
    return ImGui::BeginColumns(str_id,count,flags);
@@ -3517,9 +3549,9 @@ CIMGUI_API void igTabItemBackground(ImDrawList* draw_list,const ImRect bb,ImGuiT
 {
    return ImGui::TabItemBackground(draw_list,bb,flags,col);
 }
-CIMGUI_API bool igTabItemLabelAndCloseButton(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImVec2 frame_padding,const char* label,ImGuiID tab_id,ImGuiID close_button_id)
+CIMGUI_API bool igTabItemLabelAndCloseButton(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImVec2 frame_padding,const char* label,ImGuiID tab_id,ImGuiID close_button_id,bool is_contents_visible)
 {
-    return ImGui::TabItemLabelAndCloseButton(draw_list,bb,flags,frame_padding,label,tab_id,close_button_id);
+    return ImGui::TabItemLabelAndCloseButton(draw_list,bb,flags,frame_padding,label,tab_id,close_button_id,is_contents_visible);
 }
 CIMGUI_API void igRenderText(ImVec2 pos,const char* text,const char* text_end,bool hide_text_after_hash)
 {
@@ -3617,6 +3649,10 @@ CIMGUI_API bool igScrollbarEx(const ImRect bb,ImGuiID id,ImGuiAxis axis,float* p
 {
    return ImGui::ScrollbarEx(bb,id,axis,p_scroll_v,avail_v,contents_v,rounding_corners);
 }
+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)
+{
+    return ImGui::ImageButtonEx(id,texture_id,size,uv0,uv1,padding,bg_col,tint_col);
+}
 CIMGUI_API void igGetWindowScrollbarRect(ImRect *pOut,ImGuiWindow* window,ImGuiAxis axis)
 {
    *pOut = ImGui::GetWindowScrollbarRect(window,axis);
@@ -3677,6 +3713,10 @@ CIMGUI_API bool igDataTypeApplyOpFromText(const char* buf,const char* initial_va
 {
    return ImGui::DataTypeApplyOpFromText(buf,initial_value_buf,data_type,p_data,format);
 }
+CIMGUI_API bool igDataTypeClamp(ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max)
+{
+    return ImGui::DataTypeClamp(data_type,p_data,p_min,p_max);
+}
 CIMGUI_API bool igInputTextEx(const char* label,const char* hint,char* buf,int buf_size,const ImVec2 size_arg,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data)
 {
    return ImGui::InputTextEx(label,hint,buf,buf_size,size_arg,flags,callback,user_data);
@@ -3685,9 +3725,9 @@ CIMGUI_API bool igTempInputText(const ImRect bb,ImGuiID id,const char* label,cha
 {
    return ImGui::TempInputText(bb,id,label,buf,buf_size,flags);
 }
-CIMGUI_API bool igTempInputScalar(const ImRect bb,ImGuiID id,const char* label,ImGuiDataType data_type,void* p_data,const char* format)
+CIMGUI_API bool igTempInputScalar(const ImRect bb,ImGuiID id,const char* label,ImGuiDataType data_type,void* p_data,const char* format,const void* p_clamp_min,const void* p_clamp_max)
 {
-    return ImGui::TempInputScalar(bb,id,label,data_type,p_data,format);
+    return ImGui::TempInputScalar(bb,id,label,data_type,p_data,format,p_clamp_min,p_clamp_max);
 }
 CIMGUI_API bool igTempInputIsActive(ImGuiID id)
 {
@@ -3791,14 +3831,7 @@ CIMGUI_API float igGET_FLT_MAX()
 {
    return FLT_MAX;
 }
-CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v)
-{
-    ImGui::ColorConvertRGBtoHSV(r,g,b,*out_h,*out_s,*out_v);
-}
-CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b)
-{
-    ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b);
-}
+

 CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
 {
--- a/generator/output/cimgui.h
+++ b/generator/output/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.76" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.77" from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 #ifndef CIMGUI_INCLUDED
 #define CIMGUI_INCLUDED
@@ -46,6 +46,7 @@ typedef struct ImGuiStoragePair ImGuiStoragePair;
 typedef struct ImGuiTextRange ImGuiTextRange;
 typedef struct ImGuiPtrOrIndex ImGuiPtrOrIndex;
 typedef struct ImGuiShrinkWidthItem ImGuiShrinkWidthItem;
+typedef struct ImGuiDataTypeTempStorage ImGuiDataTypeTempStorage;
 typedef struct ImVec2ih ImVec2ih;
 typedef struct ImVec1 ImVec1;
 typedef struct ImFontAtlasCustomRect ImFontAtlasCustomRect;
@@ -97,7 +98,6 @@ typedef struct ImDrawList ImDrawList;
 typedef struct ImDrawData ImDrawData;
 typedef struct ImDrawCmd ImDrawCmd;
 typedef struct ImDrawChannel ImDrawChannel;
-
 struct ImDrawChannel;
 struct ImDrawCmd;
 struct ImDrawData;
@@ -143,6 +143,7 @@ typedef int ImGuiFocusedFlags;
 typedef int ImGuiHoveredFlags;
 typedef int ImGuiInputTextFlags;
 typedef int ImGuiKeyModFlags;
+typedef int ImGuiPopupFlags;
 typedef int ImGuiSelectableFlags;
 typedef int ImGuiTabBarFlags;
 typedef int ImGuiTabItemFlags;
@@ -360,6 +361,19 @@ typedef enum {
    ImGuiTreeNodeFlags_NavLeftJumpsBackHere = 1 << 13,
    ImGuiTreeNodeFlags_CollapsingHeader = ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_NoAutoOpenOnLog
 }ImGuiTreeNodeFlags_;
+typedef enum {
+    ImGuiPopupFlags_None = 0,
+    ImGuiPopupFlags_MouseButtonLeft = 0,
+    ImGuiPopupFlags_MouseButtonRight = 1,
+    ImGuiPopupFlags_MouseButtonMiddle = 2,
+    ImGuiPopupFlags_MouseButtonMask_ = 0x1F,
+    ImGuiPopupFlags_MouseButtonDefault_ = 1,
+    ImGuiPopupFlags_NoOpenOverExistingPopup = 1 << 5,
+    ImGuiPopupFlags_NoOpenOverItems = 1 << 6,
+    ImGuiPopupFlags_AnyPopupId = 1 << 7,
+    ImGuiPopupFlags_AnyPopupLevel = 1 << 8,
+    ImGuiPopupFlags_AnyPopup = ImGuiPopupFlags_AnyPopupId | ImGuiPopupFlags_AnyPopupLevel
+}ImGuiPopupFlags_;
 typedef enum {
    ImGuiSelectableFlags_None = 0,
    ImGuiSelectableFlags_DontClosePopups = 1 << 0,
@@ -397,7 +411,8 @@ typedef enum {
    ImGuiTabItemFlags_UnsavedDocument = 1 << 0,
    ImGuiTabItemFlags_SetSelected = 1 << 1,
    ImGuiTabItemFlags_NoCloseWithMiddleMouseButton = 1 << 2,
-    ImGuiTabItemFlags_NoPushId = 1 << 3
+    ImGuiTabItemFlags_NoPushId = 1 << 3,
+    ImGuiTabItemFlags_NoTooltip = 1 << 4
 }ImGuiTabItemFlags_;
 typedef enum {
    ImGuiFocusedFlags_None = 0,
@@ -655,6 +670,7 @@ typedef enum {
    ImGuiMouseCursor_COUNT
 }ImGuiMouseCursor_;
 typedef enum {
+    ImGuiCond_None = 0,
    ImGuiCond_Always = 1 << 0,
    ImGuiCond_Once = 1 << 1,
    ImGuiCond_FirstUseEver = 1 << 2,
@@ -687,6 +703,7 @@ struct ImGuiStyle
    float GrabRounding;
    float TabRounding;
    float TabBorderSize;
+    float TabMinWidthForUnselectedCloseButton;
    ImGuiDir ColorButtonPosition;
    ImVec2 ButtonTextAlign;
    ImVec2 SelectableTextAlign;
@@ -778,6 +795,7 @@ struct ImGuiIO
    float KeysDownDurationPrev[512];
    float NavInputsDownDuration[ImGuiNavInput_COUNT];
    float NavInputsDownDurationPrev[ImGuiNavInput_COUNT];
+    float PenPressure;
    ImWchar16 InputQueueSurrogate;
    ImVector_ImWchar InputQueueCharacters;
 };
@@ -848,11 +866,11 @@ struct ImColor
 };
 struct ImDrawCmd
 {
-    unsigned int ElemCount;
    ImVec4 ClipRect;
    ImTextureID TextureId;
    unsigned int VtxOffset;
    unsigned int IdxOffset;
+    unsigned int ElemCount;
    ImDrawCallback UserCallback;
    void* UserCallbackData;
 };
@@ -899,13 +917,13 @@ struct ImDrawList
    ImDrawListFlags Flags;
    const ImDrawListSharedData* _Data;
    const char* _OwnerName;
-    unsigned int _VtxCurrentOffset;
    unsigned int _VtxCurrentIdx;
    ImDrawVert* _VtxWritePtr;
    ImDrawIdx* _IdxWritePtr;
    ImVector_ImVec4 _ClipRectStack;
    ImVector_ImTextureID _TextureIdStack;
    ImVector_ImVec2 _Path;
+    ImDrawCmd _CmdHeader;
    ImDrawListSplitter _Splitter;
 };
 struct ImDrawData
@@ -955,9 +973,9 @@ struct ImFontGlyphRangesBuilder
 };
 struct ImFontAtlasCustomRect
 {
-    unsigned int ID;
    unsigned short Width, Height;
    unsigned short X, Y;
+    unsigned int GlyphID;
    float GlyphAdvanceX;
    ImVec2 GlyphOffset;
    ImFont* Font;
@@ -1005,10 +1023,60 @@ struct ImFont
    int MetricsTotalSurface;
    ImU8 Used4kPagesMap[(0xFFFF +1)/4096/8];
 };
+struct ImVec1
+{
+    float x;
+};
+struct ImVec2ih
+{
+    short x, y;
+};
+struct ImRect
+{
+    ImVec2 Min;
+    ImVec2 Max;
+};
 struct ImBitVector
 {
    ImVector_ImU32 Storage;
 };
+struct ImDrawListSharedData
+{
+    ImVec2 TexUvWhitePixel;
+    ImFont* Font;
+    float FontSize;
+    float CurveTessellationTol;
+    float CircleSegmentMaxError;
+    ImVec4 ClipRectFullscreen;
+    ImDrawListFlags InitialFlags;
+    ImVec2 ArcFastVtx[12 * 1];
+    ImU8 CircleSegmentCounts[64];
+};
+struct ImDrawDataBuilder
+{
+    ImVector_ImDrawListPtr Layers[2];
+};
+typedef enum {
+    ImGuiItemFlags_None = 0,
+    ImGuiItemFlags_NoTabStop = 1 << 0,
+    ImGuiItemFlags_ButtonRepeat = 1 << 1,
+    ImGuiItemFlags_Disabled = 1 << 2,
+    ImGuiItemFlags_NoNav = 1 << 3,
+    ImGuiItemFlags_NoNavDefaultFocus = 1 << 4,
+    ImGuiItemFlags_SelectableDontClosePopup = 1 << 5,
+    ImGuiItemFlags_MixedValue = 1 << 6,
+    ImGuiItemFlags_Default_ = 0
+}ImGuiItemFlags_;
+typedef enum {
+    ImGuiItemStatusFlags_None = 0,
+    ImGuiItemStatusFlags_HoveredRect = 1 << 0,
+    ImGuiItemStatusFlags_HasDisplayRect = 1 << 1,
+    ImGuiItemStatusFlags_Edited = 1 << 2,
+    ImGuiItemStatusFlags_ToggledSelection = 1 << 3,
+    ImGuiItemStatusFlags_ToggledOpen = 1 << 4,
+    ImGuiItemStatusFlags_HasDeactivated = 1 << 5,
+    ImGuiItemStatusFlags_Deactivated = 1 << 6
+}ImGuiItemStatusFlags_;
 typedef enum {
    ImGuiButtonFlags_None = 0,
    ImGuiButtonFlags_Repeat = 1 << 0,
@@ -1044,14 +1112,6 @@ typedef enum {
    ImGuiDragFlags_None = 0,
    ImGuiDragFlags_Vertical = 1 << 0
 }ImGuiDragFlags_;
-typedef enum {
-    ImGuiColumnsFlags_None = 0,
-    ImGuiColumnsFlags_NoBorder = 1 << 0,
-    ImGuiColumnsFlags_NoResize = 1 << 1,
-    ImGuiColumnsFlags_NoPreserveWidths = 1 << 2,
-    ImGuiColumnsFlags_NoForceWithinWindow = 1 << 3,
-    ImGuiColumnsFlags_GrowParentContentsSize= 1 << 4
-}ImGuiColumnsFlags_;
 typedef enum {
    ImGuiSelectableFlags_NoHoldingActiveID = 1 << 20,
    ImGuiSelectableFlags_SelectOnClick = 1 << 21,
@@ -1069,27 +1129,6 @@ typedef enum {
    ImGuiSeparatorFlags_Vertical = 1 << 1,
    ImGuiSeparatorFlags_SpanAllColumns = 1 << 2
 }ImGuiSeparatorFlags_;
-typedef enum {
-    ImGuiItemFlags_None = 0,
-    ImGuiItemFlags_NoTabStop = 1 << 0,
-    ImGuiItemFlags_ButtonRepeat = 1 << 1,
-    ImGuiItemFlags_Disabled = 1 << 2,
-    ImGuiItemFlags_NoNav = 1 << 3,
-    ImGuiItemFlags_NoNavDefaultFocus = 1 << 4,
-    ImGuiItemFlags_SelectableDontClosePopup = 1 << 5,
-    ImGuiItemFlags_MixedValue = 1 << 6,
-    ImGuiItemFlags_Default_ = 0
-}ImGuiItemFlags_;
-typedef enum {
-    ImGuiItemStatusFlags_None = 0,
-    ImGuiItemStatusFlags_HoveredRect = 1 << 0,
-    ImGuiItemStatusFlags_HasDisplayRect = 1 << 1,
-    ImGuiItemStatusFlags_Edited = 1 << 2,
-    ImGuiItemStatusFlags_ToggledSelection = 1 << 3,
-    ImGuiItemStatusFlags_ToggledOpen = 1 << 4,
-    ImGuiItemStatusFlags_HasDeactivated = 1 << 5,
-    ImGuiItemStatusFlags_Deactivated = 1 << 6
-}ImGuiItemStatusFlags_;
 typedef enum {
    ImGuiTextFlags_None = 0,
    ImGuiTextFlags_NoWidthForLargeClippedText = 1 << 0
@@ -1171,18 +1210,9 @@ typedef enum {
    ImGuiPopupPositionPolicy_Default,
    ImGuiPopupPositionPolicy_ComboBox
 }ImGuiPopupPositionPolicy;
-struct ImVec1
+struct ImGuiDataTypeTempStorage
 {
-    float x;
-};
-struct ImVec2ih
-{
-    short x, y;
-};
-struct ImRect
-{
-    ImVec2 Min;
-    ImVec2 Max;
+    ImU8 Data[8];
 };
 struct ImGuiDataTypeInfo
 {
@@ -1190,6 +1220,11 @@ struct ImGuiDataTypeInfo
    const char* PrintFmt;
    const char* ScanFmt;
 };
+typedef enum {
+    ImGuiDataType_String = ImGuiDataType_COUNT + 1,
+    ImGuiDataType_Pointer,
+    ImGuiDataType_ID
+}ImGuiDataTypePrivate_;
 struct ImGuiColorMod
 {
    ImGuiCol Col;
@@ -1236,22 +1271,6 @@ struct ImGuiInputTextState
    ImGuiInputTextCallback UserCallback;
    void* UserCallbackData;
 };
-struct ImGuiWindowSettings
-{
-    ImGuiID ID;
-    ImVec2ih Pos;
-    ImVec2ih Size;
-    bool Collapsed;
-};
-struct ImGuiSettingsHandler
-{
-    const char* TypeName;
-    ImGuiID TypeHash;
-    void* (*ReadOpenFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, const char* name);
-    void (*ReadLineFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, void* entry, const char* line);
-    void (*WriteAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* out_buf);
-    void* UserData;
-};
 struct ImGuiPopupData
 {
    ImGuiID PopupId;
@@ -1262,46 +1281,6 @@ struct ImGuiPopupData
    ImVec2 OpenPopupPos;
    ImVec2 OpenMousePos;
 };
-struct ImGuiColumnData
-{
-    float OffsetNorm;
-    float OffsetNormBeforeResize;
-    ImGuiColumnsFlags Flags;
-    ImRect ClipRect;
-};
-struct ImGuiColumns
-{
-    ImGuiID ID;
-    ImGuiColumnsFlags Flags;
-    bool IsFirstFrame;
-    bool IsBeingResized;
-    int Current;
-    int Count;
-    float OffMinX, OffMaxX;
-    float LineMinY, LineMaxY;
-    float HostCursorPosY;
-    float HostCursorMaxPosX;
-    ImRect HostClipRect;
-    ImRect HostWorkRect;
-    ImVector_ImGuiColumnData Columns;
-    ImDrawListSplitter Splitter;
-};
-struct ImDrawListSharedData
-{
-    ImVec2 TexUvWhitePixel;
-    ImFont* Font;
-    float FontSize;
-    float CurveTessellationTol;
-    float CircleSegmentMaxError;
-    ImVec4 ClipRectFullscreen;
-    ImDrawListFlags InitialFlags;
-    ImVec2 ArcFastVtx[12 * 1];
-    ImU8 CircleSegmentCounts[64];
-};
-struct ImDrawDataBuilder
-{
-    ImVector_ImDrawListPtr Layers[2];
-};
 struct ImGuiNavMoveResult
 {
    ImGuiWindow* Window;
@@ -1320,7 +1299,8 @@ typedef enum {
    ImGuiNextWindowDataFlags_HasCollapsed = 1 << 3,
    ImGuiNextWindowDataFlags_HasSizeConstraint = 1 << 4,
    ImGuiNextWindowDataFlags_HasFocus = 1 << 5,
-    ImGuiNextWindowDataFlags_HasBgAlpha = 1 << 6
+    ImGuiNextWindowDataFlags_HasBgAlpha = 1 << 6,
+    ImGuiNextWindowDataFlags_HasScroll = 1 << 7
 }ImGuiNextWindowDataFlags_;
 struct ImGuiNextWindowData
 {
@@ -1332,6 +1312,7 @@ struct ImGuiNextWindowData
    ImVec2 PosPivotVal;
    ImVec2 SizeVal;
    ImVec2 ContentSizeVal;
+    ImVec2 ScrollVal;
    bool CollapsedVal;
    ImRect SizeConstraintRect;
    ImGuiSizeCallback SizeCallback;
@@ -1362,6 +1343,59 @@ struct ImGuiPtrOrIndex
    void* Ptr;
    int Index;
 };
+typedef enum {
+    ImGuiColumnsFlags_None = 0,
+    ImGuiColumnsFlags_NoBorder = 1 << 0,
+    ImGuiColumnsFlags_NoResize = 1 << 1,
+    ImGuiColumnsFlags_NoPreserveWidths = 1 << 2,
+    ImGuiColumnsFlags_NoForceWithinWindow = 1 << 3,
+    ImGuiColumnsFlags_GrowParentContentsSize= 1 << 4
+}ImGuiColumnsFlags_;
+struct ImGuiColumnData
+{
+    float OffsetNorm;
+    float OffsetNormBeforeResize;
+    ImGuiColumnsFlags Flags;
+    ImRect ClipRect;
+};
+struct ImGuiColumns
+{
+    ImGuiID ID;
+    ImGuiColumnsFlags Flags;
+    bool IsFirstFrame;
+    bool IsBeingResized;
+    int Current;
+    int Count;
+    float OffMinX, OffMaxX;
+    float LineMinY, LineMaxY;
+    float HostCursorPosY;
+    float HostCursorMaxPosX;
+    ImRect HostInitialClipRect;
+    ImRect HostBackupClipRect;
+    ImRect HostWorkRect;
+    ImVector_ImGuiColumnData Columns;
+    ImDrawListSplitter Splitter;
+};
+struct ImGuiWindowSettings
+{
+    ImGuiID ID;
+    ImVec2ih Pos;
+    ImVec2ih Size;
+    bool Collapsed;
+    bool WantApply;
+};
+struct ImGuiSettingsHandler
+{
+    const char* TypeName;
+    ImGuiID TypeHash;
+    void (*ClearAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler);
+    void (*ReadInitFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler);
+    void* (*ReadOpenFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, const char* name);
+    void (*ReadLineFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, void* entry, const char* line);
+    void (*ApplyAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler);
+    void (*WriteAllFn)(ImGuiContext* ctx, ImGuiSettingsHandler* handler, ImGuiTextBuffer* out_buf);
+    void* UserData;
+};
 struct ImGuiContext
 {
    bool Initialized;
@@ -1379,6 +1413,9 @@ struct ImGuiContext
    bool WithinFrameScope;
    bool WithinFrameScopeWithImplicitWindow;
    bool WithinEndChild;
+    bool TestEngineHookItems;
+    ImGuiID TestEngineHookIdInfo;
+    void* TestEngine;
    ImVector_ImGuiWindowPtr Windows;
    ImVector_ImGuiWindowPtr WindowsFocusOrder;
    ImVector_ImGuiWindowPtr WindowsTempSortBuffer;
@@ -1461,9 +1498,11 @@ struct ImGuiContext
    ImGuiNavMoveResult NavMoveResultLocal;
    ImGuiNavMoveResult NavMoveResultLocalVisibleSet;
    ImGuiNavMoveResult NavMoveResultOther;
+    ImGuiWindow* NavWrapRequestWindow;
+    ImGuiNavMoveFlags NavWrapRequestFlags;
    ImGuiWindow* NavWindowingTarget;
    ImGuiWindow* NavWindowingTargetAnim;
-    ImGuiWindow* NavWindowingList;
+    ImGuiWindow* NavWindowingListWindow;
    float NavWindowingTimer;
    float NavWindowingHighlightAlpha;
    bool NavWindowingToggleLayer;
@@ -1494,6 +1533,7 @@ struct ImGuiContext
    ImGuiID DragDropAcceptIdCurr;
    ImGuiID DragDropAcceptIdPrev;
    int DragDropAcceptFrameCount;
+    ImGuiID DragDropHoldJustPressedId;
    ImVector_unsigned_char DragDropPayloadBufHeap;
    unsigned char DragDropPayloadBufLocal[16];
    ImGuiTabBar* CurrentTabBar;
@@ -1927,7 +1967,7 @@ CIMGUI_API bool igBeginCombo(const char* label,const char* preview_value,ImGuiCo
 CIMGUI_API void igEndCombo(void);
 CIMGUI_API bool igComboStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int popup_max_height_in_items);
 CIMGUI_API bool igComboStr(const char* label,int* current_item,const char* items_separated_by_zeros,int popup_max_height_in_items);
-CIMGUI_API bool igComboFnPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items);
+CIMGUI_API bool igComboFnBoolPtr(const char* label,int* current_item,bool(*items_getter)(void* data,int idx,const char** out_text),void* data,int items_count,int popup_max_height_in_items);
 CIMGUI_API bool igDragFloat(const char* label,float* v,float v_speed,float v_min,float v_max,const char* format,float power);
 CIMGUI_API bool igDragFloat2(const char* label,float v[2],float v_speed,float v_min,float v_max,const char* format,float power);
 CIMGUI_API bool igDragFloat3(const char* label,float v[3],float v_speed,float v_min,float v_max,const char* format,float power);
@@ -1994,14 +2034,14 @@ 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 igListBoxStr_arr(const char* label,int* current_item,const char* const items[],int items_count,int height_in_items);
-CIMGUI_API bool igListBoxFnPtr(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 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 igPlotLinesFnPtr(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 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);
-CIMGUI_API void igPlotHistogramFnPtr(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 igPlotHistogramFnFloatPtr(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 igValueBool(const char* prefix,bool b);
 CIMGUI_API void igValueInt(const char* prefix,int v);
 CIMGUI_API void igValueUint(const char* prefix,unsigned int v);
@@ -2018,16 +2058,16 @@ CIMGUI_API void igBeginTooltip(void);
 CIMGUI_API void igEndTooltip(void);
 CIMGUI_API void igSetTooltip(const char* fmt,...);
 CIMGUI_API void igSetTooltipV(const char* fmt,va_list args);
-CIMGUI_API void igOpenPopup(const char* str_id);
 CIMGUI_API bool igBeginPopup(const char* str_id,ImGuiWindowFlags flags);
-CIMGUI_API bool igBeginPopupContextItem(const char* str_id,ImGuiMouseButton mouse_button);
-CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,ImGuiMouseButton mouse_button,bool also_over_items);
-CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,ImGuiMouseButton mouse_button);
 CIMGUI_API bool igBeginPopupModal(const char* name,bool* p_open,ImGuiWindowFlags flags);
 CIMGUI_API void igEndPopup(void);
-CIMGUI_API bool igOpenPopupOnItemClick(const char* str_id,ImGuiMouseButton mouse_button);
-CIMGUI_API bool igIsPopupOpenStr(const char* str_id);
+CIMGUI_API void igOpenPopup(const char* str_id,ImGuiPopupFlags popup_flags);
+CIMGUI_API bool igOpenPopupContextItem(const char* str_id,ImGuiPopupFlags popup_flags);
 CIMGUI_API void igCloseCurrentPopup(void);
+CIMGUI_API bool igBeginPopupContextItem(const char* str_id,ImGuiPopupFlags popup_flags);
+CIMGUI_API bool igBeginPopupContextWindow(const char* str_id,ImGuiPopupFlags popup_flags);
+CIMGUI_API bool igBeginPopupContextVoid(const char* str_id,ImGuiPopupFlags popup_flags);
+CIMGUI_API bool igIsPopupOpenStr(const char* str_id,ImGuiPopupFlags flags);
 CIMGUI_API void igColumns(int count,const char* id,bool border);
 CIMGUI_API void igNextColumn(void);
 CIMGUI_API int igGetColumnIndex(void);
@@ -2090,6 +2130,8 @@ CIMGUI_API void igEndChildFrame(void);
 CIMGUI_API void igCalcTextSize(ImVec2 *pOut,const char* text,const char* text_end,bool hide_text_after_double_hash,float wrap_width);
 CIMGUI_API void igColorConvertU32ToFloat4(ImVec4 *pOut,ImU32 in);
 CIMGUI_API ImU32 igColorConvertFloat4ToU32(const ImVec4 in);
+CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float* out_h,float* out_s,float* out_v);
+CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float* out_r,float* out_g,float* out_b);
 CIMGUI_API int igGetKeyIndex(ImGuiKey imgui_key);
 CIMGUI_API bool igIsKeyDown(int user_key_index);
 CIMGUI_API bool igIsKeyPressed(int user_key_index,bool repeat);
@@ -2251,8 +2293,6 @@ CIMGUI_API ImDrawList* ImDrawList_CloneOutput(ImDrawList* self);
 CIMGUI_API void ImDrawList_ChannelsSplit(ImDrawList* self,int count);
 CIMGUI_API void ImDrawList_ChannelsMerge(ImDrawList* self);
 CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* self,int n);
-CIMGUI_API void ImDrawList_Clear(ImDrawList* self);
-CIMGUI_API void ImDrawList_ClearFreeMemory(ImDrawList* self);
 CIMGUI_API void ImDrawList_PrimReserve(ImDrawList* self,int idx_count,int vtx_count);
 CIMGUI_API void ImDrawList_PrimUnreserve(ImDrawList* self,int idx_count,int vtx_count);
 CIMGUI_API void ImDrawList_PrimRect(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col);
@@ -2261,8 +2301,12 @@ CIMGUI_API void ImDrawList_PrimQuadUV(ImDrawList* self,const ImVec2 a,const ImVe
 CIMGUI_API void ImDrawList_PrimWriteVtx(ImDrawList* self,const ImVec2 pos,const ImVec2 uv,ImU32 col);
 CIMGUI_API void ImDrawList_PrimWriteIdx(ImDrawList* self,ImDrawIdx idx);
 CIMGUI_API void ImDrawList_PrimVtx(ImDrawList* self,const ImVec2 pos,const ImVec2 uv,ImU32 col);
-CIMGUI_API void ImDrawList_UpdateClipRect(ImDrawList* self);
-CIMGUI_API void ImDrawList_UpdateTextureID(ImDrawList* self);
+CIMGUI_API void ImDrawList__ResetForNewFrame(ImDrawList* self);
+CIMGUI_API void ImDrawList__ClearFreeMemory(ImDrawList* self);
+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 ImDrawData* ImDrawData_ImDrawData(void);
 CIMGUI_API void ImDrawData_destroy(ImDrawData* self);
 CIMGUI_API void ImDrawData_Clear(ImDrawData* self);
@@ -2307,7 +2351,7 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseSimplifiedCommon(ImFo
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesCyrillic(ImFontAtlas* self);
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self);
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesVietnamese(ImFontAtlas* self);
-CIMGUI_API int ImFontAtlas_AddCustomRectRegular(ImFontAtlas* self,unsigned int id,int width,int height);
+CIMGUI_API int ImFontAtlas_AddCustomRectRegular(ImFontAtlas* self,int width,int height);
 CIMGUI_API int ImFontAtlas_AddCustomRectFontGlyph(ImFontAtlas* self,ImFont* font,ImWchar id,int width,int height,float advance_x,const ImVec2 offset);
 CIMGUI_API const ImFontAtlasCustomRect* ImFontAtlas_GetCustomRectByIndex(ImFontAtlas* self,int index);
 CIMGUI_API void ImFontAtlas_CalcCustomRectUV(ImFontAtlas* self,const ImFontAtlasCustomRect* rect,ImVec2* out_uv_min,ImVec2* out_uv_max);
@@ -2393,18 +2437,9 @@ CIMGUI_API void igImBezierClosestPointCasteljau(ImVec2 *pOut,const ImVec2 p1,con
 CIMGUI_API void igImLineClosestPoint(ImVec2 *pOut,const ImVec2 a,const ImVec2 b,const ImVec2 p);
 CIMGUI_API bool igImTriangleContainsPoint(const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 p);
 CIMGUI_API void igImTriangleClosestPoint(ImVec2 *pOut,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 p);
-CIMGUI_API void igImTriangleBarycentricCoords(const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 p,float out_u,float out_v,float out_w);
+CIMGUI_API void igImTriangleBarycentricCoords(const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 p,float* out_u,float* out_v,float* out_w);
 CIMGUI_API float igImTriangleArea(const ImVec2 a,const ImVec2 b,const ImVec2 c);
 CIMGUI_API ImGuiDir igImGetDirQuadrantFromDelta(float dx,float dy);
-CIMGUI_API bool igImBitArrayTestBit(const ImU32* arr,int n);
-CIMGUI_API void igImBitArrayClearBit(ImU32* arr,int n);
-CIMGUI_API void igImBitArraySetBit(ImU32* arr,int n);
-CIMGUI_API void igImBitArraySetBitRange(ImU32* arr,int n,int n2);
-CIMGUI_API void ImBitVector_Create(ImBitVector* self,int sz);
-CIMGUI_API void ImBitVector_Clear(ImBitVector* self);
-CIMGUI_API bool ImBitVector_TestBit(ImBitVector* self,int n);
-CIMGUI_API void ImBitVector_SetBit(ImBitVector* self,int n);
-CIMGUI_API void ImBitVector_ClearBit(ImBitVector* self,int n);
 CIMGUI_API ImVec1* ImVec1_ImVec1Nil(void);
 CIMGUI_API void ImVec1_destroy(ImVec1* self);
 CIMGUI_API ImVec1* ImVec1_ImVec1Float(float _x);
@@ -2439,6 +2474,22 @@ CIMGUI_API void ImRect_ClipWith(ImRect* self,const ImRect r);
 CIMGUI_API void ImRect_ClipWithFull(ImRect* self,const ImRect r);
 CIMGUI_API void ImRect_Floor(ImRect* self);
 CIMGUI_API bool ImRect_IsInverted(ImRect* self);
+CIMGUI_API void ImRect_ToVec4(ImVec4 *pOut,ImRect* self);
+CIMGUI_API bool igImBitArrayTestBit(const ImU32* arr,int n);
+CIMGUI_API void igImBitArrayClearBit(ImU32* arr,int n);
+CIMGUI_API void igImBitArraySetBit(ImU32* arr,int n);
+CIMGUI_API void igImBitArraySetBitRange(ImU32* arr,int n,int n2);
+CIMGUI_API void ImBitVector_Create(ImBitVector* self,int sz);
+CIMGUI_API void ImBitVector_Clear(ImBitVector* self);
+CIMGUI_API bool ImBitVector_TestBit(ImBitVector* self,int n);
+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 ImDrawDataBuilder_Clear(ImDrawDataBuilder* self);
+CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(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);
 CIMGUI_API ImGuiStyleMod* ImGuiStyleMod_ImGuiStyleModFloat(ImGuiStyleVar idx,float v);
@@ -2460,24 +2511,8 @@ CIMGUI_API void ImGuiInputTextState_CursorClamp(ImGuiInputTextState* self);
 CIMGUI_API bool ImGuiInputTextState_HasSelection(ImGuiInputTextState* self);
 CIMGUI_API void ImGuiInputTextState_ClearSelection(ImGuiInputTextState* self);
 CIMGUI_API void ImGuiInputTextState_SelectAll(ImGuiInputTextState* self);
-CIMGUI_API ImGuiWindowSettings* ImGuiWindowSettings_ImGuiWindowSettings(void);
-CIMGUI_API void ImGuiWindowSettings_destroy(ImGuiWindowSettings* self);
-CIMGUI_API char* ImGuiWindowSettings_GetName(ImGuiWindowSettings* self);
-CIMGUI_API ImGuiSettingsHandler* ImGuiSettingsHandler_ImGuiSettingsHandler(void);
-CIMGUI_API void ImGuiSettingsHandler_destroy(ImGuiSettingsHandler* self);
 CIMGUI_API ImGuiPopupData* ImGuiPopupData_ImGuiPopupData(void);
 CIMGUI_API void ImGuiPopupData_destroy(ImGuiPopupData* self);
-CIMGUI_API ImGuiColumnData* ImGuiColumnData_ImGuiColumnData(void);
-CIMGUI_API void ImGuiColumnData_destroy(ImGuiColumnData* self);
-CIMGUI_API ImGuiColumns* ImGuiColumns_ImGuiColumns(void);
-CIMGUI_API void ImGuiColumns_destroy(ImGuiColumns* self);
-CIMGUI_API void ImGuiColumns_Clear(ImGuiColumns* self);
-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 ImDrawDataBuilder_Clear(ImDrawDataBuilder* self);
-CIMGUI_API void ImDrawDataBuilder_ClearFreeMemory(ImDrawDataBuilder* self);
-CIMGUI_API void ImDrawDataBuilder_FlattenIntoSingleLayer(ImDrawDataBuilder* self);
 CIMGUI_API ImGuiNavMoveResult* ImGuiNavMoveResult_ImGuiNavMoveResult(void);
 CIMGUI_API void ImGuiNavMoveResult_destroy(ImGuiNavMoveResult* self);
 CIMGUI_API void ImGuiNavMoveResult_Clear(ImGuiNavMoveResult* self);
@@ -2490,6 +2525,16 @@ CIMGUI_API void ImGuiNextItemData_ClearFlags(ImGuiNextItemData* self);
 CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndexPtr(void* ptr);
 CIMGUI_API void ImGuiPtrOrIndex_destroy(ImGuiPtrOrIndex* self);
 CIMGUI_API ImGuiPtrOrIndex* ImGuiPtrOrIndex_ImGuiPtrOrIndexInt(int index);
+CIMGUI_API ImGuiColumnData* ImGuiColumnData_ImGuiColumnData(void);
+CIMGUI_API void ImGuiColumnData_destroy(ImGuiColumnData* self);
+CIMGUI_API ImGuiColumns* ImGuiColumns_ImGuiColumns(void);
+CIMGUI_API void ImGuiColumns_destroy(ImGuiColumns* self);
+CIMGUI_API void ImGuiColumns_Clear(ImGuiColumns* self);
+CIMGUI_API ImGuiWindowSettings* ImGuiWindowSettings_ImGuiWindowSettings(void);
+CIMGUI_API void ImGuiWindowSettings_destroy(ImGuiWindowSettings* self);
+CIMGUI_API char* ImGuiWindowSettings_GetName(ImGuiWindowSettings* self);
+CIMGUI_API ImGuiSettingsHandler* ImGuiSettingsHandler_ImGuiSettingsHandler(void);
+CIMGUI_API void ImGuiSettingsHandler_destroy(ImGuiSettingsHandler* self);
 CIMGUI_API ImGuiContext* ImGuiContext_ImGuiContext(ImFontAtlas* shared_font_atlas);
 CIMGUI_API void ImGuiContext_destroy(ImGuiContext* self);
 CIMGUI_API ImGuiWindowTempData* ImGuiWindowTempData_ImGuiWindowTempData(void);
@@ -2547,10 +2592,12 @@ CIMGUI_API void igUpdateMouseMovingWindowNewFrame(void);
 CIMGUI_API void igUpdateMouseMovingWindowEndFrame(void);
 CIMGUI_API void igMarkIniSettingsDirtyNil(void);
 CIMGUI_API void igMarkIniSettingsDirtyWindowPtr(ImGuiWindow* window);
+CIMGUI_API void igClearIniSettings(void);
 CIMGUI_API ImGuiWindowSettings* igCreateNewWindowSettings(const char* name);
 CIMGUI_API ImGuiWindowSettings* igFindWindowSettings(ImGuiID id);
 CIMGUI_API ImGuiWindowSettings* igFindOrCreateWindowSettings(const char* name);
 CIMGUI_API ImGuiSettingsHandler* igFindSettingsHandler(const char* type_name);
+CIMGUI_API void igSetNextWindowScroll(const ImVec2 scroll);
 CIMGUI_API void igSetScrollXWindowPtr(ImGuiWindow* window,float new_scroll_x);
 CIMGUI_API void igSetScrollYWindowPtr(ImGuiWindow* window,float new_scroll_y);
 CIMGUI_API void igSetScrollFromPosXWindowPtr(ImGuiWindow* window,float local_x,float center_x_ratio);
@@ -2586,10 +2633,10 @@ CIMGUI_API void igShrinkWidths(ImGuiShrinkWidthItem* items,int count,float width
 CIMGUI_API void igLogBegin(ImGuiLogType type,int auto_open_depth);
 CIMGUI_API void igLogToBuffer(int auto_open_depth);
 CIMGUI_API bool igBeginChildEx(const char* name,ImGuiID id,const ImVec2 size_arg,bool border,ImGuiWindowFlags flags);
-CIMGUI_API void igOpenPopupEx(ImGuiID id);
+CIMGUI_API void igOpenPopupEx(ImGuiID id,ImGuiPopupFlags popup_flags);
 CIMGUI_API void igClosePopupToLevel(int remaining,bool restore_focus_to_window_under_popup);
 CIMGUI_API void igClosePopupsOverWindow(ImGuiWindow* ref_window,bool restore_focus_to_window_under_popup);
-CIMGUI_API bool igIsPopupOpenID(ImGuiID id);
+CIMGUI_API bool igIsPopupOpenID(ImGuiID id,ImGuiPopupFlags popup_flags);
 CIMGUI_API bool igBeginPopupEx(ImGuiID id,ImGuiWindowFlags extra_flags);
 CIMGUI_API void igBeginTooltipEx(ImGuiWindowFlags extra_flags,ImGuiTooltipFlags tooltip_flags);
 CIMGUI_API ImGuiWindow* igGetTopMostPopupModal(void);
@@ -2620,6 +2667,7 @@ CIMGUI_API ImGuiKeyModFlags igGetMergedKeyModFlags(void);
 CIMGUI_API bool igBeginDragDropTargetCustom(const ImRect bb,ImGuiID id);
 CIMGUI_API void igClearDragDrop(void);
 CIMGUI_API bool igIsDragDropPayloadBeingAccepted(void);
+CIMGUI_API void igSetWindowClipRectBeforeSetChannel(ImGuiWindow* window,const ImRect clip_rect);
 CIMGUI_API void igBeginColumns(const char* str_id,int count,ImGuiColumnsFlags flags);
 CIMGUI_API void igEndColumns(void);
 CIMGUI_API void igPushColumnClipRect(int column_index);
@@ -2637,7 +2685,7 @@ CIMGUI_API void igTabBarQueueChangeTabOrder(ImGuiTabBar* tab_bar,const ImGuiTabI
 CIMGUI_API bool igTabItemEx(ImGuiTabBar* tab_bar,const char* label,bool* p_open,ImGuiTabItemFlags flags);
 CIMGUI_API void igTabItemCalcSize(ImVec2 *pOut,const char* label,bool has_close_button);
 CIMGUI_API void igTabItemBackground(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImU32 col);
-CIMGUI_API bool igTabItemLabelAndCloseButton(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImVec2 frame_padding,const char* label,ImGuiID tab_id,ImGuiID close_button_id);
+CIMGUI_API bool igTabItemLabelAndCloseButton(ImDrawList* draw_list,const ImRect bb,ImGuiTabItemFlags flags,ImVec2 frame_padding,const char* label,ImGuiID tab_id,ImGuiID close_button_id,bool is_contents_visible);
 CIMGUI_API void igRenderText(ImVec2 pos,const char* text,const char* text_end,bool hide_text_after_hash);
 CIMGUI_API void igRenderTextWrapped(ImVec2 pos,const char* text,const char* text_end,float wrap_width);
 CIMGUI_API void igRenderTextClipped(const ImVec2 pos_min,const ImVec2 pos_max,const char* text,const char* text_end,const ImVec2* text_size_if_known,const ImVec2 align,const ImRect* clip_rect);
@@ -2662,6 +2710,7 @@ 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 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);
 CIMGUI_API ImGuiID igGetWindowResizeID(ImGuiWindow* window,int n);
@@ -2677,9 +2726,10 @@ CIMGUI_API const ImGuiDataTypeInfo* igDataTypeGetInfo(ImGuiDataType data_type);
 CIMGUI_API int igDataTypeFormatString(char* buf,int buf_size,ImGuiDataType data_type,const void* p_data,const char* format);
 CIMGUI_API void igDataTypeApplyOp(ImGuiDataType data_type,int op,void* output,void* arg_1,const void* arg_2);
 CIMGUI_API bool igDataTypeApplyOpFromText(const char* buf,const char* initial_value_buf,ImGuiDataType data_type,void* p_data,const char* format);
+CIMGUI_API bool igDataTypeClamp(ImGuiDataType data_type,void* p_data,const void* p_min,const void* p_max);
 CIMGUI_API bool igInputTextEx(const char* label,const char* hint,char* buf,int buf_size,const ImVec2 size_arg,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data);
 CIMGUI_API bool igTempInputText(const ImRect bb,ImGuiID id,const char* label,char* buf,int buf_size,ImGuiInputTextFlags flags);
-CIMGUI_API bool igTempInputScalar(const ImRect bb,ImGuiID id,const char* label,ImGuiDataType data_type,void* p_data,const char* format);
+CIMGUI_API bool igTempInputScalar(const ImRect bb,ImGuiID id,const char* label,ImGuiDataType data_type,void* p_data,const char* format,const void* p_clamp_min,const void* p_clamp_max);
 CIMGUI_API bool igTempInputIsActive(ImGuiID id);
 CIMGUI_API ImGuiInputTextState* igGetInputTextState(ImGuiID id);
 CIMGUI_API void igColorTooltip(const char* text,const float* col,ImGuiColorEditFlags flags);
@@ -2708,9 +2758,6 @@ CIMGUI_API void igLogText(CONST char *fmt, ...);
 CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const char *fmt, ...);
 //for getting FLT_MAX in bindings
 CIMGUI_API float igGET_FLT_MAX();
-//not const args from & to *
-CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v);
-CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b);


 CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create();
--- a/generator/output/cimgui_impl.h
+++ b/generator/output/cimgui_impl.h
@@ -1,9 +1,6 @@
 typedef struct SDL_Window SDL_Window;
 typedef struct GLFWwindow GLFWwindow;
-
-struct GLFWwindow;
-
-struct SDL_Window;
+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 void ImGui_ImplGlfw_Shutdown();
--- a/generator/output/definitions.json
+++ b/generator/output/definitions.json
--- a/generator/output/definitions.lua
+++ b/generator/output/definitions.lua
--- a/generator/output/impl_definitions.json
+++ b/generator/output/impl_definitions.json
@@ -17,6 +17,7 @@
      "cimguiname": "ImGui_ImplGlfw_CharCallback",
      "defaults": [],
      "funcname": "ImGui_ImplGlfw_CharCallback",
+      "location": "imgui_impl_glfw",
      "ov_cimguiname": "ImGui_ImplGlfw_CharCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,unsigned int)",
@@ -41,6 +42,7 @@
      "cimguiname": "ImGui_ImplGlfw_InitForOpenGL",
      "defaults": [],
      "funcname": "ImGui_ImplGlfw_InitForOpenGL",
+      "location": "imgui_impl_glfw",
      "ov_cimguiname": "ImGui_ImplGlfw_InitForOpenGL",
      "ret": "bool",
      "signature": "(GLFWwindow*,bool)",
@@ -65,6 +67,7 @@
      "cimguiname": "ImGui_ImplGlfw_InitForVulkan",
      "defaults": [],
      "funcname": "ImGui_ImplGlfw_InitForVulkan",
+      "location": "imgui_impl_glfw",
      "ov_cimguiname": "ImGui_ImplGlfw_InitForVulkan",
      "ret": "bool",
      "signature": "(GLFWwindow*,bool)",
@@ -101,6 +104,7 @@
      "cimguiname": "ImGui_ImplGlfw_KeyCallback",
      "defaults": [],
      "funcname": "ImGui_ImplGlfw_KeyCallback",
+      "location": "imgui_impl_glfw",
      "ov_cimguiname": "ImGui_ImplGlfw_KeyCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int,int,int,int)",
@@ -133,6 +137,7 @@
      "cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
      "defaults": [],
      "funcname": "ImGui_ImplGlfw_MouseButtonCallback",
+      "location": "imgui_impl_glfw",
      "ov_cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int,int,int)",
@@ -148,6 +153,7 @@
      "cimguiname": "ImGui_ImplGlfw_NewFrame",
      "defaults": [],
      "funcname": "ImGui_ImplGlfw_NewFrame",
+      "location": "imgui_impl_glfw",
      "ov_cimguiname": "ImGui_ImplGlfw_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -176,6 +182,7 @@
      "cimguiname": "ImGui_ImplGlfw_ScrollCallback",
      "defaults": [],
      "funcname": "ImGui_ImplGlfw_ScrollCallback",
+      "location": "imgui_impl_glfw",
      "ov_cimguiname": "ImGui_ImplGlfw_ScrollCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,double,double)",
@@ -191,6 +198,7 @@
      "cimguiname": "ImGui_ImplGlfw_Shutdown",
      "defaults": [],
      "funcname": "ImGui_ImplGlfw_Shutdown",
+      "location": "imgui_impl_glfw",
      "ov_cimguiname": "ImGui_ImplGlfw_Shutdown",
      "ret": "void",
      "signature": "()",
@@ -206,6 +214,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
+      "location": "imgui_impl_opengl2",
      "ov_cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
      "ret": "bool",
      "signature": "()",
@@ -221,6 +230,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_CreateFontsTexture",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL2_CreateFontsTexture",
+      "location": "imgui_impl_opengl2",
      "ov_cimguiname": "ImGui_ImplOpenGL2_CreateFontsTexture",
      "ret": "bool",
      "signature": "()",
@@ -236,6 +246,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
+      "location": "imgui_impl_opengl2",
      "ov_cimguiname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
      "ret": "void",
      "signature": "()",
@@ -251,6 +262,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
+      "location": "imgui_impl_opengl2",
      "ov_cimguiname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
      "ret": "void",
      "signature": "()",
@@ -266,6 +278,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_Init",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL2_Init",
+      "location": "imgui_impl_opengl2",
      "ov_cimguiname": "ImGui_ImplOpenGL2_Init",
      "ret": "bool",
      "signature": "()",
@@ -281,6 +294,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_NewFrame",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL2_NewFrame",
+      "location": "imgui_impl_opengl2",
      "ov_cimguiname": "ImGui_ImplOpenGL2_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -301,6 +315,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_RenderDrawData",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL2_RenderDrawData",
+      "location": "imgui_impl_opengl2",
      "ov_cimguiname": "ImGui_ImplOpenGL2_RenderDrawData",
      "ret": "void",
      "signature": "(ImDrawData*)",
@@ -316,6 +331,7 @@
      "cimguiname": "ImGui_ImplOpenGL2_Shutdown",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL2_Shutdown",
+      "location": "imgui_impl_opengl2",
      "ov_cimguiname": "ImGui_ImplOpenGL2_Shutdown",
      "ret": "void",
      "signature": "()",
@@ -331,6 +347,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
+      "location": "imgui_impl_opengl3",
      "ov_cimguiname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
      "ret": "bool",
      "signature": "()",
@@ -346,6 +363,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_CreateFontsTexture",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL3_CreateFontsTexture",
+      "location": "imgui_impl_opengl3",
      "ov_cimguiname": "ImGui_ImplOpenGL3_CreateFontsTexture",
      "ret": "bool",
      "signature": "()",
@@ -361,6 +379,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
+      "location": "imgui_impl_opengl3",
      "ov_cimguiname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
      "ret": "void",
      "signature": "()",
@@ -376,6 +395,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
+      "location": "imgui_impl_opengl3",
      "ov_cimguiname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
      "ret": "void",
      "signature": "()",
@@ -398,6 +418,7 @@
        "glsl_version": "((void*)0)"
      },
      "funcname": "ImGui_ImplOpenGL3_Init",
+      "location": "imgui_impl_opengl3",
      "ov_cimguiname": "ImGui_ImplOpenGL3_Init",
      "ret": "bool",
      "signature": "(const char*)",
@@ -413,6 +434,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_NewFrame",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL3_NewFrame",
+      "location": "imgui_impl_opengl3",
      "ov_cimguiname": "ImGui_ImplOpenGL3_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -433,6 +455,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_RenderDrawData",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL3_RenderDrawData",
+      "location": "imgui_impl_opengl3",
      "ov_cimguiname": "ImGui_ImplOpenGL3_RenderDrawData",
      "ret": "void",
      "signature": "(ImDrawData*)",
@@ -448,6 +471,7 @@
      "cimguiname": "ImGui_ImplOpenGL3_Shutdown",
      "defaults": [],
      "funcname": "ImGui_ImplOpenGL3_Shutdown",
+      "location": "imgui_impl_opengl3",
      "ov_cimguiname": "ImGui_ImplOpenGL3_Shutdown",
      "ret": "void",
      "signature": "()",
@@ -468,6 +492,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForD3D",
      "defaults": [],
      "funcname": "ImGui_ImplSDL2_InitForD3D",
+      "location": "imgui_impl_sdl",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForD3D",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -488,6 +513,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForMetal",
      "defaults": [],
      "funcname": "ImGui_ImplSDL2_InitForMetal",
+      "location": "imgui_impl_sdl",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForMetal",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -512,6 +538,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
      "defaults": [],
      "funcname": "ImGui_ImplSDL2_InitForOpenGL",
+      "location": "imgui_impl_sdl",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
      "ret": "bool",
      "signature": "(SDL_Window*,void*)",
@@ -532,6 +559,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForVulkan",
      "defaults": [],
      "funcname": "ImGui_ImplSDL2_InitForVulkan",
+      "location": "imgui_impl_sdl",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForVulkan",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -552,6 +580,7 @@
      "cimguiname": "ImGui_ImplSDL2_NewFrame",
      "defaults": [],
      "funcname": "ImGui_ImplSDL2_NewFrame",
+      "location": "imgui_impl_sdl",
      "ov_cimguiname": "ImGui_ImplSDL2_NewFrame",
      "ret": "void",
      "signature": "(SDL_Window*)",
@@ -572,6 +601,7 @@
      "cimguiname": "ImGui_ImplSDL2_ProcessEvent",
      "defaults": [],
      "funcname": "ImGui_ImplSDL2_ProcessEvent",
+      "location": "imgui_impl_sdl",
      "ov_cimguiname": "ImGui_ImplSDL2_ProcessEvent",
      "ret": "bool",
      "signature": "(const SDL_Event*)",
@@ -587,6 +617,7 @@
      "cimguiname": "ImGui_ImplSDL2_Shutdown",
      "defaults": [],
      "funcname": "ImGui_ImplSDL2_Shutdown",
+      "location": "imgui_impl_sdl",
      "ov_cimguiname": "ImGui_ImplSDL2_Shutdown",
      "ret": "void",
      "signature": "()",
--- a/generator/output/impl_definitions.lua
+++ b/generator/output/impl_definitions.lua
@@ -14,6 +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"
 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)"
@@ -34,6 +35,7 @@ defs["ImGui_ImplGlfw_InitForOpenGL"][1]["call_args"] = "(window,install_callback
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["cimguiname"] = "ImGui_ImplGlfw_InitForOpenGL"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["funcname"] = "ImGui_ImplGlfw_InitForOpenGL"
+defs["ImGui_ImplGlfw_InitForOpenGL"][1]["location"] = "imgui_impl_glfw"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_InitForOpenGL"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["ret"] = "bool"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["signature"] = "(GLFWwindow*,bool)"
@@ -54,6 +56,7 @@ defs["ImGui_ImplGlfw_InitForVulkan"][1]["call_args"] = "(window,install_callback
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["cimguiname"] = "ImGui_ImplGlfw_InitForVulkan"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["funcname"] = "ImGui_ImplGlfw_InitForVulkan"
+defs["ImGui_ImplGlfw_InitForVulkan"][1]["location"] = "imgui_impl_glfw"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_InitForVulkan"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["ret"] = "bool"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["signature"] = "(GLFWwindow*,bool)"
@@ -83,6 +86,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"
 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)"
@@ -109,6 +113,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"
 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)"
@@ -123,6 +128,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"
 defs["ImGui_ImplGlfw_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_NewFrame"
 defs["ImGui_ImplGlfw_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_NewFrame"][1]["signature"] = "()"
@@ -146,6 +152,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"
 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)"
@@ -160,6 +167,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"
 defs["ImGui_ImplGlfw_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_Shutdown"
 defs["ImGui_ImplGlfw_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_Shutdown"][1]["signature"] = "()"
@@ -174,6 +182,7 @@ defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL2_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL2_CreateDeviceObjects"
+defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["location"] = "imgui_impl_opengl2"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["signature"] = "()"
@@ -188,6 +197,7 @@ defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL2_CreateFontsTexture"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL2_CreateFontsTexture"
+defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["location"] = "imgui_impl_opengl2"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_CreateFontsTexture"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["signature"] = "()"
@@ -202,6 +212,7 @@ defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL2_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL2_DestroyDeviceObjects"
+defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["location"] = "imgui_impl_opengl2"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["signature"] = "()"
@@ -216,6 +227,7 @@ defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL2_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL2_DestroyFontsTexture"
+defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["location"] = "imgui_impl_opengl2"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["signature"] = "()"
@@ -230,6 +242,7 @@ defs["ImGui_ImplOpenGL2_Init"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_Init"][1]["cimguiname"] = "ImGui_ImplOpenGL2_Init"
 defs["ImGui_ImplOpenGL2_Init"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_Init"][1]["funcname"] = "ImGui_ImplOpenGL2_Init"
+defs["ImGui_ImplOpenGL2_Init"][1]["location"] = "imgui_impl_opengl2"
 defs["ImGui_ImplOpenGL2_Init"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_Init"
 defs["ImGui_ImplOpenGL2_Init"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL2_Init"][1]["signature"] = "()"
@@ -244,6 +257,7 @@ defs["ImGui_ImplOpenGL2_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["cimguiname"] = "ImGui_ImplOpenGL2_NewFrame"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["funcname"] = "ImGui_ImplOpenGL2_NewFrame"
+defs["ImGui_ImplOpenGL2_NewFrame"][1]["location"] = "imgui_impl_opengl2"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_NewFrame"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["signature"] = "()"
@@ -261,6 +275,7 @@ defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["call_args"] = "(draw_data)"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["cimguiname"] = "ImGui_ImplOpenGL2_RenderDrawData"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["funcname"] = "ImGui_ImplOpenGL2_RenderDrawData"
+defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["location"] = "imgui_impl_opengl2"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_RenderDrawData"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["signature"] = "(ImDrawData*)"
@@ -275,6 +290,7 @@ defs["ImGui_ImplOpenGL2_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["cimguiname"] = "ImGui_ImplOpenGL2_Shutdown"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["funcname"] = "ImGui_ImplOpenGL2_Shutdown"
+defs["ImGui_ImplOpenGL2_Shutdown"][1]["location"] = "imgui_impl_opengl2"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL2_Shutdown"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["signature"] = "()"
@@ -289,6 +305,7 @@ defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL3_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL3_CreateDeviceObjects"
+defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["location"] = "imgui_impl_opengl3"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_CreateDeviceObjects"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["signature"] = "()"
@@ -303,6 +320,7 @@ defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL3_CreateFontsTexture"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL3_CreateFontsTexture"
+defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["location"] = "imgui_impl_opengl3"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_CreateFontsTexture"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["signature"] = "()"
@@ -317,6 +335,7 @@ defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL3_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["funcname"] = "ImGui_ImplOpenGL3_DestroyDeviceObjects"
+defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["location"] = "imgui_impl_opengl3"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_DestroyDeviceObjects"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["signature"] = "()"
@@ -331,6 +350,7 @@ defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL3_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["funcname"] = "ImGui_ImplOpenGL3_DestroyFontsTexture"
+defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["location"] = "imgui_impl_opengl3"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_DestroyFontsTexture"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["signature"] = "()"
@@ -349,6 +369,7 @@ defs["ImGui_ImplOpenGL3_Init"][1]["cimguiname"] = "ImGui_ImplOpenGL3_Init"
 defs["ImGui_ImplOpenGL3_Init"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_Init"][1]["defaults"]["glsl_version"] = "((void*)0)"
 defs["ImGui_ImplOpenGL3_Init"][1]["funcname"] = "ImGui_ImplOpenGL3_Init"
+defs["ImGui_ImplOpenGL3_Init"][1]["location"] = "imgui_impl_opengl3"
 defs["ImGui_ImplOpenGL3_Init"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_Init"
 defs["ImGui_ImplOpenGL3_Init"][1]["ret"] = "bool"
 defs["ImGui_ImplOpenGL3_Init"][1]["signature"] = "(const char*)"
@@ -363,6 +384,7 @@ defs["ImGui_ImplOpenGL3_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["cimguiname"] = "ImGui_ImplOpenGL3_NewFrame"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["funcname"] = "ImGui_ImplOpenGL3_NewFrame"
+defs["ImGui_ImplOpenGL3_NewFrame"][1]["location"] = "imgui_impl_opengl3"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_NewFrame"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["signature"] = "()"
@@ -380,6 +402,7 @@ defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["call_args"] = "(draw_data)"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["cimguiname"] = "ImGui_ImplOpenGL3_RenderDrawData"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["funcname"] = "ImGui_ImplOpenGL3_RenderDrawData"
+defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["location"] = "imgui_impl_opengl3"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_RenderDrawData"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["signature"] = "(ImDrawData*)"
@@ -394,6 +417,7 @@ defs["ImGui_ImplOpenGL3_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["cimguiname"] = "ImGui_ImplOpenGL3_Shutdown"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["funcname"] = "ImGui_ImplOpenGL3_Shutdown"
+defs["ImGui_ImplOpenGL3_Shutdown"][1]["location"] = "imgui_impl_opengl3"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplOpenGL3_Shutdown"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["signature"] = "()"
@@ -411,6 +435,7 @@ defs["ImGui_ImplSDL2_InitForD3D"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForD3D"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForD3D"][1]["funcname"] = "ImGui_ImplSDL2_InitForD3D"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["location"] = "imgui_impl_sdl"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForD3D"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["signature"] = "(SDL_Window*)"
@@ -428,6 +453,7 @@ defs["ImGui_ImplSDL2_InitForMetal"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForMetal"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForMetal"][1]["funcname"] = "ImGui_ImplSDL2_InitForMetal"
+defs["ImGui_ImplSDL2_InitForMetal"][1]["location"] = "imgui_impl_sdl"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForMetal"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["signature"] = "(SDL_Window*)"
@@ -448,6 +474,7 @@ defs["ImGui_ImplSDL2_InitForOpenGL"][1]["call_args"] = "(window,sdl_gl_context)"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForOpenGL"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["funcname"] = "ImGui_ImplSDL2_InitForOpenGL"
+defs["ImGui_ImplSDL2_InitForOpenGL"][1]["location"] = "imgui_impl_sdl"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForOpenGL"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["signature"] = "(SDL_Window*,void*)"
@@ -465,6 +492,7 @@ defs["ImGui_ImplSDL2_InitForVulkan"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForVulkan"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["funcname"] = "ImGui_ImplSDL2_InitForVulkan"
+defs["ImGui_ImplSDL2_InitForVulkan"][1]["location"] = "imgui_impl_sdl"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForVulkan"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["signature"] = "(SDL_Window*)"
@@ -482,6 +510,7 @@ defs["ImGui_ImplSDL2_NewFrame"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_NewFrame"][1]["cimguiname"] = "ImGui_ImplSDL2_NewFrame"
 defs["ImGui_ImplSDL2_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_NewFrame"][1]["funcname"] = "ImGui_ImplSDL2_NewFrame"
+defs["ImGui_ImplSDL2_NewFrame"][1]["location"] = "imgui_impl_sdl"
 defs["ImGui_ImplSDL2_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_NewFrame"
 defs["ImGui_ImplSDL2_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplSDL2_NewFrame"][1]["signature"] = "(SDL_Window*)"
@@ -499,6 +528,7 @@ defs["ImGui_ImplSDL2_ProcessEvent"][1]["call_args"] = "(event)"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["cimguiname"] = "ImGui_ImplSDL2_ProcessEvent"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["funcname"] = "ImGui_ImplSDL2_ProcessEvent"
+defs["ImGui_ImplSDL2_ProcessEvent"][1]["location"] = "imgui_impl_sdl"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_ProcessEvent"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["signature"] = "(const SDL_Event*)"
@@ -513,6 +543,7 @@ defs["ImGui_ImplSDL2_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplSDL2_Shutdown"][1]["cimguiname"] = "ImGui_ImplSDL2_Shutdown"
 defs["ImGui_ImplSDL2_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_Shutdown"][1]["funcname"] = "ImGui_ImplSDL2_Shutdown"
+defs["ImGui_ImplSDL2_Shutdown"][1]["location"] = "imgui_impl_sdl"
 defs["ImGui_ImplSDL2_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_Shutdown"
 defs["ImGui_ImplSDL2_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplSDL2_Shutdown"][1]["signature"] = "()"
--- a/generator/output/overloads.txt
+++ b/generator/output/overloads.txt
@@ -30,7 +30,7 @@ ImVector_back	2
 2	const T*	ImVector_back_const ()const
 igPlotHistogram	2
 1	void	igPlotHistogramFloatPtr (const char*,const float*,int,int,const char*,float,float,ImVec2,int)
-2	void	igPlotHistogramFnPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2)
+2	void	igPlotHistogramFnFloatPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2)
 igGetID	3
 1	ImGuiID	igGetIDStr (const char*)
 2	ImGuiID	igGetIDStrStr (const char*,const char*)
@@ -69,10 +69,13 @@ igSetScrollFromPosX	2
 igGetForegroundDrawList	2
 1	ImDrawList*	igGetForegroundDrawListNil ()
 2	ImDrawList*	igGetForegroundDrawListWindowPtr (ImGuiWindow*)
-igTreeNodeEx	3
-1	bool	igTreeNodeExStr (const char*,ImGuiTreeNodeFlags)
-2	bool	igTreeNodeExStrStr (const char*,ImGuiTreeNodeFlags,const char*,...)
-3	bool	igTreeNodeExPtr (const void*,ImGuiTreeNodeFlags,const char*,...)
+ImVector_front	2
+1	T*	ImVector_frontNil ()
+2	const T*	ImVector_front_const ()const
+ImGuiWindow_GetID	3
+1	ImGuiID	ImGuiWindow_GetIDStr (const char*,const char*)
+2	ImGuiID	ImGuiWindow_GetIDPtr (const void*)
+3	ImGuiID	ImGuiWindow_GetIDInt (int)
 igImLengthSqr	2
 1	float	igImLengthSqrVec2 (const ImVec2)
 2	float	igImLengthSqrVec4 (const ImVec4)
@@ -83,13 +86,10 @@ igTreeNode	3
 1	bool	igTreeNodeStr (const char*)
 2	bool	igTreeNodeStrStr (const char*,const char*,...)
 3	bool	igTreeNodePtr (const void*,const char*,...)
-igItemSize	2
-1	void	igItemSizeVec2 (const ImVec2,float)
-2	void	igItemSizeRect (const ImRect,float)
 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	igComboFnPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int)
+3	bool	igComboFnBoolPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int)
 igSetScrollY	2
 1	void	igSetScrollYFloat (float)
 2	void	igSetScrollYWindowPtr (ImGuiWindow*,float)
@@ -112,6 +112,9 @@ igImLerp	3
 ImVector_end	2
 1	T*	ImVector_endNil ()
 2	const T*	ImVector_end_const ()const
+igItemSize	2
+1	void	igItemSizeVec2 (const ImVec2,float)
+2	void	igItemSizeRect (const ImRect,float)
 igMarkIniSettingsDirty	2
 1	void	igMarkIniSettingsDirtyNil ()
 2	void	igMarkIniSettingsDirtyWindowPtr (ImGuiWindow*)
@@ -119,9 +122,12 @@ igSetWindowSize	3
 1	void	igSetWindowSizeVec2 (const ImVec2,ImGuiCond)
 2	void	igSetWindowSizeStr (const char*,const ImVec2,ImGuiCond)
 3	void	igSetWindowSizeWindowPtr (ImGuiWindow*,const ImVec2,ImGuiCond)
+igSetScrollX	2
+1	void	igSetScrollXFloat (float)
+2	void	igSetScrollXWindowPtr (ImGuiWindow*,float)
 igIsPopupOpen	2
-1	bool	igIsPopupOpenStr (const char*)
-2	bool	igIsPopupOpenID (ImGuiID)
+1	bool	igIsPopupOpenStr (const char*,ImGuiPopupFlags)
+2	bool	igIsPopupOpenID (ImGuiID,ImGuiPopupFlags)
 ImVector_ImVector	2
 1	nil	ImVector_ImVectorNil ()
 2	nil	ImVector_ImVectorVector (const ImVector)
@@ -131,7 +137,7 @@ igSetWindowCollapsed	3
 3	void	igSetWindowCollapsedWindowPtr (ImGuiWindow*,bool,ImGuiCond)
 igPlotLines	2
 1	void	igPlotLinesFloatPtr (const char*,const float*,int,int,const char*,float,float,ImVec2,int)
-2	void	igPlotLinesFnPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2)
+2	void	igPlotLinesFnFloatPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2)
 igPushStyleColor	2
 1	void	igPushStyleColorU32 (ImGuiCol,ImU32)
 2	void	igPushStyleColorVec4 (ImGuiCol,const ImVec4)
@@ -139,10 +145,6 @@ ImGuiWindow_GetIDNoKeepAlive	3
 1	ImGuiID	ImGuiWindow_GetIDNoKeepAliveStr (const char*,const char*)
 2	ImGuiID	ImGuiWindow_GetIDNoKeepAlivePtr (const void*)
 3	ImGuiID	ImGuiWindow_GetIDNoKeepAliveInt (int)
-ImGuiWindow_GetID	3
-1	ImGuiID	ImGuiWindow_GetIDStr (const char*,const char*)
-2	ImGuiID	ImGuiWindow_GetIDPtr (const void*)
-3	ImGuiID	ImGuiWindow_GetIDInt (int)
 igTreeNodeExV	2
 1	bool	igTreeNodeExVStr (const char*,ImGuiTreeNodeFlags,const char*,va_list)
 2	bool	igTreeNodeExVPtr (const void*,ImGuiTreeNodeFlags,const char*,va_list)
@@ -154,15 +156,15 @@ ImGuiStyleMod_ImGuiStyleMod	3
 1	nil	ImGuiStyleMod_ImGuiStyleModInt (ImGuiStyleVar,int)
 2	nil	ImGuiStyleMod_ImGuiStyleModFloat (ImGuiStyleVar,float)
 3	nil	ImGuiStyleMod_ImGuiStyleModVec2 (ImGuiStyleVar,ImVec2)
-ImRect_Expand	2
-1	void	ImRect_ExpandFloat (const float)
-2	void	ImRect_ExpandVec2 (const ImVec2)
 ImPool_Remove	2
 1	void	ImPool_RemoveTPtr (ImGuiID,const T*)
 2	void	ImPool_RemovePoolIdx (ImGuiID,ImPoolIdx)
+ImRect_Expand	2
+1	void	ImRect_ExpandFloat (const float)
+2	void	ImRect_ExpandVec2 (const ImVec2)
 igListBox	2
 1	bool	igListBoxStr_arr (const char*,int*,const char* const[],int,int)
-2	bool	igListBoxFnPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int)
+2	bool	igListBoxFnBoolPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int)
 ImGuiPtrOrIndex_ImGuiPtrOrIndex	2
 1	nil	ImGuiPtrOrIndex_ImGuiPtrOrIndexPtr (void*)
 2	nil	ImGuiPtrOrIndex_ImGuiPtrOrIndexInt (int)
@@ -174,37 +176,35 @@ ImRect_ImRect	4
 igTreePush	2
 1	void	igTreePushStr (const char*)
 2	void	igTreePushPtr (const void*)
-igSelectable	2
-1	bool	igSelectableBool (const char*,bool,ImGuiSelectableFlags,const ImVec2)
-2	bool	igSelectableBoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2)
+igTreeNodeEx	3
+1	bool	igTreeNodeExStr (const char*,ImGuiTreeNodeFlags)
+2	bool	igTreeNodeExStrStr (const char*,ImGuiTreeNodeFlags,const char*,...)
+3	bool	igTreeNodeExPtr (const void*,ImGuiTreeNodeFlags,const char*,...)
 igGetColorU32	3
 1	ImU32	igGetColorU32Col (ImGuiCol,float)
 2	ImU32	igGetColorU32Vec4 (const ImVec4)
 3	ImU32	igGetColorU32U32 (ImU32)
-ImVector_begin	2
-1	T*	ImVector_beginNil ()
-2	const T*	ImVector_begin_const ()const
+ImVector_find	2
+1	T*	ImVector_findNil (const T)
+2	const T*	ImVector_find_const (const T)const
 ImColor_ImColor	5
 1	nil	ImColor_ImColorNil ()
 2	nil	ImColor_ImColorInt (int,int,int,int)
 3	nil	ImColor_ImColorU32 (ImU32)
 4	nil	ImColor_ImColorFloat (float,float,float,float)
 5	nil	ImColor_ImColorVec4 (const ImVec4)
+ImVector_begin	2
+1	T*	ImVector_beginNil ()
+2	const T*	ImVector_begin_const ()const
 igCollapsingHeader	2
 1	bool	igCollapsingHeaderTreeNodeFlags (const char*,ImGuiTreeNodeFlags)
 2	bool	igCollapsingHeaderBoolPtr (const char*,bool*,ImGuiTreeNodeFlags)
-ImVector_front	2
-1	T*	ImVector_frontNil ()
-2	const T*	ImVector_front_const ()const
-ImVector_find	2
-1	T*	ImVector_findNil (const T)
-2	const T*	ImVector_find_const (const T)const
 igListBoxHeader	2
 1	bool	igListBoxHeaderVec2 (const char*,const ImVec2)
 2	bool	igListBoxHeaderInt (const char*,int,int)
-igSetScrollX	2
-1	void	igSetScrollXFloat (float)
-2	void	igSetScrollXWindowPtr (ImGuiWindow*,float)
+igSelectable	2
+1	bool	igSelectableBool (const char*,bool,ImGuiSelectableFlags,const ImVec2)
+2	bool	igSelectableBoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2)
 igMenuItem	2
 1	bool	igMenuItemBool (const char*,const char*,bool,bool)
 2	bool	igMenuItemBoolPtr (const char*,const char*,bool*,bool)
--- a/generator/output/structs_and_enums.json
+++ b/generator/output/structs_and_enums.json
@@ -736,6 +736,11 @@
      }
    ],
    "ImGuiCond_": [
+      {
+        "calc_value": 0,
+        "name": "ImGuiCond_None",
+        "value": "0"
+      },
      {
        "calc_value": 1,
        "name": "ImGuiCond_Always",
@@ -804,6 +809,23 @@
        "value": "1 << 21"
      }
    ],
+    "ImGuiDataTypePrivate_": [
+      {
+        "calc_value": 11,
+        "name": "ImGuiDataType_String",
+        "value": "ImGuiDataType_COUNT + 1"
+      },
+      {
+        "calc_value": 12,
+        "name": "ImGuiDataType_Pointer",
+        "value": "ImGuiDataType_COUNT + 1+1"
+      },
+      {
+        "calc_value": 13,
+        "name": "ImGuiDataType_ID",
+        "value": "ImGuiDataType_COUNT + 1+1+1"
+      }
+    ],
    "ImGuiDataType_": [
      {
        "calc_value": 0,
@@ -1867,6 +1889,11 @@
        "calc_value": 64,
        "name": "ImGuiNextWindowDataFlags_HasBgAlpha",
        "value": "1 << 6"
+      },
+      {
+        "calc_value": 128,
+        "name": "ImGuiNextWindowDataFlags_HasScroll",
+        "value": "1 << 7"
      }
    ],
    "ImGuiPlotType": [
@@ -1881,6 +1908,63 @@
        "value": 1
      }
    ],
+    "ImGuiPopupFlags_": [
+      {
+        "calc_value": 0,
+        "name": "ImGuiPopupFlags_None",
+        "value": "0"
+      },
+      {
+        "calc_value": 0,
+        "name": "ImGuiPopupFlags_MouseButtonLeft",
+        "value": "0"
+      },
+      {
+        "calc_value": 1,
+        "name": "ImGuiPopupFlags_MouseButtonRight",
+        "value": "1"
+      },
+      {
+        "calc_value": 2,
+        "name": "ImGuiPopupFlags_MouseButtonMiddle",
+        "value": "2"
+      },
+      {
+        "calc_value": 31,
+        "name": "ImGuiPopupFlags_MouseButtonMask_",
+        "value": "0x1F"
+      },
+      {
+        "calc_value": 1,
+        "name": "ImGuiPopupFlags_MouseButtonDefault_",
+        "value": "1"
+      },
+      {
+        "calc_value": 32,
+        "name": "ImGuiPopupFlags_NoOpenOverExistingPopup",
+        "value": "1 << 5"
+      },
+      {
+        "calc_value": 64,
+        "name": "ImGuiPopupFlags_NoOpenOverItems",
+        "value": "1 << 6"
+      },
+      {
+        "calc_value": 128,
+        "name": "ImGuiPopupFlags_AnyPopupId",
+        "value": "1 << 7"
+      },
+      {
+        "calc_value": 256,
+        "name": "ImGuiPopupFlags_AnyPopupLevel",
+        "value": "1 << 8"
+      },
+      {
+        "calc_value": 384,
+        "name": "ImGuiPopupFlags_AnyPopup",
+        "value": "ImGuiPopupFlags_AnyPopupId | ImGuiPopupFlags_AnyPopupLevel"
+      }
+    ],
    "ImGuiPopupPositionPolicy": [
      {
        "calc_value": 0,
@@ -2219,6 +2303,11 @@
        "calc_value": 8,
        "name": "ImGuiTabItemFlags_NoPushId",
        "value": "1 << 3"
+      },
+      {
+        "calc_value": 16,
+        "name": "ImGuiTabItemFlags_NoTooltip",
+        "value": "1 << 4"
      }
    ],
    "ImGuiTextFlags_": [
@@ -2514,10 +2603,6 @@
      }
    ],
    "ImDrawCmd": [
-      {
-        "name": "ElemCount",
-        "type": "unsigned int"
-      },
      {
        "name": "ClipRect",
        "type": "ImVec4"
@@ -2534,6 +2619,10 @@
        "name": "IdxOffset",
        "type": "unsigned int"
      },
+      {
+        "name": "ElemCount",
+        "type": "unsigned int"
+      },
      {
        "name": "UserCallback",
        "type": "ImDrawCallback"
@@ -2613,10 +2702,6 @@
        "name": "_OwnerName",
        "type": "const char*"
      },
-      {
-        "name": "_VtxCurrentOffset",
-        "type": "unsigned int"
-      },
      {
        "name": "_VtxCurrentIdx",
        "type": "unsigned int"
@@ -2644,6 +2729,10 @@
        "template_type": "ImVec2",
        "type": "ImVector_ImVec2"
      },
+      {
+        "name": "_CmdHeader",
+        "type": "ImDrawCmd"
+      },
      {
        "name": "_Splitter",
        "type": "ImDrawListSplitter"
@@ -2863,10 +2952,6 @@
      }
    ],
    "ImFontAtlasCustomRect": [
-      {
-        "name": "ID",
-        "type": "unsigned int"
-      },
      {
        "name": "Width",
        "type": "unsigned short"
@@ -2883,6 +2968,10 @@
        "name": "Y",
        "type": "unsigned short"
      },
+      {
+        "name": "GlyphID",
+        "type": "unsigned int"
+      },
      {
        "name": "GlyphAdvanceX",
        "type": "float"
@@ -3108,7 +3197,11 @@
        "type": "float"
      },
      {
-        "name": "HostClipRect",
+        "name": "HostInitialClipRect",
+        "type": "ImRect"
+      },
+      {
+        "name": "HostBackupClipRect",
        "type": "ImRect"
      },
      {
@@ -3186,6 +3279,18 @@
        "name": "WithinEndChild",
        "type": "bool"
      },
+      {
+        "name": "TestEngineHookItems",
+        "type": "bool"
+      },
+      {
+        "name": "TestEngineHookIdInfo",
+        "type": "ImGuiID"
+      },
+      {
+        "name": "TestEngine",
+        "type": "void*"
+      },
      {
        "name": "Windows",
        "template_type": "ImGuiWindow*",
@@ -3527,6 +3632,14 @@
        "name": "NavMoveResultOther",
        "type": "ImGuiNavMoveResult"
      },
+      {
+        "name": "NavWrapRequestWindow",
+        "type": "ImGuiWindow*"
+      },
+      {
+        "name": "NavWrapRequestFlags",
+        "type": "ImGuiNavMoveFlags"
+      },
      {
        "name": "NavWindowingTarget",
        "type": "ImGuiWindow*"
@@ -3536,7 +3649,7 @@
        "type": "ImGuiWindow*"
      },
      {
-        "name": "NavWindowingList",
+        "name": "NavWindowingListWindow",
        "type": "ImGuiWindow*"
      },
      {
@@ -3659,6 +3772,10 @@
        "name": "DragDropAcceptFrameCount",
        "type": "int"
      },
+      {
+        "name": "DragDropHoldJustPressedId",
+        "type": "ImGuiID"
+      },
      {
        "name": "DragDropPayloadBufHeap",
        "template_type": "unsigned char",
@@ -3874,6 +3991,13 @@
        "type": "const char*"
      }
    ],
+    "ImGuiDataTypeTempStorage": [
+      {
+        "name": "Data[8]",
+        "size": 8,
+        "type": "ImU8"
+      }
+    ],
    "ImGuiGroupData": [
      {
        "name": "BackupCursorPos",
@@ -4240,6 +4364,10 @@
        "size": 21,
        "type": "float"
      },
+      {
+        "name": "PenPressure",
+        "type": "float"
+      },
      {
        "name": "InputQueueSurrogate",
        "type": "ImWchar16"
@@ -4522,6 +4650,10 @@
        "name": "ContentSizeVal",
        "type": "ImVec2"
      },
+      {
+        "name": "ScrollVal",
+        "type": "ImVec2"
+      },
      {
        "name": "CollapsedVal",
        "type": "bool"
@@ -4637,6 +4769,14 @@
        "name": "TypeHash",
        "type": "ImGuiID"
      },
+      {
+        "name": "ClearAllFn",
+        "type": "void(*)(ImGuiContext* ctx,ImGuiSettingsHandler* handler)"
+      },
+      {
+        "name": "ReadInitFn",
+        "type": "void(*)(ImGuiContext* ctx,ImGuiSettingsHandler* handler)"
+      },
      {
        "name": "ReadOpenFn",
        "type": "void*(*)(ImGuiContext* ctx,ImGuiSettingsHandler* handler,const char* name)"
@@ -4645,6 +4785,10 @@
        "name": "ReadLineFn",
        "type": "void(*)(ImGuiContext* ctx,ImGuiSettingsHandler* handler,void* entry,const char* line)"
      },
+      {
+        "name": "ApplyAllFn",
+        "type": "void(*)(ImGuiContext* ctx,ImGuiSettingsHandler* handler)"
+      },
      {
        "name": "WriteAllFn",
        "type": "void(*)(ImGuiContext* ctx,ImGuiSettingsHandler* handler,ImGuiTextBuffer* out_buf)"
@@ -4800,6 +4944,10 @@
        "name": "TabBorderSize",
        "type": "float"
      },
+      {
+        "name": "TabMinWidthForUnselectedCloseButton",
+        "type": "float"
+      },
      {
        "name": "ColorButtonPosition",
        "type": "ImGuiDir"
@@ -5344,6 +5492,10 @@
      {
        "name": "Collapsed",
        "type": "bool"
+      },
+      {
+        "name": "WantApply",
+        "type": "bool"
      }
    ],
    "ImGuiWindowTempData": [
--- a/generator/output/structs_and_enums.lua
+++ b/generator/output/structs_and_enums.lua
--- a/generator/output/typedefs_dict.json
+++ b/generator/output/typedefs_dict.json
@@ -35,6 +35,7 @@
  "ImGuiContext": "struct ImGuiContext",
  "ImGuiDataType": "int",
  "ImGuiDataTypeInfo": "struct ImGuiDataTypeInfo",
+  "ImGuiDataTypeTempStorage": "struct ImGuiDataTypeTempStorage",
  "ImGuiDir": "int",
  "ImGuiDragDropFlags": "int",
  "ImGuiDragFlags": "int",
@@ -69,6 +70,7 @@
  "ImGuiOnceUponAFrame": "struct ImGuiOnceUponAFrame",
  "ImGuiPayload": "struct ImGuiPayload",
  "ImGuiPopupData": "struct ImGuiPopupData",
+  "ImGuiPopupFlags": "int",
  "ImGuiPtrOrIndex": "struct ImGuiPtrOrIndex",
  "ImGuiSelectableFlags": "int",
  "ImGuiSeparatorFlags": "int",
--- a/generator/output/typedefs_dict.lua
+++ b/generator/output/typedefs_dict.lua
@@ -35,6 +35,7 @@ defs["ImGuiConfigFlags"] = "int"
 defs["ImGuiContext"] = "struct ImGuiContext"
 defs["ImGuiDataType"] = "int"
 defs["ImGuiDataTypeInfo"] = "struct ImGuiDataTypeInfo"
+defs["ImGuiDataTypeTempStorage"] = "struct ImGuiDataTypeTempStorage"
 defs["ImGuiDir"] = "int"
 defs["ImGuiDragDropFlags"] = "int"
 defs["ImGuiDragFlags"] = "int"
@@ -69,6 +70,7 @@ defs["ImGuiNextWindowDataFlags"] = "int"
 defs["ImGuiOnceUponAFrame"] = "struct ImGuiOnceUponAFrame"
 defs["ImGuiPayload"] = "struct ImGuiPayload"
 defs["ImGuiPopupData"] = "struct ImGuiPopupData"
+defs["ImGuiPopupFlags"] = "int"
 defs["ImGuiPtrOrIndex"] = "struct ImGuiPtrOrIndex"
 defs["ImGuiSelectableFlags"] = "int"
 defs["ImGuiSeparatorFlags"] = "int"
--- a/2
+++ b/2
Author	SHA1	Message	Date
Victor Bombi	bc3bc4583d	pull imgui master 1.77 and generate	2020-06-29 18:55:13 +02:00
Victor Bombi	13ad240b74	readme: argsT when arg is function pointer	2020-06-08 18:03:20 +02:00
Victor Bombi	74ca33d026	generation with non const ref to ptr	2020-06-06 11:42:25 +02:00
Victor Bombi	ab53af765f	non const ref to pointer	2020-06-06 11:41:33 +02:00
Victor Bombi	4e160d8017	generation with location info	2020-06-05 20:46:02 +02:00
Victor Bombi	8b4ebff2e2	update readme with location info	2020-06-05 20:45:08 +02:00
Victor Bombi	a27b5236db	keep implementations locations	2020-06-05 20:45:08 +02:00
Victor Bombi	19e41cf8e9	keep function locations keep locations	2020-06-05 20:45:08 +02:00
Victor Bombi	61784f32f9	readme: size field in struct description	2020-05-31 10:37:10 +02:00
Victor Bombi	250169feb7	generation after FnPtr change	2020-05-30 15:33:12 +02:00
Victor Bombi	16846a206b	FnPtr changes to FnretvalPtr to allow 2 overloadings with different FnPtr, corrected checking equal ov_cimguiname	2020-05-30 15:30:57 +02:00
Victor Bombi	f30441fd5d	CMakeLists.txt modification for MSVC thanks to @Sewer56	2020-05-25 16:54:55 +02:00
Victor Bombi	787939bebc	getCname uses namespace	2020-05-16 16:50:12 +02:00