Merge branch 'docking_inter'

README.md

@@ -11,7 +11,7 @@ History:
 Initially cimgui was developed by Stephan Dilly as hand-written code but lately turned into an auto-generated version by sonoro1234 in order to keep up with imgui more easily (letting the user select the desired branch and commit)
 
 Notes:
-* currently this wrapper is based on version [1.91.0 of Dear ImGui with internal api]
+* currently this wrapper is based on version [1.91.2 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.
@@ -37,7 +37,7 @@ 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, Freetype2 is used or not and comments are generated or not
+* 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 and if constructors are generated also with versions performing just initialization of structs provided by yourself (_Construct is added to the constructor names)
 * 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.

cimgui.cpp

@@ -1,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.91.1" 19110 from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.91.2" 19120 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 #ifdef IMGUI_ENABLE_FREETYPE
 #ifndef CIMGUI_FREETYPE
@@ -2794,9 +2794,9 @@ CIMGUI_API int igImStrlenW(const ImWchar* str)
 {
     return ImStrlenW(str);
 }
-CIMGUI_API const ImWchar* igImStrbolW(const ImWchar* buf_mid_line,const ImWchar* buf_begin)
+CIMGUI_API const char* igImStrbol(const char* buf_mid_line,const char* buf_begin)
 {
-    return ImStrbolW(buf_mid_line,buf_begin);
+    return ImStrbol(buf_mid_line,buf_begin);
 }
 CIMGUI_API char igImToUpper(char c)
 {
@@ -3405,18 +3405,14 @@ CIMGUI_API void ImGuiInputTextState_ClearFreeMemory(ImGuiInputTextState* self)
 {
     return self->ClearFreeMemory();
 }
-CIMGUI_API int ImGuiInputTextState_GetUndoAvailCount(ImGuiInputTextState* self)
-{
-    return self->GetUndoAvailCount();
-}
-CIMGUI_API int ImGuiInputTextState_GetRedoAvailCount(ImGuiInputTextState* self)
-{
-    return self->GetRedoAvailCount();
-}
 CIMGUI_API void ImGuiInputTextState_OnKeyPressed(ImGuiInputTextState* self,int key)
 {
     return self->OnKeyPressed(key);
 }
+CIMGUI_API void ImGuiInputTextState_OnCharPressed(ImGuiInputTextState* self,unsigned int c)
+{
+    return self->OnCharPressed(c);
+}
 CIMGUI_API void ImGuiInputTextState_CursorAnimReset(ImGuiInputTextState* self)
 {
     return self->CursorAnimReset();

cimgui.h

@@ -1,5 +1,5 @@
 //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui
-//based on imgui.h file version "1.91.1" 19110 from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.91.2" 19120 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 #ifndef CIMGUI_INCLUDED
 #define CIMGUI_INCLUDED
@@ -117,6 +117,7 @@ typedef struct ImGuiTypingSelectRequest ImGuiTypingSelectRequest;
 typedef struct ImGuiWindow ImGuiWindow;
 typedef struct ImGuiWindowTempData ImGuiWindowTempData;
 typedef struct ImGuiWindowSettings ImGuiWindowSettings;
+typedef struct STB_TexteditState STB_TexteditState;
 typedef unsigned int ImGuiID;
 typedef signed char ImS8;
 typedef unsigned char ImU8;
@@ -266,6 +267,7 @@ typedef enum {
     ImGuiItemFlags_NoNavDefaultFocus = 1 << 2,
     ImGuiItemFlags_ButtonRepeat = 1 << 3,
     ImGuiItemFlags_AutoClosePopups = 1 << 4,
+    ImGuiItemFlags_AllowDuplicateId = 1 << 5,
 }ImGuiItemFlags_;
 typedef enum {
     ImGuiInputTextFlags_None = 0,
@@ -1009,6 +1011,7 @@ struct ImGuiIO
     float KeyRepeatDelay;
     float KeyRepeatRate;
     bool ConfigDebugIsDebuggerPresent;
+    bool ConfigDebugHighlightIdConflicts;
     bool ConfigDebugBeginReturnValueOnce;
     bool ConfigDebugBeginReturnValueLoop;
     bool ConfigDebugIgnoreFocusLoss;
@@ -1520,46 +1523,6 @@ typedef int ImGuiTypingSelectFlags;
 typedef int ImGuiWindowRefreshFlags;
 typedef void (*ImGuiErrorLogCallback)(void* user_data, const char* fmt, ...);
 extern ImGuiContext* GImGui;
-typedef struct StbUndoRecord StbUndoRecord;
-struct StbUndoRecord
-{
-   int where;
-   int insert_length;
-   int delete_length;
-   int char_storage;
-};
-typedef struct StbUndoState StbUndoState;
-struct StbUndoState
-{
-   StbUndoRecord undo_rec [99];
-   ImWchar undo_char[999];
-   short undo_point, redo_point;
-   int undo_char_point, redo_char_point;
-};
-typedef struct STB_TexteditState STB_TexteditState;
-struct STB_TexteditState
-{
-   int cursor;
-   int select_start;
-   int select_end;
-   unsigned char insert_mode;
-   int row_count_per_page;
-   unsigned char cursor_at_end_of_line;
-   unsigned char initialized;
-   unsigned char has_preferred_x;
-   unsigned char single_line;
-   unsigned char padding1, padding2, padding3;
-   float preferred_x;
-   StbUndoState undostate;
-};
-typedef struct StbTexteditRow StbTexteditRow;
-struct StbTexteditRow
-{
-   float x0,x1;
-   float baseline_y_delta;
-   float ymin,ymax;
-   int num_chars;
-};
 typedef FILE* ImFileHandle;
 typedef struct ImVec1 ImVec1;
 struct ImVec1
@@ -1804,19 +1767,19 @@ struct ImGuiInputTextDeactivatedState
 {
     ImGuiID ID;
     ImVector_char TextA;
-};
+}; struct STB_TexteditState;
+typedef STB_TexteditState ImStbTexteditState;
 struct ImGuiInputTextState
 {
     ImGuiContext* Ctx;
+    ImStbTexteditState* Stb;
     ImGuiID ID;
-    int CurLenW, CurLenA;
+    int CurLenA;
-    ImVector_ImWchar TextW;
     ImVector_char TextA;
     ImVector_char InitialTextA;
-    bool TextAIsValid;
+    ImVector_char CallbackTextBackup;
     int BufCapacityA;
     ImVec2 Scroll;
-    STB_TexteditState Stb;
     float CursorAnim;
     bool CursorFollow;
     bool SelectedAllMouseLock;
@@ -2308,8 +2271,9 @@ ImGuiLocKey_TableResetOrder=4,
 ImGuiLocKey_WindowingMainMenuBar=5,
 ImGuiLocKey_WindowingPopup=6,
 ImGuiLocKey_WindowingUntitled=7,
-ImGuiLocKey_CopyLink=8,
+ImGuiLocKey_OpenLink_s=8,
-ImGuiLocKey_COUNT=9,
+ImGuiLocKey_CopyLink=9,
+ImGuiLocKey_COUNT=10,
 }ImGuiLocKey;
 struct ImGuiLocEntry
 {
@@ -2496,9 +2460,11 @@ struct ImGuiContext
     float WheelingWindowReleaseTimer;
     ImVec2 WheelingWindowWheelRemainder;
     ImVec2 WheelingAxisAvg;
+    ImGuiID DebugDrawIdConflicts;
     ImGuiID DebugHookIdInfo;
     ImGuiID HoveredId;
     ImGuiID HoveredIdPreviousFrame;
+    int HoveredIdPreviousFrameItemCount;
     float HoveredIdTimer;
     float HoveredIdNotActiveTimer;
     bool HoveredIdAllowOverlap;
@@ -3189,9 +3155,6 @@ typedef union SDL_Event SDL_Event;
 #ifndef CIMGUI_DEFINE_ENUMS_AND_STRUCTS
 typedef struct ImGuiTextFilter::ImGuiTextRange ImGuiTextRange;
 typedef ImStb::STB_TexteditState STB_TexteditState;
-typedef ImStb::StbTexteditRow StbTexteditRow;
-typedef ImStb::StbUndoRecord StbUndoRecord;
-typedef ImStb::StbUndoState StbUndoState;
 typedef ImChunkStream<ImGuiTableSettings> ImChunkStream_ImGuiTableSettings;
 typedef ImChunkStream<ImGuiWindowSettings> ImChunkStream_ImGuiWindowSettings;
 typedef ImPool<ImGuiMultiSelectState> ImPool_ImGuiMultiSelectState;
@@ -3933,7 +3896,7 @@ CIMGUI_API const char* igImStristr(const char* haystack,const char* haystack_end
 CIMGUI_API void igImStrTrimBlanks(char* str);
 CIMGUI_API const char* igImStrSkipBlank(const char* str);
 CIMGUI_API int igImStrlenW(const ImWchar* str);
-CIMGUI_API const ImWchar* igImStrbolW(const ImWchar* buf_mid_line,const ImWchar* buf_begin);
+CIMGUI_API const char* igImStrbol(const char* buf_mid_line,const char* buf_begin);
 CIMGUI_API char igImToUpper(char c);
 CIMGUI_API bool igImCharIsBlankA(char c);
 CIMGUI_API bool igImCharIsBlankW(unsigned int c);
@@ -4084,9 +4047,8 @@ CIMGUI_API ImGuiInputTextState* ImGuiInputTextState_ImGuiInputTextState(void);
 CIMGUI_API void ImGuiInputTextState_destroy(ImGuiInputTextState* self);
 CIMGUI_API void ImGuiInputTextState_ClearText(ImGuiInputTextState* self);
 CIMGUI_API void ImGuiInputTextState_ClearFreeMemory(ImGuiInputTextState* self);
-CIMGUI_API int ImGuiInputTextState_GetUndoAvailCount(ImGuiInputTextState* self);
-CIMGUI_API int ImGuiInputTextState_GetRedoAvailCount(ImGuiInputTextState* self);
 CIMGUI_API void ImGuiInputTextState_OnKeyPressed(ImGuiInputTextState* self,int key);
+CIMGUI_API void ImGuiInputTextState_OnCharPressed(ImGuiInputTextState* self,unsigned int c);
 CIMGUI_API void ImGuiInputTextState_CursorAnimReset(ImGuiInputTextState* self);
 CIMGUI_API void ImGuiInputTextState_CursorClamp(ImGuiInputTextState* self);
 CIMGUI_API bool ImGuiInputTextState_HasSelection(ImGuiInputTextState* self);

generator/cpp2ffi.lua

@@ -175,6 +175,7 @@ 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)
@@ -1289,6 +1290,14 @@ 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("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)
@@ -1311,6 +1320,8 @@ 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
@@ -1337,6 +1348,7 @@ function M.Parser()
 		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]]))
@@ -1346,7 +1358,6 @@ 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])
@@ -1429,7 +1440,11 @@ function M.Parser()
 			stname,derived = inistruct:match"struct%s*([^%s:]+):(.+)"
 			derived = derived:match"(%S+)$"
 		else
