update README.md

Im vector

README.md

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

generator/cimgui_template.cpp

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

generator/cimgui_template.h

@@ -83,7 +83,6 @@ CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,floa
 CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b);
 
 CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create();
-CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* p);
 CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p);
 CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p);
 #endif //CIMGUI_INCLUDED

generator/cpp2ffi.lua

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

generator/generator.bat

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

generator/generator.lua

@@ -602,7 +602,7 @@ local function func_parser()
         and not line:match(functype_re) 
         then
             --if line:match(functype_re) then print("ft",line) end
-            if stname~="ImVector" 
+            if stname~="ImVectorNO" 
             --and stname~="GlyphRangesBuilder" and stname~="CustomRect"  and stname~="TextRange" and stname~="Pair"
             and not line:match("operator") then
             
@@ -993,7 +993,7 @@ local function gen_structs_and_enums_table(cdefs)
             end
             if line=="" or line:match("^{") then
                 break
-            elseif structnames[#structnames] ~="ImVector" then --avoid ImVector
+            elseif structnames[#structnames] ~="ImVectorNO" then --avoid ImVector
                 --local functype_re = "^%s*[%w%s%*]+(%(%*)[%w_]+(%)%([^%(%)]*%))"
                 local functype_re = "^%s*[%w%s%*]+%(%*[%w_]+%)%([^%(%)]*%)"
                 local functype_reex = "^(%s*[%w%s%*]+%(%*)([%w_]+)(%)%([^%(%)]*%))"
@@ -1111,7 +1111,7 @@ local function gen_structs_and_enums(cdefs,templates)
         local structbegin = line:match(struct_re)
         if structbegin then
             structnames[#structnames + 1] = structbegin
-            if #structnames < 2 and structbegin~= "ImVector" then --not inner and not ImVector
+            if #structnames < 2 and structbegin~= "ImVectorNO" then --not inner and not ImVector
                 table.insert(outtab,linecom.."\n")
                 break
             end

generator/generator2.lua

@@ -230,12 +230,14 @@ local function func_header_generate(FP)
 
     table.insert(outtab,"#endif //CIMGUI_DEFINE_ENUMS_AND_STRUCTS\n")
     for _,t in ipairs(FP.funcdefs) do
+
         if t.cimguiname then
         local cimf = FP.defsT[t.cimguiname]
         local def = cimf[t.signature]
         assert(def,t.signature..t.cimguiname)
         local manual = FP.get_manuals(def)
-        if not manual then
+        if not manual and not def.templated then
+
             local addcoment = def.comment or ""
             local empty = def.args:match("^%(%)") --no args
             if def.constructor then
@@ -244,6 +246,7 @@ local function func_header_generate(FP)
             elseif def.destructor then
                 table.insert(outtab,"CIMGUI_API void "..def.ov_cimguiname..def.args..";"..addcoment.."\n")
             else --not constructor
+
                 if def.stname == "" then --ImGui namespace or top level
                     table.insert(outtab,"CIMGUI_API "..def.ret.." ".. def.ov_cimguiname ..(empty and "(void)" or def.args)..";"..addcoment.."\n")
                 else
@@ -260,6 +263,8 @@ local function func_header_generate(FP)
     cfuncsstr = cfuncsstr:gsub("\n+","\n") --several empty lines to one empty line
     return cfuncsstr
 end
+
+
 local function ImGui_f_implementation(outtab,def)
     local ptret = def.retref and "&" or ""
     table.insert(outtab,"CIMGUI_API".." "..def.ret.." "..def.ov_cimguiname..def.args.."\n")
@@ -334,7 +339,7 @@ local function func_implementation(FP)
         local def = cimf[t.signature]
         assert(def)
         local manual = FP.get_manuals(def)
-        if not manual then 
+        if not manual and not def.templated then 
             if def.constructor then
                 assert(def.stname ~= "","constructor without struct")
                 local empty = def.args:match("^%(%)") --no args
@@ -439,10 +444,33 @@ local function generate_templates(code,templates)
 end
 --generate cimgui.cpp cimgui.h 
 local function cimgui_generation(parser)
+	cpp2ffi.prtable(parser.templates)
+	cpp2ffi.prtable(parser.typenames)
+	-- clean ImVector:contains() for not applicable types
+	local clean_f = {}
+	for k,v in pairs(parser.defsT) do
+		if k:match"ImVector" and k:match"contains" then
+			--cpp2ffi.prtable(k,v)
+			local stname = v[1].stname
+			if not(stname:match"float" or stname:match"int" or stname:match"char") then
+				parser.defsT[k] = nil
+				--delete also from funcdefs
+				for i,t in ipairs(parser.funcdefs) do
+					if t.cimguiname == k then
+						table.remove(parser.funcdefs, i)
+						break
+					end
+				end
+			end
+		end
+	end
 	
+	--------------------------------------------------
     local hstrfile = read_data"./cimgui_template.h"
 
 	local outpre,outpost = parser:gen_structs_and_enums()
+	--parser.templates get completely defined here
+	--cpp2ffi.prtable(parser.templates)
 	
 	local outtab = {}
     generate_templates(outtab,parser.templates)
@@ -516,7 +544,7 @@ end
 pipe:close()
 
 parser1:do_parse()
-
+--table.sort(parser1.funcdefs, function(a,b) return a.cimguiname < b.cimguiname end)
 --parser1:dump_alltypes()
 --parser1:printItems()
 
@@ -530,6 +558,10 @@ save_data("./output/definitions.lua",serializeTableF(parser1.defsT))
 
 ----------save struct and enums lua table in structs_and_enums.lua for using in bindings
 local structs_and_enums_table = parser1:gen_structs_and_enums_table()
+--correct Pair union member
+structs_and_enums_table["structs"]["Pair"][2]["name"] = ""
+structs_and_enums_table["structs"]["Pair"][2]["type"] = structs_and_enums_table["structs"]["Pair"][2]["type"] .. "}"
+-----------------------
 save_data("./output/structs_and_enums.lua",serializeTableF(structs_and_enums_table))
 save_data("./output/typedefs_dict.lua",serializeTableF(parser1.typedefs_dict))
 

generator/output/cimgui_impl.h

@@ -1,9 +1,10 @@
 typedef struct SDL_Window SDL_Window;
 typedef struct GLFWwindow GLFWwindow;
+
 struct GLFWwindow;
+
 struct SDL_Window;
-typedef union SDL_Event SDL_Event;
+typedef union SDL_Event SDL_Event;CIMGUI_API bool ImGui_ImplGlfw_InitForOpenGL(GLFWwindow* window,bool install_callbacks);
-CIMGUI_API bool ImGui_ImplGlfw_InitForOpenGL(GLFWwindow* window,bool install_callbacks);
 CIMGUI_API bool ImGui_ImplGlfw_InitForVulkan(GLFWwindow* window,bool install_callbacks);
 CIMGUI_API void ImGui_ImplGlfw_Shutdown();
 CIMGUI_API void ImGui_ImplGlfw_NewFrame();

generator/output/impl_definitions.json

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

generator/output/impl_definitions.lua

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

generator/output/overloads.txt

@@ -3,9 +3,15 @@ igCombo	3
 1	bool	igCombo (const char*,int*,const char* const[],int,int)
 2	bool	igComboStr (const char*,int*,const char*,int)
 3	bool	igComboFnPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int)
+TextRange_TextRange	2
+1	nil	TextRange_TextRange ()
+2	nil	TextRange_TextRangeStr (const char*,const char*)
 ImVec4_ImVec4	2
 1	nil	ImVec4_ImVec4 ()
 2	nil	ImVec4_ImVec4Float (float,float,float,float)
+igSetWindowFocus	2
+1	void	igSetWindowFocus ()
+2	void	igSetWindowFocusStr (const char*)
 igValue	4
 1	void	igValueBool (const char*,bool)
 2	void	igValueInt (const char*,int)
@@ -14,6 +20,9 @@ igValue	4
 igPushStyleVar	2
 1	void	igPushStyleVarFloat (ImGuiStyleVar,float)
 2	void	igPushStyleVarVec2 (ImGuiStyleVar,const ImVec2)
+ImVector_end	2
+1	T*	ImVector_end ()
+2	const T*	ImVector_end_const ()const
 igIsRectVisible	2
 1	bool	igIsRectVisible (const ImVec2)
 2	bool	igIsRectVisibleVec2 (const ImVec2,const ImVec2)
@@ -23,9 +32,9 @@ igRadioButton	2
 igSetWindowSize	2
 1	void	igSetWindowSizeVec2 (const ImVec2,ImGuiCond)
 2	void	igSetWindowSizeStr (const char*,const ImVec2,ImGuiCond)
-igSetWindowFocus	2
+ImVector_ImVector	2
-1	void	igSetWindowFocus ()
+1	nil	ImVector_ImVector ()
-2	void	igSetWindowFocusStr (const char*)
+2	nil	ImVector_ImVectorVector (const ImVector)
 igSetWindowCollapsed	2
 1	void	igSetWindowCollapsedBool (bool,ImGuiCond)
 2	void	igSetWindowCollapsedStr (const char*,bool,ImGuiCond)
@@ -35,52 +44,64 @@ igPlotLines	2
 ImVec2_ImVec2	2
 1	nil	ImVec2_ImVec2 ()
 2	nil	ImVec2_ImVec2Float (float,float)
+ImVector_back	2
+1	T*	ImVector_back ()
+2	const T*	ImVector_back_const ()const
 igPlotHistogram	2
 1	void	igPlotHistogramFloatPtr (const char*,const float*,int,int,const char*,float,float,ImVec2,int)
 2	void	igPlotHistogramFnPtr (const char*,float(*)(void*,int),void*,int,int,const char*,float,float,ImVec2)
 igTreeNodeExV	2
 1	bool	igTreeNodeExVStr (const char*,ImGuiTreeNodeFlags,const char*,va_list)
 2	bool	igTreeNodeExVPtr (const void*,ImGuiTreeNodeFlags,const char*,va_list)
-igPushStyleColor	2
-1	void	igPushStyleColorU32 (ImGuiCol,ImU32)
-2	void	igPushStyleColor (ImGuiCol,const ImVec4)
 igGetID	3
 1	ImGuiID	igGetIDStr (const char*)
 2	ImGuiID	igGetIDRange (const char*,const char*)
 3	ImGuiID	igGetIDPtr (const void*)
-TextRange_TextRange	2
-1	nil	TextRange_TextRange ()
-2	nil	TextRange_TextRangeStr (const char*,const char*)
-igListBoxHeader	2
-1	bool	igListBoxHeaderVec2 (const char*,const ImVec2)
-2	bool	igListBoxHeaderInt (const char*,int,int)
-igBeginChild	2
-1	bool	igBeginChild (const char*,const ImVec2,bool,ImGuiWindowFlags)
-2	bool	igBeginChildID (ImGuiID,const ImVec2,bool,ImGuiWindowFlags)
-igTreePush	2
-1	void	igTreePushStr (const char*)
-2	void	igTreePushPtr (const void*)
 ImDrawList_AddText	2
 1	void	ImDrawList_AddText (const ImVec2,ImU32,const char*,const char*)
 2	void	ImDrawList_AddTextFontPtr (const ImFont*,float,const ImVec2,ImU32,const char*,const char*,float,const ImVec4*)
+ImVector_begin	2
+1	T*	ImVector_begin ()
+2	const T*	ImVector_begin_const ()const
+igBeginChild	2
+1	bool	igBeginChild (const char*,const ImVec2,bool,ImGuiWindowFlags)
+2	bool	igBeginChildID (ImGuiID,const ImVec2,bool,ImGuiWindowFlags)
+igPushStyleColor	2
+1	void	igPushStyleColorU32 (ImGuiCol,ImU32)
+2	void	igPushStyleColor (ImGuiCol,const ImVec4)
 igSelectable	2
 1	bool	igSelectable (const char*,bool,ImGuiSelectableFlags,const ImVec2)
 2	bool	igSelectableBoolPtr (const char*,bool*,ImGuiSelectableFlags,const ImVec2)
 igListBox	2
 1	bool	igListBoxStr_arr (const char*,int*,const char* const[],int,int)
 2	bool	igListBoxFnPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int)
+Pair_Pair	3
+1	nil	Pair_PairInt (ImGuiID,int)
+2	nil	Pair_PairFloat (ImGuiID,float)
+3	nil	Pair_PairPtr (ImGuiID,void*)
 igPushID	4
 1	void	igPushIDStr (const char*)
 2	void	igPushIDRange (const char*,const char*)
 3	void	igPushIDPtr (const void*)
 4	void	igPushIDInt (int)
-Pair_Pair	3
-1	nil	Pair_PairInt (ImGuiID,int)
-2	nil	Pair_PairFloat (ImGuiID,float)
-3	nil	Pair_PairPtr (ImGuiID,void*)
 igSetWindowPos	2
 1	void	igSetWindowPosVec2 (const ImVec2,ImGuiCond)
 2	void	igSetWindowPosStr (const char*,const ImVec2,ImGuiCond)
+igListBoxHeader	2
+1	bool	igListBoxHeaderVec2 (const char*,const ImVec2)
+2	bool	igListBoxHeaderInt (const char*,int,int)
+ImVector_erase	2
+1	T*	ImVector_erase (const T*)
+2	T*	ImVector_eraseTPtr (const T*,const T*)
+ImVector_resize	2
+1	void	ImVector_resize (int)
+2	void	ImVector_resizeT (int,const T)
+ImVector_front	2
+1	T*	ImVector_front ()
+2	const T*	ImVector_front_const ()const
+igTreePush	2
+1	void	igTreePushStr (const char*)
+2	void	igTreePushPtr (const void*)
 ImColor_ImColor	5
 1	nil	ImColor_ImColor ()
 2	nil	ImColor_ImColorInt (int,int,int,int)
@@ -108,4 +129,4 @@ igTreeNode	3
 igTreeNodeV	2
 1	bool	igTreeNodeVStr (const char*,const char*,va_list)
 2	bool	igTreeNodeVPtr (const void*,const char*,va_list)
-77 overloaded
+91 overloaded

generator/output/structs_and_enums.json

@@ -271,58 +271,83 @@
       },
       {
         "calc_value": 33,
-        "name": "ImGuiCol_PlotLines",
+        "name": "ImGuiCol_Tab",
         "value": 33
       },
       {
         "calc_value": 34,
-        "name": "ImGuiCol_PlotLinesHovered",
+        "name": "ImGuiCol_TabHovered",
         "value": 34
       },
       {
         "calc_value": 35,
-        "name": "ImGuiCol_PlotHistogram",
+        "name": "ImGuiCol_TabActive",
         "value": 35
       },
       {
         "calc_value": 36,
-        "name": "ImGuiCol_PlotHistogramHovered",
+        "name": "ImGuiCol_TabUnfocused",
         "value": 36
       },
       {
         "calc_value": 37,
-        "name": "ImGuiCol_TextSelectedBg",
+        "name": "ImGuiCol_TabUnfocusedActive",
         "value": 37
       },
       {
         "calc_value": 38,
-        "name": "ImGuiCol_DragDropTarget",
+        "name": "ImGuiCol_PlotLines",
         "value": 38
       },
       {
         "calc_value": 39,
-        "name": "ImGuiCol_NavHighlight",
+        "name": "ImGuiCol_PlotLinesHovered",
         "value": 39
       },
       {
         "calc_value": 40,
-        "name": "ImGuiCol_NavWindowingHighlight",
+        "name": "ImGuiCol_PlotHistogram",
         "value": 40
       },
       {
         "calc_value": 41,
-        "name": "ImGuiCol_NavWindowingDimBg",
+        "name": "ImGuiCol_PlotHistogramHovered",
         "value": 41
       },
       {
         "calc_value": 42,
-        "name": "ImGuiCol_ModalWindowDimBg",
+        "name": "ImGuiCol_TextSelectedBg",
         "value": 42
       },
       {
         "calc_value": 43,
-        "name": "ImGuiCol_COUNT",
+        "name": "ImGuiCol_DragDropTarget",
         "value": 43
+      },
+      {
+        "calc_value": 44,
+        "name": "ImGuiCol_NavHighlight",
+        "value": 44
+      },
+      {
+        "calc_value": 45,
+        "name": "ImGuiCol_NavWindowingHighlight",
+        "value": 45
+      },
+      {
+        "calc_value": 46,
+        "name": "ImGuiCol_NavWindowingDimBg",
+        "value": 46
+      },
+      {
+        "calc_value": 47,
+        "name": "ImGuiCol_ModalWindowDimBg",
+        "value": 47
+      },
+      {
+        "calc_value": 48,
+        "name": "ImGuiCol_COUNT",
+        "value": 48
       }
     ],
     "ImGuiColorEditFlags_": [
@@ -1291,13 +1316,107 @@
       },
       {
         "calc_value": 20,
-        "name": "ImGuiStyleVar_ButtonTextAlign",
+        "name": "ImGuiStyleVar_TabRounding",
         "value": 20
       },
       {
         "calc_value": 21,
-        "name": "ImGuiStyleVar_COUNT",
+        "name": "ImGuiStyleVar_ButtonTextAlign",
         "value": 21
+      },
+      {
+        "calc_value": 22,
+        "name": "ImGuiStyleVar_SelectableTextAlign",
+        "value": 22
+      },
+      {
+        "calc_value": 23,
+        "name": "ImGuiStyleVar_COUNT",
+        "value": 23
+      }
+    ],
+    "ImGuiTabBarFlags_": [
+      {
+        "calc_value": 0,
+        "name": "ImGuiTabBarFlags_None",
+        "value": "0"
+      },
+      {
+        "calc_value": 1,
+        "name": "ImGuiTabBarFlags_Reorderable",
+        "value": "1 << 0"
+      },
+      {
+        "calc_value": 2,
+        "name": "ImGuiTabBarFlags_AutoSelectNewTabs",
+        "value": "1 << 1"
+      },
+      {
+        "calc_value": 4,
+        "name": "ImGuiTabBarFlags_TabListPopupButton",
+        "value": "1 << 2"
+      },
+      {
+        "calc_value": 8,
+        "name": "ImGuiTabBarFlags_NoCloseWithMiddleMouseButton",
+        "value": "1 << 3"
+      },
+      {
+        "calc_value": 16,
+        "name": "ImGuiTabBarFlags_NoTabListScrollingButtons",
+        "value": "1 << 4"
+      },
+      {
+        "calc_value": 32,
+        "name": "ImGuiTabBarFlags_NoTooltip",
+        "value": "1 << 5"
+      },
+      {
+        "calc_value": 64,
+        "name": "ImGuiTabBarFlags_FittingPolicyResizeDown",
+        "value": "1 << 6"
+      },
+      {
+        "calc_value": 128,
+        "name": "ImGuiTabBarFlags_FittingPolicyScroll",
+        "value": "1 << 7"
+      },
+      {
+        "calc_value": 192,
+        "name": "ImGuiTabBarFlags_FittingPolicyMask_",
+        "value": "ImGuiTabBarFlags_FittingPolicyResizeDown | ImGuiTabBarFlags_FittingPolicyScroll"
+      },
+      {
+        "calc_value": 64,
+        "name": "ImGuiTabBarFlags_FittingPolicyDefault_",
+        "value": "ImGuiTabBarFlags_FittingPolicyResizeDown"
+      }
+    ],
+    "ImGuiTabItemFlags_": [
+      {
+        "calc_value": 0,
+        "name": "ImGuiTabItemFlags_None",
+        "value": "0"
+      },
+      {
+        "calc_value": 1,
+        "name": "ImGuiTabItemFlags_UnsavedDocument",
+        "value": "1 << 0"
+      },
+      {
+        "calc_value": 2,
+        "name": "ImGuiTabItemFlags_SetSelected",
+        "value": "1 << 1"
+      },
+      {
+        "calc_value": 4,
+        "name": "ImGuiTabItemFlags_NoCloseWithMiddleMouseButton",
+        "value": "1 << 2"
+      },
+      {
+        "calc_value": 8,
+        "name": "ImGuiTabItemFlags_NoPushId",
+        "value": "1 << 3"
       }
     ],
     "ImGuiTreeNodeFlags_": [
@@ -1473,6 +1592,11 @@
         "name": "ImGuiWindowFlags_NoNavFocus",
         "value": "1 << 19"
       },
