Merge branch 'docking_inter'

2025-08-13 13:18:31 +01:00 · 2023-02-15 10:18:15 +01:00
parent 6dba58d90f 1187e22308
commit d24246adfd
20 changed files with 3876 additions and 3238 deletions
--- a/generator/cpp2ffi.lua
+++ b/generator/cpp2ffi.lua
@@ -436,10 +436,11 @@ local function parseItems(txt,linenumdict, itparent, dumpit)
 							-- end
 							--error"no entry in linenumdict"
 							--take locat from parent
-							if itparent.locat then
+							if itparent and itparent.locat then
 								loca = itparent.locat
 							else
-								error"no entry in linenumdict"
+								loca = 0
+								--error"no entry in linenumdict"
 							end
 						end
 					else
--- a/generator/generator.bat
+++ b/generator/generator.bat
@@ -18,7 +18,7 @@ set PATH=%PATH%;C:\anima;C:\mingws\i686-7.2.0-release-posix-dwarf-rt_v5-rev1\min
 :: arg[2] options as words in one string: internal for imgui_internal generation, freetype for freetype generation, comments for comments generation
 :: examples: "" "internal" "internal freetype comments"
 :: arg[3..n] name of implementations to generate and/or CFLAGS (e.g. -DIMGUI_USER_CONFIG or -DIMGUI_USE_WCHAR32)
-luajit ./generator.lua gcc "internal" glfw opengl3 opengl2 sdl
+luajit ./generator.lua gcc "internal" glfw opengl3 opengl2 sdl2

 ::leave console open
 cmd /k
--- a/generator/generator.lua
+++ b/generator/generator.lua
@@ -75,6 +75,9 @@ local cimgui_manuals = {
    --igColorConvertRGBtoHSV = true,
    --igColorConvertHSVtoRGB = true
 }
+local cimgui_skipped = {
+	 --igShowDemoWindow = true
+}
 --------------------------------------------------------------------------
 --this table is a dictionary to force a naming of function overloading (instead of algorythmic generated)
 --first level is cimguiname without postfix, second level is the signature of the function, value is the
@@ -304,6 +307,7 @@ local function parseImGuiHeader(header,names)
 	end
 	parser.cname_overloads = cimgui_overloads
 	parser.manuals = cimgui_manuals
+	parser.skipped = cimgui_skipped
 	parser.UDTs = {"ImVec2","ImVec4","ImColor","ImRect"}
 	--parser.gen_template_typedef = gen_template_typedef --use auto
 	parser.COMMENTS_GENERATION = COMMENTS_GENERATION
--- a/generator/generator.sh
+++ b/generator/generator.sh
@@ -22,4 +22,4 @@ then
  suffix='.exe'
 fi

-luajit$suffix ./generator.lua gcc "internal" glfw opengl3 opengl2 sdl
+luajit$suffix ./generator.lua gcc "internal" glfw opengl3 opengl2 sdl2
--- a/generator/output/cimgui_impl.h
+++ b/generator/output/cimgui_impl.h
@@ -10,6 +10,7 @@ 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);
@@ -42,7 +43,7 @@ CIMGUI_API bool ImGui_ImplOpenGL2_CreateDeviceObjects(void);
 CIMGUI_API void ImGui_ImplOpenGL2_DestroyDeviceObjects(void);

 #endif
-#ifdef CIMGUI_USE_SDL
+#ifdef CIMGUI_USE_SDL2

 typedef struct SDL_Window SDL_Window;
 typedef struct SDL_Renderer SDL_Renderer;
--- a/generator/output/definitions.json
+++ b/generator/output/definitions.json
--- a/generator/output/definitions.lua
+++ b/generator/output/definitions.lua
--- a/generator/output/impl_definitions.json
+++ b/generator/output/impl_definitions.json
@@ -17,7 +17,7 @@
      "cimguiname": "ImGui_ImplGlfw_CharCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_CharCallback",
-      "location": "imgui_impl_glfw:41",
+      "location": "imgui_impl_glfw:45",
      "ov_cimguiname": "ImGui_ImplGlfw_CharCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,unsigned int)",
@@ -42,7 +42,7 @@
      "cimguiname": "ImGui_ImplGlfw_CursorEnterCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_CursorEnterCallback",
-      "location": "imgui_impl_glfw:36",
+      "location": "imgui_impl_glfw:40",
      "ov_cimguiname": "ImGui_ImplGlfw_CursorEnterCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int)",
@@ -71,7 +71,7 @@
      "cimguiname": "ImGui_ImplGlfw_CursorPosCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_CursorPosCallback",
-      "location": "imgui_impl_glfw:37",
+      "location": "imgui_impl_glfw:41",
      "ov_cimguiname": "ImGui_ImplGlfw_CursorPosCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,double,double)",
@@ -204,7 +204,7 @@
      "cimguiname": "ImGui_ImplGlfw_KeyCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_KeyCallback",
-      "location": "imgui_impl_glfw:40",
+      "location": "imgui_impl_glfw:44",
      "ov_cimguiname": "ImGui_ImplGlfw_KeyCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int,int,int,int)",
@@ -229,7 +229,7 @@
      "cimguiname": "ImGui_ImplGlfw_MonitorCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_MonitorCallback",
-      "location": "imgui_impl_glfw:42",
+      "location": "imgui_impl_glfw:46",
      "ov_cimguiname": "ImGui_ImplGlfw_MonitorCallback",
      "ret": "void",
      "signature": "(GLFWmonitor*,int)",
@@ -262,7 +262,7 @@
      "cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_MouseButtonCallback",
-      "location": "imgui_impl_glfw:38",
+      "location": "imgui_impl_glfw:42",
      "ov_cimguiname": "ImGui_ImplGlfw_MouseButtonCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int,int,int)",
@@ -328,13 +328,34 @@
      "cimguiname": "ImGui_ImplGlfw_ScrollCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_ScrollCallback",
-      "location": "imgui_impl_glfw:39",
+      "location": "imgui_impl_glfw:43",
      "ov_cimguiname": "ImGui_ImplGlfw_ScrollCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,double,double)",
      "stname": ""
    }
  ],
