pull imgui 1.73

Update CMake to a modern module system and create simple test

.gitignore

@@ -32,7 +32,10 @@ cimgui/cimgui.sdf
 cimgui/cimgui.v12.suo
 cimgui/Release/
 .idea
-CMakeLists.txt
 cimgui/.vs/
 cimgui/cimgui.vcxproj.user
 cimgui/x64/
+
+# Test / Build
+bld/
+build/

.travis.yml

@@ -1,11 +1,32 @@
 language: cpp
+dist: trusty
 
 os:
   - linux
+  - osx
+  - windows
 
 compiler:
   - gcc
   - clang
 
+env:
+  - MSBUILD_PATH="c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin"
+
 script:
-  make
+  - mkdir bld
+  - cd bld
+  - cmake -D CIMGUI_TEST=1 ..
+  - |
+    if [ "$TRAVIS_OS_NAME" == "windows" ]; then
+      export PATH=$MSBUILD_PATH:$PATH
+      MSBuild.exe cimgui.sln
+    else
+      make
+    fi
+  - |
+    if [ "$TRAVIS_OS_NAME" == "windows" ]; then
+      ./Debug/cimgui_test.exe
+    else
+      ./cimgui_test
+    fi

CMakeLists.txt

@@ -1,20 +1,15 @@
-Project(cimgui)
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.1)
+
+project(cimgui)
 
 #general settings
-include_directories(imgui)
-add_definitions("-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS=1")
-
-include_directories(.)
-set(IMGUI_SOURCES ./cimgui.cpp ./imgui/imgui.cpp ./imgui/imgui_draw.cpp ./imgui/imgui_demo.cpp ./imgui/imgui_widgets.cpp)
-
-set(IMGUI_LIBRARIES )
-
-if (WIN32)
-    add_definitions("-DIMGUI_IMPL_API=extern \"C\" __declspec\(dllexport\)")
-else(WIN32)
-    add_definitions("-DIMGUI_IMPL_API=extern \"C\" ")
-endif(WIN32)
+file(GLOB IMGUI_SOURCES
+    cimgui.cpp
+    imgui/imgui.cpp
+    imgui/imgui_draw.cpp
+    imgui/imgui_demo.cpp
+    imgui/imgui_widgets.cpp
+)
 
 set(IMGUI_STATIC "no" CACHE STRING "Build as a static library")
 
@@ -25,12 +20,27 @@ else (IMGUI_STATIC)
     add_library(cimgui SHARED ${IMGUI_SOURCES})
 endif (IMGUI_STATIC)
 
-target_link_libraries(cimgui ${IMGUI_LIBRARIES})
+target_compile_definitions(cimgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS=1)
+if (WIN32)
+    target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API="extern \"C\" __declspec\(dllexport\)")
+else (WIN32)
+    target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API="extern \"C\" ")
+endif (WIN32)
+
+target_include_directories(cimgui PUBLIC ${CMAKE_SOURCE_DIR})
+target_include_directories(cimgui PUBLIC ${CMAKE_SOURCE_DIR}/imgui)
 set_target_properties(cimgui PROPERTIES PREFIX "")
 
 #install
 install(TARGETS cimgui
-              RUNTIME DESTINATION  .
-              LIBRARY DESTINATION  .
-              ARCHIVE DESTINATION  .
-              )
+    RUNTIME DESTINATION  .
+    LIBRARY DESTINATION  .
+    ARCHIVE DESTINATION  .
+)
+
+#test
+set(CIMGUI_TEST "no" CACHE STRING "Enable compilation of a test unit based on imgui null")
+
+if (CIMGUI_TEST)
+  add_subdirectory(test)
+endif ()

Makefile

@@ -46,11 +46,18 @@ endif
 .cpp.o:
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-all:imgui_example
+all:$(OUTPUTNAME)
 	@echo Build complete for $(ECHO_MESSAGE)
 
-imgui_example:$(OBJS)
+$(OUTPUTNAME):$(OBJS)
 	$(CXX) -o $(OUTPUTNAME) $(OBJS) $(CXXFLAGS) $(LINKFLAGS)
 
 clean:
-	rm $(OBJS)
+	rm -f $(OBJS)
+
+fclean: clean
+	rm -f $(OUTPUTNAME)
+
+re: fclean all
+
+.PHONY: all clean fclean re

README.md

@@ -1,8 +1,8 @@
-# cimgui [![Build Status](https://travis-ci.org/sonoro1234/cimgui.svg?branch=master)](https://travis-ci.org/sonoro1234/cimgui)
+# cimgui [![Build Status](https://travis-ci.org/cimgui/cimgui.svg?branch=master)](https://travis-ci.org/cimgui/cimgui)
 
 
 This is a thin c-api wrapper programmatically generated for the excellent C++ immediate mode gui [Dear ImGui](https://github.com/ocornut/imgui).
-All functions are programmatically wrapped except `ImVector` constructors and destructors. (Unless someone find a use case for them)(Now they exist for `ImVector_ImWchar`)
+All imgui.h functions are programmatically wrapped.
 Generated files are: `cimgui.cpp`, `cimgui.h` for C compilation. Also for helping in bindings creation, `definitions.lua` with function definition information and `structs_and_enums.lua`.
 This library is intended as a intermediate layer to be able to use Dear ImGui from other languages that can interface with C (like D - see [D-binding](https://github.com/Extrawurst/DerelictImgui))
 
@@ -11,7 +11,9 @@ History:
 Initially cimgui was developed by Stephan Dilly as hand-written code but lately turned into an auto-generated version by sonoro1234 in order to keep up with imgui more easily (letting the user select the desired branch and commit)
 
 Notes:
-* currently this wrapper is based on version [1.66b of Dear ImGui]
+* currently this wrapper is based on version [1.73 of Dear ImGui]
+* only functions, structs and enums from imgui.h are wrapped.
+* if you are interested in imgui implementations you should look LuaJIT-ImGui project.
 * overloaded function names try to be the most compatible with traditional cimgui names. So all naming is algorithmic except for those names that were in conflict with widely used cimgui names and were thus coded in a table (https://github.com/cimgui/cimgui/blob/master/generator/generator.lua#L58). Current overloaded function names can be found in (https://github.com/cimgui/cimgui/blob/master/generator/output/overloads.txt)
 
 # compilation
@@ -25,10 +27,11 @@ Notes:
 
 # using generator
 
+* this is only needed (before compilation) if you want an imgui version different from the one provided, otherwise generation is already done.
 * you will need LuaJIT (https://github.com/LuaJIT/LuaJIT.git better 2.1 branch) or precompiled for linux/macOS/windows in https://luapower.com/luajit/download
 * you can use also a C++ compiler for doing preprocessing: gcc (In windows MinGW-W64-builds for example), clang or cl (MSVC) or not use a compiler (experimental nocompiler option) at all. (this repo was done with gcc)
 * update `imgui` folder to the version you desire.
-* edit `generator/generator.bat` (or make a .sh version and please PR) to choose between gcc, clang, cl or nocompiler. Run it with gcc, clang or cl and LuaJIT on your PATH.
+* edit `generator/generator.bat` on windows, or `generator/generator.sh` on linux, to choose between gcc, clang, cl or nocompiler. Run it with gcc, clang or cl and LuaJIT on your PATH.
 * as a result some files are generated: `cimgui.cpp` and `cimgui.h` for compiling and some lua/json files with information about the binding: `definitions.json` with function info, `structs_and_enums.json` with struct and enum info, `impl_definitions.json` with functions from the implementations info. 
 
 # generate binding
@@ -39,10 +42,11 @@ Notes:
 ### definitions description
 * It is a collection in which key is the cimgui name that would result without overloadings and the value is an array of overloadings (may be only one overloading)
 * Each overloading is a collection. Some relevant keys and values are:
-  * stname : the name of the struct the function belongs to (may be ImGui if it is top level in ImGui namespace)
+  * stname : the name of the struct the function belongs to (will be "" if it is top level in ImGui namespace)
   * ov_cimguiname : the overloaded cimgui name (if absent it would be taken from cimguiname)
   * cimguiname : the name without overloading (this should be used if there is not ov_cimguiname)
   * ret : the return type
+  * retref : is setted 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)
   * 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
@@ -50,7 +54,9 @@ Notes:
   * manual : will be true if this function is hand-written (not generated)
   * isvararg : is setted if some argument is a vararg
   * constructor : is setted if the function is a constructor for a class
-  * destructor : is setted if the functions is a destructor for a class
+  * destructor : is setted if the function is a destructor for a class
+  * templated : is setted if the function belongs to a templated class (ImVector)
+  * templatedgen: is setted if the function belongs to a struct generated from template (ImVector_ImWchar)
   * nonUDT : if present can be 1 or 2 (explained meaning in usage) if return type was a user defined type
 ### structs_and_enums description
 * Is is a collection with two items:

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.66b" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.73" from Dear ImGui https://github.com/ocornut/imgui
 
 #include "./imgui/imgui.h"
 #include "cimgui.h"
@@ -46,9 +46,9 @@ CIMGUI_API void igSetCurrentContext(ImGuiContext* ctx)
 {
     return ImGui::SetCurrentContext(ctx);
 }
-CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t sz_io,size_t sz_style,size_t sz_vec2,size_t sz_vec4,size_t sz_drawvert)
+CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t sz_io,size_t sz_style,size_t sz_vec2,size_t sz_vec4,size_t sz_drawvert,size_t sz_drawidx)
 {
-    return ImGui::DebugCheckVersionAndDataLayout(version_str,sz_io,sz_style,sz_vec2,sz_vec4,sz_drawvert);
+    return ImGui::DebugCheckVersionAndDataLayout(version_str,sz_io,sz_style,sz_vec2,sz_vec4,sz_drawvert,sz_drawidx);
 }
 CIMGUI_API ImGuiIO* igGetIO()
 {
@@ -174,30 +174,6 @@ CIMGUI_API float igGetWindowHeight()
 {
     return ImGui::GetWindowHeight();
 }
-CIMGUI_API ImVec2 igGetContentRegionMax()
-{
-    return ImGui::GetContentRegionMax();
-}
-CIMGUI_API ImVec2 igGetContentRegionAvail()
-{
-    return ImGui::GetContentRegionAvail();
-}
-CIMGUI_API float igGetContentRegionAvailWidth()
-{
-    return ImGui::GetContentRegionAvailWidth();
-}
-CIMGUI_API ImVec2 igGetWindowContentRegionMin()
-{
-    return ImGui::GetWindowContentRegionMin();
-}
-CIMGUI_API ImVec2 igGetWindowContentRegionMax()
-{
-    return ImGui::GetWindowContentRegionMax();
-}
-CIMGUI_API float igGetWindowContentRegionWidth()
-{
-    return ImGui::GetWindowContentRegionWidth();
-}
 CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot)
 {
     return ImGui::SetNextWindowPos(pos,cond,pivot);
@@ -262,6 +238,26 @@ CIMGUI_API void igSetWindowFocusStr(const char* name)
 {
     return ImGui::SetWindowFocus(name);
 }
+CIMGUI_API ImVec2 igGetContentRegionMax()
+{
+    return ImGui::GetContentRegionMax();
+}
+CIMGUI_API ImVec2 igGetContentRegionAvail()
+{
+    return ImGui::GetContentRegionAvail();
+}
+CIMGUI_API ImVec2 igGetWindowContentRegionMin()
+{
+    return ImGui::GetWindowContentRegionMin();
+}
+CIMGUI_API ImVec2 igGetWindowContentRegionMax()
+{
+    return ImGui::GetWindowContentRegionMax();
+}
+CIMGUI_API float igGetWindowContentRegionWidth()
+{
+    return ImGui::GetWindowContentRegionWidth();
+}
 CIMGUI_API float igGetScrollX()
 {
     return ImGui::GetScrollX();
@@ -286,13 +282,21 @@ CIMGUI_API void igSetScrollY(float scroll_y)
 {
     return ImGui::SetScrollY(scroll_y);
 }
+CIMGUI_API void igSetScrollHereX(float center_x_ratio)
+{
+    return ImGui::SetScrollHereX(center_x_ratio);
+}
 CIMGUI_API void igSetScrollHereY(float center_y_ratio)
 {
     return ImGui::SetScrollHereY(center_y_ratio);
 }
-CIMGUI_API void igSetScrollFromPosY(float pos_y,float center_y_ratio)
+CIMGUI_API void igSetScrollFromPosX(float local_x,float center_x_ratio)
 {
-    return ImGui::SetScrollFromPosY(pos_y,center_y_ratio);
+    return ImGui::SetScrollFromPosX(local_x,center_x_ratio);
+}
+CIMGUI_API void igSetScrollFromPosY(float local_y,float center_y_ratio)
+{
+    return ImGui::SetScrollFromPosY(local_y,center_y_ratio);
 }
 CIMGUI_API void igPushFont(ImFont* font)
 {
@@ -362,13 +366,17 @@ CIMGUI_API void igPopItemWidth()
 {
     return ImGui::PopItemWidth();
 }
+CIMGUI_API void igSetNextItemWidth(float item_width)
+{
+    return ImGui::SetNextItemWidth(item_width);
+}
 CIMGUI_API float igCalcItemWidth()
 {
     return ImGui::CalcItemWidth();
 }
-CIMGUI_API void igPushTextWrapPos(float wrap_pos_x)
+CIMGUI_API void igPushTextWrapPos(float wrap_local_pos_x)
 {
-    return ImGui::PushTextWrapPos(wrap_pos_x);
+    return ImGui::PushTextWrapPos(wrap_local_pos_x);
 }
 CIMGUI_API void igPopTextWrapPos()
 {
@@ -394,9 +402,9 @@ CIMGUI_API void igSeparator()
 {
     return ImGui::Separator();
 }
-CIMGUI_API void igSameLine(float pos_x,float spacing_w)
+CIMGUI_API void igSameLine(float offset_from_start_x,float spacing)
 {
-    return ImGui::SameLine(pos_x,spacing_w);
+    return ImGui::SameLine(offset_from_start_x,spacing);
 }
 CIMGUI_API void igNewLine()
 {
@@ -442,13 +450,13 @@ CIMGUI_API void igSetCursorPos(const ImVec2 local_pos)
 {
     return ImGui::SetCursorPos(local_pos);
 }
-CIMGUI_API void igSetCursorPosX(float x)
+CIMGUI_API void igSetCursorPosX(float local_x)
 {
-    return ImGui::SetCursorPosX(x);
+    return ImGui::SetCursorPosX(local_x);
 }
-CIMGUI_API void igSetCursorPosY(float y)
+CIMGUI_API void igSetCursorPosY(float local_y)
 {
-    return ImGui::SetCursorPosY(y);
+    return ImGui::SetCursorPosY(local_y);
 }
 CIMGUI_API ImVec2 igGetCursorStartPos()
 {
@@ -458,9 +466,9 @@ CIMGUI_API ImVec2 igGetCursorScreenPos()
 {
     return ImGui::GetCursorScreenPos();
 }
-CIMGUI_API void igSetCursorScreenPos(const ImVec2 screen_pos)
+CIMGUI_API void igSetCursorScreenPos(const ImVec2 pos)
 {
-    return ImGui::SetCursorScreenPos(screen_pos);
+    return ImGui::SetCursorScreenPos(pos);
 }
 CIMGUI_API void igAlignTextToFramePadding()
 {
@@ -764,49 +772,53 @@ CIMGUI_API bool igInputTextMultiline(const char* label,char* buf,size_t buf_size
 {
     return ImGui::InputTextMultiline(label,buf,buf_size,size,flags,callback,user_data);
 }
-CIMGUI_API bool igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputTextWithHint(const char* label,const char* hint,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data)
 {
-    return ImGui::InputFloat(label,v,step,step_fast,format,extra_flags);
+    return ImGui::InputTextWithHint(label,hint,buf,buf_size,flags,callback,user_data);
 }
-CIMGUI_API bool igInputFloat2(const char* label,float v[2],const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputFloat2(label,v,format,extra_flags);
+    return ImGui::InputFloat(label,v,step,step_fast,format,flags);
 }
-CIMGUI_API bool igInputFloat3(const char* label,float v[3],const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputFloat2(const char* label,float v[2],const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputFloat3(label,v,format,extra_flags);
+    return ImGui::InputFloat2(label,v,format,flags);
 }
-CIMGUI_API bool igInputFloat4(const char* label,float v[4],const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputFloat3(const char* label,float v[3],const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputFloat4(label,v,format,extra_flags);
+    return ImGui::InputFloat3(label,v,format,flags);
 }
-CIMGUI_API bool igInputInt(const char* label,int* v,int step,int step_fast,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputFloat4(const char* label,float v[4],const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputInt(label,v,step,step_fast,extra_flags);
+    return ImGui::InputFloat4(label,v,format,flags);
 }
-CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputInt(const char* label,int* v,int step,int step_fast,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputInt2(label,v,extra_flags);
+    return ImGui::InputInt(label,v,step,step_fast,flags);
 }
-CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags flags)
 {
-    return ImGui::InputInt3(label,v,extra_flags);
+    return ImGui::InputInt2(label,v,flags);
 }
-CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags flags)
 {
-    return ImGui::InputInt4(label,v,extra_flags);
+    return ImGui::InputInt3(label,v,flags);
 }
-CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags flags)
 {
-    return ImGui::InputDouble(label,v,step,step_fast,format,extra_flags);
+    return ImGui::InputInt4(label,v,flags);
 }
-CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputScalar(label,data_type,v,step,step_fast,format,extra_flags);
+    return ImGui::InputDouble(label,v,step,step_fast,format,flags);
 }
-CIMGUI_API bool igInputScalarN(const char* label,ImGuiDataType data_type,void* v,int components,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputScalarN(label,data_type,v,components,step,step_fast,format,extra_flags);
+    return ImGui::InputScalar(label,data_type,v,step,step_fast,format,flags);
+}
+CIMGUI_API bool igInputScalarN(const char* label,ImGuiDataType data_type,void* v,int components,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags flags)
+{
+    return ImGui::InputScalarN(label,data_type,v,components,step,step_fast,format,flags);
 }
 CIMGUI_API bool igColorEdit3(const char* label,float col[3],ImGuiColorEditFlags flags)
 {
@@ -900,18 +912,10 @@ CIMGUI_API void igTreePop()
 {
     return ImGui::TreePop();
 }
-CIMGUI_API void igTreeAdvanceToLabelPos()
-{
-    return ImGui::TreeAdvanceToLabelPos();
-}
 CIMGUI_API float igGetTreeNodeToLabelSpacing()
 {
     return ImGui::GetTreeNodeToLabelSpacing();
 }
-CIMGUI_API void igSetNextTreeNodeOpen(bool is_open,ImGuiCond cond)
-{
-    return ImGui::SetNextTreeNodeOpen(is_open,cond);
-}
 CIMGUI_API bool igCollapsingHeader(const char* label,ImGuiTreeNodeFlags flags)
 {
     return ImGui::CollapsingHeader(label,flags);
@@ -920,6 +924,10 @@ CIMGUI_API bool igCollapsingHeaderBoolPtr(const char* label,bool* p_open,ImGuiTr
 {
     return ImGui::CollapsingHeader(label,p_open,flags);
 }
+CIMGUI_API void igSetNextItemOpen(bool is_open,ImGuiCond cond)
+{
+    return ImGui::SetNextItemOpen(is_open,cond);
+}
 CIMGUI_API bool igSelectable(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size)
 {
     return ImGui::Selectable(label,selected,flags,size);
@@ -1103,17 +1111,37 @@ CIMGUI_API int igGetColumnsCount()
 {
     return ImGui::GetColumnsCount();
 }
-CIMGUI_API void igLogToTTY(int max_depth)
+CIMGUI_API bool igBeginTabBar(const char* str_id,ImGuiTabBarFlags flags)
 {
-    return ImGui::LogToTTY(max_depth);
+    return ImGui::BeginTabBar(str_id,flags);
 }
-CIMGUI_API void igLogToFile(int max_depth,const char* filename)
+CIMGUI_API void igEndTabBar()
 {
-    return ImGui::LogToFile(max_depth,filename);
+    return ImGui::EndTabBar();
 }
-CIMGUI_API void igLogToClipboard(int max_depth)
+CIMGUI_API bool igBeginTabItem(const char* label,bool* p_open,ImGuiTabItemFlags flags)
 {
-    return ImGui::LogToClipboard(max_depth);
+    return ImGui::BeginTabItem(label,p_open,flags);
+}
+CIMGUI_API void igEndTabItem()
+{
+    return ImGui::EndTabItem();
+}
+CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label)
+{
+    return ImGui::SetTabItemClosed(tab_or_docked_window_label);
+}
+CIMGUI_API void igLogToTTY(int auto_open_depth)
+{
+    return ImGui::LogToTTY(auto_open_depth);
+}
+CIMGUI_API void igLogToFile(int auto_open_depth,const char* filename)
+{
+    return ImGui::LogToFile(auto_open_depth,filename);
+}
+CIMGUI_API void igLogToClipboard(int auto_open_depth)
+{
+    return ImGui::LogToClipboard(auto_open_depth);
 }
 CIMGUI_API void igLogFinish()
 {
@@ -1127,9 +1155,9 @@ CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags)
 {
     return ImGui::BeginDragDropSource(flags);
 }
-CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t size,ImGuiCond cond)
+CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t sz,ImGuiCond cond)
 {
-    return ImGui::SetDragDropPayload(type,data,size,cond);
+    return ImGui::SetDragDropPayload(type,data,sz,cond);
 }
 CIMGUI_API void igEndDragDropSource()
 {
@@ -1191,6 +1219,10 @@ CIMGUI_API bool igIsItemEdited()
 {
     return ImGui::IsItemEdited();
 }
+CIMGUI_API bool igIsItemActivated()
+{
+    return ImGui::IsItemActivated();
+}
 CIMGUI_API bool igIsItemDeactivated()
 {
     return ImGui::IsItemDeactivated();
@@ -1243,9 +1275,13 @@ CIMGUI_API int igGetFrameCount()
 {
     return ImGui::GetFrameCount();
 }
-CIMGUI_API ImDrawList* igGetOverlayDrawList()
+CIMGUI_API ImDrawList* igGetBackgroundDrawList()
 {
-    return ImGui::GetOverlayDrawList();
+    return ImGui::GetBackgroundDrawList();
+}
+CIMGUI_API ImDrawList* igGetForegroundDrawList()
+{
+    return ImGui::GetForegroundDrawList();
 }
 CIMGUI_API ImDrawListSharedData* igGetDrawListSharedData()
 {
@@ -1363,13 +1399,13 @@ CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor type)
 {
     return ImGui::SetMouseCursor(type);
 }
-CIMGUI_API void igCaptureKeyboardFromApp(bool capture)
+CIMGUI_API void igCaptureKeyboardFromApp(bool want_capture_keyboard_value)
 {
-    return ImGui::CaptureKeyboardFromApp(capture);
+    return ImGui::CaptureKeyboardFromApp(want_capture_keyboard_value);
 }
-CIMGUI_API void igCaptureMouseFromApp(bool capture)
+CIMGUI_API void igCaptureMouseFromApp(bool want_capture_mouse_value)
 {
-    return ImGui::CaptureMouseFromApp(capture);
+    return ImGui::CaptureMouseFromApp(want_capture_mouse_value);
 }
 CIMGUI_API const char* igGetClipboardText()
 {
@@ -1419,13 +1455,13 @@ CIMGUI_API void ImGuiStyle_ScaleAllSizes(ImGuiStyle* self,float scale_factor)
 {
     return self->ScaleAllSizes(scale_factor);
 }
-CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,ImWchar c)
+CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,unsigned int c)
 {
     return self->AddInputCharacter(c);
 }
-CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(ImGuiIO* self,const char* utf8_chars)
+CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(ImGuiIO* self,const char* str)
 {
-    return self->AddInputCharactersUTF8(utf8_chars);
+    return self->AddInputCharactersUTF8(str);
 }
 CIMGUI_API void ImGuiIO_ClearInputCharacters(ImGuiIO* self)
 {
@@ -1519,31 +1555,23 @@ CIMGUI_API bool ImGuiTextFilter_IsActive(ImGuiTextFilter* self)
 {
     return self->IsActive();
 }
-CIMGUI_API TextRange* TextRange_TextRange(void)
+CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRange(void)
 {
-    return IM_NEW(TextRange)();
+    return IM_NEW(ImGuiTextRange)();
 }
-CIMGUI_API void TextRange_destroy(TextRange* self)
+CIMGUI_API void ImGuiTextRange_destroy(ImGuiTextRange* self)
 {
     IM_DELETE(self);
 }
-CIMGUI_API TextRange* TextRange_TextRangeStr(const char* _b,const char* _e)
+CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRangeStr(const char* _b,const char* _e)
 {
-    return IM_NEW(TextRange)(_b,_e);
+    return IM_NEW(ImGuiTextRange)(_b,_e);
 }
-CIMGUI_API const char* TextRange_begin(TextRange* self)
-{
-    return self->begin();
-}
-CIMGUI_API const char* TextRange_end(TextRange* self)
-{
-    return self->end();
-}
-CIMGUI_API bool TextRange_empty(TextRange* self)
+CIMGUI_API bool ImGuiTextRange_empty(ImGuiTextRange* self)
 {
     return self->empty();
 }
-CIMGUI_API void TextRange_split(TextRange* self,char separator,ImVector_TextRange* out)
+CIMGUI_API void ImGuiTextRange_split(ImGuiTextRange* self,char separator,ImVector_ImGuiTextRange* out)
 {
     return self->split(separator,out);
 }
@@ -1583,25 +1611,29 @@ CIMGUI_API const char* ImGuiTextBuffer_c_str(ImGuiTextBuffer* self)
 {
     return self->c_str();
 }
+CIMGUI_API void ImGuiTextBuffer_append(ImGuiTextBuffer* self,const char* str,const char* str_end)
+{
+    return self->append(str,str_end);
+}
 CIMGUI_API void ImGuiTextBuffer_appendfv(ImGuiTextBuffer* self,const char* fmt,va_list args)
 {
     return self->appendfv(fmt,args);
 }
-CIMGUI_API Pair* Pair_PairInt(ImGuiID _key,int _val_i)
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairInt(ImGuiID _key,int _val_i)
 {
-    return IM_NEW(Pair)(_key,_val_i);
+    return IM_NEW(ImGuiStoragePair)(_key,_val_i);
 }
-CIMGUI_API void Pair_destroy(Pair* self)
+CIMGUI_API void ImGuiStoragePair_destroy(ImGuiStoragePair* self)
 {
     IM_DELETE(self);
 }
-CIMGUI_API Pair* Pair_PairFloat(ImGuiID _key,float _val_f)
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairFloat(ImGuiID _key,float _val_f)
 {
-    return IM_NEW(Pair)(_key,_val_f);
+    return IM_NEW(ImGuiStoragePair)(_key,_val_f);
 }
-CIMGUI_API Pair* Pair_PairPtr(ImGuiID _key,void* _val_p)
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairPtr(ImGuiID _key,void* _val_p)
 {
-    return IM_NEW(Pair)(_key,_val_p);
+    return IM_NEW(ImGuiStoragePair)(_key,_val_p);
 }
 CIMGUI_API void ImGuiStorage_Clear(ImGuiStorage* self)
 {
@@ -1723,6 +1755,34 @@ CIMGUI_API void ImDrawCmd_destroy(ImDrawCmd* self)
 {
     IM_DELETE(self);
 }
+CIMGUI_API ImDrawListSplitter* ImDrawListSplitter_ImDrawListSplitter(void)
+{
+    return IM_NEW(ImDrawListSplitter)();
+}
+CIMGUI_API void ImDrawListSplitter_destroy(ImDrawListSplitter* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImDrawListSplitter_Clear(ImDrawListSplitter* self)
+{
+    return self->Clear();
+}
+CIMGUI_API void ImDrawListSplitter_ClearFreeMemory(ImDrawListSplitter* self)
+{
+    return self->ClearFreeMemory();
+}
+CIMGUI_API void ImDrawListSplitter_Split(ImDrawListSplitter* self,ImDrawList* draw_list,int count)
+{
+    return self->Split(draw_list,count);
+}
+CIMGUI_API void ImDrawListSplitter_Merge(ImDrawListSplitter* self,ImDrawList* draw_list)
+{
+    return self->Merge(draw_list);
+}
+CIMGUI_API void ImDrawListSplitter_SetCurrentChannel(ImDrawListSplitter* self,ImDrawList* draw_list,int channel_idx)
+{
+    return self->SetCurrentChannel(draw_list,channel_idx);
+}
 CIMGUI_API ImDrawList* ImDrawList_ImDrawList(const ImDrawListSharedData* shared_data)
 {
     return IM_NEW(ImDrawList)(shared_data);
@@ -1759,45 +1819,45 @@ CIMGUI_API ImVec2 ImDrawList_GetClipRectMax(ImDrawList* self)
 {
     return self->GetClipRectMax();
 }
-CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float thickness)
+CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,ImU32 col,float thickness)
 {
-    return self->AddLine(a,b,col,thickness);
+    return self->AddLine(p1,p2,col,thickness);
 }
-CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float rounding,int rounding_corners_flags,float thickness)
+CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners,float thickness)
 {
-    return self->AddRect(a,b,col,rounding,rounding_corners_flags,thickness);
+    return self->AddRect(p_min,p_max,col,rounding,rounding_corners,thickness);
 }
-CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float rounding,int rounding_corners_flags)
+CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners)
 {
-    return self->AddRectFilled(a,b,col,rounding,rounding_corners_flags);
+    return self->AddRectFilled(p_min,p_max,col,rounding,rounding_corners);
 }
-CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left)
+CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left)
 {
-    return self->AddRectFilledMultiColor(a,b,col_upr_left,col_upr_right,col_bot_right,col_bot_left);
+    return self->AddRectFilledMultiColor(p_min,p_max,col_upr_left,col_upr_right,col_bot_right,col_bot_left);
 }
-CIMGUI_API void ImDrawList_AddQuad(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,ImU32 col,float thickness)
+CIMGUI_API void ImDrawList_AddQuad(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness)
 {
-    return self->AddQuad(a,b,c,d,col,thickness);
+    return self->AddQuad(p1,p2,p3,p4,col,thickness);
 }
-CIMGUI_API void ImDrawList_AddQuadFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,ImU32 col)
+CIMGUI_API void ImDrawList_AddQuadFilled(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col)
 {
-    return self->AddQuadFilled(a,b,c,d,col);
+    return self->AddQuadFilled(p1,p2,p3,p4,col);
 }
-CIMGUI_API void ImDrawList_AddTriangle(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,ImU32 col,float thickness)
+CIMGUI_API void ImDrawList_AddTriangle(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col,float thickness)
 {
-    return self->AddTriangle(a,b,c,col,thickness);
+    return self->AddTriangle(p1,p2,p3,col,thickness);
 }
-CIMGUI_API void ImDrawList_AddTriangleFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,ImU32 col)
+CIMGUI_API void ImDrawList_AddTriangleFilled(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col)
 {
-    return self->AddTriangleFilled(a,b,c,col);
+    return self->AddTriangleFilled(p1,p2,p3,col);
 }
-CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 centre,float radius,ImU32 col,int num_segments,float thickness)
+CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments,float thickness)
 {
-    return self->AddCircle(centre,radius,col,num_segments,thickness);
+    return self->AddCircle(center,radius,col,num_segments,thickness);
 }
-CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 centre,float radius,ImU32 col,int num_segments)
+CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments)
 {
-    return self->AddCircleFilled(centre,radius,col,num_segments);
+    return self->AddCircleFilled(center,radius,col,num_segments);
 }
 CIMGUI_API void ImDrawList_AddText(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end)
 {
@@ -1807,23 +1867,11 @@ CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,fl
 {
     return self->AddText(font,font_size,pos,col,text_begin,text_end,wrap_width,cpu_fine_clip_rect);
 }
-CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col)
-{
-    return self->AddImage(user_texture_id,a,b,uv_a,uv_b,col);
-}
-CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,const ImVec2 uv_a,const ImVec2 uv_b,const ImVec2 uv_c,const ImVec2 uv_d,ImU32 col)
-{
-    return self->AddImageQuad(user_texture_id,a,b,c,d,uv_a,uv_b,uv_c,uv_d,col);
-}
-CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col,float rounding,int rounding_corners)
-{
-    return self->AddImageRounded(user_texture_id,a,b,uv_a,uv_b,col,rounding,rounding_corners);
-}
-CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col,bool closed,float thickness)
+CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness)
 {
     return self->AddPolyline(points,num_points,col,closed,thickness);
 }
-CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col)
+CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col)
 {
     return self->AddConvexPolyFilled(points,num_points,col);
 }
@@ -1831,6 +1879,18 @@ CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 pos0,con
 {
     return self->AddBezierCurve(pos0,cp0,cp1,pos1,col,thickness,num_segments);
 }
+CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col)
+{
+    return self->AddImage(user_texture_id,p_min,p_max,uv_min,uv_max,col);
+}
+CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,const ImVec2 uv1,const ImVec2 uv2,const ImVec2 uv3,const ImVec2 uv4,ImU32 col)
+{
+    return self->AddImageQuad(user_texture_id,p1,p2,p3,p4,uv1,uv2,uv3,uv4,col);
+}
+CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners)
+{
+    return self->AddImageRounded(user_texture_id,p_min,p_max,uv_min,uv_max,col,rounding,rounding_corners);
+}
 CIMGUI_API void ImDrawList_PathClear(ImDrawList* self)
 {
     return self->PathClear();
@@ -1851,33 +1911,21 @@ CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,bool closed,flo
 {
     return self->PathStroke(col,closed,thickness);
 }
-CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 centre,float radius,float a_min,float a_max,int num_segments)
+CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments)
 {
-    return self->PathArcTo(centre,radius,a_min,a_max,num_segments);
+    return self->PathArcTo(center,radius,a_min,a_max,num_segments);
 }
-CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 centre,float radius,int a_min_of_12,int a_max_of_12)
+CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 center,float radius,int a_min_of_12,int a_max_of_12)
 {
-    return self->PathArcToFast(centre,radius,a_min_of_12,a_max_of_12);
+    return self->PathArcToFast(center,radius,a_min_of_12,a_max_of_12);
 }
 CIMGUI_API void ImDrawList_PathBezierCurveTo(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,int num_segments)
 {
     return self->PathBezierCurveTo(p1,p2,p3,num_segments);
 }
-CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,int rounding_corners_flags)
+CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawCornerFlags rounding_corners)
 {
-    return self->PathRect(rect_min,rect_max,rounding,rounding_corners_flags);
-}
-CIMGUI_API void ImDrawList_ChannelsSplit(ImDrawList* self,int channels_count)
-{
-    return self->ChannelsSplit(channels_count);
-}
-CIMGUI_API void ImDrawList_ChannelsMerge(ImDrawList* self)
-{
-    return self->ChannelsMerge();
-}
-CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* self,int channel_index)
-{
-    return self->ChannelsSetCurrent(channel_index);
+    return self->PathRect(rect_min,rect_max,rounding,rounding_corners);
 }
 CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data)
 {
@@ -1891,6 +1939,18 @@ CIMGUI_API ImDrawList* ImDrawList_CloneOutput(ImDrawList* self)
 {
     return self->CloneOutput();
 }
+CIMGUI_API void ImDrawList_ChannelsSplit(ImDrawList* self,int count)
+{
+    return self->ChannelsSplit(count);
+}
+CIMGUI_API void ImDrawList_ChannelsMerge(ImDrawList* self)
+{
+    return self->ChannelsMerge();
+}
+CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* self,int n)
+{
+    return self->ChannelsSetCurrent(n);
+}
 CIMGUI_API void ImDrawList_Clear(ImDrawList* self)
 {
     return self->Clear();
@@ -1951,9 +2011,9 @@ CIMGUI_API void ImDrawData_DeIndexAllBuffers(ImDrawData* self)
 {
     return self->DeIndexAllBuffers();
 }
-CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 sc)
+CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 fb_scale)
 {
-    return self->ScaleClipRects(sc);
+    return self->ScaleClipRects(fb_scale);
 }
 CIMGUI_API ImFontConfig* ImFontConfig_ImFontConfig(void)
 {
@@ -1963,6 +2023,54 @@ CIMGUI_API void ImFontConfig_destroy(ImFontConfig* self)
 {
     IM_DELETE(self);
 }
+CIMGUI_API ImFontGlyphRangesBuilder* ImFontGlyphRangesBuilder_ImFontGlyphRangesBuilder(void)
+{
+    return IM_NEW(ImFontGlyphRangesBuilder)();
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_destroy(ImFontGlyphRangesBuilder* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_Clear(ImFontGlyphRangesBuilder* self)
+{
+    return self->Clear();
+}
+CIMGUI_API bool ImFontGlyphRangesBuilder_GetBit(ImFontGlyphRangesBuilder* self,int n)
+{
+    return self->GetBit(n);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_SetBit(ImFontGlyphRangesBuilder* self,int n)
+{
+    return self->SetBit(n);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_AddChar(ImFontGlyphRangesBuilder* self,ImWchar c)
+{
+    return self->AddChar(c);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_AddText(ImFontGlyphRangesBuilder* self,const char* text,const char* text_end)
+{
+    return self->AddText(text,text_end);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_AddRanges(ImFontGlyphRangesBuilder* self,const ImWchar* ranges)
+{
+    return self->AddRanges(ranges);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_BuildRanges(ImFontGlyphRangesBuilder* self,ImVector_ImWchar* out_ranges)
+{
+    return self->BuildRanges(out_ranges);
+}
+CIMGUI_API ImFontAtlasCustomRect* ImFontAtlasCustomRect_ImFontAtlasCustomRect(void)
+{
+    return IM_NEW(ImFontAtlasCustomRect)();
+}
+CIMGUI_API void ImFontAtlasCustomRect_destroy(ImFontAtlasCustomRect* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API bool ImFontAtlasCustomRect_IsPacked(ImFontAtlasCustomRect* self)
+{
+    return self->IsPacked();
+}
 CIMGUI_API ImFontAtlas* ImFontAtlas_ImFontAtlas(void)
 {
     return IM_NEW(ImFontAtlas)();
@@ -2015,10 +2123,6 @@ CIMGUI_API bool ImFontAtlas_Build(ImFontAtlas* self)
 {
     return self->Build();
 }
-CIMGUI_API bool ImFontAtlas_IsBuilt(ImFontAtlas* self)
-{
-    return self->IsBuilt();
-}
 CIMGUI_API void ImFontAtlas_GetTexDataAsAlpha8(ImFontAtlas* self,unsigned char** out_pixels,int* out_width,int* out_height,int* out_bytes_per_pixel)
 {
     return self->GetTexDataAsAlpha8(out_pixels,out_width,out_height,out_bytes_per_pixel);
@@ -2027,6 +2131,10 @@ CIMGUI_API void ImFontAtlas_GetTexDataAsRGBA32(ImFontAtlas* self,unsigned char**
 {
     return self->GetTexDataAsRGBA32(out_pixels,out_width,out_height,out_bytes_per_pixel);
 }
+CIMGUI_API bool ImFontAtlas_IsBuilt(ImFontAtlas* self)
+{
+    return self->IsBuilt();
+}
 CIMGUI_API void ImFontAtlas_SetTexID(ImFontAtlas* self,ImTextureID id)
 {
     return self->SetTexID(id);
@@ -2059,49 +2167,9 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self)
 {
     return self->GetGlyphRangesThai();
 }
-CIMGUI_API GlyphRangesBuilder* GlyphRangesBuilder_GlyphRangesBuilder(void)
+CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesVietnamese(ImFontAtlas* self)
 {
-    return IM_NEW(GlyphRangesBuilder)();
-}
-CIMGUI_API void GlyphRangesBuilder_destroy(GlyphRangesBuilder* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API bool GlyphRangesBuilder_GetBit(GlyphRangesBuilder* self,int n)
-{
-    return self->GetBit(n);
-}
-CIMGUI_API void GlyphRangesBuilder_SetBit(GlyphRangesBuilder* self,int n)
-{
-    return self->SetBit(n);
-}
-CIMGUI_API void GlyphRangesBuilder_AddChar(GlyphRangesBuilder* self,ImWchar c)
-{
-    return self->AddChar(c);
-}
-CIMGUI_API void GlyphRangesBuilder_AddText(GlyphRangesBuilder* self,const char* text,const char* text_end)
-{
-    return self->AddText(text,text_end);
-}
-CIMGUI_API void GlyphRangesBuilder_AddRanges(GlyphRangesBuilder* self,const ImWchar* ranges)
-{
-    return self->AddRanges(ranges);
-}
-CIMGUI_API void GlyphRangesBuilder_BuildRanges(GlyphRangesBuilder* self,ImVector_ImWchar* out_ranges)
-{
-    return self->BuildRanges(out_ranges);
-}
-CIMGUI_API CustomRect* CustomRect_CustomRect(void)
-{
-    return IM_NEW(CustomRect)();
-}
-CIMGUI_API void CustomRect_destroy(CustomRect* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API bool CustomRect_IsPacked(CustomRect* self)
-{
-    return self->IsPacked();
+    return self->GetGlyphRangesVietnamese();
 }
 CIMGUI_API int ImFontAtlas_AddCustomRectRegular(ImFontAtlas* self,unsigned int id,int width,int height)
 {
@@ -2111,11 +2179,11 @@ CIMGUI_API int ImFontAtlas_AddCustomRectFontGlyph(ImFontAtlas* self,ImFont* font
 {
     return self->AddCustomRectFontGlyph(font,id,width,height,advance_x,offset);
 }
-CIMGUI_API const CustomRect* ImFontAtlas_GetCustomRectByIndex(ImFontAtlas* self,int index)
+CIMGUI_API const ImFontAtlasCustomRect* ImFontAtlas_GetCustomRectByIndex(ImFontAtlas* self,int index)
 {
     return self->GetCustomRectByIndex(index);
 }
-CIMGUI_API void ImFontAtlas_CalcCustomRectUV(ImFontAtlas* self,const CustomRect* rect,ImVec2* out_uv_min,ImVec2* out_uv_max)
+CIMGUI_API void ImFontAtlas_CalcCustomRectUV(ImFontAtlas* self,const ImFontAtlasCustomRect* rect,ImVec2* out_uv_min,ImVec2* out_uv_max)
 {
     return self->CalcCustomRectUV(rect,out_uv_min,out_uv_max);
 }
@@ -2131,14 +2199,6 @@ CIMGUI_API void ImFont_destroy(ImFont* self)
 {
     IM_DELETE(self);
 }
-CIMGUI_API void ImFont_ClearOutputData(ImFont* self)
-{
-    return self->ClearOutputData();
-}
-CIMGUI_API void ImFont_BuildLookupTable(ImFont* self)
-{
-    return self->BuildLookupTable();
-}
 CIMGUI_API const ImFontGlyph* ImFont_FindGlyph(ImFont* self,ImWchar c)
 {
     return self->FindGlyph(c);
@@ -2147,10 +2207,6 @@ CIMGUI_API const ImFontGlyph* ImFont_FindGlyphNoFallback(ImFont* self,ImWchar c)
 {
     return self->FindGlyphNoFallback(c);
 }
-CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c)
-{
-    return self->SetFallbackChar(c);
-}
 CIMGUI_API float ImFont_GetCharAdvance(ImFont* self,ImWchar c)
 {
     return self->GetCharAdvance(c);
@@ -2179,6 +2235,14 @@ CIMGUI_API void ImFont_RenderText(ImFont* self,ImDrawList* draw_list,float size,
 {
     return self->RenderText(draw_list,size,pos,col,clip_rect,text_begin,text_end,wrap_width,cpu_fine_clip);
 }
+CIMGUI_API void ImFont_BuildLookupTable(ImFont* self)
+{
+    return self->BuildLookupTable();
+}
+CIMGUI_API void ImFont_ClearOutputData(ImFont* self)
+{
+    return self->ClearOutputData();
+}
 CIMGUI_API void ImFont_GrowIndex(ImFont* self,int new_size)
 {
     return self->GrowIndex(new_size);
@@ -2191,6 +2255,10 @@ CIMGUI_API void ImFont_AddRemapChar(ImFont* self,ImWchar dst,ImWchar src,bool ov
 {
     return self->AddRemapChar(dst,src,overwrite_dst);
 }
+CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c)
+{
+    return self->SetFallbackChar(c);
+}
 CIMGUI_API void igGetWindowPos_nonUDT(ImVec2 *pOut)
 {
     *pOut = ImGui::GetWindowPos();
@@ -2450,10 +2518,7 @@ CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
 {
 	return IM_NEW(ImVector<ImWchar>) ();
 }
-CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* p)
-{
-	IM_DELETE(p);
-}
+
 CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p)
 {
 	IM_PLACEMENT_NEW(p) ImVector<ImWchar>();

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.66b" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.73" from Dear ImGui https://github.com/ocornut/imgui
 #ifndef CIMGUI_INCLUDED
 #define CIMGUI_INCLUDED
 #include <stdio.h>
@@ -42,16 +42,13 @@ typedef struct ImColor_Simple { ImVec4_Simple Value;} ImColor_Simple;
 
 
 #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-typedef struct CustomRect CustomRect;
-typedef struct GlyphRangesBuilder GlyphRangesBuilder;
-typedef struct ImFontGlyph ImFontGlyph;
-typedef unsigned short ImDrawIdx;;
-typedef struct Pair Pair;
-typedef struct TextRange TextRange;
+typedef struct ImGuiStoragePair ImGuiStoragePair;
+typedef struct ImGuiTextRange ImGuiTextRange;
+typedef struct ImFontAtlasCustomRect ImFontAtlasCustomRect;
 typedef struct ImVec4 ImVec4;
 typedef struct ImVec2 ImVec2;
-typedef struct ImGuiTextBuffer ImGuiTextBuffer;
 typedef struct ImGuiTextFilter ImGuiTextFilter;
+typedef struct ImGuiTextBuffer ImGuiTextBuffer;
 typedef struct ImGuiStyle ImGuiStyle;
 typedef struct ImGuiStorage ImGuiStorage;
 typedef struct ImGuiSizeCallbackData ImGuiSizeCallbackData;
@@ -62,26 +59,32 @@ typedef struct ImGuiInputTextCallbackData ImGuiInputTextCallbackData;
 typedef struct ImGuiIO ImGuiIO;
 typedef struct ImGuiContext ImGuiContext;
 typedef struct ImColor ImColor;
+typedef struct ImFontGlyphRangesBuilder ImFontGlyphRangesBuilder;
+typedef struct ImFontGlyph ImFontGlyph;
 typedef struct ImFontConfig ImFontConfig;
 typedef struct ImFontAtlas ImFontAtlas;
 typedef struct ImFont ImFont;
 typedef struct ImDrawVert ImDrawVert;
+typedef struct ImDrawListSplitter ImDrawListSplitter;
 typedef struct ImDrawListSharedData ImDrawListSharedData;
 typedef struct ImDrawList ImDrawList;
 typedef struct ImDrawData ImDrawData;
 typedef struct ImDrawCmd ImDrawCmd;
 typedef struct ImDrawChannel ImDrawChannel;
+
 struct ImDrawChannel;
 struct ImDrawCmd;
 struct ImDrawData;
 struct ImDrawList;
 struct ImDrawListSharedData;
+struct ImDrawListSplitter;
 struct ImDrawVert;
 struct ImFont;
 struct ImFontAtlas;
 struct ImFontConfig;
+struct ImFontGlyph;
+struct ImFontGlyphRangesBuilder;
 struct ImColor;
-typedef void* ImTextureID;
 struct ImGuiContext;
 struct ImGuiIO;
 struct ImGuiInputTextCallbackData;
@@ -91,8 +94,9 @@ struct ImGuiPayload;
 struct ImGuiSizeCallbackData;
 struct ImGuiStorage;
 struct ImGuiStyle;
-struct ImGuiTextFilter;
 struct ImGuiTextBuffer;
+struct ImGuiTextFilter;
+typedef void* ImTextureID;
 typedef unsigned int ImGuiID;
 typedef unsigned short ImWchar;
 typedef int ImGuiCol;
@@ -108,7 +112,6 @@ typedef int ImDrawListFlags;
 typedef int ImFontAtlasFlags;
 typedef int ImGuiBackendFlags;
 typedef int ImGuiColorEditFlags;
-typedef int ImGuiColumnsFlags;
 typedef int ImGuiConfigFlags;
 typedef int ImGuiComboFlags;
 typedef int ImGuiDragDropFlags;
@@ -116,14 +119,40 @@ typedef int ImGuiFocusedFlags;
 typedef int ImGuiHoveredFlags;
 typedef int ImGuiInputTextFlags;
 typedef int ImGuiSelectableFlags;
+typedef int ImGuiTabBarFlags;
+typedef int ImGuiTabItemFlags;
 typedef int ImGuiTreeNodeFlags;
 typedef int ImGuiWindowFlags;
 typedef int (*ImGuiInputTextCallback)(ImGuiInputTextCallbackData *data);
 typedef void (*ImGuiSizeCallback)(ImGuiSizeCallbackData* data);
+typedef signed char ImS8;
+typedef unsigned char ImU8;
+typedef signed short ImS16;
+typedef unsigned short ImU16;
 typedef signed int ImS32;
 typedef unsigned int ImU32;
 typedef int64_t ImS64;
 typedef uint64_t ImU64;
+typedef void (*ImDrawCallback)(const ImDrawList* parent_list, const ImDrawCmd* cmd);
+typedef unsigned short ImDrawIdx;typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;
+typedef struct ImVector_float {int Size;int Capacity;float* Data;} ImVector_float;
+typedef struct ImVector_ImWchar {int Size;int Capacity;ImWchar* Data;} ImVector_ImWchar;
+typedef struct ImVector_ImDrawVert {int Size;int Capacity;ImDrawVert* Data;} ImVector_ImDrawVert;
+typedef struct ImVector_ImFontGlyph {int Size;int Capacity;ImFontGlyph* Data;} ImVector_ImFontGlyph;
+typedef struct ImVector_ImGuiTextRange {int Size;int Capacity;ImGuiTextRange* Data;} ImVector_ImGuiTextRange;
+typedef struct ImVector_ImGuiStoragePair {int Size;int Capacity;ImGuiStoragePair* Data;} ImVector_ImGuiStoragePair;
+typedef struct ImVector_ImDrawChannel {int Size;int Capacity;ImDrawChannel* Data;} ImVector_ImDrawChannel;
+typedef struct ImVector_char {int Size;int Capacity;char* Data;} ImVector_char;
+typedef struct ImVector_ImU32 {int Size;int Capacity;ImU32* Data;} ImVector_ImU32;
+typedef struct ImVector_ImFontAtlasCustomRect {int Size;int Capacity;ImFontAtlasCustomRect* Data;} ImVector_ImFontAtlasCustomRect;
+typedef struct ImVector_ImTextureID {int Size;int Capacity;ImTextureID* Data;} ImVector_ImTextureID;
+typedef struct ImVector_ImFontConfig {int Size;int Capacity;ImFontConfig* Data;} ImVector_ImFontConfig;
+typedef struct ImVector_ImFontPtr {int Size;int Capacity;ImFont** Data;} ImVector_ImFontPtr;
+typedef struct ImVector_ImDrawCmd {int Size;int Capacity;ImDrawCmd* Data;} ImVector_ImDrawCmd;
+typedef struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_ImVec4;
+typedef struct ImVector_ImDrawIdx {int Size;int Capacity;ImDrawIdx* Data;} ImVector_ImDrawIdx;
+typedef struct ImVector_ImVec2 {int Size;int Capacity;ImVec2* Data;} ImVector_ImVec2;
+
 struct ImVec2
 {
     float x, y;
@@ -154,6 +183,7 @@ enum ImGuiWindowFlags_
     ImGuiWindowFlags_AlwaysUseWindowPadding = 1 << 16,
     ImGuiWindowFlags_NoNavInputs = 1 << 18,
     ImGuiWindowFlags_NoNavFocus = 1 << 19,
+    ImGuiWindowFlags_UnsavedDocument = 1 << 20,
     ImGuiWindowFlags_NoNav = ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus,
     ImGuiWindowFlags_NoDecoration = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoCollapse,
     ImGuiWindowFlags_NoInputs = ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus,
@@ -186,7 +216,8 @@ enum ImGuiInputTextFlags_
     ImGuiInputTextFlags_NoUndoRedo = 1 << 16,
     ImGuiInputTextFlags_CharsScientific = 1 << 17,
     ImGuiInputTextFlags_CallbackResize = 1 << 18,
-    ImGuiInputTextFlags_Multiline = 1 << 20
+    ImGuiInputTextFlags_Multiline = 1 << 20,
+    ImGuiInputTextFlags_NoMarkEdited = 1 << 21
 };
 enum ImGuiTreeNodeFlags_
 {
@@ -202,6 +233,8 @@ enum ImGuiTreeNodeFlags_
     ImGuiTreeNodeFlags_Leaf = 1 << 8,
     ImGuiTreeNodeFlags_Bullet = 1 << 9,
     ImGuiTreeNodeFlags_FramePadding = 1 << 10,
+    ImGuiTreeNodeFlags_SpanAvailWidth = 1 << 11,
+    ImGuiTreeNodeFlags_SpanFullWidth = 1 << 12,
     ImGuiTreeNodeFlags_NavLeftJumpsBackHere = 1 << 13,
     ImGuiTreeNodeFlags_CollapsingHeader = ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_NoAutoOpenOnLog
 };
@@ -211,7 +244,8 @@ enum ImGuiSelectableFlags_
     ImGuiSelectableFlags_DontClosePopups = 1 << 0,
     ImGuiSelectableFlags_SpanAllColumns = 1 << 1,
     ImGuiSelectableFlags_AllowDoubleClick = 1 << 2,
-    ImGuiSelectableFlags_Disabled = 1 << 3
+    ImGuiSelectableFlags_Disabled = 1 << 3,
+    ImGuiSelectableFlags_AllowItemOverlap = 1 << 4
 };
 enum ImGuiComboFlags_
 {
@@ -225,6 +259,28 @@ enum ImGuiComboFlags_
     ImGuiComboFlags_NoPreview = 1 << 6,
     ImGuiComboFlags_HeightMask_ = ImGuiComboFlags_HeightSmall | ImGuiComboFlags_HeightRegular | ImGuiComboFlags_HeightLarge | ImGuiComboFlags_HeightLargest
 };
+enum ImGuiTabBarFlags_
+{
+    ImGuiTabBarFlags_None = 0,
+    ImGuiTabBarFlags_Reorderable = 1 << 0,
+    ImGuiTabBarFlags_AutoSelectNewTabs = 1 << 1,
+    ImGuiTabBarFlags_TabListPopupButton = 1 << 2,
+    ImGuiTabBarFlags_NoCloseWithMiddleMouseButton = 1 << 3,
+    ImGuiTabBarFlags_NoTabListScrollingButtons = 1 << 4,
+    ImGuiTabBarFlags_NoTooltip = 1 << 5,
+    ImGuiTabBarFlags_FittingPolicyResizeDown = 1 << 6,
+    ImGuiTabBarFlags_FittingPolicyScroll = 1 << 7,
+    ImGuiTabBarFlags_FittingPolicyMask_ = ImGuiTabBarFlags_FittingPolicyResizeDown | ImGuiTabBarFlags_FittingPolicyScroll,
+    ImGuiTabBarFlags_FittingPolicyDefault_ = ImGuiTabBarFlags_FittingPolicyResizeDown
+};
+enum ImGuiTabItemFlags_
+{
+    ImGuiTabItemFlags_None = 0,
+    ImGuiTabItemFlags_UnsavedDocument = 1 << 0,
+    ImGuiTabItemFlags_SetSelected = 1 << 1,
+    ImGuiTabItemFlags_NoCloseWithMiddleMouseButton = 1 << 2,
+    ImGuiTabItemFlags_NoPushId = 1 << 3
+};
 enum ImGuiFocusedFlags_
 {
     ImGuiFocusedFlags_None = 0,
@@ -262,6 +318,10 @@ enum ImGuiDragDropFlags_
 };
 enum ImGuiDataType_
 {
+    ImGuiDataType_S8,
+    ImGuiDataType_U8,
+    ImGuiDataType_S16,
+    ImGuiDataType_U16,
     ImGuiDataType_S32,
     ImGuiDataType_U32,
     ImGuiDataType_S64,
@@ -296,6 +356,7 @@ enum ImGuiKey_
     ImGuiKey_Space,
     ImGuiKey_Enter,
     ImGuiKey_Escape,
+    ImGuiKey_KeyPadEnter,
     ImGuiKey_A,
     ImGuiKey_C,
     ImGuiKey_V,
@@ -323,6 +384,7 @@ enum ImGuiNavInput_
     ImGuiNavInput_TweakSlow,
     ImGuiNavInput_TweakFast,
     ImGuiNavInput_KeyMenu_,
+    ImGuiNavInput_KeyTab_,
     ImGuiNavInput_KeyLeft_,
     ImGuiNavInput_KeyRight_,
     ImGuiNavInput_KeyUp_,
@@ -347,7 +409,8 @@ enum ImGuiBackendFlags_
     ImGuiBackendFlags_None = 0,
     ImGuiBackendFlags_HasGamepad = 1 << 0,
     ImGuiBackendFlags_HasMouseCursors = 1 << 1,
-    ImGuiBackendFlags_HasSetMousePos = 1 << 2
+    ImGuiBackendFlags_HasSetMousePos = 1 << 2,
+    ImGuiBackendFlags_RendererHasVtxOffset = 1 << 3
 };
 enum ImGuiCol_
 {
@@ -384,6 +447,11 @@ enum ImGuiCol_
     ImGuiCol_ResizeGrip,
     ImGuiCol_ResizeGripHovered,
     ImGuiCol_ResizeGripActive,
+    ImGuiCol_Tab,
+    ImGuiCol_TabHovered,
+    ImGuiCol_TabActive,
+    ImGuiCol_TabUnfocused,
+    ImGuiCol_TabUnfocusedActive,
     ImGuiCol_PlotLines,
     ImGuiCol_PlotLinesHovered,
     ImGuiCol_PlotHistogram,
@@ -418,7 +486,9 @@ enum ImGuiStyleVar_
     ImGuiStyleVar_ScrollbarRounding,
     ImGuiStyleVar_GrabMinSize,
     ImGuiStyleVar_GrabRounding,
+    ImGuiStyleVar_TabRounding,
     ImGuiStyleVar_ButtonTextAlign,
+    ImGuiStyleVar_SelectableTextAlign,
     ImGuiStyleVar_COUNT
 };
 enum ImGuiColorEditFlags_
@@ -437,17 +507,20 @@ enum ImGuiColorEditFlags_
     ImGuiColorEditFlags_AlphaPreview = 1 << 17,
     ImGuiColorEditFlags_AlphaPreviewHalf= 1 << 18,
     ImGuiColorEditFlags_HDR = 1 << 19,
-    ImGuiColorEditFlags_RGB = 1 << 20,
-    ImGuiColorEditFlags_HSV = 1 << 21,
-    ImGuiColorEditFlags_HEX = 1 << 22,
+    ImGuiColorEditFlags_DisplayRGB = 1 << 20,
+    ImGuiColorEditFlags_DisplayHSV = 1 << 21,
+    ImGuiColorEditFlags_DisplayHex = 1 << 22,
     ImGuiColorEditFlags_Uint8 = 1 << 23,
     ImGuiColorEditFlags_Float = 1 << 24,
     ImGuiColorEditFlags_PickerHueBar = 1 << 25,
     ImGuiColorEditFlags_PickerHueWheel = 1 << 26,
-    ImGuiColorEditFlags__InputsMask = ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_HSV|ImGuiColorEditFlags_HEX,
+    ImGuiColorEditFlags_InputRGB = 1 << 27,
+    ImGuiColorEditFlags_InputHSV = 1 << 28,
+    ImGuiColorEditFlags__OptionsDefault = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_PickerHueBar,
+    ImGuiColorEditFlags__DisplayMask = ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_DisplayHSV|ImGuiColorEditFlags_DisplayHex,
     ImGuiColorEditFlags__DataTypeMask = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_Float,
     ImGuiColorEditFlags__PickerMask = ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar,
-    ImGuiColorEditFlags__OptionsDefault = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_PickerHueBar
+    ImGuiColorEditFlags__InputMask = ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_InputHSV
 };
 enum ImGuiMouseCursor_
 {
@@ -477,6 +550,7 @@ struct ImGuiStyle
     float WindowBorderSize;
     ImVec2 WindowMinSize;
     ImVec2 WindowTitleAlign;
+    ImGuiDir WindowMenuButtonPosition;
     float ChildRounding;
     float ChildBorderSize;
     float PopupRounding;
@@ -493,7 +567,11 @@ struct ImGuiStyle
     float ScrollbarRounding;
     float GrabMinSize;
     float GrabRounding;
+    float TabRounding;
+    float TabBorderSize;
+    ImGuiDir ColorButtonPosition;
     ImVec2 ButtonTextAlign;
+    ImVec2 SelectableTextAlign;
     ImVec2 DisplayWindowPadding;
     ImVec2 DisplaySafeAreaPadding;
     float MouseCursorScale;
@@ -518,19 +596,22 @@ struct ImGuiIO
     float KeyRepeatDelay;
     float KeyRepeatRate;
     void* UserData;
-    ImFontAtlas* Fonts;
+    ImFontAtlas*Fonts;
     float FontGlobalScale;
     bool FontAllowUserScaling;
     ImFont* FontDefault;
     ImVec2 DisplayFramebufferScale;
-    ImVec2 DisplayVisibleMin;
-    ImVec2 DisplayVisibleMax;
     bool MouseDrawCursor;
     bool ConfigMacOSXBehaviors;
     bool ConfigInputTextCursorBlink;
-    bool ConfigResizeWindowsFromEdges;
+    bool ConfigWindowsResizeFromEdges;
+    bool ConfigWindowsMoveFromTitleBarOnly;
+    float ConfigWindowsMemoryCompactTimer;
     const char* BackendPlatformName;
     const char* BackendRendererName;
+    void* BackendPlatformUserData;
+    void* BackendRendererUserData;
+    void* BackendLanguageUserData;
     const char* (*GetClipboardTextFn)(void* user_data);
     void (*SetClipboardTextFn)(void* user_data, const char* text);
     void* ClipboardUserData;
@@ -546,7 +627,6 @@ struct ImGuiIO
     bool KeyAlt;
     bool KeySuper;
     bool KeysDown[512];
-    ImWchar InputCharacters[16+1];
     float NavInputs[ImGuiNavInput_COUNT];
     bool WantCaptureMouse;
     bool WantCaptureKeyboard;
@@ -569,6 +649,7 @@ struct ImGuiIO
     bool MouseDoubleClicked[5];
     bool MouseReleased[5];
     bool MouseDownOwned[5];
+    bool MouseDownWasDoubleClick[5];
     float MouseDownDuration[5];
     float MouseDownDurationPrev[5];
     ImVec2 MouseDragMaxDistanceAbs[5];
@@ -577,6 +658,7 @@ struct ImGuiIO
     float KeysDownDurationPrev[512];
     float NavInputsDownDuration[ImGuiNavInput_COUNT];
     float NavInputsDownDurationPrev[ImGuiNavInput_COUNT];
+    ImVector_ImWchar InputQueueCharacters;
 };
 struct ImGuiInputTextCallbackData
 {
@@ -611,24 +693,6 @@ struct ImGuiPayload
     bool Preview;
     bool Delivery;
 };
-typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;
-typedef struct ImVector_float {int Size;int Capacity;float* Data;} ImVector_float;
-typedef struct ImVector_ImWchar {int Size;int Capacity;ImWchar* Data;} ImVector_ImWchar;
-typedef struct ImVector_ImFontConfig {int Size;int Capacity;ImFontConfig* Data;} ImVector_ImFontConfig;
-typedef struct ImVector_ImFontGlyph {int Size;int Capacity;ImFontGlyph* Data;} ImVector_ImFontGlyph;
-typedef struct ImVector_unsigned_char {int Size;int Capacity;unsigned char* Data;} ImVector_unsigned_char;
-typedef struct ImVector_Pair {int Size;int Capacity;Pair* Data;} ImVector_Pair;
-typedef struct ImVector_CustomRect {int Size;int Capacity;CustomRect* Data;} ImVector_CustomRect;
-typedef struct ImVector_ImDrawChannel {int Size;int Capacity;ImDrawChannel* Data;} ImVector_ImDrawChannel;
-typedef struct ImVector_char {int Size;int Capacity;char* Data;} ImVector_char;
-typedef struct ImVector_ImTextureID {int Size;int Capacity;ImTextureID* Data;} ImVector_ImTextureID;
-typedef struct ImVector_ImDrawVert {int Size;int Capacity;ImDrawVert* Data;} ImVector_ImDrawVert;
-typedef struct ImVector_ImDrawCmd {int Size;int Capacity;ImDrawCmd* Data;} ImVector_ImDrawCmd;
-typedef struct ImVector_ImFontPtr {int Size;int Capacity;ImFont** Data;} ImVector_ImFontPtr;
-typedef struct ImVector_TextRange {int Size;int Capacity;TextRange* Data;} ImVector_TextRange;
-typedef struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_ImVec4;
-typedef struct ImVector_ImDrawIdx {int Size;int Capacity;ImDrawIdx* Data;} ImVector_ImDrawIdx;
-typedef struct ImVector_ImVec2 {int Size;int Capacity;ImVec2* Data;} ImVector_ImVec2;
 struct ImGuiOnceUponAFrame
 {
      int RefFrame;
@@ -636,7 +700,7 @@ struct ImGuiOnceUponAFrame
 struct ImGuiTextFilter
 {
     char InputBuf[256];
-    ImVector_TextRange Filters;
+    ImVector_ImGuiTextRange Filters;
     int CountGrep;
 };
 struct ImGuiTextBuffer
@@ -645,7 +709,7 @@ struct ImGuiTextBuffer
 };
 struct ImGuiStorage
 {
-    ImVector_Pair Data;
+    ImVector_ImGuiStoragePair Data;
 };
 struct ImGuiListClipper
 {
@@ -657,12 +721,13 @@ struct ImColor
 {
     ImVec4 Value;
 };
-typedef void (*ImDrawCallback)(const ImDrawList* parent_list, const ImDrawCmd* cmd);
 struct ImDrawCmd
 {
     unsigned int ElemCount;
     ImVec4 ClipRect;
     ImTextureID TextureId;
+    unsigned int VtxOffset;
+    unsigned int IdxOffset;
     ImDrawCallback UserCallback;
     void* UserCallbackData;
 };
@@ -674,11 +739,18 @@ struct ImDrawVert
 };
 struct ImDrawChannel
 {
-    ImVector_ImDrawCmd CmdBuffer;
-    ImVector_ImDrawIdx IdxBuffer;
+    ImVector_ImDrawCmd _CmdBuffer;
+    ImVector_ImDrawIdx _IdxBuffer;
+};
+struct ImDrawListSplitter
+{
+    int _Current;
+    int _Count;
+    ImVector_ImDrawChannel _Channels;
 };
 enum ImDrawCornerFlags_
 {
+    ImDrawCornerFlags_None = 0,
     ImDrawCornerFlags_TopLeft = 1 << 0,
     ImDrawCornerFlags_TopRight = 1 << 1,
     ImDrawCornerFlags_BotLeft = 1 << 2,
@@ -693,7 +765,8 @@ enum ImDrawListFlags_
 {
     ImDrawListFlags_None = 0,
     ImDrawListFlags_AntiAliasedLines = 1 << 0,
-    ImDrawListFlags_AntiAliasedFill = 1 << 1
+    ImDrawListFlags_AntiAliasedFill = 1 << 1,
+    ImDrawListFlags_AllowVtxOffset = 1 << 2
 };
 struct ImDrawList
 {
@@ -703,15 +776,14 @@ 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;
-    int _ChannelsCurrent;
-    int _ChannelsCount;
-    ImVector_ImDrawChannel _Channels;
+    ImDrawListSplitter _Splitter;
 };
 struct ImDrawData
 {
@@ -722,6 +794,7 @@ struct ImDrawData
     int TotalVtxCount;
     ImVec2 DisplayPos;
     ImVec2 DisplaySize;
+    ImVec2 FramebufferScale;
 };
 struct ImFontConfig
 {
@@ -741,6 +814,7 @@ struct ImFontConfig
     bool MergeMode;
     unsigned int RasterizerFlags;
     float RasterizerMultiply;
+    ImWchar EllipsisChar;
     char Name[40];
     ImFont* DstFont;
 };
@@ -751,6 +825,19 @@ struct ImFontGlyph
     float X0, Y0, X1, Y1;
     float U0, V0, U1, V1;
 };
+struct ImFontGlyphRangesBuilder
+{
+    ImVector_ImU32 UsedChars;
+};
+struct ImFontAtlasCustomRect
+{
+    unsigned int ID;
+    unsigned short Width, Height;
+    unsigned short X, Y;
+    float GlyphAdvanceX;
+    ImVec2 GlyphOffset;
+    ImFont* Font;
+};
 enum ImFontAtlasFlags_
 {
     ImFontAtlasFlags_None = 0,
@@ -771,52 +858,39 @@ struct ImFontAtlas
     ImVec2 TexUvScale;
     ImVec2 TexUvWhitePixel;
     ImVector_ImFontPtr Fonts;
-    ImVector_CustomRect CustomRects;
+    ImVector_ImFontAtlasCustomRect CustomRects;
     ImVector_ImFontConfig ConfigData;
     int CustomRectIds[1];
 };
 struct ImFont
 {
-    float FontSize;
-    float Scale;
-    ImVec2 DisplayOffset;
-    ImVector_ImFontGlyph Glyphs;
     ImVector_float IndexAdvanceX;
-    ImVector_ImWchar IndexLookup;
-    const ImFontGlyph* FallbackGlyph;
     float FallbackAdvanceX;
-    ImWchar FallbackChar;
-    short ConfigDataCount;
-    ImFontConfig* ConfigData;
+    float FontSize;
+    ImVector_ImWchar IndexLookup;
+    ImVector_ImFontGlyph Glyphs;
+    const ImFontGlyph* FallbackGlyph;
+    ImVec2 DisplayOffset;
     ImFontAtlas* ContainerAtlas;
+    const ImFontConfig* ConfigData;
+    short ConfigDataCount;
+    ImWchar FallbackChar;
+    ImWchar EllipsisChar;
+    float Scale;
     float Ascent, Descent;
-    bool DirtyLookupTables;
     int MetricsTotalSurface;
+    bool DirtyLookupTables;
 };
-    struct GlyphRangesBuilder
-    {
-        ImVector_unsigned_char UsedChars;
-    };
-    struct CustomRect
-    {
-        unsigned int ID;
-        unsigned short Width, Height;
-        unsigned short X, Y;
-        float GlyphAdvanceX;
-        ImVec2 GlyphOffset;
-        ImFont* Font;
-    };
-    struct TextRange
+    struct ImGuiTextRange
     {
         const char* b;
         const char* e;
-    };
-    struct Pair
+};
+    struct ImGuiStoragePair
     {
         ImGuiID key;
         union { int val_i; float val_f; void* val_p; };
-    };
-
+};
 #else
 struct GLFWwindow;
 struct SDL_Window;
@@ -846,12 +920,25 @@ inline ImColor_Simple ImColorToSimple(ImColor col)
 #endif // CIMGUI_DEFINE_ENUMS_AND_STRUCTS
 
 #ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-typedef ImFontAtlas::GlyphRangesBuilder GlyphRangesBuilder;
-typedef ImFontAtlas::CustomRect CustomRect;
-typedef ImGuiTextFilter::TextRange TextRange;
-typedef ImGuiStorage::Pair Pair;
-typedef ImVector<TextRange> ImVector_TextRange;
+typedef ImGuiStorage::ImGuiStoragePair ImGuiStoragePair;
+typedef ImGuiTextFilter::ImGuiTextRange ImGuiTextRange;
+typedef ImVector<float> ImVector_float;
 typedef ImVector<ImWchar> ImVector_ImWchar;
+typedef ImVector<ImDrawVert> ImVector_ImDrawVert;
+typedef ImVector<ImFontGlyph> ImVector_ImFontGlyph;
+typedef ImVector<ImGuiTextRange> ImVector_ImGuiTextRange;
+typedef ImVector<ImGuiStoragePair> ImVector_ImGuiStoragePair;
+typedef ImVector<ImDrawChannel> ImVector_ImDrawChannel;
+typedef ImVector<char> ImVector_char;
+typedef ImVector<ImU32> ImVector_ImU32;
+typedef ImVector<ImFontAtlasCustomRect> ImVector_ImFontAtlasCustomRect;
+typedef ImVector<ImTextureID> ImVector_ImTextureID;
+typedef ImVector<ImFontConfig> ImVector_ImFontConfig;
+typedef ImVector<ImFont*> ImVector_ImFontPtr;
+typedef ImVector<ImDrawCmd> ImVector_ImDrawCmd;
+typedef ImVector<ImVec4> ImVector_ImVec4;
+typedef ImVector<ImDrawIdx> ImVector_ImDrawIdx;
+typedef ImVector<ImVec2> ImVector_ImVec2;
 #endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS
 CIMGUI_API ImVec2* ImVec2_ImVec2(void);
 CIMGUI_API void ImVec2_destroy(ImVec2* self);
@@ -863,7 +950,7 @@ CIMGUI_API ImGuiContext* igCreateContext(ImFontAtlas* shared_font_atlas);
 CIMGUI_API void igDestroyContext(ImGuiContext* ctx);
 CIMGUI_API ImGuiContext* igGetCurrentContext(void);
 CIMGUI_API void igSetCurrentContext(ImGuiContext* ctx);
-CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t sz_io,size_t sz_style,size_t sz_vec2,size_t sz_vec4,size_t sz_drawvert);
+CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t sz_io,size_t sz_style,size_t sz_vec2,size_t sz_vec4,size_t sz_drawvert,size_t sz_drawidx);
 CIMGUI_API ImGuiIO* igGetIO(void);
 CIMGUI_API ImGuiStyle* igGetStyle(void);
 CIMGUI_API void igNewFrame(void);
@@ -895,12 +982,6 @@ CIMGUI_API ImVec2 igGetWindowPos(void);
 CIMGUI_API ImVec2 igGetWindowSize(void);
 CIMGUI_API float igGetWindowWidth(void);
 CIMGUI_API float igGetWindowHeight(void);
-CIMGUI_API ImVec2 igGetContentRegionMax(void);
-CIMGUI_API ImVec2 igGetContentRegionAvail(void);
-CIMGUI_API float igGetContentRegionAvailWidth(void);
-CIMGUI_API ImVec2 igGetWindowContentRegionMin(void);
-CIMGUI_API ImVec2 igGetWindowContentRegionMax(void);
-CIMGUI_API float igGetWindowContentRegionWidth(void);
 CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot);
 CIMGUI_API void igSetNextWindowSize(const ImVec2 size,ImGuiCond cond);
 CIMGUI_API void igSetNextWindowSizeConstraints(const ImVec2 size_min,const ImVec2 size_max,ImGuiSizeCallback custom_callback,void* custom_callback_data);
@@ -917,14 +998,21 @@ CIMGUI_API void igSetWindowPosStr(const char* name,const ImVec2 pos,ImGuiCond co
 CIMGUI_API void igSetWindowSizeStr(const char* name,const ImVec2 size,ImGuiCond cond);
 CIMGUI_API void igSetWindowCollapsedStr(const char* name,bool collapsed,ImGuiCond cond);
 CIMGUI_API void igSetWindowFocusStr(const char* name);
+CIMGUI_API ImVec2 igGetContentRegionMax(void);
+CIMGUI_API ImVec2 igGetContentRegionAvail(void);
+CIMGUI_API ImVec2 igGetWindowContentRegionMin(void);
+CIMGUI_API ImVec2 igGetWindowContentRegionMax(void);
+CIMGUI_API float igGetWindowContentRegionWidth(void);
 CIMGUI_API float igGetScrollX(void);
 CIMGUI_API float igGetScrollY(void);
 CIMGUI_API float igGetScrollMaxX(void);
 CIMGUI_API float igGetScrollMaxY(void);
 CIMGUI_API void igSetScrollX(float scroll_x);
 CIMGUI_API void igSetScrollY(float scroll_y);
+CIMGUI_API void igSetScrollHereX(float center_x_ratio);
 CIMGUI_API void igSetScrollHereY(float center_y_ratio);
-CIMGUI_API void igSetScrollFromPosY(float pos_y,float center_y_ratio);
+CIMGUI_API void igSetScrollFromPosX(float local_x,float center_x_ratio);
+CIMGUI_API void igSetScrollFromPosY(float local_y,float center_y_ratio);
 CIMGUI_API void igPushFont(ImFont* font);
 CIMGUI_API void igPopFont(void);
 CIMGUI_API void igPushStyleColorU32(ImGuiCol idx,ImU32 col);
@@ -942,15 +1030,16 @@ CIMGUI_API ImU32 igGetColorU32Vec4(const ImVec4 col);
 CIMGUI_API ImU32 igGetColorU32U32(ImU32 col);
 CIMGUI_API void igPushItemWidth(float item_width);
 CIMGUI_API void igPopItemWidth(void);
+CIMGUI_API void igSetNextItemWidth(float item_width);
 CIMGUI_API float igCalcItemWidth(void);
-CIMGUI_API void igPushTextWrapPos(float wrap_pos_x);
+CIMGUI_API void igPushTextWrapPos(float wrap_local_pos_x);
 CIMGUI_API void igPopTextWrapPos(void);
 CIMGUI_API void igPushAllowKeyboardFocus(bool allow_keyboard_focus);
 CIMGUI_API void igPopAllowKeyboardFocus(void);
 CIMGUI_API void igPushButtonRepeat(bool repeat);
 CIMGUI_API void igPopButtonRepeat(void);
 CIMGUI_API void igSeparator(void);
-CIMGUI_API void igSameLine(float pos_x,float spacing_w);
+CIMGUI_API void igSameLine(float offset_from_start_x,float spacing);
 CIMGUI_API void igNewLine(void);
 CIMGUI_API void igSpacing(void);
 CIMGUI_API void igDummy(const ImVec2 size);
@@ -962,11 +1051,11 @@ CIMGUI_API ImVec2 igGetCursorPos(void);
 CIMGUI_API float igGetCursorPosX(void);
 CIMGUI_API float igGetCursorPosY(void);
 CIMGUI_API void igSetCursorPos(const ImVec2 local_pos);
-CIMGUI_API void igSetCursorPosX(float x);
-CIMGUI_API void igSetCursorPosY(float y);
+CIMGUI_API void igSetCursorPosX(float local_x);
+CIMGUI_API void igSetCursorPosY(float local_y);
 CIMGUI_API ImVec2 igGetCursorStartPos(void);
 CIMGUI_API ImVec2 igGetCursorScreenPos(void);
-CIMGUI_API void igSetCursorScreenPos(const ImVec2 screen_pos);
+CIMGUI_API void igSetCursorScreenPos(const ImVec2 pos);
 CIMGUI_API void igAlignTextToFramePadding(void);
 CIMGUI_API float igGetTextLineHeight(void);
 CIMGUI_API float igGetTextLineHeightWithSpacing(void);
@@ -1038,17 +1127,18 @@ CIMGUI_API bool igVSliderInt(const char* label,const ImVec2 size,int* v,int v_mi
 CIMGUI_API bool igVSliderScalar(const char* label,const ImVec2 size,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format,float power);
 CIMGUI_API bool igInputText(const char* label,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data);
 CIMGUI_API bool igInputTextMultiline(const char* label,char* buf,size_t buf_size,const ImVec2 size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data);
-CIMGUI_API bool igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputFloat2(const char* label,float v[2],const char* format,ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputFloat3(const char* label,float v[3],const char* format,ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputFloat4(const char* label,float v[4],const char* format,ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputInt(const char* label,int* v,int step,int step_fast,ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputScalarN(const char* label,ImGuiDataType data_type,void* v,int components,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags extra_flags);
+CIMGUI_API bool igInputTextWithHint(const char* label,const char* hint,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data);
+CIMGUI_API bool igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputFloat2(const char* label,float v[2],const char* format,ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputFloat3(const char* label,float v[3],const char* format,ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputFloat4(const char* label,float v[4],const char* format,ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputInt(const char* label,int* v,int step,int step_fast,ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputScalarN(const char* label,ImGuiDataType data_type,void* v,int components,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags flags);
 CIMGUI_API bool igColorEdit3(const char* label,float col[3],ImGuiColorEditFlags flags);
 CIMGUI_API bool igColorEdit4(const char* label,float col[4],ImGuiColorEditFlags flags);
 CIMGUI_API bool igColorPicker3(const char* label,float col[3],ImGuiColorEditFlags flags);
@@ -1068,11 +1158,10 @@ CIMGUI_API bool igTreeNodeExVPtr(const void* ptr_id,ImGuiTreeNodeFlags flags,con
 CIMGUI_API void igTreePushStr(const char* str_id);
 CIMGUI_API void igTreePushPtr(const void* ptr_id);
 CIMGUI_API void igTreePop(void);
-CIMGUI_API void igTreeAdvanceToLabelPos(void);
 CIMGUI_API float igGetTreeNodeToLabelSpacing(void);
-CIMGUI_API void igSetNextTreeNodeOpen(bool is_open,ImGuiCond cond);
 CIMGUI_API bool igCollapsingHeader(const char* label,ImGuiTreeNodeFlags flags);
 CIMGUI_API bool igCollapsingHeaderBoolPtr(const char* label,bool* p_open,ImGuiTreeNodeFlags flags);
+CIMGUI_API void igSetNextItemOpen(bool is_open,ImGuiCond cond);
 CIMGUI_API bool igSelectable(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);
@@ -1118,13 +1207,18 @@ CIMGUI_API void igSetColumnWidth(int column_index,float width);
 CIMGUI_API float igGetColumnOffset(int column_index);
 CIMGUI_API void igSetColumnOffset(int column_index,float offset_x);
 CIMGUI_API int igGetColumnsCount(void);
-CIMGUI_API void igLogToTTY(int max_depth);
-CIMGUI_API void igLogToFile(int max_depth,const char* filename);
-CIMGUI_API void igLogToClipboard(int max_depth);
+CIMGUI_API bool igBeginTabBar(const char* str_id,ImGuiTabBarFlags flags);
+CIMGUI_API void igEndTabBar(void);
+CIMGUI_API bool igBeginTabItem(const char* label,bool* p_open,ImGuiTabItemFlags flags);
+CIMGUI_API void igEndTabItem(void);
+CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label);
+CIMGUI_API void igLogToTTY(int auto_open_depth);
+CIMGUI_API void igLogToFile(int auto_open_depth,const char* filename);
+CIMGUI_API void igLogToClipboard(int auto_open_depth);
 CIMGUI_API void igLogFinish(void);
 CIMGUI_API void igLogButtons(void);
 CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags);
-CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t size,ImGuiCond cond);
+CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t sz,ImGuiCond cond);
 CIMGUI_API void igEndDragDropSource(void);
 CIMGUI_API bool igBeginDragDropTarget(void);
 CIMGUI_API const ImGuiPayload* igAcceptDragDropPayload(const char* type,ImGuiDragDropFlags flags);
@@ -1140,6 +1234,7 @@ CIMGUI_API bool igIsItemFocused(void);
 CIMGUI_API bool igIsItemClicked(int mouse_button);
 CIMGUI_API bool igIsItemVisible(void);
 CIMGUI_API bool igIsItemEdited(void);
+CIMGUI_API bool igIsItemActivated(void);
 CIMGUI_API bool igIsItemDeactivated(void);
 CIMGUI_API bool igIsItemDeactivatedAfterEdit(void);
 CIMGUI_API bool igIsAnyItemHovered(void);
@@ -1153,7 +1248,8 @@ CIMGUI_API bool igIsRectVisible(const ImVec2 size);
 CIMGUI_API bool igIsRectVisibleVec2(const ImVec2 rect_min,const ImVec2 rect_max);
 CIMGUI_API double igGetTime(void);
 CIMGUI_API int igGetFrameCount(void);
-CIMGUI_API ImDrawList* igGetOverlayDrawList(void);
+CIMGUI_API ImDrawList* igGetBackgroundDrawList(void);
+CIMGUI_API ImDrawList* igGetForegroundDrawList(void);
 CIMGUI_API ImDrawListSharedData* igGetDrawListSharedData(void);
 CIMGUI_API const char* igGetStyleColorName(ImGuiCol idx);
 CIMGUI_API void igSetStateStorage(ImGuiStorage* storage);
@@ -1183,8 +1279,8 @@ CIMGUI_API ImVec2 igGetMouseDragDelta(int button,float lock_threshold);
 CIMGUI_API void igResetMouseDragDelta(int button);
 CIMGUI_API ImGuiMouseCursor igGetMouseCursor(void);
 CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor type);
-CIMGUI_API void igCaptureKeyboardFromApp(bool capture);
-CIMGUI_API void igCaptureMouseFromApp(bool capture);
+CIMGUI_API void igCaptureKeyboardFromApp(bool want_capture_keyboard_value);
+CIMGUI_API void igCaptureMouseFromApp(bool want_capture_mouse_value);
 CIMGUI_API const char* igGetClipboardText(void);
 CIMGUI_API void igSetClipboardText(const char* text);
 CIMGUI_API void igLoadIniSettingsFromDisk(const char* ini_filename);
@@ -1197,8 +1293,8 @@ CIMGUI_API void igMemFree(void* ptr);
 CIMGUI_API ImGuiStyle* ImGuiStyle_ImGuiStyle(void);
 CIMGUI_API void ImGuiStyle_destroy(ImGuiStyle* self);
 CIMGUI_API void ImGuiStyle_ScaleAllSizes(ImGuiStyle* self,float scale_factor);
-CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,ImWchar c);
-CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(ImGuiIO* self,const char* utf8_chars);
+CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,unsigned int c);
+CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(ImGuiIO* self,const char* str);
 CIMGUI_API void ImGuiIO_ClearInputCharacters(ImGuiIO* self);
 CIMGUI_API ImGuiIO* ImGuiIO_ImGuiIO(void);
 CIMGUI_API void ImGuiIO_destroy(ImGuiIO* self);
@@ -1222,13 +1318,11 @@ CIMGUI_API bool ImGuiTextFilter_PassFilter(ImGuiTextFilter* self,const char* tex
 CIMGUI_API void ImGuiTextFilter_Build(ImGuiTextFilter* self);
 CIMGUI_API void ImGuiTextFilter_Clear(ImGuiTextFilter* self);
 CIMGUI_API bool ImGuiTextFilter_IsActive(ImGuiTextFilter* self);
-CIMGUI_API TextRange* TextRange_TextRange(void);
-CIMGUI_API void TextRange_destroy(TextRange* self);
-CIMGUI_API TextRange* TextRange_TextRangeStr(const char* _b,const char* _e);
-CIMGUI_API const char* TextRange_begin(TextRange* self);
-CIMGUI_API const char* TextRange_end(TextRange* self);
-CIMGUI_API bool TextRange_empty(TextRange* self);
-CIMGUI_API void TextRange_split(TextRange* self,char separator,ImVector_TextRange* out);
+CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRange(void);
+CIMGUI_API void ImGuiTextRange_destroy(ImGuiTextRange* self);
+CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRangeStr(const char* _b,const char* _e);
+CIMGUI_API bool ImGuiTextRange_empty(ImGuiTextRange* self);
+CIMGUI_API void ImGuiTextRange_split(ImGuiTextRange* self,char separator,ImVector_ImGuiTextRange* out);
 CIMGUI_API ImGuiTextBuffer* ImGuiTextBuffer_ImGuiTextBuffer(void);
 CIMGUI_API void ImGuiTextBuffer_destroy(ImGuiTextBuffer* self);
 CIMGUI_API const char* ImGuiTextBuffer_begin(ImGuiTextBuffer* self);
@@ -1238,11 +1332,12 @@ CIMGUI_API bool ImGuiTextBuffer_empty(ImGuiTextBuffer* self);
 CIMGUI_API void ImGuiTextBuffer_clear(ImGuiTextBuffer* self);
 CIMGUI_API void ImGuiTextBuffer_reserve(ImGuiTextBuffer* self,int capacity);
 CIMGUI_API const char* ImGuiTextBuffer_c_str(ImGuiTextBuffer* self);
+CIMGUI_API void ImGuiTextBuffer_append(ImGuiTextBuffer* self,const char* str,const char* str_end);
 CIMGUI_API void ImGuiTextBuffer_appendfv(ImGuiTextBuffer* self,const char* fmt,va_list args);
-CIMGUI_API Pair* Pair_PairInt(ImGuiID _key,int _val_i);
-CIMGUI_API void Pair_destroy(Pair* self);
-CIMGUI_API Pair* Pair_PairFloat(ImGuiID _key,float _val_f);
-CIMGUI_API Pair* Pair_PairPtr(ImGuiID _key,void* _val_p);
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairInt(ImGuiID _key,int _val_i);
+CIMGUI_API void ImGuiStoragePair_destroy(ImGuiStoragePair* self);
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairFloat(ImGuiID _key,float _val_f);
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairPtr(ImGuiID _key,void* _val_p);
 CIMGUI_API void ImGuiStorage_Clear(ImGuiStorage* self);
 CIMGUI_API int ImGuiStorage_GetInt(ImGuiStorage* self,ImGuiID key,int default_val);
 CIMGUI_API void ImGuiStorage_SetInt(ImGuiStorage* self,ImGuiID key,int val);
@@ -1273,6 +1368,13 @@ CIMGUI_API void ImColor_SetHSV(ImColor* self,float h,float s,float v,float a);
 CIMGUI_API ImColor ImColor_HSV(ImColor* self,float h,float s,float v,float a);
 CIMGUI_API ImDrawCmd* ImDrawCmd_ImDrawCmd(void);
 CIMGUI_API void ImDrawCmd_destroy(ImDrawCmd* self);
+CIMGUI_API ImDrawListSplitter* ImDrawListSplitter_ImDrawListSplitter(void);
+CIMGUI_API void ImDrawListSplitter_destroy(ImDrawListSplitter* self);
+CIMGUI_API void ImDrawListSplitter_Clear(ImDrawListSplitter* self);
+CIMGUI_API void ImDrawListSplitter_ClearFreeMemory(ImDrawListSplitter* self);
+CIMGUI_API void ImDrawListSplitter_Split(ImDrawListSplitter* self,ImDrawList* draw_list,int count);
+CIMGUI_API void ImDrawListSplitter_Merge(ImDrawListSplitter* self,ImDrawList* draw_list);
+CIMGUI_API void ImDrawListSplitter_SetCurrentChannel(ImDrawListSplitter* self,ImDrawList* draw_list,int channel_idx);
 CIMGUI_API ImDrawList* ImDrawList_ImDrawList(const ImDrawListSharedData* shared_data);
 CIMGUI_API void ImDrawList_destroy(ImDrawList* self);
 CIMGUI_API void ImDrawList_PushClipRect(ImDrawList* self,ImVec2 clip_rect_min,ImVec2 clip_rect_max,bool intersect_with_current_clip_rect);
@@ -1282,39 +1384,39 @@ CIMGUI_API void ImDrawList_PushTextureID(ImDrawList* self,ImTextureID texture_id
 CIMGUI_API void ImDrawList_PopTextureID(ImDrawList* self);
 CIMGUI_API ImVec2 ImDrawList_GetClipRectMin(ImDrawList* self);
 CIMGUI_API ImVec2 ImDrawList_GetClipRectMax(ImDrawList* self);
-CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float thickness);
-CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float rounding,int rounding_corners_flags,float thickness);
-CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float rounding,int rounding_corners_flags);
-CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left);
-CIMGUI_API void ImDrawList_AddQuad(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,ImU32 col,float thickness);
-CIMGUI_API void ImDrawList_AddQuadFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,ImU32 col);
-CIMGUI_API void ImDrawList_AddTriangle(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,ImU32 col,float thickness);
-CIMGUI_API void ImDrawList_AddTriangleFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,ImU32 col);
-CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 centre,float radius,ImU32 col,int num_segments,float thickness);
-CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 centre,float radius,ImU32 col,int num_segments);
+CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,ImU32 col,float thickness);
+CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners,float thickness);
+CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners);
+CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left);
+CIMGUI_API void ImDrawList_AddQuad(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness);
+CIMGUI_API void ImDrawList_AddQuadFilled(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col);
+CIMGUI_API void ImDrawList_AddTriangle(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col,float thickness);
+CIMGUI_API void ImDrawList_AddTriangleFilled(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col);
+CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments,float thickness);
+CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments);
 CIMGUI_API void ImDrawList_AddText(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end);
 CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect);
-CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col);
-CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,const ImVec2 uv_a,const ImVec2 uv_b,const ImVec2 uv_c,const ImVec2 uv_d,ImU32 col);
-CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col,float rounding,int rounding_corners);
-CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col,bool closed,float thickness);
-CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col);
+CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness);
+CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col);
 CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 pos0,const ImVec2 cp0,const ImVec2 cp1,const ImVec2 pos1,ImU32 col,float thickness,int num_segments);
+CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col);
+CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,const ImVec2 uv1,const ImVec2 uv2,const ImVec2 uv3,const ImVec2 uv4,ImU32 col);
+CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners);
 CIMGUI_API void ImDrawList_PathClear(ImDrawList* self);
 CIMGUI_API void ImDrawList_PathLineTo(ImDrawList* self,const ImVec2 pos);
 CIMGUI_API void ImDrawList_PathLineToMergeDuplicate(ImDrawList* self,const ImVec2 pos);
 CIMGUI_API void ImDrawList_PathFillConvex(ImDrawList* self,ImU32 col);
 CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,bool closed,float thickness);
-CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 centre,float radius,float a_min,float a_max,int num_segments);
-CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 centre,float radius,int a_min_of_12,int a_max_of_12);
+CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments);
+CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 center,float radius,int a_min_of_12,int a_max_of_12);
 CIMGUI_API void ImDrawList_PathBezierCurveTo(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,int num_segments);
-CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,int rounding_corners_flags);
-CIMGUI_API void ImDrawList_ChannelsSplit(ImDrawList* self,int channels_count);
-CIMGUI_API void ImDrawList_ChannelsMerge(ImDrawList* self);
-CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* self,int channel_index);
+CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawCornerFlags rounding_corners);
 CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data);
 CIMGUI_API void ImDrawList_AddDrawCmd(ImDrawList* self);
 CIMGUI_API ImDrawList* ImDrawList_CloneOutput(ImDrawList* self);
+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);
@@ -1330,9 +1432,21 @@ CIMGUI_API ImDrawData* ImDrawData_ImDrawData(void);
 CIMGUI_API void ImDrawData_destroy(ImDrawData* self);
 CIMGUI_API void ImDrawData_Clear(ImDrawData* self);
 CIMGUI_API void ImDrawData_DeIndexAllBuffers(ImDrawData* self);
-CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 sc);
+CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 fb_scale);
 CIMGUI_API ImFontConfig* ImFontConfig_ImFontConfig(void);
 CIMGUI_API void ImFontConfig_destroy(ImFontConfig* self);
+CIMGUI_API ImFontGlyphRangesBuilder* ImFontGlyphRangesBuilder_ImFontGlyphRangesBuilder(void);
+CIMGUI_API void ImFontGlyphRangesBuilder_destroy(ImFontGlyphRangesBuilder* self);
+CIMGUI_API void ImFontGlyphRangesBuilder_Clear(ImFontGlyphRangesBuilder* self);
+CIMGUI_API bool ImFontGlyphRangesBuilder_GetBit(ImFontGlyphRangesBuilder* self,int n);
+CIMGUI_API void ImFontGlyphRangesBuilder_SetBit(ImFontGlyphRangesBuilder* self,int n);
+CIMGUI_API void ImFontGlyphRangesBuilder_AddChar(ImFontGlyphRangesBuilder* self,ImWchar c);
+CIMGUI_API void ImFontGlyphRangesBuilder_AddText(ImFontGlyphRangesBuilder* self,const char* text,const char* text_end);
+CIMGUI_API void ImFontGlyphRangesBuilder_AddRanges(ImFontGlyphRangesBuilder* self,const ImWchar* ranges);
+CIMGUI_API void ImFontGlyphRangesBuilder_BuildRanges(ImFontGlyphRangesBuilder* self,ImVector_ImWchar* out_ranges);
+CIMGUI_API ImFontAtlasCustomRect* ImFontAtlasCustomRect_ImFontAtlasCustomRect(void);
+CIMGUI_API void ImFontAtlasCustomRect_destroy(ImFontAtlasCustomRect* self);
+CIMGUI_API bool ImFontAtlasCustomRect_IsPacked(ImFontAtlasCustomRect* self);
 CIMGUI_API ImFontAtlas* ImFontAtlas_ImFontAtlas(void);
 CIMGUI_API void ImFontAtlas_destroy(ImFontAtlas* self);
 CIMGUI_API ImFont* ImFontAtlas_AddFont(ImFontAtlas* self,const ImFontConfig* font_cfg);
@@ -1346,9 +1460,9 @@ CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* self);
 CIMGUI_API void ImFontAtlas_ClearFonts(ImFontAtlas* self);
 CIMGUI_API void ImFontAtlas_Clear(ImFontAtlas* self);
 CIMGUI_API bool ImFontAtlas_Build(ImFontAtlas* self);
-CIMGUI_API bool ImFontAtlas_IsBuilt(ImFontAtlas* self);
 CIMGUI_API void ImFontAtlas_GetTexDataAsAlpha8(ImFontAtlas* self,unsigned char** out_pixels,int* out_width,int* out_height,int* out_bytes_per_pixel);
 CIMGUI_API void ImFontAtlas_GetTexDataAsRGBA32(ImFontAtlas* self,unsigned char** out_pixels,int* out_width,int* out_height,int* out_bytes_per_pixel);
+CIMGUI_API bool ImFontAtlas_IsBuilt(ImFontAtlas* self);
 CIMGUI_API void ImFontAtlas_SetTexID(ImFontAtlas* self,ImTextureID id);
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesDefault(ImFontAtlas* self);
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesKorean(ImFontAtlas* self);
@@ -1357,29 +1471,16 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseFull(ImFontAtlas* sel
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseSimplifiedCommon(ImFontAtlas* self);
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesCyrillic(ImFontAtlas* self);
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self);
-CIMGUI_API GlyphRangesBuilder* GlyphRangesBuilder_GlyphRangesBuilder(void);
-CIMGUI_API void GlyphRangesBuilder_destroy(GlyphRangesBuilder* self);
-CIMGUI_API bool GlyphRangesBuilder_GetBit(GlyphRangesBuilder* self,int n);
-CIMGUI_API void GlyphRangesBuilder_SetBit(GlyphRangesBuilder* self,int n);
-CIMGUI_API void GlyphRangesBuilder_AddChar(GlyphRangesBuilder* self,ImWchar c);
-CIMGUI_API void GlyphRangesBuilder_AddText(GlyphRangesBuilder* self,const char* text,const char* text_end);
-CIMGUI_API void GlyphRangesBuilder_AddRanges(GlyphRangesBuilder* self,const ImWchar* ranges);
-CIMGUI_API void GlyphRangesBuilder_BuildRanges(GlyphRangesBuilder* self,ImVector_ImWchar* out_ranges);
-CIMGUI_API CustomRect* CustomRect_CustomRect(void);
-CIMGUI_API void CustomRect_destroy(CustomRect* self);
-CIMGUI_API bool CustomRect_IsPacked(CustomRect* 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_AddCustomRectFontGlyph(ImFontAtlas* self,ImFont* font,ImWchar id,int width,int height,float advance_x,const ImVec2 offset);
-CIMGUI_API const CustomRect* ImFontAtlas_GetCustomRectByIndex(ImFontAtlas* self,int index);
-CIMGUI_API void ImFontAtlas_CalcCustomRectUV(ImFontAtlas* self,const CustomRect* rect,ImVec2* out_uv_min,ImVec2* out_uv_max);
+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);
 CIMGUI_API bool ImFontAtlas_GetMouseCursorTexData(ImFontAtlas* self,ImGuiMouseCursor cursor,ImVec2* out_offset,ImVec2* out_size,ImVec2 out_uv_border[2],ImVec2 out_uv_fill[2]);
 CIMGUI_API ImFont* ImFont_ImFont(void);
 CIMGUI_API void ImFont_destroy(ImFont* self);
-CIMGUI_API void ImFont_ClearOutputData(ImFont* self);
-CIMGUI_API void ImFont_BuildLookupTable(ImFont* self);
 CIMGUI_API const ImFontGlyph* ImFont_FindGlyph(ImFont* self,ImWchar c);
 CIMGUI_API const ImFontGlyph* ImFont_FindGlyphNoFallback(ImFont* self,ImWchar c);
-CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c);
 CIMGUI_API float ImFont_GetCharAdvance(ImFont* self,ImWchar c);
 CIMGUI_API bool ImFont_IsLoaded(ImFont* self);
 CIMGUI_API const char* ImFont_GetDebugName(ImFont* self);
@@ -1387,9 +1488,12 @@ CIMGUI_API ImVec2 ImFont_CalcTextSizeA(ImFont* self,float size,float max_width,f
 CIMGUI_API const char* ImFont_CalcWordWrapPositionA(ImFont* self,float scale,const char* text,const char* text_end,float wrap_width);
 CIMGUI_API void ImFont_RenderChar(ImFont* self,ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,ImWchar c);
 CIMGUI_API void ImFont_RenderText(ImFont* self,ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,const ImVec4 clip_rect,const char* text_begin,const char* text_end,float wrap_width,bool cpu_fine_clip);
+CIMGUI_API void ImFont_BuildLookupTable(ImFont* self);
+CIMGUI_API void ImFont_ClearOutputData(ImFont* self);
 CIMGUI_API void ImFont_GrowIndex(ImFont* self,int new_size);
 CIMGUI_API void ImFont_AddGlyph(ImFont* self,ImWchar c,float x0,float y0,float x1,float y1,float u0,float v0,float u1,float v1,float advance_x);
 CIMGUI_API void ImFont_AddRemapChar(ImFont* self,ImWchar dst,ImWchar src,bool overwrite_dst);
+CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c);
 CIMGUI_API void igGetWindowPos_nonUDT(ImVec2 *pOut);
 CIMGUI_API ImVec2_Simple igGetWindowPos_nonUDT2(void);
 CIMGUI_API void igGetWindowSize_nonUDT(ImVec2 *pOut);
@@ -1448,7 +1552,6 @@ CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,floa
 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();
-CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* p);
 CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p);
 CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p);
 #endif //CIMGUI_INCLUDED

generator/cimgui_template.cpp

@@ -43,10 +43,7 @@ CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
 {
 	return IM_NEW(ImVector<ImWchar>) ();
 }
-CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* p)
-{
-	IM_DELETE(p);
-}
+
 CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p)
 {
 	IM_PLACEMENT_NEW(p) ImVector<ImWchar>();

generator/cimgui_template.h

@@ -83,7 +83,6 @@ CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,floa
 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();
-CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* p);
 CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p);
 CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p);
 #endif //CIMGUI_INCLUDED

generator/cpp2ffi.lua

@@ -1,5 +1,80 @@
 local M = {}
 
