Merge branch 'docking_inter'

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.3" 19130 from Dear ImGui https://github.com/ocornut/imgui
+//based on imgui.h file version "1.91.4" 19140 from Dear ImGui https://github.com/ocornut/imgui
 //with imgui_internal.h api
 #ifndef CIMGUI_INCLUDED
 #define CIMGUI_INCLUDED
@@ -198,7 +198,7 @@ typedef int ImGuiTableRowFlags;
 typedef int ImGuiTreeNodeFlags;
 typedef int ImGuiViewportFlags;
 typedef int ImGuiWindowFlags;
-typedef void* ImTextureID;
+typedef ImU64 ImTextureID;
 typedef unsigned short ImDrawIdx;
 typedef unsigned int ImWchar32;
 typedef unsigned short ImWchar16;
@@ -634,8 +634,6 @@ typedef enum {
     ImGuiConfigFlags_None = 0,
     ImGuiConfigFlags_NavEnableKeyboard = 1 << 0,
     ImGuiConfigFlags_NavEnableGamepad = 1 << 1,
-    ImGuiConfigFlags_NavEnableSetMousePos = 1 << 2,
-    ImGuiConfigFlags_NavNoCaptureKeyboard = 1 << 3,
     ImGuiConfigFlags_NoMouse = 1 << 4,
     ImGuiConfigFlags_NoMouseCursorChange = 1 << 5,
     ImGuiConfigFlags_NoKeyboard = 1 << 6,
@@ -702,7 +700,7 @@ typedef enum {
     ImGuiCol_TextLink,
     ImGuiCol_TextSelectedBg,
     ImGuiCol_DragDropTarget,
-    ImGuiCol_NavHighlight,
+    ImGuiCol_NavCursor,
     ImGuiCol_NavWindowingHighlight,
     ImGuiCol_NavWindowingDimBg,
     ImGuiCol_ModalWindowDimBg,
@@ -750,6 +748,7 @@ typedef enum {
     ImGuiButtonFlags_MouseButtonRight = 1 << 1,
     ImGuiButtonFlags_MouseButtonMiddle = 1 << 2,
     ImGuiButtonFlags_MouseButtonMask_ = ImGuiButtonFlags_MouseButtonLeft | ImGuiButtonFlags_MouseButtonRight | ImGuiButtonFlags_MouseButtonMiddle,
+    ImGuiButtonFlags_EnableNav = 1 << 3,
 }ImGuiButtonFlags_;
 typedef enum {
     ImGuiColorEditFlags_None = 0,
@@ -997,9 +996,15 @@ struct ImGuiIO
     bool FontAllowUserScaling;
     ImFont* FontDefault;
     ImVec2 DisplayFramebufferScale;
+    bool ConfigNavSwapGamepadButtons;
+    bool ConfigNavMoveSetMousePos;
+    bool ConfigNavCaptureKeyboard;
+    bool ConfigNavEscapeClearFocusItem;
+    bool ConfigNavEscapeClearFocusWindow;
+    bool ConfigNavCursorVisibleAuto;
+    bool ConfigNavCursorVisibleAlways;
     bool MouseDrawCursor;
     bool ConfigMacOSXBehaviors;
-    bool ConfigNavSwapGamepadButtons;
     bool ConfigInputTrickleEventQueue;
     bool ConfigInputTextCursorBlink;
     bool ConfigInputTextEnterKeepActive;
@@ -1230,6 +1235,8 @@ struct ImDrawCmd
     unsigned int ElemCount;
     ImDrawCallback UserCallback;
     void* UserCallbackData;
+    int UserCallbackDataSize;
+    int UserCallbackDataOffset;
 };
 struct ImDrawVert
 {
@@ -1292,6 +1299,8 @@ typedef struct ImVector_ImVec4 {int Size;int Capacity;ImVec4* Data;} ImVector_Im
 
 typedef struct ImVector_ImTextureID {int Size;int Capacity;ImTextureID* Data;} ImVector_ImTextureID;
 
+typedef struct ImVector_ImU8 {int Size;int Capacity;ImU8* Data;} ImVector_ImU8;
+
 struct ImDrawList
 {
     ImVector_ImDrawCmd CmdBuffer;
@@ -1307,6 +1316,7 @@ struct ImDrawList
     ImDrawListSplitter _Splitter;
     ImVector_ImVec4 _ClipRectStack;
     ImVector_ImTextureID _TextureIdStack;
+    ImVector_ImU8 _CallbacksDataBuf;
     float _FringeScale;
     const char* _OwnerName;
 };
@@ -1462,6 +1472,7 @@ struct ImGuiPlatformIO
     void (*Platform_SetImeDataFn)(ImGuiContext* ctx, ImGuiViewport* viewport, ImGuiPlatformImeData* data);
     void* Platform_ImeUserData;
     ImWchar Platform_LocaleDecimalPoint;
+    void* Renderer_RenderState;
 };
 struct ImGuiPlatformImeData
 {
@@ -1518,7 +1529,7 @@ typedef int ImGuiDebugLogFlags;
 typedef int ImGuiFocusRequestFlags;
 typedef int ImGuiItemStatusFlags;
 typedef int ImGuiOldColumnFlags;
-typedef int ImGuiNavHighlightFlags;
+typedef int ImGuiNavRenderCursorFlags;
 typedef int ImGuiNavMoveFlags;
 typedef int ImGuiNextItemDataFlags;
 typedef int ImGuiNextWindowDataFlags;
@@ -1609,6 +1620,8 @@ typedef enum {
     ImGuiItemFlags_MixedValue = 1 << 12,
     ImGuiItemFlags_NoWindowHoverableCheck = 1 << 13,
     ImGuiItemFlags_AllowOverlap = 1 << 14,
+    ImGuiItemFlags_NoNavDisableMouseHover = 1 << 15,
+    ImGuiItemFlags_NoMarkEdited = 1 << 16,
     ImGuiItemFlags_Inputable = 1 << 20,
     ImGuiItemFlags_HasSelectionUserData = 1 << 21,
     ImGuiItemFlags_IsMultiSelect = 1 << 22,
@@ -1635,9 +1648,8 @@ typedef enum {
 }ImGuiHoveredFlagsPrivate_;
 typedef enum {
     ImGuiInputTextFlags_Multiline = 1 << 26,
-    ImGuiInputTextFlags_NoMarkEdited = 1 << 27,
-    ImGuiInputTextFlags_MergedItem = 1 << 28,
-    ImGuiInputTextFlags_LocalizeDecimalPoint= 1 << 29,
+    ImGuiInputTextFlags_MergedItem = 1 << 27,
+    ImGuiInputTextFlags_LocalizeDecimalPoint= 1 << 28,
 }ImGuiInputTextFlagsPrivate_;
 typedef enum {
     ImGuiButtonFlags_PressedOnClick = 1 << 4,
@@ -1646,12 +1658,10 @@ typedef enum {
     ImGuiButtonFlags_PressedOnRelease = 1 << 7,
     ImGuiButtonFlags_PressedOnDoubleClick = 1 << 8,
     ImGuiButtonFlags_PressedOnDragDropHold = 1 << 9,
-    ImGuiButtonFlags_Repeat = 1 << 10,
     ImGuiButtonFlags_FlattenChildren = 1 << 11,
     ImGuiButtonFlags_AllowOverlap = 1 << 12,
-    ImGuiButtonFlags_DontClosePopups = 1 << 13,
     ImGuiButtonFlags_AlignTextBaseLine = 1 << 15,
-    ImGuiButtonFlags_NoKeyModifiers = 1 << 16,
+    ImGuiButtonFlags_NoKeyModsAllowed = 1 << 16,
     ImGuiButtonFlags_NoHoldingActiveId = 1 << 17,
     ImGuiButtonFlags_NoNavFocus = 1 << 18,
     ImGuiButtonFlags_NoHoveredOnFocus = 1 << 19,
@@ -1844,7 +1854,7 @@ typedef enum {
 }ImGuiNextItemDataFlags_;
 struct ImGuiNextItemData
 {
-    ImGuiNextItemDataFlags Flags;
+    ImGuiNextItemDataFlags HasFlags;
     ImGuiItemFlags ItemFlags;
     ImGuiID FocusScopeId;
     ImGuiSelectionUserData SelectionUserData;
@@ -1859,7 +1869,7 @@ struct ImGuiNextItemData
 struct ImGuiLastItemData
 {
     ImGuiID ID;
-    ImGuiItemFlags InFlags;
+    ImGuiItemFlags ItemFlags;
     ImGuiItemStatusFlags StatusFlags;
     ImRect Rect;
     ImRect NavRect;
@@ -1871,7 +1881,7 @@ struct ImGuiTreeNodeStackData
 {
     ImGuiID ID;
     ImGuiTreeNodeFlags TreeFlags;
-    ImGuiItemFlags InFlags;
+    ImGuiItemFlags ItemFlags;
     ImRect NavRect;
 };
 struct ImGuiErrorRecoveryState
@@ -2081,11 +2091,11 @@ typedef enum {
     ImGuiScrollFlags_MaskY_ = ImGuiScrollFlags_KeepVisibleEdgeY | ImGuiScrollFlags_KeepVisibleCenterY | ImGuiScrollFlags_AlwaysCenterY,
 }ImGuiScrollFlags_;
 typedef enum {
-    ImGuiNavHighlightFlags_None = 0,
-    ImGuiNavHighlightFlags_Compact = 1 << 1,
-    ImGuiNavHighlightFlags_AlwaysDraw = 1 << 2,
-    ImGuiNavHighlightFlags_NoRounding = 1 << 3,
-}ImGuiNavHighlightFlags_;
+    ImGuiNavRenderCursorFlags_None = 0,
+    ImGuiNavRenderCursorFlags_Compact = 1 << 1,
+    ImGuiNavRenderCursorFlags_AlwaysDraw = 1 << 2,
+    ImGuiNavRenderCursorFlags_NoRounding = 1 << 3,
+}ImGuiNavRenderCursorFlags_;
 typedef enum {
     ImGuiNavMoveFlags_None = 0,
     ImGuiNavMoveFlags_LoopX = 1 << 0,
@@ -2103,7 +2113,7 @@ typedef enum {
     ImGuiNavMoveFlags_IsPageMove = 1 << 11,
     ImGuiNavMoveFlags_Activate = 1 << 12,
     ImGuiNavMoveFlags_NoSelect = 1 << 13,
-    ImGuiNavMoveFlags_NoSetNavHighlight = 1 << 14,
+    ImGuiNavMoveFlags_NoSetNavCursorVisible = 1 << 14,
     ImGuiNavMoveFlags_NoClearActiveId = 1 << 15,
 }ImGuiNavMoveFlags_;
 typedef enum {
@@ -2117,7 +2127,7 @@ struct ImGuiNavItemData
     ImGuiID ID;
     ImGuiID FocusScopeId;
     ImRect RectRel;
-    ImGuiItemFlags InFlags;
+    ImGuiItemFlags ItemFlags;
     float DistBox;
     float DistCenter;
     float DistAxial;
@@ -2529,8 +2539,12 @@ struct ImGuiContext
     ImVector_ImGuiPopupData BeginPopupStack;
     ImVector_ImGuiTreeNodeStackData TreeNodeStack;
     ImVector_ImGuiViewportPPtr Viewports;
-    ImGuiWindow* NavWindow;
+    bool NavCursorVisible;
+    bool NavHighlightItemUnderNav;
+    bool NavMousePosDirty;
+    bool NavIdIsAlive;
     ImGuiID NavId;
+    ImGuiWindow* NavWindow;
     ImGuiID NavFocusScopeId;
     ImGuiNavLayer NavLayer;
     ImGuiID NavActivateId;
@@ -2544,10 +2558,7 @@ struct ImGuiContext
     ImGuiActivateFlags NavNextActivateFlags;
     ImGuiInputSource NavInputSource;
     ImGuiSelectionUserData NavLastValidSelectionUserData;
-    bool NavIdIsAlive;
-    bool NavMousePosDirty;
-    bool NavDisableHighlight;
-    bool NavDisableMouseHover;
+    ImS8 NavCursorHideFrames;
     bool NavAnyRequest;
     bool NavInitRequest;
     bool NavInitRequestFromMove;
@@ -2660,7 +2671,6 @@ struct ImGuiContext
     float DragSpeedDefaultRatio;
     float DisabledAlphaBackup;
     short DisabledStackSize;
-    short LockMarkEdited;
     short TooltipOverrideCount;
     ImGuiWindow* TooltipPreviousWindow;
     ImVector_char ClipboardHandlerData;
@@ -3228,6 +3238,7 @@ typedef ImVector<ImGuiWindow*> ImVector_ImGuiWindowPtr;
 typedef ImVector<ImGuiWindowStackData> ImVector_ImGuiWindowStackData;
 typedef ImVector<ImTextureID> ImVector_ImTextureID;
 typedef ImVector<ImU32> ImVector_ImU32;
+typedef ImVector<ImU8> ImVector_ImU8;
 typedef ImVector<ImVec2> ImVector_ImVec2;
 typedef ImVector<ImVec4> ImVector_ImVec4;
 typedef ImVector<ImWchar> ImVector_ImWchar;
@@ -3559,6 +3570,7 @@ CIMGUI_API void igPushClipRect(const ImVec2 clip_rect_min,const ImVec2 clip_rect
 CIMGUI_API void igPopClipRect(void);
 CIMGUI_API void igSetItemDefaultFocus(void);
 CIMGUI_API void igSetKeyboardFocusHere(int offset);
+CIMGUI_API void igSetNavCursorVisible(bool visible);
 CIMGUI_API void igSetNextItemAllowOverlap(void);
 CIMGUI_API bool igIsItemHovered(ImGuiHoveredFlags flags);
 CIMGUI_API bool igIsItemActive(void);
@@ -3799,7 +3811,7 @@ CIMGUI_API void ImDrawList_PathEllipticalArcTo(ImDrawList* self,const ImVec2 cen
 CIMGUI_API void ImDrawList_PathBezierCubicCurveTo(ImDrawList* self,const ImVec2 p2,const ImVec2 p3,const ImVec2 p4,int num_segments);
 CIMGUI_API void ImDrawList_PathBezierQuadraticCurveTo(ImDrawList* self,const ImVec2 p2,const ImVec2 p3,int num_segments);
 CIMGUI_API void ImDrawList_PathRect(ImDrawList* self,const ImVec2 rect_min,const ImVec2 rect_max,float rounding,ImDrawFlags flags);
-CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* callback_data);
+CIMGUI_API void ImDrawList_AddCallback(ImDrawList* self,ImDrawCallback callback,void* userdata,size_t userdata_size);
 CIMGUI_API void ImDrawList_AddDrawCmd(ImDrawList* self);
 CIMGUI_API ImDrawList* ImDrawList_CloneOutput(ImDrawList* self);
 CIMGUI_API void ImDrawList_ChannelsSplit(ImDrawList* self,int count);
@@ -4314,7 +4326,7 @@ CIMGUI_API void igNavMoveRequestApplyResult(void);
 CIMGUI_API void igNavMoveRequestTryWrapping(ImGuiWindow* window,ImGuiNavMoveFlags move_flags);
 CIMGUI_API void igNavHighlightActivated(ImGuiID id);
 CIMGUI_API void igNavClearPreferredPosForAxis(ImGuiAxis axis);
-CIMGUI_API void igNavRestoreHighlightAfterMove(void);
+CIMGUI_API void igSetNavCursorVisibleAfterMove(void);
 CIMGUI_API void igNavUpdateCurrentWindowIsScrollPushableX(void);
 CIMGUI_API void igSetNavWindow(ImGuiWindow* window);
 CIMGUI_API void igSetNavID(ImGuiID id,ImGuiNavLayer nav_layer,ImGuiID focus_scope_id,const ImRect rect_rel);
@@ -4468,7 +4480,7 @@ CIMGUI_API void igRenderTextEllipsis(ImDrawList* draw_list,const ImVec2 pos_min,
 CIMGUI_API void igRenderFrame(ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,bool borders,float rounding);
 CIMGUI_API void igRenderFrameBorder(ImVec2 p_min,ImVec2 p_max,float rounding);
 CIMGUI_API void igRenderColorRectWithAlphaCheckerboard(ImDrawList* draw_list,ImVec2 p_min,ImVec2 p_max,ImU32 fill_col,float grid_step,ImVec2 grid_off,float rounding,ImDrawFlags flags);
-CIMGUI_API void igRenderNavHighlight(const ImRect bb,ImGuiID id,ImGuiNavHighlightFlags flags);
+CIMGUI_API void igRenderNavCursor(const ImRect bb,ImGuiID id,ImGuiNavRenderCursorFlags flags);
 CIMGUI_API const char* igFindRenderedTextEnd(const char* text,const char* text_end);
 CIMGUI_API void igRenderMouseCursor(ImVec2 pos,float scale,ImGuiMouseCursor mouse_cursor,ImU32 col_fill,ImU32 col_border,ImU32 col_shadow);
 CIMGUI_API void igRenderArrow(ImDrawList* draw_list,ImVec2 pos,ImU32 col,ImGuiDir dir,float scale);