+  "ImGui_ImplGlfw_SetCallbacksChainForAllWindows": [
+    {
+      "args": "(bool chain_for_all_windows)",
+      "argsT": [
+        {
+          "name": "chain_for_all_windows",
+          "type": "bool"
+        }
+      ],
+      "argsoriginal": "(bool chain_for_all_windows)",
+      "call_args": "(chain_for_all_windows)",
+      "cimguiname": "ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
+      "defaults": {},
+      "funcname": "ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
+      "location": "imgui_impl_glfw:36",
+      "ov_cimguiname": "ImGui_ImplGlfw_SetCallbacksChainForAllWindows",
+      "ret": "void",
+      "signature": "(bool)",
+      "stname": ""
+    }
+  ],
  "ImGui_ImplGlfw_Shutdown": [
    {
      "args": "()",
@@ -369,7 +390,7 @@
      "cimguiname": "ImGui_ImplGlfw_WindowFocusCallback",
      "defaults": {},
      "funcname": "ImGui_ImplGlfw_WindowFocusCallback",
-      "location": "imgui_impl_glfw:35",
+      "location": "imgui_impl_glfw:39",
      "ov_cimguiname": "ImGui_ImplGlfw_WindowFocusCallback",
      "ret": "void",
      "signature": "(GLFWwindow*,int)",
@@ -663,7 +684,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForD3D",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForD3D",
-      "location": "imgui_impl_sdl:27",
+      "location": "imgui_impl_sdl2:26",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForD3D",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -684,7 +705,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForMetal",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForMetal",
-      "location": "imgui_impl_sdl:28",
+      "location": "imgui_impl_sdl2:27",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForMetal",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -709,7 +730,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForOpenGL",
-      "location": "imgui_impl_sdl:25",
+      "location": "imgui_impl_sdl2:24",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForOpenGL",
      "ret": "bool",
      "signature": "(SDL_Window*,void*)",
@@ -734,7 +755,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForSDLRenderer",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForSDLRenderer",
-      "location": "imgui_impl_sdl:29",
+      "location": "imgui_impl_sdl2:28",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForSDLRenderer",
      "ret": "bool",
      "signature": "(SDL_Window*,SDL_Renderer*)",
@@ -755,7 +776,7 @@
      "cimguiname": "ImGui_ImplSDL2_InitForVulkan",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_InitForVulkan",
-      "location": "imgui_impl_sdl:26",
+      "location": "imgui_impl_sdl2:25",
      "ov_cimguiname": "ImGui_ImplSDL2_InitForVulkan",
      "ret": "bool",
      "signature": "(SDL_Window*)",
@@ -771,7 +792,7 @@
      "cimguiname": "ImGui_ImplSDL2_NewFrame",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_NewFrame",
-      "location": "imgui_impl_sdl:31",
+      "location": "imgui_impl_sdl2:30",
      "ov_cimguiname": "ImGui_ImplSDL2_NewFrame",
      "ret": "void",
      "signature": "()",
@@ -792,7 +813,7 @@
      "cimguiname": "ImGui_ImplSDL2_ProcessEvent",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_ProcessEvent",
-      "location": "imgui_impl_sdl:32",
+      "location": "imgui_impl_sdl2:31",
      "ov_cimguiname": "ImGui_ImplSDL2_ProcessEvent",
      "ret": "bool",
      "signature": "(const SDL_Event*)",
@@ -808,7 +829,7 @@
      "cimguiname": "ImGui_ImplSDL2_Shutdown",
      "defaults": {},
      "funcname": "ImGui_ImplSDL2_Shutdown",
-      "location": "imgui_impl_sdl:30",
+      "location": "imgui_impl_sdl2:29",
      "ov_cimguiname": "ImGui_ImplSDL2_Shutdown",
      "ret": "void",
      "signature": "()",
--- a/generator/output/impl_definitions.lua
+++ b/generator/output/impl_definitions.lua
@@ -14,7 +14,7 @@ defs["ImGui_ImplGlfw_CharCallback"][1]["call_args"] = "(window,c)"
 defs["ImGui_ImplGlfw_CharCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_CharCallback"
 defs["ImGui_ImplGlfw_CharCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_CharCallback"][1]["funcname"] = "ImGui_ImplGlfw_CharCallback"
-defs["ImGui_ImplGlfw_CharCallback"][1]["location"] = "imgui_impl_glfw:41"
+defs["ImGui_ImplGlfw_CharCallback"][1]["location"] = "imgui_impl_glfw:45"
 defs["ImGui_ImplGlfw_CharCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_CharCallback"
 defs["ImGui_ImplGlfw_CharCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_CharCallback"][1]["signature"] = "(GLFWwindow*,unsigned int)"
@@ -35,7 +35,7 @@ defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["call_args"] = "(window,entered)"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_CursorEnterCallback"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["funcname"] = "ImGui_ImplGlfw_CursorEnterCallback"
-defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["location"] = "imgui_impl_glfw:36"
+defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["location"] = "imgui_impl_glfw:40"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_CursorEnterCallback"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_CursorEnterCallback"][1]["signature"] = "(GLFWwindow*,int)"
@@ -59,7 +59,7 @@ defs["ImGui_ImplGlfw_CursorPosCallback"][1]["call_args"] = "(window,x,y)"
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_CursorPosCallback"
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["funcname"] = "ImGui_ImplGlfw_CursorPosCallback"
-defs["ImGui_ImplGlfw_CursorPosCallback"][1]["location"] = "imgui_impl_glfw:37"
+defs["ImGui_ImplGlfw_CursorPosCallback"][1]["location"] = "imgui_impl_glfw:41"
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_CursorPosCallback"
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_CursorPosCallback"][1]["signature"] = "(GLFWwindow*,double,double)"
@@ -170,7 +170,7 @@ defs["ImGui_ImplGlfw_KeyCallback"][1]["call_args"] = "(window,key,scancode,actio
 defs["ImGui_ImplGlfw_KeyCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_KeyCallback"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_KeyCallback"][1]["funcname"] = "ImGui_ImplGlfw_KeyCallback"
-defs["ImGui_ImplGlfw_KeyCallback"][1]["location"] = "imgui_impl_glfw:40"
+defs["ImGui_ImplGlfw_KeyCallback"][1]["location"] = "imgui_impl_glfw:44"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_KeyCallback"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_KeyCallback"][1]["signature"] = "(GLFWwindow*,int,int,int,int)"
@@ -191,7 +191,7 @@ defs["ImGui_ImplGlfw_MonitorCallback"][1]["call_args"] = "(monitor,event)"
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_MonitorCallback"
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["funcname"] = "ImGui_ImplGlfw_MonitorCallback"
-defs["ImGui_ImplGlfw_MonitorCallback"][1]["location"] = "imgui_impl_glfw:42"
+defs["ImGui_ImplGlfw_MonitorCallback"][1]["location"] = "imgui_impl_glfw:46"
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_MonitorCallback"
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_MonitorCallback"][1]["signature"] = "(GLFWmonitor*,int)"
@@ -218,7 +218,7 @@ defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["call_args"] = "(window,button,act
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_MouseButtonCallback"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["funcname"] = "ImGui_ImplGlfw_MouseButtonCallback"
-defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["location"] = "imgui_impl_glfw:38"
+defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["location"] = "imgui_impl_glfw:42"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_MouseButtonCallback"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_MouseButtonCallback"][1]["signature"] = "(GLFWwindow*,int,int,int)"
@@ -275,12 +275,30 @@ defs["ImGui_ImplGlfw_ScrollCallback"][1]["call_args"] = "(window,xoffset,yoffset
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_ScrollCallback"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["funcname"] = "ImGui_ImplGlfw_ScrollCallback"
-defs["ImGui_ImplGlfw_ScrollCallback"][1]["location"] = "imgui_impl_glfw:39"
+defs["ImGui_ImplGlfw_ScrollCallback"][1]["location"] = "imgui_impl_glfw:43"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_ScrollCallback"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["signature"] = "(GLFWwindow*,double,double)"
 defs["ImGui_ImplGlfw_ScrollCallback"][1]["stname"] = ""
 defs["ImGui_ImplGlfw_ScrollCallback"]["(GLFWwindow*,double,double)"] = defs["ImGui_ImplGlfw_ScrollCallback"][1]
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"] = {}
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1] = {}
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["args"] = "(bool chain_for_all_windows)"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["argsT"] = {}
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["argsT"][1] = {}
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["argsT"][1]["name"] = "chain_for_all_windows"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["argsT"][1]["type"] = "bool"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["argsoriginal"] = "(bool chain_for_all_windows)"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["call_args"] = "(chain_for_all_windows)"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["cimguiname"] = "ImGui_ImplGlfw_SetCallbacksChainForAllWindows"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["defaults"] = {}
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["funcname"] = "ImGui_ImplGlfw_SetCallbacksChainForAllWindows"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["location"] = "imgui_impl_glfw:36"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_SetCallbacksChainForAllWindows"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["ret"] = "void"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["signature"] = "(bool)"
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]["stname"] = ""
+defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"]["(bool)"] = defs["ImGui_ImplGlfw_SetCallbacksChainForAllWindows"][1]
 defs["ImGui_ImplGlfw_Shutdown"] = {}
 defs["ImGui_ImplGlfw_Shutdown"][1] = {}
 defs["ImGui_ImplGlfw_Shutdown"][1]["args"] = "()"