-			stname = inistruct:match"struct%s(%S+)"
+			if itst.re_name == "struct_re" then
+				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
@@ -1439,6 +1454,7 @@ 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")
@@ -1595,6 +1611,9 @@ 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)
@@ -1649,6 +1668,8 @@ function M.Parser()
 						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
@@ -1656,7 +1677,7 @@ function M.Parser()
 					table.insert(outtab,cl_item)
 					print("unnamed enum",cl_item)
 				end
-			elseif it.re_name == "struct_re" or it.re_name == "typedef_st_re" then
+			elseif it.re_name == "struct_re" or it.re_name == "typedef_st_re" or it.re_name == "class_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
@@ -1693,7 +1714,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" then
+					if it.parent.re_name == "struct_re" or it.parent.re_name == "typedef_st_re" or it.parent.re_name == "class_re" then
 						stname = it.parent.name
 					elseif it.parent.re_name == "namespace_re" then
 						namespace = get_parents_nameC(it) --it.parent.name
@@ -1779,7 +1800,8 @@ 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
@@ -1869,7 +1891,7 @@ function M.Parser()
 				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" then
+			elseif it.re_name == "struct_re" or it.re_name == "typedef_st_re" or it.re_name == "class_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
@@ -2416,6 +2438,12 @@ local function func_implementation(FP)
                 table.insert(outtab,"{\n")
                 table.insert(outtab,"    return IM_NEW("..def.stname..")"..def.call_args..";\n")
                 table.insert(outtab,"}\n")