+      {
+        "calc_value": 1048576,
+        "name": "ImGuiWindowFlags_UnsavedDocument",
+        "value": "1 << 20"
+      },
       {
         "calc_value": 786432,
         "name": "ImGuiWindowFlags_NoNav",
@@ -1555,13 +1679,6 @@
         "type": "ImFont*"
       }
     ],
-    "GlyphRangesBuilder": [
-      {
-        "name": "UsedChars",
-        "template_type": "unsigned char",
-        "type": "ImVector_unsigned_char"
-      }
-    ],
     "ImColor": [
       {
         "name": "Value",
@@ -1630,6 +1747,10 @@
       {
         "name": "DisplaySize",
         "type": "ImVec2"
+      },
+      {
+        "name": "FramebufferScale",
+        "type": "ImVec2"
       }
     ],
     "ImDrawList": [
@@ -1716,56 +1837,56 @@
       }
     ],
     "ImFont": [
-      {
-        "name": "FontSize",
-        "type": "float"
-      },
-      {
-        "name": "Scale",
-        "type": "float"
-      },
-      {
-        "name": "DisplayOffset",
-        "type": "ImVec2"
-      },
-      {
-        "name": "Glyphs",
-        "template_type": "ImFontGlyph",
-        "type": "ImVector_ImFontGlyph"
-      },
       {
         "name": "IndexAdvanceX",
         "template_type": "float",
         "type": "ImVector_float"
       },
+      {
+        "name": "FallbackAdvanceX",
+        "type": "float"
+      },
+      {
+        "name": "FontSize",
+        "type": "float"
+      },
       {
         "name": "IndexLookup",
         "template_type": "ImWchar",
         "type": "ImVector_ImWchar"
       },
+      {
+        "name": "Glyphs",
+        "template_type": "ImFontGlyph",
+        "type": "ImVector_ImFontGlyph"
+      },
       {
         "name": "FallbackGlyph",
         "type": "const ImFontGlyph*"
       },
       {
-        "name": "FallbackAdvanceX",
+        "name": "DisplayOffset",
-        "type": "float"
+        "type": "ImVec2"
       },
       {
-        "name": "FallbackChar",
+        "name": "ContainerAtlas",
-        "type": "ImWchar"
+        "type": "ImFontAtlas*"
+      },
+      {
+        "name": "ConfigData",
+        "type": "const ImFontConfig*"
       },
       {
         "name": "ConfigDataCount",
         "type": "short"
       },
       {
-        "name": "ConfigData",
+        "name": "FallbackChar",
-        "type": "ImFontConfig*"
+        "type": "ImWchar"
       },
       {
-        "name": "ContainerAtlas",
+        "name": "Scale",
-        "type": "ImFontAtlas*"
+        "type": "float"
       },
       {
         "name": "Ascent",
@@ -1775,13 +1896,13 @@
         "name": "Descent",
         "type": "float"
       },
-      {
-        "name": "DirtyLookupTables",
-        "type": "bool"
-      },
       {
         "name": "MetricsTotalSurface",
         "type": "int"
+      },
+      {
+        "name": "DirtyLookupTables",
+        "type": "bool"
       }
     ],
     "ImFontAtlas": [
@@ -1967,6 +2088,13 @@
         "type": "float"
       }
     ],