@@ -311,7 +329,7 @@ defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["call_args"] = "(window,focused)"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["cimguiname"] = "ImGui_ImplGlfw_WindowFocusCallback"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["defaults"] = {}
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["funcname"] = "ImGui_ImplGlfw_WindowFocusCallback"
-defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["location"] = "imgui_impl_glfw:35"
+defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["location"] = "imgui_impl_glfw:39"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["ov_cimguiname"] = "ImGui_ImplGlfw_WindowFocusCallback"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["ret"] = "void"
 defs["ImGui_ImplGlfw_WindowFocusCallback"][1]["signature"] = "(GLFWwindow*,int)"
@@ -579,7 +597,7 @@ defs["ImGui_ImplSDL2_InitForD3D"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForD3D"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForD3D"][1]["funcname"] = "ImGui_ImplSDL2_InitForD3D"
-defs["ImGui_ImplSDL2_InitForD3D"][1]["location"] = "imgui_impl_sdl:27"
+defs["ImGui_ImplSDL2_InitForD3D"][1]["location"] = "imgui_impl_sdl2:26"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForD3D"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForD3D"][1]["signature"] = "(SDL_Window*)"
@@ -597,7 +615,7 @@ defs["ImGui_ImplSDL2_InitForMetal"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForMetal"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForMetal"][1]["funcname"] = "ImGui_ImplSDL2_InitForMetal"
-defs["ImGui_ImplSDL2_InitForMetal"][1]["location"] = "imgui_impl_sdl:28"
+defs["ImGui_ImplSDL2_InitForMetal"][1]["location"] = "imgui_impl_sdl2:27"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForMetal"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForMetal"][1]["signature"] = "(SDL_Window*)"
@@ -618,7 +636,7 @@ defs["ImGui_ImplSDL2_InitForOpenGL"][1]["call_args"] = "(window,sdl_gl_context)"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForOpenGL"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["funcname"] = "ImGui_ImplSDL2_InitForOpenGL"
-defs["ImGui_ImplSDL2_InitForOpenGL"][1]["location"] = "imgui_impl_sdl:25"
+defs["ImGui_ImplSDL2_InitForOpenGL"][1]["location"] = "imgui_impl_sdl2:24"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForOpenGL"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForOpenGL"][1]["signature"] = "(SDL_Window*,void*)"
@@ -639,7 +657,7 @@ defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["call_args"] = "(window,renderer)"
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForSDLRenderer"
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["funcname"] = "ImGui_ImplSDL2_InitForSDLRenderer"
-defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["location"] = "imgui_impl_sdl:29"
+defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["location"] = "imgui_impl_sdl2:28"
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForSDLRenderer"
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForSDLRenderer"][1]["signature"] = "(SDL_Window*,SDL_Renderer*)"
@@ -657,7 +675,7 @@ defs["ImGui_ImplSDL2_InitForVulkan"][1]["call_args"] = "(window)"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["cimguiname"] = "ImGui_ImplSDL2_InitForVulkan"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["funcname"] = "ImGui_ImplSDL2_InitForVulkan"
-defs["ImGui_ImplSDL2_InitForVulkan"][1]["location"] = "imgui_impl_sdl:26"
+defs["ImGui_ImplSDL2_InitForVulkan"][1]["location"] = "imgui_impl_sdl2:25"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_InitForVulkan"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_InitForVulkan"][1]["signature"] = "(SDL_Window*)"
@@ -672,7 +690,7 @@ defs["ImGui_ImplSDL2_NewFrame"][1]["call_args"] = "()"
 defs["ImGui_ImplSDL2_NewFrame"][1]["cimguiname"] = "ImGui_ImplSDL2_NewFrame"
 defs["ImGui_ImplSDL2_NewFrame"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_NewFrame"][1]["funcname"] = "ImGui_ImplSDL2_NewFrame"
-defs["ImGui_ImplSDL2_NewFrame"][1]["location"] = "imgui_impl_sdl:31"
+defs["ImGui_ImplSDL2_NewFrame"][1]["location"] = "imgui_impl_sdl2:30"
 defs["ImGui_ImplSDL2_NewFrame"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_NewFrame"
 defs["ImGui_ImplSDL2_NewFrame"][1]["ret"] = "void"
 defs["ImGui_ImplSDL2_NewFrame"][1]["signature"] = "()"
@@ -690,7 +708,7 @@ defs["ImGui_ImplSDL2_ProcessEvent"][1]["call_args"] = "(event)"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["cimguiname"] = "ImGui_ImplSDL2_ProcessEvent"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["funcname"] = "ImGui_ImplSDL2_ProcessEvent"
-defs["ImGui_ImplSDL2_ProcessEvent"][1]["location"] = "imgui_impl_sdl:32"
+defs["ImGui_ImplSDL2_ProcessEvent"][1]["location"] = "imgui_impl_sdl2:31"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_ProcessEvent"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["ret"] = "bool"
 defs["ImGui_ImplSDL2_ProcessEvent"][1]["signature"] = "(const SDL_Event*)"
@@ -705,7 +723,7 @@ defs["ImGui_ImplSDL2_Shutdown"][1]["call_args"] = "()"
 defs["ImGui_ImplSDL2_Shutdown"][1]["cimguiname"] = "ImGui_ImplSDL2_Shutdown"
 defs["ImGui_ImplSDL2_Shutdown"][1]["defaults"] = {}
 defs["ImGui_ImplSDL2_Shutdown"][1]["funcname"] = "ImGui_ImplSDL2_Shutdown"
-defs["ImGui_ImplSDL2_Shutdown"][1]["location"] = "imgui_impl_sdl:30"
+defs["ImGui_ImplSDL2_Shutdown"][1]["location"] = "imgui_impl_sdl2:29"
 defs["ImGui_ImplSDL2_Shutdown"][1]["ov_cimguiname"] = "ImGui_ImplSDL2_Shutdown"
 defs["ImGui_ImplSDL2_Shutdown"][1]["ret"] = "void"
 defs["ImGui_ImplSDL2_Shutdown"][1]["signature"] = "()"
--- a/generator/output/overloads.txt
+++ b/generator/output/overloads.txt
@@ -123,6 +123,9 @@ igGetID	3
 1	ImGuiID	igGetID_Str (const char*)
 2	ImGuiID	igGetID_StrStr (const char*,const char*)
 3	ImGuiID	igGetID_Ptr (const void*)
+igGetIDWithSeed	2
+1	ImGuiID	igGetIDWithSeed_Str (const char*,const char*,ImGuiID)
+2	ImGuiID	igGetIDWithSeed_Int (int,ImGuiID)
 igImAbs	3
 1	int	igImAbs_Int (int)
 2	float	igImAbs_Float (float)
@@ -275,4 +278,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*)
-193 overloaded
+195 overloaded
--- a/generator/output/structs_and_enums.json
+++ b/generator/output/structs_and_enums.json
@@ -3322,8 +3322,23 @@
      },
      {
        "calc_value": 25,
-        "name": "ImGuiStyleVar_COUNT",
+        "name": "ImGuiStyleVar_SeparatorTextBorderSize",
        "value": "25"
+      },
+      {
+        "calc_value": 26,
+        "name": "ImGuiStyleVar_SeparatorTextAlign",
+        "value": "26"
+      },
+      {
+        "calc_value": 27,
+        "name": "ImGuiStyleVar_SeparatorTextPadding",
+        "value": "27"
+      },
+      {
+        "calc_value": 28,
+        "name": "ImGuiStyleVar_COUNT",
+        "value": "28"
      }
    ],
    "ImGuiTabBarFlagsPrivate_": [
@@ -4110,164 +4125,164 @@
    "ImGuiLocKey": "int"
  },
  "locations": {
-    "ImBitVector": "imgui_internal:588",
-    "ImColor": "imgui:2344",
-    "ImDrawChannel": "imgui:2434",
-    "ImDrawCmd": "imgui:2393",
-    "ImDrawCmdHeader": "imgui:2426",
-    "ImDrawData": "imgui:2626",
-    "ImDrawDataBuilder": "imgui_internal:777",
-    "ImDrawFlags_": "imgui:2460",
-    "ImDrawList": "imgui:2498",
-    "ImDrawListFlags_": "imgui:2480",
-    "ImDrawListSharedData": "imgui_internal:754",
-    "ImDrawListSplitter": "imgui:2443",
-    "ImDrawVert": "imgui:2411",
-    "ImFont": "imgui:2845",
-    "ImFontAtlas": "imgui:2742",
-    "ImFontAtlasCustomRect": "imgui:2704",
-    "ImFontAtlasFlags_": "imgui:2717",
-    "ImFontBuilderIO": "imgui_internal:3202",
-    "ImFontConfig": "imgui:2648",
-    "ImFontGlyph": "imgui:2677",
-    "ImFontGlyphRangesBuilder": "imgui:2689",
-    "ImGuiActivateFlags_": "imgui_internal:1412",
-    "ImGuiAxis": "imgui_internal:943",
-    "ImGuiBackendFlags_": "imgui:1508",
-    "ImGuiButtonFlagsPrivate_": "imgui_internal:848",
-    "ImGuiButtonFlags_": "imgui:1615",
-    "ImGuiCol_": "imgui:1518",
-    "ImGuiColorEditFlags_": "imgui:1628",
-    "ImGuiColorMod": "imgui_internal:986",
-    "ImGuiComboFlagsPrivate_": "imgui_internal:873",
-    "ImGuiComboFlags_": "imgui:1080",
-    "ImGuiComboPreviewData": "imgui_internal:1003",
-    "ImGuiCond_": "imgui:1719",
-    "ImGuiConfigFlags_": "imgui:1492",
-    "ImGuiContext": "imgui_internal:1731",
-    "ImGuiContextHook": "imgui_internal:1716",
-    "ImGuiContextHookType": "imgui_internal:1714",
-    "ImGuiDataTypeInfo": "imgui_internal:969",
-    "ImGuiDataTypePrivate_": "imgui_internal:978",
-    "ImGuiDataTypeTempStorage": "imgui_internal:963",
-    "ImGuiDataType_": "imgui:1317",
-    "ImGuiDebugLogFlags_": "imgui_internal:1650",
-    "ImGuiDir_": "imgui:1333",
-    "ImGuiDragDropFlags_": "imgui:1295",
-    "ImGuiFocusedFlags_": "imgui:1257",
-    "ImGuiGroupData": "imgui_internal:1016",
-    "ImGuiHoveredFlags_": "imgui:1271",
-    "ImGuiIO": "imgui:1896",
-    "ImGuiInputEvent": "imgui_internal:1271",
-    "ImGuiInputEventAppFocused": "imgui_internal:1269",
-    "ImGuiInputEventKey": "imgui_internal:1267",
-    "ImGuiInputEventMouseButton": "imgui_internal:1266",
-    "ImGuiInputEventMousePos": "imgui_internal:1264",
-    "ImGuiInputEventMouseWheel": "imgui_internal:1265",
-    "ImGuiInputEventText": "imgui_internal:1268",
-    "ImGuiInputEventType": "imgui_internal:1239",
-    "ImGuiInputFlags_": "imgui_internal:1333",
-    "ImGuiInputSource": "imgui_internal:1251",
-    "ImGuiInputTextCallbackData": "imgui:2069",
-    "ImGuiInputTextFlagsPrivate_": "imgui_internal:839",
-    "ImGuiInputTextFlags_": "imgui:992",
-    "ImGuiInputTextState": "imgui_internal:1051",
-    "ImGuiItemFlags_": "imgui_internal:796",
-    "ImGuiItemStatusFlags_": "imgui_internal:816",
-    "ImGuiKey": "imgui:1355",
-    "ImGuiKeyData": "imgui:1888",
-    "ImGuiKeyOwnerData": "imgui_internal:1321",
-    "ImGuiKeyRoutingData": "imgui_internal:1296",
-    "ImGuiKeyRoutingTable": "imgui_internal:1309",
-    "ImGuiLastItemData": "imgui_internal:1158",
-    "ImGuiLayoutType_": "imgui_internal:927",
-    "ImGuiListClipper": "imgui:2293",
-    "ImGuiListClipperData": "imgui_internal:1396",
-    "ImGuiListClipperRange": "imgui_internal:1383",
-    "ImGuiLocEntry": "imgui_internal:1639",
-    "ImGuiLocKey": "imgui_internal:1627",
-    "ImGuiLogType": "imgui_internal:933",
-    "ImGuiMenuColumns": "imgui_internal:1032",
-    "ImGuiMetricsConfig": "imgui_internal:1664",
-    "ImGuiMouseButton_": "imgui:1691",
-    "ImGuiMouseCursor_": "imgui:1701",
-    "ImGuiNavHighlightFlags_": "imgui_internal:1435",
-    "ImGuiNavInput": "imgui:1483",
-    "ImGuiNavItemData": "imgui_internal:1469",
-    "ImGuiNavLayer": "imgui_internal:1462",
-    "ImGuiNavMoveFlags_": "imgui_internal:1444",
-    "ImGuiNextItemData": "imgui_internal:1145",
-    "ImGuiNextItemDataFlags_": "imgui_internal:1138",
-    "ImGuiNextWindowData": "imgui_internal:1116",
-    "ImGuiNextWindowDataFlags_": "imgui_internal:1102",
-    "ImGuiOldColumnData": "imgui_internal:1509",
-    "ImGuiOldColumnFlags_": "imgui_internal:1489",
-    "ImGuiOldColumns": "imgui_internal:1519",
-    "ImGuiOnceUponAFrame": "imgui:2168",
-    "ImGuiPayload": "imgui:2109",
-    "ImGuiPlatformImeData": "imgui:2939",
-    "ImGuiPlotType": "imgui_internal:950",
-    "ImGuiPopupData": "imgui_internal:1088",
-    "ImGuiPopupFlags_": "imgui:1053",
-    "ImGuiPopupPositionPolicy": "imgui_internal:956",
-    "ImGuiPtrOrIndex": "imgui_internal:1202",
-    "ImGuiScrollFlags_": "imgui_internal:1421",
-    "ImGuiSelectableFlagsPrivate_": "imgui_internal:886",
-    "ImGuiSelectableFlags_": "imgui:1069",
-    "ImGuiSeparatorFlags_": "imgui_internal:905",
-    "ImGuiSettingsHandler": "imgui_internal:1607",
-    "ImGuiShrinkWidthItem": "imgui_internal:1195",
-    "ImGuiSizeCallbackData": "imgui:2100",
-    "ImGuiSliderFlagsPrivate_": "imgui_internal:879",
-    "ImGuiSliderFlags_": "imgui:1674",
-    "ImGuiSortDirection_": "imgui:1344",
-    "ImGuiStackLevelInfo": "imgui_internal:1685",
-    "ImGuiStackSizes": "imgui_internal:1170",
-    "ImGuiStackTool": "imgui_internal:1697",
-    "ImGuiStorage": "imgui:2230",
-    "ImGuiStoragePair": "imgui:2233",
-    "ImGuiStyle": "imgui:1831",
-    "ImGuiStyleMod": "imgui_internal:993",
-    "ImGuiStyleVar_": "imgui:1583",
-    "ImGuiTabBar": "imgui_internal:2394",
-    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2359",
-    "ImGuiTabBarFlags_": "imgui:1094",
-    "ImGuiTabItem": "imgui_internal:2375",
-    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2367",
-    "ImGuiTabItemFlags_": "imgui:1110",
-    "ImGuiTable": "imgui_internal:2529",
-    "ImGuiTableBgTarget_": "imgui:1248",
-    "ImGuiTableCellData": "imgui_internal:2512",
-    "ImGuiTableColumn": "imgui_internal:2453",
-    "ImGuiTableColumnFlags_": "imgui:1196",
-    "ImGuiTableColumnSettings": "imgui_internal:2666",
-    "ImGuiTableColumnSortSpecs": "imgui:2131",
-    "ImGuiTableFlags_": "imgui:1145",
-    "ImGuiTableInstanceData": "imgui_internal:2519",
-    "ImGuiTableRowFlags_": "imgui:1233",
-    "ImGuiTableSettings": "imgui_internal:2690",
-    "ImGuiTableSortSpecs": "imgui:2145",
-    "ImGuiTableTempData": "imgui_internal:2645",
-    "ImGuiTextBuffer": "imgui:2203",
-    "ImGuiTextFilter": "imgui:2176",
-    "ImGuiTextFlags_": "imgui_internal:913",
-    "ImGuiTextIndex": "imgui_internal:711",
-    "ImGuiTextRange": "imgui:2186",
-    "ImGuiTooltipFlags_": "imgui_internal:919",
-    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:900",
-    "ImGuiTreeNodeFlags_": "imgui:1024",
-    "ImGuiViewport": "imgui:2916",
-    "ImGuiViewportFlags_": "imgui:2901",
-    "ImGuiViewportP": "imgui_internal:1562",
-    "ImGuiWindow": "imgui_internal:2235",
-    "ImGuiWindowFlags_": "imgui:954",
-    "ImGuiWindowSettings": "imgui_internal:1595",
-    "ImGuiWindowStackData": "imgui_internal:1188",
-    "ImGuiWindowTempData": "imgui_internal:2187",
-    "ImRect": "imgui_internal:516",
-    "ImVec1": "imgui_internal:498",
+    "ImBitVector": "imgui_internal:595",
+    "ImColor": "imgui:2351",
+    "ImDrawChannel": "imgui:2441",
+    "ImDrawCmd": "imgui:2400",
+    "ImDrawCmdHeader": "imgui:2433",
+    "ImDrawData": "imgui:2633",
+    "ImDrawDataBuilder": "imgui_internal:785",
+    "ImDrawFlags_": "imgui:2467",
+    "ImDrawList": "imgui:2505",
+    "ImDrawListFlags_": "imgui:2487",
+    "ImDrawListSharedData": "imgui_internal:762",
+    "ImDrawListSplitter": "imgui:2450",
+    "ImDrawVert": "imgui:2418",
+    "ImFont": "imgui:2852",
+    "ImFontAtlas": "imgui:2749",
+    "ImFontAtlasCustomRect": "imgui:2711",
+    "ImFontAtlasFlags_": "imgui:2724",
+    "ImFontBuilderIO": "imgui_internal:3212",
+    "ImFontConfig": "imgui:2655",
+    "ImFontGlyph": "imgui:2684",
+    "ImFontGlyphRangesBuilder": "imgui:2696",
+    "ImGuiActivateFlags_": "imgui_internal:1420",
+    "ImGuiAxis": "imgui_internal:951",
+    "ImGuiBackendFlags_": "imgui:1509",
+    "ImGuiButtonFlagsPrivate_": "imgui_internal:856",
+    "ImGuiButtonFlags_": "imgui:1619",
+    "ImGuiCol_": "imgui:1519",
+    "ImGuiColorEditFlags_": "imgui:1632",
+    "ImGuiColorMod": "imgui_internal:994",
+    "ImGuiComboFlagsPrivate_": "imgui_internal:881",
+    "ImGuiComboFlags_": "imgui:1081",
+    "ImGuiComboPreviewData": "imgui_internal:1011",
+    "ImGuiCond_": "imgui:1723",
+    "ImGuiConfigFlags_": "imgui:1493",
+    "ImGuiContext": "imgui_internal:1733",
+    "ImGuiContextHook": "imgui_internal:1718",
+    "ImGuiContextHookType": "imgui_internal:1716",
+    "ImGuiDataTypeInfo": "imgui_internal:977",
+    "ImGuiDataTypePrivate_": "imgui_internal:986",
+    "ImGuiDataTypeTempStorage": "imgui_internal:971",
+    "ImGuiDataType_": "imgui:1318",
+    "ImGuiDebugLogFlags_": "imgui_internal:1659",
+    "ImGuiDir_": "imgui:1334",
+    "ImGuiDragDropFlags_": "imgui:1296",
+    "ImGuiFocusedFlags_": "imgui:1258",
+    "ImGuiGroupData": "imgui_internal:1024",
+    "ImGuiHoveredFlags_": "imgui:1272",
+    "ImGuiIO": "imgui:1903",
+    "ImGuiInputEvent": "imgui_internal:1279",
+    "ImGuiInputEventAppFocused": "imgui_internal:1277",
+    "ImGuiInputEventKey": "imgui_internal:1275",
+    "ImGuiInputEventMouseButton": "imgui_internal:1274",
+    "ImGuiInputEventMousePos": "imgui_internal:1272",
+    "ImGuiInputEventMouseWheel": "imgui_internal:1273",
+    "ImGuiInputEventText": "imgui_internal:1276",
+    "ImGuiInputEventType": "imgui_internal:1247",
+    "ImGuiInputFlags_": "imgui_internal:1341",
+    "ImGuiInputSource": "imgui_internal:1259",
+    "ImGuiInputTextCallbackData": "imgui:2076",
+    "ImGuiInputTextFlagsPrivate_": "imgui_internal:847",
+    "ImGuiInputTextFlags_": "imgui:993",
+    "ImGuiInputTextState": "imgui_internal:1059",
+    "ImGuiItemFlags_": "imgui_internal:804",
+    "ImGuiItemStatusFlags_": "imgui_internal:824",
+    "ImGuiKey": "imgui:1356",
+    "ImGuiKeyData": "imgui:1895",
+    "ImGuiKeyOwnerData": "imgui_internal:1329",
+    "ImGuiKeyRoutingData": "imgui_internal:1304",
+    "ImGuiKeyRoutingTable": "imgui_internal:1317",
+    "ImGuiLastItemData": "imgui_internal:1166",
+    "ImGuiLayoutType_": "imgui_internal:935",
+    "ImGuiListClipper": "imgui:2300",
+    "ImGuiListClipperData": "imgui_internal:1404",
+    "ImGuiListClipperRange": "imgui_internal:1391",
+    "ImGuiLocEntry": "imgui_internal:1648",
+    "ImGuiLocKey": "imgui_internal:1636",
+    "ImGuiLogType": "imgui_internal:941",
+    "ImGuiMenuColumns": "imgui_internal:1040",
+    "ImGuiMetricsConfig": "imgui_internal:1673",
+    "ImGuiMouseButton_": "imgui:1695",
+    "ImGuiMouseCursor_": "imgui:1705",
+    "ImGuiNavHighlightFlags_": "imgui_internal:1443",
+    "ImGuiNavInput": "imgui:1484",
+    "ImGuiNavItemData": "imgui_internal:1477",
+    "ImGuiNavLayer": "imgui_internal:1470",
+    "ImGuiNavMoveFlags_": "imgui_internal:1452",
+    "ImGuiNextItemData": "imgui_internal:1153",
+    "ImGuiNextItemDataFlags_": "imgui_internal:1146",
+    "ImGuiNextWindowData": "imgui_internal:1124",
+    "ImGuiNextWindowDataFlags_": "imgui_internal:1110",
+    "ImGuiOldColumnData": "imgui_internal:1517",
+    "ImGuiOldColumnFlags_": "imgui_internal:1497",
+    "ImGuiOldColumns": "imgui_internal:1527",
+    "ImGuiOnceUponAFrame": "imgui:2175",
+    "ImGuiPayload": "imgui:2116",
+    "ImGuiPlatformImeData": "imgui:2948",
+    "ImGuiPlotType": "imgui_internal:958",
+    "ImGuiPopupData": "imgui_internal:1096",
+    "ImGuiPopupFlags_": "imgui:1054",
+    "ImGuiPopupPositionPolicy": "imgui_internal:964",
+    "ImGuiPtrOrIndex": "imgui_internal:1210",
+    "ImGuiScrollFlags_": "imgui_internal:1429",
+    "ImGuiSelectableFlagsPrivate_": "imgui_internal:894",
+    "ImGuiSelectableFlags_": "imgui:1070",
+    "ImGuiSeparatorFlags_": "imgui_internal:913",
+    "ImGuiSettingsHandler": "imgui_internal:1616",
+    "ImGuiShrinkWidthItem": "imgui_internal:1203",
+    "ImGuiSizeCallbackData": "imgui:2107",
+    "ImGuiSliderFlagsPrivate_": "imgui_internal:887",
+    "ImGuiSliderFlags_": "imgui:1678",
+    "ImGuiSortDirection_": "imgui:1345",
+    "ImGuiStackLevelInfo": "imgui_internal:1687",
+    "ImGuiStackSizes": "imgui_internal:1178",
+    "ImGuiStackTool": "imgui_internal:1699",
+    "ImGuiStorage": "imgui:2237",
+    "ImGuiStoragePair": "imgui:2240",
+    "ImGuiStyle": "imgui:1835",
+    "ImGuiStyleMod": "imgui_internal:1001",
+    "ImGuiStyleVar_": "imgui:1584",
+    "ImGuiTabBar": "imgui_internal:2399",
+    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2364",
+    "ImGuiTabBarFlags_": "imgui:1095",
+    "ImGuiTabItem": "imgui_internal:2380",
+    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2372",
+    "ImGuiTabItemFlags_": "imgui:1111",
+    "ImGuiTable": "imgui_internal:2528",
+    "ImGuiTableBgTarget_": "imgui:1249",
+    "ImGuiTableCellData": "imgui_internal:2510",
+    "ImGuiTableColumn": "imgui_internal:2451",
+    "ImGuiTableColumnFlags_": "imgui:1197",
+    "ImGuiTableColumnSettings": "imgui_internal:2664",
+    "ImGuiTableColumnSortSpecs": "imgui:2138",
+    "ImGuiTableFlags_": "imgui:1146",
+    "ImGuiTableInstanceData": "imgui_internal:2517",
+    "ImGuiTableRowFlags_": "imgui:1234",
+    "ImGuiTableSettings": "imgui_internal:2688",
+    "ImGuiTableSortSpecs": "imgui:2152",
+    "ImGuiTableTempData": "imgui_internal:2643",
+    "ImGuiTextBuffer": "imgui:2210",
+    "ImGuiTextFilter": "imgui:2183",
+    "ImGuiTextFlags_": "imgui_internal:921",
+    "ImGuiTextIndex": "imgui_internal:719",
+    "ImGuiTextRange": "imgui:2193",
+    "ImGuiTooltipFlags_": "imgui_internal:927",
+    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:908",
+    "ImGuiTreeNodeFlags_": "imgui:1025",
+    "ImGuiViewport": "imgui:2925",
+    "ImGuiViewportFlags_": "imgui:2910",
+    "ImGuiViewportP": "imgui_internal:1570",
+    "ImGuiWindow": "imgui_internal:2240",
+    "ImGuiWindowFlags_": "imgui:955",
+    "ImGuiWindowSettings": "imgui_internal:1603",
+    "ImGuiWindowStackData": "imgui_internal:1196",
+    "ImGuiWindowTempData": "imgui_internal:2192",
+    "ImRect": "imgui_internal:518",
+    "ImVec1": "imgui_internal:500",
    "ImVec2": "imgui:253",
-    "ImVec2ih": "imgui_internal:506",
+    "ImVec2ih": "imgui_internal:508",
    "ImVec4": "imgui:266",
    "STB_TexteditState": "imstb_textedit:320",
    "StbTexteditRow": "imstb_textedit:367",
@@ -4585,8 +4600,16 @@
        "type": "ImWchar"
      },
      {
-        "name": "DotChar",
-        "type": "ImWchar"
+        "name": "EllipsisCharCount",
+        "type": "short"
+      },
+      {
+        "name": "EllipsisWidth",
+        "type": "float"
+      },
+      {
+        "name": "EllipsisCharStep",
+        "type": "float"
      },
      {
        "name": "DirtyLookupTables",
@@ -5655,15 +5678,23 @@
        "type": "ImGuiColorEditFlags"
      },
      {
-        "name": "ColorEditLastHue",
+        "name": "ColorEditCurrentID",
+        "type": "ImGuiID"
+      },
+      {
+        "name": "ColorEditSavedID",
+        "type": "ImGuiID"
+      },
+      {
+        "name": "ColorEditSavedHue",
        "type": "float"
      },
      {
-        "name": "ColorEditLastSat",
+        "name": "ColorEditSavedSat",
        "type": "float"
      },
      {
-        "name": "ColorEditLastColor",
+        "name": "ColorEditSavedColor",
        "type": "ImU32"
      },
      {
@@ -6792,6 +6823,10 @@
        "name": "ShowDrawCmdBoundingBoxes",
        "type": "bool"
      },
