upgraded imgui to v1.89.7; Downstream-breakage **possible**

Allow base-4.19 for ghc-9.6 (#177 )
Co-authored-by: Alexander Bondarenko <486682+dpwiz@users.noreply.github.com>
2025-07-04 12:08:48 +02:00 · 2023-07-17 17:50:17 +02:00 · 2023-07-02 21:54:03 +00:00 · 2023-07-03 00:48:44 +03:00 · 2023-05-07 17:44:13 +03:00 · 2023-01-15 15:27:15 +02:00
30 changed files with 1647 additions and 377 deletions
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@ -4,19 +4,19 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.4.0
      with:
          persist-credentials: false
          submodules: true

-    - uses: cachix/install-nix-action@v16
+    - uses: cachix/install-nix-action@v20
      with:
        nix_path: nixpkgs=channel:nixos-unstable

-    - uses: cachix/cachix-action@v10
+    - uses: cachix/cachix-action@v12
      with:
        name: hs-dear-imgui
        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'

-    - run: nix-build --version      
+    - run: nix-build --version
    - run: nix-build -A hsPkgs.dear-imgui.components.exes
--- a/ChangeLog.md
+++ b/ChangeLog.md
@ -1,5 +1,50 @@
 # Changelog for dear-imgui

+## [2.1.3]
+
+- Fixed off-by-1 in internal Text wrapper.
+- Fixed sliderFloat* Raw calls
+- Added `formatPtr` to Raw.dragFloat* and Raw.sliderFloat*
+
+## [2.1.2]
+
+- Fixed glfw example build flags.
+- Added `plotLines`.
+- Added `setNextItemOpen`.
+
+## [2.1.1]
+
+- Build flag fix for MacOS.
+
+## [2.1.0]
+
+- `imgui` updated to [1.88].
+    * Breaking: `ImGuiKeyModFlags` renamed to `ImGuiModFlags`.
+
+## [2.0.0]
+
+- `String` arguments replaced with `Text`.
+  * Upgrading to `text-2` recommended to reap the UTF-8 benefits.
+
+## [1.5.0]
+
+- Added table wrappers.
+- Added popup wrappers.
+- Added `selectableWith`/`SelectableOptions` to expose optional arguments.
+- Fix GHC-9.2 compatibility.
+
+## [1.4.0]
+
+- `imgui` updated to [1.87].
+- Added `DearImGui.Vulkan.vulkanAddTexture`.
+- Added `DearImGui.GLFW.glfwCursorPosCallback`.
+  * Apps that don't install backend callbacks, *must* call it themselves.
+- Added flags `use-wchar32` (default on) and `disable-obsolete` (default off).
+
+## [1.3.1]
+
+- `imgui` updated to [1.86].
+
 ## [1.3.0]

 - Added `DearImGui.FontAtlas` and related `DearImGui.Raw.Font.*` bits.
@ -7,7 +52,7 @@

 ## [1.2.2]

- `imgui` updated to 1.85.
+- `imgui` updated to [1.85].

 ## [1.2.1]

@ -29,7 +74,7 @@

 ## [1.1.0]

- `imgui` updated to 1.84.2.
+- `imgui` updated to [1.84.2].
 - Removed unused Window argument from SDL `newFrame` to match 1.84.
 - Added GLFW backend callbacks.
 - Added more withXXX wrappers.
@ -44,7 +89,7 @@

 ## [1.0.0]

-Initial Hackage release based on 1.83.
+Initial Hackage release based on [1.83].

 [1.0.0]: https://github.com/haskell-game/dear-imgui.hs/tree/v1.0.0
 [1.0.1]: https://github.com/haskell-game/dear-imgui.hs/tree/v1.0.1
@ -54,3 +99,17 @@ Initial Hackage release based on 1.83.
 [1.2.1]: https://github.com/haskell-game/dear-imgui.hs/tree/v1.2.1
 [1.2.2]: https://github.com/haskell-game/dear-imgui.hs/tree/v1.2.2
 [1.3.0]: https://github.com/haskell-game/dear-imgui.hs/tree/v1.3.0
+[1.3.1]: https://github.com/haskell-game/dear-imgui.hs/tree/v1.3.1
+[1.4.0]: https://github.com/haskell-game/dear-imgui.hs/tree/v1.4.0
+[1.5.0]: https://github.com/haskell-game/dear-imgui.hs/tree/v1.5.0
+[2.0.0]: https://github.com/haskell-game/dear-imgui.hs/tree/v2.0.0
+[2.1.0]: https://github.com/haskell-game/dear-imgui.hs/tree/v2.1.0
+[2.1.1]: https://github.com/haskell-game/dear-imgui.hs/tree/v2.1.1
+[2.1.2]: https://github.com/haskell-game/dear-imgui.hs/tree/v2.1.2
+[2.1.3]: https://github.com/haskell-game/dear-imgui.hs/tree/v2.1.3
+
+[1.87]: https://github.com/ocornut/imgui/releases/tag/v1.87
+[1.86]: https://github.com/ocornut/imgui/releases/tag/v1.86
+[1.85]: https://github.com/ocornut/imgui/releases/tag/v1.85
+[1.84.2]: https://github.com/ocornut/imgui/releases/tag/v1.84.2
+[1.83]: https://github.com/ocornut/imgui/releases/tag/v1.83
--- a/Main.hs
+++ b/Main.hs
@ -10,6 +10,7 @@ import Data.IORef
 import qualified Data.Vector as Vector
 import DearImGui
 import DearImGui.OpenGL3
+import DearImGui.Internal.Text (pack)
 import DearImGui.SDL
 import DearImGui.SDL.OpenGL
 import Control.Exception
@ -134,18 +135,18 @@ loop window checked color slider r pos size' selected tab1Ref tab2Ref = do

  text "ListClipper"
  withChildOpen "##fixed" (ImVec2 0 200) True ImGuiWindowFlags_None do
-    let lotsOfItems = Vector.generate 50 (mappend "Item " . show)
+    let lotsOfItems = Vector.generate 50 (pack . mappend "Item " . show)
    withListClipper Nothing lotsOfItems text

  text "ListClipper, Haskell-powered"
  withChildOpen "##infinite" (ImVec2 0 200) True ImGuiWindowFlags_None do
-    let infiniteItems = map (mappend "Item " . show) [0 :: Int ..]
+    let infiniteItems = map (pack . mappend "Item " . show) [0 :: Int ..]
    withListClipper Nothing infiniteItems text

  text "Ethereal ListClipper"
  withChildOpen "##ethereal" (ImVec2 0 200) True ImGuiWindowFlags_None do
    withListClipper Nothing (ClipRange (0 :: Int) 1000) $
-      text . mappend "Item " . show
+      text . pack . mappend "Item " . show

  plotHistogram "A histogram" [ 10, 10, 20, 30, 90 ]

--- a/cabal.project
+++ b/cabal.project
@ -1,4 +1,4 @@
 packages: *.cabal
 package dear-imgui
-  flags: +sdl2 +glfw +opengl2 +opengl3 +vulkan +examples
+  flags: +sdl +glfw +opengl2 +opengl3 +vulkan +examples
  ghc-options: -Wall -Wcompat -fno-warn-unused-do-bind
--- a/dear-imgui.cabal
+++ b/dear-imgui.cabal
@ -1,7 +1,7 @@
 cabal-version: 3.0

 name: dear-imgui
-version: 1.3.0
+version: 2.1.3
 author: Oliver Charles
 maintainer: ollie@ocharles.org.uk, aenor.realm@gmail.com
 license: BSD-3-Clause
@ -24,7 +24,7 @@ extra-source-files:
  imgui/imconfig.h,
  imgui/LICENSE.txt

-common build-flags
+common exe-flags
  if flag(debug)
    if os(linux)
      ghc-options: -Wall -g -rtsopts -dcore-lint -debug
@ -50,7 +50,6 @@ common build-flags
      ghc-options: -Wall -O2
      cc-options: -O2

-
 source-repository head
  type: git
  location: https://github.com/haskell-game/dear-imgui.hs
@ -111,10 +110,37 @@ flag examples
  manual:
    True

+flag disable-obsolete
+  description:
+    Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to avoid using soon-to-be obsolete function/names.
+  default:
+    False
+  manual:
+    True
+
+flag use-wchar32
+  description:
+    Use 32-bit for ImWchar (default is 16-bit) to support unicode planes 1-16. (e.g. point beyond 0xFFFF like emoticons, dingbats, symbols, shapes, ancient languages, etc...)
+  default:
+    True
+  manual:
+    True
+
+flag use-ImDrawIdx32
+  description:
+    Use 32-bit vertex indices (default is 16-bit) is one way to allow large meshes with more than 64K vertices.
+    Your renderer backend will need to support it (most example renderer backends support both 16/32-bit indices).
+    Another way to allow large meshes while keeping 16-bit indices is to handle ImDrawCmd::VtxOffset in your renderer.
+    Read about ImGuiBackendFlags_RendererHasVtxOffset for details.
+  default:
+    True
+  manual:
+    True
+
 common common
  build-depends:
      base
-        >= 4.12 && < 4.17
+        >= 4.12 && < 4.19
  default-language:
      Haskell2010

@ -125,15 +151,16 @@ library
  exposed-modules:
    DearImGui
    DearImGui.FontAtlas
+    DearImGui.Internal.Text
    DearImGui.Raw
    DearImGui.Raw.DrawList
    DearImGui.Raw.Font
    DearImGui.Raw.Font.Config
    DearImGui.Raw.Font.GlyphRanges
-    DearImGui.Raw.ListClipper
    DearImGui.Raw.IO
+    DearImGui.Raw.ListClipper
+    DearImGui.Raw.Context
  other-modules:
-    DearImGui.Context
    DearImGui.Enums
    DearImGui.Structs
  cxx-options: -std=c++11
@ -156,6 +183,22 @@ library
    , StateVar
    , unliftio
    , vector
+    , text
+
+  if os(darwin)
+    ghc-options:
+      -optcxx-std=c++11
+
+  if flag(disable-obsolete)
+    cxx-options: -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS
+
+  if flag(use-wchar32)
+    cxx-options: -DIMGUI_USE_WCHAR32
+    cpp-options: -DIMGUI_USE_WCHAR32
+
+  if flag(use-ImDrawIdx32)
+    cxx-options: "-DImDrawIdx=unsigned int"
+    cpp-options: "-DImDrawIdx=unsigned int"

  if flag(opengl2)
    exposed-modules:
@ -200,7 +243,7 @@ library
    build-depends:
      sdl2
    cxx-sources:
-      imgui/backends/imgui_impl_sdl.cpp
+      imgui/backends/imgui_impl_sdl2.cpp

    if os(windows) || os(darwin)
      extra-libraries:
@ -248,7 +291,7 @@ library dear-imgui-generator
    , DearImGui.Generator.Types
  build-depends:
      template-haskell
-        >= 2.15 && < 2.19
+        >= 2.15 && < 2.21
    , containers
       ^>= 0.6.2.1
    , directory
@ -264,16 +307,16 @@ library dear-imgui-generator
    , scientific
        >= 0.3.6.2 && < 0.3.8
    , text
-        >= 1.2.4 && < 1.3
+        >= 1.2.4 && < 2.1
    , th-lift
        >= 0.7 && < 0.9
    , transformers
-        >= 0.5.6 && < 0.6
+        >= 0.5.6 && < 0.7
    , unordered-containers
        >= 0.2.11 && < 0.3

 executable test
-  import: common, build-flags
+  import: common, exe-flags
  main-is: Main.hs
  default-language: Haskell2010
  if (!flag(examples) || !flag(sdl) || !flag(opengl2))
@ -282,17 +325,17 @@ executable test
    build-depends: base, sdl2, gl, dear-imgui, vector

 executable glfw
-  import: common, build-flags
+  import: common, exe-flags
  main-is: Main.hs
  hs-source-dirs: examples/glfw
  default-language: Haskell2010
  if (!flag(examples) || !flag(glfw) || !flag(opengl2))
    buildable: False
  else
-    build-depends: base, GLFW-b, gl, dear-imgui, managed
+    build-depends: base, GLFW-b, gl, dear-imgui, managed, text

 executable readme
-  import: common, build-flags
+  import: common, exe-flags
  main-is: Readme.hs
  hs-source-dirs: examples
  build-depends: sdl2, gl, dear-imgui, managed
@ -300,7 +343,7 @@ executable readme
    buildable: False

 executable fonts
-  import: common, build-flags
+  import: common, exe-flags
  main-is: Main.hs
  hs-source-dirs: examples/fonts
  build-depends: sdl2, gl, dear-imgui, managed
@ -308,15 +351,15 @@ executable fonts
    buildable: False

 executable image
-  import: common, build-flags
+  import: common, exe-flags
  main-is: Image.hs
  hs-source-dirs: examples/sdl
  build-depends: sdl2, gl, dear-imgui, managed, vector
-  if (!flag(examples) || !flag(sdl) || !flag(opengl2))
+  if (!flag(examples) || !flag(sdl) || !flag(opengl3))
    buildable: False

 executable vulkan
-  import: common, build-flags
+  import: common, exe-flags
  main-is: Main.hs
  other-modules: Attachments, Backend, Input, Util
  hs-source-dirs: examples/vulkan
@ -339,7 +382,7 @@ executable vulkan
      , text-short
         ^>= 0.1.3
      , transformers
-         ^>= 0.5.6.2
+          >= 0.5.6 && < 0.7
      , unliftio
          >= 0.2.13 && < 0.2.19
      , unliftio-core
@ -347,6 +390,9 @@ executable vulkan
      , vector
         ^>= 0.12.1.2
      , vulkan
-         ^>= 3.9
+         >= 3.12
      , vulkan-utils
-         ^>= 0.4.1
+         >= 0.5
+      , VulkanMemoryAllocator
+         >= 0.7.1
+      , JuicyPixels
--- a/examples/glfw/Main.hs
+++ b/examples/glfw/Main.hs
@ -1,6 +1,7 @@
 {-# language BlockArguments #-}
 {-# language LambdaCase #-}
 {-# language OverloadedStrings #-}
+{-# language RecordWildCards #-}

 module Main ( main ) where

@ -8,6 +9,12 @@ import Control.Exception
 import Control.Monad
 import Control.Monad.IO.Class
 import Control.Monad.Managed
+import Data.Bits ((.|.))
+import Data.IORef
+import Data.List (sortBy)
+import Data.Foldable (traverse_)
+import Data.Text (Text, pack)
+
 import DearImGui
 import DearImGui.OpenGL2
 import DearImGui.GLFW
@ -40,14 +47,23 @@ main = do
        -- Initialize ImGui's OpenGL backend
        _ <- managed_ $ bracket_ openGL2Init openGL2Shutdown

-        liftIO $ mainLoop win
+        tableRef <- liftIO $ newIORef
+          [ (1,  "foo")
+          , (2,  "bar")
+          , (3,  "baz")
+          , (10, "spam")
+          , (11, "spam")
+          , (12, "spam")
+          ]
+
+        liftIO $ mainLoop win tableRef
      Nothing -> do
        error "GLFW createWindow failed"

  GLFW.terminate

-mainLoop :: Window -> IO ()
-mainLoop win = do
+mainLoop :: Window -> IORef [(Integer, Text)] -> IO ()
+mainLoop win tableRef = do
  -- Process the event loop
  GLFW.pollEvents
  close <- GLFW.windowShouldClose win
@ -64,12 +80,18 @@ mainLoop win = do
      text "Hello, ImGui!"

      -- Add a button widget, and call 'putStrLn' when it's clicked
-      button "Clickety Click" >>= \case
-        False -> return ()
-        True  -> putStrLn "Ow!"
+      clicking <- button "Clickety Click"
+      when clicking $
+        putStrLn "Ow!"
+      itemContextPopup do
+        text "pop!"
+        button "ok" >>= \clicked ->
+          when clicked $
+            closeCurrentPopup

-    -- Show the ImGui demo window
-    showDemoWindow
+      newLine
+
+      mkTable tableRef

    -- Render
    glClear GL_COLOR_BUFFER_BIT
@ -79,4 +101,41 @@ mainLoop win = do

    GLFW.swapBuffers win

-    mainLoop win
+    mainLoop win tableRef
+
+mkTable :: IORef [(Integer, Text)] -> IO ()
+mkTable tableRef =
+  withTableOpen sortable "MyTable" 3 $ do
+    tableSetupColumn "Hello"
+    tableSetupColumnWith defTableColumnOptions "World"
+
+    withSortableTable \isDirty sortSpecs ->
+      when (isDirty && not (null sortSpecs)) do
+        -- XXX: do your sorting & cache it. Dont sort every frame.
+        putStrLn "So dirty!"
+        print sortSpecs
+        modifyIORef' tableRef . sortBy $
+          foldMap mkCompare sortSpecs
+
+    tableHeadersRow
+    readIORef tableRef >>=
+      traverse_ \(ix, title) -> do
+        tableNextRow
+        tableNextColumn $ text (pack $ show ix)
+        tableNextColumn $ text title
+        tableNextColumn $ void (button "♥")
+  where
+    mkCompare TableSortingSpecs{..} a b =
+      let
+        dir = if tableSortingReverse then flip else id
+      in
+        case tableSortingColumn of
+          0 -> dir compare (fst a) (fst b)
+          1 -> dir compare (snd a) (snd b)
+          _ -> EQ
+
+    sortable = defTableOptions
+      { tableFlags =
+          ImGuiTableFlags_Sortable .|.
+          ImGuiTableFlags_SortMulti
+      }
--- a/examples/vulkan/Backend.hs
+++ b/examples/vulkan/Backend.hs
@ -190,9 +190,9 @@ initialiseVulkanContext instanceType appName ( VulkanRequirements { instanceRequ
  device <- logDebug "Creating logical device" *>
    Vulkan.Utils.createDeviceFromRequirements swapchainDeviceRequirements [] physicalDevice deviceCreateInfo
  queue  <- Vulkan.getDeviceQueue device ( fromIntegral queueFamily ) 0
-  
+
  pure ( VulkanContext { .. } )
-  
+


 vulkanInstanceInfo
@ -206,7 +206,7 @@ vulkanInstanceInfo appName = do
  let
    validationLayer :: Maybe ValidationLayerName
    validationLayer
-      = coerce 
+      = coerce
      . foldMap
        (  (  Vulkan.layerName :: Vulkan.LayerProperties -> ByteString )
        >>> \case
@ -374,11 +374,10 @@ chooseSwapchainFormat

      case sortOn ( Down . score ) ( Boxed.Vector.toList surfaceFormats ) of
        [] -> error "No formats found."
-        ( best : _ )
-          | Vulkan.FORMAT_UNDEFINED <- ( Vulkan.format :: Vulkan.SurfaceFormatKHR -> Vulkan.Format ) best
-            -> pure preferredFormat
-          | otherwise
-            -> pure best
+        Vulkan.SurfaceFormatKHR{format=Vulkan.FORMAT_UNDEFINED} : _rest ->
+          pure preferredFormat
+        best : _rest
+          -> pure best

    where
      match :: Eq a => a -> a -> Int
@ -406,20 +405,17 @@ createSwapchain physicalDevice device surface surfaceFormat imageUsage imageCoun
  surfaceCapabilities <- Vulkan.getPhysicalDeviceSurfaceCapabilitiesKHR physicalDevice ( Vulkan.SurfaceKHR surface )

  ( _, presentModes ) <- Vulkan.getPhysicalDeviceSurfacePresentModesKHR physicalDevice ( Vulkan.SurfaceKHR surface )
-  
+
  let
    presentMode :: Vulkan.PresentModeKHR
-    presentMode 
+    presentMode
      | Vulkan.PRESENT_MODE_MAILBOX_KHR `elem` presentModes
      = Vulkan.PRESENT_MODE_MAILBOX_KHR
      | otherwise
      = Vulkan.PRESENT_MODE_FIFO_KHR

-    currentExtent :: Vulkan.Extent2D
-    currentExtent = ( Vulkan.currentExtent :: Vulkan.SurfaceCapabilitiesKHR -> Vulkan.Extent2D ) surfaceCapabilities
-
-    currentTransform :: Vulkan.SurfaceTransformFlagBitsKHR
-    currentTransform = ( Vulkan.currentTransform :: Vulkan.SurfaceCapabilitiesKHR -> Vulkan.SurfaceTransformFlagBitsKHR ) surfaceCapabilities
+    Vulkan.SurfaceCapabilitiesKHR{currentExtent, currentTransform} = surfaceCapabilities
+    Vulkan.SurfaceFormatKHR{format=fmt, colorSpace=csp} = surfaceFormat

    swapchainCreateInfo :: Vulkan.SwapchainCreateInfoKHR '[]
    swapchainCreateInfo =
@ -428,8 +424,8 @@ createSwapchain physicalDevice device surface surfaceFormat imageUsage imageCoun
        , Vulkan.flags                 = Vulkan.zero
        , Vulkan.surface               = Vulkan.SurfaceKHR surface
        , Vulkan.minImageCount         = imageCount
-        , Vulkan.imageFormat           = ( Vulkan.format     :: Vulkan.SurfaceFormatKHR -> Vulkan.Format        ) surfaceFormat
-        , Vulkan.imageColorSpace       = ( Vulkan.colorSpace :: Vulkan.SurfaceFormatKHR -> Vulkan.ColorSpaceKHR ) surfaceFormat
+        , Vulkan.imageFormat           = fmt
+        , Vulkan.imageColorSpace       = csp
        , Vulkan.imageExtent           = currentExtent
        , Vulkan.imageArrayLayers      = 1
        , Vulkan.imageUsage            = imageUsage
@ -494,7 +490,7 @@ simpleRenderPass dev attachments = Vulkan.withRenderPass dev createInfo Nothing
        { Vulkan.next         = ()
        , Vulkan.flags        = Vulkan.zero
        , Vulkan.attachments  = Boxed.Vector.fromList attachmentDescriptions
-        , Vulkan.subpasses    = Boxed.Vector.singleton subpass 
+        , Vulkan.subpasses    = Boxed.Vector.singleton subpass
        , Vulkan.dependencies = Boxed.Vector.fromList [ dependency1, dependency2 ]
        }

@ -591,7 +587,7 @@ createFramebuffer
  -> Vulkan.Extent2D
  -> f Vulkan.ImageView
  -> m ( ResourceT.ReleaseKey, Vulkan.Framebuffer )
-createFramebuffer dev renderPass extent attachments = Vulkan.withFramebuffer dev createInfo Nothing ResourceT.allocate
+createFramebuffer dev renderPass Vulkan.Extent2D{width, height} attachments = Vulkan.withFramebuffer dev createInfo Nothing ResourceT.allocate
  where
    createInfo :: Vulkan.FramebufferCreateInfo '[]
    createInfo =
@ -600,8 +596,8 @@ createFramebuffer dev renderPass extent attachments = Vulkan.withFramebuffer dev
        , Vulkan.flags       = Vulkan.zero
        , Vulkan.renderPass  = renderPass
        , Vulkan.attachments = Boxed.Vector.fromList . toList $ attachments
-        , Vulkan.width       = ( Vulkan.width  :: Vulkan.Extent2D -> Word32 ) extent
-        , Vulkan.height      = ( Vulkan.height :: Vulkan.Extent2D -> Word32 ) extent
+        , Vulkan.width       = width
+        , Vulkan.height      = height
        , Vulkan.layers      = 1
        }

--- a/examples/vulkan/Main.hs
+++ b/examples/vulkan/Main.hs
@ -24,7 +24,9 @@ import Control.Arrow
 import Control.Exception
  ( throw )
 import Control.Monad
-  ( unless, void )
+  ( unless, void, when )
+import Data.Bits
+  ( (.|.) )
 import Data.Foldable
  ( traverse_ )
 import Data.String
@ -62,11 +64,13 @@ import qualified Data.Vector as Boxed
  ( Vector )
 import qualified Data.Vector as Boxed.Vector
  ( (!), head, singleton, unzip )
+import qualified Data.Vector.Storable as Storable.Vector

 -- vulkan
 import qualified Vulkan
-import qualified Vulkan.Exception as Vulkan
-import qualified Vulkan.Zero      as Vulkan
+import qualified Vulkan.Exception      as Vulkan
+import qualified Vulkan.Zero           as Vulkan
+import qualified VulkanMemoryAllocator as VMA

 -- dear-imgui
 import Attachments
@ -76,6 +80,13 @@ import qualified DearImGui            as ImGui
 import qualified DearImGui.Vulkan     as ImGui.Vulkan
 import qualified DearImGui.SDL        as ImGui.SDL
 import qualified DearImGui.SDL.Vulkan as ImGui.SDL.Vulkan
+import Util (vmaVulkanFunctions)
+import Foreign (Ptr, castPtr, copyBytes, with, withForeignPtr, wordPtrToPtr)
+import qualified DearImGui.Raw as ImGui.Raw
+import UnliftIO (MonadUnliftIO)
+import qualified Vulkan.CStruct.Extends as Vulkan
+
+import qualified Codec.Picture as Picture

 --------------------------------------------------------------------------------

@ -83,8 +94,8 @@ type Handler    = LogMessage -> ResourceT IO ()
 deriving via ( ReaderT Handler (ResourceT IO) )
  instance MonadResource ( LoggingT LogMessage (ResourceT IO) )

-gui :: MonadIO m => m ImGui.DrawData
-gui = do
+gui :: MonadUnliftIO m => (ImGui.Raw.ImVec2, Ptr ()) ->  m ImGui.DrawData
+gui texture = do
  -- Prepare frame
  ImGui.Vulkan.vulkanNewFrame
  ImGui.SDL.sdl2NewFrame
@ -92,6 +103,25 @@ gui = do

  -- Run your windows
  ImGui.showDemoWindow
+  ImGui.withWindowOpen "Vulkan demo" do
+    clicked <- liftIO do
+      with (fst texture) \sizePtr ->
+        with (ImGui.Raw.ImVec2 0 0) \uv0Ptr ->
+          with (ImGui.Raw.ImVec2 1 1) \uv1Ptr ->
+            with (ImGui.Raw.ImVec4 1 1 1 1) \tintColPtr ->
+              with (ImGui.Raw.ImVec4 1 1 1 1) \bgColPtr ->
+                ImGui.Raw.imageButton
+                  (snd texture)
+                  sizePtr
+                  uv0Ptr
+                  uv1Ptr
+                  (-1)
+                  bgColPtr
+                  tintColPtr
+
+    when clicked $
+      ImGui.text "clicky click!"
+

  -- Process ImGui state into draw commands
  ImGui.render
@ -171,9 +201,7 @@ app = do
  surfaceCapabilities <- Vulkan.getPhysicalDeviceSurfaceCapabilitiesKHR physicalDevice ( Vulkan.SurfaceKHR surface )

  let
-    minImageCount, maxImageCount, imageCount :: Word32
-    minImageCount = ( Vulkan.minImageCount :: Vulkan.SurfaceCapabilitiesKHR -> Word32 ) surfaceCapabilities
-    maxImageCount = ( Vulkan.maxImageCount :: Vulkan.SurfaceCapabilitiesKHR -> Word32 ) surfaceCapabilities
+    Vulkan.SurfaceCapabilitiesKHR{minImageCount, maxImageCount} = surfaceCapabilities
    imageCount
      | maxImageCount == 0 =   minImageCount + 1
      | otherwise          = ( minImageCount + 1 ) `min` maxImageCount
@ -183,31 +211,30 @@ app = do

    swapchainResources :: Maybe SwapchainResources -> m ( m (), SwapchainResources )
    swapchainResources mbOldResources = do
-      ( surfaceFormat, imGuiRenderPass ) <- case mbOldResources of
+      ( colFmt, surfaceFormat, imGuiRenderPass ) <- case mbOldResources of
        Nothing -> do
          logDebug "Choosing swapchain format & color space"
          surfaceFormat <- chooseSwapchainFormat preferredFormat physicalDevice surface
-          let
-            colFmt :: Vulkan.Format
-            colFmt = ( Vulkan.format :: Vulkan.SurfaceFormatKHR -> Vulkan.Format ) surfaceFormat
+          let Vulkan.SurfaceFormatKHR{format=colFmt} = surfaceFormat
          logDebug "Creating Dear ImGui render pass"
          ( _, imGuiRenderPass ) <-
            simpleRenderPass device
              ( noAttachments
                { colorAttachments = Boxed.Vector.singleton $ presentableColorAttachmentDescription colFmt }
              )
-          pure ( surfaceFormat, imGuiRenderPass )
-        Just oldResources -> pure ( surfaceFormat oldResources, imGuiRenderPass oldResources )
-
-      let
-        colFmt :: Vulkan.Format
-        colFmt = ( Vulkan.format :: Vulkan.SurfaceFormatKHR -> Vulkan.Format ) surfaceFormat
+          pure ( colFmt, surfaceFormat, imGuiRenderPass )
+        Just oldResources -> do
+          let surFmt = surfaceFormat oldResources
+          let Vulkan.SurfaceFormatKHR{format=colFmt} = surFmt
+          pure ( colFmt, surFmt, imGuiRenderPass oldResources )

      logDebug "Creating swapchain"
      ( swapchainKey, swapchain, swapchainExtent ) <-
        createSwapchain
-          physicalDevice device
-          surface surfaceFormat
+          physicalDevice
+          device
+          surface
+          surfaceFormat
          surfaceUsage
          imageCount
          ( swapchain <$> mbOldResources )
@ -275,6 +302,80 @@ app = do
  logDebug "Allocating command buffers"
  commandBuffers <- snd <$> allocatePrimaryCommandBuffers device commandPool imageCount

+  logDebug "Allocating VMA"
+  (_key, vma) <- VMA.withAllocator
+    Vulkan.zero
+      { VMA.instance'       = Vulkan.instanceHandle instance'
+      , VMA.device          = Vulkan.deviceHandle device
+      , VMA.physicalDevice  = Vulkan.physicalDeviceHandle physicalDevice
+      , VMA.vulkanFunctions = Just $ vmaVulkanFunctions device instance'
+      }
+    ResourceT.allocate
+
+  logDebug "Loading image data"
+  picture <- liftIO (Picture.readImage "Example.png") >>= either error (pure . Picture.convertRGBA8)
+
+  logDebug "Allocating image"
+  let textureWidth = Picture.imageWidth picture
+  let textureHeight = Picture.imageHeight picture
+
+  (_key, (image, _imageAllocation, _imageAllocationInfo)) <- VMA.withImage
+    vma
+    ( Vulkan.zero
+        { Vulkan.imageType     = Vulkan.IMAGE_TYPE_2D
+        , Vulkan.mipLevels     = 1
+        , Vulkan.arrayLayers   = 1
+        , Vulkan.format        = Vulkan.FORMAT_R8G8B8A8_SRGB
+        , Vulkan.extent        = Vulkan.Extent3D (fromIntegral textureWidth) (fromIntegral textureHeight) 1
+        , Vulkan.tiling        = Vulkan.IMAGE_TILING_OPTIMAL
+        , Vulkan.initialLayout = Vulkan.IMAGE_LAYOUT_UNDEFINED
+        , Vulkan.usage         = Vulkan.IMAGE_USAGE_SAMPLED_BIT .|. Vulkan.IMAGE_USAGE_TRANSFER_DST_BIT
+        , Vulkan.sharingMode   = Vulkan.SHARING_MODE_EXCLUSIVE
+        , Vulkan.samples       = Vulkan.SAMPLE_COUNT_1_BIT
+        }
+    )
+    ( Vulkan.zero
+        { VMA.flags         = Vulkan.zero
+        , VMA.usage         = VMA.MEMORY_USAGE_GPU_ONLY
+        , VMA.requiredFlags = Vulkan.MEMORY_PROPERTY_DEVICE_LOCAL_BIT
+        }
+    )
+    ResourceT.allocate
+
+  let (pictureF, pictureSize) = Storable.Vector.unsafeToForeignPtr0 (Picture.imageData picture)
+
+  let stageBufferCI = Vulkan.zero
+        { Vulkan.size        = fromIntegral pictureSize
+        , Vulkan.usage       = Vulkan.BUFFER_USAGE_TRANSFER_SRC_BIT
+        , Vulkan.sharingMode = Vulkan.SHARING_MODE_EXCLUSIVE
+        }
+  let stageAllocationCI = Vulkan.zero
+        { VMA.flags         = VMA.ALLOCATION_CREATE_MAPPED_BIT
+        , VMA.usage         = VMA.MEMORY_USAGE_CPU_TO_GPU
+        , VMA.requiredFlags = Vulkan.MEMORY_PROPERTY_HOST_VISIBLE_BIT
+        }
+
+  (stageKey, (stage, stageAllocation, stageAllocationInfo)) <- VMA.withBuffer
+    vma
+    stageBufferCI
+    stageAllocationCI
+    ResourceT.allocate
+
+  liftIO $ withForeignPtr pictureF \srcPtr ->
+    copyBytes (VMA.mappedData stageAllocationInfo) (castPtr srcPtr) pictureSize
+
+  VMA.flushAllocation vma stageAllocation 0 Vulkan.WHOLE_SIZE
+
+  logDebug "Allocating sampler"
+  (_key, sampler) <- Vulkan.withSampler device Vulkan.zero Nothing ResourceT.allocate
+  logDebug "Allocating image view"
+  (_key, imageView) <- createImageView
+    device
+    image
+    Vulkan.IMAGE_VIEW_TYPE_2D
+    Vulkan.FORMAT_R8G8B8A8_SRGB
+    Vulkan.IMAGE_ASPECT_COLOR_BIT
+
  -------------------------------------------
  -- Initialise Dear ImGui.

@ -308,23 +409,96 @@ app = do
    logDebug "Creating fence"
    ( fenceKey, fence ) <- createFence device
    logDebug "Allocating one-shot command buffer"
-    ( fontUploadCommandBufferKey, fontUploadCommandBuffer ) <-
+    ( oneshotCommandBufferKey, oneshotCommandBuffer ) <-
      second Boxed.Vector.head <$>
        allocatePrimaryCommandBuffers device commandPool 1

    logDebug "Recording one-shot commands"
-    beginCommandBuffer fontUploadCommandBuffer
-    _ <- ImGui.Vulkan.vulkanCreateFontsTexture fontUploadCommandBuffer
-    endCommandBuffer fontUploadCommandBuffer
+    beginCommandBuffer oneshotCommandBuffer
+    _ <- ImGui.Vulkan.vulkanCreateFontsTexture oneshotCommandBuffer
+
+    logDebug "Uploading texture"
+    let textureSubresource = Vulkan.ImageSubresourceRange
+          { Vulkan.aspectMask     = Vulkan.IMAGE_ASPECT_COLOR_BIT
+          , Vulkan.baseMipLevel   = 0
+          , Vulkan.levelCount     = 1
+          , Vulkan.baseArrayLayer = 0
+          , Vulkan.layerCount     = 1
+          }
+
+    let uploadBarrier = Vulkan.zero
+          { Vulkan.srcAccessMask       = Vulkan.zero
+          , Vulkan.dstAccessMask       = Vulkan.ACCESS_TRANSFER_WRITE_BIT
+          , Vulkan.oldLayout           = Vulkan.IMAGE_LAYOUT_UNDEFINED
+          , Vulkan.newLayout           = Vulkan.IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL
+          , Vulkan.srcQueueFamilyIndex = Vulkan.QUEUE_FAMILY_IGNORED
+          , Vulkan.dstQueueFamilyIndex = Vulkan.QUEUE_FAMILY_IGNORED
+          , Vulkan.image               = image
+          , Vulkan.subresourceRange    = textureSubresource
+          } :: Vulkan.ImageMemoryBarrier '[]
+    Vulkan.cmdPipelineBarrier
+      oneshotCommandBuffer
+      Vulkan.PIPELINE_STAGE_TOP_OF_PIPE_BIT
+      Vulkan.PIPELINE_STAGE_TRANSFER_BIT
+      Vulkan.zero
+      mempty
+      mempty
+      (Boxed.Vector.singleton $ Vulkan.SomeStruct uploadBarrier)
+
+    Vulkan.cmdCopyBufferToImage oneshotCommandBuffer stage image Vulkan.IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL $
+      Boxed.Vector.singleton Vulkan.BufferImageCopy
+        { Vulkan.bufferOffset      = 0
+        , Vulkan.bufferRowLength   = Vulkan.zero
+        , Vulkan.bufferImageHeight = Vulkan.zero
+        , Vulkan.imageSubresource = Vulkan.ImageSubresourceLayers
+            { aspectMask     = Vulkan.IMAGE_ASPECT_COLOR_BIT
+            , mipLevel       = 0
+            , baseArrayLayer = 0
+            , layerCount     = 1
+            }
+        , Vulkan.imageOffset = Vulkan.zero
+        , Vulkan.imageExtent = Vulkan.Extent3D
+            { width  = fromIntegral textureWidth
+            , height = fromIntegral textureHeight
+            , depth  = 1
+            }
+        }
+
+    logDebug "Transitioning texture"
+    let transitionBarrier = Vulkan.zero
+          { Vulkan.srcAccessMask       = Vulkan.ACCESS_TRANSFER_WRITE_BIT
+          , Vulkan.dstAccessMask       = Vulkan.ACCESS_SHADER_READ_BIT
+          , Vulkan.oldLayout           = Vulkan.IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL
+          , Vulkan.newLayout           = Vulkan.IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
+          , Vulkan.srcQueueFamilyIndex = Vulkan.QUEUE_FAMILY_IGNORED
+          , Vulkan.dstQueueFamilyIndex = Vulkan.QUEUE_FAMILY_IGNORED
+          , Vulkan.image               = image
+          , Vulkan.subresourceRange    = textureSubresource
+          } :: Vulkan.ImageMemoryBarrier '[]
+    Vulkan.cmdPipelineBarrier
+      oneshotCommandBuffer
+      Vulkan.PIPELINE_STAGE_TRANSFER_BIT
+      Vulkan.PIPELINE_STAGE_FRAGMENT_SHADER_BIT
+      Vulkan.zero
+      mempty
+      mempty
+      (Boxed.Vector.singleton $ Vulkan.SomeStruct transitionBarrier)
+
+    endCommandBuffer oneshotCommandBuffer

    logDebug "Submitting one-shot commands"
-    submitCommandBuffer queue fontUploadCommandBuffer [] [] ( Just fence )
+    submitCommandBuffer queue oneshotCommandBuffer [] [] ( Just fence )
    waitForFences device ( WaitAll [ fence ] )

    logDebug "Finished uploading font objects"
    logDebug "Cleaning up one-shot commands"
    ImGui.Vulkan.vulkanDestroyFontUploadObjects
-    traverse_ ResourceT.release [ fenceKey, fontUploadCommandBufferKey ]
+    traverse_ ResourceT.release [ fenceKey, oneshotCommandBufferKey, stageKey ]
+
+    logDebug "Adding imgui texture"
+    Vulkan.DescriptorSet ds <- ImGui.Vulkan.vulkanAddTexture sampler imageView Vulkan.IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL
+    let textureSize = ImGui.Raw.ImVec2 (fromIntegral textureWidth) (fromIntegral textureHeight)
+    let texture = (textureSize, wordPtrToPtr $ fromIntegral ds)

    let
      mainLoop :: AppState m -> m ()
@ -364,7 +538,7 @@ app = do
                  beginCommandBuffer commandBuffer
                  cmdBeginRenderPass commandBuffer imGuiRenderPass framebuffer clearValues swapchainExtent

-                  drawData <- gui
+                  drawData <- gui texture
                  ImGui.Vulkan.vulkanRenderDrawData drawData commandBuffer Nothing

                  cmdEndRenderPass commandBuffer
--- a/examples/vulkan/Util.hs
+++ b/examples/vulkan/Util.hs
@ -1,4 +1,7 @@
 {-# LANGUAGE BlockArguments      #-}
+{-# LANGUAGE CPP                 #-}
+{-# LANGUAGE NamedFieldPuns      #-}
+{-# LANGUAGE RecordWildCards     #-}
 {-# LANGUAGE ScopedTypeVariables #-}

 module Util where
@ -12,6 +15,10 @@ import Data.Functor.Identity
  ( Identity(..) )
 import Data.Traversable
  ( for )
+#if MIN_VERSION_VulkanMemoryAllocator(0,8,0)
+import Foreign
+  ( castFunPtr )
+#endif

 -- transformers
 import Control.Monad.Trans.State.Strict
@ -19,6 +26,16 @@ import Control.Monad.Trans.State.Strict
 import Control.Monad.Trans.Writer.Strict
  ( runWriter, tell )

+-- vulkan
+import qualified Vulkan
+#if MIN_VERSION_VulkanMemoryAllocator(0,8,0)
+import qualified Vulkan.Dynamic as VkDynamic
+#endif
+import Vulkan.Zero (zero)
+
+-- VulkanMemoryAllocator
+import qualified VulkanMemoryAllocator as VMA
+
 ---------------------------------------------------------------

 iunzipWith
@ -38,3 +55,19 @@ ifor i0 upd ta f = (`evalState` i0) . getCompose $ result
  where
    result :: Compose (State i) f (t b)
    result = for ta \ a -> ( coerce ( \ i -> ( f i a, upd i ) ) )
+
+vmaVulkanFunctions
+  :: Vulkan.Device
+  -> Vulkan.Instance
+  -> VMA.VulkanFunctions
+#if MIN_VERSION_VulkanMemoryAllocator(0,8,0)
+vmaVulkanFunctions Vulkan.Device{deviceCmds} Vulkan.Instance{instanceCmds} =
+  zero
+    { VMA.vkGetInstanceProcAddr =
+        castFunPtr $ VkDynamic.pVkGetInstanceProcAddr instanceCmds
+    , VMA.vkGetDeviceProcAddr =
+        castFunPtr $ VkDynamic.pVkGetDeviceProcAddr deviceCmds
+    }
+#else
+vmaVulkanFunctions _device _instance = zero
+#endif
--- a/generator/DearImGui/Generator.hs
+++ b/generator/DearImGui/Generator.hs
@ -24,6 +24,10 @@ import Data.Traversable
  ( for )
 import Foreign.Storable
  ( Storable )
+#if MIN_VERSION_template_haskell(2,18,0)
+import Data.Coerce
+  ( coerce )
+#endif

 -- containers
 import Data.Map.Strict
@ -171,7 +175,7 @@ declareEnumeration finiteEnumName countName ( Enumeration {..} ) = do
        else
          \ nm args dir pat ->
          TH.patSynD_doc nm args dir pat
-            ( Just $ Text.unpack patDoc ) []
+            ( Just $ Text.unpack _patDoc ) []
      )
 #else
      TH.patSynD
--- a/generator/DearImGui/Generator/Parser.hs
+++ b/generator/DearImGui/Generator/Parser.hs
@ -60,7 +60,7 @@ import Data.Text
  ( Text )
 import qualified Data.Text as Text
  ( all, any, breakOn, drop, dropWhile, dropWhileEnd
-  , length, stripPrefix, unlines, unpack
+  , length, stripPrefix, unlines, unpack, pack
  )

 -- transformers
@ -81,6 +81,8 @@ import DearImGui.Generator.Tokeniser
 import DearImGui.Generator.Types
  ( Comment(..), Enumeration(..), Headers(..) )

+import qualified Text.Show as Text
+
 --------------------------------------------------------------------------------
 -- Parse error type.

@ -90,7 +92,9 @@ data CustomParseError
    , problems :: ![Text]
    }
  | MissingForwardDeclaration
-    { enumName :: !Text }
+    { enumName :: !Text
+    , library :: HashMap Text ( TH.Name, Comment )
+    }
  | UnexpectedSection
    { sectionName :: !Text
    , problem     :: ![Text]
@ -101,8 +105,9 @@ instance ShowErrorComponent CustomParseError where
  showErrorComponent ( Couldn'tLookupEnumValues { enumName, problems } ) = Text.unpack $
    "Couldn't lookup the following values in enum " <> enumName <> ":\n"
    <> Text.unlines ( map ( " - "  <> ) problems )
-  showErrorComponent ( MissingForwardDeclaration { enumName } ) = Text.unpack $
-    "Missing forward declaration for enum named " <> enumName
+  showErrorComponent ( MissingForwardDeclaration { enumName, library } ) = Text.unpack $
+    "Missing forward declaration for enum named " <> enumName <> "\n"
+    <> "In Library: " <> Text.pack ( Text.show library)
  showErrorComponent ( UnexpectedSection { sectionName, problem } ) = Text.unpack $
    "Unexpected section name.\n\
    \Expected: " <> sectionName <> "\n\
@ -124,6 +129,7 @@ headers = do
  ( _defines, basicEnums ) <- partitionEithers <$>
    manyTill
      (   ( Left  <$> try ignoreDefine )
+      <|> ( Left  <$> try cppConditional )
      <|> ( Right <$> enumeration enumNamesAndTypes )
      )
      ( namedSection "Helpers: Memory allocations macros, ImVector<>" )
@ -134,7 +140,7 @@ headers = do

  _ <- skipManyTill anySingle ( namedSection "Misc data structures" )

-  _ <- skipManyTill anySingle ( namedSection "Helpers (ImGuiOnceUponAFrame, ImGuiTextFilter, ImGuiTextBuffer, ImGuiStorage, ImGuiListClipper, ImColor)" )
+  _ <- skipManyTill anySingle ( namedSection "Helpers (ImGuiOnceUponAFrame, ImGuiTextFilter, ImGuiTextBuffer, ImGuiStorage, ImGuiListClipper, Math Operators, ImColor)" )

  _ <- skipManyTill anySingle ( namedSection "Drawing API (ImDrawCmd, ImDrawIdx, ImDrawVert, ImDrawChannel, ImDrawListSplitter, ImDrawListFlags, ImDrawList, ImDrawData)" )
  skipManyTill anySingle ( try . lookAhead $ many comment *> keyword "enum" )
@ -146,6 +152,8 @@ headers = do

  _ <- skipManyTill anySingle ( namedSection "Viewports" )

+  _ <- skipManyTill anySingle ( namedSection "Platform Dependent Interfaces" ) -- XXX: since 1.87
+
  _ <- skipManyTill anySingle ( namedSection "Obsolete functions and types" )

  let
@ -169,14 +177,24 @@ forwardDeclarations = do
    pure ( structName, doc )
  _ <- many comment
  enums <- many do
+    keyword "enum"
+    enumName <- identifier
+    symbol ":"
+    ty <- cTypeName
+    reservedSymbol ';'
+    doc <- commentText <$> comment
+    pure ( enumName, ( ty, CommentText <$> Text.drop 2 . snd $ Text.breakOn "//" doc ) )
+  _ <- many comment
+  typedefs <- many do
    keyword "typedef"
    ty <- cTypeName
    enumName <- identifier
    reservedSymbol ';'
    doc <- commentText <$> comment
+    _ <- many comment
    pure ( enumName, ( ty, CommentText <$> Text.drop 2 . snd $ Text.breakOn "//" doc ) )
  -- Stopping after simple structs and enums for now.
-  pure ( HashMap.fromList structs, HashMap.fromList enums )
+  pure ( HashMap.fromList structs, HashMap.fromList (enums <> typedefs) )

 cTypeName :: MonadParsec e [Tok] m => m TH.Name
 cTypeName = keyword "int" $> ''CInt
@ -198,6 +216,7 @@ enumeration enumNamesAndTypes = do
    keyword "enum"
    pure inlineDocs
  fullEnumName <- identifier
+  _ <- try $ (symbol ":" >> cTypeName >> pure ()) <|> pure ()
  let
    enumName :: Text
    enumName = Text.dropWhileEnd ( == '_' ) fullEnumName
@ -205,7 +224,7 @@ enumeration enumNamesAndTypes = do
    enumTypeName = ()
  ( underlyingType, forwardDoc ) <- case HashMap.lookup enumName enumNamesAndTypes of
    Just res -> pure res
-    Nothing  -> customFailure ( MissingForwardDeclaration { enumName } )
+    Nothing  -> customFailure ( MissingForwardDeclaration { enumName, library=enumNamesAndTypes } )
  let
    docs :: [Comment]
    docs = forwardDoc : CommentText "" : inlineDocs
@ -254,13 +273,21 @@ patternNameAndValue enumName =
  where
    count :: StateT EnumState m Integer
    count = do
-      _ <- single ( Identifier $ enumName <> "COUNT" )
+      let idName = enumName <> "COUNT"
+      _ <- single ( Identifier idName )
+
      mbVal <- optional do
        _ <- reservedSymbol '='
-        integerExpression
-      case mbVal of
+        EnumState{enumValues} <- get
+        integerExpression enumValues
+
+      countVal <- case mbVal of
        Nothing -> currEnumTag <$> get
        Just ct -> pure ct
+
+      modify' ( \ st -> st { enumValues = HashMap.insert idName countVal ( enumValues st ) } )
+      pure countVal
+
    value :: StateT EnumState m ( Text, Integer )
    value = do
      name <- identifier
@ -271,13 +298,16 @@ patternNameAndValue enumName =
    patternRHS =
      ( do
        reservedSymbol '='
-        try integerExpression <|> try disjunction
+        EnumState{enumValues} <- get
+        try disjunction <|> try (integerExpression enumValues)
      )
      <|> ( currEnumTag <$> get )

    disjunction :: StateT EnumState m Integer
    disjunction = do
-      ( summands :: [Text] ) <- identifier `sepBy1` symbol "|"
+      initial <- identifier <* symbol "|"
+      ( rest :: [Text] ) <- identifier `sepBy1` symbol "|"
+      let summands = initial : rest
      valsMap <- enumValues <$> get
      let
        res :: Either [ Text ] Integer
@ -327,34 +357,53 @@ symbol :: MonadParsec e [ Tok ] m => Text -> m ()
 symbol s = token ( \ case { Symbolic s' | s == s' -> Just (); _ -> Nothing } ) mempty
  <?> ( Text.unpack s <> " (symbol)" )

-integerExpression :: MonadParsec e [ Tok ] m => m Integer
-integerExpression = try integerPower <|> integer
-
-integerPower :: MonadParsec e [ Tok ] m => m Integer
-integerPower = do
-  a <- integer
-  _ <- symbol "<<"
-  i <- integer
-  pure ( a `shiftL` fromIntegral i )
-
-integer :: forall e m. MonadParsec e [ Tok ] m => m Integer
-integer =
-  option id mkSign <*>
-    token
-      ( \ case {
-        Number i suff
-          | Just  _  <- toBoundedInteger @Int64 i
-          , Right i' <- floatingOrInteger @Float @Integer i
-          , not ( Text.any ( (== 'f' ) . toLower ) suff )
-          -> Just i';
-         _ -> Nothing
-        }
-      )
-      mempty
-    <?> "integer"
+integerExpression :: MonadParsec e [ Tok ] m => HashMap Text Integer -> m Integer
+integerExpression enums = try integerPower <|> try integerAdd <|> try integerSub <|> integer
  where
-    mkSign :: m ( Integer -> Integer )
-    mkSign = ( symbol "+" $> id ) <|> ( symbol "-" $> negate )
+    integerPower :: MonadParsec e [ Tok ] m => m Integer
+    integerPower = do
+      a <- integer
+      _ <- symbol "<<"
+      i <- integer
+      pure ( a `shiftL` fromIntegral i )
+
+    integerAdd :: MonadParsec e [ Tok ] m => m Integer
+    integerAdd = do
+      a <- integer
+      _ <- symbol "+"
+      i <- integer
+      pure ( a + i )
+
+    integerSub :: MonadParsec e [ Tok ] m => m Integer
+    integerSub = do
+      a <- integer
+      _ <- symbol "-"
+      i <- integer
+      pure ( a - i )
+
+    integer :: forall e m. MonadParsec e [ Tok ] m => m Integer
+    integer =
+      option id mkSign <*>
+        token
+          ( \case
+              Number i suff
+                | Just  _  <- toBoundedInteger @Int64 i
+                , Right i' <- floatingOrInteger @Float @Integer i
+                , not ( Text.any ( (== 'f' ) . toLower ) suff )
+                ->
+                Just i'
+
+              Identifier name ->
+                HashMap.lookup name enums
+
+              _ ->
+                Nothing
+          )
+          mempty
+        <?> "integer"
+      where
+        mkSign :: m ( Integer -> Integer )
+        mkSign = ( symbol "+" $> id ) <|> ( symbol "-" $> negate )

 section :: MonadParsec e [ Tok ] m => m [Text]
 section =
--- a/2
+++ b/2
--- a/src/DearImGui.hs
+++ b/src/DearImGui.hs
--- a/src/DearImGui/FontAtlas.hs
+++ b/src/DearImGui/FontAtlas.hs
@ -119,6 +119,8 @@ import DearImGui.Raw.Font.Config (FontConfig(..))
 import qualified DearImGui.Raw.Font.Config as FontConfig
 import DearImGui.Raw.Font.GlyphRanges (GlyphRanges(..), GlyphRangesBuilder(..))
 import qualified DearImGui.Raw.Font.GlyphRanges as GlyphRanges
+import DearImGui.Internal.Text (Text)
+import qualified DearImGui.Internal.Text as Text

 import DearImGui.Structs (ImVec2(..), ImWchar)

@ -332,10 +334,10 @@ addChar char =
    GlyphRanges.addChar builder char

 -- | UTF-8 string
-addText :: String -> RangesBuilderSetup
+addText :: Text -> RangesBuilderSetup
 addText str =
  RangesBuilderSetup \builder ->
-    withCString str (GlyphRanges.addText builder)
+    Text.withCString str (GlyphRanges.addText builder)

 -- | Existing ranges (as is)
 addRangesRaw :: GlyphRanges -> RangesBuilderSetup
--- a/src/DearImGui/GLFW.hs
+++ b/src/DearImGui/GLFW.hs
@ -23,6 +23,7 @@ module DearImGui.GLFW (
    -- $callbacks
  , glfwWindowFocusCallback
  , glfwCursorEnterCallback
+  , glfwCursorPosCallback
  , glfwMouseButtonCallback
  , glfwScrollCallback
  , glfwKeyCallback
@ -108,6 +109,20 @@ glfwCursorEnterCallback window entered = liftIO do
  where
    windowPtr = castPtr $ unWindow window

+glfwCursorPosCallback :: MonadIO m => Window -> CDouble -> CDouble -> m ()
+glfwCursorPosCallback window x y = liftIO do
+  [C.exp| void {
+    ImGui_ImplGlfw_CursorPosCallback(
+      static_cast<GLFWwindow *>(
+        $(void * windowPtr)
+      ),
+      $(double x),
+      $(double y)
+    );
+  } |]
+  where
+    windowPtr = castPtr $ unWindow window
+
 glfwMouseButtonCallback :: MonadIO m => Window -> CInt -> CInt -> CInt -> m ()
 glfwMouseButtonCallback window button action mods = liftIO do
  [C.exp| void {
--- a/src/DearImGui/Internal/Text.hs
+++ b/src/DearImGui/Internal/Text.hs
@ -0,0 +1,76 @@
+{-# LANGUAGE CPP #-}
+
+module DearImGui.Internal.Text
+  ( withCString
+  , withCStringOrNull
+  , withCStringLen
+  , withCStringEnd
+  , peekCString
+
+  , Text
+  , pack
+  , unpack
+  ) where
+
+-- base
+import Foreign (nullPtr, plusPtr)
+import Foreign.C.String (CString)
+import qualified GHC.Foreign as Foreign
+import System.IO (utf8)
+
+-- text
+import Data.Text (Text, pack, unpack)
+import Data.Text.Foreign (withCStringLen)
+
+-- unliftio-core
+import UnliftIO (MonadUnliftIO, UnliftIO(..), withUnliftIO)
+
+#if MIN_VERSION_text(2,0,1)
+-- XXX: just wrap the provided combinator
+
+import qualified Data.Text.Foreign as Text
+
+withCString :: MonadUnliftIO m => Text -> (CString -> m a) -> m a
+withCString text action =
+  withUnliftIO $ \(UnliftIO unlift) ->
+    Text.withCString text $ \buf ->
+      unlift $ action buf
+
+#elif MIN_VERSION_text(2,0,0)
+-- XXX: the text is UTF-8, alas no withCString is available
+
+import Data.Text.Foreign (lengthWord8, unsafeCopyToPtr)
+import Data.Word (Word8)
+import Foreign (allocaBytes, castPtr, pokeByteOff)
+
+withCString :: MonadUnliftIO m => Text -> (CString -> m a) -> m a
+withCString t@(Text _arr _off len) action =
+  withUnliftIO $ \(UnliftIO unlift) ->
+    allocaBytes (len + 1) $ \buf -> do
+      unsafeCopyToPtr t buf
+      pokeByteOff buf len (0 :: Word8)
+      unlift $ action (castPtr buf)
+
+#else
+-- XXX: the text is UTF-16, let GHC do it
+
+withCString :: MonadUnliftIO m => Text -> (CString -> m a) -> m a
+withCString t action = do
+  withUnliftIO $ \(UnliftIO unlift) ->
+    Foreign.withCString utf8 (unpack t) $ \textPtr ->
+      unlift $ action textPtr
+
+#endif
+
+peekCString :: CString -> IO Text
+peekCString = fmap pack . Foreign.peekCString utf8
+
+withCStringOrNull :: Maybe Text -> (CString -> IO a) -> IO a
+withCStringOrNull Nothing k  = k nullPtr
+withCStringOrNull (Just s) k = withCString s k
+
+withCStringEnd :: MonadUnliftIO m => Text -> (CString -> CString -> m a) -> m a
+withCStringEnd t action =
+  withUnliftIO $ \(UnliftIO unlift) ->
+    withCStringLen t $ \(textPtr, size) ->
+      unlift $ action textPtr (textPtr `plusPtr` size)
--- a/src/DearImGui/Raw.hs
+++ b/src/DearImGui/Raw.hs
@ -6,6 +6,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE ViewPatterns #-}

@ -89,6 +90,7 @@ module DearImGui.Raw
  , popItemWidth
  , beginGroup
  , endGroup
+  , getCursorPos
  , setCursorPos
  , getCursorScreenPos
  , alignTextToFramePadding
@ -157,10 +159,34 @@ module DearImGui.Raw
  , colorPicker3
  , colorButton

+    -- * Tables
+  , beginTable
+  , endTable
+  , tableNextRow
+  , tableNextColumn
+  , tableSetColumnIndex
+
+  , tableSetupColumn
+  , tableSetupScrollFreeze
+  , tableHeadersRow
+  , tableHeader
+
+  , tableGetSortSpecs
+  , tableClearSortSpecsDirty
+
+  , tableGetColumnCount
+  , tableGetColumnIndex
+  , tableGetRowIndex
+  , tableGetColumnName
+  , tableGetColumnFlags
+  , tableSetColumnEnabled
+  , tableSetBgColor
+
    -- * Trees
  , treeNode
  , treePush
  , treePop
+  , setNextItemOpen

    -- ** Selectables
  , selectable
@ -169,6 +195,7 @@ module DearImGui.Raw
  , listBox

    -- * Data Plotting
+  , plotLines
  , plotHistogram

    -- ** Menus
@ -197,7 +224,12 @@ module DearImGui.Raw
  , beginPopupModal
  , endPopup
  , openPopup
+  , openPopupOnItemClick
  , closeCurrentPopup
+  , beginPopupContextItem
+  , beginPopupContextWindow
+  , beginPopupContextVoid
+  , isPopupOpen

    -- * ID stack/scopes
  , pushIDInt
@ -233,7 +265,7 @@ import System.IO.Unsafe
  ( unsafePerformIO )

 -- dear-imgui
-import DearImGui.Context
+import DearImGui.Raw.Context
  ( imguiContext )
 import DearImGui.Enums
 import DearImGui.Structs
@ -662,27 +694,27 @@ combo labelPtr iPtr itemsPtr itemsLen = liftIO do


 -- | Wraps @ImGui::DragFloat()@
-dragFloat :: (MonadIO m) => CString -> Ptr CFloat -> CFloat -> CFloat -> CFloat -> m Bool
-dragFloat descPtr floatPtr speed minValue maxValue = liftIO do
-  (0 /=) <$> [C.exp| bool { DragFloat( $(char* descPtr), $(float* floatPtr), $(float speed), $(float minValue), $(float maxValue)) } |]
+dragFloat :: (MonadIO m) => CString -> Ptr CFloat -> CFloat -> CFloat -> CFloat -> CString -> m Bool
+dragFloat descPtr floatPtr speed minValue maxValue formatPtr = liftIO do
+  (0 /=) <$> [C.exp| bool { DragFloat( $(char* descPtr), $(float* floatPtr), $(float speed), $(float minValue), $(float maxValue), $(char* formatPtr)) } |]


 -- | Wraps @ImGui::DragFloat2()@
-dragFloat2 :: (MonadIO m) => CString -> Ptr CFloat -> CFloat -> CFloat -> CFloat -> m Bool
-dragFloat2 descPtr floatPtr speed minValue maxValue = liftIO do
-  (0 /=) <$> [C.exp| bool { DragFloat2( $(char* descPtr), $(float* floatPtr), $(float speed), $(float minValue), $(float maxValue)) } |]
+dragFloat2 :: (MonadIO m) => CString -> Ptr CFloat -> CFloat -> CFloat -> CFloat -> CString -> m Bool
+dragFloat2 descPtr floatPtr speed minValue maxValue formatPtr = liftIO do
+  (0 /=) <$> [C.exp| bool { DragFloat2( $(char* descPtr), $(float* floatPtr), $(float speed), $(float minValue), $(float maxValue), $(char* formatPtr)) } |]


 -- | Wraps @ImGui::DragFloat3()@
-dragFloat3 :: (MonadIO m) => CString -> Ptr CFloat -> CFloat -> CFloat -> CFloat -> m Bool
-dragFloat3 descPtr floatPtr speed minValue maxValue = liftIO do
-  (0 /=) <$> [C.exp| bool { DragFloat3( $(char* descPtr), $(float* floatPtr), $(float speed), $(float minValue), $(float maxValue)) } |]
+dragFloat3 :: (MonadIO m) => CString -> Ptr CFloat -> CFloat -> CFloat -> CFloat -> CString -> m Bool
+dragFloat3 descPtr floatPtr speed minValue maxValue formatPtr = liftIO do
+  (0 /=) <$> [C.exp| bool { DragFloat3( $(char* descPtr), $(float* floatPtr), $(float speed), $(float minValue), $(float maxValue), $(char* formatPtr)) } |]


 -- | Wraps @ImGui::DragFloat4()@
-dragFloat4 :: (MonadIO m) => CString -> Ptr CFloat -> CFloat -> CFloat -> CFloat -> m Bool
-dragFloat4 descPtr floatPtr speed minValue maxValue = liftIO do
-  (0 /=) <$> [C.exp| bool { DragFloat4( $(char* descPtr), $(float* floatPtr), $(float speed), $(float minValue), $(float maxValue)) } |]
+dragFloat4 :: (MonadIO m) => CString -> Ptr CFloat -> CFloat -> CFloat -> CFloat -> CString -> m Bool
+dragFloat4 descPtr floatPtr speed minValue maxValue formatPtr = liftIO do
+  (0 /=) <$> [C.exp| bool { DragFloat4( $(char* descPtr), $(float* floatPtr), $(float speed), $(float minValue), $(float maxValue), $(char* formatPtr)) } |]


 -- | Wraps @ImGui::DragFloatRange2()@
@ -822,27 +854,27 @@ dragScalarN labelPtr dataType dataPtr components vSpeed minPtr maxPtr formatPtr
    maxPtr_ = castPtr maxPtr

 -- | Wraps @ImGui::SliderFloat()@
-sliderFloat :: (MonadIO m) => CString -> Ptr CFloat -> CFloat -> CFloat -> m Bool
-sliderFloat descPtr floatPtr minValue maxValue = liftIO do
-  (0 /=) <$> [C.exp| bool { SliderFloat( $(char* descPtr), $(float* floatPtr), $(float minValue), $(float maxValue)) } |]
+sliderFloat :: (MonadIO m) => CString -> Ptr CFloat -> CFloat -> CFloat -> CString -> m Bool
+sliderFloat descPtr floatPtr minValue maxValue formatPtr = liftIO do
+  (0 /=) <$> [C.exp| bool { SliderFloat( $(char* descPtr), $(float* floatPtr), $(float minValue), $(float maxValue), $(char* formatPtr)) } |]


 -- | Wraps @ImGui::SliderFloat2()@
-sliderFloat2 :: (MonadIO m) => CString -> Ptr CFloat -> CFloat -> CFloat -> m Bool
-sliderFloat2 descPtr floatPtr minValue maxValue = liftIO do
-  (0 /=) <$> [C.exp| bool { SliderFloat2( $(char* descPtr), $(float* floatPtr), $(float minValue), $(float maxValue)) } |]
+sliderFloat2 :: (MonadIO m) => CString -> Ptr CFloat -> CFloat -> CFloat -> CString -> m Bool
+sliderFloat2 descPtr floatPtr minValue maxValue formatPtr = liftIO do
+  (0 /=) <$> [C.exp| bool { SliderFloat2( $(char* descPtr), $(float* floatPtr), $(float minValue), $(float maxValue), $(char* formatPtr)) } |]


 -- | Wraps @ImGui::SliderFloat3()@
-sliderFloat3 :: (MonadIO m) => CString -> Ptr CFloat -> CFloat -> CFloat -> m Bool
-sliderFloat3 descPtr floatPtr minValue maxValue = liftIO do
-  (0 /=) <$> [C.exp| bool { SliderFloat3( $(char* descPtr), $(float* floatPtr), $(float minValue), $(float maxValue)) } |]
+sliderFloat3 :: (MonadIO m) => CString -> Ptr CFloat -> CFloat -> CFloat -> CString -> m Bool
+sliderFloat3 descPtr floatPtr minValue maxValue formatPtr = liftIO do
+  (0 /=) <$> [C.exp| bool { SliderFloat3( $(char* descPtr), $(float* floatPtr), $(float minValue), $(float maxValue), $(char* formatPtr)) } |]


 -- | Wraps @ImGui::SliderFloat4()@
-sliderFloat4 :: (MonadIO m) => CString -> Ptr CFloat -> CFloat -> CFloat -> m Bool
-sliderFloat4 descPtr floatPtr minValue maxValue = liftIO do
-  (0 /=) <$> [C.exp| bool { SliderFloat4( $(char* descPtr), $(float* floatPtr), $(float minValue), $(float maxValue)) } |]
+sliderFloat4 :: (MonadIO m) => CString -> Ptr CFloat -> CFloat -> CFloat -> CString -> m Bool
+sliderFloat4 descPtr floatPtr minValue maxValue formatPtr = liftIO do
+  (0 /=) <$> [C.exp| bool { SliderFloat4( $(char* descPtr), $(float* floatPtr), $(float minValue), $(float maxValue), $(char* formatPtr)) } |]

 -- | Wraps @ImGui::SliderAngle()@
 sliderAngle :: (MonadIO m) => CString -> Ptr CFloat -> CFloat -> CFloat -> CString -> ImGuiSliderFlags -> m Bool
@ -1063,6 +1095,128 @@ colorButton descPtr refPtr = liftIO do
  (0 /=) <$> [C.exp| bool { ColorButton( $(char* descPtr), *$(ImVec4* refPtr) ) } |]


+-- | Wraps @ImGui::BeginTable()@.
+beginTable :: MonadIO m => CString -> CInt -> ImGuiTableFlags -> Ptr ImVec2 -> CFloat -> m Bool
+beginTable labelPtr column flags outerSizePtr innerWidth = liftIO do
+  (0 /=) <$> [C.exp| bool { BeginTable($(char* labelPtr), $(int column), $(ImGuiTableFlags flags), *$(ImVec2* outerSizePtr), $(float innerWidth)) } |]
+
+-- | Only call 'endTable' if 'beginTable' returns true!
+--
+-- Wraps @ImGui::EndTable()@.
+endTable :: MonadIO m => m ()
+endTable = liftIO do
+  [C.exp| void { EndTable() } |]
+
+-- | Wraps @ImGui::TableNextRow()@.
+--   append into the first cell of a new row.
+tableNextRow :: MonadIO m => ImGuiTableRowFlags -> CFloat -> m ()
+tableNextRow flags minRowHeight = liftIO do
+  [C.exp| void { TableNextRow($(ImGuiTableRowFlags flags), $(float minRowHeight)) } |]
+
+-- | Wraps @ImGui::TableNextColumn()@.
+--   append into the next column (or first column of next row if currently in
+--   last column). Return true when column is visible.
+tableNextColumn :: MonadIO m => m Bool
+tableNextColumn = liftIO do
+  (0 /=) <$> [C.exp| bool { TableNextColumn() } |]
+
+-- | Wraps @ImGui::TableSetColumnIndex()@.
+--   append into the specified column. Return true when column is visible.
+tableSetColumnIndex :: MonadIO m => CInt -> m Bool
+tableSetColumnIndex column= liftIO do
+  (0 /=) <$> [C.exp| bool { TableSetColumnIndex($(int column)) } |]
+
+-- | Wraps @ImGui::TableSetupColumn()@.
+tableSetupColumn :: MonadIO m => CString -> ImGuiTableColumnFlags -> CFloat -> ImGuiID-> m ()
+tableSetupColumn labelPtr flags initWidthOrWeight userId = liftIO do
+  [C.exp| void { TableSetupColumn($(char* labelPtr), $(ImGuiTableColumnFlags flags), $(float initWidthOrWeight), $(ImGuiID userId)) } |]
+
+-- | Wraps @ImGui::TableSetupScrollFreeze()@.
+tableSetupScrollFreeze :: MonadIO m => CInt -> CInt -> m ()
+tableSetupScrollFreeze cols rows = liftIO do
+  [C.exp| void { TableSetupScrollFreeze($(int cols), $(int rows)) } |]
+
+-- | Wraps @ImGui::TableHeadersRow()@.
+--   submit all headers cells based on data provided to 'tableSetupColumn'
+--   + submit context menu
+tableHeadersRow :: MonadIO m => m ()
+tableHeadersRow = liftIO do
+  [C.exp| void { TableHeadersRow() } |]
+
+-- | Wraps @ImGui::TableHeader()@.
+--   submit one header cell manually (rarely used)
+tableHeader :: MonadIO m => CString -> m ()
+tableHeader labelPtr = liftIO do
+  [C.exp| void { TableHeader($(char* labelPtr)) } |]
+
+-- | Wraps @ImGui::TableGetSortSpecs()@.
+--   Low-level-Function. Better use the wrapper that outomatically conform
+--   to the things described below
+--
+--   Tables: Sorting
+--   - Call TableGetSortSpecs() to retrieve latest sort specs for the table.
+--     NULL when not sorting.
+--   - When 'SpecsDirty == true' you should sort your data. It will be true when
+--     sorting specs have changed since last call, or the first time. Make sure
+--     to set 'SpecsDirty = false' after sorting, else you may wastefully sort
+--     your data every frame!
+--   - Lifetime: don't hold on this pointer over multiple frames or past any
+--     subsequent call to BeginTable().
+tableGetSortSpecs :: MonadIO m => m (Maybe (Ptr ImGuiTableSortSpecs))
+tableGetSortSpecs = liftIO do
+  ptr <- [C.exp| ImGuiTableSortSpecs* { TableGetSortSpecs() } |]
+  if ptr == nullPtr then
+    return Nothing
+  else
+    return $ Just ptr
+
+tableClearSortSpecsDirty :: MonadIO m => Ptr ImGuiTableSortSpecs -> m ()
+tableClearSortSpecsDirty specsPtr = liftIO do
+  [C.block| void {
+    $(ImGuiTableSortSpecs* specsPtr)->SpecsDirty = false;
+  } |]
+
+-- | Wraps @ImGui::TableGetColumnCount()@.
+tableGetColumnCount :: MonadIO m => m CInt
+tableGetColumnCount = liftIO do
+  [C.exp| int { TableGetColumnCount() } |]
+
+-- | Wraps @ImGui::TableGetColumnIndex()@.
+tableGetColumnIndex :: MonadIO m => m CInt
+tableGetColumnIndex = liftIO do
+  [C.exp| int { TableGetColumnIndex() } |]
+
+-- | Wraps @ImGui::TableGetRowIndex()@.
+tableGetRowIndex :: MonadIO m => m CInt
+tableGetRowIndex = liftIO do
+  [C.exp| int { TableGetRowIndex() } |]
+
+-- | Wraps @ImGui::TableGetColumnName
+--   'Nothing' returns the current column name
+tableGetColumnName :: MonadIO m => Maybe CInt -> m CString
+tableGetColumnName Nothing = tableGetColumnName (Just (-1))
+tableGetColumnName (Just column_n) = liftIO do
+  [C.exp| const char* { TableGetColumnName($(int column_n)) } |]
+
+-- | Wraps @ImGui::TableGetRowIndex()@.
+--   'Nothing' returns the current column flags
+tableGetColumnFlags :: MonadIO m => Maybe CInt -> m ImGuiTableColumnFlags
+tableGetColumnFlags Nothing = tableGetColumnFlags (Just (-1))
+tableGetColumnFlags (Just column_n) = liftIO do
+  [C.exp| ImGuiTableColumnFlags { TableGetColumnFlags($(int column_n)) } |]
+
+-- | Wraps @ImGui::TableSetColumnEnabled()@.
+tableSetColumnEnabled :: MonadIO m => CInt -> CBool -> m ()
+tableSetColumnEnabled column_n v = liftIO do
+  [C.exp| void { TableSetColumnEnabled($(int column_n), $(bool v)) } |]
+
+-- | Wraps @ImGui::TableSetBgColor()@.
+--   'Nothing' sets the current row/column color
+tableSetBgColor :: MonadIO m => ImGuiTableBgTarget -> ImU32 -> Maybe CInt -> m ()
+tableSetBgColor target color Nothing = tableSetBgColor target color (Just (-1))
+tableSetBgColor target color (Just column_n) = liftIO do
+  [C.exp| void { TableSetBgColor($(ImGuiTableBgTarget target), $(ImU32 color), $(int column_n)) } |]
+
 -- | Wraps @ImGui::TreeNode()@.
 treeNode :: (MonadIO m) => CString -> m Bool
 treeNode labelPtr = liftIO do
@ -1081,10 +1235,22 @@ treePop = liftIO do
  [C.exp| void { TreePop() } |]


+-- | Wraps @ImGui::SetNextItemOpen()@.
+setNextItemOpen :: (MonadIO m) => CBool -> m ()
+setNextItemOpen is_open = liftIO do
+  [C.exp| void { SetNextItemOpen($(bool is_open)) } |]
+
+-- -- | Wraps @ImGui::Selectable()@.
+-- selectable :: (MonadIO m) => CString -> m Bool
+-- selectable labelPtr = liftIO do
+--   (0 /=) <$> [C.exp| bool { Selectable($(char* labelPtr)) } |]
+
+
 -- | Wraps @ImGui::Selectable()@.
-selectable :: (MonadIO m) => CString -> m Bool
-selectable labelPtr = liftIO do
-  (0 /=) <$> [C.exp| bool { Selectable($(char* labelPtr)) } |]
+selectable :: (MonadIO m) => CString -> CBool -> ImGuiSelectableFlags -> Ptr ImVec2 -> m Bool
+selectable labelPtr selected flags size = liftIO do
+  (0 /=) <$> [C.exp| bool { Selectable($(char* labelPtr), $(bool selected), $(ImGuiSelectableFlags flags), *$(ImVec2 *size)) } |]
+


 -- | Wraps @ImGui::ListBox()@.
@ -1092,6 +1258,10 @@ listBox :: (MonadIO m) => CString -> Ptr CInt -> Ptr CString -> CInt -> m Bool
 listBox labelPtr iPtr itemsPtr itemsLen = liftIO do
  (0 /=) <$> [C.exp| bool { ListBox($(char* labelPtr), $(int* iPtr), $(char** itemsPtr), $(int itemsLen)) }|]

+-- | Wraps @ImGui::PlotLines()@.
+plotLines :: (MonadIO m) => CString -> Ptr CFloat -> CInt -> m ()
+plotLines labelPtr valuesPtr valuesLen = liftIO do
+  [C.exp| void { PlotLines($(char* labelPtr), $(float* valuesPtr), $(int valuesLen)) } |]

 -- | Wraps @ImGui::PlotHistogram()@.
 plotHistogram :: (MonadIO m) => CString -> Ptr CFloat -> CInt -> m ()
@ -1253,6 +1423,16 @@ openPopup popupIdPtr = liftIO do
  [C.exp| void { OpenPopup($(char* popupIdPtr)) } |]


+-- | Open popup when clicked on last item.
+--
+-- Note: actually triggers on the mouse _released_ event to be consistent with popup behaviors.
+--
+-- Wraps @ImGui::OpenPopupOnItemClick()@
+openPopupOnItemClick :: (MonadIO m) => CString -> ImGuiPopupFlags-> m ()
+openPopupOnItemClick popupIdPtr flags = liftIO do
+  [C.exp| void { OpenPopupOnItemClick($(char* popupIdPtr), $(ImGuiPopupFlags flags)) } |]
+
+
 -- | Manually close the popup we have begin-ed into.
 --
 -- Wraps @ImGui::ClosePopup()@
@ -1260,6 +1440,36 @@ closeCurrentPopup :: (MonadIO m) => m ()
 closeCurrentPopup = liftIO do
  [C.exp| void { CloseCurrentPopup() } |]

+-- | Open+begin popup when clicked on last item.
+--
+-- Use str_id==NULL to associate the popup to previous item.
+--
+-- If you want to use that on a non-interactive item such as 'text' you need to pass in an explicit ID here.
+beginPopupContextItem :: (MonadIO m) => CString -> ImGuiPopupFlags-> m Bool
+beginPopupContextItem popupIdPtr flags = liftIO do
+  (0 /=) <$> [C.exp| bool { BeginPopupContextItem($(char* popupIdPtr), $(ImGuiPopupFlags flags)) } |]
+
+-- | Open+begin popup when clicked on current window.
+beginPopupContextWindow :: (MonadIO m) => CString -> ImGuiPopupFlags-> m Bool
+beginPopupContextWindow popupIdPtr flags = liftIO do
+  (0 /=) <$> [C.exp| bool { BeginPopupContextWindow($(char* popupIdPtr), $(ImGuiPopupFlags flags)) } |]
+
+-- | Open+begin popup when clicked in void (where there are no windows).
+beginPopupContextVoid :: (MonadIO m) => CString -> ImGuiPopupFlags-> m Bool
+beginPopupContextVoid popupIdPtr flags = liftIO do
+  (0 /=) <$> [C.exp| bool { BeginPopupContextVoid($(char* popupIdPtr), $(ImGuiPopupFlags flags)) } |]
+
+-- | Query popup status
+--
+-- - return 'True' if the popup is open at the current 'beginPopup' level of the popup stack.
+-- - with 'ImGuiPopupFlags_AnyPopupId': return 'True' if any popup is open at the current 'beginPopup' level of the popup stack.
+-- - with 'ImGuiPopupFlags_AnyPopupId' | 'ImGuiPopupFlags_AnyPopupLevel': return 'True' if any popup is open.
+--
+-- Wraps @ImGui::IsPopupOpen()@
+isPopupOpen :: (MonadIO m) => CString -> ImGuiPopupFlags-> m Bool
+isPopupOpen popupIdPtr flags = liftIO do
+  (0 /=) <$> [C.exp| bool { IsPopupOpen($(char* popupIdPtr), $(ImGuiPopupFlags flags)) } |]
+

 -- | Is the last item hovered? (and usable, aka not blocked by a popup, etc.).
 --
@ -1462,6 +1672,20 @@ setCursorPos :: (MonadIO m) => Ptr ImVec2 -> m ()
 setCursorPos posPtr = liftIO do
  [C.exp| void { SetCursorPos(*$(ImVec2* posPtr)) } |]

+-- | Get cursor position in window-local coordinates.
+--
+-- Useful to overlap draw using 'setCursorPos'.
+--
+-- Wraps @ImGui::SetCursorPos()@
+getCursorPos :: (MonadIO m) => m ImVec2
+getCursorPos = liftIO do
+  C.withPtr_ \ptr ->
+    [C.block|
+      void {
+        *$(ImVec2 * ptr) = GetCursorPos();
+      }
+    |]
+
 -- | Cursor position in absolute coordinates.
 --
 -- Useful to work with 'DrawList' API.
--- a/src/DearImGui/Raw/Context.hs
+++ b/src/DearImGui/Raw/Context.hs
@ -6,7 +6,7 @@
 {-# language PatternSynonyms #-}
 {-# language TemplateHaskell #-}

-module DearImGui.Context where
+module DearImGui.Raw.Context where

 -- containers
 import qualified Data.Map.Strict as Map
@ -34,6 +34,7 @@ imguiContext = mempty
      , ( TypeName "ImVec3", [t| ImVec3 |] )
      , ( TypeName "ImVec4", [t| ImVec4 |] )
      , ( TypeName "ImU32", [t| ImU32 |] )
+      , ( TypeName "ImGuiID", [t| ImGuiID |] )
      , ( TypeName "ImWchar", [t| ImWchar |] )
      , ( TypeName "ImDrawList", [t| ImDrawList |] )
      , ( TypeName "ImGuiContext", [t| ImGuiContext |] )
@ -41,5 +42,6 @@ imguiContext = mempty
      , ( TypeName "ImFontConfig", [t| ImFontConfig |] )
      , ( TypeName "ImFontGlyphRangesBuilder", [t| ImFontGlyphRangesBuilder |] )
      , ( TypeName "ImGuiListClipper", [t| ImGuiListClipper |] )
+      , ( TypeName "ImGuiTableSortSpecs", [t| ImGuiTableSortSpecs |] )
      ]
  }
--- a/src/DearImGui/Raw/DrawList.hs
+++ b/src/DearImGui/Raw/DrawList.hs
@ -115,7 +115,7 @@ import Foreign hiding (new)
 import Foreign.C

 -- dear-imgui
-import DearImGui.Context
+import DearImGui.Raw.Context
  ( imguiContext )
 import DearImGui.Enums
 import DearImGui.Structs
--- a/src/DearImGui/Raw/Font.hs
+++ b/src/DearImGui/Raw/Font.hs
@ -41,7 +41,7 @@ import Foreign ( Ptr, castPtr )
 import Foreign.C

 -- dear-imgui
-import DearImGui.Context
+import DearImGui.Raw.Context
  ( imguiContext )
 import DearImGui.Structs
 import DearImGui.Raw.Font.Config
--- a/src/DearImGui/Raw/Font/Config.hs
+++ b/src/DearImGui/Raw/Font/Config.hs
@ -46,7 +46,7 @@ import Foreign ( Ptr )
 import Foreign.C

 -- dear-imgui
-import DearImGui.Context
+import DearImGui.Raw.Context
  ( imguiContext )
 import DearImGui.Structs
 import DearImGui.Raw.Font.GlyphRanges
--- a/src/DearImGui/Raw/Font/GlyphRanges.hs
+++ b/src/DearImGui/Raw/Font/GlyphRanges.hs
@ -75,7 +75,7 @@ import Foreign.C
 import System.IO.Unsafe (unsafePerformIO)

 -- dear-imgui
-import DearImGui.Context
+import DearImGui.Raw.Context
  ( imguiContext )
 import DearImGui.Structs

--- a/src/DearImGui/Raw/IO.hs
+++ b/src/DearImGui/Raw/IO.hs
@ -39,7 +39,7 @@ import Foreign.C
  )

 -- dear-imgui
-import DearImGui.Context
+import DearImGui.Raw.Context
  ( imguiContext )
 -- import DearImGui.Enums
 -- import DearImGui.Structs
--- a/src/DearImGui/Raw/ListClipper.hs
+++ b/src/DearImGui/Raw/ListClipper.hs
@ -59,7 +59,7 @@ import Foreign.C
 import System.IO.Unsafe (unsafePerformIO)

 -- dear-imgui
-import DearImGui.Context
+import DearImGui.Raw.Context
  ( imguiContext )
 import DearImGui.Structs
  ( ImGuiListClipper )
--- a/src/DearImGui/SDL.hs
+++ b/src/DearImGui/SDL.hs
@ -50,7 +50,7 @@ import Control.Monad.IO.Class

 C.context (Cpp.cppCtx <> C.bsCtx)
 C.include "imgui.h"
-C.include "backends/imgui_impl_sdl.h"
+C.include "backends/imgui_impl_sdl2.h"
 C.include "SDL.h"
 Cpp.using "namespace ImGui"

--- a/src/DearImGui/SDL/OpenGL.hs
+++ b/src/DearImGui/SDL/OpenGL.hs
@ -42,7 +42,7 @@ import Control.Monad.IO.Class
 C.context (Cpp.cppCtx <> C.bsCtx)
 C.include "imgui.h"
 C.include "backends/imgui_impl_opengl2.h"
-C.include "backends/imgui_impl_sdl.h"
+C.include "backends/imgui_impl_sdl2.h"
 C.include "SDL.h"
 C.include "SDL_opengl.h"
 Cpp.using "namespace ImGui"
--- a/src/DearImGui/SDL/Vulkan.hs
+++ b/src/DearImGui/SDL/Vulkan.hs
@ -33,7 +33,7 @@ import Control.Monad.IO.Class ( MonadIO, liftIO )
 C.context Cpp.cppCtx
 C.include "imgui.h"
 C.include "backends/imgui_impl_vulkan.h"
-C.include "backends/imgui_impl_sdl.h"
+C.include "backends/imgui_impl_sdl2.h"
 C.include "SDL.h"
 C.include "SDL_vulkan.h"
 Cpp.using "namespace ImGui"
--- a/src/DearImGui/Structs.hs
+++ b/src/DearImGui/Structs.hs
@ -1,13 +1,25 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE CPP #-}

 module DearImGui.Structs where

 -- base
 import Data.Word
-  ( Word32, Word16 )
+  ( Word32
+#ifndef IMGUI_USE_WCHAR32
+  , Word16
+#endif
+  )
+
 import Foreign
-  ( Storable(..), castPtr, plusPtr )
+  ( Storable(..), castPtr, plusPtr, Ptr, Int16, nullPtr )
+import Foreign.C
+  ( CInt, CBool )
+
+import DearImGui.Enums
+import Data.Bits ((.&.))

 --------------------------------------------------------------------------------
 data ImVec2 = ImVec2 { x, y :: {-# unpack #-} !Float }
@ -92,9 +104,111 @@ data ImDrawList
 -- | 'DearImGui.Raw.ListClipper.ListClipper' pointer tag.
 data ImGuiListClipper

+-- | A unique ID used by widgets (typically the result of hashing a stack of string)
+--   unsigned Integer (same as ImU32)
+type ImGuiID = ImU32
+
 -- | 32-bit unsigned integer (often used to store packed colors).
 type ImU32 = Word32

+type ImS16 = Int16
+
 -- | Single wide character (used mostly in glyph management)
+#ifdef IMGUI_USE_WCHAR32
+type ImWchar = Word32
+#else
 type ImWchar = Word16
-- FIXME: consider IMGUI_USE_WCHAR32
+#endif
+
+--------------------------------------------------------------------------------
+
+-- | Sorting specifications for a table (often handling sort specs for a single column, occasionally more)
+--   Obtained by calling TableGetSortSpecs().
+--   When @SpecsDirty == true@ you can sort your data. It will be true with sorting specs have changed since last call, or the first time.
+--   Make sure to set @SpecsDirty = false@ after sorting, else you may wastefully sort your data every frame!
+data ImGuiTableSortSpecs = ImGuiTableSortSpecs
+  { specs      :: Ptr ImGuiTableColumnSortSpecs
+  , specsCount :: CInt
+  , specsDirty :: CBool
+  } deriving (Show, Eq)
+
+instance Storable ImGuiTableSortSpecs where
+  sizeOf _ =
+    sizeOf (undefined :: Ptr ImGuiTableColumnSortSpecs) +
+    sizeOf (undefined :: CInt) +
+    sizeOf (undefined :: CBool)
+
+  alignment _ =
+    alignment nullPtr
+
+  poke ptr ImGuiTableSortSpecs{..} = do
+    let specsPtr = castPtr ptr
+    poke specsPtr specs
+
+    let specsCountPtr = castPtr $ specsPtr `plusPtr` sizeOf specs
+    poke specsCountPtr specsCount
+
+    let specsDirtyPtr = castPtr $ specsCountPtr `plusPtr` sizeOf specsCount
+    poke specsDirtyPtr specsDirty
+
+  peek ptr = do
+    let specsPtr = castPtr ptr
+    specs <- peek specsPtr
+
+    let specsCountPtr = castPtr $ specsPtr `plusPtr` sizeOf specs
+    specsCount <- peek specsCountPtr
+
+    let specsDirtyPtr = castPtr $ specsCountPtr `plusPtr` sizeOf specsCount
+    specsDirty <- peek specsDirtyPtr
+
+    pure ImGuiTableSortSpecs{..}
+
+-- | Sorting specification for one column of a table
+data ImGuiTableColumnSortSpecs = ImGuiTableColumnSortSpecs
+  { columnUserID  :: ImGuiID            -- ^ User id of the column (if specified by a TableSetupColumn() call)
+  , columnIndex   :: ImS16              -- ^ Index of the column
+  , sortOrder     :: ImS16              -- ^ Index within parent ImGuiTableSortSpecs (always stored in order starting from 0, tables sorted on a single criteria will always have a 0 here)
+  , sortDirection :: ImGuiSortDirection -- ^ 'ImGuiSortDirection_Ascending' or 'ImGuiSortDirection_Descending'
+  } deriving (Show, Eq)
+
+instance Storable ImGuiTableColumnSortSpecs where
+  sizeOf _ = 12
+  alignment _ = 4
+
+  poke ptr ImGuiTableColumnSortSpecs{..} = do
+    let columnUserIDPtr = castPtr ptr
+    poke columnUserIDPtr columnUserID
+
+    let columnIndexPtr = castPtr $ columnUserIDPtr `plusPtr` sizeOf columnUserID
+    poke columnIndexPtr columnIndex
+
+    let sortOrderPtr = castPtr $ columnIndexPtr `plusPtr` sizeOf columnIndex
+    poke sortOrderPtr sortOrder
+
+    let sortDirectionPtr = castPtr $ sortOrderPtr `plusPtr` sizeOf sortOrder
+    poke sortDirectionPtr sortDirection
+
+  peek ptr = do
+    let columnUserIDPtr = castPtr ptr
+    columnUserID <- peek columnUserIDPtr
+
+    let columnIndexPtr = castPtr $ columnUserIDPtr `plusPtr` sizeOf columnUserID
+    columnIndex <- peek columnIndexPtr
+
+    let sortOrderPtr = castPtr $ columnIndexPtr `plusPtr` sizeOf columnIndex
+    sortOrder <- peek sortOrderPtr
+
+    let sortDirectionPtr = castPtr $ sortOrderPtr `plusPtr` sizeOf sortOrder
+    sortDirection' <- peek sortDirectionPtr :: IO CInt
+    -- XXX: Specs struct uses trimmed field: @SortDirection : 8@
+    let sortDirection = case sortDirection' .&. 0xFF of
+          0 ->
+            ImGuiSortDirection_None
+          1 ->
+            ImGuiSortDirection_Ascending
+          2 ->
+            ImGuiSortDirection_Descending
+          _ ->
+            error $ "Unexpected value for ImGuiSortDirection: " <> show sortDirection
+
+    pure ImGuiTableColumnSortSpecs{..}
--- a/src/DearImGui/Vulkan.hs
+++ b/src/DearImGui/Vulkan.hs
@ -19,6 +19,8 @@ module DearImGui.Vulkan
  , vulkanCreateFontsTexture
  , vulkanDestroyFontUploadObjects
  , vulkanSetMinImageCount
+
+  , vulkanAddTexture
  )
  where

@ -32,7 +34,7 @@ import Foreign.Marshal.Alloc
 import Foreign.Ptr
  ( FunPtr, Ptr, freeHaskellFunPtr, nullPtr )
 import Foreign.Storable
-  ( Storable(poke) )
+  ( poke )

 -- inline-c
 import qualified Language.C.Inline as C
@ -92,7 +94,7 @@ withVulkan initInfo renderPass action =
    ( \ ( _, initResult ) -> action initResult )

 -- | Wraps @ImGui_ImplVulkan_Init@.
-- 
+--
 -- Use 'vulkanShutdown' to clean up on shutdown.
 -- Prefer using 'withVulkan' when possible, as it automatically handles cleanup.
 vulkanInit :: MonadIO m => InitInfo -> Vulkan.RenderPass -> m (FunPtr (Vulkan.Result -> IO ()), Bool)
@ -184,3 +186,16 @@ vulkanDestroyFontUploadObjects = liftIO do
 vulkanSetMinImageCount :: MonadIO m => Word32 -> m ()
 vulkanSetMinImageCount minImageCount = liftIO do
  [C.exp| void { ImGui_ImplVulkan_SetMinImageCount($(uint32_t minImageCount)); } |]
+
+-- | Wraps @ImGui_ImplVulkan_AddTexture@.
+vulkanAddTexture :: MonadIO m => Vulkan.Sampler -> Vulkan.ImageView -> Vulkan.ImageLayout -> m Vulkan.DescriptorSet
+vulkanAddTexture sampler imageView imageLayout = liftIO do
+  [C.block|
+    VkDescriptorSet {
+      return ImGui_ImplVulkan_AddTexture(
+        $(VkSampler sampler),
+        $(VkImageView imageView),
+        $(VkImageLayout imageLayout)
+      );
+    }
+  |]
--- a/src/DearImGui/Vulkan/Types.hs
+++ b/src/DearImGui/Vulkan/Types.hs
@ -31,6 +31,10 @@ vulkanTypesTable = Map.fromList
  , ( C.TypeName "VkRenderPass"         , [t| Vulkan.RenderPass          |] )
  , ( C.TypeName "VkResult"             , [t| Vulkan.Result              |] )
  , ( C.TypeName "VkSampleCountFlagBits", [t| Vulkan.SampleCountFlagBits |] )
+  , ( C.TypeName "VkSampler"            , [t| Vulkan.Sampler             |] )
+  , ( C.TypeName "VkImageView"          , [t| Vulkan.ImageView           |] )
+  , ( C.TypeName "VkImageLayout"        , [t| Vulkan.ImageLayout         |] )
+  , ( C.TypeName "VkDescriptorSet"      , [t| Vulkan.DescriptorSet       |] )
  ]

 vulkanCtx :: C.Context
Author	SHA1	Message	Date
Stefan Dresselhaus	6195b32afd	upgraded imgui to v1.89.7; Downstream-breakage possible	2023-07-17 17:50:17 +02:00
Tristan de Cacqueray	8368192370	Allow base-4.19 for ghc-9.6 (#177 ) Co-authored-by: Alexander Bondarenko <486682+dpwiz@users.noreply.github.com>	2023-07-02 21:54:03 +00:00
Tristan de Cacqueray	ea3ad959f9	Add getCursorPos (#176 )	2023-07-03 00:48:44 +03:00
Tristan de Cacqueray	0cc654f190	Update bound for ghc-9.6 (#174 ) * Update bound for ghc-9.6 * Update ci action versions	2023-05-07 17:44:13 +03:00
romes	8697aa3a0a	Expose DearImGui.Raw.Context (#172 )	2023-01-15 15:27:15 +02:00
Alexander Bondarenko	802bdb72fe	Fix cabal flag for image example (#170 )	2022-12-24 12:21:51 +02:00
Alexander Bondarenko	69a463d98b	Fix vulkan versions to a fresh set (#168 ) vulkan, vulkan-utils and VMA can be too old/new for each other. This cuts a fresh, known-to-work set of lower bounds.	2022-12-12 18:33:48 +00:00
Alexander Bondarenko	9bb66f0113	Fix the text fix and prepare 2.1.3 (#167 )	2022-12-12 19:57:54 +02:00
romes	68e30d98ad	Fix off-by-one bug in string null termination (#166 ) Backport withCString fix and use text version when available	2022-12-12 18:20:39 +03:00
Tristan de Cacqueray	52142bbf7e	Add formatPtr to Raw.dragFloat* and Raw.sliderFloat* (#165 )	2022-12-05 17:47:21 +03:00
Tristan de Cacqueray	d933248a2c	This change fixes the high level API to use the right Raw call (#164 )	2022-12-02 17:50:04 +02:00
Alexander Bondarenko	258777f8c7	Fix sdl flag in cabal.project (#163 )	2022-11-30 17:08:06 +00:00
Alexander Bondarenko	cd99938f97	Prepare v2.1.2 (#162 )	2022-11-30 16:32:44 +00:00
Tristan de Cacqueray	48486ee8c2	Add setNextItemOpen (#161 ) This change enables starting a new TreeNode open.	2022-11-28 15:56:27 +03:00
Tristan de Cacqueray	a2feb73fa5	Fix the glfw example build condition (#159 ) The example needs the opengl2 flag.	2022-11-22 21:13:18 +02:00
Tristan de Cacqueray	051a17a1c5	Add plotLines (#158 )	2022-11-20 17:57:15 +02:00
Alexander Bondarenko	9dac0f9fbe	Prepare 2.1.1 (#157 )	2022-08-30 21:13:04 +00:00
Axis Sivitz	dab5937eee	Fix compilation on MacOS / GHC 8.10.7 (#156 ) Fixes errors along the lines of: dear-imgui > [ 2 of 17] Compiling DearImGui.GLFW dear-imgui > error: unknown type name 'constexpr' So the "-std=c++11" option is not being passed to the C++ compiler on MacOS. The issue seems related to https://github.com/haskell/cabal/issues/6421	2022-08-30 21:57:08 +03:00
Alexander Bondarenko	7795b3d838	Prepare 2.1.0 (#153 ) Breaking change in upstream.	2022-07-25 18:14:21 +00:00
Alexander Bondarenko	3a5abb2037	Update to 1.88 (#152 )	2022-07-25 17:58:22 +00:00
Stefan Dresselhaus	06eb052cc5	added flag_ImDrawIdx (#151 ) Co-authored-by: Stefan Dresselhaus <stefan@dresselhaus.cloud>	2022-07-23 15:42:13 +03:00
Alexander Bondarenko	cf87988336	Prepare 2.0.0 (#148 )	2022-05-15 23:37:43 +03:00
Alexander Bondarenko	3c1d381c14	Replace String arguments with Text (#138 ) Shave a few allocations and pointer-chasing due to conversion.	2022-05-15 22:41:10 +03:00
Alexander Bondarenko	04fe618871	Prepare 1.5.0 (#140 )	2022-03-28 13:22:11 +00:00
Alexander Bondarenko	08d4b423ad	Fix GHC-9.2 build (#145 )	2022-03-28 13:04:22 +00:00
Alexander Bondarenko	7d4f3a8b93	Make value and read-only range types distinct (#143 ) Fixes #142	2022-03-23 21:22:05 +03:00
Alexander Bondarenko	bc590d97c5	Tweak tables and add an example (#139 ) Previously: #135	2022-03-22 22:36:19 +03:00
Stefan Dresselhaus	e5969f6b35	implementation of ImGui Tables (#135 )	2022-03-11 16:48:11 +03:00
Stefan Dresselhaus	f066d03017	added options to selectable (#137 )	2022-03-10 15:17:42 +00:00
Alexander Bondarenko	fc307a4d6e	Add remaining popup wrappers (#136 ) - BeginPopupContextItem - BeginPopupContextWindow - BeginPopupContextVoid For #132	2022-03-10 11:34:13 +03:00
Alexander Bondarenko	4517af8123	Add isPopupOpen and wrappers (#134 )	2022-03-09 21:08:54 +03:00
Stefan Dresselhaus	b837d583a5	added openPopupOnItemClick (#133 )	2022-02-25 17:28:53 +00:00
Alexander Bondarenko	67e169dc35	Prepare 1.4.0 (#129 )	2022-02-13 19:31:45 +03:00
Alexander Bondarenko	ae3fdb8bc3	Add new GLFW callback from 1.87 (#128 )	2022-02-13 16:12:15 +00:00
Alexander Bondarenko	ccdff36774	Add wchar32 and disable-obsolete flags (#127 )	2022-02-13 16:05:49 +00:00
Alexander Bondarenko	af6ba9e989	Add image support for vulkan backend (#126 )	2022-02-13 14:24:08 +00:00
Alexander Bondarenko	dc11fad07f	Update to 1.87 (#125 )	2022-02-13 00:26:39 +03:00
Alexander Bondarenko	265d143261	Prepare 1.3.1 (#123 )	2022-01-31 10:56:12 +03:00
Alexander Bondarenko	0877843619	Update upstream to 1.86 (#122 )	2022-01-19 23:36:33 +03:00