+    "ImFontGlyphRangesBuilder": [
+      {
+        "name": "UsedChars",
+        "template_type": "int",
+        "type": "ImVector_int"
+      }
+    ],
     "ImGuiIO": [
       {
         "name": "ConfigFlags",
@@ -2045,14 +2173,6 @@
         "name": "DisplayFramebufferScale",
         "type": "ImVec2"
       },
-      {
-        "name": "DisplayVisibleMin",
-        "type": "ImVec2"
-      },
-      {
-        "name": "DisplayVisibleMax",
-        "type": "ImVec2"
-      },
       {
         "name": "MouseDrawCursor",
         "type": "bool"
@@ -2066,7 +2186,11 @@
         "type": "bool"
       },
       {
-        "name": "ConfigResizeWindowsFromEdges",
+        "name": "ConfigWindowsResizeFromEdges",
+        "type": "bool"
+      },
+      {
+        "name": "ConfigWindowsMoveFromTitleBarOnly",
         "type": "bool"
       },
       {
@@ -2077,6 +2201,18 @@
         "name": "BackendRendererName",
         "type": "const char*"
       },
+      {
+        "name": "BackendPlatformUserData",
+        "type": "void*"
+      },
+      {
+        "name": "BackendRendererUserData",
+        "type": "void*"
+      },
+      {
+        "name": "BackendLanguageUserData",
+        "type": "void*"
+      },
       {
         "name": "GetClipboardTextFn",
         "type": "const char*(*)(void* user_data)"
@@ -2139,11 +2275,6 @@
         "size": 512,
         "type": "bool"
       },
-      {
-        "name": "InputCharacters[16+1]",
-        "size": 17,
-        "type": "ImWchar"
-      },
       {
         "name": "NavInputs[ImGuiNavInput_COUNT]",
         "size": 21,
@@ -2278,6 +2409,11 @@
         "name": "NavInputsDownDurationPrev[ImGuiNavInput_COUNT]",
         "size": 21,
         "type": "float"
+      },
+      {
+        "name": "InputQueueCharacters",
+        "template_type": "ImWchar",
+        "type": "ImVector_ImWchar"
       }
     ],
     "ImGuiInputTextCallbackData": [
@@ -2511,10 +2647,22 @@
         "name": "GrabRounding",
         "type": "float"
       },
+      {
+        "name": "TabRounding",
+        "type": "float"
+      },
+      {
+        "name": "TabBorderSize",
+        "type": "float"
+      },
       {
         "name": "ButtonTextAlign",
         "type": "ImVec2"
       },
+      {
+        "name": "SelectableTextAlign",
+        "type": "ImVec2"
+      },
       {
         "name": "DisplayWindowPadding",
         "type": "ImVec2"
@@ -2541,7 +2689,7 @@
       },
       {
         "name": "Colors[ImGuiCol_COUNT]",
-        "size": 43,
+        "size": 48,
         "type": "ImVec4"
       }
     ],
@@ -2596,15 +2744,14 @@
         "type": "float"
       }
     ],