+      {
+        "name": "ShowAtlasTintedWithTextColor",
+        "type": "bool"
+      },
      {
        "name": "ShowWindowsRectsType",
        "type": "int"
@@ -7412,6 +7447,18 @@
        "name": "SelectableTextAlign",
        "type": "ImVec2"
      },
+      {
+        "name": "SeparatorTextBorderSize",
+        "type": "float"
+      },
+      {
+        "name": "SeparatorTextAlign",
+        "type": "ImVec2"
+      },
+      {
+        "name": "SeparatorTextPadding",
+        "type": "ImVec2"
+      },
      {
        "name": "DisplayWindowPadding",
        "type": "ImVec2"
@@ -7671,19 +7718,15 @@
      },
      {
        "name": "EnabledMaskByDisplayOrder",
-        "type": "ImU64"
+        "type": "ImBitArrayPtr"
      },
      {
        "name": "EnabledMaskByIndex",
-        "type": "ImU64"
+        "type": "ImBitArrayPtr"
      },
      {
        "name": "VisibleMaskByIndex",
-        "type": "ImU64"
-      },
-      {
-        "name": "RequestOutputMaskByIndex",
-        "type": "ImU64"
+        "type": "ImBitArrayPtr"
      },
      {
        "name": "SettingsLoadedFlags",
@@ -8307,6 +8350,10 @@
      }
    ],
    "ImGuiTableInstanceData": [
+      {
+        "name": "TableInstanceID",
+        "type": "ImGuiID"
+      },
      {
        "name": "LastOuterHeight",
        "type": "float"
@@ -8929,6 +8976,10 @@
      {
        "name": "WantApply",
        "type": "bool"
+      },
+      {
+        "name": "WantDelete",
+        "type": "bool"
      }
    ],
    "ImGuiWindowStackData": [
--- a/generator/output/structs_and_enums.lua
+++ b/generator/output/structs_and_enums.lua
--- a/generator/output/typedefs_dict.json
+++ b/generator/output/typedefs_dict.json
@@ -1,5 +1,6 @@
 {
  "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);",
@@ -123,11 +124,11 @@
  "ImGuiTableCellData": "struct ImGuiTableCellData",
  "ImGuiTableColumn": "struct ImGuiTableColumn",
  "ImGuiTableColumnFlags": "int",
-  "ImGuiTableColumnIdx": "ImS8",
+  "ImGuiTableColumnIdx": "ImS16",
  "ImGuiTableColumnSettings": "struct ImGuiTableColumnSettings",
  "ImGuiTableColumnSortSpecs": "struct ImGuiTableColumnSortSpecs",
  "ImGuiTableColumnsSettings": "struct ImGuiTableColumnsSettings",
-  "ImGuiTableDrawChannelIdx": "ImU8",
+  "ImGuiTableDrawChannelIdx": "ImU16",
  "ImGuiTableFlags": "int",
  "ImGuiTableInstanceData": "struct ImGuiTableInstanceData",
  "ImGuiTableRowFlags": "int",
--- a/generator/output/typedefs_dict.lua
+++ b/generator/output/typedefs_dict.lua
@@ -1,5 +1,6 @@
 local defs = {}
 defs["ImBitArrayForNamedKeys"] = "ImBitArray<ImGuiKey_NamedKey_COUNT,-ImGuiKey_NamedKey_BEGIN>"
+defs["ImBitArrayPtr"] = "ImU32*"
 defs["ImBitVector"] = "struct ImBitVector"
 defs["ImColor"] = "struct ImColor"
 defs["ImDrawCallback"] = "void(*)(const ImDrawList* parent_list,const ImDrawCmd* cmd);"
@@ -123,11 +124,11 @@ defs["ImGuiTableBgTarget"] = "int"
 defs["ImGuiTableCellData"] = "struct ImGuiTableCellData"
 defs["ImGuiTableColumn"] = "struct ImGuiTableColumn"
 defs["ImGuiTableColumnFlags"] = "int"
-defs["ImGuiTableColumnIdx"] = "ImS8"
+defs["ImGuiTableColumnIdx"] = "ImS16"
 defs["ImGuiTableColumnSettings"] = "struct ImGuiTableColumnSettings"
 defs["ImGuiTableColumnSortSpecs"] = "struct ImGuiTableColumnSortSpecs"
 defs["ImGuiTableColumnsSettings"] = "struct ImGuiTableColumnsSettings"
-defs["ImGuiTableDrawChannelIdx"] = "ImU8"
+defs["ImGuiTableDrawChannelIdx"] = "ImU16"
 defs["ImGuiTableFlags"] = "int"
 defs["ImGuiTableInstanceData"] = "struct ImGuiTableInstanceData"
 defs["ImGuiTableRowFlags"] = "int"