Merge branch 'docking_inter'

CMakeLists.txt

@@ -26,10 +26,10 @@ set(IMGUI_FREETYPE "no" CACHE STRING "Build with freetype library")
 set(IMGUI_LIBRARIES )
 
 if(IMGUI_FREETYPE)
-	message(STATUS "Building with freetype")
 	FIND_PACKAGE(freetype REQUIRED PATHS ${FREETYPE_PATH})
 	list(APPEND IMGUI_LIBRARIES freetype)
 	list(APPEND IMGUI_SOURCES imgui/misc/freetype/imgui_freetype.cpp)
+	add_definitions("-DCIMGUI_FREETYPE=1")
 endif(IMGUI_FREETYPE)
 
 #add library and link
@@ -39,16 +39,6 @@ else (IMGUI_STATIC)
     add_library(cimgui SHARED ${IMGUI_SOURCES})
 endif (IMGUI_STATIC)
 
-if(IMGUI_FREETYPE)
-	target_compile_definitions(cimgui PUBLIC IMGUI_ENABLE_FREETYPE)
-	target_compile_definitions(cimgui PUBLIC IMGUI_ENABLE_STB_TRUETYPE)
-endif(IMGUI_FREETYPE)
-
-if(IMGUI_WCHAR32)
-	target_compile_definitions(cimgui PUBLIC IMGUI_USE_WCHAR32)
-endif(IMGUI_WCHAR32)
-
-add_definitions("-DIMGUI_USER_CONFIG=\"../cimconfig.h\"")
 target_compile_definitions(cimgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS=1)
 if (WIN32)
     target_compile_definitions(cimgui PUBLIC IMGUI_IMPL_API=extern\t\"C\"\t__declspec\(dllexport\))

README.md

@@ -11,7 +11,7 @@ History:
 Initially cimgui was developed by Stephan Dilly as hand-written code but lately turned into an auto-generated version by sonoro1234 in order to keep up with imgui more easily (letting the user select the desired branch and commit)
 
 Notes:
-* currently this wrapper is based on version [1.91.9 of Dear ImGui with internal api]
+* currently this wrapper is based on version [1.90.9 of Dear ImGui with internal api]
 * only functions, structs and enums from imgui.h (an optionally imgui_internal.h) are wrapped.
 * if you are interested in imgui backends you should look [LuaJIT-ImGui](https://github.com/sonoro1234/LuaJIT-ImGui) project.
 * All naming is algorithmic except for those names that were coded in cimgui_overloads table (https://github.com/cimgui/cimgui/blob/master/generator/generator.lua#L60). In the official version this table is empty.
@@ -24,7 +24,7 @@ Notes:
   * `git submodule update --init --recursive` (If already cloned)
 * compile 
   * using makefile on linux/macOS/mingw (Or use CMake to generate project)
-  * cmake options are IMGUI_STATIC (compiling as static library), IMGUI_FREETYPE (for using Freetype2) and FREETYPE_PATH (Freetype2 cmake install location) and IMGUI_WCHAR32
+  * cmake options are IMGUI_STATIC (compiling as static library), IMGUI_FREETYPE (for using Freetype2) and FREETYPE_PATH (Freetype2 cmake install location) (only if cimgui is generated with freetype option)
   * or as in https://github.com/sonoro1234/LuaJIT-ImGui/tree/master/build
   
   For compiling with backends there are now examples with SDL2 and opengl3/vulkan in folder backend_test.
@@ -37,12 +37,12 @@ Notes:
 * 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 need to use also a C++ compiler for doing preprocessing: gcc (In windows MinGW-W64-builds for example), clang or cl (MSVC). (this repo was done with gcc)
 * update `imgui` folder to the version you desire.
-* edit `generator/generator.bat` on windows, or `generator/generator.sh` on linux, to choose between gcc, clang, or cl and to choose desired backends and whether imgui_internal is generated or not, comments are generated or not and if constructors are generated also with versions performing just initialization of structs provided by yourself (_Construct is added to the constructor names)
+* edit `generator/generator.bat` on windows, or `generator/generator.sh` on linux, to choose between gcc, clang, or cl and to choose desired backends and whether imgui_internal is generated or not, Freetype2 is used or not and comments are generated or not
 * the defaults of generator are gcc as compiler, imgui_internal included and sdl, glfw, vulkan, opengl2 and opengl3 as backends.
 * edit config_generator.lua for adding includes needed by your chosen backends (vulkan needs that).
 * Run generator.bat or generator.sh with gcc, clang or cl and LuaJIT on your PATH.
 * as a result some files are generated: `cimgui.cpp`, `cimgui.h` and `cimgui_impl.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 backends info. 
-* You can pass compiler flags to generator.sh or generator.bat by editing them at the end of the call to further specify the compiler behavior. (e.g. -DIMGUI_USER_CONFIG)
+* You can pass compiler flags to generator.sh or generator.bat by editing them at the end of the call to further specify the compiler behavior. (e.g. -DIMGUI_USER_CONFIG or -DIMGUI_USE_WCHAR32)
 * You are able to pass any extra argument to generator.sh (.bat) in the command-line.
 * If you are using different options than cimgui repo and if you want to keep them after a cimgui update, you can keep them in a copy of generator.sh (.bat) outside of cimgui folder where `cd cimgui/generator` is used before luajit call. See https://github.com/cimgui/cimgui/issues/232#issuecomment-1497059497
 # generate binding
@@ -92,10 +92,10 @@ Notes:
 * methods have the same parameter list and return values (where possible)
 * functions that belong to a struct have an extra first argument with a pointer to the struct.
 * where a function returns UDT (user defined type) by value some compilers complain so the function is generated accepting a pointer to the UDT type as the first argument (or second if belongs to a struct).
-* constructors return pointer to struct and has been named Struct_name_Struct_name
+
 # usage with backends
 
-* look at backend_test folder for a cmake module building with SDL and opengl3, glfw and opengl3, SDL and Vulkan, glfw and dx11
+* look at backend_test folder for a cmake module building with SDL and opengl3, glfw and opengl3, SDL and Vulkan
 * read [How can cimgui backends be used](https://github.com/cimgui/cimgui/issues/157)
 
 # example bindings based on cimgui

backend_test/example_glfw_dx11/CMakeLists.txt

@@ -23,7 +23,6 @@ else()
 endif()
 
 include_directories(../../imgui)
-add_definitions("-DIMGUI_USER_CONFIG=\"../cimconfig.h\"")
 add_definitions("-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS=1")
 
 include_directories(../../)
@@ -102,6 +101,7 @@ target_link_libraries(cimgui ${IMGUI_LIBRARIES} glfw)
 
 
 # using library
+include_directories(../../generator/output/)
 add_executable(${PROJECT_NAME} main.c)
 target_compile_definitions(${PROJECT_NAME} PUBLIC -DCIMGUI_USE_DX11 -DCIMGUI_USE_GLFW)
 target_link_libraries(${PROJECT_NAME} d3d11 d3dcompiler.lib cimgui)

backend_test/example_glfw_opengl3/CMakeLists.txt

@@ -23,7 +23,6 @@ else()
 endif()
 
 include_directories(../../imgui)
-add_definitions("-DIMGUI_USER_CONFIG=\"../cimconfig.h\"")
 add_definitions("-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS=1")
 
 include_directories(../../)
@@ -106,6 +105,7 @@ target_link_libraries(cimgui ${IMGUI_LIBRARIES} glfw)
 
 
 # using library
+include_directories(../../generator/output/)
 add_executable(${PROJECT_NAME} main.c)
 target_compile_definitions(${PROJECT_NAME} PUBLIC -DCIMGUI_USE_OPENGL3 -DCIMGUI_USE_GLFW)
 target_link_libraries(${PROJECT_NAME} cimgui)

backend_test/example_sdl_opengl3/CMakeLists.txt

@@ -22,6 +22,7 @@ else()
 endif()
 
 include_directories(../../imgui)
+add_definitions("-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS=1")
 
 include_directories(../../)
 set(IMGUI_SOURCES 
@@ -36,7 +37,11 @@ ${TABLES_SOURCE}
 set(IMGUI_SOURCES_sdl)
 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)
 
 add_compile_definitions("IMGUI_IMPL_OPENGL_LOADER_GL3W")
 
@@ -60,46 +65,47 @@ else(WIN32)#Unix
 endif(WIN32)
 
 
+#sdl2
 list(APPEND IMGUI_SOURCES ${BAKENDS_FOLDER}imgui_impl_sdl2.cpp)
-include(FetchContent)
+if(DEFINED SDL_PATH)
-Set(FETCHCONTENT_QUIET FALSE)
+	message(STATUS "SDL_PATH defined as " ${SDL_PATH})
+	FIND_PACKAGE(SDL2 PATHS ${SDL_PATH})
+else(DEFINED SDL_PATH)
+	# If SDL_PATH is not set, fallback and attempt to find SDL cmake script at a default location
+	find_package(SDL2)
+endif(DEFINED SDL_PATH)
 
-FetchContent_Declare(
+if(SDL2_FOUND)
-        SDL2
+	get_target_property(SDL_INCLUDE SDL2::SDL2 INTERFACE_INCLUDE_DIRECTORIES)
-        GIT_REPOSITORY https://github.com/libsdl-org/SDL.git
+	message(STATUS "sdlinclude is " ${SDL_INCLUDE})
-        GIT_TAG release-2.30.12
+	if ("${SDL_INCLUDE}" STREQUAL "" OR "${SDL_INCLUDE}" STREQUAL "SDL_INCLUDE-NOTFOUND") #if not found latest SDL2 cmake config use older
-        #GIT_SHALLOW TRUE
+		message(STATUS "sdlinclude2 is " ${SDL2_INCLUDE_DIRS})
-        GIT_PROGRESS TRUE
+		include_directories(${SDL2_INCLUDE_DIRS})
-)
+		set(IMGUI_SDL_LIBRARY ${SDL2_LIBRARIES})
-#FetchContent_MakeAvailable(SDL2)
+		message(STATUS IMGUI_SDL_LIBRARY ${SDL2_LIBRARIES})
-FetchContent_GetProperties(SDL2)
+	else()#use new one SDL2 config
-if (NOT sdl2_POPULATED)
+		include_directories(${SDL_INCLUDE})
-	set(FETCHCONTENT_QUIET NO)
+		set(IMGUI_SDL_LIBRARY SDL2::SDL2)
-    FetchContent_Populate(SDL2)
+		set(SDL_MAIN SDL2::SDL2main)
-	set(SDL_TEST OFF CACHE BOOL "" FORCE)
+		message(STATUS ${SDL_MAIN} ${IMGUI_SDL_LIBRARY})
-	set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
+	endif()
-	add_subdirectory(${sdl2_SOURCE_DIR} ${sdl2_BINARY_DIR})
+else(SDL2_FOUND)
-endif()
+	if(DEFINED SDL_PATH)
-include_directories(${SDL2_SOURCE_DIR}/include})
+		message(FATAL_ERROR "Cannot find SDL at SDL_PATH")
-
+	else(DEFINED SDL_PATH)
-#if dynamic SDL2 then install
+		message(FATAL_ERROR "Cannot find SDL. Maybe try specifying SDL_PATH?")
-install(TARGETS SDL2 RUNTIME DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+	endif(DEFINED SDL_PATH)
-					LIBRARY DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+endif(SDL2_FOUND)
-)
 
 add_library(cimgui_sdl SHARED ${IMGUI_SOURCES})
-target_compile_definitions(cimgui_sdl PUBLIC "-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS=1")
+target_link_libraries(cimgui_sdl ${IMGUI_LIBRARIES} ${IMGUI_SDL_LIBRARY})
-if (WIN32)
-    target_compile_definitions(cimgui_sdl PUBLIC "-DIMGUI_IMPL_API=extern \"C\" __declspec\(dllexport\)")
-else(WIN32)
-    target_compile_definitions(cimgui_sdl PUBLIC "-DIMGUI_IMPL_API=extern \"C\" ")
-endif(WIN32)
-target_link_libraries(cimgui_sdl ${IMGUI_LIBRARIES} SDL2)
 
 #using library
+include_directories(../../generator/output/)
 add_executable(test_sdl main.c)
 target_compile_definitions(test_sdl PUBLIC -DCIMGUI_USE_OPENGL3 -DCIMGUI_USE_SDL2)
 if (MINGW)
 target_link_options(test_sdl PRIVATE "-mconsole")
 endif()
-target_link_libraries(test_sdl SDL2 cimgui_sdl)
+target_link_libraries(test_sdl ${IMGUI_SDL_LIBRARY} cimgui_sdl)
+

backend_test/example_sdl_opengl3/README.md

@@ -1,2 +0,0 @@
-
-To build use `cmake path_to_example_sdl_opengl3` and then `make install`

backend_test/example_sdl_vulkan/CMakeLists.txt

@@ -18,12 +18,11 @@ else()
 	set(TABLES_SOURCE "")
 endif()
 
-include_directories(../../imgui ../../imgui/backends)
+include_directories(../../imgui)
-
+add_definitions("-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS=1")
 
 include_directories(../../)
 set(IMGUI_SOURCES ../../cimgui.cpp
-../../cimgui_impl.cpp
 ../../imgui/imgui.cpp
 ../../imgui/imgui_draw.cpp
 ../../imgui/imgui_demo.cpp
@@ -34,6 +33,11 @@ ${TABLES_SOURCE}
 set(IMGUI_SOURCES_sdl)
 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)
 
 #optional adding freetype
 option(IMGUI_FREETYPE "add Freetype2" OFF)
@@ -49,52 +53,48 @@ endif(IMGUI_FREETYPE)
 find_package(Vulkan REQUIRED FATAL_ERROR)
 list(APPEND IMGUI_LIBRARIES Vulkan::Vulkan)
 list(APPEND IMGUI_SOURCES ${BACKENDS_FOLDER}imgui_impl_vulkan.cpp)
-include_directories(${Vulkan_INCLUDE_DIRS})
 
 #sdl2
 list(APPEND IMGUI_SOURCES ${BACKENDS_FOLDER}imgui_impl_sdl2.cpp)
-include(FetchContent)
+if(DEFINED SDL_PATH)
-Set(FETCHCONTENT_QUIET FALSE)
+	message(STATUS "SDL_PATH defined as " ${SDL_PATH})
+	FIND_PACKAGE(SDL2 PATHS ${SDL_PATH})
+else(DEFINED SDL_PATH)
+	# If SDL_PATH is not set, fallback and attempt to find SDL cmake script at a default location
+	find_package(SDL2)
+endif(DEFINED SDL_PATH)
 
-FetchContent_Declare(
+if(SDL2_FOUND)
-        SDL2
+	get_target_property(SDL_INCLUDE SDL2::SDL2 INTERFACE_INCLUDE_DIRECTORIES)
-        GIT_REPOSITORY https://github.com/libsdl-org/SDL.git
+	message(STATUS "sdlinclude is " ${SDL_INCLUDE})
-        GIT_TAG release-2.30.12
+	if ("${SDL_INCLUDE}" STREQUAL "" OR "${SDL_INCLUDE}" STREQUAL "SDL_INCLUDE-NOTFOUND") #if not found latest SDL2 cmake config use older
-        #GIT_SHALLOW TRUE
+		message(STATUS "sdlinclude2 is " ${SDL2_INCLUDE_DIRS})
-        GIT_PROGRESS TRUE
+		include_directories(${SDL2_INCLUDE_DIRS})
-)
+		set(IMGUI_SDL_LIBRARY ${SDL2_LIBRARIES})
-FetchContent_GetProperties(SDL2)
+		message(STATUS IMGUI_SDL_LIBRARY ${SDL2_LIBRARIES})
-if (NOT sdl2_POPULATED)
+	else()#use new one SDL2 config
-	set(FETCHCONTENT_QUIET NO)
+		include_directories(${SDL_INCLUDE})
-    FetchContent_Populate(SDL2)
+		set(IMGUI_SDL_LIBRARY SDL2::SDL2)
-	set(SDL_TEST OFF CACHE BOOL "" FORCE)
+		set(SDL_MAIN SDL2::SDL2main)
-	set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+		message(STATUS ${SDL_MAIN} ${IMGUI_SDL_LIBRARY})
-	add_subdirectory(${sdl2_SOURCE_DIR} ${sdl2_BINARY_DIR})
+	endif()
-endif()
+else(SDL2_FOUND)
-include_directories(${SDL2_SOURCE_DIR}/include)
+	if(DEFINED SDL_PATH)
+		message(FATAL_ERROR "Cannot find SDL at SDL_PATH")
+	else(DEFINED SDL_PATH)
+		message(FATAL_ERROR "Cannot find SDL. Maybe try specifying SDL_PATH?")
+	endif(DEFINED SDL_PATH)
+endif(SDL2_FOUND)
 
-
+add_library(cimgui_sdl SHARED ${IMGUI_SOURCES})
-#if dynamic SDL2 then install
+target_link_libraries(cimgui_sdl ${IMGUI_LIBRARIES} ${IMGUI_SDL_LIBRARY})
-# install(TARGETS SDL2 RUNTIME DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
-					# LIBRARY DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
-# )
-
-add_library(cimgui_sdl STATIC ${IMGUI_SOURCES})
-target_compile_definitions(cimgui_sdl PUBLIC "-DIMGUI_USER_CONFIG=\"../cimconfig.h\"")
-target_compile_definitions(cimgui_sdl PUBLIC "-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS=1")
-target_compile_definitions(cimgui_sdl PUBLIC -DCIMGUI_USE_VULKAN -DCIMGUI_USE_SDL2)
-if (WIN32)
-    target_compile_definitions(cimgui_sdl PUBLIC "-DIMGUI_IMPL_API=extern \"C\" __declspec\(dllexport\)")
-else(WIN32)
-    target_compile_definitions(cimgui_sdl PUBLIC "-DIMGUI_IMPL_API=extern \"C\" ")
-endif(WIN32)
-#target_link_libraries(cimgui_sdl ${IMGUI_LIBRARIES} SDL2-static)
 
 #using library
+include_directories(../../generator/output/)
 add_executable(test_sdl main.c)
 target_compile_definitions(test_sdl PUBLIC -DCIMGUI_USE_VULKAN -DCIMGUI_USE_SDL2)
 if (MINGW)
 target_link_options(test_sdl PRIVATE "-mconsole")
 endif()
-target_link_libraries(test_sdl SDL2-static cimgui_sdl ${IMGUI_LIBRARIES})
+target_link_libraries(test_sdl ${IMGUI_SDL_LIBRARY} cimgui_sdl)
 

backend_test/example_sdl_vulkan/README.md

@@ -1,3 +0,0 @@
-This example needs vulkan generation before compilation: Vulkan SDK should be installed and then add "vulkan" to generator.bat and generate.
-
-To build use `cmake path_to_example_sdl_vulkan` and then `make install`

cimconfig.h

@@ -1 +0,0 @@
-#undef NDEBUG

cimgui_impl.cpp

@@ -1,65 +0,0 @@
-#include "./imgui/imgui.h"
-#ifdef IMGUI_ENABLE_FREETYPE
-#include "./imgui/misc/freetype/imgui_freetype.h"
-#endif
-#include "./imgui/imgui_internal.h"
-#include "cimgui.h"
-
-#ifdef CIMGUI_USE_DX9
-#include "imgui_impl_dx9.h"
-#endif
-
-#ifdef CIMGUI_USE_DX10
-#include "imgui_impl_dx10.h"
-#endif
-
-#ifdef CIMGUI_USE_DX11
-#include "imgui_impl_dx11.h"
-#endif
-
-#ifdef CIMGUI_USE_DX12
-#include "imgui_impl_dx12.h"
-#endif
-
-#ifdef CIMGUI_USE_GLFW
-#include "imgui_impl_glfw.h"
-#endif
-
-#ifdef CIMGUI_USE_OPENGL2
-#include "imgui_impl_opengl2.h"
-#endif
-
-#ifdef CIMGUI_USE_OPENGL3
-#include "imgui_impl_opengl3.h"
-#endif
-
-#ifdef CIMGUI_USE_SDL2
-#include "imgui_impl_sdl2.h"
-#endif
-
-#ifdef CIMGUI_USE_SDL3
-#include "imgui_impl_sdl3.h"
-#endif
-
-#ifdef CIMGUI_USE_VULKAN
-#include "imgui_impl_vulkan.h"
-#endif
-
-#ifdef CIMGUI_USE_WIN32
-#include "imgui_impl_win32.h"
-#endif
-
-#include "cimgui_impl.h"
-
-#ifdef CIMGUI_USE_VULKAN
-
-CIMGUI_API ImGui_ImplVulkanH_Window* ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window()
-{
-	return IM_NEW(ImGui_ImplVulkanH_Window)();
-}
-CIMGUI_API void ImGui_ImplVulkanH_Window_Construct(ImGui_ImplVulkanH_Window* self)
-{
-	IM_PLACEMENT_NEW(self) ImGui_ImplVulkanH_Window();
-}
-
-#endif

cimgui_impl.h

@@ -1,198 +0,0 @@
-#ifdef CIMGUI_USE_GLFW
-#ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-
-typedef struct GLFWwindow GLFWwindow;
-typedef struct GLFWmonitor GLFWmonitor;
-struct GLFWwindow;
-struct GLFWmonitor;
-#endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-CIMGUI_API bool ImGui_ImplGlfw_InitForOpenGL(GLFWwindow* window,bool install_callbacks);
-CIMGUI_API bool ImGui_ImplGlfw_InitForVulkan(GLFWwindow* window,bool install_callbacks);
-CIMGUI_API bool ImGui_ImplGlfw_InitForOther(GLFWwindow* window,bool install_callbacks);
-CIMGUI_API void ImGui_ImplGlfw_Shutdown(void);
-CIMGUI_API void ImGui_ImplGlfw_NewFrame(void);
-CIMGUI_API void ImGui_ImplGlfw_InstallCallbacks(GLFWwindow* window);
-CIMGUI_API void ImGui_ImplGlfw_RestoreCallbacks(GLFWwindow* window);
-CIMGUI_API void ImGui_ImplGlfw_SetCallbacksChainForAllWindows(bool chain_for_all_windows);
-CIMGUI_API void ImGui_ImplGlfw_WindowFocusCallback(GLFWwindow* window,int focused);
-CIMGUI_API void ImGui_ImplGlfw_CursorEnterCallback(GLFWwindow* window,int entered);
-CIMGUI_API void ImGui_ImplGlfw_CursorPosCallback(GLFWwindow* window,double x,double y);
-CIMGUI_API void ImGui_ImplGlfw_MouseButtonCallback(GLFWwindow* window,int button,int action,int mods);
-CIMGUI_API void ImGui_ImplGlfw_ScrollCallback(GLFWwindow* window,double xoffset,double yoffset);
-CIMGUI_API void ImGui_ImplGlfw_KeyCallback(GLFWwindow* window,int key,int scancode,int action,int mods);
-CIMGUI_API void ImGui_ImplGlfw_CharCallback(GLFWwindow* window,unsigned int c);
-CIMGUI_API void ImGui_ImplGlfw_MonitorCallback(GLFWmonitor* monitor,int event);
-CIMGUI_API void ImGui_ImplGlfw_Sleep(int milliseconds);
-
-#endif
-#ifdef CIMGUI_USE_OPENGL3
-CIMGUI_API bool ImGui_ImplOpenGL3_Init(const char* glsl_version);
-CIMGUI_API void ImGui_ImplOpenGL3_Shutdown(void);
-CIMGUI_API void ImGui_ImplOpenGL3_NewFrame(void);
-CIMGUI_API void ImGui_ImplOpenGL3_RenderDrawData(ImDrawData* draw_data);
-CIMGUI_API bool ImGui_ImplOpenGL3_CreateFontsTexture(void);
-CIMGUI_API void ImGui_ImplOpenGL3_DestroyFontsTexture(void);
-CIMGUI_API bool ImGui_ImplOpenGL3_CreateDeviceObjects(void);
-CIMGUI_API void ImGui_ImplOpenGL3_DestroyDeviceObjects(void);
-
-#endif
-#ifdef CIMGUI_USE_OPENGL2
-CIMGUI_API bool ImGui_ImplOpenGL2_Init(void);
-CIMGUI_API void ImGui_ImplOpenGL2_Shutdown(void);
-CIMGUI_API void ImGui_ImplOpenGL2_NewFrame(void);
-CIMGUI_API void ImGui_ImplOpenGL2_RenderDrawData(ImDrawData* draw_data);
-CIMGUI_API bool ImGui_ImplOpenGL2_CreateFontsTexture(void);
-CIMGUI_API void ImGui_ImplOpenGL2_DestroyFontsTexture(void);
-CIMGUI_API bool ImGui_ImplOpenGL2_CreateDeviceObjects(void);
-CIMGUI_API void ImGui_ImplOpenGL2_DestroyDeviceObjects(void);
-
-#endif
-#ifdef CIMGUI_USE_SDL2
-#ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-
-typedef struct SDL_Window SDL_Window;
-typedef struct SDL_Renderer SDL_Renderer;
-typedef struct _SDL_GameController _SDL_GameController;
-struct SDL_Window;
-struct SDL_Renderer;
-struct _SDL_GameController;
-typedef union SDL_Event SDL_Event;
-typedef enum { ImGui_ImplSDL2_GamepadMode_AutoFirst, ImGui_ImplSDL2_GamepadMode_AutoAll, ImGui_ImplSDL2_GamepadMode_Manual }ImGui_ImplSDL2_GamepadMode;
-#endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-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 bool ImGui_ImplSDL2_InitForMetal(SDL_Window* window);
-CIMGUI_API bool ImGui_ImplSDL2_InitForSDLRenderer(SDL_Window* window,SDL_Renderer* renderer);
-CIMGUI_API bool ImGui_ImplSDL2_InitForOther(SDL_Window* window);
-CIMGUI_API void ImGui_ImplSDL2_Shutdown(void);
-CIMGUI_API void ImGui_ImplSDL2_NewFrame(void);
-CIMGUI_API bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event);
-CIMGUI_API void ImGui_ImplSDL2_SetGamepadMode(ImGui_ImplSDL2_GamepadMode mode,struct _SDL_GameController** manual_gamepads_array,int manual_gamepads_count);
-
-#endif
-#ifdef CIMGUI_USE_SDL3
-#ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-
-typedef struct SDL_Window SDL_Window;
-typedef struct SDL_Renderer SDL_Renderer;
-typedef struct SDL_Gamepad SDL_Gamepad;
-struct SDL_Window;
-struct SDL_Renderer;
-struct SDL_Gamepad;
-typedef union SDL_Event SDL_Event;
-typedef enum { ImGui_ImplSDL3_GamepadMode_AutoFirst, ImGui_ImplSDL3_GamepadMode_AutoAll, ImGui_ImplSDL3_GamepadMode_Manual }ImGui_ImplSDL3_GamepadMode;
-#endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-CIMGUI_API bool ImGui_ImplSDL3_InitForOpenGL(SDL_Window* window,void* sdl_gl_context);
-CIMGUI_API bool ImGui_ImplSDL3_InitForVulkan(SDL_Window* window);
-CIMGUI_API bool ImGui_ImplSDL3_InitForD3D(SDL_Window* window);
-CIMGUI_API bool ImGui_ImplSDL3_InitForMetal(SDL_Window* window);
-CIMGUI_API bool ImGui_ImplSDL3_InitForSDLRenderer(SDL_Window* window,SDL_Renderer* renderer);
-CIMGUI_API bool ImGui_ImplSDL3_InitForSDLGPU(SDL_Window* window);
-CIMGUI_API bool ImGui_ImplSDL3_InitForOther(SDL_Window* window);
-CIMGUI_API void ImGui_ImplSDL3_Shutdown(void);
-CIMGUI_API void ImGui_ImplSDL3_NewFrame(void);
-CIMGUI_API bool ImGui_ImplSDL3_ProcessEvent(const SDL_Event* event);
-CIMGUI_API void ImGui_ImplSDL3_SetGamepadMode(ImGui_ImplSDL3_GamepadMode mode,SDL_Gamepad** manual_gamepads_array,int manual_gamepads_count);
-
-#endif
-#ifdef CIMGUI_USE_VULKAN
-#ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-
-typedef struct ImGui_ImplVulkanH_Frame ImGui_ImplVulkanH_Frame;
-typedef struct ImGui_ImplVulkanH_Window ImGui_ImplVulkanH_Window;
-typedef struct ImGui_ImplVulkan_InitInfo ImGui_ImplVulkan_InitInfo;
-struct ImGui_ImplVulkan_InitInfo
-{
-    uint32_t ApiVersion;
-    VkInstance Instance;
-    VkPhysicalDevice PhysicalDevice;
-    VkDevice Device;
-    uint32_t QueueFamily;
-    VkQueue Queue;
-    VkDescriptorPool DescriptorPool;
-    VkRenderPass RenderPass;
-    uint32_t MinImageCount;
-    uint32_t ImageCount;
-    VkSampleCountFlagBits MSAASamples;
-    VkPipelineCache PipelineCache;
-    uint32_t Subpass;
-    uint32_t DescriptorPoolSize;
-    bool UseDynamicRendering;
-    VkPipelineRenderingCreateInfoKHR PipelineRenderingCreateInfo;
-    const VkAllocationCallbacks* Allocator;
-    void (*CheckVkResultFn)(VkResult err);
-    VkDeviceSize MinAllocationSize;
-};
-typedef struct ImGui_ImplVulkan_RenderState ImGui_ImplVulkan_RenderState;
-struct ImGui_ImplVulkan_RenderState
-{
-    VkCommandBuffer CommandBuffer;
-    VkPipeline Pipeline;
-    VkPipelineLayout PipelineLayout;
-};
-struct ImGui_ImplVulkanH_Frame;
-struct ImGui_ImplVulkanH_Window;
-struct ImGui_ImplVulkanH_Frame
-{
-    VkCommandPool CommandPool;
-    VkCommandBuffer CommandBuffer;
-    VkFence Fence;
-    VkImage Backbuffer;
-    VkImageView BackbufferView;
-    VkFramebuffer Framebuffer;
-};
-typedef struct ImGui_ImplVulkanH_FrameSemaphores ImGui_ImplVulkanH_FrameSemaphores;
-struct ImGui_ImplVulkanH_FrameSemaphores
-{
-    VkSemaphore ImageAcquiredSemaphore;
-    VkSemaphore RenderCompleteSemaphore;
-};
-typedef struct ImVector_ImGui_ImplVulkanH_Frame {int Size;int Capacity;ImGui_ImplVulkanH_Frame* Data;} ImVector_ImGui_ImplVulkanH_Frame;
-
-typedef struct ImVector_ImGui_ImplVulkanH_FrameSemaphores {int Size;int Capacity;ImGui_ImplVulkanH_FrameSemaphores* Data;} ImVector_ImGui_ImplVulkanH_FrameSemaphores;
-
-struct ImGui_ImplVulkanH_Window
-{
-    int Width;
-    int Height;
-    VkSwapchainKHR Swapchain;
-    VkSurfaceKHR Surface;
-    VkSurfaceFormatKHR SurfaceFormat;
-    VkPresentModeKHR PresentMode;
-    VkRenderPass RenderPass;
-    bool UseDynamicRendering;
-    bool ClearEnable;
-    VkClearValue ClearValue;
-    uint32_t FrameIndex;
-    uint32_t ImageCount;
-    uint32_t SemaphoreCount;
-    uint32_t SemaphoreIndex;
-    ImVector_ImGui_ImplVulkanH_Frame Frames;
-    ImVector_ImGui_ImplVulkanH_FrameSemaphores FrameSemaphores;
-};
-#endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-#ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-typedef ImVector<ImGui_ImplVulkanH_Frame> ImVector_ImGui_ImplVulkanH_Frame;
-typedef ImVector<ImGui_ImplVulkanH_FrameSemaphores> ImVector_ImGui_ImplVulkanH_FrameSemaphores;
-#endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS
-CIMGUI_API bool ImGui_ImplVulkan_Init(ImGui_ImplVulkan_InitInfo* info);
-CIMGUI_API void ImGui_ImplVulkan_Shutdown(void);
-CIMGUI_API void ImGui_ImplVulkan_NewFrame(void);
-CIMGUI_API void ImGui_ImplVulkan_RenderDrawData(ImDrawData* draw_data,VkCommandBuffer command_buffer,VkPipeline pipeline);
-CIMGUI_API bool ImGui_ImplVulkan_CreateFontsTexture(void);
-CIMGUI_API void ImGui_ImplVulkan_DestroyFontsTexture(void);
-CIMGUI_API void ImGui_ImplVulkan_SetMinImageCount(uint32_t min_image_count);
-CIMGUI_API VkDescriptorSet ImGui_ImplVulkan_AddTexture(VkSampler sampler,VkImageView image_view,VkImageLayout image_layout);
-CIMGUI_API void ImGui_ImplVulkan_RemoveTexture(VkDescriptorSet descriptor_set);
-CIMGUI_API bool ImGui_ImplVulkan_LoadFunctions(uint32_t api_version,PFN_vkVoidFunction(*loader_func)(const char* function_name,void* user_data),void* user_data);
-CIMGUI_API void ImGui_ImplVulkanH_CreateOrResizeWindow(VkInstance instance,VkPhysicalDevice physical_device,VkDevice device,ImGui_ImplVulkanH_Window* wd,uint32_t queue_family,const VkAllocationCallbacks* allocator,int w,int h,uint32_t min_image_count);
-CIMGUI_API void ImGui_ImplVulkanH_DestroyWindow(VkInstance instance,VkDevice device,ImGui_ImplVulkanH_Window* wd,const VkAllocationCallbacks* allocator);
-CIMGUI_API VkSurfaceFormatKHR ImGui_ImplVulkanH_SelectSurfaceFormat(VkPhysicalDevice physical_device,VkSurfaceKHR surface,const VkFormat* request_formats,int request_formats_count,VkColorSpaceKHR request_color_space);
-CIMGUI_API VkPresentModeKHR ImGui_ImplVulkanH_SelectPresentMode(VkPhysicalDevice physical_device,VkSurfaceKHR surface,const VkPresentModeKHR* request_modes,int request_modes_count);
-CIMGUI_API VkPhysicalDevice ImGui_ImplVulkanH_SelectPhysicalDevice(VkInstance instance);
-CIMGUI_API uint32_t ImGui_ImplVulkanH_SelectQueueFamilyIndex(VkPhysicalDevice physical_device);
-CIMGUI_API int ImGui_ImplVulkanH_GetMinImageCountFromPresentMode(VkPresentModeKHR present_mode);
-CIMGUI_API ImGui_ImplVulkanH_Window* ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window();
-
-#endif

generator/cimgui_template.cpp

@@ -1,4 +1,12 @@
-
+#ifdef IMGUI_ENABLE_FREETYPE
+#ifndef CIMGUI_FREETYPE
+#error "IMGUI_FREETYPE should be defined for Freetype linking"
+#endif
+#else
+#ifdef CIMGUI_FREETYPE
+#error "IMGUI_FREETYPE should not be defined without freetype generated cimgui"
+#endif
+#endif
 #include "./imgui/imgui.h"
 #ifdef IMGUI_ENABLE_FREETYPE
 #include "./imgui/misc/freetype/imgui_freetype.h"
@@ -12,7 +20,7 @@
 
 
 /////////////////////////////manual written functions
-CIMGUI_API void igLogText(const char *fmt, ...)
+CIMGUI_API void igLogText(CONST char *fmt, ...)
 {
     char buffer[256];
     va_list args;
@@ -22,11 +30,11 @@ CIMGUI_API void igLogText(const char *fmt, ...)
 
     ImGui::LogText("%s", buffer);
 }
-CIMGUI_API void ImGuiTextBuffer_appendf(ImGuiTextBuffer *self, const char *fmt, ...)
+CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const char *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
-    self->appendfv(fmt, args);
+    buffer->appendfv(fmt, args);
     va_end(args);
 }
 
@@ -81,7 +89,7 @@ CimguiStorage& GetCimguiStorage()
     ImGuiIO& io = ImGui::GetIO();
     if (io.BackendLanguageUserData == NULL)
     {
-        io.BackendLanguageUserData = IM_NEW(CimguiStorage)();
+        io.BackendLanguageUserData = new CimguiStorage();
     }
 
     return *(CimguiStorage*)io.BackendLanguageUserData;

generator/cimgui_template.h

@@ -47,9 +47,9 @@ typedef union SDL_Event SDL_Event;
 
 /////////////////////////hand written functions
 //no LogTextV
-CIMGUI_API void igLogText(const char *fmt, ...);
+CIMGUI_API void igLogText(CONST char *fmt, ...);
 //no appendfV
-CIMGUI_API void ImGuiTextBuffer_appendf(ImGuiTextBuffer *self, const char *fmt, ...);
+CIMGUI_API void ImGuiTextBuffer_appendf(struct ImGuiTextBuffer *buffer, const char *fmt, ...);
 //for getting FLT_MAX in bindings
 CIMGUI_API float igGET_FLT_MAX(void);
 //for getting FLT_MIN in bindings

generator/cpp2ffi.lua

@@ -175,7 +175,6 @@ local function check_template(code)
 		te = te:gsub("%-","less")
 		te = te:gsub("%s","_")
 		te = te:gsub("%*","Ptr")
-		te = te:gsub("::","_")
 	
 		code2 = code:gsub("(<[%w_%*%s]+>)([^%s%*])","%1 %2")
 		code2 = code2:gsub("<([^<>]-)>","_"..te)
@@ -203,8 +202,6 @@ local function parse_enum_value(value, allenums,dontpost)
 		if allenums[clean(value)] then return allenums[clean(value)] end
 		--must be several and operators
 		------------precedence order (hope not ())
-		--delete (int)
-		value = value:gsub("%(int%)","")
 		--first drop outer ()
 		value = value:gsub("^(%()",""):gsub("(%))$","")
 		assert(not value:match("[%(%)]"),value)
@@ -320,9 +317,6 @@ local function getRE()
 	function_re = "^([^;{}]+%b()[\n%s]*;)%s*",
 	function_re = "^([^;{}=]+%b()[\n%s%w]*;)", --const at the end
 	function_re = "^([^;{}=]+%b()[\n%s%w%(%)_]*;)", --attribute(deprecated)
-	--we need to skip = as function because of "var = f()" initialization in struct fields
-	-- but we don want operator== to appear as a var and as we should skip this kind of function solution is:
-	operator_re = "^([^;{}]+operator[^;{}]+%b()[\n%s%w%(%)_]*;)",
 	struct_re = "^([^;{}]-struct[^;{}]-%b{}[%s%w_%(%)]*;)",
 	enum_re = "^([^;{}]-enum[^;{}]-%b{}[%s%w_%(%)]*;)",
 	union_re = "^([^;{}]-union[^;{}]-%b{}[%s%w_%(%)]*;)",
@@ -347,7 +341,7 @@ local function getRE()
 	}
 	
 	local resN = {"comment2_re","comment_re","emptyline_re",
-	"functypedef_re","functype_re","function_re","functionD_re","operator_re","typedef_st_re","struct_re","enum_re","union_re","namespace_re","class_re","typedef_re","vardef_re"}
+	"functypedef_re","functype_re","function_re","functionD_re","typedef_st_re","struct_re","enum_re","union_re","namespace_re","class_re","typedef_re","vardef_re"}
 	
 	return res,resN
 end
@@ -435,15 +429,20 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
 							loca = table.remove(loca,1)
 						end
 						if not loca then
+							print("not loca",string.format("%q , %q ",itemold,itemfirstline),#itemfirstline)
+							-- for k,v in pairs(linenumdict) do
+								-- if k:match(itemfirstline) then
+									-- print(string.format("%q",k),#k)
+								-- end
+							-- end
+							--error"no entry in linenumdict"
 							--take locat from parent
 							if itparent and itparent.locat then
 								loca = itparent.locat
-								print("parent loca",string.format("%q , %q ",itemold,itemfirstline),#itemfirstline,loca)
 							else
 								loca = 0
-								print("not loca",string.format("%q , %q ",itemold,itemfirstline),#itemfirstline,loca)
+								--error"no entry in linenumdict"
 							end
-							
 						end
 					else
 						error"no linenumdict"
@@ -479,7 +478,7 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
 	end
 	return itemarr,items
 end
---M.parseItems = parseItems
+M.parseItems = parseItems
 local function name_overloadsAlgo(v)
 
     local aa = {} -- args
@@ -603,7 +602,7 @@ local function clean_names_from_signature(self,signat)
 	return result
 end
 local function clean_functypedef(line)
-	local first, args = line:match("(typedef .-%(%*%s*[_%w]+%))%s*(%b())")
+	local first, args = line:match("(typedef .-%(%*[_%w]+%))%s*(%b())")
 
 	if not args then
 		print"not getting args in"
@@ -671,18 +670,14 @@ local function CleanImU32(def)
 	for i=1,#bb do res = res + bb[i] end 
 	return res
 end
-local function moveptr(line)
-	line = line:gsub("%s*%*","%*")
-	line = line:gsub("%*([%w_])","%* %1")
-	line = line:gsub("(%(%*)%s","%1")
-	return line
-end
 local function parseFunction(self,stname,itt,namespace,locat)
 
 	local lineorig,comment = split_comment(itt.item)
 	line = clean_spaces(lineorig)
 	--move *
-	line = moveptr(line)
+	line = line:gsub("%s*%*","%*")
+	line = line:gsub("%*([%w_])","%* %1")
+	line = line:gsub("(%(%*)%s","%1")
 
 	--print(line)
     --clean implemetation
@@ -721,21 +716,6 @@ local function parseFunction(self,stname,itt,namespace,locat)
 		error"parseFunction not getting args"
     end
 	
-	--get manuals args and ret
-	local cname = self.getCname(stname,funcname, namespace) --cimguiname
-	local manpars = self.manuals[cname]
-	local ismanual
-    if manpars then
-		if type(manpars) == "boolean" then
-			print("warning: unable to get args and ret from "..cname)
-			print("did you forgot to use set_manuals? ")
-		else
-			ismanual = true
-			args, ret = manpars.args, manpars.ret
-			args = moveptr(args)
-			ret = moveptr(ret)
-		end
-	end
 	
 	local argsp = args:sub(2,-2)..","
 	local argsTa = {}
@@ -751,8 +731,6 @@ local function parseFunction(self,stname,itt,namespace,locat)
 			argsTa[#argsTa+1] = tynam
 		end
 	end
-	
-	
 	--- templates in args
 	for i,ar in ipairs(argsTa) do
 		--TODO several diferent templates
@@ -766,7 +744,7 @@ local function parseFunction(self,stname,itt,namespace,locat)
 		end
 	    argsTa[i] = te and code2 or ar --ar:gsub("<([%w_%*%s]+)>",te) --ImVector
 	end
-
+	
 	--get typ, name and defaults
 	local functype_re =        "^%s*[%w%s%*]+%(%*%s*[%w_]+%)%([^%(%)]*%)"
     local functype_reex =     "^(%s*[%w%s%*]+)%(%*%s*([%w_]+)%)(%([^%(%)]*%))"
@@ -826,7 +804,6 @@ local function parseFunction(self,stname,itt,namespace,locat)
         end
 	end
 	
-
 	local argsArr = argsTa2
 
 	--recreate argscsinpars, call_args and signature from argsArr
@@ -858,7 +835,7 @@ local function parseFunction(self,stname,itt,namespace,locat)
 		caar = "()"
 		signat = "()" .. (extraconst or "")
 	end
-	--if ismanual then print("manual",asp, caar, signat) end
+
     ------------------------------
     
     if not ret and stname then --must be constructors
@@ -891,9 +868,6 @@ local function parseFunction(self,stname,itt,namespace,locat)
 			ar.default = nil
 		end
 	end
-	
-	--if ismanual then M.prtable(argsArr) end
-	
 	defT.templated = self.typenames[stname] and true
 	defT.namespace = namespace
     defT.cimguiname = cimguiname
@@ -924,7 +898,6 @@ local function parseFunction(self,stname,itt,namespace,locat)
         -- end
     end
 	defsT[cimguiname][signat] = defT
-	
 end
 local function itemsCount(items)
 	print"------------items"
@@ -937,8 +910,8 @@ end
 
 local function AdjustArguments(FP)
     for fun,defs in pairs(FP.defsT) do
-        --struct function but no constructors or static functions or manuals
+        --struct function but no constructors or static functions
-        if defs[1].stname~="" and defs[1].ret and not defs[1].is_static_function and not defs[1].manual then
+        if defs[1].stname~="" and defs[1].ret and not defs[1].is_static_function then
             --print("adjusting",fun)
             for i,def in ipairs(defs) do
                 local empty = def.args:match("^%(%)") --no args
@@ -949,31 +922,6 @@ local function AdjustArguments(FP)
         end
     end
 end
-local function REPLACE_TEXTUREID(FP)
-	local defsT = FP.defsT
-	for numcdef,t in ipairs(FP.funcdefs) do
-		assert(t.cimguiname)
-		local cimf = defsT[t.cimguiname]
-		local defT = cimf[t.signature]
-		local hasTextureID = false
-		for i,arg in ipairs(defT.argsT) do
-			if arg.type == "ImTextureID" then print(t.cimguiname,t.signature);hasTextureID = true; break end
-		end
-		if hasTextureID then
-			for i,v in ipairs(defT.argsT) do
-				v.type = (v.type == "ImTextureID") and "ImTextureUserID" or v.type
-            end
-			--defaults table
-			for k,v in pairs(defT.defaults) do
-				if v:match"ImTextureID" then
-					error"default ImTextureID not implemented"
-				end
-            end
-			defT.args = defT.args:gsub("ImTextureID","ImTextureUserID")
-			defT.signature = defT.signature:gsub("ImTextureID","ImTextureUserID")
-		end
-	end
-end
 local function ADDIMSTR_S(FP)
     local defsT = FP.defsT
     local newcdefs = {}
@@ -1070,39 +1018,7 @@ local function ADDIMSTR_S(FP)
     end
 	FP.funcdefs = newcdefs
 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
-    return structs
-end  
-local function get_nonPOD(FP)
-	local defbystruct = DefsByStruct(FP)
-	--M.prtable(defbystruct)
-	local nonPOD = {}
-	for k,defs in pairs(defbystruct) do 
-		if k~="" then
-		for i, ww in ipairs(defs) do
-			-- print(k,i,ww)
-			-- M.prtable(ww)
-			if not ww[1].ret then --constructor
-				nonPOD[k] = true
-				break;
-			end
-		end
-		end
-	end
-	FP.structs_and_enums_table.nonPOD = nonPOD
-	return nonPOD
-end
 local function ADDnonUDT(FP)
-	local nonPOD = get_nonPOD(FP)
-	--print"nonPOD"
-	--M.prtable(nonPOD)
     local defsT = FP.defsT
     --local newcdefs = {}
     for numcdef,t in ipairs(FP.funcdefs) do
@@ -1116,17 +1032,10 @@ local function ADDnonUDT(FP)
 		end
         --if UDT return generate nonUDT version
 		local isUDT = false
-		--isUDT = FP.structs_and_enums_table.structs[defT.ret] and true or false
-		isUDT = nonPOD[defT.ret] and true or false
-		--inherited
-		if (not isUDT) and FP.cimgui_inherited and FP.cimgui_inherited.nonPOD[defT.ret] then
-			isUDT = true
-		end
 		for _,udt_ret in ipairs(FP.UDTs) do
-			if udt_ret == defT.ret then isUDT=true; break end
+			if udt_ret == defT.ret then isUDT=true;break end
 		end
-
+        --if defT.ret=="ImVec2" or defT.ret=="ImVec4" or defT.ret=="ImColor" then
-
 		if isUDT then
             --passing as a pointer arg
             local defT2 = {}
@@ -1199,15 +1108,14 @@ local function ADDdestructors(FP)
 					error"names should be equal"
 				end
 				local def = {}
-				local isrealdestructor = keep_dest_locat[defT[1].stname] and true
 				def.stname = defT[1].stname
 				def.templated = defT[1].templated
-				def.location = keep_dest_locat[defT[1].stname] or defT[1].location
+				def.location = keep_dest_locat[defT[1].stname]
 				def.ret = "void"
 				def.ov_cimguiname = def.stname.."_destroy"
 				def.cimguiname = def.ov_cimguiname
 				def.destructor = true
-				def.realdestructor = isrealdestructor
+				def.realdestructor = def.location and true
 				def.args = "("..def.stname.."* self)"
 				def.call_args = "(self)"
 				def.signature = "("..def.stname.."*)"
@@ -1359,7 +1267,7 @@ function M.Parser()
 							self.typedefs_dict[key] = linet
 						elseif not line:match"typedef%s*struct" then --discard typedef struct
 							print("typedef not found")
-							print(key,value,line,cdef[1],cdef[2])
+							print(key,value,line)
 						end
 					end
 				end
@@ -1379,15 +1287,6 @@ function M.Parser()
 	function par:parseItemsR2(txt, itparent)
 		local itsarr,its = parseItems(txt,self.linenumdict,itparent)
 		for i,it in ipairs(itsarr) do
-			--clean class
-			if it.re_name == "class_re" then
-				it.name = it.item:match("class%s+(%S+)")
-				print("cleaning class",it.name)
-				it.item = it.item:gsub("private:.+};$","};")
-				--it.item = it.item:gsub("private:","")
-				it.item = it.item:gsub("public:","")
-				it.item = it.item:gsub("enum%s*class","enum")
-			end
 			if not isLeaf(it.re_name) then
 				local inner = strip_end(it.item:match("%b{}"):sub(2,-2))
 				it.childs = par:parseItemsR2(inner, it)
@@ -1410,8 +1309,6 @@ function M.Parser()
 					end
 				elseif it.re_name == "namespace_re" then
 					it.name = it.item:match("namespace%s+(%S+)")
-				elseif it.re_name == "class_re" then
-					--it.name = it.item:match("class%s+(%S+)")
 				end
 			end
 		end
@@ -1433,12 +1330,11 @@ function M.Parser()
 		return table.concat(txtclean)
 	end
 	function par:parseItems()
-		--self:initTypedefsDict()
+		self:initTypedefsDict()
 		
 		self.linenumdict = {}
 		local cdefs2 = {}
 		for i,cdef in ipairs(cdefs) do
-			cdef[1] = cdef[1]:gsub("enum%s*class","enum") --clean class
 			local cdef1 = clean_comments(cdef[1])
 			if self.linenumdict[cdef1] then
 				--print("linenumdict already defined for", cdef[1],type(self.linenumdict[cdef[1]]))
@@ -1448,6 +1344,7 @@ function M.Parser()
 					table.insert(self.linenumdict[cdef1],cdef[2])
 				end
 			else
+				--print("nuevo linenumdict es",cdef[1],cdef[2])
 				self.linenumdict[cdef1]=cdef[2]
 			end
 			table.insert(cdefs2,cdef[1])
@@ -1492,27 +1389,12 @@ function M.Parser()
 		--save_data("./preparse"..tostring(self):gsub("table: ","")..".c",txt)
 		--]]
 		self.itemsarr = par:parseItemsR2(txt)
-		--save_data("./itemsarr.lua",ToStr(self.itemsarr))
 		itemsarr = self.itemsarr
 	end
 	
 	function par:printItems()
 		printItems(items)
 	end
-	function par:set_manuals(manuals, modulen, erase)
-		erase = erase or {"CIMGUI_API"}
-		local moddata = read_data("./"..modulen.."_template.h")
-		for k,v in pairs(manuals) do
-			local ret = moddata:match("([^%(%):,\n;]+[%*%s])%s?~?"..k.."%b()")
-			for i,ww in ipairs(erase) do
-				ret = ret:gsub(ww,"")
-			end
-			local args = moddata:match(k.."%s*(%b())")
-			manuals[k] = {args = args, ret = ret}
-			--print(k,args,ret)
-		end
-		self.manuals = manuals
-	end
 	par.parseFunction = parseFunction
 	local uniques = {}
 	local function check_unique_typedefs(l,uniques)
@@ -1539,20 +1421,13 @@ function M.Parser()
 		local predeclare = ""
 		--local iner = strip_end(stru:match("%b{}"):sub(2,-2))
 		local inistruct = clean_spaces(stru:match("(.-)%b{}"))
-		--clean final:
-		inistruct = inistruct:gsub("%s*final%s*:",":")
 		--local stname = stru:match("struct%s*(%S+)%s*%b{}")
 		local stname, derived
 		if inistruct:match":" then
 			stname,derived = inistruct:match"struct%s*([^%s:]+):(.+)"
-			--print(inistruct,stname,derived)
 			derived = derived:match"(%S+)$"
 		else
-			if itst.re_name == "struct_re" then
+			stname = inistruct:match"struct%s(%S+)"
-				stname = inistruct:match"struct%s(%S+)"
-			elseif itst.re_name == "class_re" then
-				stname = inistruct:match"class%s(%S+)"
-			end
 		end
 
 		if derived then print(stname,"derived from",derived) end
@@ -1562,7 +1437,6 @@ function M.Parser()
 			stname = stru:match("%b{}%s*(%S+)%s*;")
 		end
 		
-		
 		local is_nested
 		if not stname then
 			is_nested = itst.parent and (itst.parent.re_name == "struct_re")
@@ -1600,14 +1474,12 @@ function M.Parser()
 					--local ttype,template = it.item:match("([^%s,%(%)]+)%s*<(.+)>")
 					local ttype,template,te,code2 =  check_template(it2)  --it.item:match"([^%s,%(%)]+)%s*<(.+)>"
 					if template then
-						--print("not doheader",ttype,template,te, self.typenames[ttype])
+						if self.typenames[ttype] ~= template then --rule out T (template typename)
-						if self.typenames[ttype] ~= template and self.typenames[ttype].."*" ~= template then --rule out T (template typename)
 							self.templates[ttype] = self.templates[ttype] or {}
 							self.templates[ttype][template] = te
 							it2=code2
 						end
 						if doheader then
-							
 							local templatetypedef = self:gentemplatetypedef(ttype, template,self.templates[ttype][template])
 							predeclare = predeclare .. templatetypedef
 						end
@@ -1663,7 +1535,7 @@ function M.Parser()
 				end
 			elseif it.re_name == "enum_re" then
 				--nop
-			elseif it.re_name ~= "functionD_re" and it.re_name ~= "function_re" and it.re_name ~= "operator_re" then
+			elseif it.re_name ~= "functionD_re" and it.re_name ~= "function_re" then
 				print(it.re_name,"not processed clean_struct in",stname,it.item:sub(1,24))
 				--M.prtable(it)
 			end
@@ -1692,9 +1564,8 @@ function M.Parser()
 		if parnam~="" then parnam = parnam:sub(1,-3) end
 		return parnam
 	end
-	function par:header_text_insert(tab,txt,it)
+	
-		table.insert(tab, txt)
+
-	end
 	function par:gen_structs_and_enums()
 		print"--------------gen_structs_and_enums"
 		--M.prtable(self.typenames)
@@ -1722,31 +1593,25 @@ function M.Parser()
 
 							local tdt = self:gentemplatetypedef(ttype,template,te)
 							it2 = tdt..code2
-						elseif it2:match"%w+::" then
-							print("clean namespace typedef",it2)
-							it2 = it2:gsub("%w+::","")
 						end
 					elseif it.re_name == "functypedef_re" then
 						it2 = clean_functypedef(it2)
 					else
 						assert(it.re_name == "vardef_re")
-						it2 = it2:gsub("constexpr","static const")
 						if it2:match"enum" then
 							print("--skip enum forward declaration:",it2)
 							it2 = ""
 						end
 					end
 					--table.insert(outtabpre,it2)
-					--table.insert(outtab,it2)
+					table.insert(outtab,it2)
-					self:header_text_insert(outtab, it2, it)
 					-- add typedef after struct name
 					if it.re_name == "vardef_re" and it.item:match"^%s*struct" then
 						local stname = it.item:match("struct%s*(%S+)%s*;")
 						--table.insert(typedefs_table,"typedef struct "..stname.." "..stname..";\n")
 						local tst = "\ntypedef struct "..stname.." "..stname..";"
 						if check_unique_typedefs(tst,uniques) then
-							--table.insert(outtabpre,tst)
+							table.insert(outtabpre,tst)
-							self:header_text_insert(outtabpre ,tst, it)
 						end
 						self.typedefs_dict[stname]="struct "..stname
 						if it.parent then --must be struct name; inside namespace
@@ -1772,31 +1637,24 @@ function M.Parser()
 							end
 						end
 						enumbody = "{"..enumbody.."\n}"
-						--table.insert(outtab,"\ntypedef enum ".. enumbody..enumname..";"..extraenums)
+						table.insert(outtab,"\ntypedef enum ".. enumbody..enumname..";"..extraenums)
-						local it2 = "\ntypedef enum ".. enumbody..enumname..";"..extraenums
-						self:header_text_insert(outtab, it2, it)
 					else
 						local enumbody = it.item:match"(%b{})"
 						enumbody = clean_comments(enumbody)
-						--table.insert(outtab,"\ntypedef enum ".. enumbody..enumname..";")
+						table.insert(outtab,"\ntypedef enum ".. enumbody..enumname..";")
-						local it2 = "\ntypedef enum ".. enumbody..enumname..";"
-						self:header_text_insert(outtab, it2, it)
 					end
 					if it.parent then
 						if it.parent.re_name == "namespace_re" then
 							local namespace = it.parent.item:match("namespace%s+(%S+)")
 							self.embeded_enums[enumname] = namespace.."::"..enumname
-						else
-							self.embeded_enums[enumname] = it.parent.name.."::"..enumname
 						end
 					end
 				else --unamed enum just repeat declaration
 					local cl_item = clean_comments(it.item)
-					--table.insert(outtab,cl_item)
+					table.insert(outtab,cl_item)
-					self:header_text_insert(outtab, cl_item, it)
 					print("unnamed enum",cl_item)
 				end
-			elseif it.re_name == "struct_re" or it.re_name == "typedef_st_re" or it.re_name == "class_re" then
+			elseif it.re_name == "struct_re" or it.re_name == "typedef_st_re" then
 				local cleanst,structname,strtab,comstab,predec = self:clean_structR1(it,true)
 				if not structname then print("NO NAME",cleanst,it.item) end
 				--if not void stname or templated
@@ -1805,14 +1663,12 @@ function M.Parser()
 					--table.insert(typedefs_table,"typedef struct "..structname.." "..structname..";\n")
 					local tst = "\ntypedef struct "..structname.." "..structname..";"
 						if check_unique_typedefs(tst,uniques) then
-							--table.insert(outtab,tst)
+							table.insert(outtab,tst)
-							self:header_text_insert(outtab, tst, it)
 						end
 					self.typedefs_dict[structname]="struct "..structname
 					--dont insert child structs as they are inserted before parent struct
 					if not (it.parent and it.parent.re_name == "struct_re") then
-						--table.insert(outtab,predec .. cleanst)
+						table.insert(outtab,predec .. cleanst)
-						self:header_text_insert(outtab, predec .. cleanst, it)
 					end
 				end
 				if it.parent  then --and (it.parent.re_name == "struct_re" or it.parent.re_name == "typedef_st_re" then
@@ -1835,7 +1691,7 @@ function M.Parser()
 				local stname = ""
 				local namespace
 				if it.parent then
-					if it.parent.re_name == "struct_re" or it.parent.re_name == "typedef_st_re" or it.parent.re_name == "class_re" then
+					if it.parent.re_name == "struct_re" or it.parent.re_name == "typedef_st_re" then
 						stname = it.parent.name
 					elseif it.parent.re_name == "namespace_re" then
 						namespace = get_parents_nameC(it) --it.parent.name
@@ -1845,9 +1701,7 @@ function M.Parser()
 					local ttype,fun = it.item:match"^%s*template%s+<%s*typename%s+([^>]+)%s*>%s*(.+)$"
 					if self.ftemplate_list and self.ftemplate_list[ttype] then
 						for iT,vT in ipairs(self.ftemplate_list[ttype]) do
-							local funT = fun:gsub("([< %(])"..ttype,"%1"..vT)
+							local funT = fun:gsub(ttype,vT)
-							--funT = funT:gsub("sizeof%("..ttype.."%)","sizeof("..vT..")")
-							--local funT = fun:gsub(ttype,vT)
 							self:parseFunction(stname,{item=funT},namespace,it.locat)
 						end
 					end
@@ -1855,9 +1709,7 @@ function M.Parser()
 					self:parseFunction(stname,it,namespace,it.locat)
 				end
 			else
-				if it.re_name~="operator_re" then
 				print("not processed gen",it.re_name,it.item:sub(1,20))
-				end
 			end
 		end
 		
@@ -1925,8 +1777,7 @@ function M.Parser()
 	end
 	local unnamed_enum_counter = 0
 	local function enums_for_table(it, outtab, enumsordered)
-		--local enumname = it.item:match"^%s*enum%s+([^%s;{}]+)"
+		local enumname = it.item:match"^%s*enum%s+([^%s;{}]+)"
-		local enumname = it.item:match"^[^;{}]-enum%s+([^%s;{}]+)"
 		if not enumname then
 			unnamed_enum_counter = unnamed_enum_counter + 1
 			enumname = "unnamed"..unnamed_enum_counter
@@ -1989,7 +1840,7 @@ function M.Parser()
 	function par:gen_structs_and_enums_table()
 		print"--------------gen_structs_and_enums_table"
 		local outtab = {enums={},structs={},locations={},enumtypes={},struct_comments={},enum_comments={}}
-		--self.typedefs_table = {}
+		self.typedefs_table = {}
 		local enumsordered = {}
 		unnamed_enum_counter = 0
 		self.templated_structs = {}
@@ -2012,35 +1863,11 @@ function M.Parser()
 				if it.re_name == "typedef_re" and not it.parent then
 					local typedefdef,typedefname = it.item:match"typedef(.+)%s([^%s;]+);$"
 					typedefname = strip(typedefname)
-					--self.typedefs_table[typedefname] = strip(typedefdef)
+					self.typedefs_table[typedefname] = strip(typedefdef)
-					self.typedefs_dict[typedefname] = strip(typedefdef)
-				elseif it.re_name == "functypedef_re" then
-					-- "^\n*%s*(typedef[%w%s%*_]+%([^*]*%*?%s*[%w_]+%s*%)%s*%b()%s*;)"
-					local key = it.item:match("%(%*%s*([%w_]+)%)%s*%([^%(%)]*%)")
-					if key then
-						local linet = it.item
-						linet = linet:gsub("[\n%s]+typedef ","")
-						linet = linet:gsub("%(%*("..key..")%)","(*)")
-						self.typedefs_dict[key] = linet
-						--print("functypedef_re",1,linet)--,clean_functypedef(line))
-					else
-						--try function typedef
-						key = it.item:match("%(([%w_]+)%)%([^%(%)]*%)")
-						if key then
-							local linet = it.item
-							linet = linet:gsub("typedef ","")
-							linet = linet:gsub("%(("..key..")%)","()")
-							self.typedefs_dict[key] = linet
-							print("functypedef_re",2, it.item)
-						else
-							print("func typedef not found")
-							print(it.item)
-						end
-					end
 				end
 			elseif it.re_name == "enum_re" then
 				enums_for_table(it, outtab, enumsordered)
-			elseif it.re_name == "struct_re" or it.re_name == "typedef_st_re" or it.re_name == "class_re" then
+			elseif it.re_name == "struct_re" or it.re_name == "typedef_st_re" then
 				local cleanst,structname,strtab,comstab = self:clean_structR1(it)
 				--if not void stname or templated
 				if not structname then print("NO NAME",cleanst,it.item) end
@@ -2067,7 +1894,7 @@ function M.Parser()
 				end
 			elseif it.re_name == "namespace_re" or it.re_name == "union_re" or it.re_name == "functype_re" then
 				--nop
-			elseif it.re_name ~= "functionD_re" and it.re_name ~= "function_re" and it.re_name ~= "operator_re" then
+			elseif it.re_name ~= "functionD_re" and it.re_name ~= "function_re" then
 				print("not processed gen table",it.re_name)
 			end
 		end
@@ -2140,11 +1967,6 @@ function M.Parser()
         for k,v in pairs(self.alltypes) do print(k, typetoStr(k) ) end
     end
     function par:compute_overloads()
-		if self.IMGUI_HAS_TEXTURES then
-			print"----------replacing ImTextureID with ImTextureUserID"
-			REPLACE_TEXTUREID(self)
-			print"----------end replacing ImTextureID with ImTextureUserID"
-		end
 		ADDIMSTR_S(self)
         local strt = {}
         local numoverloaded = 0
@@ -2317,7 +2139,6 @@ function M.Parser()
 		return self:gen_template_typedef_auto(ttype,te,newte)
 	end
 	function par:gen_template_typedef_auto(ttype,te,newte)
-		--M.prtable(self.templated_structs)
 		assert(self.templated_structs[ttype],ttype)
 		local defi = self.templated_structs[ttype]
 		local Targ = strsplit(self.typenames[ttype],",")
@@ -2361,111 +2182,7 @@ function M.Parser()
 	end
 	return par
 end
--- more compact serialization
-local function basicSerialize (o)
-    if type(o) == "number" then
-		return string.format("%.17g", o)
-	elseif type(o)=="boolean" then
-        return tostring(o)
-    elseif type(o) == "string" then
-        return string.format("%q", o)
-	elseif pcall(function() return o.__serialize end) then
-		return o.__serialize(o)
-	elseif type(o)=="cdata" then
-		return cdataSerialize(o)
-	else
-		return tostring(o) --"nil"
-    end
-end
--- very readable and now suited for cyclic tables
-local kw = {['and'] = true, ['break'] = true, ['do'] = true, ['else'] = true,
-	['elseif'] = true, ['end'] = true, ['false'] = true, ['for'] = true,
-	['function'] = true, ['goto'] = true, ['if'] = true, ['in'] = true,
-	['local'] = true, ['nil'] = true, ['not'] = true, ['or'] = true,
-	['repeat'] = true, ['return'] = true, ['then'] = true, ['true'] = true,
-	['until'] = true, ['while'] = true}
-function tb2st_serialize(t,options)
-	options = options or {}
-	local function sorter(a,b)
-        if type(a)==type(b) then 
-            return a<b 
-        elseif type(a)=="number" then
-            return true
-        else
-            assert(type(b)=="number")
-            return false
-        end
-    end
-	local function serialize_key(val, dodot, pretty)
-		local dot = dodot and "." or ""
-		if type(val)=="string" then
-			if  val:match '^[_%a][_%w]*$' and not kw[val] then
-				return dot..tostring(val)
-			else
-				return "[\""..tostring(val).."\"]"
-			end
-		elseif (not pretty) and (not dodot) and (type(val) == "number") and (math.floor(val)==val) then
-			return  --array index
-		else
-			return "["..tostring(val).."]"
-		end
-	end
-	local function serialize_key_name(val)
-		return serialize_key(val, true)
-	end
-	local insert = table.insert
-	local function _tb2st(t,saved,sref,level,name)
-		saved = saved or {}		-- initial value
-		level = level or 0
-		sref = sref or {}
-		name = name or "t"
-		if type(t)=="table" then
-			if saved[t] then
-				sref[#sref+1] = {saved[t],name}
-				return"nil"
-			else
-				saved[t] = name
 
-				local ordered_keys = {}
-				for k,v in pairs(t) do
-					insert(ordered_keys,k)
-				end
-				table.sort(ordered_keys,sorter)
-				
-				local str2 = {}
-				insert(str2,"{")
-				if options.pretty then insert(str2,"\n") end
-				for _,k in ipairs(ordered_keys) do
-					if options.pretty then insert(str2,("  "):rep(level+1)) end
-					local v = t[k]
-					local kser = serialize_key(k, nil, options.pretty)
-					insert(str2, (kser and (kser .."=") or ""))
-					if type(v)~="table" then
-						insert(str2, basicSerialize(v))
-					else
-						local name2 = name .. serialize_key_name(k)
-						insert(str2,_tb2st(v,saved,sref,level+1,name2))
-					end
-					if options.pretty then insert(str2,",\n") else insert(str2, ",") end
-				end
-				str2[#str2] = "}"
-				if level == 0 then
-					--insert(str2, 1,"local ffi = require'ffi'\nlocal t=")
-					insert(str2, 1,"local t=")
-					for i,v in ipairs(sref) do 
-						insert(str2, "\n"..v[2].."="..v[1])
-					end
-					insert(str2,"\n return t")
-				end
-				return table.concat(str2)
-			end
-		else
-			return basicSerialize(t)
-		end
-	end
-	return(_tb2st(t))
-end
-M.tb2st_serialize = tb2st_serialize
 ------serializeTable("anyname",table) gives a string that recreates the table with dofile(generated_string)
 local function serializeTable(name, value, saved)
     
@@ -2527,11 +2244,10 @@ local function serializeTable(name, value, saved)
     
     return table.concat(string_table)
 end
--- M.serializeTable = serializeTable
+M.serializeTable = serializeTable
--- M.serializeTableF = function(t)
+M.serializeTableF = function(t)
-	-- return M.serializeTable("defs",t).."\nreturn defs"
+	return M.serializeTable("defs",t).."\nreturn defs"
--- end
+end
-M.serializeTableF = function(t) return tb2st_serialize(t,{pretty=true}) end --new serialization more compact
 --iterates lines from a gcc/clang -E in a specific location
 local function location(file,locpathT,defines,COMPILER,keepemptylines)
 	local define_re = "^#define%s+([^%s]+)%s+(.+)$"
@@ -2618,8 +2334,7 @@ local function location(file,locpathT,defines,COMPILER,keepemptylines)
 end
 M.location = location
 ---------------------- C writing functions
-local function ImGui_f_implementation(def)
+local function ImGui_f_implementation(outtab,def)
-	local outtab = {}
     local ptret = def.retref and "&" or ""
     table.insert(outtab,"CIMGUI_API".." "..def.ret.." "..def.ov_cimguiname..def.args.."\n")
     table.insert(outtab,"{\n")
@@ -2646,10 +2361,8 @@ local function ImGui_f_implementation(def)
         table.insert(outtab,"    return "..ptret..namespace..def.funcname..def.call_args..";\n")
     end
     table.insert(outtab,"}\n")
-	return table.concat(outtab, "")
 end
-local function struct_f_implementation(def)
+local function struct_f_implementation(outtab,def)
-	local outtab = {}
     local empty = def.args:match("^%(%)") --no args
     local ptret = def.retref and "&" or ""
 
@@ -2678,7 +2391,6 @@ local function struct_f_implementation(def)
         table.insert(outtab,"    return "..ptret.."self->"..def.funcname..def.call_args..";\n")
     end
     table.insert(outtab,"}\n")
-	return table.concat(outtab, "")
 end
 local function func_implementation(FP)
 
@@ -2696,38 +2408,25 @@ local function func_implementation(FP)
         local manual = FP.get_manuals(def)
         if not custom and not manual and not def.templated and not FP.get_skipped(def) then 
             if def.constructor then
-				local tab = {}
                 assert(def.stname ~= "","constructor without struct")
                 local empty = def.args:match("^%(%)") --no args
-                table.insert(tab,"CIMGUI_API "..def.stname.."* "..def.ov_cimguiname..(empty and "(void)" or def.args).."\n")
+                table.insert(outtab,"CIMGUI_API "..def.stname.."* "..def.ov_cimguiname..(empty and "(void)" or def.args).."\n")
-                table.insert(tab,"{\n")
+                table.insert(outtab,"{\n")
-                table.insert(tab,"    return IM_NEW("..def.stname..")"..def.call_args..";\n")
+                table.insert(outtab,"    return IM_NEW("..def.stname..")"..def.call_args..";\n")
-                table.insert(tab,"}\n")
+                table.insert(outtab,"}\n")
-				if FP.CONSTRUCTORS_GENERATION then
-					table.insert(tab,"CIMGUI_API void "..def.ov_cimguiname.."_Construct("..def.stname.."* self"..(empty and "" or ","..def.args:sub(2,-2))..")\n")
-					table.insert(tab,"{\n")
-					table.insert(tab,"    IM_PLACEMENT_NEW(self)"..def.stname..def.call_args..";\n")
-					table.insert(tab,"}\n")
-				end
-				table.insert(outtab, table.concat(tab, ""))
             elseif def.destructor then
-				local tab = {}
                 local args = "("..def.stname.."* self)"
                 local fname = def.stname.."_destroy" 
-                table.insert(tab,"CIMGUI_API void "..fname..args.."\n")
+                table.insert(outtab,"CIMGUI_API void "..fname..args.."\n")
-                table.insert(tab,"{\n")
+                table.insert(outtab,"{\n")
-                table.insert(tab,"    IM_DELETE(self);\n")
+                table.insert(outtab,"    IM_DELETE(self);\n")
-                table.insert(tab,"}\n")
+                table.insert(outtab,"}\n")
-				table.insert(outtab, table.concat(tab, ""))
             elseif def.stname == "" or def.is_static_function then
-                table.insert(outtab, ImGui_f_implementation(def))
+                ImGui_f_implementation(outtab,def)
             else -- stname
-                table.insert(outtab, struct_f_implementation(def))
+                struct_f_implementation(outtab,def)
             end
         end
-		if FP.custom_function_post then
-			FP:custom_function_post(outtab, def)
-		end
         until true
     end
     return table.concat(outtab)
@@ -2750,16 +2449,13 @@ local function func_header_generate_structs(FP)
 
     local outtab = {}
 
-	table_do_sorted(FP.embeded_structs,function(k,v) 
+	table_do_sorted(FP.embeded_structs,function(k,v) table.insert(outtab,"typedef "..v.." "..k..";\n") end)
-		table.insert(outtab,"typedef "..v.." "..k..";\n") 
-	end)
 	
 	table_do_sorted(FP.embeded_enums,function(k,v) table.insert(outtab,"typedef "..v.." "..k..";\n") end)
 	
 	table_do_sorted(FP.templates,function(ttype,v)
 		table_do_sorted(v,function(ttypein,te)
-			local ttype2 = ttype:gsub("::","_") --std::string
+			table.insert(outtab,"typedef "..ttype.."<"..ttypein.."> "..ttype.."_"..te..";\n")
-			table.insert(outtab,"typedef "..ttype.."<"..ttypein.."> "..ttype2.."_"..te..";\n")
 		end)
 	end)
 	return outtab
@@ -2788,9 +2484,6 @@ local function func_header_generate_funcs(FP)
             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")
-				if FP.CONSTRUCTORS_GENERATION then
-					outtab[#outtab] = outtab[#outtab].."\nCIMGUI_API void "..def.ov_cimguiname.."_Construct("..def.stname.."* self"..(empty and "" or ","..def.args:sub(2,-2))..");\n"
-				end
             elseif def.destructor then
                 table.insert(outtab,"CIMGUI_API void "..def.ov_cimguiname..def.args..";"..addcoment.."\n")
             else --not constructor
@@ -2802,13 +2495,9 @@ local function func_header_generate_funcs(FP)
                 end
             end 
         end
-		if FP.custom_function_post then
-			FP:custom_function_post(outtab, def)
-		end
         else --not cimguiname
             table.insert(outtab,t.comment:gsub("%%","%%%%").."\n")-- %% substitution for gsub
         end
-		
     end
 
     return outtab

generator/generator.bat

@@ -15,12 +15,10 @@ set PATH=%PATH%;C:\anima;C:\mingws\i686-7.2.0-release-posix-dwarf-rt_v5-rev1\min
 :: set PATH=%PATH%;C:\luaGL\sources\luajit-master\luajit-master\bin\mingw32;C:\mingw32\bin;
 ::process  files
 :: arg[1] compiler name gcc, clang or cl
-:: arg[2] options as words in one string: internal for imgui_internal generation, comments for comments generation, nochar to skip char* function version, noimstrv to skip imstrv
+:: arg[2] options as words in one string: internal for imgui_internal generation, freetype for freetype generation, comments for comments generation, nochar to skip char* function version, noimstrv to skip imstrv
-:: "constructors" adds the _Construct version of constructors
+:: examples: "" "internal" "internal freetype comments"
-:: examples: "" "internal" "internal comments"
+:: arg[3..n] name of implementations to generate and/or CFLAGS (e.g. -DIMGUI_USER_CONFIG or -DIMGUI_USE_WCHAR32)
-:: arg[3..n] name of implementations to generate and/or CFLAGS (e.g. -DIMGUI_USER_CONFIG) 
+luajit ./generator.lua gcc "internal noimstrv" glfw opengl3 opengl2 sdl2 %*
-::-DIMGUI_USE_WCHAR32 should not be used (is discarded)
-luajit ./generator.lua gcc "internal noimstrv" glfw opengl3 opengl2 sdl2 sdl3 vulkan -DIMGUI_USE_WCHAR32 %*
 
 ::leave console open
 cmd /k

generator/generator.lua

@@ -7,9 +7,8 @@ assert(bit,"Must use LuaJIT")
 local script_args = {...}
 local COMPILER = script_args[1]
 local INTERNAL_GENERATION = script_args[2]:match("internal") and true or false
-local FREETYPE_GENERATION = true --script_args[2]:match("freetype") and true or false
+local FREETYPE_GENERATION = script_args[2]:match("freetype") and true or false
 local COMMENTS_GENERATION = script_args[2]:match("comments") and true or false
-local CONSTRUCTORS_GENERATION = script_args[2]:match("constructors") and true or false
 local NOCHAR = script_args[2]:match("nochar") and true or false
 local NOIMSTRV = script_args[2]:match("noimstrv") and true or false
 local IMGUI_PATH = os.getenv"IMGUI_PATH" or "../imgui"
@@ -19,9 +18,6 @@ local CPRE,CTEST
 local implementations = {}
 for i=3,#script_args do
     if script_args[i]:match(COMPILER == "cl" and "^/" or "^%-") then
-		if script_args[i]:match("IMGUI_USE_WCHAR32") then
-			script_args[i] = "" --dont use this define
-		end
         local key, value = script_args[i]:match("^(.+)=(.+)$")
         if key and value then
             CFLAGS = CFLAGS .. " " .. key .. "=\"" .. value:gsub("\"", "\\\"") .. "\"";
@@ -34,11 +30,11 @@ for i=3,#script_args do
 end
 
 if FREETYPE_GENERATION then
-	CFLAGS = CFLAGS .. " -DIMGUI_ENABLE_FREETYPE -DIMGUI_ENABLE_STB_TRUETYPE" --both builders
+	CFLAGS = CFLAGS .. " -DIMGUI_ENABLE_FREETYPE "
 end
 
 if COMPILER == "gcc" or COMPILER == "clang" or COMPILER == "zig cc" then
-    CPRE = COMPILER..[[ -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API=""  ]] .. CFLAGS
+    CPRE = COMPILER..[[ -E -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS -DIMGUI_API="" -DIMGUI_IMPL_API="" ]] .. CFLAGS
     CTEST = COMPILER.." --version"
 elseif COMPILER == "cl" then
     CPRE = COMPILER..[[ /E /DIMGUI_DISABLE_OBSOLETE_FUNCTIONS /DIMGUI_DEBUG_PARANOID /DIMGUI_API="" /DIMGUI_IMPL_API="" ]] .. CFLAGS
@@ -71,7 +67,6 @@ print("HAVE_COMPILER",HAVE_COMPILER)
 print("INTERNAL_GENERATION",INTERNAL_GENERATION)
 print("FREETYPE_GENERATION",FREETYPE_GENERATION)
 print("COMMENTS_GENERATION",COMMENTS_GENERATION)
-print("CONSTRUCTORS_GENERATION",CONSTRUCTORS_GENERATION)
 print("CPRE",CPRE)
 --------------------------------------------------------------------------
 --this table has the functions to be skipped in generation
@@ -91,10 +86,6 @@ local cimgui_skipped = {
 --desired name
 ---------------------------------------------------------------------------
 local cimgui_overloads = {
-	igGetIO = {
-		["()"] = "igGetIO",
-		["(ImGuiContext*)"] = "igGetIOEx",
-	},
     --igPushID = {
         --["(const char*)"] =           "igPushIDStr",
         --["(const char*,const char*)"] = "igPushIDRange",
@@ -129,11 +120,9 @@ local function func_header_impl_generate(FP)
             local def = cimf[t.signature]
 			local addcoment = def.comment or ""
 			if def.constructor then
-				-- only vulkan is manually created
+				-- it happens with vulkan impl but constructor ImGui_ImplVulkanH_Window is not needed
-				assert(def.ov_cimguiname=="ImGui_ImplVulkanH_Window_ImGui_ImplVulkanH_Window" or
+			    --assert(def.stname ~= "","constructor without struct")
-				def.ov_cimguiname=="ImGui_ImplVulkanH_Window_Construct", "not cpp for "..def.ov_cimguiname)
+                --table.insert(outtab,"CIMGUI_API "..def.stname.."* "..def.ov_cimguiname ..(empty and "(void)" or --def.args)..";"..addcoment.."\n")
-			    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
@@ -223,27 +212,6 @@ local function DefsByStruct(FP)
     FP.defsBystruct = structs
 end  
 
-local function colapse_defines(str, define)
-	local num = 1
-	while num > 0 do
-		str,num = str:gsub("(#ifdef "..define..".+)".."(#endif\n+#ifdef "..define.."\n)", "%1")
-	end
-	return str
-end
-local wchardefine =
-[[
-
-#ifdef IMGUI_USE_WCHAR32            
-typedef ImWchar32 ImWchar;
-#else
-typedef ImWchar16 ImWchar;
-#endif
-#ifdef IMGUI_USE_WCHAR32
-#define IM_UNICODE_CODEPOINT_MAX     0x10FFFF   
-#else
-#define IM_UNICODE_CODEPOINT_MAX     0xFFFF  
-#endif
-	]]
 
 --generate cimgui.cpp cimgui.h 
 local function cimgui_generation(parser)
@@ -291,27 +259,18 @@ local function cimgui_generation(parser)
 		end
 	end
 	
-	cstructsstr = colapse_defines(cstructsstr, "IMGUI_ENABLE_FREETYPE")
-	
     hstrfile = hstrfile:gsub([[#include "imgui_structs%.h"]],cstructsstr)
     local cfuncsstr = func_header_generate(parser)
-	cfuncsstr = colapse_defines(cfuncsstr, "IMGUI_ENABLE_FREETYPE")
     hstrfile = hstrfile:gsub([[#include "auto_funcs%.h"]],cfuncsstr)
-	--patch hstrfile for ImWchar
-	local num
-	hstrfile, num = hstrfile:gsub("typedef ImWchar16 ImWchar;", wchardefine)
-	assert(num == 1)
-	hstrfile, num = hstrfile:gsub("kPagesMap%[%(0xFFFF", "kPagesMap[(IM_UNICODE_CODEPOINT_MAX")
-	assert(num == 1, "kPagesMap[(IM_UNICODE_CODEPOINT_MAX not found or found more than once")
     save_data("./output/cimgui.h",cimgui_header,hstrfile)
     
     --merge it in cimgui_template.cpp to cimgui.cpp
     local cimplem = func_implementation(parser)
-	cimplem = colapse_defines(cimplem, "IMGUI_ENABLE_FREETYPE")
+
     local hstrfile = read_data"./cimgui_template.cpp"
 
     hstrfile = hstrfile:gsub([[#include "auto_funcs%.cpp"]],cimplem)
-	local ftdef = "" --FREETYPE_GENERATION and "#define IMGUI_ENABLE_FREETYPE\n" or ""
+	local ftdef = FREETYPE_GENERATION and "#define IMGUI_ENABLE_FREETYPE\n" or ""
     save_data("./output/cimgui.cpp",cimgui_header, ftdef, hstrfile)
 
 end
@@ -320,8 +279,8 @@ end
 --------------------------------------------------------
 --get imgui.h version and IMGUI_HAS_DOCK--------------------------
 --defines for the cl compiler must be present in the print_defines.cpp file
-gdefines = get_defines{"IMGUI_VERSION","IMGUI_VERSION_NUM","FLT_MAX","FLT_MIN","IMGUI_HAS_DOCK","IMGUI_HAS_IMSTR","ImDrawCallback_ResetRenderState","IMGUI_HAS_TEXTURES"}
+gdefines = get_defines{"IMGUI_VERSION","IMGUI_VERSION_NUM","FLT_MAX","FLT_MIN","IMGUI_HAS_DOCK","IMGUI_HAS_IMSTR","ImDrawCallback_ResetRenderState"}
-cpp2ffi.prtable(gdefines)
+--cpp2ffi.prtable(gdefines)
 if gdefines.IMGUI_HAS_DOCK then gdefines.IMGUI_HAS_DOCK = true end
 if gdefines.IMGUI_HAS_IMSTR then gdefines.IMGUI_HAS_IMSTR = true end
 
@@ -341,26 +300,11 @@ if gdefines.IMGUI_HAS_DOCK then
 end
 assert(not NOCHAR or not NOIMSTRV,"nochar and noimstrv cant be set at the same time")
 print("IMGUI_HAS_IMSTR",gdefines.IMGUI_HAS_IMSTR)
-print("IMGUI_HAS_TEXTURES",gdefines.IMGUI_HAS_TEXTURES and true)
 print("NOCHAR",NOCHAR)
 print("NOIMSTRV",NOIMSTRV)
 print("IMGUI_HAS_DOCK",gdefines.IMGUI_HAS_DOCK)
 print("IMGUI_VERSION",gdefines.IMGUI_VERSION)
 
-local function custom_function_post(self, outtab, def)
-	assert(def.location)
-	if def.location:match("imgui_freetype") then 
-		outtab[#outtab] = "#ifdef IMGUI_ENABLE_FREETYPE\n"..outtab[#outtab].."\n#endif\n"
-	end
-end
-local function header_text_insert(self, outtab, txt, it)
-	assert(it.locat)
-	if it.locat:match("imgui_freetype") then 
-		table.insert(outtab, "\n#ifdef IMGUI_ENABLE_FREETYPE"..txt.."\n#endif")
-	else
-		table.insert(outtab, txt)
-	end
-end
 
 --funtion for parsing imgui headers
 local function parseImGuiHeader(header,names)
@@ -372,18 +316,13 @@ local function parseImGuiHeader(header,names)
 		return pre..funcname
 	end
 	parser.cname_overloads = cimgui_overloads
-	--parser.manuals = cimgui_manuals
+	parser.manuals = cimgui_manuals
-	parser:set_manuals(cimgui_manuals, "cimgui")
 	parser.skipped = cimgui_skipped
 	parser.UDTs = {"ImVec2","ImVec4","ImColor","ImRect"}
 	--parser.gen_template_typedef = gen_template_typedef --use auto
 	parser.COMMENTS_GENERATION = COMMENTS_GENERATION
-	parser.CONSTRUCTORS_GENERATION = CONSTRUCTORS_GENERATION
 	parser.NOCHAR = NOCHAR
 	parser.NOIMSTRV = NOIMSTRV
-	parser.IMGUI_HAS_TEXTURES = gdefines.IMGUI_HAS_TEXTURES
-	parser.custom_function_post = custom_function_post
-	parser.header_text_insert = header_text_insert
 	local defines = parser:take_lines(CPRE..header,names,COMPILER)
 	
 	return parser
@@ -472,26 +411,15 @@ if #implementations > 0 then
 				extra_includes = extra_includes .. include_cmd .. inc .. " "
 			end
 		end
-		parser2.cimgui_inherited =  dofile([[../../cimgui/generator/output/structs_and_enums.lua]])
+		
 		local defines = parser2:take_lines(CPRE..extra_defines..extra_includes..source, {locati}, COMPILER)
 		
 		local parser3 = cpp2ffi.Parser()
-		parser3.cimgui_inherited =  dofile([[../../cimgui/generator/output/structs_and_enums.lua]])
 		parser3:take_lines(CPRE..extra_defines..extra_includes..source, {locati}, COMPILER)
 		parser3:do_parse()
 		local cfuncsstr = func_header_impl_generate(parser3) 
 		local cstructstr1,cstructstr2 = parser3.structs_and_enums[1], parser3.structs_and_enums[2]
-		local cstru = cstructstr1 .. cstructstr2
+		impl_str = impl_str .. "#ifdef CIMGUI_USE_".. string.upper(impl).."\n" .. cstructstr1 .. cstructstr2 .. cfuncsstr .. "\n#endif\n"
-		if cstru ~="" then
-			cstru = "#ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS\n"..cstru .."\n#endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS\n"
-		end
-		impl_str = impl_str .. "#ifdef CIMGUI_USE_".. string.upper(impl).."\n".. cstru
-		local outtab = cpp2ffi.func_header_generate_structs(parser3)
-		if #outtab > 0 then
-			table.insert(outtab, 1, "#ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS\n")
-			table.insert(outtab,"#endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS\n")
-		end
-		impl_str = impl_str.. table.concat(outtab)..cfuncsstr .. "\n#endif\n"
     end
 	
     parser2:do_parse()
@@ -535,9 +463,7 @@ end
 --]]
 -------------------copy C files to repo root
 copyfile("./output/cimgui.h", "../cimgui.h")
-copyfile("./output/cimgui_impl.h", "../cimgui_impl.h")
 copyfile("./output/cimgui.cpp", "../cimgui.cpp")
 os.remove("./output/cimgui.h")
-os.remove("./output/cimgui_impl.h")
 os.remove("./output/cimgui.cpp")
 print"all done!!"

generator/generator.sh

@@ -13,11 +13,9 @@
 
 #process  files
 # arg[1] compiler name gcc, clang, or cl
-# arg[2] options as words in one string: internal for imgui_internal generation, comments for comments generation, nochar to skip char* function version, noimstrv to skip imstrv
+# arg[2] options as words in one string: internal for imgui_internal generation, freetype for freetype generation, comments for comments generation, nochar to skip char* function version, noimstrv to skip imstrv
-# "constructors" adds the _Construct version of constructors
+# examples: "" "internal" "internal freetype" "comments internal"
-# examples: "" "internal" "comments internal"
+# arg[3..n] name of implementations to generate and/or CLFLAGS (e.g. -DIMGUI_USER_CONFIG or -DIMGUI_USE_WCHAR32)
-# arg[3..n] name of implementations to generate and/or CLFLAGS (e.g. -DIMGUI_USER_CONFIG)
-# -DIMGUI_USE_WCHAR32 should not be used as it is generated for both ImWchar
 #
 
 # parse command line arguments
@@ -25,7 +23,7 @@
 POSITIONAL_ARGS=()
 
 TARGETS="internal noimstrv"
-CFLAGS="glfw opengl3 opengl2 sdl2 sdl3"
+CFLAGS="glfw opengl3 opengl2 sdl2"
 
 help() {
         cat <<EOF

generator/output/cimgui_impl.h

@@ -0,0 +1,66 @@
+#ifdef CIMGUI_USE_GLFW
+
+typedef struct GLFWwindow GLFWwindow;
+typedef struct GLFWmonitor GLFWmonitor;
+struct GLFWwindow;
+struct GLFWmonitor;CIMGUI_API bool ImGui_ImplGlfw_InitForOpenGL(GLFWwindow* window,bool install_callbacks);
+CIMGUI_API bool ImGui_ImplGlfw_InitForVulkan(GLFWwindow* window,bool install_callbacks);
+CIMGUI_API bool ImGui_ImplGlfw_InitForOther(GLFWwindow* window,bool install_callbacks);
+CIMGUI_API void ImGui_ImplGlfw_Shutdown(void);
+CIMGUI_API void ImGui_ImplGlfw_NewFrame(void);
+CIMGUI_API void ImGui_ImplGlfw_InstallCallbacks(GLFWwindow* window);
+CIMGUI_API void ImGui_ImplGlfw_RestoreCallbacks(GLFWwindow* window);
+CIMGUI_API void ImGui_ImplGlfw_SetCallbacksChainForAllWindows(bool chain_for_all_windows);
+CIMGUI_API void ImGui_ImplGlfw_WindowFocusCallback(GLFWwindow* window,int focused);
+CIMGUI_API void ImGui_ImplGlfw_CursorEnterCallback(GLFWwindow* window,int entered);
+CIMGUI_API void ImGui_ImplGlfw_CursorPosCallback(GLFWwindow* window,double x,double y);
+CIMGUI_API void ImGui_ImplGlfw_MouseButtonCallback(GLFWwindow* window,int button,int action,int mods);
+CIMGUI_API void ImGui_ImplGlfw_ScrollCallback(GLFWwindow* window,double xoffset,double yoffset);
+CIMGUI_API void ImGui_ImplGlfw_KeyCallback(GLFWwindow* window,int key,int scancode,int action,int mods);
+CIMGUI_API void ImGui_ImplGlfw_CharCallback(GLFWwindow* window,unsigned int c);
+CIMGUI_API void ImGui_ImplGlfw_MonitorCallback(GLFWmonitor* monitor,int event);
+
+#endif
+#ifdef CIMGUI_USE_OPENGL3
+CIMGUI_API bool ImGui_ImplOpenGL3_Init(const char* glsl_version);
+CIMGUI_API void ImGui_ImplOpenGL3_Shutdown(void);
+CIMGUI_API void ImGui_ImplOpenGL3_NewFrame(void);
+CIMGUI_API void ImGui_ImplOpenGL3_RenderDrawData(ImDrawData* draw_data);
+CIMGUI_API bool ImGui_ImplOpenGL3_CreateFontsTexture(void);
+CIMGUI_API void ImGui_ImplOpenGL3_DestroyFontsTexture(void);
+CIMGUI_API bool ImGui_ImplOpenGL3_CreateDeviceObjects(void);
+CIMGUI_API void ImGui_ImplOpenGL3_DestroyDeviceObjects(void);
+
+#endif
+#ifdef CIMGUI_USE_OPENGL2
+CIMGUI_API bool ImGui_ImplOpenGL2_Init(void);
+CIMGUI_API void ImGui_ImplOpenGL2_Shutdown(void);
+CIMGUI_API void ImGui_ImplOpenGL2_NewFrame(void);
+CIMGUI_API void ImGui_ImplOpenGL2_RenderDrawData(ImDrawData* draw_data);
+CIMGUI_API bool ImGui_ImplOpenGL2_CreateFontsTexture(void);
+CIMGUI_API void ImGui_ImplOpenGL2_DestroyFontsTexture(void);
+CIMGUI_API bool ImGui_ImplOpenGL2_CreateDeviceObjects(void);
+CIMGUI_API void ImGui_ImplOpenGL2_DestroyDeviceObjects(void);
+
+#endif
+#ifdef CIMGUI_USE_SDL2
+
+typedef struct SDL_Window SDL_Window;
+typedef struct SDL_Renderer SDL_Renderer;
+typedef struct _SDL_GameController _SDL_GameController;
+struct SDL_Window;
+struct SDL_Renderer;
+struct _SDL_GameController;
+typedef union SDL_Event SDL_Event;
+typedef enum { ImGui_ImplSDL2_GamepadMode_AutoFirst, ImGui_ImplSDL2_GamepadMode_AutoAll, ImGui_ImplSDL2_GamepadMode_Manual }ImGui_ImplSDL2_GamepadMode;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 bool ImGui_ImplSDL2_InitForMetal(SDL_Window* window);
+CIMGUI_API bool ImGui_ImplSDL2_InitForSDLRenderer(SDL_Window* window,SDL_Renderer* renderer);
+CIMGUI_API bool ImGui_ImplSDL2_InitForOther(SDL_Window* window);
+CIMGUI_API void ImGui_ImplSDL2_Shutdown(void);
+CIMGUI_API void ImGui_ImplSDL2_NewFrame(void);
+CIMGUI_API bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event);
+CIMGUI_API void ImGui_ImplSDL2_SetGamepadMode(ImGui_ImplSDL2_GamepadMode mode,struct _SDL_GameController** manual_gamepads_array,int manual_gamepads_count);
+
+#endif

generator/output/overloads.txt

@@ -7,7 +7,7 @@ ImColor_ImColor	5
 5	nil	ImColor_ImColor_U32 (ImU32)
 ImDrawList_AddText	2
 1	void	ImDrawList_AddText_Vec2 (const ImVec2,ImU32,const char*,const char*)
-2	void	ImDrawList_AddText_FontPtr (ImFont*,float,const ImVec2,ImU32,const char*,const char*,float,const ImVec4*)
+2	void	ImDrawList_AddText_FontPtr (const ImFont*,float,const ImVec2,ImU32,const char*,const char*,float,const ImVec4*)
 ImGuiPtrOrIndex_ImGuiPtrOrIndex	2
 1	nil	ImGuiPtrOrIndex_ImGuiPtrOrIndex_Ptr (void*)
 2	nil	ImGuiPtrOrIndex_ImGuiPtrOrIndex_Int (int)
@@ -112,26 +112,26 @@ igGetColorU32	3
 1	ImU32	igGetColorU32_Col (ImGuiCol,float)
 2	ImU32	igGetColorU32_Vec4 (const ImVec4)
 3	ImU32	igGetColorU32_U32 (ImU32,float)
+<<<<<<< HEAD
+igGetForegroundDrawList	3
+1	ImDrawList*	igGetForegroundDrawList_Nil ()
+2	ImDrawList*	igGetForegroundDrawList_WindowPtr (ImGuiWindow*)
+3	ImDrawList*	igGetForegroundDrawList_ViewportPtr (ImGuiViewport*)
+=======
 igGetForegroundDrawList	2
 1	ImDrawList*	igGetForegroundDrawList_ViewportPtr (ImGuiViewport*)
 2	ImDrawList*	igGetForegroundDrawList_WindowPtr (ImGuiWindow*)
-igGetID	4
+>>>>>>> docking_inter
+igGetID	3
 1	ImGuiID	igGetID_Str (const char*)
 2	ImGuiID	igGetID_StrStr (const char*,const char*)
 3	ImGuiID	igGetID_Ptr (const void*)
-4	ImGuiID	igGetID_Int (int)
 igGetIDWithSeed	2
 1	ImGuiID	igGetIDWithSeed_Str (const char*,const char*,ImGuiID)
 2	ImGuiID	igGetIDWithSeed_Int (int,ImGuiID)
-igGetIO	2
-1	ImGuiIO*	igGetIO ()
-2	ImGuiIO*	igGetIOEx (ImGuiContext*)
 igGetKeyData	2
 1	ImGuiKeyData*	igGetKeyData_ContextPtr (ImGuiContext*,ImGuiKey)
 2	ImGuiKeyData*	igGetKeyData_Key (ImGuiKey)
-igGetPlatformIO	2
-1	ImGuiPlatformIO*	igGetPlatformIO_Nil ()
-2	ImGuiPlatformIO*	igGetPlatformIO_ContextPtr (ImGuiContext*)
 igImAbs	3
 1	int	igImAbs_Int (int)
 2	float	igImAbs_Float (float)
@@ -232,9 +232,6 @@ igRadioButton	2
 igSelectable	2
 1	bool	igSelectable_Bool (const char*,bool,ImGuiSelectableFlags,const ImVec2)
 2	bool	igSelectable_BoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2)
-igSetItemKeyOwner	2
-1	void	igSetItemKeyOwner_Nil (ImGuiKey)
-2	void	igSetItemKeyOwner_InputFlags (ImGuiKey,ImGuiInputFlags)
 igSetScrollFromPosX	2
 1	void	igSetScrollFromPosX_Float (float,float)
 2	void	igSetScrollFromPosX_WindowPtr (ImGuiWindow*,float,float)
@@ -265,9 +262,6 @@ igSetWindowSize	3
 igShortcut	2
 1	bool	igShortcut_Nil (ImGuiKeyChord,ImGuiInputFlags)
 2	bool	igShortcut_ID (ImGuiKeyChord,ImGuiInputFlags,ImGuiID)
-igTabBarQueueFocus	2
-1	void	igTabBarQueueFocus_TabItemPtr (ImGuiTabBar*,ImGuiTabItem*)
-2	void	igTabBarQueueFocus_Str (ImGuiTabBar*,const char*)
 igTabItemCalcSize	2
 1	ImVec2	igTabItemCalcSize_Str (const char*,bool)
 2	ImVec2	igTabItemCalcSize_WindowPtr (ImGuiWindow*)
@@ -299,4 +293,4 @@ igValue	4
 2	void	igValue_Int (const char*,int)
 3	void	igValue_Uint (const char*,unsigned int)
 4	void	igValue_Float (const char*,float,const char*)
-209 overloaded
+200 overloaded

generator/output/typedefs_dict.json

@@ -1,9 +1,9 @@
 {
-  "ImBitArrayForNamedKeys": "ImBitArray<ImGuiKey_NamedKey_COUNT, -ImGuiKey_NamedKey_BEGIN>",
+  "ImBitArrayForNamedKeys": "ImBitArray<ImGuiKey_NamedKey_COUNT,-ImGuiKey_NamedKey_BEGIN>",
   "ImBitArrayPtr": "ImU32*",
   "ImBitVector": "struct ImBitVector",
   "ImColor": "struct ImColor",
-  "ImDrawCallback": "void (*)(const ImDrawList* parent_list, const ImDrawCmd* cmd);",
+  "ImDrawCallback": "void(*)(const ImDrawList* parent_list,const ImDrawCmd* cmd);",
   "ImDrawChannel": "struct ImDrawChannel",
   "ImDrawCmd": "struct ImDrawCmd",
   "ImDrawCmdHeader": "struct ImDrawCmdHeader",
@@ -27,7 +27,6 @@
   "ImFontGlyphRangesBuilder": "struct ImFontGlyphRangesBuilder",
   "ImGuiActivateFlags": "int",
   "ImGuiBackendFlags": "int",
-  "ImGuiBoxSelectState": "struct ImGuiBoxSelectState",
   "ImGuiButtonFlags": "int",
   "ImGuiChildFlags": "int",
   "ImGuiCol": "int",
@@ -39,23 +38,16 @@
   "ImGuiConfigFlags": "int",
   "ImGuiContext": "struct ImGuiContext",
   "ImGuiContextHook": "struct ImGuiContextHook",
-  "ImGuiContextHookCallback": "void (*)(ImGuiContext* ctx, ImGuiContextHook* hook);",
+  "ImGuiContextHookCallback": "void(*)(ImGuiContext* ctx,ImGuiContextHook* hook);",
-  "ImGuiDataAuthority": "int",
   "ImGuiDataType": "int",
   "ImGuiDataTypeInfo": "struct ImGuiDataTypeInfo",
   "ImGuiDataTypeStorage": "struct ImGuiDataTypeStorage",
-  "ImGuiDeactivatedItemData": "struct ImGuiDeactivatedItemData",
+  "ImGuiDataVarInfo": "struct ImGuiDataVarInfo",
   "ImGuiDebugAllocEntry": "struct ImGuiDebugAllocEntry",
   "ImGuiDebugAllocInfo": "struct ImGuiDebugAllocInfo",
   "ImGuiDebugLogFlags": "int",
-  "ImGuiDockContext": "struct ImGuiDockContext",
-  "ImGuiDockNode": "struct ImGuiDockNode",
-  "ImGuiDockNodeFlags": "int",
-  "ImGuiDockNodeSettings": "struct ImGuiDockNodeSettings",
-  "ImGuiDockRequest": "struct ImGuiDockRequest",
   "ImGuiDragDropFlags": "int",
-  "ImGuiErrorCallback": "void (*)(ImGuiContext* ctx, void* user_data, const char* msg);",
+  "ImGuiErrorLogCallback": "void(*)(void* user_data,const char* fmt,...);",
-  "ImGuiErrorRecoveryState": "struct ImGuiErrorRecoveryState",
   "ImGuiFocusRequestFlags": "int",
   "ImGuiFocusScopeData": "struct ImGuiFocusScopeData",
   "ImGuiFocusedFlags": "int",
@@ -69,11 +61,10 @@
   "ImGuiInputEventKey": "struct ImGuiInputEventKey",
   "ImGuiInputEventMouseButton": "struct ImGuiInputEventMouseButton",
   "ImGuiInputEventMousePos": "struct ImGuiInputEventMousePos",
-  "ImGuiInputEventMouseViewport": "struct ImGuiInputEventMouseViewport",
   "ImGuiInputEventMouseWheel": "struct ImGuiInputEventMouseWheel",
   "ImGuiInputEventText": "struct ImGuiInputEventText",
   "ImGuiInputFlags": "int",
-  "ImGuiInputTextCallback": "int (*)(ImGuiInputTextCallbackData* data);",
+  "ImGuiInputTextCallback": "int(*)(ImGuiInputTextCallbackData* data);",
   "ImGuiInputTextCallbackData": "struct ImGuiInputTextCallbackData",
   "ImGuiInputTextDeactivateData": "struct ImGuiInputTextDeactivateData",
   "ImGuiInputTextDeactivatedState": "struct ImGuiInputTextDeactivatedState",
@@ -93,20 +84,16 @@
   "ImGuiListClipperData": "struct ImGuiListClipperData",
   "ImGuiListClipperRange": "struct ImGuiListClipperRange",
   "ImGuiLocEntry": "struct ImGuiLocEntry",
-  "ImGuiLogFlags": "int",
+  "ImGuiMemAllocFunc": "void*(*)(size_t sz,void* user_data);",
-  "ImGuiMemAllocFunc": "void* (*)(size_t sz, void* user_data);",
+  "ImGuiMemFreeFunc": "void(*)(void* ptr,void* user_data);",
-  "ImGuiMemFreeFunc": "void (*)(void* ptr, void* user_data);",
   "ImGuiMenuColumns": "struct ImGuiMenuColumns",
   "ImGuiMetricsConfig": "struct ImGuiMetricsConfig",
   "ImGuiMouseButton": "int",
   "ImGuiMouseCursor": "int",
-  "ImGuiMultiSelectFlags": "int",
+  "ImGuiNavHighlightFlags": "int",
-  "ImGuiMultiSelectIO": "struct ImGuiMultiSelectIO",
-  "ImGuiMultiSelectState": "struct ImGuiMultiSelectState",
-  "ImGuiMultiSelectTempData": "struct ImGuiMultiSelectTempData",
   "ImGuiNavItemData": "struct ImGuiNavItemData",
   "ImGuiNavMoveFlags": "int",
-  "ImGuiNavRenderCursorFlags": "int",
+  "ImGuiNavTreeNodeData": "struct ImGuiNavTreeNodeData",
   "ImGuiNextItemData": "struct ImGuiNextItemData",
   "ImGuiNextItemDataFlags": "int",
   "ImGuiNextWindowData": "struct ImGuiNextWindowData",
@@ -116,31 +103,26 @@
   "ImGuiOldColumns": "struct ImGuiOldColumns",
   "ImGuiOnceUponAFrame": "struct ImGuiOnceUponAFrame",
   "ImGuiPayload": "struct ImGuiPayload",
-  "ImGuiPlatformIO": "struct ImGuiPlatformIO",
   "ImGuiPlatformImeData": "struct ImGuiPlatformImeData",
-  "ImGuiPlatformMonitor": "struct ImGuiPlatformMonitor",
   "ImGuiPopupData": "struct ImGuiPopupData",
   "ImGuiPopupFlags": "int",
   "ImGuiPtrOrIndex": "struct ImGuiPtrOrIndex",
   "ImGuiScrollFlags": "int",
   "ImGuiSelectableFlags": "int",
-  "ImGuiSelectionBasicStorage": "struct ImGuiSelectionBasicStorage",
-  "ImGuiSelectionExternalStorage": "struct ImGuiSelectionExternalStorage",
-  "ImGuiSelectionRequest": "struct ImGuiSelectionRequest",
   "ImGuiSelectionUserData": "ImS64",
   "ImGuiSeparatorFlags": "int",
   "ImGuiSettingsHandler": "struct ImGuiSettingsHandler",
   "ImGuiShrinkWidthItem": "struct ImGuiShrinkWidthItem",
-  "ImGuiSizeCallback": "void (*)(ImGuiSizeCallbackData* data);",
+  "ImGuiSizeCallback": "void(*)(ImGuiSizeCallbackData* data);",
   "ImGuiSizeCallbackData": "struct ImGuiSizeCallbackData",
   "ImGuiSliderFlags": "int",
   "ImGuiStackLevelInfo": "struct ImGuiStackLevelInfo",
+  "ImGuiStackSizes": "struct ImGuiStackSizes",
   "ImGuiStorage": "struct ImGuiStorage",
   "ImGuiStoragePair": "struct ImGuiStoragePair",
   "ImGuiStyle": "struct ImGuiStyle",
   "ImGuiStyleMod": "struct ImGuiStyleMod",
   "ImGuiStyleVar": "int",
-  "ImGuiStyleVarInfo": "struct ImGuiStyleVarInfo",
   "ImGuiTabBar": "struct ImGuiTabBar",
   "ImGuiTabBarFlags": "int",
   "ImGuiTabItem": "struct ImGuiTabItem",
@@ -169,7 +151,6 @@
   "ImGuiTextRange": "struct ImGuiTextRange",
   "ImGuiTooltipFlags": "int",
   "ImGuiTreeNodeFlags": "int",
-  "ImGuiTreeNodeStackData": "struct ImGuiTreeNodeStackData",
   "ImGuiTypingSelectFlags": "int",
   "ImGuiTypingSelectRequest": "struct ImGuiTypingSelectRequest",
   "ImGuiTypingSelectState": "struct ImGuiTypingSelectState",
@@ -177,8 +158,6 @@
   "ImGuiViewportFlags": "int",
   "ImGuiViewportP": "struct ImGuiViewportP",
   "ImGuiWindow": "struct ImGuiWindow",
-  "ImGuiWindowClass": "struct ImGuiWindowClass",
-  "ImGuiWindowDockStyle": "struct ImGuiWindowDockStyle",
   "ImGuiWindowFlags": "int",
   "ImGuiWindowRefreshFlags": "int",
   "ImGuiWindowSettings": "struct ImGuiWindowSettings",
@@ -190,8 +169,7 @@
   "ImS32": "signed int",
   "ImS64": "signed long long",
   "ImS8": "signed char",
-  "ImStbTexteditState": "ImStb::STB_TexteditState",
+  "ImTextureID": "void*",
-  "ImTextureID": "ImU64",
   "ImU16": "unsigned short",
   "ImU32": "unsigned int",
   "ImU64": "unsigned long long",
@@ -203,5 +181,11 @@
   "ImWchar": "ImWchar16",
   "ImWchar16": "unsigned short",
   "ImWchar32": "unsigned int",
-  "STB_TexteditState": "struct STB_TexteditState"
+  "STB_TexteditState": "struct STB_TexteditState",
+  "StbTexteditRow": "struct StbTexteditRow",
+  "StbUndoRecord": "struct StbUndoRecord",
+  "StbUndoState": "struct StbUndoState",
+  "const_iterator": "const value_type*",
+  "iterator": "value_type*",
+  "value_type": "T"
 }

generator/output/typedefs_dict.lua

@@ -1,207 +1,192 @@
-local t={
+local defs = {}
-  ImBitArrayForNamedKeys="ImBitArray<ImGuiKey_NamedKey_COUNT, -ImGuiKey_NamedKey_BEGIN>",
+defs["ImBitArrayForNamedKeys"] = "ImBitArray<ImGuiKey_NamedKey_COUNT,-ImGuiKey_NamedKey_BEGIN>"
-  ImBitArrayPtr="ImU32*",
+defs["ImBitArrayPtr"] = "ImU32*"
-  ImBitVector="struct ImBitVector",
+defs["ImBitVector"] = "struct ImBitVector"
-  ImColor="struct ImColor",
+defs["ImColor"] = "struct ImColor"
-  ImDrawCallback="void (*)(const ImDrawList* parent_list, const ImDrawCmd* cmd);",
+defs["ImDrawCallback"] = "void(*)(const ImDrawList* parent_list,const ImDrawCmd* cmd);"
-  ImDrawChannel="struct ImDrawChannel",
+defs["ImDrawChannel"] = "struct ImDrawChannel"
-  ImDrawCmd="struct ImDrawCmd",
+defs["ImDrawCmd"] = "struct ImDrawCmd"
-  ImDrawCmdHeader="struct ImDrawCmdHeader",
+defs["ImDrawCmdHeader"] = "struct ImDrawCmdHeader"
-  ImDrawData="struct ImDrawData",
+defs["ImDrawData"] = "struct ImDrawData"
-  ImDrawDataBuilder="struct ImDrawDataBuilder",
+defs["ImDrawDataBuilder"] = "struct ImDrawDataBuilder"
-  ImDrawFlags="int",
+defs["ImDrawFlags"] = "int"
-  ImDrawIdx="unsigned short",
+defs["ImDrawIdx"] = "unsigned short"
-  ImDrawList="struct ImDrawList",
+defs["ImDrawList"] = "struct ImDrawList"
-  ImDrawListFlags="int",
+defs["ImDrawListFlags"] = "int"
-  ImDrawListSharedData="struct ImDrawListSharedData",
+defs["ImDrawListSharedData"] = "struct ImDrawListSharedData"
-  ImDrawListSplitter="struct ImDrawListSplitter",
+defs["ImDrawListSplitter"] = "struct ImDrawListSplitter"
-  ImDrawVert="struct ImDrawVert",
+defs["ImDrawVert"] = "struct ImDrawVert"
-  ImFileHandle="FILE*",
+defs["ImFileHandle"] = "FILE*"
-  ImFont="struct ImFont",
+defs["ImFont"] = "struct ImFont"
-  ImFontAtlas="struct ImFontAtlas",
+defs["ImFontAtlas"] = "struct ImFontAtlas"
-  ImFontAtlasCustomRect="struct ImFontAtlasCustomRect",
+defs["ImFontAtlasCustomRect"] = "struct ImFontAtlasCustomRect"
-  ImFontAtlasFlags="int",
+defs["ImFontAtlasFlags"] = "int"
-  ImFontBuilderIO="struct ImFontBuilderIO",
+defs["ImFontBuilderIO"] = "struct ImFontBuilderIO"
-  ImFontConfig="struct ImFontConfig",
+defs["ImFontConfig"] = "struct ImFontConfig"
-  ImFontGlyph="struct ImFontGlyph",
+defs["ImFontGlyph"] = "struct ImFontGlyph"
-  ImFontGlyphRangesBuilder="struct ImFontGlyphRangesBuilder",
+defs["ImFontGlyphRangesBuilder"] = "struct ImFontGlyphRangesBuilder"
-  ImGuiActivateFlags="int",
+defs["ImGuiActivateFlags"] = "int"
-  ImGuiBackendFlags="int",
+defs["ImGuiBackendFlags"] = "int"
-  ImGuiBoxSelectState="struct ImGuiBoxSelectState",
+defs["ImGuiButtonFlags"] = "int"
-  ImGuiButtonFlags="int",
+defs["ImGuiChildFlags"] = "int"
-  ImGuiChildFlags="int",
+defs["ImGuiCol"] = "int"
-  ImGuiCol="int",
+defs["ImGuiColorEditFlags"] = "int"
-  ImGuiColorEditFlags="int",
+defs["ImGuiColorMod"] = "struct ImGuiColorMod"
-  ImGuiColorMod="struct ImGuiColorMod",
+defs["ImGuiComboFlags"] = "int"
-  ImGuiComboFlags="int",
+defs["ImGuiComboPreviewData"] = "struct ImGuiComboPreviewData"
-  ImGuiComboPreviewData="struct ImGuiComboPreviewData",
+defs["ImGuiCond"] = "int"
-  ImGuiCond="int",
+defs["ImGuiConfigFlags"] = "int"
-  ImGuiConfigFlags="int",
+defs["ImGuiContext"] = "struct ImGuiContext"
-  ImGuiContext="struct ImGuiContext",
+defs["ImGuiContextHook"] = "struct ImGuiContextHook"
-  ImGuiContextHook="struct ImGuiContextHook",
+defs["ImGuiContextHookCallback"] = "void(*)(ImGuiContext* ctx,ImGuiContextHook* hook);"
-  ImGuiContextHookCallback="void (*)(ImGuiContext* ctx, ImGuiContextHook* hook);",
+defs["ImGuiDataType"] = "int"
-  ImGuiDataAuthority="int",
+defs["ImGuiDataTypeInfo"] = "struct ImGuiDataTypeInfo"
-  ImGuiDataType="int",
+defs["ImGuiDataTypeStorage"] = "struct ImGuiDataTypeStorage"
-  ImGuiDataTypeInfo="struct ImGuiDataTypeInfo",
+defs["ImGuiDataVarInfo"] = "struct ImGuiDataVarInfo"
-  ImGuiDataTypeStorage="struct ImGuiDataTypeStorage",
+defs["ImGuiDebugAllocEntry"] = "struct ImGuiDebugAllocEntry"
-  ImGuiDeactivatedItemData="struct ImGuiDeactivatedItemData",
+defs["ImGuiDebugAllocInfo"] = "struct ImGuiDebugAllocInfo"
-  ImGuiDebugAllocEntry="struct ImGuiDebugAllocEntry",
+defs["ImGuiDebugLogFlags"] = "int"
-  ImGuiDebugAllocInfo="struct ImGuiDebugAllocInfo",
+defs["ImGuiDragDropFlags"] = "int"
-  ImGuiDebugLogFlags="int",
+defs["ImGuiErrorLogCallback"] = "void(*)(void* user_data,const char* fmt,...);"
-  ImGuiDockContext="struct ImGuiDockContext",
+defs["ImGuiFocusRequestFlags"] = "int"
-  ImGuiDockNode="struct ImGuiDockNode",
+defs["ImGuiFocusScopeData"] = "struct ImGuiFocusScopeData"
-  ImGuiDockNodeFlags="int",
+defs["ImGuiFocusedFlags"] = "int"
-  ImGuiDockNodeSettings="struct ImGuiDockNodeSettings",
+defs["ImGuiGroupData"] = "struct ImGuiGroupData"
-  ImGuiDockRequest="struct ImGuiDockRequest",
+defs["ImGuiHoveredFlags"] = "int"
-  ImGuiDragDropFlags="int",
+defs["ImGuiID"] = "unsigned int"
-  ImGuiErrorCallback="void (*)(ImGuiContext* ctx, void* user_data, const char* msg);",
+defs["ImGuiIDStackTool"] = "struct ImGuiIDStackTool"
-  ImGuiErrorRecoveryState="struct ImGuiErrorRecoveryState",
+defs["ImGuiIO"] = "struct ImGuiIO"
-  ImGuiFocusRequestFlags="int",
+defs["ImGuiInputEvent"] = "struct ImGuiInputEvent"
-  ImGuiFocusScopeData="struct ImGuiFocusScopeData",
+defs["ImGuiInputEventAppFocused"] = "struct ImGuiInputEventAppFocused"
-  ImGuiFocusedFlags="int",
+defs["ImGuiInputEventKey"] = "struct ImGuiInputEventKey"
-  ImGuiGroupData="struct ImGuiGroupData",
+defs["ImGuiInputEventMouseButton"] = "struct ImGuiInputEventMouseButton"
-  ImGuiHoveredFlags="int",
+defs["ImGuiInputEventMousePos"] = "struct ImGuiInputEventMousePos"
-  ImGuiID="unsigned int",
+defs["ImGuiInputEventMouseWheel"] = "struct ImGuiInputEventMouseWheel"
-  ImGuiIDStackTool="struct ImGuiIDStackTool",
+defs["ImGuiInputEventText"] = "struct ImGuiInputEventText"
-  ImGuiIO="struct ImGuiIO",
+defs["ImGuiInputFlags"] = "int"
-  ImGuiInputEvent="struct ImGuiInputEvent",
+defs["ImGuiInputTextCallback"] = "int(*)(ImGuiInputTextCallbackData* data);"
-  ImGuiInputEventAppFocused="struct ImGuiInputEventAppFocused",
+defs["ImGuiInputTextCallbackData"] = "struct ImGuiInputTextCallbackData"
-  ImGuiInputEventKey="struct ImGuiInputEventKey",
+defs["ImGuiInputTextDeactivateData"] = "struct ImGuiInputTextDeactivateData"
-  ImGuiInputEventMouseButton="struct ImGuiInputEventMouseButton",
+defs["ImGuiInputTextDeactivatedState"] = "struct ImGuiInputTextDeactivatedState"
-  ImGuiInputEventMousePos="struct ImGuiInputEventMousePos",
+defs["ImGuiInputTextFlags"] = "int"
-  ImGuiInputEventMouseViewport="struct ImGuiInputEventMouseViewport",
+defs["ImGuiInputTextState"] = "struct ImGuiInputTextState"
-  ImGuiInputEventMouseWheel="struct ImGuiInputEventMouseWheel",
+defs["ImGuiItemFlags"] = "int"
-  ImGuiInputEventText="struct ImGuiInputEventText",
+defs["ImGuiItemStatusFlags"] = "int"
-  ImGuiInputFlags="int",
+defs["ImGuiKeyChord"] = "int"
-  ImGuiInputTextCallback="int (*)(ImGuiInputTextCallbackData* data);",
+defs["ImGuiKeyData"] = "struct ImGuiKeyData"
-  ImGuiInputTextCallbackData="struct ImGuiInputTextCallbackData",
+defs["ImGuiKeyOwnerData"] = "struct ImGuiKeyOwnerData"
-  ImGuiInputTextDeactivateData="struct ImGuiInputTextDeactivateData",
+defs["ImGuiKeyRoutingData"] = "struct ImGuiKeyRoutingData"
-  ImGuiInputTextDeactivatedState="struct ImGuiInputTextDeactivatedState",
+defs["ImGuiKeyRoutingIndex"] = "ImS16"
-  ImGuiInputTextFlags="int",
+defs["ImGuiKeyRoutingTable"] = "struct ImGuiKeyRoutingTable"
-  ImGuiInputTextState="struct ImGuiInputTextState",
+defs["ImGuiLastItemData"] = "struct ImGuiLastItemData"
-  ImGuiItemFlags="int",
+defs["ImGuiLayoutType"] = "int"
-  ImGuiItemStatusFlags="int",
+defs["ImGuiListClipper"] = "struct ImGuiListClipper"
-  ImGuiKeyChord="int",
+defs["ImGuiListClipperData"] = "struct ImGuiListClipperData"
-  ImGuiKeyData="struct ImGuiKeyData",
+defs["ImGuiListClipperRange"] = "struct ImGuiListClipperRange"
-  ImGuiKeyOwnerData="struct ImGuiKeyOwnerData",
+defs["ImGuiLocEntry"] = "struct ImGuiLocEntry"
-  ImGuiKeyRoutingData="struct ImGuiKeyRoutingData",
+defs["ImGuiMemAllocFunc"] = "void*(*)(size_t sz,void* user_data);"
-  ImGuiKeyRoutingIndex="ImS16",
+defs["ImGuiMemFreeFunc"] = "void(*)(void* ptr,void* user_data);"
-  ImGuiKeyRoutingTable="struct ImGuiKeyRoutingTable",
+defs["ImGuiMenuColumns"] = "struct ImGuiMenuColumns"
-  ImGuiLastItemData="struct ImGuiLastItemData",
+defs["ImGuiMetricsConfig"] = "struct ImGuiMetricsConfig"
-  ImGuiLayoutType="int",
+defs["ImGuiMouseButton"] = "int"
-  ImGuiListClipper="struct ImGuiListClipper",
+defs["ImGuiMouseCursor"] = "int"
-  ImGuiListClipperData="struct ImGuiListClipperData",
+defs["ImGuiNavHighlightFlags"] = "int"
-  ImGuiListClipperRange="struct ImGuiListClipperRange",
+defs["ImGuiNavItemData"] = "struct ImGuiNavItemData"
-  ImGuiLocEntry="struct ImGuiLocEntry",
+defs["ImGuiNavMoveFlags"] = "int"
-  ImGuiLogFlags="int",
+defs["ImGuiNavTreeNodeData"] = "struct ImGuiNavTreeNodeData"
-  ImGuiMemAllocFunc="void* (*)(size_t sz, void* user_data);",
+defs["ImGuiNextItemData"] = "struct ImGuiNextItemData"
-  ImGuiMemFreeFunc="void (*)(void* ptr, void* user_data);",
+defs["ImGuiNextItemDataFlags"] = "int"
-  ImGuiMenuColumns="struct ImGuiMenuColumns",
+defs["ImGuiNextWindowData"] = "struct ImGuiNextWindowData"
-  ImGuiMetricsConfig="struct ImGuiMetricsConfig",
+defs["ImGuiNextWindowDataFlags"] = "int"
-  ImGuiMouseButton="int",
+defs["ImGuiOldColumnData"] = "struct ImGuiOldColumnData"
-  ImGuiMouseCursor="int",
+defs["ImGuiOldColumnFlags"] = "int"
-  ImGuiMultiSelectFlags="int",
+defs["ImGuiOldColumns"] = "struct ImGuiOldColumns"
-  ImGuiMultiSelectIO="struct ImGuiMultiSelectIO",
+defs["ImGuiOnceUponAFrame"] = "struct ImGuiOnceUponAFrame"
-  ImGuiMultiSelectState="struct ImGuiMultiSelectState",
+defs["ImGuiPayload"] = "struct ImGuiPayload"
-  ImGuiMultiSelectTempData="struct ImGuiMultiSelectTempData",
+defs["ImGuiPlatformImeData"] = "struct ImGuiPlatformImeData"
-  ImGuiNavItemData="struct ImGuiNavItemData",
+defs["ImGuiPopupData"] = "struct ImGuiPopupData"
-  ImGuiNavMoveFlags="int",
+defs["ImGuiPopupFlags"] = "int"
-  ImGuiNavRenderCursorFlags="int",
+defs["ImGuiPtrOrIndex"] = "struct ImGuiPtrOrIndex"
-  ImGuiNextItemData="struct ImGuiNextItemData",
+defs["ImGuiScrollFlags"] = "int"
-  ImGuiNextItemDataFlags="int",
+defs["ImGuiSelectableFlags"] = "int"
-  ImGuiNextWindowData="struct ImGuiNextWindowData",
+defs["ImGuiSelectionUserData"] = "ImS64"
-  ImGuiNextWindowDataFlags="int",
+defs["ImGuiSeparatorFlags"] = "int"
-  ImGuiOldColumnData="struct ImGuiOldColumnData",
+defs["ImGuiSettingsHandler"] = "struct ImGuiSettingsHandler"
-  ImGuiOldColumnFlags="int",
+defs["ImGuiShrinkWidthItem"] = "struct ImGuiShrinkWidthItem"
-  ImGuiOldColumns="struct ImGuiOldColumns",
+defs["ImGuiSizeCallback"] = "void(*)(ImGuiSizeCallbackData* data);"
-  ImGuiOnceUponAFrame="struct ImGuiOnceUponAFrame",
+defs["ImGuiSizeCallbackData"] = "struct ImGuiSizeCallbackData"
-  ImGuiPayload="struct ImGuiPayload",
+defs["ImGuiSliderFlags"] = "int"
-  ImGuiPlatformIO="struct ImGuiPlatformIO",
+defs["ImGuiStackLevelInfo"] = "struct ImGuiStackLevelInfo"
-  ImGuiPlatformImeData="struct ImGuiPlatformImeData",
+defs["ImGuiStackSizes"] = "struct ImGuiStackSizes"
-  ImGuiPlatformMonitor="struct ImGuiPlatformMonitor",
+defs["ImGuiStorage"] = "struct ImGuiStorage"
-  ImGuiPopupData="struct ImGuiPopupData",
+defs["ImGuiStoragePair"] = "struct ImGuiStoragePair"
-  ImGuiPopupFlags="int",
+defs["ImGuiStyle"] = "struct ImGuiStyle"
-  ImGuiPtrOrIndex="struct ImGuiPtrOrIndex",
+defs["ImGuiStyleMod"] = "struct ImGuiStyleMod"
-  ImGuiScrollFlags="int",
+defs["ImGuiStyleVar"] = "int"
-  ImGuiSelectableFlags="int",
+defs["ImGuiTabBar"] = "struct ImGuiTabBar"
-  ImGuiSelectionBasicStorage="struct ImGuiSelectionBasicStorage",
+defs["ImGuiTabBarFlags"] = "int"
-  ImGuiSelectionExternalStorage="struct ImGuiSelectionExternalStorage",
+defs["ImGuiTabItem"] = "struct ImGuiTabItem"
-  ImGuiSelectionRequest="struct ImGuiSelectionRequest",
+defs["ImGuiTabItemFlags"] = "int"
-  ImGuiSelectionUserData="ImS64",
+defs["ImGuiTable"] = "struct ImGuiTable"
-  ImGuiSeparatorFlags="int",
+defs["ImGuiTableBgTarget"] = "int"
-  ImGuiSettingsHandler="struct ImGuiSettingsHandler",
+defs["ImGuiTableCellData"] = "struct ImGuiTableCellData"
-  ImGuiShrinkWidthItem="struct ImGuiShrinkWidthItem",
+defs["ImGuiTableColumn"] = "struct ImGuiTableColumn"
-  ImGuiSizeCallback="void (*)(ImGuiSizeCallbackData* data);",
+defs["ImGuiTableColumnFlags"] = "int"
-  ImGuiSizeCallbackData="struct ImGuiSizeCallbackData",
+defs["ImGuiTableColumnIdx"] = "ImS16"
-  ImGuiSliderFlags="int",
+defs["ImGuiTableColumnSettings"] = "struct ImGuiTableColumnSettings"
-  ImGuiStackLevelInfo="struct ImGuiStackLevelInfo",
+defs["ImGuiTableColumnSortSpecs"] = "struct ImGuiTableColumnSortSpecs"
-  ImGuiStorage="struct ImGuiStorage",
+defs["ImGuiTableColumnsSettings"] = "struct ImGuiTableColumnsSettings"
-  ImGuiStoragePair="struct ImGuiStoragePair",
+defs["ImGuiTableDrawChannelIdx"] = "ImU16"
-  ImGuiStyle="struct ImGuiStyle",
+defs["ImGuiTableFlags"] = "int"
-  ImGuiStyleMod="struct ImGuiStyleMod",
+defs["ImGuiTableHeaderData"] = "struct ImGuiTableHeaderData"
-  ImGuiStyleVar="int",
+defs["ImGuiTableInstanceData"] = "struct ImGuiTableInstanceData"
-  ImGuiStyleVarInfo="struct ImGuiStyleVarInfo",
+defs["ImGuiTableRowFlags"] = "int"
-  ImGuiTabBar="struct ImGuiTabBar",
+defs["ImGuiTableSettings"] = "struct ImGuiTableSettings"
-  ImGuiTabBarFlags="int",
+defs["ImGuiTableSortSpecs"] = "struct ImGuiTableSortSpecs"
-  ImGuiTabItem="struct ImGuiTabItem",
+defs["ImGuiTableTempData"] = "struct ImGuiTableTempData"
-  ImGuiTabItemFlags="int",
+defs["ImGuiTextBuffer"] = "struct ImGuiTextBuffer"
-  ImGuiTable="struct ImGuiTable",
+defs["ImGuiTextFilter"] = "struct ImGuiTextFilter"
-  ImGuiTableBgTarget="int",
+defs["ImGuiTextFlags"] = "int"
-  ImGuiTableCellData="struct ImGuiTableCellData",
+defs["ImGuiTextIndex"] = "struct ImGuiTextIndex"
-  ImGuiTableColumn="struct ImGuiTableColumn",
+defs["ImGuiTextRange"] = "struct ImGuiTextRange"
-  ImGuiTableColumnFlags="int",
+defs["ImGuiTooltipFlags"] = "int"
-  ImGuiTableColumnIdx="ImS16",
+defs["ImGuiTreeNodeFlags"] = "int"
-  ImGuiTableColumnSettings="struct ImGuiTableColumnSettings",
+defs["ImGuiTypingSelectFlags"] = "int"
-  ImGuiTableColumnSortSpecs="struct ImGuiTableColumnSortSpecs",
+defs["ImGuiTypingSelectRequest"] = "struct ImGuiTypingSelectRequest"
-  ImGuiTableColumnsSettings="struct ImGuiTableColumnsSettings",
+defs["ImGuiTypingSelectState"] = "struct ImGuiTypingSelectState"
-  ImGuiTableDrawChannelIdx="ImU16",
+defs["ImGuiViewport"] = "struct ImGuiViewport"
-  ImGuiTableFlags="int",
+defs["ImGuiViewportFlags"] = "int"
-  ImGuiTableHeaderData="struct ImGuiTableHeaderData",
+defs["ImGuiViewportP"] = "struct ImGuiViewportP"
-  ImGuiTableInstanceData="struct ImGuiTableInstanceData",
+defs["ImGuiWindow"] = "struct ImGuiWindow"
-  ImGuiTableRowFlags="int",
+defs["ImGuiWindowFlags"] = "int"
-  ImGuiTableSettings="struct ImGuiTableSettings",
+defs["ImGuiWindowRefreshFlags"] = "int"
-  ImGuiTableSortSpecs="struct ImGuiTableSortSpecs",
+defs["ImGuiWindowSettings"] = "struct ImGuiWindowSettings"
-  ImGuiTableTempData="struct ImGuiTableTempData",
+defs["ImGuiWindowStackData"] = "struct ImGuiWindowStackData"
-  ImGuiTextBuffer="struct ImGuiTextBuffer",
+defs["ImGuiWindowTempData"] = "struct ImGuiWindowTempData"
-  ImGuiTextFilter="struct ImGuiTextFilter",
+defs["ImPoolIdx"] = "int"
-  ImGuiTextFlags="int",
+defs["ImRect"] = "struct ImRect"
-  ImGuiTextIndex="struct ImGuiTextIndex",
+defs["ImS16"] = "signed short"
-  ImGuiTextRange="struct ImGuiTextRange",
+defs["ImS32"] = "signed int"
-  ImGuiTooltipFlags="int",
+defs["ImS64"] = "signed long long"
-  ImGuiTreeNodeFlags="int",
+defs["ImS8"] = "signed char"
-  ImGuiTreeNodeStackData="struct ImGuiTreeNodeStackData",
+defs["ImTextureID"] = "void*"
-  ImGuiTypingSelectFlags="int",
+defs["ImU16"] = "unsigned short"
-  ImGuiTypingSelectRequest="struct ImGuiTypingSelectRequest",
+defs["ImU32"] = "unsigned int"
-  ImGuiTypingSelectState="struct ImGuiTypingSelectState",
+defs["ImU64"] = "unsigned long long"
-  ImGuiViewport="struct ImGuiViewport",
+defs["ImU8"] = "unsigned char"
-  ImGuiViewportFlags="int",
+defs["ImVec1"] = "struct ImVec1"
-  ImGuiViewportP="struct ImGuiViewportP",
+defs["ImVec2"] = "struct ImVec2"
-  ImGuiWindow="struct ImGuiWindow",
+defs["ImVec2ih"] = "struct ImVec2ih"
-  ImGuiWindowClass="struct ImGuiWindowClass",
+defs["ImVec4"] = "struct ImVec4"
-  ImGuiWindowDockStyle="struct ImGuiWindowDockStyle",
+defs["ImWchar"] = "ImWchar16"
-  ImGuiWindowFlags="int",
+defs["ImWchar16"] = "unsigned short"
-  ImGuiWindowRefreshFlags="int",
+defs["ImWchar32"] = "unsigned int"
-  ImGuiWindowSettings="struct ImGuiWindowSettings",
+defs["STB_TexteditState"] = "struct STB_TexteditState"
-  ImGuiWindowStackData="struct ImGuiWindowStackData",
+defs["StbTexteditRow"] = "struct StbTexteditRow"
-  ImGuiWindowTempData="struct ImGuiWindowTempData",
+defs["StbUndoRecord"] = "struct StbUndoRecord"
-  ImPoolIdx="int",
+defs["StbUndoState"] = "struct StbUndoState"
-  ImRect="struct ImRect",
+defs["const_iterator"] = "const value_type*"
-  ImS16="signed short",
+defs["iterator"] = "value_type*"
-  ImS32="signed int",
+defs["value_type"] = "T"
-  ImS64="signed long long",
+
-  ImS8="signed char",
+return defs
-  ImStbTexteditState="ImStb::STB_TexteditState",
-  ImTextureID="ImU64",
-  ImU16="unsigned short",
-  ImU32="unsigned int",
-  ImU64="unsigned long long",
-  ImU8="unsigned char",
-  ImVec1="struct ImVec1",
-  ImVec2="struct ImVec2",
-  ImVec2ih="struct ImVec2ih",
-  ImVec4="struct ImVec4",
-  ImWchar="ImWchar16",
-  ImWchar16="unsigned short",
-  ImWchar32="unsigned int",
-  STB_TexteditState="struct STB_TexteditState"}
- return t

generator/print_defines.cpp

@@ -31,7 +31,3 @@
 #ifdef ImDrawCallback_ResetRenderState
 #pragma message(CIMGUI_DEFSTRING(ImDrawCallback_ResetRenderState))
 #endif
-
-#ifdef IMGUI_HAS_TEXTURES
-#pragma message(CIMGUI_DEFSTRING(IMGUI_HAS_TEXTURES))
-#endif