-    "ImVector": [],
     "Pair": [
       {
         "name": "key",
         "type": "ImGuiID"
       },
       {
-        "name": "}",
+        "name": "",
-        "type": "union { int val_i; float val_f; void* val_p;"
+        "type": "union { int val_i; float val_f; void* val_p;}"
       }
     ],
     "TextRange": [

generator/output/structs_and_enums.lua

@@ -215,48 +215,68 @@ defs["enums"]["ImGuiCol_"][33]["name"] = "ImGuiCol_ResizeGripActive"
 defs["enums"]["ImGuiCol_"][33]["value"] = 32
 defs["enums"]["ImGuiCol_"][34] = {}
 defs["enums"]["ImGuiCol_"][34]["calc_value"] = 33
-defs["enums"]["ImGuiCol_"][34]["name"] = "ImGuiCol_PlotLines"
+defs["enums"]["ImGuiCol_"][34]["name"] = "ImGuiCol_Tab"
 defs["enums"]["ImGuiCol_"][34]["value"] = 33
 defs["enums"]["ImGuiCol_"][35] = {}
 defs["enums"]["ImGuiCol_"][35]["calc_value"] = 34
-defs["enums"]["ImGuiCol_"][35]["name"] = "ImGuiCol_PlotLinesHovered"
+defs["enums"]["ImGuiCol_"][35]["name"] = "ImGuiCol_TabHovered"
 defs["enums"]["ImGuiCol_"][35]["value"] = 34
 defs["enums"]["ImGuiCol_"][36] = {}
 defs["enums"]["ImGuiCol_"][36]["calc_value"] = 35
-defs["enums"]["ImGuiCol_"][36]["name"] = "ImGuiCol_PlotHistogram"
+defs["enums"]["ImGuiCol_"][36]["name"] = "ImGuiCol_TabActive"
 defs["enums"]["ImGuiCol_"][36]["value"] = 35
 defs["enums"]["ImGuiCol_"][37] = {}
 defs["enums"]["ImGuiCol_"][37]["calc_value"] = 36
-defs["enums"]["ImGuiCol_"][37]["name"] = "ImGuiCol_PlotHistogramHovered"
+defs["enums"]["ImGuiCol_"][37]["name"] = "ImGuiCol_TabUnfocused"
 defs["enums"]["ImGuiCol_"][37]["value"] = 36
 defs["enums"]["ImGuiCol_"][38] = {}
 defs["enums"]["ImGuiCol_"][38]["calc_value"] = 37
-defs["enums"]["ImGuiCol_"][38]["name"] = "ImGuiCol_TextSelectedBg"
+defs["enums"]["ImGuiCol_"][38]["name"] = "ImGuiCol_TabUnfocusedActive"
 defs["enums"]["ImGuiCol_"][38]["value"] = 37
 defs["enums"]["ImGuiCol_"][39] = {}
 defs["enums"]["ImGuiCol_"][39]["calc_value"] = 38
-defs["enums"]["ImGuiCol_"][39]["name"] = "ImGuiCol_DragDropTarget"
+defs["enums"]["ImGuiCol_"][39]["name"] = "ImGuiCol_PlotLines"
 defs["enums"]["ImGuiCol_"][39]["value"] = 38
 defs["enums"]["ImGuiCol_"][40] = {}
 defs["enums"]["ImGuiCol_"][40]["calc_value"] = 39
-defs["enums"]["ImGuiCol_"][40]["name"] = "ImGuiCol_NavHighlight"
+defs["enums"]["ImGuiCol_"][40]["name"] = "ImGuiCol_PlotLinesHovered"
 defs["enums"]["ImGuiCol_"][40]["value"] = 39
 defs["enums"]["ImGuiCol_"][41] = {}
 defs["enums"]["ImGuiCol_"][41]["calc_value"] = 40
-defs["enums"]["ImGuiCol_"][41]["name"] = "ImGuiCol_NavWindowingHighlight"
+defs["enums"]["ImGuiCol_"][41]["name"] = "ImGuiCol_PlotHistogram"
 defs["enums"]["ImGuiCol_"][41]["value"] = 40
 defs["enums"]["ImGuiCol_"][42] = {}
 defs["enums"]["ImGuiCol_"][42]["calc_value"] = 41
-defs["enums"]["ImGuiCol_"][42]["name"] = "ImGuiCol_NavWindowingDimBg"
+defs["enums"]["ImGuiCol_"][42]["name"] = "ImGuiCol_PlotHistogramHovered"
 defs["enums"]["ImGuiCol_"][42]["value"] = 41
 defs["enums"]["ImGuiCol_"][43] = {}
 defs["enums"]["ImGuiCol_"][43]["calc_value"] = 42
-defs["enums"]["ImGuiCol_"][43]["name"] = "ImGuiCol_ModalWindowDimBg"
+defs["enums"]["ImGuiCol_"][43]["name"] = "ImGuiCol_TextSelectedBg"
 defs["enums"]["ImGuiCol_"][43]["value"] = 42
 defs["enums"]["ImGuiCol_"][44] = {}
 defs["enums"]["ImGuiCol_"][44]["calc_value"] = 43
-defs["enums"]["ImGuiCol_"][44]["name"] = "ImGuiCol_COUNT"
+defs["enums"]["ImGuiCol_"][44]["name"] = "ImGuiCol_DragDropTarget"
 defs["enums"]["ImGuiCol_"][44]["value"] = 43
+defs["enums"]["ImGuiCol_"][45] = {}
+defs["enums"]["ImGuiCol_"][45]["calc_value"] = 44
+defs["enums"]["ImGuiCol_"][45]["name"] = "ImGuiCol_NavHighlight"
+defs["enums"]["ImGuiCol_"][45]["value"] = 44
+defs["enums"]["ImGuiCol_"][46] = {}
+defs["enums"]["ImGuiCol_"][46]["calc_value"] = 45
+defs["enums"]["ImGuiCol_"][46]["name"] = "ImGuiCol_NavWindowingHighlight"
+defs["enums"]["ImGuiCol_"][46]["value"] = 45
+defs["enums"]["ImGuiCol_"][47] = {}
+defs["enums"]["ImGuiCol_"][47]["calc_value"] = 46
+defs["enums"]["ImGuiCol_"][47]["name"] = "ImGuiCol_NavWindowingDimBg"
+defs["enums"]["ImGuiCol_"][47]["value"] = 46
+defs["enums"]["ImGuiCol_"][48] = {}
+defs["enums"]["ImGuiCol_"][48]["calc_value"] = 47
+defs["enums"]["ImGuiCol_"][48]["name"] = "ImGuiCol_ModalWindowDimBg"
+defs["enums"]["ImGuiCol_"][48]["value"] = 47
+defs["enums"]["ImGuiCol_"][49] = {}
+defs["enums"]["ImGuiCol_"][49]["calc_value"] = 48
+defs["enums"]["ImGuiCol_"][49]["name"] = "ImGuiCol_COUNT"
+defs["enums"]["ImGuiCol_"][49]["value"] = 48
 defs["enums"]["ImGuiColorEditFlags_"] = {}
 defs["enums"]["ImGuiColorEditFlags_"][1] = {}
 defs["enums"]["ImGuiColorEditFlags_"][1]["calc_value"] = 0
@@ -1022,12 +1042,86 @@ defs["enums"]["ImGuiStyleVar_"][20]["name"] = "ImGuiStyleVar_GrabRounding"
 defs["enums"]["ImGuiStyleVar_"][20]["value"] = 19
 defs["enums"]["ImGuiStyleVar_"][21] = {}
 defs["enums"]["ImGuiStyleVar_"][21]["calc_value"] = 20
-defs["enums"]["ImGuiStyleVar_"][21]["name"] = "ImGuiStyleVar_ButtonTextAlign"
+defs["enums"]["ImGuiStyleVar_"][21]["name"] = "ImGuiStyleVar_TabRounding"
 defs["enums"]["ImGuiStyleVar_"][21]["value"] = 20
 defs["enums"]["ImGuiStyleVar_"][22] = {}
 defs["enums"]["ImGuiStyleVar_"][22]["calc_value"] = 21
-defs["enums"]["ImGuiStyleVar_"][22]["name"] = "ImGuiStyleVar_COUNT"
+defs["enums"]["ImGuiStyleVar_"][22]["name"] = "ImGuiStyleVar_ButtonTextAlign"
 defs["enums"]["ImGuiStyleVar_"][22]["value"] = 21
+defs["enums"]["ImGuiStyleVar_"][23] = {}
+defs["enums"]["ImGuiStyleVar_"][23]["calc_value"] = 22
+defs["enums"]["ImGuiStyleVar_"][23]["name"] = "ImGuiStyleVar_SelectableTextAlign"
+defs["enums"]["ImGuiStyleVar_"][23]["value"] = 22
+defs["enums"]["ImGuiStyleVar_"][24] = {}
+defs["enums"]["ImGuiStyleVar_"][24]["calc_value"] = 23
+defs["enums"]["ImGuiStyleVar_"][24]["name"] = "ImGuiStyleVar_COUNT"
+defs["enums"]["ImGuiStyleVar_"][24]["value"] = 23
+defs["enums"]["ImGuiTabBarFlags_"] = {}
+defs["enums"]["ImGuiTabBarFlags_"][1] = {}
+defs["enums"]["ImGuiTabBarFlags_"][1]["calc_value"] = 0
+defs["enums"]["ImGuiTabBarFlags_"][1]["name"] = "ImGuiTabBarFlags_None"
+defs["enums"]["ImGuiTabBarFlags_"][1]["value"] = "0"
+defs["enums"]["ImGuiTabBarFlags_"][2] = {}
+defs["enums"]["ImGuiTabBarFlags_"][2]["calc_value"] = 1
+defs["enums"]["ImGuiTabBarFlags_"][2]["name"] = "ImGuiTabBarFlags_Reorderable"
+defs["enums"]["ImGuiTabBarFlags_"][2]["value"] = "1 << 0"
+defs["enums"]["ImGuiTabBarFlags_"][3] = {}
+defs["enums"]["ImGuiTabBarFlags_"][3]["calc_value"] = 2
+defs["enums"]["ImGuiTabBarFlags_"][3]["name"] = "ImGuiTabBarFlags_AutoSelectNewTabs"
+defs["enums"]["ImGuiTabBarFlags_"][3]["value"] = "1 << 1"
+defs["enums"]["ImGuiTabBarFlags_"][4] = {}
+defs["enums"]["ImGuiTabBarFlags_"][4]["calc_value"] = 4
+defs["enums"]["ImGuiTabBarFlags_"][4]["name"] = "ImGuiTabBarFlags_TabListPopupButton"
+defs["enums"]["ImGuiTabBarFlags_"][4]["value"] = "1 << 2"
+defs["enums"]["ImGuiTabBarFlags_"][5] = {}
+defs["enums"]["ImGuiTabBarFlags_"][5]["calc_value"] = 8
+defs["enums"]["ImGuiTabBarFlags_"][5]["name"] = "ImGuiTabBarFlags_NoCloseWithMiddleMouseButton"
+defs["enums"]["ImGuiTabBarFlags_"][5]["value"] = "1 << 3"
+defs["enums"]["ImGuiTabBarFlags_"][6] = {}
+defs["enums"]["ImGuiTabBarFlags_"][6]["calc_value"] = 16
+defs["enums"]["ImGuiTabBarFlags_"][6]["name"] = "ImGuiTabBarFlags_NoTabListScrollingButtons"
+defs["enums"]["ImGuiTabBarFlags_"][6]["value"] = "1 << 4"
+defs["enums"]["ImGuiTabBarFlags_"][7] = {}
+defs["enums"]["ImGuiTabBarFlags_"][7]["calc_value"] = 32
+defs["enums"]["ImGuiTabBarFlags_"][7]["name"] = "ImGuiTabBarFlags_NoTooltip"
+defs["enums"]["ImGuiTabBarFlags_"][7]["value"] = "1 << 5"
+defs["enums"]["ImGuiTabBarFlags_"][8] = {}
+defs["enums"]["ImGuiTabBarFlags_"][8]["calc_value"] = 64
+defs["enums"]["ImGuiTabBarFlags_"][8]["name"] = "ImGuiTabBarFlags_FittingPolicyResizeDown"
+defs["enums"]["ImGuiTabBarFlags_"][8]["value"] = "1 << 6"
+defs["enums"]["ImGuiTabBarFlags_"][9] = {}
+defs["enums"]["ImGuiTabBarFlags_"][9]["calc_value"] = 128
+defs["enums"]["ImGuiTabBarFlags_"][9]["name"] = "ImGuiTabBarFlags_FittingPolicyScroll"
+defs["enums"]["ImGuiTabBarFlags_"][9]["value"] = "1 << 7"
+defs["enums"]["ImGuiTabBarFlags_"][10] = {}
+defs["enums"]["ImGuiTabBarFlags_"][10]["calc_value"] = 192
+defs["enums"]["ImGuiTabBarFlags_"][10]["name"] = "ImGuiTabBarFlags_FittingPolicyMask_"
+defs["enums"]["ImGuiTabBarFlags_"][10]["value"] = "ImGuiTabBarFlags_FittingPolicyResizeDown | ImGuiTabBarFlags_FittingPolicyScroll"
+defs["enums"]["ImGuiTabBarFlags_"][11] = {}
+defs["enums"]["ImGuiTabBarFlags_"][11]["calc_value"] = 64
+defs["enums"]["ImGuiTabBarFlags_"][11]["name"] = "ImGuiTabBarFlags_FittingPolicyDefault_"
+defs["enums"]["ImGuiTabBarFlags_"][11]["value"] = "ImGuiTabBarFlags_FittingPolicyResizeDown"
+defs["enums"]["ImGuiTabItemFlags_"] = {}
+defs["enums"]["ImGuiTabItemFlags_"][1] = {}
+defs["enums"]["ImGuiTabItemFlags_"][1]["calc_value"] = 0
+defs["enums"]["ImGuiTabItemFlags_"][1]["name"] = "ImGuiTabItemFlags_None"
+defs["enums"]["ImGuiTabItemFlags_"][1]["value"] = "0"
+defs["enums"]["ImGuiTabItemFlags_"][2] = {}
+defs["enums"]["ImGuiTabItemFlags_"][2]["calc_value"] = 1
+defs["enums"]["ImGuiTabItemFlags_"][2]["name"] = "ImGuiTabItemFlags_UnsavedDocument"
+defs["enums"]["ImGuiTabItemFlags_"][2]["value"] = "1 << 0"
+defs["enums"]["ImGuiTabItemFlags_"][3] = {}
+defs["enums"]["ImGuiTabItemFlags_"][3]["calc_value"] = 2
+defs["enums"]["ImGuiTabItemFlags_"][3]["name"] = "ImGuiTabItemFlags_SetSelected"
+defs["enums"]["ImGuiTabItemFlags_"][3]["value"] = "1 << 1"
+defs["enums"]["ImGuiTabItemFlags_"][4] = {}
+defs["enums"]["ImGuiTabItemFlags_"][4]["calc_value"] = 4
+defs["enums"]["ImGuiTabItemFlags_"][4]["name"] = "ImGuiTabItemFlags_NoCloseWithMiddleMouseButton"
+defs["enums"]["ImGuiTabItemFlags_"][4]["value"] = "1 << 2"
+defs["enums"]["ImGuiTabItemFlags_"][5] = {}
+defs["enums"]["ImGuiTabItemFlags_"][5]["calc_value"] = 8
+defs["enums"]["ImGuiTabItemFlags_"][5]["name"] = "ImGuiTabItemFlags_NoPushId"
+defs["enums"]["ImGuiTabItemFlags_"][5]["value"] = "1 << 3"
 defs["enums"]["ImGuiTreeNodeFlags_"] = {}
 defs["enums"]["ImGuiTreeNodeFlags_"][1] = {}
 defs["enums"]["ImGuiTreeNodeFlags_"][1]["calc_value"] = 0
@@ -1167,41 +1261,45 @@ defs["enums"]["ImGuiWindowFlags_"][20]["calc_value"] = 524288
 defs["enums"]["ImGuiWindowFlags_"][20]["name"] = "ImGuiWindowFlags_NoNavFocus"
 defs["enums"]["ImGuiWindowFlags_"][20]["value"] = "1 << 19"
 defs["enums"]["ImGuiWindowFlags_"][21] = {}
-defs["enums"]["ImGuiWindowFlags_"][21]["calc_value"] = 786432
+defs["enums"]["ImGuiWindowFlags_"][21]["calc_value"] = 1048576
-defs["enums"]["ImGuiWindowFlags_"][21]["name"] = "ImGuiWindowFlags_NoNav"
+defs["enums"]["ImGuiWindowFlags_"][21]["name"] = "ImGuiWindowFlags_UnsavedDocument"
-defs["enums"]["ImGuiWindowFlags_"][21]["value"] = "ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus"
+defs["enums"]["ImGuiWindowFlags_"][21]["value"] = "1 << 20"
 defs["enums"]["ImGuiWindowFlags_"][22] = {}
-defs["enums"]["ImGuiWindowFlags_"][22]["calc_value"] = 43
+defs["enums"]["ImGuiWindowFlags_"][22]["calc_value"] = 786432
-defs["enums"]["ImGuiWindowFlags_"][22]["name"] = "ImGuiWindowFlags_NoDecoration"
+defs["enums"]["ImGuiWindowFlags_"][22]["name"] = "ImGuiWindowFlags_NoNav"
-defs["enums"]["ImGuiWindowFlags_"][22]["value"] = "ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoCollapse"
+defs["enums"]["ImGuiWindowFlags_"][22]["value"] = "ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus"
 defs["enums"]["ImGuiWindowFlags_"][23] = {}
-defs["enums"]["ImGuiWindowFlags_"][23]["calc_value"] = 786944
+defs["enums"]["ImGuiWindowFlags_"][23]["calc_value"] = 43
-defs["enums"]["ImGuiWindowFlags_"][23]["name"] = "ImGuiWindowFlags_NoInputs"
+defs["enums"]["ImGuiWindowFlags_"][23]["name"] = "ImGuiWindowFlags_NoDecoration"
-defs["enums"]["ImGuiWindowFlags_"][23]["value"] = "ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus"
+defs["enums"]["ImGuiWindowFlags_"][23]["value"] = "ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoCollapse"
 defs["enums"]["ImGuiWindowFlags_"][24] = {}
-defs["enums"]["ImGuiWindowFlags_"][24]["calc_value"] = 8388608
+defs["enums"]["ImGuiWindowFlags_"][24]["calc_value"] = 786944
-defs["enums"]["ImGuiWindowFlags_"][24]["name"] = "ImGuiWindowFlags_NavFlattened"
+defs["enums"]["ImGuiWindowFlags_"][24]["name"] = "ImGuiWindowFlags_NoInputs"
-defs["enums"]["ImGuiWindowFlags_"][24]["value"] = "1 << 23"
+defs["enums"]["ImGuiWindowFlags_"][24]["value"] = "ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoNavInputs | ImGuiWindowFlags_NoNavFocus"
 defs["enums"]["ImGuiWindowFlags_"][25] = {}
-defs["enums"]["ImGuiWindowFlags_"][25]["calc_value"] = 16777216
+defs["enums"]["ImGuiWindowFlags_"][25]["calc_value"] = 8388608
-defs["enums"]["ImGuiWindowFlags_"][25]["name"] = "ImGuiWindowFlags_ChildWindow"
+defs["enums"]["ImGuiWindowFlags_"][25]["name"] = "ImGuiWindowFlags_NavFlattened"
-defs["enums"]["ImGuiWindowFlags_"][25]["value"] = "1 << 24"
+defs["enums"]["ImGuiWindowFlags_"][25]["value"] = "1 << 23"
 defs["enums"]["ImGuiWindowFlags_"][26] = {}
-defs["enums"]["ImGuiWindowFlags_"][26]["calc_value"] = 33554432
+defs["enums"]["ImGuiWindowFlags_"][26]["calc_value"] = 16777216
-defs["enums"]["ImGuiWindowFlags_"][26]["name"] = "ImGuiWindowFlags_Tooltip"
+defs["enums"]["ImGuiWindowFlags_"][26]["name"] = "ImGuiWindowFlags_ChildWindow"
-defs["enums"]["ImGuiWindowFlags_"][26]["value"] = "1 << 25"
+defs["enums"]["ImGuiWindowFlags_"][26]["value"] = "1 << 24"
 defs["enums"]["ImGuiWindowFlags_"][27] = {}
-defs["enums"]["ImGuiWindowFlags_"][27]["calc_value"] = 67108864
+defs["enums"]["ImGuiWindowFlags_"][27]["calc_value"] = 33554432
-defs["enums"]["ImGuiWindowFlags_"][27]["name"] = "ImGuiWindowFlags_Popup"
+defs["enums"]["ImGuiWindowFlags_"][27]["name"] = "ImGuiWindowFlags_Tooltip"
-defs["enums"]["ImGuiWindowFlags_"][27]["value"] = "1 << 26"
+defs["enums"]["ImGuiWindowFlags_"][27]["value"] = "1 << 25"
 defs["enums"]["ImGuiWindowFlags_"][28] = {}
-defs["enums"]["ImGuiWindowFlags_"][28]["calc_value"] = 134217728
+defs["enums"]["ImGuiWindowFlags_"][28]["calc_value"] = 67108864
-defs["enums"]["ImGuiWindowFlags_"][28]["name"] = "ImGuiWindowFlags_Modal"
+defs["enums"]["ImGuiWindowFlags_"][28]["name"] = "ImGuiWindowFlags_Popup"
-defs["enums"]["ImGuiWindowFlags_"][28]["value"] = "1 << 27"
+defs["enums"]["ImGuiWindowFlags_"][28]["value"] = "1 << 26"
 defs["enums"]["ImGuiWindowFlags_"][29] = {}
-defs["enums"]["ImGuiWindowFlags_"][29]["calc_value"] = 268435456
+defs["enums"]["ImGuiWindowFlags_"][29]["calc_value"] = 134217728
-defs["enums"]["ImGuiWindowFlags_"][29]["name"] = "ImGuiWindowFlags_ChildMenu"
+defs["enums"]["ImGuiWindowFlags_"][29]["name"] = "ImGuiWindowFlags_Modal"
-defs["enums"]["ImGuiWindowFlags_"][29]["value"] = "1 << 28"
+defs["enums"]["ImGuiWindowFlags_"][29]["value"] = "1 << 27"
+defs["enums"]["ImGuiWindowFlags_"][30] = {}
+defs["enums"]["ImGuiWindowFlags_"][30]["calc_value"] = 268435456
+defs["enums"]["ImGuiWindowFlags_"][30]["name"] = "ImGuiWindowFlags_ChildMenu"
+defs["enums"]["ImGuiWindowFlags_"][30]["value"] = "1 << 28"
 defs["structs"] = {}
 defs["structs"]["CustomRect"] = {}
 defs["structs"]["CustomRect"][1] = {}
@@ -1228,11 +1326,6 @@ defs["structs"]["CustomRect"][7]["type"] = "ImVec2"
 defs["structs"]["CustomRect"][8] = {}
 defs["structs"]["CustomRect"][8]["name"] = "Font"
 defs["structs"]["CustomRect"][8]["type"] = "ImFont*"
-defs["structs"]["GlyphRangesBuilder"] = {}
-defs["structs"]["GlyphRangesBuilder"][1] = {}
-defs["structs"]["GlyphRangesBuilder"][1]["name"] = "UsedChars"
-defs["structs"]["GlyphRangesBuilder"][1]["template_type"] = "unsigned char"
-defs["structs"]["GlyphRangesBuilder"][1]["type"] = "ImVector_unsigned_char"
 defs["structs"]["ImColor"] = {}
 defs["structs"]["ImColor"][1] = {}
 defs["structs"]["ImColor"][1]["name"] = "Value"
@@ -1284,6 +1377,9 @@ defs["structs"]["ImDrawData"][6]["type"] = "ImVec2"
 defs["structs"]["ImDrawData"][7] = {}
 defs["structs"]["ImDrawData"][7]["name"] = "DisplaySize"
 defs["structs"]["ImDrawData"][7]["type"] = "ImVec2"
+defs["structs"]["ImDrawData"][8] = {}
+defs["structs"]["ImDrawData"][8]["name"] = "FramebufferScale"
+defs["structs"]["ImDrawData"][8]["type"] = "ImVec2"
 defs["structs"]["ImDrawList"] = {}
 defs["structs"]["ImDrawList"][1] = {}
 defs["structs"]["ImDrawList"][1]["name"] = "CmdBuffer"
@@ -1349,44 +1445,44 @@ defs["structs"]["ImDrawVert"][3]["name"] = "col"
 defs["structs"]["ImDrawVert"][3]["type"] = "ImU32"
 defs["structs"]["ImFont"] = {}
 defs["structs"]["ImFont"][1] = {}
-defs["structs"]["ImFont"][1]["name"] = "FontSize"
+defs["structs"]["ImFont"][1]["name"] = "IndexAdvanceX"
-defs["structs"]["ImFont"][1]["type"] = "float"
+defs["structs"]["ImFont"][1]["template_type"] = "float"
+defs["structs"]["ImFont"][1]["type"] = "ImVector_float"
 defs["structs"]["ImFont"][2] = {}
-defs["structs"]["ImFont"][2]["name"] = "Scale"
+defs["structs"]["ImFont"][2]["name"] = "FallbackAdvanceX"
 defs["structs"]["ImFont"][2]["type"] = "float"
 defs["structs"]["ImFont"][3] = {}
-defs["structs"]["ImFont"][3]["name"] = "DisplayOffset"
+defs["structs"]["ImFont"][3]["name"] = "FontSize"
-defs["structs"]["ImFont"][3]["type"] = "ImVec2"
+defs["structs"]["ImFont"][3]["type"] = "float"
 defs["structs"]["ImFont"][4] = {}
-defs["structs"]["ImFont"][4]["name"] = "Glyphs"
+defs["structs"]["ImFont"][4]["name"] = "IndexLookup"
-defs["structs"]["ImFont"][4]["template_type"] = "ImFontGlyph"
+defs["structs"]["ImFont"][4]["template_type"] = "ImWchar"
-defs["structs"]["ImFont"][4]["type"] = "ImVector_ImFontGlyph"
+defs["structs"]["ImFont"][4]["type"] = "ImVector_ImWchar"
 defs["structs"]["ImFont"][5] = {}
-defs["structs"]["ImFont"][5]["name"] = "IndexAdvanceX"
+defs["structs"]["ImFont"][5]["name"] = "Glyphs"
-defs["structs"]["ImFont"][5]["template_type"] = "float"
+defs["structs"]["ImFont"][5]["template_type"] = "ImFontGlyph"
-defs["structs"]["ImFont"][5]["type"] = "ImVector_float"
+defs["structs"]["ImFont"][5]["type"] = "ImVector_ImFontGlyph"
 defs["structs"]["ImFont"][6] = {}
-defs["structs"]["ImFont"][6]["name"] = "IndexLookup"
+defs["structs"]["ImFont"][6]["name"] = "FallbackGlyph"
-defs["structs"]["ImFont"][6]["template_type"] = "ImWchar"
+defs["structs"]["ImFont"][6]["type"] = "const ImFontGlyph*"
-defs["structs"]["ImFont"][6]["type"] = "ImVector_ImWchar"
 defs["structs"]["ImFont"][7] = {}
-defs["structs"]["ImFont"][7]["name"] = "FallbackGlyph"
+defs["structs"]["ImFont"][7]["name"] = "DisplayOffset"
-defs["structs"]["ImFont"][7]["type"] = "const ImFontGlyph*"
+defs["structs"]["ImFont"][7]["type"] = "ImVec2"
 defs["structs"]["ImFont"][8] = {}
-defs["structs"]["ImFont"][8]["name"] = "FallbackAdvanceX"
+defs["structs"]["ImFont"][8]["name"] = "ContainerAtlas"
-defs["structs"]["ImFont"][8]["type"] = "float"
+defs["structs"]["ImFont"][8]["type"] = "ImFontAtlas*"
 defs["structs"]["ImFont"][9] = {}
-defs["structs"]["ImFont"][9]["name"] = "FallbackChar"
+defs["structs"]["ImFont"][9]["name"] = "ConfigData"
-defs["structs"]["ImFont"][9]["type"] = "ImWchar"
+defs["structs"]["ImFont"][9]["type"] = "const ImFontConfig*"
 defs["structs"]["ImFont"][10] = {}
 defs["structs"]["ImFont"][10]["name"] = "ConfigDataCount"
 defs["structs"]["ImFont"][10]["type"] = "short"
 defs["structs"]["ImFont"][11] = {}
-defs["structs"]["ImFont"][11]["name"] = "ConfigData"
+defs["structs"]["ImFont"][11]["name"] = "FallbackChar"
-defs["structs"]["ImFont"][11]["type"] = "ImFontConfig*"
+defs["structs"]["ImFont"][11]["type"] = "ImWchar"
 defs["structs"]["ImFont"][12] = {}
-defs["structs"]["ImFont"][12]["name"] = "ContainerAtlas"
+defs["structs"]["ImFont"][12]["name"] = "Scale"
-defs["structs"]["ImFont"][12]["type"] = "ImFontAtlas*"
+defs["structs"]["ImFont"][12]["type"] = "float"
 defs["structs"]["ImFont"][13] = {}
 defs["structs"]["ImFont"][13]["name"] = "Ascent"
 defs["structs"]["ImFont"][13]["type"] = "float"
@@ -1394,11 +1490,11 @@ defs["structs"]["ImFont"][14] = {}
 defs["structs"]["ImFont"][14]["name"] = "Descent"
 defs["structs"]["ImFont"][14]["type"] = "float"
 defs["structs"]["ImFont"][15] = {}
-defs["structs"]["ImFont"][15]["name"] = "DirtyLookupTables"
+defs["structs"]["ImFont"][15]["name"] = "MetricsTotalSurface"
-defs["structs"]["ImFont"][15]["type"] = "bool"
+defs["structs"]["ImFont"][15]["type"] = "int"
 defs["structs"]["ImFont"][16] = {}
-defs["structs"]["ImFont"][16]["name"] = "MetricsTotalSurface"
+defs["structs"]["ImFont"][16]["name"] = "DirtyLookupTables"
-defs["structs"]["ImFont"][16]["type"] = "int"
+defs["structs"]["ImFont"][16]["type"] = "bool"
 defs["structs"]["ImFontAtlas"] = {}
 defs["structs"]["ImFontAtlas"][1] = {}
 defs["structs"]["ImFontAtlas"][1]["name"] = "Locked"
@@ -1536,6 +1632,11 @@ defs["structs"]["ImFontGlyph"][9]["type"] = "float"
 defs["structs"]["ImFontGlyph"][10] = {}
 defs["structs"]["ImFontGlyph"][10]["name"] = "V1"
 defs["structs"]["ImFontGlyph"][10]["type"] = "float"
+defs["structs"]["ImFontGlyphRangesBuilder"] = {}
+defs["structs"]["ImFontGlyphRangesBuilder"][1] = {}
+defs["structs"]["ImFontGlyphRangesBuilder"][1]["name"] = "UsedChars"
+defs["structs"]["ImFontGlyphRangesBuilder"][1]["template_type"] = "int"
+defs["structs"]["ImFontGlyphRangesBuilder"][1]["type"] = "ImVector_int"
 defs["structs"]["ImGuiIO"] = {}
 defs["structs"]["ImGuiIO"][1] = {}
 defs["structs"]["ImGuiIO"][1]["name"] = "ConfigFlags"
@@ -1596,185 +1697,191 @@ defs["structs"]["ImGuiIO"][19] = {}
 defs["structs"]["ImGuiIO"][19]["name"] = "DisplayFramebufferScale"
 defs["structs"]["ImGuiIO"][19]["type"] = "ImVec2"
 defs["structs"]["ImGuiIO"][20] = {}
-defs["structs"]["ImGuiIO"][20]["name"] = "DisplayVisibleMin"
+defs["structs"]["ImGuiIO"][20]["name"] = "MouseDrawCursor"
-defs["structs"]["ImGuiIO"][20]["type"] = "ImVec2"
+defs["structs"]["ImGuiIO"][20]["type"] = "bool"
 defs["structs"]["ImGuiIO"][21] = {}
-defs["structs"]["ImGuiIO"][21]["name"] = "DisplayVisibleMax"
+defs["structs"]["ImGuiIO"][21]["name"] = "ConfigMacOSXBehaviors"
-defs["structs"]["ImGuiIO"][21]["type"] = "ImVec2"
+defs["structs"]["ImGuiIO"][21]["type"] = "bool"
 defs["structs"]["ImGuiIO"][22] = {}
-defs["structs"]["ImGuiIO"][22]["name"] = "MouseDrawCursor"
+defs["structs"]["ImGuiIO"][22]["name"] = "ConfigInputTextCursorBlink"
 defs["structs"]["ImGuiIO"][22]["type"] = "bool"
 defs["structs"]["ImGuiIO"][23] = {}
-defs["structs"]["ImGuiIO"][23]["name"] = "ConfigMacOSXBehaviors"
+defs["structs"]["ImGuiIO"][23]["name"] = "ConfigWindowsResizeFromEdges"
 defs["structs"]["ImGuiIO"][23]["type"] = "bool"
 defs["structs"]["ImGuiIO"][24] = {}
-defs["structs"]["ImGuiIO"][24]["name"] = "ConfigInputTextCursorBlink"
+defs["structs"]["ImGuiIO"][24]["name"] = "ConfigWindowsMoveFromTitleBarOnly"
 defs["structs"]["ImGuiIO"][24]["type"] = "bool"
 defs["structs"]["ImGuiIO"][25] = {}
-defs["structs"]["ImGuiIO"][25]["name"] = "ConfigResizeWindowsFromEdges"
+defs["structs"]["ImGuiIO"][25]["name"] = "BackendPlatformName"
-defs["structs"]["ImGuiIO"][25]["type"] = "bool"
+defs["structs"]["ImGuiIO"][25]["type"] = "const char*"
 defs["structs"]["ImGuiIO"][26] = {}
-defs["structs"]["ImGuiIO"][26]["name"] = "BackendPlatformName"
+defs["structs"]["ImGuiIO"][26]["name"] = "BackendRendererName"
 defs["structs"]["ImGuiIO"][26]["type"] = "const char*"
 defs["structs"]["ImGuiIO"][27] = {}
-defs["structs"]["ImGuiIO"][27]["name"] = "BackendRendererName"
+defs["structs"]["ImGuiIO"][27]["name"] = "BackendPlatformUserData"
-defs["structs"]["ImGuiIO"][27]["type"] = "const char*"
+defs["structs"]["ImGuiIO"][27]["type"] = "void*"
 defs["structs"]["ImGuiIO"][28] = {}
-defs["structs"]["ImGuiIO"][28]["name"] = "GetClipboardTextFn"
+defs["structs"]["ImGuiIO"][28]["name"] = "BackendRendererUserData"
-defs["structs"]["ImGuiIO"][28]["type"] = "const char*(*)(void* user_data)"
+defs["structs"]["ImGuiIO"][28]["type"] = "void*"
 defs["structs"]["ImGuiIO"][29] = {}
-defs["structs"]["ImGuiIO"][29]["name"] = "SetClipboardTextFn"
+defs["structs"]["ImGuiIO"][29]["name"] = "BackendLanguageUserData"
-defs["structs"]["ImGuiIO"][29]["type"] = "void(*)(void* user_data,const char* text)"
+defs["structs"]["ImGuiIO"][29]["type"] = "void*"
 defs["structs"]["ImGuiIO"][30] = {}
-defs["structs"]["ImGuiIO"][30]["name"] = "ClipboardUserData"
+defs["structs"]["ImGuiIO"][30]["name"] = "GetClipboardTextFn"
-defs["structs"]["ImGuiIO"][30]["type"] = "void*"
+defs["structs"]["ImGuiIO"][30]["type"] = "const char*(*)(void* user_data)"
 defs["structs"]["ImGuiIO"][31] = {}
-defs["structs"]["ImGuiIO"][31]["name"] = "ImeSetInputScreenPosFn"
+defs["structs"]["ImGuiIO"][31]["name"] = "SetClipboardTextFn"
-defs["structs"]["ImGuiIO"][31]["type"] = "void(*)(int x,int y)"
+defs["structs"]["ImGuiIO"][31]["type"] = "void(*)(void* user_data,const char* text)"
 defs["structs"]["ImGuiIO"][32] = {}
-defs["structs"]["ImGuiIO"][32]["name"] = "ImeWindowHandle"
+defs["structs"]["ImGuiIO"][32]["name"] = "ClipboardUserData"
 defs["structs"]["ImGuiIO"][32]["type"] = "void*"
 defs["structs"]["ImGuiIO"][33] = {}
-defs["structs"]["ImGuiIO"][33]["name"] = "RenderDrawListsFnUnused"
+defs["structs"]["ImGuiIO"][33]["name"] = "ImeSetInputScreenPosFn"
-defs["structs"]["ImGuiIO"][33]["type"] = "void*"
+defs["structs"]["ImGuiIO"][33]["type"] = "void(*)(int x,int y)"
 defs["structs"]["ImGuiIO"][34] = {}
-defs["structs"]["ImGuiIO"][34]["name"] = "MousePos"
+defs["structs"]["ImGuiIO"][34]["name"] = "ImeWindowHandle"
-defs["structs"]["ImGuiIO"][34]["type"] = "ImVec2"
+defs["structs"]["ImGuiIO"][34]["type"] = "void*"
 defs["structs"]["ImGuiIO"][35] = {}
-defs["structs"]["ImGuiIO"][35]["name"] = "MouseDown[5]"
+defs["structs"]["ImGuiIO"][35]["name"] = "RenderDrawListsFnUnused"
-defs["structs"]["ImGuiIO"][35]["size"] = 5
+defs["structs"]["ImGuiIO"][35]["type"] = "void*"
-defs["structs"]["ImGuiIO"][35]["type"] = "bool"
 defs["structs"]["ImGuiIO"][36] = {}
-defs["structs"]["ImGuiIO"][36]["name"] = "MouseWheel"
+defs["structs"]["ImGuiIO"][36]["name"] = "MousePos"
-defs["structs"]["ImGuiIO"][36]["type"] = "float"
+defs["structs"]["ImGuiIO"][36]["type"] = "ImVec2"
 defs["structs"]["ImGuiIO"][37] = {}
-defs["structs"]["ImGuiIO"][37]["name"] = "MouseWheelH"
+defs["structs"]["ImGuiIO"][37]["name"] = "MouseDown[5]"
-defs["structs"]["ImGuiIO"][37]["type"] = "float"
+defs["structs"]["ImGuiIO"][37]["size"] = 5
+defs["structs"]["ImGuiIO"][37]["type"] = "bool"
 defs["structs"]["ImGuiIO"][38] = {}
-defs["structs"]["ImGuiIO"][38]["name"] = "KeyCtrl"
+defs["structs"]["ImGuiIO"][38]["name"] = "MouseWheel"
-defs["structs"]["ImGuiIO"][38]["type"] = "bool"
+defs["structs"]["ImGuiIO"][38]["type"] = "float"
 defs["structs"]["ImGuiIO"][39] = {}
-defs["structs"]["ImGuiIO"][39]["name"] = "KeyShift"
+defs["structs"]["ImGuiIO"][39]["name"] = "MouseWheelH"
-defs["structs"]["ImGuiIO"][39]["type"] = "bool"
+defs["structs"]["ImGuiIO"][39]["type"] = "float"
 defs["structs"]["ImGuiIO"][40] = {}
-defs["structs"]["ImGuiIO"][40]["name"] = "KeyAlt"
+defs["structs"]["ImGuiIO"][40]["name"] = "KeyCtrl"
 defs["structs"]["ImGuiIO"][40]["type"] = "bool"
 defs["structs"]["ImGuiIO"][41] = {}
-defs["structs"]["ImGuiIO"][41]["name"] = "KeySuper"
+defs["structs"]["ImGuiIO"][41]["name"] = "KeyShift"
 defs["structs"]["ImGuiIO"][41]["type"] = "bool"
 defs["structs"]["ImGuiIO"][42] = {}
-defs["structs"]["ImGuiIO"][42]["name"] = "KeysDown[512]"
+defs["structs"]["ImGuiIO"][42]["name"] = "KeyAlt"
-defs["structs"]["ImGuiIO"][42]["size"] = 512
 defs["structs"]["ImGuiIO"][42]["type"] = "bool"
 defs["structs"]["ImGuiIO"][43] = {}
-defs["structs"]["ImGuiIO"][43]["name"] = "InputCharacters[16+1]"
+defs["structs"]["ImGuiIO"][43]["name"] = "KeySuper"
-defs["structs"]["ImGuiIO"][43]["size"] = 17
+defs["structs"]["ImGuiIO"][43]["type"] = "bool"
-defs["structs"]["ImGuiIO"][43]["type"] = "ImWchar"
 defs["structs"]["ImGuiIO"][44] = {}
-defs["structs"]["ImGuiIO"][44]["name"] = "NavInputs[ImGuiNavInput_COUNT]"
+defs["structs"]["ImGuiIO"][44]["name"] = "KeysDown[512]"
-defs["structs"]["ImGuiIO"][44]["size"] = 21
+defs["structs"]["ImGuiIO"][44]["size"] = 512
-defs["structs"]["ImGuiIO"][44]["type"] = "float"
+defs["structs"]["ImGuiIO"][44]["type"] = "bool"
 defs["structs"]["ImGuiIO"][45] = {}
-defs["structs"]["ImGuiIO"][45]["name"] = "WantCaptureMouse"
+defs["structs"]["ImGuiIO"][45]["name"] = "NavInputs[ImGuiNavInput_COUNT]"
-defs["structs"]["ImGuiIO"][45]["type"] = "bool"
+defs["structs"]["ImGuiIO"][45]["size"] = 21
+defs["structs"]["ImGuiIO"][45]["type"] = "float"
 defs["structs"]["ImGuiIO"][46] = {}
-defs["structs"]["ImGuiIO"][46]["name"] = "WantCaptureKeyboard"
+defs["structs"]["ImGuiIO"][46]["name"] = "WantCaptureMouse"
 defs["structs"]["ImGuiIO"][46]["type"] = "bool"
 defs["structs"]["ImGuiIO"][47] = {}
-defs["structs"]["ImGuiIO"][47]["name"] = "WantTextInput"
+defs["structs"]["ImGuiIO"][47]["name"] = "WantCaptureKeyboard"
 defs["structs"]["ImGuiIO"][47]["type"] = "bool"
 defs["structs"]["ImGuiIO"][48] = {}
-defs["structs"]["ImGuiIO"][48]["name"] = "WantSetMousePos"
+defs["structs"]["ImGuiIO"][48]["name"] = "WantTextInput"
 defs["structs"]["ImGuiIO"][48]["type"] = "bool"
 defs["structs"]["ImGuiIO"][49] = {}
-defs["structs"]["ImGuiIO"][49]["name"] = "WantSaveIniSettings"
+defs["structs"]["ImGuiIO"][49]["name"] = "WantSetMousePos"
 defs["structs"]["ImGuiIO"][49]["type"] = "bool"
 defs["structs"]["ImGuiIO"][50] = {}
-defs["structs"]["ImGuiIO"][50]["name"] = "NavActive"
+defs["structs"]["ImGuiIO"][50]["name"] = "WantSaveIniSettings"
 defs["structs"]["ImGuiIO"][50]["type"] = "bool"
 defs["structs"]["ImGuiIO"][51] = {}
-defs["structs"]["ImGuiIO"][51]["name"] = "NavVisible"
+defs["structs"]["ImGuiIO"][51]["name"] = "NavActive"
 defs["structs"]["ImGuiIO"][51]["type"] = "bool"
 defs["structs"]["ImGuiIO"][52] = {}
-defs["structs"]["ImGuiIO"][52]["name"] = "Framerate"
+defs["structs"]["ImGuiIO"][52]["name"] = "NavVisible"
-defs["structs"]["ImGuiIO"][52]["type"] = "float"
+defs["structs"]["ImGuiIO"][52]["type"] = "bool"
 defs["structs"]["ImGuiIO"][53] = {}
-defs["structs"]["ImGuiIO"][53]["name"] = "MetricsRenderVertices"
+defs["structs"]["ImGuiIO"][53]["name"] = "Framerate"
-defs["structs"]["ImGuiIO"][53]["type"] = "int"
+defs["structs"]["ImGuiIO"][53]["type"] = "float"
 defs["structs"]["ImGuiIO"][54] = {}
-defs["structs"]["ImGuiIO"][54]["name"] = "MetricsRenderIndices"
+defs["structs"]["ImGuiIO"][54]["name"] = "MetricsRenderVertices"
 defs["structs"]["ImGuiIO"][54]["type"] = "int"
 defs["structs"]["ImGuiIO"][55] = {}
-defs["structs"]["ImGuiIO"][55]["name"] = "MetricsRenderWindows"
+defs["structs"]["ImGuiIO"][55]["name"] = "MetricsRenderIndices"
 defs["structs"]["ImGuiIO"][55]["type"] = "int"
 defs["structs"]["ImGuiIO"][56] = {}
-defs["structs"]["ImGuiIO"][56]["name"] = "MetricsActiveWindows"
+defs["structs"]["ImGuiIO"][56]["name"] = "MetricsRenderWindows"
 defs["structs"]["ImGuiIO"][56]["type"] = "int"
 defs["structs"]["ImGuiIO"][57] = {}
-defs["structs"]["ImGuiIO"][57]["name"] = "MetricsActiveAllocations"
+defs["structs"]["ImGuiIO"][57]["name"] = "MetricsActiveWindows"
 defs["structs"]["ImGuiIO"][57]["type"] = "int"
 defs["structs"]["ImGuiIO"][58] = {}
-defs["structs"]["ImGuiIO"][58]["name"] = "MouseDelta"
+defs["structs"]["ImGuiIO"][58]["name"] = "MetricsActiveAllocations"
-defs["structs"]["ImGuiIO"][58]["type"] = "ImVec2"
+defs["structs"]["ImGuiIO"][58]["type"] = "int"
 defs["structs"]["ImGuiIO"][59] = {}
-defs["structs"]["ImGuiIO"][59]["name"] = "MousePosPrev"
+defs["structs"]["ImGuiIO"][59]["name"] = "MouseDelta"
 defs["structs"]["ImGuiIO"][59]["type"] = "ImVec2"
 defs["structs"]["ImGuiIO"][60] = {}
-defs["structs"]["ImGuiIO"][60]["name"] = "MouseClickedPos[5]"
+defs["structs"]["ImGuiIO"][60]["name"] = "MousePosPrev"
-defs["structs"]["ImGuiIO"][60]["size"] = 5
 defs["structs"]["ImGuiIO"][60]["type"] = "ImVec2"
 defs["structs"]["ImGuiIO"][61] = {}
-defs["structs"]["ImGuiIO"][61]["name"] = "MouseClickedTime[5]"
+defs["structs"]["ImGuiIO"][61]["name"] = "MouseClickedPos[5]"
 defs["structs"]["ImGuiIO"][61]["size"] = 5
-defs["structs"]["ImGuiIO"][61]["type"] = "double"
+defs["structs"]["ImGuiIO"][61]["type"] = "ImVec2"
 defs["structs"]["ImGuiIO"][62] = {}
-defs["structs"]["ImGuiIO"][62]["name"] = "MouseClicked[5]"
+defs["structs"]["ImGuiIO"][62]["name"] = "MouseClickedTime[5]"
 defs["structs"]["ImGuiIO"][62]["size"] = 5
-defs["structs"]["ImGuiIO"][62]["type"] = "bool"
+defs["structs"]["ImGuiIO"][62]["type"] = "double"
 defs["structs"]["ImGuiIO"][63] = {}
-defs["structs"]["ImGuiIO"][63]["name"] = "MouseDoubleClicked[5]"
+defs["structs"]["ImGuiIO"][63]["name"] = "MouseClicked[5]"
 defs["structs"]["ImGuiIO"][63]["size"] = 5
 defs["structs"]["ImGuiIO"][63]["type"] = "bool"
 defs["structs"]["ImGuiIO"][64] = {}
-defs["structs"]["ImGuiIO"][64]["name"] = "MouseReleased[5]"
+defs["structs"]["ImGuiIO"][64]["name"] = "MouseDoubleClicked[5]"
 defs["structs"]["ImGuiIO"][64]["size"] = 5
 defs["structs"]["ImGuiIO"][64]["type"] = "bool"
 defs["structs"]["ImGuiIO"][65] = {}
-defs["structs"]["ImGuiIO"][65]["name"] = "MouseDownOwned[5]"
+defs["structs"]["ImGuiIO"][65]["name"] = "MouseReleased[5]"
 defs["structs"]["ImGuiIO"][65]["size"] = 5
 defs["structs"]["ImGuiIO"][65]["type"] = "bool"
 defs["structs"]["ImGuiIO"][66] = {}
-defs["structs"]["ImGuiIO"][66]["name"] = "MouseDownDuration[5]"
+defs["structs"]["ImGuiIO"][66]["name"] = "MouseDownOwned[5]"
 defs["structs"]["ImGuiIO"][66]["size"] = 5
-defs["structs"]["ImGuiIO"][66]["type"] = "float"
+defs["structs"]["ImGuiIO"][66]["type"] = "bool"
 defs["structs"]["ImGuiIO"][67] = {}
-defs["structs"]["ImGuiIO"][67]["name"] = "MouseDownDurationPrev[5]"
+defs["structs"]["ImGuiIO"][67]["name"] = "MouseDownDuration[5]"
 defs["structs"]["ImGuiIO"][67]["size"] = 5
 defs["structs"]["ImGuiIO"][67]["type"] = "float"
 defs["structs"]["ImGuiIO"][68] = {}
-defs["structs"]["ImGuiIO"][68]["name"] = "MouseDragMaxDistanceAbs[5]"
+defs["structs"]["ImGuiIO"][68]["name"] = "MouseDownDurationPrev[5]"
 defs["structs"]["ImGuiIO"][68]["size"] = 5
-defs["structs"]["ImGuiIO"][68]["type"] = "ImVec2"
+defs["structs"]["ImGuiIO"][68]["type"] = "float"
 defs["structs"]["ImGuiIO"][69] = {}
-defs["structs"]["ImGuiIO"][69]["name"] = "MouseDragMaxDistanceSqr[5]"
+defs["structs"]["ImGuiIO"][69]["name"] = "MouseDragMaxDistanceAbs[5]"
 defs["structs"]["ImGuiIO"][69]["size"] = 5
-defs["structs"]["ImGuiIO"][69]["type"] = "float"
+defs["structs"]["ImGuiIO"][69]["type"] = "ImVec2"
 defs["structs"]["ImGuiIO"][70] = {}
-defs["structs"]["ImGuiIO"][70]["name"] = "KeysDownDuration[512]"
+defs["structs"]["ImGuiIO"][70]["name"] = "MouseDragMaxDistanceSqr[5]"
-defs["structs"]["ImGuiIO"][70]["size"] = 512
+defs["structs"]["ImGuiIO"][70]["size"] = 5
 defs["structs"]["ImGuiIO"][70]["type"] = "float"
 defs["structs"]["ImGuiIO"][71] = {}
-defs["structs"]["ImGuiIO"][71]["name"] = "KeysDownDurationPrev[512]"
+defs["structs"]["ImGuiIO"][71]["name"] = "KeysDownDuration[512]"
 defs["structs"]["ImGuiIO"][71]["size"] = 512
 defs["structs"]["ImGuiIO"][71]["type"] = "float"
 defs["structs"]["ImGuiIO"][72] = {}
-defs["structs"]["ImGuiIO"][72]["name"] = "NavInputsDownDuration[ImGuiNavInput_COUNT]"
+defs["structs"]["ImGuiIO"][72]["name"] = "KeysDownDurationPrev[512]"
-defs["structs"]["ImGuiIO"][72]["size"] = 21
+defs["structs"]["ImGuiIO"][72]["size"] = 512
 defs["structs"]["ImGuiIO"][72]["type"] = "float"
 defs["structs"]["ImGuiIO"][73] = {}
-defs["structs"]["ImGuiIO"][73]["name"] = "NavInputsDownDurationPrev[ImGuiNavInput_COUNT]"
+defs["structs"]["ImGuiIO"][73]["name"] = "NavInputsDownDuration[ImGuiNavInput_COUNT]"
 defs["structs"]["ImGuiIO"][73]["size"] = 21
 defs["structs"]["ImGuiIO"][73]["type"] = "float"
+defs["structs"]["ImGuiIO"][74] = {}
+defs["structs"]["ImGuiIO"][74]["name"] = "NavInputsDownDurationPrev[ImGuiNavInput_COUNT]"
+defs["structs"]["ImGuiIO"][74]["size"] = 21
+defs["structs"]["ImGuiIO"][74]["type"] = "float"
+defs["structs"]["ImGuiIO"][75] = {}
+defs["structs"]["ImGuiIO"][75]["name"] = "InputQueueCharacters"
+defs["structs"]["ImGuiIO"][75]["template_type"] = "ImWchar"
+defs["structs"]["ImGuiIO"][75]["type"] = "ImVector_ImWchar"
 defs["structs"]["ImGuiInputTextCallbackData"] = {}
 defs["structs"]["ImGuiInputTextCallbackData"][1] = {}
 defs["structs"]["ImGuiInputTextCallbackData"][1]["name"] = "EventFlag"
@@ -1947,30 +2054,39 @@ defs["structs"]["ImGuiStyle"][22] = {}
 defs["structs"]["ImGuiStyle"][22]["name"] = "GrabRounding"
 defs["structs"]["ImGuiStyle"][22]["type"] = "float"
 defs["structs"]["ImGuiStyle"][23] = {}
-defs["structs"]["ImGuiStyle"][23]["name"] = "ButtonTextAlign"
+defs["structs"]["ImGuiStyle"][23]["name"] = "TabRounding"
-defs["structs"]["ImGuiStyle"][23]["type"] = "ImVec2"
+defs["structs"]["ImGuiStyle"][23]["type"] = "float"
 defs["structs"]["ImGuiStyle"][24] = {}
-defs["structs"]["ImGuiStyle"][24]["name"] = "DisplayWindowPadding"
+defs["structs"]["ImGuiStyle"][24]["name"] = "TabBorderSize"
-defs["structs"]["ImGuiStyle"][24]["type"] = "ImVec2"
+defs["structs"]["ImGuiStyle"][24]["type"] = "float"
 defs["structs"]["ImGuiStyle"][25] = {}
-defs["structs"]["ImGuiStyle"][25]["name"] = "DisplaySafeAreaPadding"
+defs["structs"]["ImGuiStyle"][25]["name"] = "ButtonTextAlign"
 defs["structs"]["ImGuiStyle"][25]["type"] = "ImVec2"
 defs["structs"]["ImGuiStyle"][26] = {}
-defs["structs"]["ImGuiStyle"][26]["name"] = "MouseCursorScale"
+defs["structs"]["ImGuiStyle"][26]["name"] = "SelectableTextAlign"
-defs["structs"]["ImGuiStyle"][26]["type"] = "float"
+defs["structs"]["ImGuiStyle"][26]["type"] = "ImVec2"
 defs["structs"]["ImGuiStyle"][27] = {}
-defs["structs"]["ImGuiStyle"][27]["name"] = "AntiAliasedLines"
+defs["structs"]["ImGuiStyle"][27]["name"] = "DisplayWindowPadding"
-defs["structs"]["ImGuiStyle"][27]["type"] = "bool"
+defs["structs"]["ImGuiStyle"][27]["type"] = "ImVec2"
 defs["structs"]["ImGuiStyle"][28] = {}
-defs["structs"]["ImGuiStyle"][28]["name"] = "AntiAliasedFill"
+defs["structs"]["ImGuiStyle"][28]["name"] = "DisplaySafeAreaPadding"
-defs["structs"]["ImGuiStyle"][28]["type"] = "bool"
+defs["structs"]["ImGuiStyle"][28]["type"] = "ImVec2"
 defs["structs"]["ImGuiStyle"][29] = {}
-defs["structs"]["ImGuiStyle"][29]["name"] = "CurveTessellationTol"
+defs["structs"]["ImGuiStyle"][29]["name"] = "MouseCursorScale"
 defs["structs"]["ImGuiStyle"][29]["type"] = "float"
 defs["structs"]["ImGuiStyle"][30] = {}
-defs["structs"]["ImGuiStyle"][30]["name"] = "Colors[ImGuiCol_COUNT]"
+defs["structs"]["ImGuiStyle"][30]["name"] = "AntiAliasedLines"
-defs["structs"]["ImGuiStyle"][30]["size"] = 43
+defs["structs"]["ImGuiStyle"][30]["type"] = "bool"
-defs["structs"]["ImGuiStyle"][30]["type"] = "ImVec4"
+defs["structs"]["ImGuiStyle"][31] = {}
+defs["structs"]["ImGuiStyle"][31]["name"] = "AntiAliasedFill"
+defs["structs"]["ImGuiStyle"][31]["type"] = "bool"
+defs["structs"]["ImGuiStyle"][32] = {}
+defs["structs"]["ImGuiStyle"][32]["name"] = "CurveTessellationTol"
+defs["structs"]["ImGuiStyle"][32]["type"] = "float"
+defs["structs"]["ImGuiStyle"][33] = {}
+defs["structs"]["ImGuiStyle"][33]["name"] = "Colors[ImGuiCol_COUNT]"
+defs["structs"]["ImGuiStyle"][33]["size"] = 48
+defs["structs"]["ImGuiStyle"][33]["type"] = "ImVec4"
 defs["structs"]["ImGuiTextBuffer"] = {}
 defs["structs"]["ImGuiTextBuffer"][1] = {}
 defs["structs"]["ImGuiTextBuffer"][1]["name"] = "Buf"
@@ -2008,14 +2124,13 @@ defs["structs"]["ImVec4"][3]["type"] = "float"
 defs["structs"]["ImVec4"][4] = {}
 defs["structs"]["ImVec4"][4]["name"] = "w"
 defs["structs"]["ImVec4"][4]["type"] = "float"
-defs["structs"]["ImVector"] = {}
 defs["structs"]["Pair"] = {}
 defs["structs"]["Pair"][1] = {}
 defs["structs"]["Pair"][1]["name"] = "key"
 defs["structs"]["Pair"][1]["type"] = "ImGuiID"
 defs["structs"]["Pair"][2] = {}
-defs["structs"]["Pair"][2]["name"] = "}"
+defs["structs"]["Pair"][2]["name"] = ""
-defs["structs"]["Pair"][2]["type"] = "union { int val_i; float val_f; void* val_p;"
+defs["structs"]["Pair"][2]["type"] = "union { int val_i; float val_f; void* val_p;}"
 defs["structs"]["TextRange"] = {}
 defs["structs"]["TextRange"][1] = {}
 defs["structs"]["TextRange"][1]["name"] = "b"

generator/output/typedefs_dict.json

@@ -1,6 +1,5 @@
 {
   "CustomRect": "struct CustomRect",
-  "GlyphRangesBuilder": "struct GlyphRangesBuilder",
   "ImColor": "struct ImColor",
   "ImDrawCallback": "void(*)(const ImDrawList* parent_list,const ImDrawCmd* cmd);",
   "ImDrawChannel": "struct ImDrawChannel",
@@ -17,6 +16,7 @@
   "ImFontAtlasFlags": "int",
   "ImFontConfig": "struct ImFontConfig",
   "ImFontGlyph": "struct ImFontGlyph",
+  "ImFontGlyphRangesBuilder": "struct ImFontGlyphRangesBuilder",
   "ImGuiBackendFlags": "int",
   "ImGuiCol": "int",
   "ImGuiColorEditFlags": "int",
@@ -47,6 +47,8 @@
   "ImGuiStorage": "struct ImGuiStorage",
   "ImGuiStyle": "struct ImGuiStyle",
   "ImGuiStyleVar": "int",
+  "ImGuiTabBarFlags": "int",
+  "ImGuiTabItemFlags": "int",
   "ImGuiTextBuffer": "struct ImGuiTextBuffer",
   "ImGuiTextFilter": "struct ImGuiTextFilter",
   "ImGuiTreeNodeFlags": "int",

generator/output/typedefs_dict.lua

@@ -1,6 +1,5 @@
 local defs = {}
 defs["CustomRect"] = "struct CustomRect"
-defs["GlyphRangesBuilder"] = "struct GlyphRangesBuilder"
 defs["ImColor"] = "struct ImColor"
 defs["ImDrawCallback"] = "void(*)(const ImDrawList* parent_list,const ImDrawCmd* cmd);"
 defs["ImDrawChannel"] = "struct ImDrawChannel"
@@ -17,6 +16,7 @@ defs["ImFontAtlas"] = "struct ImFontAtlas"
 defs["ImFontAtlasFlags"] = "int"
 defs["ImFontConfig"] = "struct ImFontConfig"
 defs["ImFontGlyph"] = "struct ImFontGlyph"
+defs["ImFontGlyphRangesBuilder"] = "struct ImFontGlyphRangesBuilder"
 defs["ImGuiBackendFlags"] = "int"
 defs["ImGuiCol"] = "int"
 defs["ImGuiColorEditFlags"] = "int"
@@ -47,6 +47,8 @@ defs["ImGuiSizeCallbackData"] = "struct ImGuiSizeCallbackData"
 defs["ImGuiStorage"] = "struct ImGuiStorage"
 defs["ImGuiStyle"] = "struct ImGuiStyle"
 defs["ImGuiStyleVar"] = "int"
+defs["ImGuiTabBarFlags"] = "int"
+defs["ImGuiTabItemFlags"] = "int"
 defs["ImGuiTextBuffer"] = "struct ImGuiTextBuffer"
 defs["ImGuiTextFilter"] = "struct ImGuiTextFilter"
 defs["ImGuiTreeNodeFlags"] = "int"

testbuildc/build.bat

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

testbuildc/cimguitest.c

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