diff --git a/cimgui.cpp b/cimgui.cpp index 5c03828..e2e9ddf 100644 --- a/cimgui.cpp +++ b/cimgui.cpp @@ -1,5 +1,5 @@ //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui -//based on imgui.h file version "1.91.4" 19140 from Dear ImGui https://github.com/ocornut/imgui +//based on imgui.h file version "1.91.5" 19150 from Dear ImGui https://github.com/ocornut/imgui //with imgui_internal.h api //with imgui_freetype.h api //docking branch @@ -2296,7 +2296,7 @@ CIMGUI_API void ImDrawList_AddText_Vec2(ImDrawList* self,const ImVec2 pos,ImU32 { return self->AddText(pos,col,text_begin,text_end); } -CIMGUI_API void ImDrawList_AddText_FontPtr(ImDrawList* self,const ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect) +CIMGUI_API void ImDrawList_AddText_FontPtr(ImDrawList* self,ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect) { return self->AddText(font,font_size,pos,col,text_begin,text_end,wrap_width,cpu_fine_clip_rect); } @@ -3991,6 +3991,10 @@ CIMGUI_API ImGuiTableColumnSettings* ImGuiTableSettings_GetColumnSettings(ImGuiT { return self->GetColumnSettings(); } +CIMGUI_API ImGuiIO* igGetIOEx(ImGuiContext* ctx) +{ + return &ImGui::GetIOEx(ctx); +} CIMGUI_API ImGuiWindow* igGetCurrentWindowRead() { return ImGui::GetCurrentWindowRead(); @@ -4395,9 +4399,9 @@ CIMGUI_API void igEndDisabledOverrideReenable() { return ImGui::EndDisabledOverrideReenable(); } -CIMGUI_API void igLogBegin(ImGuiLogType type,int auto_open_depth) +CIMGUI_API void igLogBegin(ImGuiLogFlags flags,int auto_open_depth) { - return ImGui::LogBegin(type,auto_open_depth); + return ImGui::LogBegin(flags,auto_open_depth); } CIMGUI_API void igLogToBuffer(int auto_open_depth) { diff --git a/cimgui.h b/cimgui.h index ec6d21e..394175a 100644 --- a/cimgui.h +++ b/cimgui.h @@ -1,5 +1,5 @@ //This file is automatically generated by generator.lua from https://github.com/cimgui/cimgui -//based on imgui.h file version "1.91.4" 19140 from Dear ImGui https://github.com/ocornut/imgui +//based on imgui.h file version "1.91.5" 19150 from Dear ImGui https://github.com/ocornut/imgui //with imgui_internal.h api //with imgui_freetype.h api //docking branch @@ -488,6 +488,7 @@ ImGuiSortDirection_Descending=2, }ImGuiSortDirection; typedef enum { ImGuiKey_None=0, +ImGuiKey_NamedKey_BEGIN=512, ImGuiKey_Tab=512, ImGuiKey_LeftArrow=513, ImGuiKey_RightArrow=514, @@ -642,18 +643,14 @@ ImGuiKey_ReservedForModCtrl=662, ImGuiKey_ReservedForModShift=663, ImGuiKey_ReservedForModAlt=664, ImGuiKey_ReservedForModSuper=665, -ImGuiKey_COUNT=666, +ImGuiKey_NamedKey_END=666, ImGuiMod_None=0, ImGuiMod_Ctrl=1 << 12, ImGuiMod_Shift=1 << 13, ImGuiMod_Alt=1 << 14, ImGuiMod_Super=1 << 15, ImGuiMod_Mask_=0xF000, -ImGuiKey_NamedKey_BEGIN=512, -ImGuiKey_NamedKey_END=ImGuiKey_COUNT, ImGuiKey_NamedKey_COUNT=ImGuiKey_NamedKey_END - ImGuiKey_NamedKey_BEGIN, -ImGuiKey_KeysData_SIZE=ImGuiKey_NamedKey_COUNT, -ImGuiKey_KeysData_OFFSET=ImGuiKey_NamedKey_BEGIN, }ImGuiKey; typedef enum { ImGuiInputFlags_None = 0, @@ -1068,6 +1065,7 @@ struct ImGuiIO bool ConfigDragClickToInputText; bool ConfigWindowsResizeFromEdges; bool ConfigWindowsMoveFromTitleBarOnly; + bool ConfigWindowsCopyContentsWithCtrlC; bool ConfigScrollbarScrollByPage; float ConfigMemoryCompactTimer; float MouseDoubleClickTime; @@ -1115,7 +1113,7 @@ struct ImGuiIO bool KeyAlt; bool KeySuper; ImGuiKeyChord KeyMods; - ImGuiKeyData KeysData[ImGuiKey_KeysData_SIZE]; + ImGuiKeyData KeysData[ImGuiKey_NamedKey_COUNT]; bool WantCaptureMouseUnlessPopupClose; ImVec2 MousePosPrev; ImVec2 MouseClickedPos[5]; @@ -1136,8 +1134,6 @@ struct ImGuiIO float PenPressure; bool AppFocusLost; bool AppAcceptingEvents; - ImS8 BackendUsingLegacyKeyArrays; - bool BackendUsingLegacyNavInputArray; ImWchar16 InputQueueSurrogate; ImVector_ImWchar InputQueueCharacters; }; @@ -1448,7 +1444,8 @@ struct ImFontAtlasCustomRect { unsigned short Width, Height; unsigned short X, Y; - unsigned int GlyphID; + unsigned int GlyphID : 31; + unsigned int GlyphColored : 1; float GlyphAdvanceX; ImVec2 GlyphOffset; ImFont* Font; @@ -1663,6 +1660,7 @@ typedef int ImGuiDebugLogFlags; typedef int ImGuiFocusRequestFlags; typedef int ImGuiItemStatusFlags; typedef int ImGuiOldColumnFlags; +typedef int ImGuiLogFlags; typedef int ImGuiNavRenderCursorFlags; typedef int ImGuiNavMoveFlags; typedef int ImGuiNextItemDataFlags; @@ -1850,12 +1848,13 @@ typedef enum { ImGuiLayoutType_Vertical = 1 }ImGuiLayoutType_; typedef enum { - ImGuiLogType_None = 0, - ImGuiLogType_TTY, - ImGuiLogType_File, - ImGuiLogType_Buffer, - ImGuiLogType_Clipboard, -}ImGuiLogType; + ImGuiLogFlags_None = 0, + ImGuiLogFlags_OutputTTY = 1 << 0, + ImGuiLogFlags_OutputFile = 1 << 1, + ImGuiLogFlags_OutputBuffer = 1 << 2, + ImGuiLogFlags_OutputClipboard = 1 << 3, + ImGuiLogFlags_OutputMask_ = ImGuiLogFlags_OutputTTY | ImGuiLogFlags_OutputFile | ImGuiLogFlags_OutputBuffer | ImGuiLogFlags_OutputClipboard, +}ImGuiLogFlags_; typedef enum { ImGuiAxis_None = -1, ImGuiAxis_X = 0, @@ -1924,11 +1923,11 @@ struct ImGuiInputTextState ImGuiContext* Ctx; ImStbTexteditState* Stb; ImGuiID ID; - int CurLenA; + int TextLen; ImVector_char TextA; - ImVector_char InitialTextA; + ImVector_char TextToRevertTo; ImVector_char CallbackTextBackup; - int BufCapacityA; + int BufCapacity; ImVec2 Scroll; float CursorAnim; bool CursorFollow; @@ -2976,7 +2975,8 @@ struct ImGuiContext ImGuiID HookIdNext; const char* LocalizationTable[ImGuiLocKey_COUNT]; bool LogEnabled; - ImGuiLogType LogType; + ImGuiLogFlags LogFlags; + ImGuiWindow* LogWindow; ImFileHandle LogFile; ImGuiTextBuffer LogBuffer; const char* LogNextPrefix; @@ -4142,7 +4142,7 @@ CIMGUI_API void ImDrawList_AddNgonFilled(ImDrawList* self,const ImVec2 center,fl CIMGUI_API void ImDrawList_AddEllipse(ImDrawList* self,const ImVec2 center,const ImVec2 radius,ImU32 col,float rot,int num_segments,float thickness); CIMGUI_API void ImDrawList_AddEllipseFilled(ImDrawList* self,const ImVec2 center,const ImVec2 radius,ImU32 col,float rot,int num_segments); CIMGUI_API void ImDrawList_AddText_Vec2(ImDrawList* self,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end); -CIMGUI_API void ImDrawList_AddText_FontPtr(ImDrawList* self,const ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect); +CIMGUI_API void ImDrawList_AddText_FontPtr(ImDrawList* self,ImFont* font,float font_size,const ImVec2 pos,ImU32 col,const char* text_begin,const char* text_end,float wrap_width,const ImVec4* cpu_fine_clip_rect); CIMGUI_API void ImDrawList_AddBezierCubic(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,ImU32 col,float thickness,int num_segments); CIMGUI_API void ImDrawList_AddBezierQuadratic(ImDrawList* self,const ImVec2 p1,const ImVec2 p2,const ImVec2 p3,ImU32 col,float thickness,int num_segments); CIMGUI_API void ImDrawList_AddPolyline(ImDrawList* self,const ImVec2* points,int num_points,ImU32 col,ImDrawFlags flags,float thickness); @@ -4564,6 +4564,7 @@ CIMGUI_API void ImGuiTableColumnSettings_destroy(ImGuiTableColumnSettings* self) CIMGUI_API ImGuiTableSettings* ImGuiTableSettings_ImGuiTableSettings(void); CIMGUI_API void ImGuiTableSettings_destroy(ImGuiTableSettings* self); CIMGUI_API ImGuiTableColumnSettings* ImGuiTableSettings_GetColumnSettings(ImGuiTableSettings* self); +CIMGUI_API ImGuiIO* igGetIOEx(ImGuiContext* ctx); CIMGUI_API ImGuiWindow* igGetCurrentWindowRead(void); CIMGUI_API ImGuiWindow* igGetCurrentWindow(void); CIMGUI_API ImGuiWindow* igFindWindowByID(ImGuiID id); @@ -4665,7 +4666,7 @@ CIMGUI_API void igShrinkWidths(ImGuiShrinkWidthItem* items,int count,float width CIMGUI_API const ImGuiDataVarInfo* igGetStyleVarInfo(ImGuiStyleVar idx); CIMGUI_API void igBeginDisabledOverrideReenable(void); CIMGUI_API void igEndDisabledOverrideReenable(void); -CIMGUI_API void igLogBegin(ImGuiLogType type,int auto_open_depth); +CIMGUI_API void igLogBegin(ImGuiLogFlags flags,int auto_open_depth); CIMGUI_API void igLogToBuffer(int auto_open_depth); CIMGUI_API void igLogRenderedText(const ImVec2* ref_pos,const char* text,const char* text_end); CIMGUI_API void igLogSetNextTextDecoration(const char* prefix,const char* suffix); diff --git a/generator/generator.sh b/generator/generator.sh index 734cd55..06b8915 100755 --- a/generator/generator.sh +++ b/generator/generator.sh @@ -25,7 +25,7 @@ POSITIONAL_ARGS=() TARGETS="internal noimstrv" -CFLAGS="glfw opengl3 opengl2 sdl2" +CFLAGS="glfw opengl3 opengl2 sdl2 sdl3" help() { cat <