+local function ToStr(t,dometatables)
+	local function basicToStr (o)
+		if type(o) == "number" or type(o)=="boolean" then
+			return tostring(o)
+		elseif type(o) == "string" then
+			return string.format("%q", o)
+		else
+			return tostring(o) --"nil"
+		end
+	end
+	local strTG = {}
+	--local basicToStr= basicSerialize --tostring
+	if type(t) ~="table" then  return basicToStr(t) end
+	local recG = 0
+	local nameG="SELF"..recG
+	local ancest ={}
+	local function _ToStr(t,strT,rec,name)
+		if ancest[t] then
+			strT[#strT + 1]=ancest[t]
+			return
+		end
+		rec = rec + 1
+		ancest[t]=name
+		strT[#strT + 1]='{'
+		local count=0
+		-------------
+		--if t.name then strT[#strT + 1]=string.rep("\t",rec).."name:"..tostring(t.name) end
+		----------------
+		for k,v in pairs(t) do
+			count=count+1
+			strT[#strT + 1]="\n"
+			local kstr
+			if type(k) == "table" then
+				local name2=string.format("%s.KEY%d",name,count)
+				strT[#strT + 1]=string.rep("\t",rec).."["
+				local strTK = {}
+				_ToStr(k,strTK,rec,name2)
+				kstr=table.concat(strTK)
+				strT[#strT + 1]=kstr.."]="
+			else
+				kstr = basicToStr(k)
+				strT[#strT + 1]=string.rep("\t",rec).."["..kstr.."]="
+			end
+			
+			if type(v) == "table" then
+					local name2=string.format("%s[%s]",name,kstr)
+					_ToStr(v,strT,rec,name2)
+			else
+				strT[#strT + 1]=basicToStr(v)
+			end
+		end
+		if dometatables then
+			local mt = getmetatable(t)
+			if mt then
+				local namemt = string.format("%s.METATABLE",name)
+				local strMT = {}
+				_ToStr(mt,strMT,rec,namemt)
+				local metastr=table.concat(strMT)
+				strT[#strT + 1] = "\n"..string.rep("\t",rec).."[METATABLE]="..metastr
+			end
+		end
+		strT[#strT + 1]='}'
+		rec = rec - 1
+		return
+	end
+	_ToStr(t,strTG,recG,nameG)
+	return table.concat(strTG)
+end
+function M.prtable(...)
+	for i=1, select('#', ...) do
+		local t = select(i, ...)
+		print(ToStr(t))
+		print("\n")
+	end
+end
 local function str_split(str, pat)
 	local t = {} 
 	local fpat = "(.-)" .. pat
@@ -173,7 +248,14 @@ local function name_overloadsAlgo(v)
     local maxnum = 0
     for i,t in ipairs(v) do
         bb[i] = ""
-        local signature = t.signature:sub(2,-2) -- without parenthesis
+        --local signature = t.signature:sub(2,-2) -- without parenthesis
+		--inside parenthesis
+		local signature = t.signature:match("%b()")
+		signature = signature:sub(2,-2)
+		--add const function
+		if t.signature:match("const$") then
+			signature = signature .. ",_const"
+		end
         aa[i] = {}
         local num = 1
         --for typec in t.signature:gmatch(".-([^,%(%s]+)[,%)]") do
@@ -261,8 +343,10 @@ local function parseFunction(self,stname,lineorig,namespace)
 	if line:match("template") then return end
     
     local ret = line:match("([^%(%)]+[%*%s])%s?~?[_%w]+%b()")
-    local funcname, args = line:match("(~?[_%w]+)%s*(%b())")
-	
+    --local funcname, args = line:match("(~?[_%w]+)%s*(%b())")
+	local funcname, args, extraconst = line:match("(~?[_%w]+)%s*(%b())(.*)")
+	extraconst = extraconst:match("const")
+
 	if not args then
 	print"not gettint args in"
 	print(line,lineorig)
@@ -282,16 +366,21 @@ local function parseFunction(self,stname,lineorig,namespace)
 
 	--for _,ttype in ipairs(self.templatedTypes) do
     --local template = argscsinpars:match(ttype.."%s*<(.+)>")
+	--TODO several diferent templates
 	local ttype,template = argscsinpars:match("([^%s,%(%)]+)%s*<(.+)>")
 	local te=""
 	if template then
+		if self.typenames[stname] ~= template then --rule out template typename
 		te = template:gsub("%s","_")
         te = te:gsub("%*","Ptr")
+		te = "_"..te
+
 		self.templates[ttype] = self.templates[ttype] or {}
 		self.templates[ttype][template] = te
+		end
 	end
 	--end
-    argscsinpars = argscsinpars:gsub("<([%w_%*]+)>","_"..te) --ImVector
+    argscsinpars = argscsinpars:gsub("<([%w_%*]+)>",te) --ImVector
     
     local argsArr = {}
     local functype_re =       "^%s*[%w%s%*]+%(%*[%w_]+%)%([^%(%)]*%)"
@@ -354,6 +443,7 @@ local function parseFunction(self,stname,lineorig,namespace)
     signature = signature:gsub(",%s*",",")--space after ,
     signature = signature:gsub("([%w_]+)%s[%w_]+(%[%d*%])","%1%2") -- float[2]
     signature = signature:gsub("(%(%*)[%w_]+(%)%([^%(%)]*%))","%1%2") --func defs
+	signature = signature .. (extraconst or "")
     
     local call_args = argscsinpars:gsub("([%w_]+%s[%w_]+)%[%d*%]","%1") --float[2]
     call_args = call_args:gsub("%(%*([%w_]+)%)%([^%(%)]*%)"," %1") --func type
@@ -368,7 +458,7 @@ local function parseFunction(self,stname,lineorig,namespace)
     end
     
     local cimguiname = self.getCname(stname,funcname)
-    table.insert(self.funcdefs,{stname=stname,funcname=funcname,args=args,argsc=argscsinpars,signature=signature,cimguiname=cimguiname,call_args=call_args,ret =ret,comment=comment})
+    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 {}
                 table.insert(defsT[cimguiname],{})
@@ -376,9 +466,10 @@ local function parseFunction(self,stname,lineorig,namespace)
     defT.defaults = {}
     --for k,def in args:gmatch("([%w%s%*_]+)=([%w_%(%)%s,%*]+)[,%)]") do
     --for k,def in args:gmatch("([%w_]+)=([%w_%(%)%s,%*%.%-]+)[,%)]") do
-    for k,def in args:gmatch('([%w_]+)=([%w_%(%)%s,%*%.%-%+%%"]+)[,%)]') do
+    for k,def in args:gmatch('([%w_]+)=([|<%w_%(%)%s,%*%.%-%+%%"]+)[,%)]') do
         defT.defaults[k]=def
     end
+	defT.templated = self.typenames[stname] and true
 	defT.namespace = namespace
     defT.cimguiname = cimguiname
     defT.stname = stname
@@ -389,7 +480,7 @@ local function parseFunction(self,stname,lineorig,namespace)
     defT.call_args = call_args
     defT.isvararg = signature:match("%.%.%.%)$")
     defT.location = locat
-    defT.comment = "" --comment
+    --defT.comment = "" --comment
     defT.argsT = argsArr
     if self.get_manuals(defT) then
         defT.manual = true
@@ -462,7 +553,7 @@ local function ADDnonUDT(FP)
             defT2.retref = nil
             defsT[t.cimguiname][#defsT[t.cimguiname] + 1] = defT2
             defsT[t.cimguiname][t.signature.."nonUDT"] = defT2
-            table.insert(newcdefs,{stname=t.stname,funcname=t.funcname,args=args,argsc=argscsinpars,signature=t.signature.."nonUDT",cimguiname=t.cimguiname,call_args=call_args,ret =t.ret,comment=comment})
+            table.insert(newcdefs,{stname=t.stname,funcname=t.funcname,args=args,argsc=argscsinpars,signature=t.signature.."nonUDT",cimguiname=t.cimguiname,call_args=call_args,ret =t.ret})
             --converting to Simple type----------------------------------------------------
             local defT3 = {}
             --first strings
@@ -483,7 +574,7 @@ local function ADDnonUDT(FP)
             defT3.retref = nil
             defsT[t.cimguiname][#defsT[t.cimguiname] + 1] = defT3
             defsT[t.cimguiname][t.signature.."nonUDT2"] = defT3
-            table.insert(newcdefs,{stname=t.stname,funcname=t.funcname,args=args,argsc=argscsinpars,signature=t.signature.."nonUDT2",cimguiname=t.cimguiname,call_args=call_args,ret =t.ret,comment=comment})
+            table.insert(newcdefs,{stname=t.stname,funcname=t.funcname,args=args,argsc=argscsinpars,signature=t.signature.."nonUDT2",cimguiname=t.cimguiname,call_args=call_args,ret =t.ret})
         end
         end
 		--end
@@ -511,9 +602,13 @@ local function ADDdestructors(FP)
             for j,cons in ipairs(defT) do
                 cons.constructor = true
             end
-            assert(defT[1].stname==defT[1].funcname)
+            if(defT[1].stname~=defT[1].funcname) then
+				print(defT[1].stname, defT[1].funcname)
+				error"names should be equal"
+			end
             local def = {}
             def.stname = defT[1].stname
+			def.templated = defT[1].templated
             def.ret = "void"
             def.ov_cimguiname = def.stname.."_destroy"
             def.cimguiname = def.ov_cimguiname
@@ -587,6 +682,7 @@ function M.Parser()
 	par.embeded_structs = {}
 	par.inerstructs = {}
 	par.templates = {}
+	par.typenames = {}
 	par.typedefs_dict = {}
 	par.cname_overloads = {}
 	par.manuals = {}
@@ -612,6 +708,9 @@ function M.Parser()
 		self:parseItems()
 		self:parseFunctions()
 		self:compute_overloads()
+		self:gen_structs_and_enums()
+		--self:compute_templated()
+		ADDdestructors(self)
 	end
 	function par:parseItems()
 		--typedefs dictionary
@@ -643,7 +742,8 @@ function M.Parser()
 		printItems(items)
 	end
 	par.parseFunction = parseFunction
-
+	
+	--get all function definitions and template structs
 	function par:parseFunctions()
 		for i,it in ipairs(itemsarr) do
 			if it.re_name == "function_re" or it.re_name == "functionD_re" then
@@ -658,8 +758,14 @@ function M.Parser()
 					end
 				end
 			elseif it.re_name == "struct_re" then
+				--check template struct
+				local typename = it.item:match("%s*template%s*<%s*typename%s*(%S+)%s*>")
 				local nsp = it.item:match("%b{}"):sub(2,-2)
 				local stname = it.item:match("struct%s+(%S+)")
+				if typename then -- it is a struct template
+					self.typenames = self.typenames or {}
+					self.typenames[stname] = typename
+				end
 				local nspparr,itemsnsp = parseItems(nsp)
 				for insp,itnsp in ipairs(nspparr) do
 					if itnsp.re_name == "function_re" or itnsp.re_name == "functionD_re" then
@@ -706,6 +812,7 @@ function M.Parser()
 					te = te:gsub("%*","Ptr")
 					self.templates[ttype] = self.templates[ttype] or {}
 					self.templates[ttype][template] = te
+					it2 = it2:gsub("(<[%w_%*%s]+>)([^%s])","%1 %2") --add if not present space after <>
 					it2 = it2:gsub("<([%w_%*%s]+)>","_"..te)
 				end
 				--clean mutable
@@ -723,10 +830,11 @@ function M.Parser()
 		return table.concat(outtab,""),stname,outtab
 	end
 	function par:gen_structs_and_enums()
-		local outtab = {}
+		local outtab = {} 
 		local outtabpre = {}
 		local typedefs_table = {}
-
+		self.inerstructs = {}
+		
 		--first typedefs
 		for i,it in ipairs(itemsarr) do
 			if it.re_name == "typedef_re" or it.re_name == "functypedef_re" or it.re_name == "vardef_re" then
@@ -745,7 +853,8 @@ function M.Parser()
 				table.insert(outtab,it.item)
 			elseif it.re_name == "struct_re" then
 				local cleanst,structname = self:clean_struct(it.item)
-				if structname then
+				--if not void stname or templated
+				if structname and not self.typenames[structname] then
 				table.insert(outtab,cleanst)
 				table.insert(typedefs_table,"typedef struct "..structname.." "..structname..";\n")
 				self.typedefs_dict[structname]="struct "..structname
@@ -785,6 +894,9 @@ function M.Parser()
 			local typen,rest = line:match("%s*([^,]+)%s(%S+[,;])")
 			--local template_type = typen:match("/%*<(.+)>%*/")
 			--if template_type then typen = typen:match("(.+)/%*") end
+                if not typen then -- Lets try Type*name
+                    typen,rest = line:match("([^,]+%*)(%S+[,;])")
+                end
 			local template_type 
 			for k,v in pairs(self.templates) do
 				template_type = typen:match(k.."_(.+)")
@@ -825,7 +937,9 @@ function M.Parser()
 				end
 			elseif it.re_name == "struct_re" then
 				local cleanst,structname,strtab = self:clean_struct(it.item)
-				if structname then --not empty struc
+				--if not void stname or templated
+				--M.prtable(cleanst,structname,strtab)
+				if structname and not self.typenames[structname] then
 					outtab.structs[structname] = {}
 					for j=3,#strtab-1 do
 						self:parse_struct_line(strtab[j],outtab.structs[structname])
@@ -949,9 +1063,113 @@ function M.Parser()
         table.insert(strt,string.format("%d overloaded",numoverloaded))
 		AdjustArguments(self)
 		ADDnonUDT(self)
-		ADDdestructors(self)
+		--ADDdestructors(self)
         self.overloadstxt  = table.concat(strt,"\n")
     end
+	local function typename_gsub(cad,typename,tname)
+		local str,n = "",0
+		if tname:match"%*" then
+		str,n = cad:gsub("(const%s+)("..typename..")", tname.." %1")
+		end
+		if n==0 then
+		str,n = cad:gsub("(const%s+)("..typename..")(%s*%*)", tname.." %1%3")
+		end
+		if n==0 then
+		str,n = cad:gsub("([^_%w])("..typename..")([^_%w])", "%1"..tname.."%3")
+		end
+		if n==0 then
+		str,n = cad:gsub("([^_%w])("..typename..")$", "%1"..tname)
+		end
+		if n==0 then
+		str,n = cad:gsub("^("..typename..")(%s*%*)", tname.."%2")
+		end
+		return str
+	end
+	function par:compute_templated()
+		local defsT = self.defsT
+		local newcdefs = {}
+		for numcdef,t in ipairs(self.funcdefs) do
+			if t.cimguiname then
+			local cimf = defsT[t.cimguiname]
+			local defT = cimf[t.signature]
+			if defT.templated then
+				local templates = self.templates[defT.stname]
+				local typename = self.typenames[defT.stname]
+				for tname,tnamestr in pairs(templates) do
+					--local tnamestr = typetoStr(tname)
+					local stname = defT.stname .. "_" .. tnamestr
+					local cimguiname = t.cimguiname:gsub(defT.stname,stname)
+					local ov_cimguiname = defT.ov_cimguiname:gsub(defT.stname,stname)
+					local signature = defT.signature:gsub(typename, tname)
+					local ret 
+					if defT.ret then
+						--ret = defT.ret:gsub(typename, tname)
+						ret = typename_gsub(defT.ret, typename, tname)
+					end
+
+					local args = defT.args:gsub(defT.stname,stname)
+
+					args = typename_gsub(args, typename, tname)
+					
+					local argsT = {}
+					for i,ar in ipairs(defT.argsT) do
+						argsT[i] = {}
+						for k,v in pairs(ar) do
+							if k=="type" then
+								v = v:gsub(defT.stname,stname)
+								v = typename_gsub(v, typename, tname)
+							end
+							argsT[i][k]=v
+						end
+					end
+					-----------reconstruct args
+					--if(#argsT==0 and not defT.constructor) then M.prtable(defT) end
+					--if is const function make self const
+					if #argsT>0 and signature:match"const$" then
+						argsT[1].type = "const "..argsT[1].type
+					end
+					
+					args = "("
+					for i=1,#argsT-1 do
+						local ar = argsT[i]
+						args = args .. ar.type .. " " ..ar.name .. ","
+					end
+					local ar = argsT[#argsT]
+					if ar then args = args .. ar.type .. " " ..ar.name .. ")" 
+					else args = args .. ")" end
+					args = args:gsub("&","")
+					------------------------------
+					
+					defTnew = {}
+					defTnew.cimguiname = cimguiname
+					defTnew.ov_cimguiname = ov_cimguiname
+					defTnew.signature = signature
+					defTnew.ret = ret
+					defTnew.retref = defT.retref
+					defTnew.templatedgen = true
+					defTnew.call_args = defT.call_args
+					defTnew.stname = stname
+					local funcname = defT.funcname
+					if funcname == defT.stname then --is constructor
+						funcname = stname
+					end
+					defTnew.funcname = funcname
+					defTnew.args = args
+					defTnew.argsT = argsT
+					defTnew.defaults = {}
+					--print(cimguiname,ov_cimguiname, signature , ret)
+					defsT[cimguiname] = defsT[cimguiname] or {}
+					defsT[cimguiname][#defsT[cimguiname] + 1] = defTnew
+					defsT[cimguiname][signature] = defTnew
+					table.insert(newcdefs,{stname=stname,funcname=t.funcname,args=args,argsc=argscsinpars,signature=signature,cimguiname=cimguiname,call_args=call_args,ret =t.ret})
+				end
+			end -- templated
+			end --cimguiname
+		end
+		for i,v in ipairs(newcdefs) do
+			table.insert(self.funcdefs,v)
+		end
+	end
 	return par
 end
 

generator/generator.bat

@@ -10,7 +10,7 @@
 :: impl_definitions.lua for implementation function definitions
 
 :: set your PATH if necessary for LuaJIT or Lua5.1 or luajit with: (for example)
-:: set PATH=%PATH%;C:\luaGL;C:\mingw32\bin;
+set PATH=%PATH%;C:\luaGL;C:\mingw32\bin;
 :: set PATH=%PATH%;C:\luaGL;C:\i686-7.2.0-release-posix-dwarf-rt_v5-rev1\mingw32\bin;
 :: set PATH=%PATH%;C:\luaGL\sources\luajit-master\luajit-master\bin\mingw32;C:\mingw32\bin;
 ::process  files

generator/generator.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/sh
+
+# this script must be executed in this directory
+# all the output goes to generator/output folder
+# .cpp and .h files:
+# cimgui.h and cimgui.cpp with gcc preprocess
+# cimgui_nopreprocess.h and cimgui_nopreprocess.cpp generated without preprocess
+# cimgui_impl.h with implementation function cdefs
+# lua and json files:
+# definitions.lua for function definitions
+# structs_and_enums.lua with struct and enum information-definitions
+# impl_definitions.lua for implementation function definitions
+
+#process  files
+# arg[1] compiler name gcc, clang, cl or nocompiler
+# arg[2..n] name of implementations to generate
+luajit ./generator.lua gcc glfw opengl3 opengl2 sdl

generator/generator2.lua

@@ -1,609 +0,0 @@
---------------------------------------------------------------------------
---script for auto_funcs.h and auto_funcs.cpp generation
---expects LuaJIT
---------------------------------------------------------------------------
-assert(_VERSION=='Lua 5.1',"Must use LuaJIT")
-assert(bit,"Must use LuaJIT")
-local script_args = {...}
-local COMPILER = script_args[1]
-local CPRE,CTEST
-if COMPILER == "gcc" or COMPILER == "clang" then
-    CPRE = COMPILER..[[ -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ]]
-    CTEST = COMPILER.." --version"
-elseif COMPILER == "cl" then
-    CPRE = COMPILER..[[ /E /DIMGUI_DISABLE_OBSOLETE_FUNCTIONS /DIMGUI_API="" /DIMGUI_IMPL_API="" ]]
-    CTEST = COMPILER
-else
-    print("Working without compiler ")
-end
---test compiler present
-local HAVE_COMPILER = false
-if CTEST then
-    local pipe,err = io.popen(CTEST,"r")
-    if pipe then
-        local str = pipe:read"*a"
-        print(str)
-        pipe:close()
-        if str=="" then
-            HAVE_COMPILER = false
-        else
-            HAVE_COMPILER = true
-        end
-    else
-        HAVE_COMPILER = false
-        print(err)
-    end
-    assert(HAVE_COMPILER,"gcc, clang or cl needed to run script")
-end --CTEST
-
-print("HAVE_COMPILER",HAVE_COMPILER)
---get implementations
-local implementations = {}
-for i=2,#script_args do table.insert(implementations,script_args[i]) end
-
---------------------------------------------------------------------------
---this table has the functions to be skipped in generation
---------------------------------------------------------------------------
-local cimgui_manuals = {
-    igLogText = true,
-    ImGuiTextBuffer_appendf = true,
-    igColorConvertRGBtoHSV = true,
-    igColorConvertHSVtoRGB = true
-}
---------------------------------------------------------------------------
---this table is a dictionary to force a naming of function overloading (instead of algorythmic generated)
---first level is cimguiname without postfix, second level is the signature of the function, value is the
---desired name
----------------------------------------------------------------------------
-local cimgui_overloads = {
-    igPushID = {
-        --["(const char*)"] =           "igPushIDStr",
-        ["(const char*,const char*)"] = "igPushIDRange",
-        --["(const void*)"] =           "igPushIDPtr",
-        --["(int)"] =                   "igPushIDInt"
-    },
-    igGetID = {
-        ["(const char*,const char*)"] = "igGetIDRange",
-    },
-    ImDrawList_AddText = {
-        ["(const ImVec2,ImU32,const char*,const char*)"] = "ImDrawList_AddText",
-    },
-    igGetColorU32 = {
-        ["(ImGuiCol,float)"] = "igGetColorU32",
-    },
-    igCollapsingHeader = {
-        ["(const char*,ImGuiTreeNodeFlags)"] =  "igCollapsingHeader",
-    },
-    igCombo = {
-        ["(const char*,int*,const char* const[],int,int)"] = "igCombo",
-    },
-    igPlotLines = {
-        ["(const char*,const float*,int,int,const char*,float,float,ImVec2,int)"] = "igPlotLines",
-    },
-    igBeginChild = {
-        ["(const char*,const ImVec2,bool,ImGuiWindowFlags)"] = "igBeginChild",
-    },
-    igSelectable = {
-        ["(const char*,bool,ImGuiSelectableFlags,const ImVec2)"] = "igSelectable"
-    },
-    igPushStyleColor = {
-        ["(ImGuiCol,const ImVec4)"] = "igPushStyleColor"
-    }
-}
-
---------------------------header definitions
-local cimgui_header = 
-[[//This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version XXX from Dear ImGui https://github.com/ocornut/imgui
-]]
-local gdefines = {} --for FLT_MAX and others
---------------------------------------------------------------------------
---helper functions
-
-
----------------------------minimal preprocessor without compiler for ImGui.h
-local function filelines(file,locats)
-    local split_comment = require"cpp2ffi".split_comment
-    local iflevels = {}
-   --generated known prepros
-local prepro = {
-["#if"]={
-    [   "defined(__clang__) || defined(__GNUC__)"       ]=false,
-    [   "defined(__clang__)"    ]=false,
-    [   "defined(_MSC_VER) && !defined(__clang__)"      ]=false,
-    [   "!defined(IMGUI_DISABLE_INCLUDE_IMCONFIG_H) || defined(IMGUI_INCLUDE_IMCONFIG_H)"       ]=false,
-    [   "!defined(IMGUI_IMPL_OPENGL_LOADER_GL3W)     \\"        ]=false,
-},
-["#elif"]={
-    [   "defined(__GNUC__) && __GNUC__ >= 8"    ]=false,
-    [   "(defined(__clang__) || defined(__GNUC__)) && (__cplusplus < 201100)"   ]=false,
-},
-["#ifdef"]={
-    [   "IM_VEC4_CLASS_EXTRA"   ]=false,
-    [   "IMGUI_USER_CONFIG"     ]=false,
-    [   "IMGUI_INCLUDE_IMGUI_USER_H"    ]=false,
-    [   "IMGUI_USE_BGRA_PACKED_COLOR"   ]=false,
-    [   "IM_VEC2_CLASS_EXTRA"   ]=false,
-},
-["#ifndef"]={
-    [   "IMGUI_API"     ]=false,
-    [   "IMGUI_IMPL_API"        ]=false,
-    [   "IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT" ]=true,
-    [   "IM_ASSERT"     ]=false,
-    [   "ImTextureID"   ]=true,
-    [   "ImDrawIdx"     ]=true,
-    [   "IMGUI_DISABLE_OBSOLETE_FUNCTIONS"      ]=false,
-},
-}
-
-    local function prepro_boolif(pre,cond)
-        local conds = prepro[pre]
-        assert(conds,pre.." has no conds-----------------------------")
-        local res = conds[cond]
-        --assert(type(res)~="nil",cond.." not found")
-        if type(res)=="nil" then
-            print(pre,cond,"not found in precompiler database, returning false.")
-            res = false
-        end
-        return res
-    end
-    local function location_it()
-        repeat
-            local line = file:read"*l"
-
-            if not line then return nil end
-            line,_ = split_comment(line)
-            --if line:sub(1,1) == "#" then
-            if line:match("^%s*#") then
-                
-                local pre,cond = line:match("^%s*(#%S*)%s+(.*)%s*$")
-                if line:match("#if") then 
-                    iflevels[#iflevels +1 ] = prepro_boolif(pre,cond)
-                elseif line:match("#endif") then
-                    iflevels[#iflevels] = nil
-                elseif line:match("#elif") then
-                    if not iflevels[#iflevels] then
-                        iflevels[#iflevels] = prepro_boolif(pre,cond)
-                    else --was true
-                        iflevels[#iflevels] = false
-                    end
-                elseif line:match("#else") then
-                    iflevels[#iflevels] = not iflevels[#iflevels]
-                else
-                    if not (pre:match("#define") or pre:match"#include" or pre:match"#pragma") then
-                        print("not expected preprocessor directive ",pre)
-                    end
-                end
-                -- skip
-            elseif #iflevels == 0 or iflevels[#iflevels] then
-                -- drop IMGUI_APIX
-                line = line:gsub("IMGUI_IMPL_API","")
-                -- drop IMGUI_API
-                line = line:gsub("IMGUI_API","")
-                return line,locats[1]
-            end
-        until false
-    end
-    return location_it
-end
-
-
---------------------------------functions for C generation
-local function func_header_impl_generate(FP)
-
-    local outtab = {}
-    
-    for _,t in ipairs(FP.funcdefs) do
-        if t.cimguiname then
-            local cimf = FP.defsT[t.cimguiname]
-            local def = cimf[t.signature]
-            if def.ret then --not constructor
-                local addcoment = def.comment or ""
-                if def.stname == "" then --ImGui namespace or top level
-                    table.insert(outtab,"CIMGUI_API".." "..def.ret.." "..def.ov_cimguiname..def.args..";"..addcoment.."\n")
-                else
-                    error("class function in implementations")
-                end
-            end
-        else --not cimguiname
-            table.insert(outtab,t.comment:gsub("%%","%%%%").."\n")-- %% substitution for gsub
-        end
-    end
-    local cfuncsstr = table.concat(outtab)
-    cfuncsstr = cfuncsstr:gsub("\n+","\n") --several empty lines to one empty line
-    return cfuncsstr
-end
-local function func_header_generate(FP)
-
-    local outtab = {}
-    table.insert(outtab,"#ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS\n")
-    for k,v in pairs(FP.embeded_structs) do
-        table.insert(outtab,"typedef "..v.." "..k..";\n")
-    end
-    for ttype,v in pairs(FP.templates) do
-		for ttypein,_ in pairs(v) do
-			local te = ttypein:gsub("%s","_")
-			te = te:gsub("%*","Ptr")
-        table.insert(outtab,"typedef "..ttype.."<"..ttypein.."> "..ttype.."_"..te..";\n")
-		end
-    end
-
-    table.insert(outtab,"#endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS\n")
-    for _,t in ipairs(FP.funcdefs) do
-        if t.cimguiname then
-        local cimf = FP.defsT[t.cimguiname]
-        local def = cimf[t.signature]
-        assert(def,t.signature..t.cimguiname)
-        local manual = FP.get_manuals(def)
-        if not manual then
-            local addcoment = def.comment or ""
-            local empty = def.args:match("^%(%)") --no args
-            if def.constructor then
-                assert(def.stname ~= "","constructor without struct")
-                table.insert(outtab,"CIMGUI_API "..def.stname.."* "..def.ov_cimguiname ..(empty and "(void)" or def.args)..";"..addcoment.."\n")
-            elseif def.destructor then
-                table.insert(outtab,"CIMGUI_API void "..def.ov_cimguiname..def.args..";"..addcoment.."\n")
-            else --not constructor
-                if def.stname == "" then --ImGui namespace or top level
-                    table.insert(outtab,"CIMGUI_API "..def.ret.." ".. def.ov_cimguiname ..(empty and "(void)" or def.args)..";"..addcoment.."\n")
-                else
-                    table.insert(outtab,"CIMGUI_API "..def.ret.." "..def.ov_cimguiname..def.args..";"..addcoment.."\n")
-                end
-            end 
-        end
-        else --not cimguiname
-            table.insert(outtab,t.comment:gsub("%%","%%%%").."\n")-- %% substitution for gsub
-        end
-    end
-
-    local cfuncsstr = table.concat(outtab)
-    cfuncsstr = cfuncsstr:gsub("\n+","\n") --several empty lines to one empty line
-    return cfuncsstr
-end
-local function ImGui_f_implementation(outtab,def)
-    local ptret = def.retref and "&" or ""
-    table.insert(outtab,"CIMGUI_API".." "..def.ret.." "..def.ov_cimguiname..def.args.."\n")
-    table.insert(outtab,"{\n")
-    if def.isvararg then
-        local call_args = def.call_args:gsub("%.%.%.","args")
-        table.insert(outtab,"    va_list args;\n")
-        table.insert(outtab,"    va_start(args, fmt);\n")
-        if def.ret~="void" then
-            table.insert(outtab,"    "..def.ret.." ret = ImGui::"..def.funcname.."V"..call_args..";\n")
-        else
-            table.insert(outtab,"    ImGui::"..def.funcname.."V"..call_args..";\n")
-        end
-        table.insert(outtab,"    va_end(args);\n")
-        if def.ret~="void" then
-            table.insert(outtab,"    return ret;\n")
-        end
-    elseif def.nonUDT then
-        if def.nonUDT == 1 then
-            table.insert(outtab,"    *pOut = ImGui::"..def.funcname..def.call_args..";\n")
-        else --nonUDT==2
-            table.insert(outtab,"    "..def.retorig.." ret = ImGui::"..def.funcname..def.call_args..";\n")
-            table.insert(outtab,"    "..def.ret.." ret2 = "..def.retorig.."ToSimple(ret);\n")
-            table.insert(outtab,"    return ret2;\n")
-        end
-    else --standard ImGui
-        table.insert(outtab,"    return "..ptret.."ImGui::"..def.funcname..def.call_args..";\n")
-    end
-    table.insert(outtab,"}\n")
-end
-local function struct_f_implementation(outtab,def)
-    local empty = def.args:match("^%(%)") --no args
-    local ptret = def.retref and "&" or ""
-
-    local imgui_stname = def.stname
-
-    table.insert(outtab,"CIMGUI_API".." "..def.ret.." "..def.ov_cimguiname..def.args.."\n")
-    table.insert(outtab,"{\n")
-    if def.isvararg then
-        local call_args = def.call_args:gsub("%.%.%.","args")
-        table.insert(outtab,"    va_list args;\n")
-        table.insert(outtab,"    va_start(args, fmt);\n")
-        if def.ret~="void" then
-            table.insert(outtab,"    "..def.ret.." ret = self->"..def.funcname.."V"..call_args..";\n")
-        else
-            table.insert(outtab,"    self->"..def.funcname.."V"..call_args..";\n")
-        end
-        table.insert(outtab,"    va_end(args);\n")
-        if def.ret~="void" then
-            table.insert(outtab,"    return ret;\n")
-        end
-    elseif def.nonUDT then
-        if def.nonUDT == 1 then
-            table.insert(outtab,"    *pOut = self->"..def.funcname..def.call_args..";\n")
-        else --nonUDT==2
-            table.insert(outtab,"    "..def.retorig.." ret = self->"..def.funcname..def.call_args..";\n")
-            table.insert(outtab,"    "..def.ret.." ret2 = "..def.retorig.."ToSimple(ret);\n")
-            table.insert(outtab,"    return ret2;\n")
-        end
-    else --standard struct
-        table.insert(outtab,"    return "..ptret.."self->"..def.funcname..def.call_args..";\n")
-    end
-    table.insert(outtab,"}\n")
-end
-local function func_implementation(FP)
-
-    local outtab = {}
-    for _,t in ipairs(FP.funcdefs) do
-        repeat -- continue simulation
-        if not t.cimguiname then break end
-        local cimf = FP.defsT[t.cimguiname]
-        local def = cimf[t.signature]
-        assert(def)
-        local manual = FP.get_manuals(def)
-        if not manual then 
-            if def.constructor then
-                assert(def.stname ~= "","constructor without struct")
-                local empty = def.args:match("^%(%)") --no args
-                table.insert(outtab,"CIMGUI_API "..def.stname.."* "..def.ov_cimguiname..(empty and "(void)" or def.args).."\n")
-                table.insert(outtab,"{\n")
-                table.insert(outtab,"    return IM_NEW("..def.stname..")"..def.call_args..";\n")
-                table.insert(outtab,"}\n")
-            elseif def.destructor then
-                local args = "("..def.stname.."* self)"
-                local fname = def.stname.."_destroy" 
-                table.insert(outtab,"CIMGUI_API void "..fname..args.."\n")
-                table.insert(outtab,"{\n")
-                table.insert(outtab,"    IM_DELETE(self);\n")
-                table.insert(outtab,"}\n")
-            elseif def.stname == "" then
-                ImGui_f_implementation(outtab,def)
-            else -- stname
-                struct_f_implementation(outtab,def)
-            end
-        end
-        until true
-    end
-    return table.concat(outtab)
-end
--------------------functions for getting and setting defines
-local function get_defines(t)
-    if COMPILER == "cl" then print"can't get defines with cl compiler"; return {} end
-    local pipe,err = io.popen(COMPILER..[[ -E -dM -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ../imgui/imgui.h]],"r")
-    local defines = {}
-    while true do
-        local line = pipe:read"*l"
-        if not line then break end
-        local key,value = line:match([[#define%s+(%S+)%s+(.+)]])
-        if not key or not value then 
-            --print(line)
-        else
-            defines[key]=value
-        end
-    end
-    pipe:close()
-    --require"anima.utils"
-    --prtable(defines)
-    --FLT_MAX
-    local ret = {}
-    for i,v in ipairs(t) do
-        local aa = defines[v]
-        while true do
-            local tmp = defines[aa]
-            if not tmp then 
-                break
-            else
-                aa = tmp
-            end
-        end
-        ret[v] = aa
-    end
-    return ret
-end
-  --subtitution of FLT_MAX value for FLT_MAX 
-local function set_defines(fdefs)
-    for k,defT in pairs(fdefs) do
-        for i,def in ipairs(defT) do
-            for name,default in pairs(def.defaults) do
-                if default == gdefines.FLT_MAX then
-                    def.defaults[name] = "FLT_MAX"
-                end
-            end
-        end
-    end
-end 
---this creates defsBystruct in case you need to list by struct container
-local function DefsByStruct(FP)
-    local structs = {}
-    for fun,defs in pairs(FP.defsT) do
-        local stname = defs[1].stname
-        structs[stname] = structs[stname] or {}
-        table.insert(structs[stname],defs)--fun)
-    end
-    FP.defsBystruct = structs
-end  
-
-
---load parser module
-local cpp2ffi = require"cpp2ffi"
-local read_data = cpp2ffi.read_data
-local save_data = cpp2ffi.save_data
-local copyfile = cpp2ffi.copyfile
-local serializeTableF = cpp2ffi.serializeTableF
-
-----------custom ImVector templates
-local function generate_templates(code,templates)
-    table.insert(code,[[typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;]].."\n")
-    for ttype,v in pairs(templates) do
-        --local te = k:gsub("%s","_")
-        --te = te:gsub("%*","Ptr")
-		if ttype == "ImVector" then
-		for te,newte in pairs(v) do
-        table.insert(code,"typedef struct ImVector_"..newte.." {int Size;int Capacity;"..te.."* Data;} ImVector_"..newte..";\n")
-		end
-		end
-    end
-end
---generate cimgui.cpp cimgui.h 
-local function cimgui_generation(parser)
-
-    local hstrfile = read_data"./cimgui_template.h"
-
-	local outpre,outpost = parser:gen_structs_and_enums()
-
-	local outtab = {}
-    generate_templates(outtab,parser.templates)
-	local cstructsstr = outpre..table.concat(outtab,"")..outpost
-
-    hstrfile = hstrfile:gsub([[#include "imgui_structs%.h"]],cstructsstr)
-    local cfuncsstr = func_header_generate(parser)
-    hstrfile = hstrfile:gsub([[#include "auto_funcs%.h"]],cfuncsstr)
-    save_data("./output/cimgui.h",cimgui_header,hstrfile)
-    
-    --merge it in cimgui_template.cpp to cimgui.cpp
-    local cimplem = func_implementation(parser)
-
-    local hstrfile = read_data"./cimgui_template.cpp"
-
-    hstrfile = hstrfile:gsub([[#include "auto_funcs%.cpp"]],cimplem)
-    save_data("./output/cimgui.cpp",cimgui_header,hstrfile)
-
-end
---------------------------------------------------------
------------------------------do it----------------------
---------------------------------------------------------
---get imgui.h version--------------------------
-local pipe,err = io.open("../imgui/imgui.h","r")
-if not pipe then
-    error("could not open file:"..err)
-end
-local imgui_version
-while true do
-    local line = pipe:read"*l"
-    imgui_version = line:match([[#define%s+IMGUI_VERSION%s+(".+")]])
-    if imgui_version then break end
-end
-pipe:close()
-cimgui_header = cimgui_header:gsub("XXX",imgui_version)
-print("IMGUI_VERSION",imgui_version)
---get some defines----------------------------
-if HAVE_COMPILER then
-    gdefines = get_defines{"IMGUI_VERSION","FLT_MAX"}
-end                                 
-
---generation
-print("------------------generation with "..COMPILER.."------------------------")
-local typedefs_dict2
---prepare parser
-local parser1 = cpp2ffi.Parser()
-parser1.getCname = function(stname,funcname)
-    local pre = (stname == "") and "ig" or stname.."_"
-    return pre..funcname
-end
-parser1.cname_overloads = cimgui_overloads
-parser1.manuals = cimgui_manuals
-parser1.UDTs = {"ImVec2","ImVec4","ImColor"}
-
-local pipe,err
-if HAVE_COMPILER then
-    pipe,err = io.popen(CPRE..[[../imgui/imgui.h]],"r")
-else
-    pipe,err = io.open([[../imgui/imgui.h]],"r")
-end
-
-if not pipe then
-    error("could not execute gcc "..err)
-end
-
-local iterator = (HAVE_COMPILER and cpp2ffi.location) or filelines
-
-for line in iterator(pipe,{"imgui"},{}) do
-	parser1:insert(line)
-end
-pipe:close()
-
-parser1:do_parse()
-
---parser1:dump_alltypes()
---parser1:printItems()
-
-save_data("./output/overloads.txt",parser1.overloadstxt)
-cimgui_generation(parser1)
-
-----------save fundefs in definitions.lua for using in bindings
---DefsByStruct(pFP)
-set_defines(parser1.defsT) 
-save_data("./output/definitions.lua",serializeTableF(parser1.defsT))
-
-----------save struct and enums lua table in structs_and_enums.lua for using in bindings
-local structs_and_enums_table = parser1:gen_structs_and_enums_table()
-save_data("./output/structs_and_enums.lua",serializeTableF(structs_and_enums_table))
-save_data("./output/typedefs_dict.lua",serializeTableF(parser1.typedefs_dict))
-
---check every function has ov_cimguiname
--- for k,v in pairs(parser1.defsT) do
-	-- for _,def in ipairs(v) do
-		-- assert(def.ov_cimguiname)
-	-- end
--- end
---=================================Now implementations
-
-local parser2
-
-if #implementations > 0 then
-
-    parser2 = cpp2ffi.Parser()
-
-    
-    for i,impl in ipairs(implementations) do
-        local source = [[../imgui/examples/imgui_impl_]].. impl .. ".h "
-        local locati = [[imgui_impl_]].. impl
-        local pipe,err
-        if HAVE_COMPILER then
-            pipe,err = io.popen(CPRE..source,"r")
-        else
-            pipe,err = io.open(source,"r")
-        end
-        if not pipe then
-            error("could not get file: "..err)
-        end
-        
-        local iterator = (HAVE_COMPILER and cpp2ffi.location) or filelines
-        
-        for line,locat in iterator(pipe,{locati},{}) do
-            --local line, comment = split_comment(line)
-			parser2:insert(line)
-        end
-        pipe:close()
-    end
-    parser2:do_parse()
-
-    -- save ./cimgui_impl.h
-    local cfuncsstr = func_header_impl_generate(parser2) 
-    local cstructstr1,cstructstr2 = parser2:gen_structs_and_enums()
-    save_data("./output/cimgui_impl.h",cstructstr1,cstructstr2,cfuncsstr)
-
-    ----------save fundefs in impl_definitions.lua for using in bindings
-    save_data("./output/impl_definitions.lua",serializeTableF(parser2.defsT))
-
-end -- #implementations > 0 then
-
--------------------------------json saving
---avoid mixed tables (with string and integer keys)
-local function json_prepare(defs)
-    --delete signatures in function
-    for k,def in pairs(defs) do
-        for k2,v in pairs(def) do
-            if type(k2)=="string" then
-                def[k2] = nil
-            end
-        end
-    end
-    return defs
-end
----[[
-local json = require"json"
-save_data("./output/definitions.json",json.encode(json_prepare(parser1.defsT)))
-save_data("./output/structs_and_enums.json",json.encode(structs_and_enums_table))
-save_data("./output/typedefs_dict.json",json.encode(parser1.typedefs_dict))
-if parser2 then
-    save_data("./output/impl_definitions.json",json.encode(json_prepare(parser2.defsT)))
-end
---]]
--------------------copy C files to repo root
-copyfile("./output/cimgui.h", "../cimgui.h")
-copyfile("./output/cimgui.cpp", "../cimgui.cpp")
-print"all done!!"

generator/generator_old.bat

@@ -16,7 +16,7 @@ set PATH=%PATH%;C:\luaGL;C:\mingw32\bin;
 ::process  files
 :: arg[1] compiler name gcc, clang, cl or nocompiler
 :: arg[2..n] name of implementations to generate
-luajit ./generator2.lua gcc glfw opengl3 opengl2 sdl
+luajit ./generator_old.lua gcc glfw opengl3 opengl2 sdl
 
 ::leave console open
 cmd /k

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.66b" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.73" from Dear ImGui https://github.com/ocornut/imgui
 
 #include "./imgui/imgui.h"
 #include "cimgui.h"
@@ -46,9 +46,9 @@ CIMGUI_API void igSetCurrentContext(ImGuiContext* ctx)
 {
     return ImGui::SetCurrentContext(ctx);
 }
-CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t sz_io,size_t sz_style,size_t sz_vec2,size_t sz_vec4,size_t sz_drawvert)
+CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t sz_io,size_t sz_style,size_t sz_vec2,size_t sz_vec4,size_t sz_drawvert,size_t sz_drawidx)
 {
-    return ImGui::DebugCheckVersionAndDataLayout(version_str,sz_io,sz_style,sz_vec2,sz_vec4,sz_drawvert);
+    return ImGui::DebugCheckVersionAndDataLayout(version_str,sz_io,sz_style,sz_vec2,sz_vec4,sz_drawvert,sz_drawidx);
 }
 CIMGUI_API ImGuiIO* igGetIO()
 {
@@ -174,30 +174,6 @@ CIMGUI_API float igGetWindowHeight()
 {
     return ImGui::GetWindowHeight();
 }
-CIMGUI_API ImVec2 igGetContentRegionMax()
-{
-    return ImGui::GetContentRegionMax();
-}
-CIMGUI_API ImVec2 igGetContentRegionAvail()
-{
-    return ImGui::GetContentRegionAvail();
-}
-CIMGUI_API float igGetContentRegionAvailWidth()
-{
-    return ImGui::GetContentRegionAvailWidth();
-}
-CIMGUI_API ImVec2 igGetWindowContentRegionMin()
-{
-    return ImGui::GetWindowContentRegionMin();
-}
-CIMGUI_API ImVec2 igGetWindowContentRegionMax()
-{
-    return ImGui::GetWindowContentRegionMax();
-}
-CIMGUI_API float igGetWindowContentRegionWidth()
-{
-    return ImGui::GetWindowContentRegionWidth();
-}
 CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot)
 {
     return ImGui::SetNextWindowPos(pos,cond,pivot);
@@ -262,6 +238,26 @@ CIMGUI_API void igSetWindowFocusStr(const char* name)
 {
     return ImGui::SetWindowFocus(name);
 }
+CIMGUI_API ImVec2 igGetContentRegionMax()
+{
+    return ImGui::GetContentRegionMax();
+}
+CIMGUI_API ImVec2 igGetContentRegionAvail()
+{
+    return ImGui::GetContentRegionAvail();
+}
+CIMGUI_API ImVec2 igGetWindowContentRegionMin()
+{
+    return ImGui::GetWindowContentRegionMin();
+}
+CIMGUI_API ImVec2 igGetWindowContentRegionMax()
+{
+    return ImGui::GetWindowContentRegionMax();
+}
+CIMGUI_API float igGetWindowContentRegionWidth()
+{
+    return ImGui::GetWindowContentRegionWidth();
+}
 CIMGUI_API float igGetScrollX()
 {
     return ImGui::GetScrollX();
@@ -286,13 +282,21 @@ CIMGUI_API void igSetScrollY(float scroll_y)
 {
     return ImGui::SetScrollY(scroll_y);
 }
+CIMGUI_API void igSetScrollHereX(float center_x_ratio)
+{
+    return ImGui::SetScrollHereX(center_x_ratio);
+}
 CIMGUI_API void igSetScrollHereY(float center_y_ratio)
 {
     return ImGui::SetScrollHereY(center_y_ratio);
 }
-CIMGUI_API void igSetScrollFromPosY(float pos_y,float center_y_ratio)
+CIMGUI_API void igSetScrollFromPosX(float local_x,float center_x_ratio)
 {
-    return ImGui::SetScrollFromPosY(pos_y,center_y_ratio);
+    return ImGui::SetScrollFromPosX(local_x,center_x_ratio);
+}
+CIMGUI_API void igSetScrollFromPosY(float local_y,float center_y_ratio)
+{
+    return ImGui::SetScrollFromPosY(local_y,center_y_ratio);
 }
 CIMGUI_API void igPushFont(ImFont* font)
 {
@@ -362,13 +366,17 @@ CIMGUI_API void igPopItemWidth()
 {
     return ImGui::PopItemWidth();
 }
+CIMGUI_API void igSetNextItemWidth(float item_width)
+{
+    return ImGui::SetNextItemWidth(item_width);
+}
 CIMGUI_API float igCalcItemWidth()
 {
     return ImGui::CalcItemWidth();
 }
-CIMGUI_API void igPushTextWrapPos(float wrap_pos_x)
+CIMGUI_API void igPushTextWrapPos(float wrap_local_pos_x)
 {
-    return ImGui::PushTextWrapPos(wrap_pos_x);
+    return ImGui::PushTextWrapPos(wrap_local_pos_x);
 }
 CIMGUI_API void igPopTextWrapPos()
 {
@@ -394,9 +402,9 @@ CIMGUI_API void igSeparator()
 {
     return ImGui::Separator();
 }
-CIMGUI_API void igSameLine(float pos_x,float spacing_w)
+CIMGUI_API void igSameLine(float offset_from_start_x,float spacing)
 {
-    return ImGui::SameLine(pos_x,spacing_w);
+    return ImGui::SameLine(offset_from_start_x,spacing);
 }
 CIMGUI_API void igNewLine()
 {
@@ -442,13 +450,13 @@ CIMGUI_API void igSetCursorPos(const ImVec2 local_pos)
 {
     return ImGui::SetCursorPos(local_pos);
 }
-CIMGUI_API void igSetCursorPosX(float x)
+CIMGUI_API void igSetCursorPosX(float local_x)
 {
-    return ImGui::SetCursorPosX(x);
+    return ImGui::SetCursorPosX(local_x);
 }
-CIMGUI_API void igSetCursorPosY(float y)
+CIMGUI_API void igSetCursorPosY(float local_y)
 {
-    return ImGui::SetCursorPosY(y);
+    return ImGui::SetCursorPosY(local_y);
 }
 CIMGUI_API ImVec2 igGetCursorStartPos()
 {
@@ -458,9 +466,9 @@ CIMGUI_API ImVec2 igGetCursorScreenPos()
 {
     return ImGui::GetCursorScreenPos();
 }
-CIMGUI_API void igSetCursorScreenPos(const ImVec2 screen_pos)
+CIMGUI_API void igSetCursorScreenPos(const ImVec2 pos)
 {
-    return ImGui::SetCursorScreenPos(screen_pos);
+    return ImGui::SetCursorScreenPos(pos);
 }
 CIMGUI_API void igAlignTextToFramePadding()
 {
@@ -764,49 +772,53 @@ CIMGUI_API bool igInputTextMultiline(const char* label,char* buf,size_t buf_size
 {
     return ImGui::InputTextMultiline(label,buf,buf_size,size,flags,callback,user_data);
 }
-CIMGUI_API bool igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputTextWithHint(const char* label,const char* hint,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data)
 {
-    return ImGui::InputFloat(label,v,step,step_fast,format,extra_flags);
+    return ImGui::InputTextWithHint(label,hint,buf,buf_size,flags,callback,user_data);
 }
-CIMGUI_API bool igInputFloat2(const char* label,float v[2],const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputFloat2(label,v,format,extra_flags);
+    return ImGui::InputFloat(label,v,step,step_fast,format,flags);
 }
-CIMGUI_API bool igInputFloat3(const char* label,float v[3],const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputFloat2(const char* label,float v[2],const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputFloat3(label,v,format,extra_flags);
+    return ImGui::InputFloat2(label,v,format,flags);
 }
-CIMGUI_API bool igInputFloat4(const char* label,float v[4],const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputFloat3(const char* label,float v[3],const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputFloat4(label,v,format,extra_flags);
+    return ImGui::InputFloat3(label,v,format,flags);
 }
-CIMGUI_API bool igInputInt(const char* label,int* v,int step,int step_fast,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputFloat4(const char* label,float v[4],const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputInt(label,v,step,step_fast,extra_flags);
+    return ImGui::InputFloat4(label,v,format,flags);
 }
-CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputInt(const char* label,int* v,int step,int step_fast,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputInt2(label,v,extra_flags);
+    return ImGui::InputInt(label,v,step,step_fast,flags);
 }
-CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags flags)
 {
-    return ImGui::InputInt3(label,v,extra_flags);
+    return ImGui::InputInt2(label,v,flags);
 }
-CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags flags)
 {
-    return ImGui::InputInt4(label,v,extra_flags);
+    return ImGui::InputInt3(label,v,flags);
 }
-CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags flags)
 {
-    return ImGui::InputDouble(label,v,step,step_fast,format,extra_flags);
+    return ImGui::InputInt4(label,v,flags);
 }
-CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputScalar(label,data_type,v,step,step_fast,format,extra_flags);
+    return ImGui::InputDouble(label,v,step,step_fast,format,flags);
 }
-CIMGUI_API bool igInputScalarN(const char* label,ImGuiDataType data_type,void* v,int components,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags extra_flags)
+CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags flags)
 {
-    return ImGui::InputScalarN(label,data_type,v,components,step,step_fast,format,extra_flags);
+    return ImGui::InputScalar(label,data_type,v,step,step_fast,format,flags);
+}
+CIMGUI_API bool igInputScalarN(const char* label,ImGuiDataType data_type,void* v,int components,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags flags)
+{
+    return ImGui::InputScalarN(label,data_type,v,components,step,step_fast,format,flags);
 }
 CIMGUI_API bool igColorEdit3(const char* label,float col[3],ImGuiColorEditFlags flags)
 {
@@ -900,18 +912,10 @@ CIMGUI_API void igTreePop()
 {
     return ImGui::TreePop();
 }
-CIMGUI_API void igTreeAdvanceToLabelPos()
-{
-    return ImGui::TreeAdvanceToLabelPos();
-}
 CIMGUI_API float igGetTreeNodeToLabelSpacing()
 {
     return ImGui::GetTreeNodeToLabelSpacing();
 }
-CIMGUI_API void igSetNextTreeNodeOpen(bool is_open,ImGuiCond cond)
-{
-    return ImGui::SetNextTreeNodeOpen(is_open,cond);
-}
 CIMGUI_API bool igCollapsingHeader(const char* label,ImGuiTreeNodeFlags flags)
 {
     return ImGui::CollapsingHeader(label,flags);
@@ -920,6 +924,10 @@ CIMGUI_API bool igCollapsingHeaderBoolPtr(const char* label,bool* p_open,ImGuiTr
 {
     return ImGui::CollapsingHeader(label,p_open,flags);
 }
+CIMGUI_API void igSetNextItemOpen(bool is_open,ImGuiCond cond)
+{
+    return ImGui::SetNextItemOpen(is_open,cond);
+}
 CIMGUI_API bool igSelectable(const char* label,bool selected,ImGuiSelectableFlags flags,const ImVec2 size)
 {
     return ImGui::Selectable(label,selected,flags,size);
@@ -1103,17 +1111,37 @@ CIMGUI_API int igGetColumnsCount()
 {
     return ImGui::GetColumnsCount();
 }
-CIMGUI_API void igLogToTTY(int max_depth)
+CIMGUI_API bool igBeginTabBar(const char* str_id,ImGuiTabBarFlags flags)
 {
-    return ImGui::LogToTTY(max_depth);
+    return ImGui::BeginTabBar(str_id,flags);
 }
-CIMGUI_API void igLogToFile(int max_depth,const char* filename)
+CIMGUI_API void igEndTabBar()
 {
-    return ImGui::LogToFile(max_depth,filename);
+    return ImGui::EndTabBar();
 }
-CIMGUI_API void igLogToClipboard(int max_depth)
+CIMGUI_API bool igBeginTabItem(const char* label,bool* p_open,ImGuiTabItemFlags flags)
 {
-    return ImGui::LogToClipboard(max_depth);
+    return ImGui::BeginTabItem(label,p_open,flags);
+}
+CIMGUI_API void igEndTabItem()
+{
+    return ImGui::EndTabItem();
+}
+CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label)
+{
+    return ImGui::SetTabItemClosed(tab_or_docked_window_label);
+}
+CIMGUI_API void igLogToTTY(int auto_open_depth)
+{
+    return ImGui::LogToTTY(auto_open_depth);
+}
+CIMGUI_API void igLogToFile(int auto_open_depth,const char* filename)
+{
+    return ImGui::LogToFile(auto_open_depth,filename);
+}
+CIMGUI_API void igLogToClipboard(int auto_open_depth)
+{
+    return ImGui::LogToClipboard(auto_open_depth);
 }
 CIMGUI_API void igLogFinish()
 {
@@ -1127,9 +1155,9 @@ CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags)
 {
     return ImGui::BeginDragDropSource(flags);
 }
-CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t size,ImGuiCond cond)
+CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t sz,ImGuiCond cond)
 {
-    return ImGui::SetDragDropPayload(type,data,size,cond);
+    return ImGui::SetDragDropPayload(type,data,sz,cond);
 }
 CIMGUI_API void igEndDragDropSource()
 {
@@ -1191,6 +1219,10 @@ CIMGUI_API bool igIsItemEdited()
 {
     return ImGui::IsItemEdited();
 }
+CIMGUI_API bool igIsItemActivated()
+{
+    return ImGui::IsItemActivated();
+}
 CIMGUI_API bool igIsItemDeactivated()
 {
     return ImGui::IsItemDeactivated();
@@ -1243,9 +1275,13 @@ CIMGUI_API int igGetFrameCount()
 {
     return ImGui::GetFrameCount();
 }
-CIMGUI_API ImDrawList* igGetOverlayDrawList()
+CIMGUI_API ImDrawList* igGetBackgroundDrawList()
 {
-    return ImGui::GetOverlayDrawList();
+    return ImGui::GetBackgroundDrawList();
+}
+CIMGUI_API ImDrawList* igGetForegroundDrawList()
+{
+    return ImGui::GetForegroundDrawList();
 }
 CIMGUI_API ImDrawListSharedData* igGetDrawListSharedData()
 {
@@ -1363,13 +1399,13 @@ CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor type)
 {
     return ImGui::SetMouseCursor(type);
 }
-CIMGUI_API void igCaptureKeyboardFromApp(bool capture)
+CIMGUI_API void igCaptureKeyboardFromApp(bool want_capture_keyboard_value)
 {
-    return ImGui::CaptureKeyboardFromApp(capture);
+    return ImGui::CaptureKeyboardFromApp(want_capture_keyboard_value);
 }
-CIMGUI_API void igCaptureMouseFromApp(bool capture)
+CIMGUI_API void igCaptureMouseFromApp(bool want_capture_mouse_value)
 {
-    return ImGui::CaptureMouseFromApp(capture);
+    return ImGui::CaptureMouseFromApp(want_capture_mouse_value);
 }
 CIMGUI_API const char* igGetClipboardText()
 {
@@ -1419,13 +1455,13 @@ CIMGUI_API void ImGuiStyle_ScaleAllSizes(ImGuiStyle* self,float scale_factor)
 {
     return self->ScaleAllSizes(scale_factor);
 }
-CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,ImWchar c)
+CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,unsigned int c)
 {
     return self->AddInputCharacter(c);
 }
-CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(ImGuiIO* self,const char* utf8_chars)
+CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(ImGuiIO* self,const char* str)
 {
-    return self->AddInputCharactersUTF8(utf8_chars);
+    return self->AddInputCharactersUTF8(str);
 }
 CIMGUI_API void ImGuiIO_ClearInputCharacters(ImGuiIO* self)
 {
@@ -1519,31 +1555,23 @@ CIMGUI_API bool ImGuiTextFilter_IsActive(ImGuiTextFilter* self)
 {
     return self->IsActive();
 }
-CIMGUI_API TextRange* TextRange_TextRange(void)
+CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRange(void)
 {
-    return IM_NEW(TextRange)();
+    return IM_NEW(ImGuiTextRange)();
 }
-CIMGUI_API void TextRange_destroy(TextRange* self)
+CIMGUI_API void ImGuiTextRange_destroy(ImGuiTextRange* self)
 {
     IM_DELETE(self);
 }
-CIMGUI_API TextRange* TextRange_TextRangeStr(const char* _b,const char* _e)
+CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRangeStr(const char* _b,const char* _e)
 {
-    return IM_NEW(TextRange)(_b,_e);
+    return IM_NEW(ImGuiTextRange)(_b,_e);
 }
-CIMGUI_API const char* TextRange_begin(TextRange* self)
-{
-    return self->begin();
-}
-CIMGUI_API const char* TextRange_end(TextRange* self)
-{
-    return self->end();
-}
-CIMGUI_API bool TextRange_empty(TextRange* self)
+CIMGUI_API bool ImGuiTextRange_empty(ImGuiTextRange* self)
 {
     return self->empty();
 }
-CIMGUI_API void TextRange_split(TextRange* self,char separator,ImVector_TextRange* out)
+CIMGUI_API void ImGuiTextRange_split(ImGuiTextRange* self,char separator,ImVector_ImGuiTextRange* out)
 {
     return self->split(separator,out);
 }
@@ -1583,25 +1611,29 @@ CIMGUI_API const char* ImGuiTextBuffer_c_str(ImGuiTextBuffer* self)
 {
     return self->c_str();
 }
+CIMGUI_API void ImGuiTextBuffer_append(ImGuiTextBuffer* self,const char* str,const char* str_end)
+{
+    return self->append(str,str_end);
+}
 CIMGUI_API void ImGuiTextBuffer_appendfv(ImGuiTextBuffer* self,const char* fmt,va_list args)
 {
     return self->appendfv(fmt,args);
 }
-CIMGUI_API Pair* Pair_PairInt(ImGuiID _key,int _val_i)
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairInt(ImGuiID _key,int _val_i)
 {
-    return IM_NEW(Pair)(_key,_val_i);
+    return IM_NEW(ImGuiStoragePair)(_key,_val_i);
 }
-CIMGUI_API void Pair_destroy(Pair* self)
+CIMGUI_API void ImGuiStoragePair_destroy(ImGuiStoragePair* self)
 {
     IM_DELETE(self);
 }
-CIMGUI_API Pair* Pair_PairFloat(ImGuiID _key,float _val_f)
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairFloat(ImGuiID _key,float _val_f)
 {
-    return IM_NEW(Pair)(_key,_val_f);
+    return IM_NEW(ImGuiStoragePair)(_key,_val_f);
 }
-CIMGUI_API Pair* Pair_PairPtr(ImGuiID _key,void* _val_p)
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairPtr(ImGuiID _key,void* _val_p)
 {
-    return IM_NEW(Pair)(_key,_val_p);
+    return IM_NEW(ImGuiStoragePair)(_key,_val_p);
 }
 CIMGUI_API void ImGuiStorage_Clear(ImGuiStorage* self)
 {
@@ -1723,6 +1755,34 @@ CIMGUI_API void ImDrawCmd_destroy(ImDrawCmd* self)
 {
     IM_DELETE(self);
 }
+CIMGUI_API ImDrawListSplitter* ImDrawListSplitter_ImDrawListSplitter(void)
+{
+    return IM_NEW(ImDrawListSplitter)();
+}
+CIMGUI_API void ImDrawListSplitter_destroy(ImDrawListSplitter* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImDrawListSplitter_Clear(ImDrawListSplitter* self)
+{
+    return self->Clear();
+}
+CIMGUI_API void ImDrawListSplitter_ClearFreeMemory(ImDrawListSplitter* self)
+{
+    return self->ClearFreeMemory();
+}
+CIMGUI_API void ImDrawListSplitter_Split(ImDrawListSplitter* self,ImDrawList* draw_list,int count)
+{
+    return self->Split(draw_list,count);
+}
+CIMGUI_API void ImDrawListSplitter_Merge(ImDrawListSplitter* self,ImDrawList* draw_list)
+{
+    return self->Merge(draw_list);
+}
+CIMGUI_API void ImDrawListSplitter_SetCurrentChannel(ImDrawListSplitter* self,ImDrawList* draw_list,int channel_idx)
+{
+    return self->SetCurrentChannel(draw_list,channel_idx);
+}
 CIMGUI_API ImDrawList* ImDrawList_ImDrawList(const ImDrawListSharedData* shared_data)
 {
     return IM_NEW(ImDrawList)(shared_data);
@@ -1759,45 +1819,45 @@ CIMGUI_API ImVec2 ImDrawList_GetClipRectMax(ImDrawList* self)
 {
     return self->GetClipRectMax();
 }
-CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float thickness)
+CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,ImU32 col,float thickness)
 {
-    return self->AddLine(a,b,col,thickness);
+    return self->AddLine(p1,p2,col,thickness);
 }
-CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float rounding,int rounding_corners_flags,float thickness)
+CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners,float thickness)
 {
-    return self->AddRect(a,b,col,rounding,rounding_corners_flags,thickness);
+    return self->AddRect(p_min,p_max,col,rounding,rounding_corners,thickness);
 }
-CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float rounding,int rounding_corners_flags)
+CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners)
 {
-    return self->AddRectFilled(a,b,col,rounding,rounding_corners_flags);
+    return self->AddRectFilled(p_min,p_max,col,rounding,rounding_corners);
 }
-CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left)
+CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left)
 {
-    return self->AddRectFilledMultiColor(a,b,col_upr_left,col_upr_right,col_bot_right,col_bot_left);
+    return self->AddRectFilledMultiColor(p_min,p_max,col_upr_left,col_upr_right,col_bot_right,col_bot_left);
 }
-CIMGUI_API void ImDrawList_AddQuad(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,ImU32 col,float thickness)
+CIMGUI_API void ImDrawList_AddQuad(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness)
 {
-    return self->AddQuad(a,b,c,d,col,thickness);
+    return self->AddQuad(p1,p2,p3,p4,col,thickness);
 }
-CIMGUI_API void ImDrawList_AddQuadFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,ImU32 col)
+CIMGUI_API void ImDrawList_AddQuadFilled(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col)
 {
-    return self->AddQuadFilled(a,b,c,d,col);
+    return self->AddQuadFilled(p1,p2,p3,p4,col);
 }
-CIMGUI_API void ImDrawList_AddTriangle(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,ImU32 col,float thickness)
+CIMGUI_API void ImDrawList_AddTriangle(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col,float thickness)
 {
-    return self->AddTriangle(a,b,c,col,thickness);
+    return self->AddTriangle(p1,p2,p3,col,thickness);
 }
-CIMGUI_API void ImDrawList_AddTriangleFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,ImU32 col)
+CIMGUI_API void ImDrawList_AddTriangleFilled(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col)
 {
-    return self->AddTriangleFilled(a,b,c,col);
+    return self->AddTriangleFilled(p1,p2,p3,col);
 }
-CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 centre,float radius,ImU32 col,int num_segments,float thickness)
+CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments,float thickness)
 {
-    return self->AddCircle(centre,radius,col,num_segments,thickness);
+    return self->AddCircle(center,radius,col,num_segments,thickness);
 }
-CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 centre,float radius,ImU32 col,int num_segments)
+CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments)
 {
-    return self->AddCircleFilled(centre,radius,col,num_segments);
+    return self->AddCircleFilled(center,radius,col,num_segments);
 }
 CIMGUI_API void ImDrawList_AddText(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end)
 {
@@ -1807,23 +1867,11 @@ CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,fl
 {
     return self->AddText(font,font_size,pos,col,text_begin,text_end,wrap_width,cpu_fine_clip_rect);
 }
-CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col)
-{
-    return self->AddImage(user_texture_id,a,b,uv_a,uv_b,col);
-}
-CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,const ImVec2 uv_a,const ImVec2 uv_b,const ImVec2 uv_c,const ImVec2 uv_d,ImU32 col)
-{
-    return self->AddImageQuad(user_texture_id,a,b,c,d,uv_a,uv_b,uv_c,uv_d,col);
-}
-CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col,float rounding,int rounding_corners)
-{
-    return self->AddImageRounded(user_texture_id,a,b,uv_a,uv_b,col,rounding,rounding_corners);
-}
-CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col,bool closed,float thickness)
+CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness)
 {
     return self->AddPolyline(points,num_points,col,closed,thickness);
 }
-CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col)
+CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col)
 {
     return self->AddConvexPolyFilled(points,num_points,col);
 }
@@ -1831,6 +1879,18 @@ CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 pos0,con
 {
     return self->AddBezierCurve(pos0,cp0,cp1,pos1,col,thickness,num_segments);
 }
+CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col)
+{
+    return self->AddImage(user_texture_id,p_min,p_max,uv_min,uv_max,col);
+}
+CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,const ImVec2 uv1,const ImVec2 uv2,const ImVec2 uv3,const ImVec2 uv4,ImU32 col)
+{
+    return self->AddImageQuad(user_texture_id,p1,p2,p3,p4,uv1,uv2,uv3,uv4,col);
+}
+CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners)
+{
+    return self->AddImageRounded(user_texture_id,p_min,p_max,uv_min,uv_max,col,rounding,rounding_corners);
+}
 CIMGUI_API void ImDrawList_PathClear(ImDrawList* self)
 {
     return self->PathClear();
@@ -1851,33 +1911,21 @@ CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,bool closed,flo
 {
     return self->PathStroke(col,closed,thickness);
 }
-CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 centre,float radius,float a_min,float a_max,int num_segments)
+CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments)
 {
-    return self->PathArcTo(centre,radius,a_min,a_max,num_segments);
+    return self->PathArcTo(center,radius,a_min,a_max,num_segments);
 }
-CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 centre,float radius,int a_min_of_12,int a_max_of_12)
+CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 center,float radius,int a_min_of_12,int a_max_of_12)
 {
-    return self->PathArcToFast(centre,radius,a_min_of_12,a_max_of_12);
+    return self->PathArcToFast(center,radius,a_min_of_12,a_max_of_12);
 }
 CIMGUI_API void ImDrawList_PathBezierCurveTo(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,int num_segments)
 {
     return self->PathBezierCurveTo(p1,p2,p3,num_segments);
 }
-CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,int rounding_corners_flags)
+CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawCornerFlags rounding_corners)
 {
-    return self->PathRect(rect_min,rect_max,rounding,rounding_corners_flags);
-}
-CIMGUI_API void ImDrawList_ChannelsSplit(ImDrawList* self,int channels_count)
-{
-    return self->ChannelsSplit(channels_count);
-}
-CIMGUI_API void ImDrawList_ChannelsMerge(ImDrawList* self)
-{
-    return self->ChannelsMerge();
-}
-CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* self,int channel_index)
-{
-    return self->ChannelsSetCurrent(channel_index);
+    return self->PathRect(rect_min,rect_max,rounding,rounding_corners);
 }
 CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data)
 {
@@ -1891,6 +1939,18 @@ CIMGUI_API ImDrawList* ImDrawList_CloneOutput(ImDrawList* self)
 {
     return self->CloneOutput();
 }
+CIMGUI_API void ImDrawList_ChannelsSplit(ImDrawList* self,int count)
+{
+    return self->ChannelsSplit(count);
+}
+CIMGUI_API void ImDrawList_ChannelsMerge(ImDrawList* self)
+{
+    return self->ChannelsMerge();
+}
+CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* self,int n)
+{
+    return self->ChannelsSetCurrent(n);
+}
 CIMGUI_API void ImDrawList_Clear(ImDrawList* self)
 {
     return self->Clear();
@@ -1951,9 +2011,9 @@ CIMGUI_API void ImDrawData_DeIndexAllBuffers(ImDrawData* self)
 {
     return self->DeIndexAllBuffers();
 }
-CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 sc)
+CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 fb_scale)
 {
-    return self->ScaleClipRects(sc);
+    return self->ScaleClipRects(fb_scale);
 }
 CIMGUI_API ImFontConfig* ImFontConfig_ImFontConfig(void)
 {
@@ -1963,6 +2023,54 @@ CIMGUI_API void ImFontConfig_destroy(ImFontConfig* self)
 {
     IM_DELETE(self);
 }
+CIMGUI_API ImFontGlyphRangesBuilder* ImFontGlyphRangesBuilder_ImFontGlyphRangesBuilder(void)
+{
+    return IM_NEW(ImFontGlyphRangesBuilder)();
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_destroy(ImFontGlyphRangesBuilder* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_Clear(ImFontGlyphRangesBuilder* self)
+{
+    return self->Clear();
+}
+CIMGUI_API bool ImFontGlyphRangesBuilder_GetBit(ImFontGlyphRangesBuilder* self,int n)
+{
+    return self->GetBit(n);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_SetBit(ImFontGlyphRangesBuilder* self,int n)
+{
+    return self->SetBit(n);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_AddChar(ImFontGlyphRangesBuilder* self,ImWchar c)
+{
+    return self->AddChar(c);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_AddText(ImFontGlyphRangesBuilder* self,const char* text,const char* text_end)
+{
+    return self->AddText(text,text_end);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_AddRanges(ImFontGlyphRangesBuilder* self,const ImWchar* ranges)
+{
+    return self->AddRanges(ranges);
+}
+CIMGUI_API void ImFontGlyphRangesBuilder_BuildRanges(ImFontGlyphRangesBuilder* self,ImVector_ImWchar* out_ranges)
+{
+    return self->BuildRanges(out_ranges);
+}
+CIMGUI_API ImFontAtlasCustomRect* ImFontAtlasCustomRect_ImFontAtlasCustomRect(void)
+{
+    return IM_NEW(ImFontAtlasCustomRect)();
+}
+CIMGUI_API void ImFontAtlasCustomRect_destroy(ImFontAtlasCustomRect* self)
+{
+    IM_DELETE(self);
+}
+CIMGUI_API bool ImFontAtlasCustomRect_IsPacked(ImFontAtlasCustomRect* self)
+{
+    return self->IsPacked();
+}
 CIMGUI_API ImFontAtlas* ImFontAtlas_ImFontAtlas(void)
 {
     return IM_NEW(ImFontAtlas)();
@@ -2015,10 +2123,6 @@ CIMGUI_API bool ImFontAtlas_Build(ImFontAtlas* self)
 {
     return self->Build();
 }
-CIMGUI_API bool ImFontAtlas_IsBuilt(ImFontAtlas* self)
-{
-    return self->IsBuilt();
-}
 CIMGUI_API void ImFontAtlas_GetTexDataAsAlpha8(ImFontAtlas* self,unsigned char** out_pixels,int* out_width,int* out_height,int* out_bytes_per_pixel)
 {
     return self->GetTexDataAsAlpha8(out_pixels,out_width,out_height,out_bytes_per_pixel);
@@ -2027,6 +2131,10 @@ CIMGUI_API void ImFontAtlas_GetTexDataAsRGBA32(ImFontAtlas* self,unsigned char**
 {
     return self->GetTexDataAsRGBA32(out_pixels,out_width,out_height,out_bytes_per_pixel);
 }
+CIMGUI_API bool ImFontAtlas_IsBuilt(ImFontAtlas* self)
+{
+    return self->IsBuilt();
+}
 CIMGUI_API void ImFontAtlas_SetTexID(ImFontAtlas* self,ImTextureID id)
 {
     return self->SetTexID(id);
@@ -2059,49 +2167,9 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self)
 {
     return self->GetGlyphRangesThai();
 }
-CIMGUI_API GlyphRangesBuilder* GlyphRangesBuilder_GlyphRangesBuilder(void)
+CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesVietnamese(ImFontAtlas* self)
 {
-    return IM_NEW(GlyphRangesBuilder)();
-}
-CIMGUI_API void GlyphRangesBuilder_destroy(GlyphRangesBuilder* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API bool GlyphRangesBuilder_GetBit(GlyphRangesBuilder* self,int n)
-{
-    return self->GetBit(n);
-}
-CIMGUI_API void GlyphRangesBuilder_SetBit(GlyphRangesBuilder* self,int n)
-{
-    return self->SetBit(n);
-}
-CIMGUI_API void GlyphRangesBuilder_AddChar(GlyphRangesBuilder* self,ImWchar c)
-{
-    return self->AddChar(c);
-}
-CIMGUI_API void GlyphRangesBuilder_AddText(GlyphRangesBuilder* self,const char* text,const char* text_end)
-{
-    return self->AddText(text,text_end);
-}
-CIMGUI_API void GlyphRangesBuilder_AddRanges(GlyphRangesBuilder* self,const ImWchar* ranges)
-{
-    return self->AddRanges(ranges);
-}
-CIMGUI_API void GlyphRangesBuilder_BuildRanges(GlyphRangesBuilder* self,ImVector_ImWchar* out_ranges)
-{
-    return self->BuildRanges(out_ranges);
-}
-CIMGUI_API CustomRect* CustomRect_CustomRect(void)
-{
-    return IM_NEW(CustomRect)();
-}
-CIMGUI_API void CustomRect_destroy(CustomRect* self)
-{
-    IM_DELETE(self);
-}
-CIMGUI_API bool CustomRect_IsPacked(CustomRect* self)
-{
-    return self->IsPacked();
+    return self->GetGlyphRangesVietnamese();
 }
 CIMGUI_API int ImFontAtlas_AddCustomRectRegular(ImFontAtlas* self,unsigned int id,int width,int height)
 {
@@ -2111,11 +2179,11 @@ CIMGUI_API int ImFontAtlas_AddCustomRectFontGlyph(ImFontAtlas* self,ImFont* font
 {
     return self->AddCustomRectFontGlyph(font,id,width,height,advance_x,offset);
 }
-CIMGUI_API const CustomRect* ImFontAtlas_GetCustomRectByIndex(ImFontAtlas* self,int index)
+CIMGUI_API const ImFontAtlasCustomRect* ImFontAtlas_GetCustomRectByIndex(ImFontAtlas* self,int index)
 {
     return self->GetCustomRectByIndex(index);
 }
-CIMGUI_API void ImFontAtlas_CalcCustomRectUV(ImFontAtlas* self,const CustomRect* rect,ImVec2* out_uv_min,ImVec2* out_uv_max)
+CIMGUI_API void ImFontAtlas_CalcCustomRectUV(ImFontAtlas* self,const ImFontAtlasCustomRect* rect,ImVec2* out_uv_min,ImVec2* out_uv_max)
 {
     return self->CalcCustomRectUV(rect,out_uv_min,out_uv_max);
 }
@@ -2131,14 +2199,6 @@ CIMGUI_API void ImFont_destroy(ImFont* self)
 {
     IM_DELETE(self);
 }
-CIMGUI_API void ImFont_ClearOutputData(ImFont* self)
-{
-    return self->ClearOutputData();
-}
-CIMGUI_API void ImFont_BuildLookupTable(ImFont* self)
-{
-    return self->BuildLookupTable();
-}
 CIMGUI_API const ImFontGlyph* ImFont_FindGlyph(ImFont* self,ImWchar c)
 {
     return self->FindGlyph(c);
@@ -2147,10 +2207,6 @@ CIMGUI_API const ImFontGlyph* ImFont_FindGlyphNoFallback(ImFont* self,ImWchar c)
 {
     return self->FindGlyphNoFallback(c);
 }
-CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c)
-{
-    return self->SetFallbackChar(c);
-}
 CIMGUI_API float ImFont_GetCharAdvance(ImFont* self,ImWchar c)
 {
     return self->GetCharAdvance(c);
@@ -2179,6 +2235,14 @@ CIMGUI_API void ImFont_RenderText(ImFont* self,ImDrawList* draw_list,float size,
 {
     return self->RenderText(draw_list,size,pos,col,clip_rect,text_begin,text_end,wrap_width,cpu_fine_clip);
 }
+CIMGUI_API void ImFont_BuildLookupTable(ImFont* self)
+{
+    return self->BuildLookupTable();
+}
+CIMGUI_API void ImFont_ClearOutputData(ImFont* self)
+{
+    return self->ClearOutputData();
+}
 CIMGUI_API void ImFont_GrowIndex(ImFont* self,int new_size)
 {
     return self->GrowIndex(new_size);
@@ -2191,6 +2255,10 @@ CIMGUI_API void ImFont_AddRemapChar(ImFont* self,ImWchar dst,ImWchar src,bool ov
 {
     return self->AddRemapChar(dst,src,overwrite_dst);
 }
+CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c)
+{
+    return self->SetFallbackChar(c);
+}
 CIMGUI_API void igGetWindowPos_nonUDT(ImVec2 *pOut)
 {
     *pOut = ImGui::GetWindowPos();
@@ -2450,10 +2518,7 @@ CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
 {
 	return IM_NEW(ImVector<ImWchar>) ();
 }
-CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* p)
-{
-	IM_DELETE(p);
-}
+
 CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p)
 {
 	IM_PLACEMENT_NEW(p) ImVector<ImWchar>();

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.66b" from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.73" from Dear ImGui https://github.com/ocornut/imgui
 #ifndef CIMGUI_INCLUDED
 #define CIMGUI_INCLUDED
 #include <stdio.h>
@@ -42,16 +42,13 @@ typedef struct ImColor_Simple { ImVec4_Simple Value;} ImColor_Simple;
 
 
 #ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-typedef struct CustomRect CustomRect;
-typedef struct GlyphRangesBuilder GlyphRangesBuilder;
-typedef struct ImFontGlyph ImFontGlyph;
-typedef unsigned short ImDrawIdx;;
-typedef struct Pair Pair;
-typedef struct TextRange TextRange;
+typedef struct ImGuiStoragePair ImGuiStoragePair;
+typedef struct ImGuiTextRange ImGuiTextRange;
+typedef struct ImFontAtlasCustomRect ImFontAtlasCustomRect;
 typedef struct ImVec4 ImVec4;
 typedef struct ImVec2 ImVec2;
-typedef struct ImGuiTextBuffer ImGuiTextBuffer;
 typedef struct ImGuiTextFilter ImGuiTextFilter;
+typedef struct ImGuiTextBuffer ImGuiTextBuffer;
 typedef struct ImGuiStyle ImGuiStyle;
 typedef struct ImGuiStorage ImGuiStorage;
 typedef struct ImGuiSizeCallbackData ImGuiSizeCallbackData;
@@ -62,26 +59,32 @@ typedef struct ImGuiInputTextCallbackData ImGuiInputTextCallbackData;
 typedef struct ImGuiIO ImGuiIO;
 typedef struct ImGuiContext ImGuiContext;
 typedef struct ImColor ImColor;
+typedef struct ImFontGlyphRangesBuilder ImFontGlyphRangesBuilder;
+typedef struct ImFontGlyph ImFontGlyph;
 typedef struct ImFontConfig ImFontConfig;
 typedef struct ImFontAtlas ImFontAtlas;
 typedef struct ImFont ImFont;
 typedef struct ImDrawVert ImDrawVert;
+typedef struct ImDrawListSplitter ImDrawListSplitter;
 typedef struct ImDrawListSharedData ImDrawListSharedData;
 typedef struct ImDrawList ImDrawList;
 typedef struct ImDrawData ImDrawData;
 typedef struct ImDrawCmd ImDrawCmd;
 typedef struct ImDrawChannel ImDrawChannel;
+
 struct ImDrawChannel;
 struct ImDrawCmd;
 struct ImDrawData;
 struct ImDrawList;
 struct ImDrawListSharedData;
+struct ImDrawListSplitter;
 struct ImDrawVert;
 struct ImFont;
 struct ImFontAtlas;
 struct ImFontConfig;
+struct ImFontGlyph;
+struct ImFontGlyphRangesBuilder;
 struct ImColor;
-typedef void* ImTextureID;
 struct ImGuiContext;
 struct ImGuiIO;
 struct ImGuiInputTextCallbackData;
@@ -91,8 +94,9 @@ struct ImGuiPayload;
 struct ImGuiSizeCallbackData;
 struct ImGuiStorage;
 struct ImGuiStyle;
-struct ImGuiTextFilter;
 struct ImGuiTextBuffer;
+struct ImGuiTextFilter;
+typedef void* ImTextureID;
 typedef unsigned int ImGuiID;
 typedef unsigned short ImWchar;
 typedef int ImGuiCol;
@@ -108,7 +112,6 @@ typedef int ImDrawListFlags;
 typedef int ImFontAtlasFlags;
 typedef int ImGuiBackendFlags;
 typedef int ImGuiColorEditFlags;
-typedef int ImGuiColumnsFlags;
 typedef int ImGuiConfigFlags;
 typedef int ImGuiComboFlags;
 typedef int ImGuiDragDropFlags;
@@ -116,14 +119,40 @@ typedef int ImGuiFocusedFlags;
 typedef int ImGuiHoveredFlags;
 typedef int ImGuiInputTextFlags;
 typedef int ImGuiSelectableFlags;
+typedef int ImGuiTabBarFlags;
+typedef int ImGuiTabItemFlags;
 typedef int ImGuiTreeNodeFlags;
 typedef int ImGuiWindowFlags;
 typedef int (*ImGuiInputTextCallback)(ImGuiInputTextCallbackData *data);
 typedef void (*ImGuiSizeCallback)(ImGuiSizeCallbackData* data);
+typedef signed char ImS8;
+typedef unsigned char ImU8;
+typedef signed short ImS16;
+typedef unsigned short ImU16;
 typedef signed int ImS32;
 typedef unsigned int ImU32;
 typedef int64_t ImS64;
 typedef uint64_t ImU64;
+typedef void (*ImDrawCallback)(const ImDrawList* parent_list, const ImDrawCmd* cmd);
+typedef unsigned short ImDrawIdx;typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;
+typedef struct ImVector_float {int Size;int Capacity;float* Data;} ImVector_float;
+typedef struct ImVector_ImWchar {int Size;int Capacity;ImWchar* Data;} ImVector_ImWchar;
+typedef struct ImVector_ImDrawVert {int Size;int Capacity;ImDrawVert* Data;} ImVector_ImDrawVert;
+typedef struct ImVector_ImFontGlyph {int Size;int Capacity;ImFontGlyph* Data;} ImVector_ImFontGlyph;
+typedef struct ImVector_ImGuiTextRange {int Size;int Capacity;ImGuiTextRange* Data;} ImVector_ImGuiTextRange;
+typedef struct ImVector_ImGuiStoragePair {int Size;int Capacity;ImGuiStoragePair* Data;} ImVector_ImGuiStoragePair;
+typedef struct ImVector_ImDrawChannel {int Size;int Capacity;ImDrawChannel* Data;} ImVector_ImDrawChannel;
+typedef struct ImVector_char {int Size;int Capacity;char* Data;} ImVector_char;
+typedef struct ImVector_ImU32 {int Size;int Capacity;ImU32* Data;} ImVector_ImU32;
+typedef struct ImVector_ImFontAtlasCustomRect {int Size;int Capacity;ImFontAtlasCustomRect* Data;} ImVector_ImFontAtlasCustomRect;
+typedef struct ImVector_ImTextureID {int Size;int Capacity;ImTextureID* Data;} ImVector_ImTextureID;
+typedef struct ImVector_ImFontConfig {int Size;int Capacity;ImFontConfig* Data;} ImVector_ImFontConfig;
+typedef struct ImVector_ImFontPtr {int Size;int Capacity;ImFont** Data;} ImVector_ImFontPtr;
+typedef struct ImVector_ImDrawCmd {int Size;int Capacity;ImDrawCmd* Data;} ImVector_ImDrawCmd;
+typedef struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_ImVec4;
+typedef struct ImVector_ImDrawIdx {int Size;int Capacity;ImDrawIdx* Data;} ImVector_ImDrawIdx;
+typedef struct ImVector_ImVec2 {int Size;int Capacity;ImVec2* Data;} ImVector_ImVec2;
+
 struct ImVec2
 {
     float x, y;
@@ -154,6 +183,7 @@ enum ImGuiWindowFlags_
     ImGuiWindowFlags_AlwaysUseWindowPadding = 1 << 16,
     ImGuiWindowFlags_NoNavInputs = 1 << 18,
     ImGuiWindowFlags_NoNavFocus = 1 << 19,
+    ImGuiWindowFlags_UnsavedDocument = 1 << 20,
     ImGuiWindowFlags_NoNav = ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus,
     ImGuiWindowFlags_NoDecoration = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoCollapse,
     ImGuiWindowFlags_NoInputs = ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus,
@@ -186,7 +216,8 @@ enum ImGuiInputTextFlags_
     ImGuiInputTextFlags_NoUndoRedo = 1 << 16,
     ImGuiInputTextFlags_CharsScientific = 1 << 17,
     ImGuiInputTextFlags_CallbackResize = 1 << 18,
-    ImGuiInputTextFlags_Multiline = 1 << 20
+    ImGuiInputTextFlags_Multiline = 1 << 20,
+    ImGuiInputTextFlags_NoMarkEdited = 1 << 21
 };
 enum ImGuiTreeNodeFlags_
 {
@@ -202,6 +233,8 @@ enum ImGuiTreeNodeFlags_
     ImGuiTreeNodeFlags_Leaf = 1 << 8,
     ImGuiTreeNodeFlags_Bullet = 1 << 9,
     ImGuiTreeNodeFlags_FramePadding = 1 << 10,
+    ImGuiTreeNodeFlags_SpanAvailWidth = 1 << 11,
+    ImGuiTreeNodeFlags_SpanFullWidth = 1 << 12,
     ImGuiTreeNodeFlags_NavLeftJumpsBackHere = 1 << 13,
     ImGuiTreeNodeFlags_CollapsingHeader = ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_NoAutoOpenOnLog
 };
@@ -211,7 +244,8 @@ enum ImGuiSelectableFlags_
     ImGuiSelectableFlags_DontClosePopups = 1 << 0,
     ImGuiSelectableFlags_SpanAllColumns = 1 << 1,
     ImGuiSelectableFlags_AllowDoubleClick = 1 << 2,
-    ImGuiSelectableFlags_Disabled = 1 << 3
+    ImGuiSelectableFlags_Disabled = 1 << 3,
+    ImGuiSelectableFlags_AllowItemOverlap = 1 << 4
 };
 enum ImGuiComboFlags_
 {
@@ -225,6 +259,28 @@ enum ImGuiComboFlags_
     ImGuiComboFlags_NoPreview = 1 << 6,
     ImGuiComboFlags_HeightMask_ = ImGuiComboFlags_HeightSmall | ImGuiComboFlags_HeightRegular | ImGuiComboFlags_HeightLarge | ImGuiComboFlags_HeightLargest
 };
+enum ImGuiTabBarFlags_
+{
+    ImGuiTabBarFlags_None = 0,
+    ImGuiTabBarFlags_Reorderable = 1 << 0,
+    ImGuiTabBarFlags_AutoSelectNewTabs = 1 << 1,
+    ImGuiTabBarFlags_TabListPopupButton = 1 << 2,
+    ImGuiTabBarFlags_NoCloseWithMiddleMouseButton = 1 << 3,
+    ImGuiTabBarFlags_NoTabListScrollingButtons = 1 << 4,
+    ImGuiTabBarFlags_NoTooltip = 1 << 5,
+    ImGuiTabBarFlags_FittingPolicyResizeDown = 1 << 6,
+    ImGuiTabBarFlags_FittingPolicyScroll = 1 << 7,
+    ImGuiTabBarFlags_FittingPolicyMask_ = ImGuiTabBarFlags_FittingPolicyResizeDown | ImGuiTabBarFlags_FittingPolicyScroll,
+    ImGuiTabBarFlags_FittingPolicyDefault_ = ImGuiTabBarFlags_FittingPolicyResizeDown
+};
+enum ImGuiTabItemFlags_
+{
+    ImGuiTabItemFlags_None = 0,
+    ImGuiTabItemFlags_UnsavedDocument = 1 << 0,
+    ImGuiTabItemFlags_SetSelected = 1 << 1,
+    ImGuiTabItemFlags_NoCloseWithMiddleMouseButton = 1 << 2,
+    ImGuiTabItemFlags_NoPushId = 1 << 3
+};
 enum ImGuiFocusedFlags_
 {
     ImGuiFocusedFlags_None = 0,
@@ -262,6 +318,10 @@ enum ImGuiDragDropFlags_
 };
 enum ImGuiDataType_
 {
+    ImGuiDataType_S8,
+    ImGuiDataType_U8,
+    ImGuiDataType_S16,
+    ImGuiDataType_U16,
     ImGuiDataType_S32,
     ImGuiDataType_U32,
     ImGuiDataType_S64,
@@ -296,6 +356,7 @@ enum ImGuiKey_
     ImGuiKey_Space,
     ImGuiKey_Enter,
     ImGuiKey_Escape,
+    ImGuiKey_KeyPadEnter,
     ImGuiKey_A,
     ImGuiKey_C,
     ImGuiKey_V,
@@ -323,6 +384,7 @@ enum ImGuiNavInput_
     ImGuiNavInput_TweakSlow,
     ImGuiNavInput_TweakFast,
     ImGuiNavInput_KeyMenu_,
+    ImGuiNavInput_KeyTab_,
     ImGuiNavInput_KeyLeft_,
     ImGuiNavInput_KeyRight_,
     ImGuiNavInput_KeyUp_,
@@ -347,7 +409,8 @@ enum ImGuiBackendFlags_
     ImGuiBackendFlags_None = 0,
     ImGuiBackendFlags_HasGamepad = 1 << 0,
     ImGuiBackendFlags_HasMouseCursors = 1 << 1,
-    ImGuiBackendFlags_HasSetMousePos = 1 << 2
+    ImGuiBackendFlags_HasSetMousePos = 1 << 2,
+    ImGuiBackendFlags_RendererHasVtxOffset = 1 << 3
 };
 enum ImGuiCol_
 {
@@ -384,6 +447,11 @@ enum ImGuiCol_
     ImGuiCol_ResizeGrip,
     ImGuiCol_ResizeGripHovered,
     ImGuiCol_ResizeGripActive,
+    ImGuiCol_Tab,
+    ImGuiCol_TabHovered,
+    ImGuiCol_TabActive,
+    ImGuiCol_TabUnfocused,
+    ImGuiCol_TabUnfocusedActive,
     ImGuiCol_PlotLines,
     ImGuiCol_PlotLinesHovered,
     ImGuiCol_PlotHistogram,
@@ -418,7 +486,9 @@ enum ImGuiStyleVar_
     ImGuiStyleVar_ScrollbarRounding,
     ImGuiStyleVar_GrabMinSize,
     ImGuiStyleVar_GrabRounding,
+    ImGuiStyleVar_TabRounding,
     ImGuiStyleVar_ButtonTextAlign,
+    ImGuiStyleVar_SelectableTextAlign,
     ImGuiStyleVar_COUNT
 };
 enum ImGuiColorEditFlags_
@@ -437,17 +507,20 @@ enum ImGuiColorEditFlags_
     ImGuiColorEditFlags_AlphaPreview = 1 << 17,
     ImGuiColorEditFlags_AlphaPreviewHalf= 1 << 18,
     ImGuiColorEditFlags_HDR = 1 << 19,
-    ImGuiColorEditFlags_RGB = 1 << 20,
-    ImGuiColorEditFlags_HSV = 1 << 21,
-    ImGuiColorEditFlags_HEX = 1 << 22,
+    ImGuiColorEditFlags_DisplayRGB = 1 << 20,
+    ImGuiColorEditFlags_DisplayHSV = 1 << 21,
+    ImGuiColorEditFlags_DisplayHex = 1 << 22,
     ImGuiColorEditFlags_Uint8 = 1 << 23,
     ImGuiColorEditFlags_Float = 1 << 24,
     ImGuiColorEditFlags_PickerHueBar = 1 << 25,
     ImGuiColorEditFlags_PickerHueWheel = 1 << 26,
-    ImGuiColorEditFlags__InputsMask = ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_HSV|ImGuiColorEditFlags_HEX,
+    ImGuiColorEditFlags_InputRGB = 1 << 27,
+    ImGuiColorEditFlags_InputHSV = 1 << 28,
+    ImGuiColorEditFlags__OptionsDefault = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_PickerHueBar,
+    ImGuiColorEditFlags__DisplayMask = ImGuiColorEditFlags_DisplayRGB|ImGuiColorEditFlags_DisplayHSV|ImGuiColorEditFlags_DisplayHex,
     ImGuiColorEditFlags__DataTypeMask = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_Float,
     ImGuiColorEditFlags__PickerMask = ImGuiColorEditFlags_PickerHueWheel|ImGuiColorEditFlags_PickerHueBar,
-    ImGuiColorEditFlags__OptionsDefault = ImGuiColorEditFlags_Uint8|ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_PickerHueBar
+    ImGuiColorEditFlags__InputMask = ImGuiColorEditFlags_InputRGB|ImGuiColorEditFlags_InputHSV
 };
 enum ImGuiMouseCursor_
 {
@@ -477,6 +550,7 @@ struct ImGuiStyle
     float WindowBorderSize;
     ImVec2 WindowMinSize;
     ImVec2 WindowTitleAlign;
+    ImGuiDir WindowMenuButtonPosition;
     float ChildRounding;
     float ChildBorderSize;
     float PopupRounding;
@@ -493,7 +567,11 @@ struct ImGuiStyle
     float ScrollbarRounding;
     float GrabMinSize;
     float GrabRounding;
+    float TabRounding;
+    float TabBorderSize;
+    ImGuiDir ColorButtonPosition;
     ImVec2 ButtonTextAlign;
+    ImVec2 SelectableTextAlign;
     ImVec2 DisplayWindowPadding;
     ImVec2 DisplaySafeAreaPadding;
     float MouseCursorScale;
@@ -518,19 +596,22 @@ struct ImGuiIO
     float KeyRepeatDelay;
     float KeyRepeatRate;
     void* UserData;
-    ImFontAtlas* Fonts;
+    ImFontAtlas*Fonts;
     float FontGlobalScale;
     bool FontAllowUserScaling;
     ImFont* FontDefault;
     ImVec2 DisplayFramebufferScale;
-    ImVec2 DisplayVisibleMin;
-    ImVec2 DisplayVisibleMax;
     bool MouseDrawCursor;
     bool ConfigMacOSXBehaviors;
     bool ConfigInputTextCursorBlink;
-    bool ConfigResizeWindowsFromEdges;
+    bool ConfigWindowsResizeFromEdges;
+    bool ConfigWindowsMoveFromTitleBarOnly;
+    float ConfigWindowsMemoryCompactTimer;
     const char* BackendPlatformName;
     const char* BackendRendererName;
+    void* BackendPlatformUserData;
+    void* BackendRendererUserData;
+    void* BackendLanguageUserData;
     const char* (*GetClipboardTextFn)(void* user_data);
     void (*SetClipboardTextFn)(void* user_data, const char* text);
     void* ClipboardUserData;
@@ -546,7 +627,6 @@ struct ImGuiIO
     bool KeyAlt;
     bool KeySuper;
     bool KeysDown[512];
-    ImWchar InputCharacters[16+1];
     float NavInputs[ImGuiNavInput_COUNT];
     bool WantCaptureMouse;
     bool WantCaptureKeyboard;
@@ -569,6 +649,7 @@ struct ImGuiIO
     bool MouseDoubleClicked[5];
     bool MouseReleased[5];
     bool MouseDownOwned[5];
+    bool MouseDownWasDoubleClick[5];
     float MouseDownDuration[5];
     float MouseDownDurationPrev[5];
     ImVec2 MouseDragMaxDistanceAbs[5];
@@ -577,6 +658,7 @@ struct ImGuiIO
     float KeysDownDurationPrev[512];
     float NavInputsDownDuration[ImGuiNavInput_COUNT];
     float NavInputsDownDurationPrev[ImGuiNavInput_COUNT];
+    ImVector_ImWchar InputQueueCharacters;
 };
 struct ImGuiInputTextCallbackData
 {
@@ -611,24 +693,6 @@ struct ImGuiPayload
     bool Preview;
     bool Delivery;
 };
-typedef struct ImVector{int Size;int Capacity;void* Data;} ImVector;
-typedef struct ImVector_float {int Size;int Capacity;float* Data;} ImVector_float;
-typedef struct ImVector_ImWchar {int Size;int Capacity;ImWchar* Data;} ImVector_ImWchar;
-typedef struct ImVector_ImFontConfig {int Size;int Capacity;ImFontConfig* Data;} ImVector_ImFontConfig;
-typedef struct ImVector_ImFontGlyph {int Size;int Capacity;ImFontGlyph* Data;} ImVector_ImFontGlyph;
-typedef struct ImVector_unsigned_char {int Size;int Capacity;unsigned char* Data;} ImVector_unsigned_char;
-typedef struct ImVector_Pair {int Size;int Capacity;Pair* Data;} ImVector_Pair;
-typedef struct ImVector_CustomRect {int Size;int Capacity;CustomRect* Data;} ImVector_CustomRect;
-typedef struct ImVector_ImDrawChannel {int Size;int Capacity;ImDrawChannel* Data;} ImVector_ImDrawChannel;
-typedef struct ImVector_char {int Size;int Capacity;char* Data;} ImVector_char;
-typedef struct ImVector_ImTextureID {int Size;int Capacity;ImTextureID* Data;} ImVector_ImTextureID;
-typedef struct ImVector_ImDrawVert {int Size;int Capacity;ImDrawVert* Data;} ImVector_ImDrawVert;
-typedef struct ImVector_ImDrawCmd {int Size;int Capacity;ImDrawCmd* Data;} ImVector_ImDrawCmd;
-typedef struct ImVector_ImFontPtr {int Size;int Capacity;ImFont** Data;} ImVector_ImFontPtr;
-typedef struct ImVector_TextRange {int Size;int Capacity;TextRange* Data;} ImVector_TextRange;
-typedef struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_ImVec4;
-typedef struct ImVector_ImDrawIdx {int Size;int Capacity;ImDrawIdx* Data;} ImVector_ImDrawIdx;
-typedef struct ImVector_ImVec2 {int Size;int Capacity;ImVec2* Data;} ImVector_ImVec2;
 struct ImGuiOnceUponAFrame
 {
      int RefFrame;
@@ -636,7 +700,7 @@ struct ImGuiOnceUponAFrame
 struct ImGuiTextFilter
 {
     char InputBuf[256];
-    ImVector_TextRange Filters;
+    ImVector_ImGuiTextRange Filters;
     int CountGrep;
 };
 struct ImGuiTextBuffer
@@ -645,7 +709,7 @@ struct ImGuiTextBuffer
 };
 struct ImGuiStorage
 {
-    ImVector_Pair Data;
+    ImVector_ImGuiStoragePair Data;
 };
 struct ImGuiListClipper
 {
@@ -657,12 +721,13 @@ struct ImColor
 {
     ImVec4 Value;
 };
-typedef void (*ImDrawCallback)(const ImDrawList* parent_list, const ImDrawCmd* cmd);
 struct ImDrawCmd
 {
     unsigned int ElemCount;
     ImVec4 ClipRect;
     ImTextureID TextureId;
+    unsigned int VtxOffset;
+    unsigned int IdxOffset;
     ImDrawCallback UserCallback;
     void* UserCallbackData;
 };
@@ -674,11 +739,18 @@ struct ImDrawVert
 };
 struct ImDrawChannel
 {
-    ImVector_ImDrawCmd CmdBuffer;
-    ImVector_ImDrawIdx IdxBuffer;
+    ImVector_ImDrawCmd _CmdBuffer;
+    ImVector_ImDrawIdx _IdxBuffer;
+};
+struct ImDrawListSplitter
+{
+    int _Current;
+    int _Count;
+    ImVector_ImDrawChannel _Channels;
 };
 enum ImDrawCornerFlags_
 {
+    ImDrawCornerFlags_None = 0,
     ImDrawCornerFlags_TopLeft = 1 << 0,
     ImDrawCornerFlags_TopRight = 1 << 1,
     ImDrawCornerFlags_BotLeft = 1 << 2,
@@ -693,7 +765,8 @@ enum ImDrawListFlags_
 {
     ImDrawListFlags_None = 0,
     ImDrawListFlags_AntiAliasedLines = 1 << 0,
-    ImDrawListFlags_AntiAliasedFill = 1 << 1
+    ImDrawListFlags_AntiAliasedFill = 1 << 1,
+    ImDrawListFlags_AllowVtxOffset = 1 << 2
 };
 struct ImDrawList
 {
@@ -703,15 +776,14 @@ 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;
-    int _ChannelsCurrent;
-    int _ChannelsCount;
-    ImVector_ImDrawChannel _Channels;
+    ImDrawListSplitter _Splitter;
 };
 struct ImDrawData
 {
@@ -722,6 +794,7 @@ struct ImDrawData
     int TotalVtxCount;
     ImVec2 DisplayPos;
     ImVec2 DisplaySize;
+    ImVec2 FramebufferScale;
 };
 struct ImFontConfig
 {
@@ -741,6 +814,7 @@ struct ImFontConfig
     bool MergeMode;
     unsigned int RasterizerFlags;
     float RasterizerMultiply;
+    ImWchar EllipsisChar;
     char Name[40];
     ImFont* DstFont;
 };
@@ -751,6 +825,19 @@ struct ImFontGlyph
     float X0, Y0, X1, Y1;
     float U0, V0, U1, V1;
 };
+struct ImFontGlyphRangesBuilder
+{
+    ImVector_ImU32 UsedChars;
+};
+struct ImFontAtlasCustomRect
+{
+    unsigned int ID;
+    unsigned short Width, Height;
+    unsigned short X, Y;
+    float GlyphAdvanceX;
+    ImVec2 GlyphOffset;
+    ImFont* Font;
+};
 enum ImFontAtlasFlags_
 {
     ImFontAtlasFlags_None = 0,
@@ -771,52 +858,39 @@ struct ImFontAtlas
     ImVec2 TexUvScale;
     ImVec2 TexUvWhitePixel;
     ImVector_ImFontPtr Fonts;
-    ImVector_CustomRect CustomRects;
+    ImVector_ImFontAtlasCustomRect CustomRects;
     ImVector_ImFontConfig ConfigData;
     int CustomRectIds[1];
 };
 struct ImFont
 {
-    float FontSize;
-    float Scale;
-    ImVec2 DisplayOffset;
-    ImVector_ImFontGlyph Glyphs;
     ImVector_float IndexAdvanceX;
-    ImVector_ImWchar IndexLookup;
-    const ImFontGlyph* FallbackGlyph;
     float FallbackAdvanceX;
-    ImWchar FallbackChar;
-    short ConfigDataCount;
-    ImFontConfig* ConfigData;
+    float FontSize;
+    ImVector_ImWchar IndexLookup;
+    ImVector_ImFontGlyph Glyphs;
+    const ImFontGlyph* FallbackGlyph;
+    ImVec2 DisplayOffset;
     ImFontAtlas* ContainerAtlas;
+    const ImFontConfig* ConfigData;
+    short ConfigDataCount;
+    ImWchar FallbackChar;
+    ImWchar EllipsisChar;
+    float Scale;
     float Ascent, Descent;
-    bool DirtyLookupTables;
     int MetricsTotalSurface;
+    bool DirtyLookupTables;
 };
-    struct GlyphRangesBuilder
-    {
-        ImVector_unsigned_char UsedChars;
-    };
-    struct CustomRect
-    {
-        unsigned int ID;
-        unsigned short Width, Height;
-        unsigned short X, Y;
-        float GlyphAdvanceX;
-        ImVec2 GlyphOffset;
-        ImFont* Font;
-    };
-    struct TextRange
+    struct ImGuiTextRange
     {
         const char* b;
         const char* e;
-    };
-    struct Pair
+};
+    struct ImGuiStoragePair
     {
         ImGuiID key;
         union { int val_i; float val_f; void* val_p; };
-    };
-
+};
 #else
 struct GLFWwindow;
 struct SDL_Window;
@@ -846,12 +920,25 @@ inline ImColor_Simple ImColorToSimple(ImColor col)
 #endif // CIMGUI_DEFINE_ENUMS_AND_STRUCTS
 
 #ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-typedef ImFontAtlas::GlyphRangesBuilder GlyphRangesBuilder;
-typedef ImFontAtlas::CustomRect CustomRect;
-typedef ImGuiTextFilter::TextRange TextRange;
-typedef ImGuiStorage::Pair Pair;
-typedef ImVector<TextRange> ImVector_TextRange;
+typedef ImGuiStorage::ImGuiStoragePair ImGuiStoragePair;
+typedef ImGuiTextFilter::ImGuiTextRange ImGuiTextRange;
+typedef ImVector<float> ImVector_float;
 typedef ImVector<ImWchar> ImVector_ImWchar;
+typedef ImVector<ImDrawVert> ImVector_ImDrawVert;
+typedef ImVector<ImFontGlyph> ImVector_ImFontGlyph;
+typedef ImVector<ImGuiTextRange> ImVector_ImGuiTextRange;
+typedef ImVector<ImGuiStoragePair> ImVector_ImGuiStoragePair;
+typedef ImVector<ImDrawChannel> ImVector_ImDrawChannel;
+typedef ImVector<char> ImVector_char;
+typedef ImVector<ImU32> ImVector_ImU32;
+typedef ImVector<ImFontAtlasCustomRect> ImVector_ImFontAtlasCustomRect;
+typedef ImVector<ImTextureID> ImVector_ImTextureID;
+typedef ImVector<ImFontConfig> ImVector_ImFontConfig;
+typedef ImVector<ImFont*> ImVector_ImFontPtr;
+typedef ImVector<ImDrawCmd> ImVector_ImDrawCmd;
+typedef ImVector<ImVec4> ImVector_ImVec4;
+typedef ImVector<ImDrawIdx> ImVector_ImDrawIdx;
+typedef ImVector<ImVec2> ImVector_ImVec2;
 #endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS
 CIMGUI_API ImVec2* ImVec2_ImVec2(void);
 CIMGUI_API void ImVec2_destroy(ImVec2* self);
@@ -863,7 +950,7 @@ CIMGUI_API ImGuiContext* igCreateContext(ImFontAtlas* shared_font_atlas);
 CIMGUI_API void igDestroyContext(ImGuiContext* ctx);
 CIMGUI_API ImGuiContext* igGetCurrentContext(void);
 CIMGUI_API void igSetCurrentContext(ImGuiContext* ctx);
-CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t sz_io,size_t sz_style,size_t sz_vec2,size_t sz_vec4,size_t sz_drawvert);
+CIMGUI_API bool igDebugCheckVersionAndDataLayout(const char* version_str,size_t sz_io,size_t sz_style,size_t sz_vec2,size_t sz_vec4,size_t sz_drawvert,size_t sz_drawidx);
 CIMGUI_API ImGuiIO* igGetIO(void);
 CIMGUI_API ImGuiStyle* igGetStyle(void);
 CIMGUI_API void igNewFrame(void);
@@ -895,12 +982,6 @@ CIMGUI_API ImVec2 igGetWindowPos(void);
 CIMGUI_API ImVec2 igGetWindowSize(void);
 CIMGUI_API float igGetWindowWidth(void);
 CIMGUI_API float igGetWindowHeight(void);
-CIMGUI_API ImVec2 igGetContentRegionMax(void);
-CIMGUI_API ImVec2 igGetContentRegionAvail(void);
-CIMGUI_API float igGetContentRegionAvailWidth(void);
-CIMGUI_API ImVec2 igGetWindowContentRegionMin(void);
-CIMGUI_API ImVec2 igGetWindowContentRegionMax(void);
-CIMGUI_API float igGetWindowContentRegionWidth(void);
 CIMGUI_API void igSetNextWindowPos(const ImVec2 pos,ImGuiCond cond,const ImVec2 pivot);
 CIMGUI_API void igSetNextWindowSize(const ImVec2 size,ImGuiCond cond);
 CIMGUI_API void igSetNextWindowSizeConstraints(const ImVec2 size_min,const ImVec2 size_max,ImGuiSizeCallback custom_callback,void* custom_callback_data);
@@ -917,14 +998,21 @@ CIMGUI_API void igSetWindowPosStr(const char* name,const ImVec2 pos,ImGuiCond co
 CIMGUI_API void igSetWindowSizeStr(const char* name,const ImVec2 size,ImGuiCond cond);
 CIMGUI_API void igSetWindowCollapsedStr(const char* name,bool collapsed,ImGuiCond cond);
 CIMGUI_API void igSetWindowFocusStr(const char* name);
+CIMGUI_API ImVec2 igGetContentRegionMax(void);
+CIMGUI_API ImVec2 igGetContentRegionAvail(void);
+CIMGUI_API ImVec2 igGetWindowContentRegionMin(void);
+CIMGUI_API ImVec2 igGetWindowContentRegionMax(void);
+CIMGUI_API float igGetWindowContentRegionWidth(void);
 CIMGUI_API float igGetScrollX(void);
 CIMGUI_API float igGetScrollY(void);
 CIMGUI_API float igGetScrollMaxX(void);
 CIMGUI_API float igGetScrollMaxY(void);
 CIMGUI_API void igSetScrollX(float scroll_x);
 CIMGUI_API void igSetScrollY(float scroll_y);
+CIMGUI_API void igSetScrollHereX(float center_x_ratio);
 CIMGUI_API void igSetScrollHereY(float center_y_ratio);
-CIMGUI_API void igSetScrollFromPosY(float pos_y,float center_y_ratio);
+CIMGUI_API void igSetScrollFromPosX(float local_x,float center_x_ratio);
+CIMGUI_API void igSetScrollFromPosY(float local_y,float center_y_ratio);
 CIMGUI_API void igPushFont(ImFont* font);
 CIMGUI_API void igPopFont(void);
 CIMGUI_API void igPushStyleColorU32(ImGuiCol idx,ImU32 col);
@@ -942,15 +1030,16 @@ CIMGUI_API ImU32 igGetColorU32Vec4(const ImVec4 col);
 CIMGUI_API ImU32 igGetColorU32U32(ImU32 col);
 CIMGUI_API void igPushItemWidth(float item_width);
 CIMGUI_API void igPopItemWidth(void);
+CIMGUI_API void igSetNextItemWidth(float item_width);
 CIMGUI_API float igCalcItemWidth(void);
-CIMGUI_API void igPushTextWrapPos(float wrap_pos_x);
+CIMGUI_API void igPushTextWrapPos(float wrap_local_pos_x);
 CIMGUI_API void igPopTextWrapPos(void);
 CIMGUI_API void igPushAllowKeyboardFocus(bool allow_keyboard_focus);
 CIMGUI_API void igPopAllowKeyboardFocus(void);
 CIMGUI_API void igPushButtonRepeat(bool repeat);
 CIMGUI_API void igPopButtonRepeat(void);
 CIMGUI_API void igSeparator(void);
-CIMGUI_API void igSameLine(float pos_x,float spacing_w);
+CIMGUI_API void igSameLine(float offset_from_start_x,float spacing);
 CIMGUI_API void igNewLine(void);
 CIMGUI_API void igSpacing(void);
 CIMGUI_API void igDummy(const ImVec2 size);
@@ -962,11 +1051,11 @@ CIMGUI_API ImVec2 igGetCursorPos(void);
 CIMGUI_API float igGetCursorPosX(void);
 CIMGUI_API float igGetCursorPosY(void);
 CIMGUI_API void igSetCursorPos(const ImVec2 local_pos);
-CIMGUI_API void igSetCursorPosX(float x);
-CIMGUI_API void igSetCursorPosY(float y);
+CIMGUI_API void igSetCursorPosX(float local_x);
+CIMGUI_API void igSetCursorPosY(float local_y);
 CIMGUI_API ImVec2 igGetCursorStartPos(void);
 CIMGUI_API ImVec2 igGetCursorScreenPos(void);
-CIMGUI_API void igSetCursorScreenPos(const ImVec2 screen_pos);
+CIMGUI_API void igSetCursorScreenPos(const ImVec2 pos);
 CIMGUI_API void igAlignTextToFramePadding(void);
 CIMGUI_API float igGetTextLineHeight(void);
 CIMGUI_API float igGetTextLineHeightWithSpacing(void);
@@ -1038,17 +1127,18 @@ CIMGUI_API bool igVSliderInt(const char* label,const ImVec2 size,int* v,int v_mi
 CIMGUI_API bool igVSliderScalar(const char* label,const ImVec2 size,ImGuiDataType data_type,void* v,const void* v_min,const void* v_max,const char* format,float power);
 CIMGUI_API bool igInputText(const char* label,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data);
 CIMGUI_API bool igInputTextMultiline(const char* label,char* buf,size_t buf_size,const ImVec2 size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data);
-CIMGUI_API bool igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputFloat2(const char* label,float v[2],const char* format,ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputFloat3(const char* label,float v[3],const char* format,ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputFloat4(const char* label,float v[4],const char* format,ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputInt(const char* label,int* v,int step,int step_fast,ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags extra_flags);
-CIMGUI_API bool igInputScalarN(const char* label,ImGuiDataType data_type,void* v,int components,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags extra_flags);
+CIMGUI_API bool igInputTextWithHint(const char* label,const char* hint,char* buf,size_t buf_size,ImGuiInputTextFlags flags,ImGuiInputTextCallback callback,void* user_data);
+CIMGUI_API bool igInputFloat(const char* label,float* v,float step,float step_fast,const char* format,ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputFloat2(const char* label,float v[2],const char* format,ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputFloat3(const char* label,float v[3],const char* format,ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputFloat4(const char* label,float v[4],const char* format,ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputInt(const char* label,int* v,int step,int step_fast,ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputInt2(const char* label,int v[2],ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputInt3(const char* label,int v[3],ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputInt4(const char* label,int v[4],ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputDouble(const char* label,double* v,double step,double step_fast,const char* format,ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputScalar(const char* label,ImGuiDataType data_type,void* v,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags flags);
+CIMGUI_API bool igInputScalarN(const char* label,ImGuiDataType data_type,void* v,int components,const void* step,const void* step_fast,const char* format,ImGuiInputTextFlags flags);
 CIMGUI_API bool igColorEdit3(const char* label,float col[3],ImGuiColorEditFlags flags);
 CIMGUI_API bool igColorEdit4(const char* label,float col[4],ImGuiColorEditFlags flags);
 CIMGUI_API bool igColorPicker3(const char* label,float col[3],ImGuiColorEditFlags flags);
@@ -1068,11 +1158,10 @@ CIMGUI_API bool igTreeNodeExVPtr(const void* ptr_id,ImGuiTreeNodeFlags flags,con
 CIMGUI_API void igTreePushStr(const char* str_id);
 CIMGUI_API void igTreePushPtr(const void* ptr_id);
 CIMGUI_API void igTreePop(void);
-CIMGUI_API void igTreeAdvanceToLabelPos(void);
 CIMGUI_API float igGetTreeNodeToLabelSpacing(void);
-CIMGUI_API void igSetNextTreeNodeOpen(bool is_open,ImGuiCond cond);
 CIMGUI_API bool igCollapsingHeader(const char* label,ImGuiTreeNodeFlags flags);
 CIMGUI_API bool igCollapsingHeaderBoolPtr(const char* label,bool* p_open,ImGuiTreeNodeFlags flags);
+CIMGUI_API void igSetNextItemOpen(bool is_open,ImGuiCond cond);
 CIMGUI_API bool igSelectable(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);
@@ -1118,13 +1207,18 @@ CIMGUI_API void igSetColumnWidth(int column_index,float width);
 CIMGUI_API float igGetColumnOffset(int column_index);
 CIMGUI_API void igSetColumnOffset(int column_index,float offset_x);
 CIMGUI_API int igGetColumnsCount(void);
-CIMGUI_API void igLogToTTY(int max_depth);
-CIMGUI_API void igLogToFile(int max_depth,const char* filename);
-CIMGUI_API void igLogToClipboard(int max_depth);
+CIMGUI_API bool igBeginTabBar(const char* str_id,ImGuiTabBarFlags flags);
+CIMGUI_API void igEndTabBar(void);
+CIMGUI_API bool igBeginTabItem(const char* label,bool* p_open,ImGuiTabItemFlags flags);
+CIMGUI_API void igEndTabItem(void);
+CIMGUI_API void igSetTabItemClosed(const char* tab_or_docked_window_label);
+CIMGUI_API void igLogToTTY(int auto_open_depth);
+CIMGUI_API void igLogToFile(int auto_open_depth,const char* filename);
+CIMGUI_API void igLogToClipboard(int auto_open_depth);
 CIMGUI_API void igLogFinish(void);
 CIMGUI_API void igLogButtons(void);
 CIMGUI_API bool igBeginDragDropSource(ImGuiDragDropFlags flags);
-CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t size,ImGuiCond cond);
+CIMGUI_API bool igSetDragDropPayload(const char* type,const void* data,size_t sz,ImGuiCond cond);
 CIMGUI_API void igEndDragDropSource(void);
 CIMGUI_API bool igBeginDragDropTarget(void);
 CIMGUI_API const ImGuiPayload* igAcceptDragDropPayload(const char* type,ImGuiDragDropFlags flags);
@@ -1140,6 +1234,7 @@ CIMGUI_API bool igIsItemFocused(void);
 CIMGUI_API bool igIsItemClicked(int mouse_button);
 CIMGUI_API bool igIsItemVisible(void);
 CIMGUI_API bool igIsItemEdited(void);
+CIMGUI_API bool igIsItemActivated(void);
 CIMGUI_API bool igIsItemDeactivated(void);
 CIMGUI_API bool igIsItemDeactivatedAfterEdit(void);
 CIMGUI_API bool igIsAnyItemHovered(void);
@@ -1153,7 +1248,8 @@ CIMGUI_API bool igIsRectVisible(const ImVec2 size);
 CIMGUI_API bool igIsRectVisibleVec2(const ImVec2 rect_min,const ImVec2 rect_max);
 CIMGUI_API double igGetTime(void);
 CIMGUI_API int igGetFrameCount(void);
-CIMGUI_API ImDrawList* igGetOverlayDrawList(void);
+CIMGUI_API ImDrawList* igGetBackgroundDrawList(void);
+CIMGUI_API ImDrawList* igGetForegroundDrawList(void);
 CIMGUI_API ImDrawListSharedData* igGetDrawListSharedData(void);
 CIMGUI_API const char* igGetStyleColorName(ImGuiCol idx);
 CIMGUI_API void igSetStateStorage(ImGuiStorage* storage);
@@ -1183,8 +1279,8 @@ CIMGUI_API ImVec2 igGetMouseDragDelta(int button,float lock_threshold);
 CIMGUI_API void igResetMouseDragDelta(int button);
 CIMGUI_API ImGuiMouseCursor igGetMouseCursor(void);
 CIMGUI_API void igSetMouseCursor(ImGuiMouseCursor type);
-CIMGUI_API void igCaptureKeyboardFromApp(bool capture);
-CIMGUI_API void igCaptureMouseFromApp(bool capture);
+CIMGUI_API void igCaptureKeyboardFromApp(bool want_capture_keyboard_value);
+CIMGUI_API void igCaptureMouseFromApp(bool want_capture_mouse_value);
 CIMGUI_API const char* igGetClipboardText(void);
 CIMGUI_API void igSetClipboardText(const char* text);
 CIMGUI_API void igLoadIniSettingsFromDisk(const char* ini_filename);
@@ -1197,8 +1293,8 @@ CIMGUI_API void igMemFree(void* ptr);
 CIMGUI_API ImGuiStyle* ImGuiStyle_ImGuiStyle(void);
 CIMGUI_API void ImGuiStyle_destroy(ImGuiStyle* self);
 CIMGUI_API void ImGuiStyle_ScaleAllSizes(ImGuiStyle* self,float scale_factor);
-CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,ImWchar c);
-CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(ImGuiIO* self,const char* utf8_chars);
+CIMGUI_API void ImGuiIO_AddInputCharacter(ImGuiIO* self,unsigned int c);
+CIMGUI_API void ImGuiIO_AddInputCharactersUTF8(ImGuiIO* self,const char* str);
 CIMGUI_API void ImGuiIO_ClearInputCharacters(ImGuiIO* self);
 CIMGUI_API ImGuiIO* ImGuiIO_ImGuiIO(void);
 CIMGUI_API void ImGuiIO_destroy(ImGuiIO* self);
@@ -1222,13 +1318,11 @@ CIMGUI_API bool ImGuiTextFilter_PassFilter(ImGuiTextFilter* self,const char* tex
 CIMGUI_API void ImGuiTextFilter_Build(ImGuiTextFilter* self);
 CIMGUI_API void ImGuiTextFilter_Clear(ImGuiTextFilter* self);
 CIMGUI_API bool ImGuiTextFilter_IsActive(ImGuiTextFilter* self);
-CIMGUI_API TextRange* TextRange_TextRange(void);
-CIMGUI_API void TextRange_destroy(TextRange* self);
-CIMGUI_API TextRange* TextRange_TextRangeStr(const char* _b,const char* _e);
-CIMGUI_API const char* TextRange_begin(TextRange* self);
-CIMGUI_API const char* TextRange_end(TextRange* self);
-CIMGUI_API bool TextRange_empty(TextRange* self);
-CIMGUI_API void TextRange_split(TextRange* self,char separator,ImVector_TextRange* out);
+CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRange(void);
+CIMGUI_API void ImGuiTextRange_destroy(ImGuiTextRange* self);
+CIMGUI_API ImGuiTextRange* ImGuiTextRange_ImGuiTextRangeStr(const char* _b,const char* _e);
+CIMGUI_API bool ImGuiTextRange_empty(ImGuiTextRange* self);
+CIMGUI_API void ImGuiTextRange_split(ImGuiTextRange* self,char separator,ImVector_ImGuiTextRange* out);
 CIMGUI_API ImGuiTextBuffer* ImGuiTextBuffer_ImGuiTextBuffer(void);
 CIMGUI_API void ImGuiTextBuffer_destroy(ImGuiTextBuffer* self);
 CIMGUI_API const char* ImGuiTextBuffer_begin(ImGuiTextBuffer* self);
@@ -1238,11 +1332,12 @@ CIMGUI_API bool ImGuiTextBuffer_empty(ImGuiTextBuffer* self);
 CIMGUI_API void ImGuiTextBuffer_clear(ImGuiTextBuffer* self);
 CIMGUI_API void ImGuiTextBuffer_reserve(ImGuiTextBuffer* self,int capacity);
 CIMGUI_API const char* ImGuiTextBuffer_c_str(ImGuiTextBuffer* self);
+CIMGUI_API void ImGuiTextBuffer_append(ImGuiTextBuffer* self,const char* str,const char* str_end);
 CIMGUI_API void ImGuiTextBuffer_appendfv(ImGuiTextBuffer* self,const char* fmt,va_list args);
-CIMGUI_API Pair* Pair_PairInt(ImGuiID _key,int _val_i);
-CIMGUI_API void Pair_destroy(Pair* self);
-CIMGUI_API Pair* Pair_PairFloat(ImGuiID _key,float _val_f);
-CIMGUI_API Pair* Pair_PairPtr(ImGuiID _key,void* _val_p);
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairInt(ImGuiID _key,int _val_i);
+CIMGUI_API void ImGuiStoragePair_destroy(ImGuiStoragePair* self);
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairFloat(ImGuiID _key,float _val_f);
+CIMGUI_API ImGuiStoragePair* ImGuiStoragePair_ImGuiStoragePairPtr(ImGuiID _key,void* _val_p);
 CIMGUI_API void ImGuiStorage_Clear(ImGuiStorage* self);
 CIMGUI_API int ImGuiStorage_GetInt(ImGuiStorage* self,ImGuiID key,int default_val);
 CIMGUI_API void ImGuiStorage_SetInt(ImGuiStorage* self,ImGuiID key,int val);
@@ -1273,6 +1368,13 @@ CIMGUI_API void ImColor_SetHSV(ImColor* self,float h,float s,float v,float a);
 CIMGUI_API ImColor ImColor_HSV(ImColor* self,float h,float s,float v,float a);
 CIMGUI_API ImDrawCmd* ImDrawCmd_ImDrawCmd(void);
 CIMGUI_API void ImDrawCmd_destroy(ImDrawCmd* self);
+CIMGUI_API ImDrawListSplitter* ImDrawListSplitter_ImDrawListSplitter(void);
+CIMGUI_API void ImDrawListSplitter_destroy(ImDrawListSplitter* self);
+CIMGUI_API void ImDrawListSplitter_Clear(ImDrawListSplitter* self);
+CIMGUI_API void ImDrawListSplitter_ClearFreeMemory(ImDrawListSplitter* self);
+CIMGUI_API void ImDrawListSplitter_Split(ImDrawListSplitter* self,ImDrawList* draw_list,int count);
+CIMGUI_API void ImDrawListSplitter_Merge(ImDrawListSplitter* self,ImDrawList* draw_list);
+CIMGUI_API void ImDrawListSplitter_SetCurrentChannel(ImDrawListSplitter* self,ImDrawList* draw_list,int channel_idx);
 CIMGUI_API ImDrawList* ImDrawList_ImDrawList(const ImDrawListSharedData* shared_data);
 CIMGUI_API void ImDrawList_destroy(ImDrawList* self);
 CIMGUI_API void ImDrawList_PushClipRect(ImDrawList* self,ImVec2 clip_rect_min,ImVec2 clip_rect_max,bool intersect_with_current_clip_rect);
@@ -1282,39 +1384,39 @@ CIMGUI_API void ImDrawList_PushTextureID(ImDrawList* self,ImTextureID texture_id
 CIMGUI_API void ImDrawList_PopTextureID(ImDrawList* self);
 CIMGUI_API ImVec2 ImDrawList_GetClipRectMin(ImDrawList* self);
 CIMGUI_API ImVec2 ImDrawList_GetClipRectMax(ImDrawList* self);
-CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float thickness);
-CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float rounding,int rounding_corners_flags,float thickness);
-CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col,float rounding,int rounding_corners_flags);
-CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 a,const ImVec2 b,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left);
-CIMGUI_API void ImDrawList_AddQuad(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,ImU32 col,float thickness);
-CIMGUI_API void ImDrawList_AddQuadFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,ImU32 col);
-CIMGUI_API void ImDrawList_AddTriangle(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,ImU32 col,float thickness);
-CIMGUI_API void ImDrawList_AddTriangleFilled(ImDrawList* self,const ImVec2 a,const ImVec2 b,const ImVec2 c,ImU32 col);
-CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 centre,float radius,ImU32 col,int num_segments,float thickness);
-CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 centre,float radius,ImU32 col,int num_segments);
+CIMGUI_API void ImDrawList_AddLine(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,ImU32 col,float thickness);
+CIMGUI_API void ImDrawList_AddRect(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners,float thickness);
+CIMGUI_API void ImDrawList_AddRectFilled(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners);
+CIMGUI_API void ImDrawList_AddRectFilledMultiColor(ImDrawList* self,const ImVec2 p_min,const ImVec2 p_max,ImU32 col_upr_left,ImU32 col_upr_right,ImU32 col_bot_right,ImU32 col_bot_left);
+CIMGUI_API void ImDrawList_AddQuad(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness);
+CIMGUI_API void ImDrawList_AddQuadFilled(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col);
+CIMGUI_API void ImDrawList_AddTriangle(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col,float thickness);
+CIMGUI_API void ImDrawList_AddTriangleFilled(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col);
+CIMGUI_API void ImDrawList_AddCircle(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments,float thickness);
+CIMGUI_API void ImDrawList_AddCircleFilled(ImDrawList* self,const ImVec2 center,float radius,ImU32 col,int num_segments);
 CIMGUI_API void ImDrawList_AddText(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end);
 CIMGUI_API void ImDrawList_AddTextFontPtr(ImDrawList* self,const ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect);
-CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col);
-CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 c,const ImVec2 d,const ImVec2 uv_a,const ImVec2 uv_b,const ImVec2 uv_c,const ImVec2 uv_d,ImU32 col);
-CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 a,const ImVec2 b,const ImVec2 uv_a,const ImVec2 uv_b,ImU32 col,float rounding,int rounding_corners);
-CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col,bool closed,float thickness);
-CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,const int num_points,ImU32 col);
+CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,bool closed,float thickness);
+CIMGUI_API void ImDrawList_AddConvexPolyFilled(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col);
 CIMGUI_API void ImDrawList_AddBezierCurve(ImDrawList* self,const ImVec2 pos0,const ImVec2 cp0,const ImVec2 cp1,const ImVec2 pos1,ImU32 col,float thickness,int num_segments);
+CIMGUI_API void ImDrawList_AddImage(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col);
+CIMGUI_API void ImDrawList_AddImageQuad(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,const ImVec2 uv1,const ImVec2 uv2,const ImVec2 uv3,const ImVec2 uv4,ImU32 col);
+CIMGUI_API void ImDrawList_AddImageRounded(ImDrawList* self,ImTextureID user_texture_id,const ImVec2 p_min,const ImVec2 p_max,const ImVec2 uv_min,const ImVec2 uv_max,ImU32 col,float rounding,ImDrawCornerFlags rounding_corners);
 CIMGUI_API void ImDrawList_PathClear(ImDrawList* self);
 CIMGUI_API void ImDrawList_PathLineTo(ImDrawList* self,const ImVec2 pos);
 CIMGUI_API void ImDrawList_PathLineToMergeDuplicate(ImDrawList* self,const ImVec2 pos);
 CIMGUI_API void ImDrawList_PathFillConvex(ImDrawList* self,ImU32 col);
 CIMGUI_API void ImDrawList_PathStroke(ImDrawList* self,ImU32 col,bool closed,float thickness);
-CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 centre,float radius,float a_min,float a_max,int num_segments);
-CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 centre,float radius,int a_min_of_12,int a_max_of_12);
+CIMGUI_API void ImDrawList_PathArcTo(ImDrawList* self,const ImVec2 center,float radius,float a_min,float a_max,int num_segments);
+CIMGUI_API void ImDrawList_PathArcToFast(ImDrawList* self,const ImVec2 center,float radius,int a_min_of_12,int a_max_of_12);
 CIMGUI_API void ImDrawList_PathBezierCurveTo(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,int num_segments);
-CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,int rounding_corners_flags);
-CIMGUI_API void ImDrawList_ChannelsSplit(ImDrawList* self,int channels_count);
-CIMGUI_API void ImDrawList_ChannelsMerge(ImDrawList* self);
-CIMGUI_API void ImDrawList_ChannelsSetCurrent(ImDrawList* self,int channel_index);
+CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawCornerFlags rounding_corners);
 CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data);
 CIMGUI_API void ImDrawList_AddDrawCmd(ImDrawList* self);
 CIMGUI_API ImDrawList* ImDrawList_CloneOutput(ImDrawList* self);
+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);
@@ -1330,9 +1432,21 @@ CIMGUI_API ImDrawData* ImDrawData_ImDrawData(void);
 CIMGUI_API void ImDrawData_destroy(ImDrawData* self);
 CIMGUI_API void ImDrawData_Clear(ImDrawData* self);
 CIMGUI_API void ImDrawData_DeIndexAllBuffers(ImDrawData* self);
-CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 sc);
+CIMGUI_API void ImDrawData_ScaleClipRects(ImDrawData* self,const ImVec2 fb_scale);
 CIMGUI_API ImFontConfig* ImFontConfig_ImFontConfig(void);
 CIMGUI_API void ImFontConfig_destroy(ImFontConfig* self);
+CIMGUI_API ImFontGlyphRangesBuilder* ImFontGlyphRangesBuilder_ImFontGlyphRangesBuilder(void);
+CIMGUI_API void ImFontGlyphRangesBuilder_destroy(ImFontGlyphRangesBuilder* self);
+CIMGUI_API void ImFontGlyphRangesBuilder_Clear(ImFontGlyphRangesBuilder* self);
+CIMGUI_API bool ImFontGlyphRangesBuilder_GetBit(ImFontGlyphRangesBuilder* self,int n);
+CIMGUI_API void ImFontGlyphRangesBuilder_SetBit(ImFontGlyphRangesBuilder* self,int n);
+CIMGUI_API void ImFontGlyphRangesBuilder_AddChar(ImFontGlyphRangesBuilder* self,ImWchar c);
+CIMGUI_API void ImFontGlyphRangesBuilder_AddText(ImFontGlyphRangesBuilder* self,const char* text,const char* text_end);
+CIMGUI_API void ImFontGlyphRangesBuilder_AddRanges(ImFontGlyphRangesBuilder* self,const ImWchar* ranges);
+CIMGUI_API void ImFontGlyphRangesBuilder_BuildRanges(ImFontGlyphRangesBuilder* self,ImVector_ImWchar* out_ranges);
+CIMGUI_API ImFontAtlasCustomRect* ImFontAtlasCustomRect_ImFontAtlasCustomRect(void);
+CIMGUI_API void ImFontAtlasCustomRect_destroy(ImFontAtlasCustomRect* self);
+CIMGUI_API bool ImFontAtlasCustomRect_IsPacked(ImFontAtlasCustomRect* self);
 CIMGUI_API ImFontAtlas* ImFontAtlas_ImFontAtlas(void);
 CIMGUI_API void ImFontAtlas_destroy(ImFontAtlas* self);
 CIMGUI_API ImFont* ImFontAtlas_AddFont(ImFontAtlas* self,const ImFontConfig* font_cfg);
@@ -1346,9 +1460,9 @@ CIMGUI_API void ImFontAtlas_ClearTexData(ImFontAtlas* self);
 CIMGUI_API void ImFontAtlas_ClearFonts(ImFontAtlas* self);
 CIMGUI_API void ImFontAtlas_Clear(ImFontAtlas* self);
 CIMGUI_API bool ImFontAtlas_Build(ImFontAtlas* self);
-CIMGUI_API bool ImFontAtlas_IsBuilt(ImFontAtlas* self);
 CIMGUI_API void ImFontAtlas_GetTexDataAsAlpha8(ImFontAtlas* self,unsigned char** out_pixels,int* out_width,int* out_height,int* out_bytes_per_pixel);
 CIMGUI_API void ImFontAtlas_GetTexDataAsRGBA32(ImFontAtlas* self,unsigned char** out_pixels,int* out_width,int* out_height,int* out_bytes_per_pixel);
+CIMGUI_API bool ImFontAtlas_IsBuilt(ImFontAtlas* self);
 CIMGUI_API void ImFontAtlas_SetTexID(ImFontAtlas* self,ImTextureID id);
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesDefault(ImFontAtlas* self);
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesKorean(ImFontAtlas* self);
@@ -1357,29 +1471,16 @@ CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseFull(ImFontAtlas* sel
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesChineseSimplifiedCommon(ImFontAtlas* self);
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesCyrillic(ImFontAtlas* self);
 CIMGUI_API const ImWchar* ImFontAtlas_GetGlyphRangesThai(ImFontAtlas* self);
-CIMGUI_API GlyphRangesBuilder* GlyphRangesBuilder_GlyphRangesBuilder(void);
-CIMGUI_API void GlyphRangesBuilder_destroy(GlyphRangesBuilder* self);
-CIMGUI_API bool GlyphRangesBuilder_GetBit(GlyphRangesBuilder* self,int n);
-CIMGUI_API void GlyphRangesBuilder_SetBit(GlyphRangesBuilder* self,int n);
-CIMGUI_API void GlyphRangesBuilder_AddChar(GlyphRangesBuilder* self,ImWchar c);
-CIMGUI_API void GlyphRangesBuilder_AddText(GlyphRangesBuilder* self,const char* text,const char* text_end);
-CIMGUI_API void GlyphRangesBuilder_AddRanges(GlyphRangesBuilder* self,const ImWchar* ranges);
-CIMGUI_API void GlyphRangesBuilder_BuildRanges(GlyphRangesBuilder* self,ImVector_ImWchar* out_ranges);
-CIMGUI_API CustomRect* CustomRect_CustomRect(void);
-CIMGUI_API void CustomRect_destroy(CustomRect* self);
-CIMGUI_API bool CustomRect_IsPacked(CustomRect* 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_AddCustomRectFontGlyph(ImFontAtlas* self,ImFont* font,ImWchar id,int width,int height,float advance_x,const ImVec2 offset);
-CIMGUI_API const CustomRect* ImFontAtlas_GetCustomRectByIndex(ImFontAtlas* self,int index);
-CIMGUI_API void ImFontAtlas_CalcCustomRectUV(ImFontAtlas* self,const CustomRect* rect,ImVec2* out_uv_min,ImVec2* out_uv_max);
+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);
 CIMGUI_API bool ImFontAtlas_GetMouseCursorTexData(ImFontAtlas* self,ImGuiMouseCursor cursor,ImVec2* out_offset,ImVec2* out_size,ImVec2 out_uv_border[2],ImVec2 out_uv_fill[2]);
 CIMGUI_API ImFont* ImFont_ImFont(void);
 CIMGUI_API void ImFont_destroy(ImFont* self);
-CIMGUI_API void ImFont_ClearOutputData(ImFont* self);
-CIMGUI_API void ImFont_BuildLookupTable(ImFont* self);
 CIMGUI_API const ImFontGlyph* ImFont_FindGlyph(ImFont* self,ImWchar c);
 CIMGUI_API const ImFontGlyph* ImFont_FindGlyphNoFallback(ImFont* self,ImWchar c);
-CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c);
 CIMGUI_API float ImFont_GetCharAdvance(ImFont* self,ImWchar c);
 CIMGUI_API bool ImFont_IsLoaded(ImFont* self);
 CIMGUI_API const char* ImFont_GetDebugName(ImFont* self);
@@ -1387,9 +1488,12 @@ CIMGUI_API ImVec2 ImFont_CalcTextSizeA(ImFont* self,float size,float max_width,f
 CIMGUI_API const char* ImFont_CalcWordWrapPositionA(ImFont* self,float scale,const char* text,const char* text_end,float wrap_width);
 CIMGUI_API void ImFont_RenderChar(ImFont* self,ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,ImWchar c);
 CIMGUI_API void ImFont_RenderText(ImFont* self,ImDrawList* draw_list,float size,ImVec2 pos,ImU32 col,const ImVec4 clip_rect,const char* text_begin,const char* text_end,float wrap_width,bool cpu_fine_clip);
+CIMGUI_API void ImFont_BuildLookupTable(ImFont* self);
+CIMGUI_API void ImFont_ClearOutputData(ImFont* self);
 CIMGUI_API void ImFont_GrowIndex(ImFont* self,int new_size);
 CIMGUI_API void ImFont_AddGlyph(ImFont* self,ImWchar c,float x0,float y0,float x1,float y1,float u0,float v0,float u1,float v1,float advance_x);
 CIMGUI_API void ImFont_AddRemapChar(ImFont* self,ImWchar dst,ImWchar src,bool overwrite_dst);
+CIMGUI_API void ImFont_SetFallbackChar(ImFont* self,ImWchar c);
 CIMGUI_API void igGetWindowPos_nonUDT(ImVec2 *pOut);
 CIMGUI_API ImVec2_Simple igGetWindowPos_nonUDT2(void);
 CIMGUI_API void igGetWindowSize_nonUDT(ImVec2 *pOut);
@@ -1448,7 +1552,6 @@ CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,floa
 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();
-CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* p);
 CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p);
 CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p);
 #endif //CIMGUI_INCLUDED

generator/output/cimgui_impl.h

@@ -1,9 +1,10 @@
 typedef struct SDL_Window SDL_Window;
 typedef struct GLFWwindow GLFWwindow;
+
 struct GLFWwindow;
+
 struct SDL_Window;
-typedef union SDL_Event SDL_Event;
-CIMGUI_API bool ImGui_ImplGlfw_InitForOpenGL(GLFWwindow* window,bool install_callbacks);
+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();
 CIMGUI_API void ImGui_ImplGlfw_NewFrame();
@@ -29,6 +30,7 @@ CIMGUI_API bool ImGui_ImplOpenGL2_CreateDeviceObjects();
 CIMGUI_API void ImGui_ImplOpenGL2_DestroyDeviceObjects();
 CIMGUI_API bool ImGui_ImplSDL2_InitForOpenGL(SDL_Window* window,void* sdl_gl_context);
 CIMGUI_API bool ImGui_ImplSDL2_InitForVulkan(SDL_Window* window);
+CIMGUI_API bool ImGui_ImplSDL2_InitForD3D(SDL_Window* window);
 CIMGUI_API void ImGui_ImplSDL2_Shutdown();
 CIMGUI_API void ImGui_ImplSDL2_NewFrame(SDL_Window* window);
 CIMGUI_API bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event);

generator/output/impl_definitions.json

@@ -15,10 +15,9 @@
       "argsoriginal": "(GLFWwindow* window,unsigned int c)",
       "call_args": "(window,c)",
       "cimguiname": "ImGui_ImplGlfw_CharCallback",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplGlfw_CharCallback",
-      "location": "imgui_impl_glfw",
+      "ov_cimguiname": "ImGui_ImplGlfw_CharCallback",
       "ret": "void",
       "signature": "(GLFWwindow*,unsigned int)",
       "stname": ""
@@ -40,10 +39,9 @@
       "argsoriginal": "(GLFWwindow* window,bool install_callbacks)",
       "call_args": "(window,install_callbacks)",
       "cimguiname": "ImGui_ImplGlfw_InitForOpenGL",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplGlfw_InitForOpenGL",
-      "location": "imgui_impl_glfw",
+      "ov_cimguiname": "ImGui_ImplGlfw_InitForOpenGL",
       "ret": "bool",
       "signature": "(GLFWwindow*,bool)",
       "stname": ""
@@ -65,10 +63,9 @@
       "argsoriginal": "(GLFWwindow* window,bool install_callbacks)",
       "call_args": "(window,install_callbacks)",
       "cimguiname": "ImGui_ImplGlfw_InitForVulkan",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplGlfw_InitForVulkan",
-      "location": "imgui_impl_glfw",
+      "ov_cimguiname": "ImGui_ImplGlfw_InitForVulkan",
       "ret": "bool",
       "signature": "(GLFWwindow*,bool)",
       "stname": ""
@@ -102,10 +99,9 @@
       "argsoriginal": "(GLFWwindow* window,int key,int scancode,int action,int mods)",
       "call_args": "(window,key,scancode,action,mods)",
       "cimguiname": "ImGui_ImplGlfw_KeyCallback",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplGlfw_KeyCallback",
-      "location": "imgui_impl_glfw",
+      "ov_cimguiname": "ImGui_ImplGlfw_KeyCallback",
       "ret": "void",
       "signature": "(GLFWwindow*,int,int,int,int)",
       "stname": ""
@@ -135,10 +131,9 @@
       "argsoriginal": "(GLFWwindow* window,int button,int action,int mods)",
       "call_args": "(window,button,action,mods)",
       "cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplGlfw_MouseButtonCallback",
-      "location": "imgui_impl_glfw",
+      "ov_cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
       "ret": "void",
       "signature": "(GLFWwindow*,int,int,int)",
       "stname": ""
@@ -151,10 +146,9 @@
       "argsoriginal": "()",
       "call_args": "()",
       "cimguiname": "ImGui_ImplGlfw_NewFrame",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplGlfw_NewFrame",
-      "location": "imgui_impl_glfw",
+      "ov_cimguiname": "ImGui_ImplGlfw_NewFrame",
       "ret": "void",
       "signature": "()",
       "stname": ""
@@ -180,10 +174,9 @@
       "argsoriginal": "(GLFWwindow* window,double xoffset,double yoffset)",
       "call_args": "(window,xoffset,yoffset)",
       "cimguiname": "ImGui_ImplGlfw_ScrollCallback",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplGlfw_ScrollCallback",
-      "location": "imgui_impl_glfw",
+      "ov_cimguiname": "ImGui_ImplGlfw_ScrollCallback",
       "ret": "void",
       "signature": "(GLFWwindow*,double,double)",
       "stname": ""
@@ -196,10 +189,9 @@
       "argsoriginal": "()",
       "call_args": "()",
       "cimguiname": "ImGui_ImplGlfw_Shutdown",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplGlfw_Shutdown",
-      "location": "imgui_impl_glfw",
+      "ov_cimguiname": "ImGui_ImplGlfw_Shutdown",
       "ret": "void",
       "signature": "()",
       "stname": ""
@@ -212,10 +204,9 @@
       "argsoriginal": "()",
       "call_args": "()",
       "cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
-      "location": "imgui_impl_opengl2",
+      "ov_cimguiname": "ImGui_ImplOpenGL2_CreateDeviceObjects",
       "ret": "bool",
       "signature": "()",
       "stname": ""
@@ -228,10 +219,9 @@
       "argsoriginal": "()",
       "call_args": "()",
       "cimguiname": "ImGui_ImplOpenGL2_CreateFontsTexture",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplOpenGL2_CreateFontsTexture",
-      "location": "imgui_impl_opengl2",
+      "ov_cimguiname": "ImGui_ImplOpenGL2_CreateFontsTexture",
       "ret": "bool",
       "signature": "()",
       "stname": ""
@@ -244,10 +234,9 @@
       "argsoriginal": "()",
       "call_args": "()",
       "cimguiname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
-      "location": "imgui_impl_opengl2",
+      "ov_cimguiname": "ImGui_ImplOpenGL2_DestroyDeviceObjects",
       "ret": "void",
       "signature": "()",
       "stname": ""
@@ -260,10 +249,9 @@
       "argsoriginal": "()",
       "call_args": "()",
       "cimguiname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
-      "location": "imgui_impl_opengl2",
+      "ov_cimguiname": "ImGui_ImplOpenGL2_DestroyFontsTexture",
       "ret": "void",
       "signature": "()",
       "stname": ""
@@ -276,10 +264,9 @@
       "argsoriginal": "()",
       "call_args": "()",
       "cimguiname": "ImGui_ImplOpenGL2_Init",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplOpenGL2_Init",
-      "location": "imgui_impl_opengl2",
+      "ov_cimguiname": "ImGui_ImplOpenGL2_Init",
       "ret": "bool",
       "signature": "()",
       "stname": ""
@@ -292,10 +279,9 @@
       "argsoriginal": "()",
       "call_args": "()",
       "cimguiname": "ImGui_ImplOpenGL2_NewFrame",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplOpenGL2_NewFrame",
-      "location": "imgui_impl_opengl2",
+      "ov_cimguiname": "ImGui_ImplOpenGL2_NewFrame",
       "ret": "void",
       "signature": "()",
       "stname": ""
@@ -313,10 +299,9 @@
       "argsoriginal": "(ImDrawData* draw_data)",
       "call_args": "(draw_data)",
       "cimguiname": "ImGui_ImplOpenGL2_RenderDrawData",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplOpenGL2_RenderDrawData",
-      "location": "imgui_impl_opengl2",
+      "ov_cimguiname": "ImGui_ImplOpenGL2_RenderDrawData",
       "ret": "void",
       "signature": "(ImDrawData*)",
       "stname": ""
@@ -329,10 +314,9 @@
       "argsoriginal": "()",
       "call_args": "()",
       "cimguiname": "ImGui_ImplOpenGL2_Shutdown",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplOpenGL2_Shutdown",
-      "location": "imgui_impl_opengl2",
+      "ov_cimguiname": "ImGui_ImplOpenGL2_Shutdown",
       "ret": "void",
       "signature": "()",
       "stname": ""
@@ -345,10 +329,9 @@
       "argsoriginal": "()",
       "call_args": "()",
       "cimguiname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
-      "location": "imgui_impl_opengl3",
+      "ov_cimguiname": "ImGui_ImplOpenGL3_CreateDeviceObjects",
       "ret": "bool",
       "signature": "()",
       "stname": ""
@@ -361,10 +344,9 @@
       "argsoriginal": "()",
       "call_args": "()",
       "cimguiname": "ImGui_ImplOpenGL3_CreateFontsTexture",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplOpenGL3_CreateFontsTexture",
-      "location": "imgui_impl_opengl3",
+      "ov_cimguiname": "ImGui_ImplOpenGL3_CreateFontsTexture",
       "ret": "bool",
       "signature": "()",
       "stname": ""
@@ -377,10 +359,9 @@
       "argsoriginal": "()",
       "call_args": "()",
       "cimguiname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
-      "location": "imgui_impl_opengl3",
+      "ov_cimguiname": "ImGui_ImplOpenGL3_DestroyDeviceObjects",
       "ret": "void",
       "signature": "()",
       "stname": ""
@@ -393,10 +374,9 @@
       "argsoriginal": "()",
       "call_args": "()",
       "cimguiname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
-      "location": "imgui_impl_opengl3",
+      "ov_cimguiname": "ImGui_ImplOpenGL3_DestroyFontsTexture",
       "ret": "void",
       "signature": "()",
       "stname": ""
@@ -414,12 +394,11 @@
       "argsoriginal": "(const char* glsl_version=NULL)",
       "call_args": "(glsl_version)",
       "cimguiname": "ImGui_ImplOpenGL3_Init",
-      "comment": "",
       "defaults": {
         "glsl_version": "NULL"
       },
       "funcname": "ImGui_ImplOpenGL3_Init",
-      "location": "imgui_impl_opengl3",
+      "ov_cimguiname": "ImGui_ImplOpenGL3_Init",
       "ret": "bool",
       "signature": "(const char*)",
       "stname": ""
@@ -432,10 +411,9 @@
       "argsoriginal": "()",
       "call_args": "()",
       "cimguiname": "ImGui_ImplOpenGL3_NewFrame",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplOpenGL3_NewFrame",
-      "location": "imgui_impl_opengl3",
+      "ov_cimguiname": "ImGui_ImplOpenGL3_NewFrame",
       "ret": "void",
       "signature": "()",
       "stname": ""
@@ -453,10 +431,9 @@
       "argsoriginal": "(ImDrawData* draw_data)",
       "call_args": "(draw_data)",
       "cimguiname": "ImGui_ImplOpenGL3_RenderDrawData",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplOpenGL3_RenderDrawData",
-      "location": "imgui_impl_opengl3",
+      "ov_cimguiname": "ImGui_ImplOpenGL3_RenderDrawData",
       "ret": "void",
       "signature": "(ImDrawData*)",
       "stname": ""
@@ -469,15 +446,34 @@
       "argsoriginal": "()",
       "call_args": "()",
       "cimguiname": "ImGui_ImplOpenGL3_Shutdown",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplOpenGL3_Shutdown",
-      "location": "imgui_impl_opengl3",
+      "ov_cimguiname": "ImGui_ImplOpenGL3_Shutdown",
       "ret": "void",
       "signature": "()",
       "stname": ""
     }
   ],
+  "ImGui_ImplSDL2_InitForD3D": [
+    {
+      "args": "(SDL_Window* window)",
+      "argsT": [
+        {
+          "name": "window",
+          "type": "SDL_Window*"
+        }
+      ],
+      "argsoriginal": "(SDL_Window* window)",
+      "call_args": "(window)",
+      "cimguiname": "ImGui_ImplSDL2_InitForD3D",
+      "defaults": [],
+      "funcname": "ImGui_ImplSDL2_InitForD3D",
+      "ov_cimguiname": "ImGui_ImplSDL2_InitForD3D",
+      "ret": "bool",
+      "signature": "(SDL_Window*)",
+      "stname": ""
+    }
+  ],
   "ImGui_ImplSDL2_InitForOpenGL": [
     {
       "args": "(SDL_Window* window,void* sdl_gl_context)",
@@ -494,10 +490,9 @@
       "argsoriginal": "(SDL_Window* window,void* sdl_gl_context)",
       "call_args": "(window,sdl_gl_context)",
       "cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplSDL2_InitForOpenGL",
-      "location": "imgui_impl_sdl",
+      "ov_cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
       "ret": "bool",
       "signature": "(SDL_Window*,void*)",
       "stname": ""
@@ -515,10 +510,9 @@
       "argsoriginal": "(SDL_Window* window)",
       "call_args": "(window)",
       "cimguiname": "ImGui_ImplSDL2_InitForVulkan",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplSDL2_InitForVulkan",
-      "location": "imgui_impl_sdl",
+      "ov_cimguiname": "ImGui_ImplSDL2_InitForVulkan",
       "ret": "bool",
       "signature": "(SDL_Window*)",
       "stname": ""
@@ -536,10 +530,9 @@
       "argsoriginal": "(SDL_Window* window)",
       "call_args": "(window)",
       "cimguiname": "ImGui_ImplSDL2_NewFrame",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplSDL2_NewFrame",
-      "location": "imgui_impl_sdl",
+      "ov_cimguiname": "ImGui_ImplSDL2_NewFrame",
       "ret": "void",
       "signature": "(SDL_Window*)",
       "stname": ""
@@ -557,10 +550,9 @@
       "argsoriginal": "(const SDL_Event* event)",
       "call_args": "(event)",
       "cimguiname": "ImGui_ImplSDL2_ProcessEvent",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplSDL2_ProcessEvent",
-      "location": "imgui_impl_sdl",
+      "ov_cimguiname": "ImGui_ImplSDL2_ProcessEvent",
       "ret": "bool",
       "signature": "(const SDL_Event*)",
       "stname": ""
@@ -573,10 +565,9 @@
       "argsoriginal": "()",
       "call_args": "()",
       "cimguiname": "ImGui_ImplSDL2_Shutdown",
-      "comment": "",
       "defaults": [],
       "funcname": "ImGui_ImplSDL2_Shutdown",
-      "location": "imgui_impl_sdl",
+      "ov_cimguiname": "ImGui_ImplSDL2_Shutdown",
       "ret": "void",
       "signature": "()",
       "stname": ""

generator/output/impl_definitions.lua

@@ -12,10 +12,9 @@ defs["ImGui_ImplGlfw_CharCallback"][1]["argsT"][2]["type"] = "unsigned int"
 defs["ImGui_ImplGlfw_CharCallback"][1]["argsoriginal"] = "(GLFWwindow* window,unsigned int c)"
 defs["ImGui_ImplGlfw_CharCallback"][1]["call_args"] = "(window,c)"
 defs["ImGui_ImplGlfw_CharCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_CharCallback"
-defs["ImGui_ImplGlfw_CharCallback"][1]["comment"] = ""
 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)"
 defs["ImGui_ImplGlfw_CharCallback"][1]["stname"] = ""
@@ -33,10 +32,9 @@ defs["ImGui_ImplGlfw_InitForOpenGL"][1]["argsT"][2]["type"] = "bool"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["argsoriginal"] = "(GLFWwindow* window,bool install_callbacks)"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["call_args"] = "(window,install_callbacks)"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["cimguiname"] = "ImGui_ImplGlfw_InitForOpenGL"
-defs["ImGui_ImplGlfw_InitForOpenGL"][1]["comment"] = ""
 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)"
 defs["ImGui_ImplGlfw_InitForOpenGL"][1]["stname"] = ""
@@ -54,10 +52,9 @@ defs["ImGui_ImplGlfw_InitForVulkan"][1]["argsT"][2]["type"] = "bool"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["argsoriginal"] = "(GLFWwindow* window,bool install_callbacks)"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["call_args"] = "(window,install_callbacks)"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["cimguiname"] = "ImGui_ImplGlfw_InitForVulkan"
-defs["ImGui_ImplGlfw_InitForVulkan"][1]["comment"] = ""
 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)"
 defs["ImGui_ImplGlfw_InitForVulkan"][1]["stname"] = ""
@@ -84,10 +81,9 @@ defs["ImGui_ImplGlfw_KeyCallback"][1]["argsT"][5]["type"] = "int"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["argsoriginal"] = "(GLFWwindow* window,int key,int scancode,int action,int mods)"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["call_args"] = "(window,key,scancode,action,mods)"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_KeyCallback"
-defs["ImGui_ImplGlfw_KeyCallback"][1]["comment"] = ""
 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)"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["stname"] = ""
@@ -111,10 +107,9 @@ defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["argsT"][4]["type"] = "int"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["argsoriginal"] = "(GLFWwindow* window,int button,int action,int mods)"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["call_args"] = "(window,button,action,mods)"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_MouseButtonCallback"
-defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["comment"] = ""
 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)"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["stname"] = ""
@@ -126,10 +121,9 @@ defs["ImGui_ImplGlfw_NewFrame"][1]["argsT"] = {}
 defs["ImGui_ImplGlfw_NewFrame"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplGlfw_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplGlfw_NewFrame"][1]["cimguiname"] = "ImGui_ImplGlfw_NewFrame"
-defs["ImGui_ImplGlfw_NewFrame"][1]["comment"] = ""
 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"] = "()"
 defs["ImGui_ImplGlfw_NewFrame"][1]["stname"] = ""
@@ -150,10 +144,9 @@ defs["ImGui_ImplGlfw_ScrollCallback"][1]["argsT"][3]["type"] = "double"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["argsoriginal"] = "(GLFWwindow* window,double xoffset,double yoffset)"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["call_args"] = "(window,xoffset,yoffset)"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_ScrollCallback"
-defs["ImGui_ImplGlfw_ScrollCallback"][1]["comment"] = ""
 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)"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["stname"] = ""
@@ -165,10 +158,9 @@ defs["ImGui_ImplGlfw_Shutdown"][1]["argsT"] = {}
 defs["ImGui_ImplGlfw_Shutdown"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplGlfw_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplGlfw_Shutdown"][1]["cimguiname"] = "ImGui_ImplGlfw_Shutdown"
-defs["ImGui_ImplGlfw_Shutdown"][1]["comment"] = ""
 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"] = "()"
 defs["ImGui_ImplGlfw_Shutdown"][1]["stname"] = ""
@@ -180,10 +172,9 @@ defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL2_CreateDeviceObjects"
-defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["comment"] = ""
 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"] = "()"
 defs["ImGui_ImplOpenGL2_CreateDeviceObjects"][1]["stname"] = ""
@@ -195,10 +186,9 @@ defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL2_CreateFontsTexture"
-defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["comment"] = ""
 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"] = "()"
 defs["ImGui_ImplOpenGL2_CreateFontsTexture"][1]["stname"] = ""
@@ -210,10 +200,9 @@ defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL2_DestroyDeviceObjects"
-defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["comment"] = ""
 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"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyDeviceObjects"][1]["stname"] = ""
@@ -225,10 +214,9 @@ defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL2_DestroyFontsTexture"
-defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["comment"] = ""
 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"] = "()"
 defs["ImGui_ImplOpenGL2_DestroyFontsTexture"][1]["stname"] = ""
@@ -240,10 +228,9 @@ defs["ImGui_ImplOpenGL2_Init"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL2_Init"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL2_Init"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_Init"][1]["cimguiname"] = "ImGui_ImplOpenGL2_Init"
-defs["ImGui_ImplOpenGL2_Init"][1]["comment"] = ""
 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"] = "()"
 defs["ImGui_ImplOpenGL2_Init"][1]["stname"] = ""
@@ -255,10 +242,9 @@ defs["ImGui_ImplOpenGL2_NewFrame"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["cimguiname"] = "ImGui_ImplOpenGL2_NewFrame"
-defs["ImGui_ImplOpenGL2_NewFrame"][1]["comment"] = ""
 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"] = "()"
 defs["ImGui_ImplOpenGL2_NewFrame"][1]["stname"] = ""
@@ -273,10 +259,9 @@ defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["argsT"][1]["type"] = "ImDrawData*"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["argsoriginal"] = "(ImDrawData* draw_data)"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["call_args"] = "(draw_data)"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["cimguiname"] = "ImGui_ImplOpenGL2_RenderDrawData"
-defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["comment"] = ""
 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*)"
 defs["ImGui_ImplOpenGL2_RenderDrawData"][1]["stname"] = ""
@@ -288,10 +273,9 @@ defs["ImGui_ImplOpenGL2_Shutdown"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["cimguiname"] = "ImGui_ImplOpenGL2_Shutdown"
-defs["ImGui_ImplOpenGL2_Shutdown"][1]["comment"] = ""
 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"] = "()"
 defs["ImGui_ImplOpenGL2_Shutdown"][1]["stname"] = ""
@@ -303,10 +287,9 @@ defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL3_CreateDeviceObjects"
-defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["comment"] = ""
 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"] = "()"
 defs["ImGui_ImplOpenGL3_CreateDeviceObjects"][1]["stname"] = ""
@@ -318,10 +301,9 @@ defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL3_CreateFontsTexture"
-defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["comment"] = ""
 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"] = "()"
 defs["ImGui_ImplOpenGL3_CreateFontsTexture"][1]["stname"] = ""
@@ -333,10 +315,9 @@ defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["cimguiname"] = "ImGui_ImplOpenGL3_DestroyDeviceObjects"
-defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["comment"] = ""
 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"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyDeviceObjects"][1]["stname"] = ""
@@ -348,10 +329,9 @@ defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["cimguiname"] = "ImGui_ImplOpenGL3_DestroyFontsTexture"
-defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["comment"] = ""
 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"] = "()"
 defs["ImGui_ImplOpenGL3_DestroyFontsTexture"][1]["stname"] = ""
@@ -366,11 +346,10 @@ defs["ImGui_ImplOpenGL3_Init"][1]["argsT"][1]["type"] = "const char*"
 defs["ImGui_ImplOpenGL3_Init"][1]["argsoriginal"] = "(const char* glsl_version=NULL)"
 defs["ImGui_ImplOpenGL3_Init"][1]["call_args"] = "(glsl_version)"
 defs["ImGui_ImplOpenGL3_Init"][1]["cimguiname"] = "ImGui_ImplOpenGL3_Init"
-defs["ImGui_ImplOpenGL3_Init"][1]["comment"] = ""
 defs["ImGui_ImplOpenGL3_Init"][1]["defaults"] = {}
 defs["ImGui_ImplOpenGL3_Init"][1]["defaults"]["glsl_version"] = "NULL"
 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*)"
 defs["ImGui_ImplOpenGL3_Init"][1]["stname"] = ""
@@ -382,10 +361,9 @@ defs["ImGui_ImplOpenGL3_NewFrame"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["cimguiname"] = "ImGui_ImplOpenGL3_NewFrame"
-defs["ImGui_ImplOpenGL3_NewFrame"][1]["comment"] = ""
 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"] = "()"
 defs["ImGui_ImplOpenGL3_NewFrame"][1]["stname"] = ""
@@ -400,10 +378,9 @@ defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["argsT"][1]["type"] = "ImDrawData*"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["argsoriginal"] = "(ImDrawData* draw_data)"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["call_args"] = "(draw_data)"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["cimguiname"] = "ImGui_ImplOpenGL3_RenderDrawData"
-defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["comment"] = ""
 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*)"
 defs["ImGui_ImplOpenGL3_RenderDrawData"][1]["stname"] = ""
@@ -415,14 +392,30 @@ defs["ImGui_ImplOpenGL3_Shutdown"][1]["argsT"] = {}
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["cimguiname"] = "ImGui_ImplOpenGL3_Shutdown"
-defs["ImGui_ImplOpenGL3_Shutdown"][1]["comment"] = ""
 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"] = "()"
 defs["ImGui_ImplOpenGL3_Shutdown"][1]["stname"] = ""
 defs["ImGui_ImplOpenGL3_Shutdown"]["()"] = defs["ImGui_ImplOpenGL3_Shutdown"][1]
+defs["ImGui_ImplSDL2_InitForD3D"] = {}
+defs["ImGui_ImplSDL2_InitForD3D"][1] = {}
+defs["ImGui_ImplSDL2_InitForD3D"][1]["args"] = "(SDL_Window* window)"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["argsT"] = {}
+defs["ImGui_ImplSDL2_InitForD3D"][1]["argsT"][1] = {}
+defs["ImGui_ImplSDL2_InitForD3D"][1]["argsT"][1]["name"] = "window"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["argsT"][1]["type"] = "SDL_Window*"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["argsoriginal"] = "(SDL_Window* window)"
+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]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForD3D"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["ret"] = "bool"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["signature"] = "(SDL_Window*)"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["stname"] = ""
+defs["ImGui_ImplSDL2_InitForD3D"]["(SDL_Window*)"] = defs["ImGui_ImplSDL2_InitForD3D"][1]
 defs["ImGui_ImplSDL2_InitForOpenGL"] = {}
 defs["ImGui_ImplSDL2_InitForOpenGL"][1] = {}
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["args"] = "(SDL_Window* window,void* sdl_gl_context)"
@@ -436,10 +429,9 @@ defs["ImGui_ImplSDL2_InitForOpenGL"][1]["argsT"][2]["type"] = "void*"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["argsoriginal"] = "(SDL_Window* window,void* sdl_gl_context)"
 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]["comment"] = ""
 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*)"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["stname"] = ""
@@ -454,10 +446,9 @@ defs["ImGui_ImplSDL2_InitForVulkan"][1]["argsT"][1]["type"] = "SDL_Window*"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["argsoriginal"] = "(SDL_Window* window)"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForVulkan"
-defs["ImGui_ImplSDL2_InitForVulkan"][1]["comment"] = ""
 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*)"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["stname"] = ""
@@ -472,10 +463,9 @@ defs["ImGui_ImplSDL2_NewFrame"][1]["argsT"][1]["type"] = "SDL_Window*"
 defs["ImGui_ImplSDL2_NewFrame"][1]["argsoriginal"] = "(SDL_Window* window)"
 defs["ImGui_ImplSDL2_NewFrame"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_NewFrame"][1]["cimguiname"] = "ImGui_ImplSDL2_NewFrame"
-defs["ImGui_ImplSDL2_NewFrame"][1]["comment"] = ""
 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*)"
 defs["ImGui_ImplSDL2_NewFrame"][1]["stname"] = ""
@@ -490,10 +480,9 @@ defs["ImGui_ImplSDL2_ProcessEvent"][1]["argsT"][1]["type"] = "const SDL_Event*"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["argsoriginal"] = "(const SDL_Event* event)"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["call_args"] = "(event)"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["cimguiname"] = "ImGui_ImplSDL2_ProcessEvent"
-defs["ImGui_ImplSDL2_ProcessEvent"][1]["comment"] = ""
 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*)"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["stname"] = ""
@@ -505,10 +494,9 @@ defs["ImGui_ImplSDL2_Shutdown"][1]["argsT"] = {}
 defs["ImGui_ImplSDL2_Shutdown"][1]["argsoriginal"] = "()"
 defs["ImGui_ImplSDL2_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplSDL2_Shutdown"][1]["cimguiname"] = "ImGui_ImplSDL2_Shutdown"
-defs["ImGui_ImplSDL2_Shutdown"][1]["comment"] = ""
 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"] = "()"
 defs["ImGui_ImplSDL2_Shutdown"][1]["stname"] = ""

generator/output/overloads.txt

@@ -1,8 +1,7 @@
 ----------------overloadings---------------------------
-igCombo	3
-1	bool	igCombo (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)
+ImVector_resize	2
+1	void	ImVector_resize (int)
+2	void	ImVector_resizeT (int,const T)
 ImVec4_ImVec4	2
 1	nil	ImVec4_ImVec4 ()
 2	nil	ImVec4_ImVec4Float (float,float,float,float)
@@ -11,101 +10,126 @@ igValue	4
 2	void	igValueInt (const char*,int)
 3	void	igValueUint (const char*,unsigned int)
 4	void	igValueFloat (const char*,float,const char*)
-igPushStyleVar	2
-1	void	igPushStyleVarFloat (ImGuiStyleVar,float)
-2	void	igPushStyleVarVec2 (ImGuiStyleVar,const ImVec2)
 igIsRectVisible	2
 1	bool	igIsRectVisible (const ImVec2)
 2	bool	igIsRectVisibleVec2 (const ImVec2,const ImVec2)
 igRadioButton	2
 1	bool	igRadioButtonBool (const char*,bool)
 2	bool	igRadioButtonIntPtr (const char*,int*,int)
-igSetWindowSize	2
-1	void	igSetWindowSizeVec2 (const ImVec2,ImGuiCond)
-2	void	igSetWindowSizeStr (const char*,const ImVec2,ImGuiCond)
+ImGuiTextRange_ImGuiTextRange	2
+1	nil	ImGuiTextRange_ImGuiTextRange ()
+2	nil	ImGuiTextRange_ImGuiTextRangeStr (const char*,const char*)
+ImVector_back	2
+1	T*	ImVector_back ()
+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)
+igGetID	3
+1	ImGuiID	igGetIDStr (const char*)
+2	ImGuiID	igGetIDRange (const char*,const char*)
+3	ImGuiID	igGetIDPtr (const void*)
+igSetWindowPos	2
+1	void	igSetWindowPosVec2 (const ImVec2,ImGuiCond)
+2	void	igSetWindowPosStr (const char*,const ImVec2,ImGuiCond)
+igBeginChild	2
+1	bool	igBeginChild (const char*,const ImVec2,bool,ImGuiWindowFlags)
+2	bool	igBeginChildID (ImGuiID,const ImVec2,bool,ImGuiWindowFlags)
+igPushID	4
+1	void	igPushIDStr (const char*)
+2	void	igPushIDRange (const char*,const char*)
+3	void	igPushIDPtr (const void*)
+4	void	igPushIDInt (int)
+ImGuiStoragePair_ImGuiStoragePair	3
+1	nil	ImGuiStoragePair_ImGuiStoragePairInt (ImGuiID,int)
+2	nil	ImGuiStoragePair_ImGuiStoragePairFloat (ImGuiID,float)
+3	nil	ImGuiStoragePair_ImGuiStoragePairPtr (ImGuiID,void*)
+igTreeNode	3
+1	bool	igTreeNodeStr (const char*)
+2	bool	igTreeNodeStrStr (const char*,const char*,...)
+3	bool	igTreeNodePtr (const void*,const char*,...)
+igCombo	3
+1	bool	igCombo (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)
+ImVector_erase	2
+1	T*	ImVector_erase (const T*)
+2	T*	ImVector_eraseTPtr (const T*,const T*)
+ImDrawList_AddText	2
+1	void	ImDrawList_AddText (const ImVec2,ImU32,const char*,const char*)
+2	void	ImDrawList_AddTextFontPtr (const ImFont*,float,const ImVec2,ImU32,const char*,const char*,float,const ImVec4*)
+igPushStyleVar	2
+1	void	igPushStyleVarFloat (ImGuiStyleVar,float)
+2	void	igPushStyleVarVec2 (ImGuiStyleVar,const ImVec2)
 igSetWindowFocus	2
 1	void	igSetWindowFocus ()
 2	void	igSetWindowFocusStr (const char*)
+ImVector_end	2
+1	T*	ImVector_end ()
+2	const T*	ImVector_end_const ()const
+ImVector_ImVector	2
+1	nil	ImVector_ImVector ()
+2	nil	ImVector_ImVectorVector (const ImVector)
 igSetWindowCollapsed	2
 1	void	igSetWindowCollapsedBool (bool,ImGuiCond)
 2	void	igSetWindowCollapsedStr (const char*,bool,ImGuiCond)
 igPlotLines	2
 1	void	igPlotLines (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)
-ImVec2_ImVec2	2
-1	nil	ImVec2_ImVec2 ()
-2	nil	ImVec2_ImVec2Float (float,float)
-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)
-igTreeNodeExV	2
-1	bool	igTreeNodeExVStr (const char*,ImGuiTreeNodeFlags,const char*,va_list)
-2	bool	igTreeNodeExVPtr (const void*,ImGuiTreeNodeFlags,const char*,va_list)
-igPushStyleColor	2
-1	void	igPushStyleColorU32 (ImGuiCol,ImU32)
-2	void	igPushStyleColor (ImGuiCol,const ImVec4)
-igGetID	3
-1	ImGuiID	igGetIDStr (const char*)
-2	ImGuiID	igGetIDRange (const char*,const char*)
-3	ImGuiID	igGetIDPtr (const void*)
-TextRange_TextRange	2
-1	nil	TextRange_TextRange ()
-2	nil	TextRange_TextRangeStr (const char*,const char*)
 igListBoxHeader	2
 1	bool	igListBoxHeaderVec2 (const char*,const ImVec2)
 2	bool	igListBoxHeaderInt (const char*,int,int)
-igBeginChild	2
-1	bool	igBeginChild (const char*,const ImVec2,bool,ImGuiWindowFlags)
-2	bool	igBeginChildID (ImGuiID,const ImVec2,bool,ImGuiWindowFlags)
-igTreePush	2
-1	void	igTreePushStr (const char*)
-2	void	igTreePushPtr (const void*)
-ImDrawList_AddText	2
-1	void	ImDrawList_AddText (const ImVec2,ImU32,const char*,const char*)
-2	void	ImDrawList_AddTextFontPtr (const ImFont*,float,const ImVec2,ImU32,const char*,const char*,float,const ImVec4*)
-igSelectable	2
-1	bool	igSelectable (const char*,bool,ImGuiSelectableFlags,const ImVec2)
-2	bool	igSelectableBoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2)
+igTreeNodeExV	2
+1	bool	igTreeNodeExVStr (const char*,ImGuiTreeNodeFlags,const char*,va_list)
+2	bool	igTreeNodeExVPtr (const void*,ImGuiTreeNodeFlags,const char*,va_list)
 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)
-igPushID	4
-1	void	igPushIDStr (const char*)
-2	void	igPushIDRange (const char*,const char*)
-3	void	igPushIDPtr (const void*)
-4	void	igPushIDInt (int)
-Pair_Pair	3
-1	nil	Pair_PairInt (ImGuiID,int)
-2	nil	Pair_PairFloat (ImGuiID,float)
-3	nil	Pair_PairPtr (ImGuiID,void*)
-igSetWindowPos	2
-1	void	igSetWindowPosVec2 (const ImVec2,ImGuiCond)
-2	void	igSetWindowPosStr (const char*,const ImVec2,ImGuiCond)
+ImVec2_ImVec2	2
+1	nil	ImVec2_ImVec2 ()
+2	nil	ImVec2_ImVec2Float (float,float)
+igCollapsingHeader	2
+1	bool	igCollapsingHeader (const char*,ImGuiTreeNodeFlags)
+2	bool	igCollapsingHeaderBoolPtr (const char*,bool*,ImGuiTreeNodeFlags)
+igTreePush	2
+1	void	igTreePushStr (const char*)
+2	void	igTreePushPtr (const void*)
+igGetColorU32	3
+1	ImU32	igGetColorU32 (ImGuiCol,float)
+2	ImU32	igGetColorU32Vec4 (const ImVec4)
+3	ImU32	igGetColorU32U32 (ImU32)
 ImColor_ImColor	5
 1	nil	ImColor_ImColor ()
 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)
-igCollapsingHeader	2
-1	bool	igCollapsingHeader (const char*,ImGuiTreeNodeFlags)
-2	bool	igCollapsingHeaderBoolPtr (const char*,bool*,ImGuiTreeNodeFlags)
-igMenuItem	2
-1	bool	igMenuItemBool (const char*,const char*,bool,bool)
-2	bool	igMenuItemBoolPtr (const char*,const char*,bool*,bool)
+ImVector_front	2
+1	T*	ImVector_front ()
+2	const T*	ImVector_front_const ()const
+ImVector_begin	2
+1	T*	ImVector_begin ()
+2	const T*	ImVector_begin_const ()const
+igPushStyleColor	2
+1	void	igPushStyleColorU32 (ImGuiCol,ImU32)
+2	void	igPushStyleColor (ImGuiCol,const ImVec4)
 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	igGetColorU32 (ImGuiCol,float)
-2	ImU32	igGetColorU32Vec4 (const ImVec4)
-3	ImU32	igGetColorU32U32 (ImU32)
-igTreeNode	3
-1	bool	igTreeNodeStr (const char*)
-2	bool	igTreeNodeStrStr (const char*,const char*,...)
-3	bool	igTreeNodePtr (const void*,const char*,...)
+igSelectable	2
+1	bool	igSelectable (const char*,bool,ImGuiSelectableFlags,const ImVec2)
+2	bool	igSelectableBoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2)
+ImVector_find	2
+1	T*	ImVector_find (const T)
+2	const T*	ImVector_find_const (const T)const
+igMenuItem	2
+1	bool	igMenuItemBool (const char*,const char*,bool,bool)
+2	bool	igMenuItemBoolPtr (const char*,const char*,bool*,bool)
+igSetWindowSize	2
+1	void	igSetWindowSizeVec2 (const ImVec2,ImGuiCond)
+2	void	igSetWindowSizeStr (const char*,const ImVec2,ImGuiCond)
 igTreeNodeV	2
 1	bool	igTreeNodeVStr (const char*,const char*,va_list)
 2	bool	igTreeNodeVPtr (const void*,const char*,va_list)
-77 overloaded
+93 overloaded

generator/output/typedefs_dict.json

@@ -1,6 +1,4 @@
 {
-  "CustomRect": "struct CustomRect",
-  "GlyphRangesBuilder": "struct GlyphRangesBuilder",
   "ImColor": "struct ImColor",
   "ImDrawCallback": "void(*)(const ImDrawList* parent_list,const ImDrawCmd* cmd);",
   "ImDrawChannel": "struct ImDrawChannel",
@@ -11,16 +9,18 @@
   "ImDrawList": "struct ImDrawList",
   "ImDrawListFlags": "int",
   "ImDrawListSharedData": "struct ImDrawListSharedData",
+  "ImDrawListSplitter": "struct ImDrawListSplitter",
   "ImDrawVert": "struct ImDrawVert",
   "ImFont": "struct ImFont",
   "ImFontAtlas": "struct ImFontAtlas",
+  "ImFontAtlasCustomRect": "struct ImFontAtlasCustomRect",
   "ImFontAtlasFlags": "int",
   "ImFontConfig": "struct ImFontConfig",
   "ImFontGlyph": "struct ImFontGlyph",
+  "ImFontGlyphRangesBuilder": "struct ImFontGlyphRangesBuilder",
   "ImGuiBackendFlags": "int",
   "ImGuiCol": "int",
   "ImGuiColorEditFlags": "int",
-  "ImGuiColumnsFlags": "int",
   "ImGuiComboFlags": "int",
   "ImGuiCond": "int",
   "ImGuiConfigFlags": "int",
@@ -45,22 +45,28 @@
   "ImGuiSizeCallback": "void(*)(ImGuiSizeCallbackData* data);",
   "ImGuiSizeCallbackData": "struct ImGuiSizeCallbackData",
   "ImGuiStorage": "struct ImGuiStorage",
+  "ImGuiStoragePair": "struct ImGuiStoragePair",
   "ImGuiStyle": "struct ImGuiStyle",
   "ImGuiStyleVar": "int",
+  "ImGuiTabBarFlags": "int",
+  "ImGuiTabItemFlags": "int",
   "ImGuiTextBuffer": "struct ImGuiTextBuffer",
   "ImGuiTextFilter": "struct ImGuiTextFilter",
+  "ImGuiTextRange": "struct ImGuiTextRange",
   "ImGuiTreeNodeFlags": "int",
   "ImGuiWindowFlags": "int",
+  "ImS16": "signed short",
   "ImS32": "signed int",
   "ImS64": "int64_t",
+  "ImS8": "signed char",
   "ImTextureID": "void*",
+  "ImU16": "unsigned short",
   "ImU32": "unsigned int",
   "ImU64": "uint64_t",
+  "ImU8": "unsigned char",
   "ImVec2": "struct ImVec2",
   "ImVec4": "struct ImVec4",
   "ImWchar": "unsigned short",
-  "Pair": "struct Pair",
-  "TextRange": "struct TextRange",
   "const_iterator": "const value_type*",
   "iterator": "value_type*",
   "value_type": "T"

generator/output/typedefs_dict.lua

@@ -1,6 +1,4 @@
 local defs = {}
-defs["CustomRect"] = "struct CustomRect"
-defs["GlyphRangesBuilder"] = "struct GlyphRangesBuilder"
 defs["ImColor"] = "struct ImColor"
 defs["ImDrawCallback"] = "void(*)(const ImDrawList* parent_list,const ImDrawCmd* cmd);"
 defs["ImDrawChannel"] = "struct ImDrawChannel"
@@ -11,16 +9,18 @@ defs["ImDrawIdx"] = "unsigned short"
 defs["ImDrawList"] = "struct ImDrawList"
 defs["ImDrawListFlags"] = "int"
 defs["ImDrawListSharedData"] = "struct ImDrawListSharedData"
+defs["ImDrawListSplitter"] = "struct ImDrawListSplitter"
 defs["ImDrawVert"] = "struct ImDrawVert"
 defs["ImFont"] = "struct ImFont"
 defs["ImFontAtlas"] = "struct ImFontAtlas"
+defs["ImFontAtlasCustomRect"] = "struct ImFontAtlasCustomRect"
 defs["ImFontAtlasFlags"] = "int"
 defs["ImFontConfig"] = "struct ImFontConfig"
 defs["ImFontGlyph"] = "struct ImFontGlyph"
+defs["ImFontGlyphRangesBuilder"] = "struct ImFontGlyphRangesBuilder"
 defs["ImGuiBackendFlags"] = "int"
 defs["ImGuiCol"] = "int"
 defs["ImGuiColorEditFlags"] = "int"
-defs["ImGuiColumnsFlags"] = "int"
 defs["ImGuiComboFlags"] = "int"
 defs["ImGuiCond"] = "int"
 defs["ImGuiConfigFlags"] = "int"
@@ -45,22 +45,28 @@ defs["ImGuiSelectableFlags"] = "int"
 defs["ImGuiSizeCallback"] = "void(*)(ImGuiSizeCallbackData* data);"
 defs["ImGuiSizeCallbackData"] = "struct ImGuiSizeCallbackData"
 defs["ImGuiStorage"] = "struct ImGuiStorage"
+defs["ImGuiStoragePair"] = "struct ImGuiStoragePair"
 defs["ImGuiStyle"] = "struct ImGuiStyle"
 defs["ImGuiStyleVar"] = "int"
+defs["ImGuiTabBarFlags"] = "int"
+defs["ImGuiTabItemFlags"] = "int"
 defs["ImGuiTextBuffer"] = "struct ImGuiTextBuffer"
 defs["ImGuiTextFilter"] = "struct ImGuiTextFilter"
+defs["ImGuiTextRange"] = "struct ImGuiTextRange"
 defs["ImGuiTreeNodeFlags"] = "int"
 defs["ImGuiWindowFlags"] = "int"
+defs["ImS16"] = "signed short"
 defs["ImS32"] = "signed int"
 defs["ImS64"] = "int64_t"
+defs["ImS8"] = "signed char"
 defs["ImTextureID"] = "void*"
+defs["ImU16"] = "unsigned short"
 defs["ImU32"] = "unsigned int"
 defs["ImU64"] = "uint64_t"
+defs["ImU8"] = "unsigned char"
 defs["ImVec2"] = "struct ImVec2"
 defs["ImVec4"] = "struct ImVec4"
 defs["ImWchar"] = "unsigned short"
-defs["Pair"] = "struct Pair"
-defs["TextRange"] = "struct TextRange"
 defs["const_iterator"] = "const value_type*"
 defs["iterator"] = "value_type*"
 defs["value_type"] = "T"

test/CMakeLists.txt

@@ -0,0 +1,11 @@
+file(GLOB CIMGUI_TEST_SOURCES
+    main.c
+)
+
+add_executable(cimgui_test ${CIMGUI_TEST_SOURCES})
+
+set_target_properties(cimgui_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set_property(TARGET cimgui_test PROPERTY C_STANDARD 99)
+
+target_compile_definitions(cimgui_test PRIVATE CIMGUI_DEFINE_ENUMS_AND_STRUCTS=1)
+target_link_libraries(cimgui_test PRIVATE cimgui)

test/main.c

@@ -0,0 +1,41 @@
+#include <stdio.h>
+#include <assert.h>
+#include "../cimgui.h"
+
+int main(void)
+{
+  assert(igDebugCheckVersionAndDataLayout(igGetVersion(), sizeof(ImGuiIO), sizeof(ImGuiStyle),
+                                          sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert),
+                                          sizeof(ImDrawIdx)));
+  printf("CreateContext() - v%s\n", igGetVersion());
+  igCreateContext(NULL);
+  ImGuiIO *io = igGetIO();
+
+  unsigned char *text_pixels = NULL;
+  int text_w, text_h;
+  ImFontAtlas_GetTexDataAsRGBA32(io->Fonts, &text_pixels, &text_w, &text_h, NULL);
+
+  for (int n = 0; n < 20; n++) {
+    printf("NewFrame() %d\n", n);
+
+    ImVec2 display_size;
+    display_size.x = 1920;
+    display_size.y = 1080;
+    io->DisplaySize = display_size;
+    io->DeltaTime = 1.0f / 60.0f;
+    igNewFrame();
+
+    static float f = 0.0f;
+    igText("Hello World!");
+    igSliderFloat("float", &f, 0.0f, 1.0f, "%.3f", 1.0f);
+    igText("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / io->Framerate, io->Framerate);
+    igShowDemoWindow(NULL);
+
+    igRender();
+  }
+
+  printf("DestroyContext()\n");
+  igDestroyContext(NULL);
+
+  return 0;
+}

testbuildc/build.bat

@@ -1,6 +0,0 @@
-set PATH=%PATH%;C:\mingw32\bin;
-::set PATH=%PATH%;C:\i686-7.2.0-release-posix-dwarf-rt_v5-rev1\mingw32\bin;
-::gcc -std=c99 -DCIMGUI_DEFINE_ENUMS_AND_STRUCTS cimgui.h
-::gcc  -DCIMGUI_DEFINE_ENUMS_AND_STRUCTS cimgui.h
-gcc  -DCIMGUI_DEFINE_ENUMS_AND_STRUCTS cimguitest.c
-cmd /k

testbuildc/cimguitest.c

@@ -1,5 +0,0 @@
-#include "../cimgui.h"
-
-void main(void)
-{
-}

testbuildc/testcl.bat

@@ -1,13 +0,0 @@
-::set PATH=%PATH%;C:\luaGL;C:\mingw32\bin;
-::gcc -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ../imgui/imgui.h > 11.txt
-
-::set PATH=%PATH%;C:\luaGL;
-::set PATH=%PATH%;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.15.26726\bin\Hostx64\x64;
-
-::ejecutar en cmd esto 
-::"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
-
-::cl /P /DIMGUI_DISABLE_OBSOLETE_FUNCTIONS /DIMGUI_API="" /DIMGUI_IMPL_API="" ../imgui/imgui.h 
-:: > clout.txt
-cl  /P /DCIMGUI_DEFINE_ENUMS_AND_STRUCTS cimguitest.c
-cmd /k