+				if FP.CONSTRUCTORS_GENERATION then
+					table.insert(outtab,"CIMGUI_API void "..def.ov_cimguiname.."_Construct("..def.stname.."* self"..(empty and "" or ","..def.args:sub(2,-2))..")\n")
+					table.insert(outtab,"{\n")
+					table.insert(outtab,"    IM_PLACEMENT_NEW(self)"..def.stname..def.call_args..";\n")
+					table.insert(outtab,"}\n")
+				end
             elseif def.destructor then
                 local args = "("..def.stname.."* self)"
                 local fname = def.stname.."_destroy" 
@@ -2457,7 +2485,8 @@ local function func_header_generate_structs(FP)
 	
 	table_do_sorted(FP.templates,function(ttype,v)
 		table_do_sorted(v,function(ttypein,te)
-			table.insert(outtab,"typedef "..ttype.."<"..ttypein.."> "..ttype.."_"..te..";\n")
+			local ttype2 = ttype:gsub("::","_") --std::string
+			table.insert(outtab,"typedef "..ttype.."<"..ttypein.."> "..ttype2.."_"..te..";\n")
 		end)
 	end)
 	return outtab
@@ -2486,6 +2515,9 @@ 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
+					table.insert(outtab,"CIMGUI_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

generator/generator.bat

@@ -16,6 +16,7 @@ set PATH=%PATH%;C:\anima;C:\mingws\i686-7.2.0-release-posix-dwarf-rt_v5-rev1\min
 ::process  files
 :: arg[1] compiler name gcc, clang or cl
 :: 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"
 :: 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 noimstrv" glfw opengl3 opengl2 sdl2 %*

generator/generator.lua

@@ -9,6 +9,7 @@ local COMPILER = script_args[1]
 local INTERNAL_GENERATION = script_args[2]:match("internal") 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"
@@ -67,6 +68,7 @@ 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
@@ -321,6 +323,7 @@ local function parseImGuiHeader(header,names)
 	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
 	local defines = parser:take_lines(CPRE..header,names,COMPILER)

generator/generator.sh

@@ -14,6 +14,7 @@
 #process  files
 # arg[1] compiler name gcc, clang, or cl
 # 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"
 # arg[3..n] name of implementations to generate and/or CLFLAGS (e.g. -DIMGUI_USER_CONFIG or -DIMGUI_USE_WCHAR32)
 #

generator/output/structs_and_enums.json

@@ -1864,6 +1864,11 @@
         "calc_value": 16,
         "name": "ImGuiItemFlags_AutoClosePopups",
         "value": "1 << 4"
+      },
+      {
+        "calc_value": 32,
+        "name": "ImGuiItemFlags_AllowDuplicateId",
+        "value": "1 << 5"
       }
     ],
     "ImGuiItemStatusFlags_": [
@@ -2820,13 +2825,18 @@
       },
       {
         "calc_value": 8,
-        "name": "ImGuiLocKey_CopyLink",
+        "name": "ImGuiLocKey_OpenLink_s",
         "value": "8"
       },
       {
         "calc_value": 9,
-        "name": "ImGuiLocKey_COUNT",
+        "name": "ImGuiLocKey_CopyLink",
         "value": "9"
+      },
+      {
+        "calc_value": 10,
+        "name": "ImGuiLocKey_COUNT",
+        "value": "10"
       }
     ],
     "ImGuiLogType": [
@@ -4651,195 +4661,191 @@
     "ImGuiSortDirection": "ImU8"
   },
   "locations": {
-    "ImBitVector": "imgui_internal:614",
+    "ImBitVector": "imgui_internal:596",
-    "ImColor": "imgui:2721",
+    "ImColor": "imgui:2730",
-    "ImDrawChannel": "imgui:2959",
+    "ImDrawChannel": "imgui:2968",
-    "ImDrawCmd": "imgui:2918",
+    "ImDrawCmd": "imgui:2927",
-    "ImDrawCmdHeader": "imgui:2951",
+    "ImDrawCmdHeader": "imgui:2960",
-    "ImDrawData": "imgui:3164",
+    "ImDrawData": "imgui:3173",
-    "ImDrawDataBuilder": "imgui_internal:803",
+    "ImDrawDataBuilder": "imgui_internal:785",
-    "ImDrawFlags_": "imgui:2985",
+    "ImDrawFlags_": "imgui:2994",
-    "ImDrawList": "imgui:3023",
+    "ImDrawList": "imgui:3032",
-    "ImDrawListFlags_": "imgui:3005",
+    "ImDrawListFlags_": "imgui:3014",
-    "ImDrawListSharedData": "imgui_internal:779",
+    "ImDrawListSharedData": "imgui_internal:761",
-    "ImDrawListSplitter": "imgui:2968",
+    "ImDrawListSplitter": "imgui:2977",
-    "ImDrawVert": "imgui:2936",
+    "ImDrawVert": "imgui:2945",
-    "ImFont": "imgui:3387",
+    "ImFont": "imgui:3396",
-    "ImFontAtlas": "imgui:3283",
+    "ImFontAtlas": "imgui:3292",
-    "ImFontAtlasCustomRect": "imgui:3245",
+    "ImFontAtlasCustomRect": "imgui:3254",
-    "ImFontAtlasFlags_": "imgui:3258",
+    "ImFontAtlasFlags_": "imgui:3267",
-    "ImFontBuilderIO": "imgui_internal:3672",
+    "ImFontBuilderIO": "imgui_internal:3669",
-    "ImFontConfig": "imgui:3188",
+    "ImFontConfig": "imgui:3197",
-    "ImFontGlyph": "imgui:3218",
+    "ImFontGlyph": "imgui:3227",
-    "ImFontGlyphRangesBuilder": "imgui:3230",
+    "ImFontGlyphRangesBuilder": "imgui:3239",
-    "ImGuiActivateFlags_": "imgui_internal:1536",
+    "ImGuiActivateFlags_": "imgui_internal:1528",
-    "ImGuiAxis": "imgui_internal:1025",
+    "ImGuiAxis": "imgui_internal:1007",
-    "ImGuiBackendFlags_": "imgui:1609",
+    "ImGuiBackendFlags_": "imgui:1610",
-    "ImGuiBoxSelectState": "imgui_internal:1719",
+    "ImGuiBoxSelectState": "imgui_internal:1711",
-    "ImGuiButtonFlagsPrivate_": "imgui_internal:918",
+    "ImGuiButtonFlagsPrivate_": "imgui_internal:900",
-    "ImGuiButtonFlags_": "imgui:1734",
+    "ImGuiButtonFlags_": "imgui:1735",
     "ImGuiChildFlags_": "imgui:1109",
-    "ImGuiCol_": "imgui:1619",
+    "ImGuiCol_": "imgui:1620",
-    "ImGuiColorEditFlags_": "imgui:1745",
+    "ImGuiColorEditFlags_": "imgui:1746",
-    "ImGuiColorMod": "imgui_internal:1039",
+    "ImGuiColorMod": "imgui_internal:1021",
-    "ImGuiComboFlagsPrivate_": "imgui_internal:943",
+    "ImGuiComboFlagsPrivate_": "imgui_internal:925",
-    "ImGuiComboFlags_": "imgui:1251",
+    "ImGuiComboFlags_": "imgui:1252",
-    "ImGuiComboPreviewData": "imgui_internal:1056",
+    "ImGuiComboPreviewData": "imgui_internal:1038",
-    "ImGuiCond_": "imgui:1847",
+    "ImGuiCond_": "imgui:1848",
-    "ImGuiConfigFlags_": "imgui:1592",
+    "ImGuiConfigFlags_": "imgui:1593",
-    "ImGuiContext": "imgui_internal:1998",
+    "ImGuiContext": "imgui_internal:1991",
-    "ImGuiContextHook": "imgui_internal:1983",
+    "ImGuiContextHook": "imgui_internal:1976",
-    "ImGuiContextHookType": "imgui_internal:1981",
+    "ImGuiContextHookType": "imgui_internal:1974",
-    "ImGuiDataTypeInfo": "imgui_internal:829",
+    "ImGuiDataTypeInfo": "imgui_internal:811",
-    "ImGuiDataTypePrivate_": "imgui_internal:838",
+    "ImGuiDataTypePrivate_": "imgui_internal:820",
-    "ImGuiDataTypeStorage": "imgui_internal:823",
+    "ImGuiDataTypeStorage": "imgui_internal:805",
-    "ImGuiDataType_": "imgui:1378",
+    "ImGuiDataType_": "imgui:1379",
-    "ImGuiDataVarInfo": "imgui_internal:815",
+    "ImGuiDataVarInfo": "imgui_internal:797",
-    "ImGuiDebugAllocEntry": "imgui_internal:1918",
+    "ImGuiDebugAllocEntry": "imgui_internal:1911",
-    "ImGuiDebugAllocInfo": "imgui_internal:1925",
+    "ImGuiDebugAllocInfo": "imgui_internal:1918",
-    "ImGuiDebugLogFlags_": "imgui_internal:1900",
+    "ImGuiDebugLogFlags_": "imgui_internal:1893",
-    "ImGuiDir": "imgui:1395",
+    "ImGuiDir": "imgui:1396",
-    "ImGuiDragDropFlags_": "imgui:1350",
+    "ImGuiDragDropFlags_": "imgui:1351",
-    "ImGuiFocusRequestFlags_": "imgui_internal:988",
+    "ImGuiFocusRequestFlags_": "imgui_internal:970",
-    "ImGuiFocusScopeData": "imgui_internal:1616",
+    "ImGuiFocusScopeData": "imgui_internal:1608",
-    "ImGuiFocusedFlags_": "imgui:1298",
+    "ImGuiFocusedFlags_": "imgui:1299",
-    "ImGuiGroupData": "imgui_internal:1069",
+    "ImGuiGroupData": "imgui_internal:1051",
-    "ImGuiHoveredFlagsPrivate_": "imgui_internal:900",
+    "ImGuiHoveredFlagsPrivate_": "imgui_internal:882",
-    "ImGuiHoveredFlags_": "imgui:1312",
+    "ImGuiHoveredFlags_": "imgui:1313",
-    "ImGuiIDStackTool": "imgui_internal:1964",
+    "ImGuiIDStackTool": "imgui_internal:1957",
-    "ImGuiIO": "imgui:2219",
+    "ImGuiIO": "imgui:2220",
-    "ImGuiInputEvent": "imgui_internal:1397",
+    "ImGuiInputEvent": "imgui_internal:1389",
-    "ImGuiInputEventAppFocused": "imgui_internal:1395",
+    "ImGuiInputEventAppFocused": "imgui_internal:1387",
-    "ImGuiInputEventKey": "imgui_internal:1393",
+    "ImGuiInputEventKey": "imgui_internal:1385",
-    "ImGuiInputEventMouseButton": "imgui_internal:1392",
+    "ImGuiInputEventMouseButton": "imgui_internal:1384",
-    "ImGuiInputEventMousePos": "imgui_internal:1390",
+    "ImGuiInputEventMousePos": "imgui_internal:1382",
-    "ImGuiInputEventMouseWheel": "imgui_internal:1391",
+    "ImGuiInputEventMouseWheel": "imgui_internal:1383",
-    "ImGuiInputEventText": "imgui_internal:1394",
+    "ImGuiInputEventText": "imgui_internal:1386",
-    "ImGuiInputEventType": "imgui_internal:1367",
+    "ImGuiInputEventType": "imgui_internal:1359",
-    "ImGuiInputFlagsPrivate_": "imgui_internal:1463",
+    "ImGuiInputFlagsPrivate_": "imgui_internal:1455",
-    "ImGuiInputFlags_": "imgui:1557",
+    "ImGuiInputFlags_": "imgui:1558",
-    "ImGuiInputSource": "imgui_internal:1379",
+    "ImGuiInputSource": "imgui_internal:1371",
-    "ImGuiInputTextCallbackData": "imgui:2422",
+    "ImGuiInputTextCallbackData": "imgui:2431",
-    "ImGuiInputTextDeactivatedState": "imgui_internal:1105",
+    "ImGuiInputTextDeactivatedState": "imgui_internal:1087",
-    "ImGuiInputTextFlagsPrivate_": "imgui_internal:908",
+    "ImGuiInputTextFlagsPrivate_": "imgui_internal:890",
-    "ImGuiInputTextFlags_": "imgui:1142",
+    "ImGuiInputTextFlags_": "imgui:1143",
-    "ImGuiInputTextState": "imgui_internal:1115",
+    "ImGuiInputTextState": "imgui_internal:1109",
-    "ImGuiItemFlagsPrivate_": "imgui_internal:852",
+    "ImGuiItemFlagsPrivate_": "imgui_internal:834",
     "ImGuiItemFlags_": "imgui:1130",
-    "ImGuiItemStatusFlags_": "imgui_internal:874",
+    "ImGuiItemStatusFlags_": "imgui_internal:856",
-    "ImGuiKey": "imgui:1424",
+    "ImGuiKey": "imgui:1425",
-    "ImGuiKeyData": "imgui:2211",
+    "ImGuiKeyData": "imgui:2212",
-    "ImGuiKeyOwnerData": "imgui_internal:1450",
+    "ImGuiKeyOwnerData": "imgui_internal:1442",
-    "ImGuiKeyRoutingData": "imgui_internal:1424",
+    "ImGuiKeyRoutingData": "imgui_internal:1416",
-    "ImGuiKeyRoutingTable": "imgui_internal:1438",
+    "ImGuiKeyRoutingTable": "imgui_internal:1430",
-    "ImGuiLastItemData": "imgui_internal:1243",
+    "ImGuiLastItemData": "imgui_internal:1235",
-    "ImGuiLayoutType_": "imgui_internal:1009",
+    "ImGuiLayoutType_": "imgui_internal:991",
-    "ImGuiListClipper": "imgui:2629",
+    "ImGuiListClipper": "imgui:2638",
-    "ImGuiListClipperData": "imgui_internal:1520",
+    "ImGuiListClipperData": "imgui_internal:1512",
-    "ImGuiListClipperRange": "imgui_internal:1507",
+    "ImGuiListClipperRange": "imgui_internal:1499",
-    "ImGuiLocEntry": "imgui_internal:1889",
+    "ImGuiLocEntry": "imgui_internal:1882",
-    "ImGuiLocKey": "imgui_internal:1875",
+    "ImGuiLocKey": "imgui_internal:1867",
-    "ImGuiLogType": "imgui_internal:1015",
+    "ImGuiLogType": "imgui_internal:997",
-    "ImGuiMenuColumns": "imgui_internal:1087",
+    "ImGuiMenuColumns": "imgui_internal:1069",
-    "ImGuiMetricsConfig": "imgui_internal:1935",
+    "ImGuiMetricsConfig": "imgui_internal:1928",
-    "ImGuiMouseButton_": "imgui:1807",
+    "ImGuiMouseButton_": "imgui:1808",
-    "ImGuiMouseCursor_": "imgui:1817",
+    "ImGuiMouseCursor_": "imgui:1818",
-    "ImGuiMouseSource": "imgui:1836",
+    "ImGuiMouseSource": "imgui:1837",
-    "ImGuiMultiSelectFlags_": "imgui:2779",
+    "ImGuiMultiSelectFlags_": "imgui:2788",
-    "ImGuiMultiSelectIO": "imgui:2806",
+    "ImGuiMultiSelectIO": "imgui:2815",
-    "ImGuiMultiSelectState": "imgui_internal:1776",
+    "ImGuiMultiSelectState": "imgui_internal:1768",
-    "ImGuiMultiSelectTempData": "imgui_internal:1751",
+    "ImGuiMultiSelectTempData": "imgui_internal:1743",
-    "ImGuiNavHighlightFlags_": "imgui_internal:1561",
+    "ImGuiNavHighlightFlags_": "imgui_internal:1553",
-    "ImGuiNavItemData": "imgui_internal:1599",
+    "ImGuiNavItemData": "imgui_internal:1591",
-    "ImGuiNavLayer": "imgui_internal:1591",
+    "ImGuiNavLayer": "imgui_internal:1583",
-    "ImGuiNavMoveFlags_": "imgui_internal:1569",
+    "ImGuiNavMoveFlags_": "imgui_internal:1561",
-    "ImGuiNextItemData": "imgui_internal:1223",
+    "ImGuiNextItemData": "imgui_internal:1215",
-    "ImGuiNextItemDataFlags_": "imgui_internal:1213",
+    "ImGuiNextItemDataFlags_": "imgui_internal:1205",
-    "ImGuiNextWindowData": "imgui_internal:1189",
+    "ImGuiNextWindowData": "imgui_internal:1181",
-    "ImGuiNextWindowDataFlags_": "imgui_internal:1173",
+    "ImGuiNextWindowDataFlags_": "imgui_internal:1165",
-    "ImGuiOldColumnData": "imgui_internal:1684",
+    "ImGuiOldColumnData": "imgui_internal:1676",
-    "ImGuiOldColumnFlags_": "imgui_internal:1664",
+    "ImGuiOldColumnFlags_": "imgui_internal:1656",
-    "ImGuiOldColumns": "imgui_internal:1694",
+    "ImGuiOldColumns": "imgui_internal:1686",
-    "ImGuiOnceUponAFrame": "imgui:2500",
+    "ImGuiOnceUponAFrame": "imgui:2509",
-    "ImGuiPayload": "imgui:2465",
+    "ImGuiPayload": "imgui:2474",
-    "ImGuiPlatformIO": "imgui:3485",
+    "ImGuiPlatformIO": "imgui:3494",
-    "ImGuiPlatformImeData": "imgui:3516",
+    "ImGuiPlatformImeData": "imgui:3525",
-    "ImGuiPlotType": "imgui_internal:1032",
+    "ImGuiPlotType": "imgui_internal:1014",
-    "ImGuiPopupData": "imgui_internal:1324",
+    "ImGuiPopupData": "imgui_internal:1316",
-    "ImGuiPopupFlags_": "imgui:1216",
+    "ImGuiPopupFlags_": "imgui:1217",
-    "ImGuiPopupPositionPolicy": "imgui_internal:1316",
+    "ImGuiPopupPositionPolicy": "imgui_internal:1308",
-    "ImGuiPtrOrIndex": "imgui_internal:1303",
+    "ImGuiPtrOrIndex": "imgui_internal:1295",
-    "ImGuiScrollFlags_": "imgui_internal:1547",
+    "ImGuiScrollFlags_": "imgui_internal:1539",
-    "ImGuiSelectableFlagsPrivate_": "imgui_internal:956",
+    "ImGuiSelectableFlagsPrivate_": "imgui_internal:938",
-    "ImGuiSelectableFlags_": "imgui:1234",
+    "ImGuiSelectableFlags_": "imgui:1235",
-    "ImGuiSelectionBasicStorage": "imgui:2852",
+    "ImGuiSelectionBasicStorage": "imgui:2861",
-    "ImGuiSelectionExternalStorage": "imgui:2875",
+    "ImGuiSelectionExternalStorage": "imgui:2884",
-    "ImGuiSelectionRequest": "imgui:2826",
+    "ImGuiSelectionRequest": "imgui:2835",
-    "ImGuiSelectionRequestType": "imgui:2818",
+    "ImGuiSelectionRequestType": "imgui:2827",
-    "ImGuiSeparatorFlags_": "imgui_internal:977",
+    "ImGuiSeparatorFlags_": "imgui_internal:959",
-    "ImGuiSettingsHandler": "imgui_internal:1855",
+    "ImGuiSettingsHandler": "imgui_internal:1847",
-    "ImGuiShrinkWidthItem": "imgui_internal:1296",
+    "ImGuiShrinkWidthItem": "imgui_internal:1288",
-    "ImGuiSizeCallbackData": "imgui:2456",
+    "ImGuiSizeCallbackData": "imgui:2465",
-    "ImGuiSliderFlagsPrivate_": "imgui_internal:949",
+    "ImGuiSliderFlagsPrivate_": "imgui_internal:931",
-    "ImGuiSliderFlags_": "imgui:1791",
+    "ImGuiSliderFlags_": "imgui:1792",
-    "ImGuiSortDirection": "imgui:1406",
+    "ImGuiSortDirection": "imgui:1407",
-    "ImGuiStackLevelInfo": "imgui_internal:1952",
+    "ImGuiStackLevelInfo": "imgui_internal:1945",
-    "ImGuiStackSizes": "imgui_internal:1270",
+    "ImGuiStackSizes": "imgui_internal:1262",
-    "ImGuiStorage": "imgui:2572",
+    "ImGuiStorage": "imgui:2581",
-    "ImGuiStoragePair": "imgui:2555",
+    "ImGuiStoragePair": "imgui:2564",
-    "ImGuiStyle": "imgui:2134",
+    "ImGuiStyle": "imgui:2135",
-    "ImGuiStyleMod": "imgui_internal:1046",
+    "ImGuiStyleMod": "imgui_internal:1028",
-    "ImGuiStyleVar_": "imgui:1694",
+    "ImGuiStyleVar_": "imgui:1695",
-    "ImGuiTabBar": "imgui_internal:2768",
+    "ImGuiTabBar": "imgui_internal:2765",
-    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2733",
+    "ImGuiTabBarFlagsPrivate_": "imgui_internal:2730",
-    "ImGuiTabBarFlags_": "imgui:1266",
+    "ImGuiTabBarFlags_": "imgui:1267",
-    "ImGuiTabItem": "imgui_internal:2749",
+    "ImGuiTabItem": "imgui_internal:2746",
-    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2741",
+    "ImGuiTabItemFlagsPrivate_": "imgui_internal:2738",
-    "ImGuiTabItemFlags_": "imgui:1283",
+    "ImGuiTabItemFlags_": "imgui:1284",
-    "ImGuiTable": "imgui_internal:2914",
+    "ImGuiTable": "imgui_internal:2911",
-    "ImGuiTableBgTarget_": "imgui:1988",
+    "ImGuiTableBgTarget_": "imgui:1989",
-    "ImGuiTableCellData": "imgui_internal:2882",
+    "ImGuiTableCellData": "imgui_internal:2879",
-    "ImGuiTableColumn": "imgui_internal:2822",
+    "ImGuiTableColumn": "imgui_internal:2819",
-    "ImGuiTableColumnFlags_": "imgui:1935",
+    "ImGuiTableColumnFlags_": "imgui:1936",
-    "ImGuiTableColumnSettings": "imgui_internal:3061",
+    "ImGuiTableColumnSettings": "imgui_internal:3058",
-    "ImGuiTableColumnSortSpecs": "imgui:2010",
+    "ImGuiTableColumnSortSpecs": "imgui:2011",
-    "ImGuiTableFlags_": "imgui:1882",
+    "ImGuiTableFlags_": "imgui:1883",
-    "ImGuiTableHeaderData": "imgui_internal:2891",
+    "ImGuiTableHeaderData": "imgui_internal:2888",
-    "ImGuiTableInstanceData": "imgui_internal:2901",
+    "ImGuiTableInstanceData": "imgui_internal:2898",
-    "ImGuiTableRowFlags_": "imgui:1973",
+    "ImGuiTableRowFlags_": "imgui:1974",
-    "ImGuiTableSettings": "imgui_internal:3085",
+    "ImGuiTableSettings": "imgui_internal:3082",
-    "ImGuiTableSortSpecs": "imgui:2000",
+    "ImGuiTableSortSpecs": "imgui:2001",
-    "ImGuiTableTempData": "imgui_internal:3038",
+    "ImGuiTableTempData": "imgui_internal:3035",
-    "ImGuiTextBuffer": "imgui:2535",
+    "ImGuiTextBuffer": "imgui:2544",
-    "ImGuiTextFilter": "imgui:2508",
+    "ImGuiTextFilter": "imgui:2517",
-    "ImGuiTextFlags_": "imgui_internal:995",
+    "ImGuiTextFlags_": "imgui_internal:977",
-    "ImGuiTextIndex": "imgui_internal:734",
+    "ImGuiTextIndex": "imgui_internal:716",
-    "ImGuiTextRange": "imgui:2518",
+    "ImGuiTextRange": "imgui:2527",
-    "ImGuiTooltipFlags_": "imgui_internal:1001",
+    "ImGuiTooltipFlags_": "imgui_internal:983",
-    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:970",
+    "ImGuiTreeNodeFlagsPrivate_": "imgui_internal:952",
-    "ImGuiTreeNodeFlags_": "imgui:1181",
+    "ImGuiTreeNodeFlags_": "imgui:1182",
-    "ImGuiTreeNodeStackData": "imgui_internal:1262",
+    "ImGuiTreeNodeStackData": "imgui_internal:1254",
-    "ImGuiTypingSelectFlags_": "imgui_internal:1627",
+    "ImGuiTypingSelectFlags_": "imgui_internal:1619",
-    "ImGuiTypingSelectRequest": "imgui_internal:1635",
+    "ImGuiTypingSelectRequest": "imgui_internal:1627",
-    "ImGuiTypingSelectState": "imgui_internal:1646",
+    "ImGuiTypingSelectState": "imgui_internal:1638",
-    "ImGuiViewport": "imgui:3460",
+    "ImGuiViewport": "imgui:3469",
-    "ImGuiViewportFlags_": "imgui:3445",
+    "ImGuiViewportFlags_": "imgui:3454",
-    "ImGuiViewportP": "imgui_internal:1804",
+    "ImGuiViewportP": "imgui_internal:1796",
-    "ImGuiWindow": "imgui_internal:2604",
+    "ImGuiWindow": "imgui_internal:2601",
     "ImGuiWindowFlags_": "imgui:1060",
-    "ImGuiWindowRefreshFlags_": "imgui_internal:1164",
+    "ImGuiWindowRefreshFlags_": "imgui_internal:1156",
-    "ImGuiWindowSettings": "imgui_internal:1841",
+    "ImGuiWindowSettings": "imgui_internal:1833",
-    "ImGuiWindowStackData": "imgui_internal:1288",
+    "ImGuiWindowStackData": "imgui_internal:1280",
-    "ImGuiWindowTempData": "imgui_internal:2554",
+    "ImGuiWindowTempData": "imgui_internal:2551",
-    "ImRect": "imgui_internal:536",
+    "ImRect": "imgui_internal:518",
-    "ImVec1": "imgui_internal:518",
+    "ImVec1": "imgui_internal:500",
     "ImVec2": "imgui:288",
-    "ImVec2ih": "imgui_internal:526",
+    "ImVec2ih": "imgui_internal:508",
-    "ImVec4": "imgui:301",
+    "ImVec4": "imgui:301"
-    "STB_TexteditState": "imstb_textedit:321",
-    "StbTexteditRow": "imstb_textedit:368",
-    "StbUndoRecord": "imstb_textedit:303",
-    "StbUndoState": "imstb_textedit:312"
   },
   "structs": {
     "ImBitVector": [
@@ -5771,6 +5777,10 @@
         "name": "WheelingAxisAvg",
         "type": "ImVec2"
       },
+      {
+        "name": "DebugDrawIdConflicts",
+        "type": "ImGuiID"
+      },
       {
         "name": "DebugHookIdInfo",
         "type": "ImGuiID"
@@ -5783,6 +5793,10 @@
         "name": "HoveredIdPreviousFrame",
         "type": "ImGuiID"
       },
+      {
+        "name": "HoveredIdPreviousFrameItemCount",
+        "type": "int"
+      },
       {
         "name": "HoveredIdTimer",
         "type": "float"
@@ -6608,7 +6622,7 @@
       },
       {
         "name": "LocalizationTable[ImGuiLocKey_COUNT]",
-        "size": 9,
+        "size": 10,
         "type": "const char*"
       },
       {
@@ -7065,6 +7079,10 @@
         "name": "ConfigDebugIsDebuggerPresent",
         "type": "bool"
       },
+      {
+        "name": "ConfigDebugHighlightIdConflicts",
+        "type": "bool"
+      },
       {
         "name": "ConfigDebugBeginReturnValueOnce",
         "type": "bool"
@@ -7469,23 +7487,18 @@
         "name": "Ctx",
         "type": "ImGuiContext*"
       },
+      {
+        "name": "Stb",
+        "type": "ImStbTexteditState*"
+      },
       {
         "name": "ID",
         "type": "ImGuiID"
       },
-      {
-        "name": "CurLenW",
-        "type": "int"
-      },
       {
         "name": "CurLenA",
         "type": "int"
       },
-      {
-        "name": "TextW",
-        "template_type": "ImWchar",
-        "type": "ImVector_ImWchar"
-      },
       {
         "name": "TextA",
         "template_type": "char",
@@ -7497,8 +7510,9 @@
         "type": "ImVector_char"
       },
       {
-        "name": "TextAIsValid",
+        "name": "CallbackTextBackup",
-        "type": "bool"
+        "template_type": "char",
+        "type": "ImVector_char"
       },
       {
         "name": "BufCapacityA",
@@ -7508,10 +7522,6 @@
         "name": "Scroll",
         "type": "ImVec2"
       },
-      {
-        "name": "Stb",
-        "type": "STB_TexteditState"
-      },
       {
         "name": "CursorAnim",
         "type": "float"
@@ -10656,136 +10666,6 @@
         "name": "w",
         "type": "float"
       }
-    ],
-    "STB_TexteditState": [
-      {
-        "name": "cursor",
-        "type": "int"
-      },
-      {
-        "name": "select_start",
-        "type": "int"
-      },
-      {
-        "name": "select_end",
-        "type": "int"
-      },
-      {
-        "name": "insert_mode",
-        "type": "unsigned char"
-      },
-      {
-        "name": "row_count_per_page",
-        "type": "int"
-      },
-      {
-        "name": "cursor_at_end_of_line",
-        "type": "unsigned char"
-      },
-      {
-        "name": "initialized",
-        "type": "unsigned char"
-      },
-      {
-        "name": "has_preferred_x",
-        "type": "unsigned char"
-      },
-      {
-        "name": "single_line",
-        "type": "unsigned char"
-      },
-      {
-        "name": "padding1",
-        "type": "unsigned char"
-      },
-      {
-        "name": "padding2",
-        "type": "unsigned char"
-      },
-      {
-        "name": "padding3",
-        "type": "unsigned char"
-      },
-      {
-        "name": "preferred_x",
-        "type": "float"
-      },
-      {
-        "name": "undostate",
-        "type": "StbUndoState"
-      }
-    ],
-    "StbTexteditRow": [
-      {
-        "name": "x0",
-        "type": "float"
-      },
-      {
-        "name": "x1",
-        "type": "float"
-      },
-      {
-        "name": "baseline_y_delta",
-        "type": "float"
-      },
-      {
-        "name": "ymin",
-        "type": "float"
-      },
-      {
-        "name": "ymax",
-        "type": "float"
-      },
-      {
-        "name": "num_chars",
-        "type": "int"
-      }
-    ],
-    "StbUndoRecord": [
-      {
-        "name": "where",
-        "type": "int"
-      },
-      {
-        "name": "insert_length",
-        "type": "int"
-      },
-      {
-        "name": "delete_length",
-        "type": "int"
-      },
-      {
-        "name": "char_storage",
-        "type": "int"
-      }
-    ],
-    "StbUndoState": [
-      {
-        "name": "undo_rec[99]",
-        "size": 99,
-        "type": "StbUndoRecord"
-      },
-      {
-        "name": "undo_char[999]",
-        "size": 999,
-        "type": "ImWchar"
-      },
-      {
-        "name": "undo_point",
-        "type": "short"
-      },
-      {
-        "name": "redo_point",
-        "type": "short"
-      },
-      {
-        "name": "undo_char_point",
-        "type": "int"
-      },
-      {
-        "name": "redo_char_point",
-        "type": "int"
-      }
     ]
   },
   "templated_structs": {

generator/output/typedefs_dict.json

@@ -178,6 +178,7 @@
   "ImS32": "signed int",
   "ImS64": "signed long long",
   "ImS8": "signed char",
+  "ImStbTexteditState": "ImStb::STB_TexteditState",
   "ImTextureID": "void*",
   "ImU16": "unsigned short",
   "ImU32": "unsigned int",
@@ -191,9 +192,6 @@
   "ImWchar16": "unsigned short",
   "ImWchar32": "unsigned int",
   "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

@@ -178,6 +178,7 @@ defs["ImS16"] = "signed short"
 defs["ImS32"] = "signed int"
 defs["ImS64"] = "signed long long"
 defs["ImS8"] = "signed char"
+defs["ImStbTexteditState"] = "ImStb::STB_TexteditState"
 defs["ImTextureID"] = "void*"
 defs["ImU16"] = "unsigned short"
 defs["ImU32"] = "unsigned int"
@@ -191,9 +192,6 @@ defs["ImWchar"] = "ImWchar16"
 defs["ImWchar16"] = "unsigned short"
 defs["ImWchar32"] = "unsigned int"
 defs["STB_TexteditState"] = "struct STB_TexteditState"
-defs["StbTexteditRow"] = "struct StbTexteditRow"
-defs["StbUndoRecord"] = "struct StbUndoRecord"
-defs["StbUndoState"] = "struct StbUndoState"
 defs["const_iterator"] = "const value_type*"
 defs["iterator"] = "value_type*"
 defs["value_type"] = "T"