fixed compile-errors.

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "imgui"]
 	path = imgui
-	url = https://github.com/ocornut/imgui
+	url = https://github.com/Drezil/imgui
+  branch = textAlign

ChangeLog.md

@@ -1,26 +1,5 @@
 # Changelog for dear-imgui
 
-## [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].
@@ -89,10 +68,6 @@ Initial Hackage release based on [1.83].
 [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
 
 [1.87]: https://github.com/ocornut/imgui/releases/tag/v1.87
 [1.86]: https://github.com/ocornut/imgui/releases/tag/v1.86

Main.hs

@@ -10,7 +10,6 @@ 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
@@ -135,18 +134,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 (pack . mappend "Item " . show)
+    let lotsOfItems = Vector.generate 50 (mappend "Item " . show)
     withListClipper Nothing lotsOfItems text
 
   text "ListClipper, Haskell-powered"
   withChildOpen "##infinite" (ImVec2 0 200) True ImGuiWindowFlags_None do
-    let infiniteItems = map (pack . mappend "Item " . show) [0 :: Int ..]
+    let infiniteItems = map (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 . pack . mappend "Item " . show
+      text . mappend "Item " . show
 
   plotHistogram "A histogram" [ 10, 10, 20, 30, 90 ]
 

dear-imgui.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name: dear-imgui
-version: 2.1.1
+version: 1.4.0
 author: Oliver Charles
 maintainer: ollie@ocharles.org.uk, aenor.realm@gmail.com
 license: BSD-3-Clause
@@ -13,10 +13,11 @@ description:
   Set package flags according to your needs.
 
 build-type: Simple
-
 extra-source-files:
   README.md,
-  ChangeLog.md,
+  ChangeLog.md
+
+extra-source-files:
   imgui/*.h,
   imgui/backends/*.h,
   imgui/backends/*.mm,
@@ -125,17 +126,6 @@ flag use-wchar32
   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
@@ -147,29 +137,20 @@ library
   import: common
   hs-source-dirs:
     src
-    generator
   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.IO
     DearImGui.Raw.ListClipper
+    DearImGui.Raw.IO
   other-modules:
     DearImGui.Context
     DearImGui.Enums
     DearImGui.Structs
-    DearImGui.Generator
-    DearImGui.Generator.Parser
-    DearImGui.Generator.Tokeniser
-    DearImGui.Generator.Types
-  ghc-options:
-    -static -dynamic-too
-    -- create both libHSdear-imgui... .a and .so
   cxx-options: -std=c++11
   cxx-sources:
     imgui/imgui.cpp
@@ -177,51 +158,19 @@ library
     imgui/imgui_draw.cpp
     imgui/imgui_tables.cpp
     imgui/imgui_widgets.cpp
-  install-includes:
-    imgui.h
-    imgui_internal.h
-    imstb_rectpack.h
-    imstb_textedit.h
-    imstb_truetype.h
   extra-libraries:
     stdc++
   include-dirs:
     imgui
   build-depends:
-      managed
+      dear-imgui-generator
+    , containers
+    , managed
+    , inline-c
     , inline-c-cpp
     , StateVar
     , unliftio
     , vector
-    -- for the generator:
-    , template-haskell
-        >= 2.15 && < 2.19
-    , containers
-       ^>= 0.6.2.1
-    , directory
-        >= 1.3 && < 1.4
-    , filepath
-        >= 1.4 && < 1.5
-    , inline-c
-        >= 0.9.0.0 && < 0.10
-    , megaparsec
-        >= 9.0 && < 9.3
-    , parser-combinators
-        >= 1.2.0 && < 1.4
-    , scientific
-        >= 0.3.6.2 && < 0.3.8
-    , text
-        >= 1.2.4 && < 2.1
-    , th-lift
-        >= 0.7 && < 0.9
-    , transformers
-        >= 0.5.6 && < 0.6
-    , unordered-containers
-        >= 0.2.11 && < 0.3
-
-  if os(darwin)
-    ghc-options:
-      -optcxx-std=c++11
 
   if flag(disable-obsolete)
     cxx-options: -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS
@@ -230,10 +179,6 @@ library
     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:
       DearImGui.OpenGL2
@@ -315,6 +260,40 @@ library
       exposed-modules:
         DearImGui.GLFW.Vulkan
 
+library dear-imgui-generator
+  import: common
+  hs-source-dirs: generator
+  exposed-modules:
+      DearImGui.Generator
+    , DearImGui.Generator.Parser
+    , DearImGui.Generator.Tokeniser
+    , DearImGui.Generator.Types
+  build-depends:
+      template-haskell
+        >= 2.15 && < 2.19
+    , containers
+       ^>= 0.6.2.1
+    , directory
+        >= 1.3 && < 1.4
+    , filepath
+        >= 1.4 && < 1.5
+    , inline-c
+        >= 0.9.0.0 && < 0.10
+    , megaparsec
+        >= 9.0 && < 9.3
+    , parser-combinators
+        >= 1.2.0 && < 1.4
+    , scientific
+        >= 0.3.6.2 && < 0.3.8
+    , text
+        >= 1.2.4 && < 1.3
+    , th-lift
+        >= 0.7 && < 0.9
+    , transformers
+        >= 0.5.6 && < 0.6
+    , unordered-containers
+        >= 0.2.11 && < 0.3
+
 executable test
   import: common, exe-flags
   main-is: Main.hs
@@ -332,7 +311,7 @@ executable glfw
   if (!flag(examples) || !flag(glfw) || !flag(opengl2))
     buildable: False
   else
-    build-depends: base, GLFW-b, gl, dear-imgui, managed, text
+    build-depends: base, GLFW-b, gl, dear-imgui, managed
 
 executable readme
   import: common, exe-flags

examples/glfw/Main.hs

@@ -1,7 +1,6 @@
 {-# language BlockArguments #-}
 {-# language LambdaCase #-}
 {-# language OverloadedStrings #-}
-{-# language RecordWildCards #-}
 
 module Main ( main ) where
 
@@ -9,12 +8,6 @@ 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
@@ -47,23 +40,14 @@ main = do
         -- Initialize ImGui's OpenGL backend
         _ <- managed_ $ bracket_ openGL2Init openGL2Shutdown
 
-        tableRef <- liftIO $ newIORef
+        liftIO $ mainLoop win
-          [ (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 -> IORef [(Integer, Text)] -> IO ()
+mainLoop :: Window -> IO ()
-mainLoop win tableRef = do
+mainLoop win = do
   -- Process the event loop
   GLFW.pollEvents
   close <- GLFW.windowShouldClose win
@@ -89,9 +73,8 @@ mainLoop win tableRef = do
           when clicked $
             closeCurrentPopup
 
-      newLine
+    -- Show the ImGui demo window
-
+    showDemoWindow
-      mkTable tableRef
 
     -- Render
     glClear GL_COLOR_BUFFER_BIT
@@ -101,41 +84,4 @@ mainLoop win tableRef = do
 
     GLFW.swapBuffers win
 
-    mainLoop win tableRef
+    mainLoop win
-
-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
-      }

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,10 +374,11 @@ chooseSwapchainFormat
 
       case sortOn ( Down . score ) ( Boxed.Vector.toList surfaceFormats ) of
         [] -> error "No formats found."
-        Vulkan.SurfaceFormatKHR{format=Vulkan.FORMAT_UNDEFINED} : _rest ->
+        ( best : _ )
-          pure preferredFormat
+          | Vulkan.FORMAT_UNDEFINED <- ( Vulkan.format :: Vulkan.SurfaceFormatKHR -> Vulkan.Format ) best
-        best : _rest
+            -> pure preferredFormat
-          -> pure best
+          | otherwise
+            -> pure best
 
     where
       match :: Eq a => a -> a -> Int
@@ -405,17 +406,20 @@ 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
 
-    Vulkan.SurfaceCapabilitiesKHR{currentExtent, currentTransform} = surfaceCapabilities
+    currentExtent :: Vulkan.Extent2D
-    Vulkan.SurfaceFormatKHR{format=fmt, colorSpace=csp} = surfaceFormat
+    currentExtent = ( Vulkan.currentExtent :: Vulkan.SurfaceCapabilitiesKHR -> Vulkan.Extent2D ) surfaceCapabilities
+
+    currentTransform :: Vulkan.SurfaceTransformFlagBitsKHR
+    currentTransform = ( Vulkan.currentTransform :: Vulkan.SurfaceCapabilitiesKHR -> Vulkan.SurfaceTransformFlagBitsKHR ) surfaceCapabilities
 
     swapchainCreateInfo :: Vulkan.SwapchainCreateInfoKHR '[]
     swapchainCreateInfo =
@@ -424,8 +428,8 @@ createSwapchain physicalDevice device surface surfaceFormat imageUsage imageCoun
         , Vulkan.flags                 = Vulkan.zero
         , Vulkan.surface               = Vulkan.SurfaceKHR surface
         , Vulkan.minImageCount         = imageCount
-        , Vulkan.imageFormat           = fmt
+        , Vulkan.imageFormat           = ( Vulkan.format     :: Vulkan.SurfaceFormatKHR -> Vulkan.Format        ) surfaceFormat
-        , Vulkan.imageColorSpace       = csp
+        , Vulkan.imageColorSpace       = ( Vulkan.colorSpace :: Vulkan.SurfaceFormatKHR -> Vulkan.ColorSpaceKHR ) surfaceFormat
         , Vulkan.imageExtent           = currentExtent
         , Vulkan.imageArrayLayers      = 1
         , Vulkan.imageUsage            = imageUsage
@@ -490,7 +494,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 ]
         }
 
@@ -587,7 +591,7 @@ createFramebuffer
   -> Vulkan.Extent2D
   -> f Vulkan.ImageView
   -> m ( ResourceT.ReleaseKey, Vulkan.Framebuffer )
-createFramebuffer dev renderPass Vulkan.Extent2D{width, height} attachments = Vulkan.withFramebuffer dev createInfo Nothing ResourceT.allocate
+createFramebuffer dev renderPass extent attachments = Vulkan.withFramebuffer dev createInfo Nothing ResourceT.allocate
   where
     createInfo :: Vulkan.FramebufferCreateInfo '[]
     createInfo =
@@ -596,8 +600,8 @@ createFramebuffer dev renderPass Vulkan.Extent2D{width, height} attachments = Vu
         , Vulkan.flags       = Vulkan.zero
         , Vulkan.renderPass  = renderPass
         , Vulkan.attachments = Boxed.Vector.fromList . toList $ attachments
-        , Vulkan.width       = width
+        , Vulkan.width       = ( Vulkan.width  :: Vulkan.Extent2D -> Word32 ) extent
-        , Vulkan.height      = height
+        , Vulkan.height      = ( Vulkan.height :: Vulkan.Extent2D -> Word32 ) extent
         , Vulkan.layers      = 1
         }
 

examples/vulkan/Main.hs

@@ -201,7 +201,9 @@ app = do
   surfaceCapabilities <- Vulkan.getPhysicalDeviceSurfaceCapabilitiesKHR physicalDevice ( Vulkan.SurfaceKHR surface )
 
   let
-    Vulkan.SurfaceCapabilitiesKHR{minImageCount, maxImageCount} = surfaceCapabilities
+    minImageCount, maxImageCount, imageCount :: Word32
+    minImageCount = ( Vulkan.minImageCount :: Vulkan.SurfaceCapabilitiesKHR -> Word32 ) surfaceCapabilities
+    maxImageCount = ( Vulkan.maxImageCount :: Vulkan.SurfaceCapabilitiesKHR -> Word32 ) surfaceCapabilities
     imageCount
       | maxImageCount == 0 =   minImageCount + 1
       | otherwise          = ( minImageCount + 1 ) `min` maxImageCount
@@ -211,30 +213,31 @@ app = do
 
     swapchainResources :: Maybe SwapchainResources -> m ( m (), SwapchainResources )
     swapchainResources mbOldResources = do
-      ( colFmt, surfaceFormat, imGuiRenderPass ) <- case mbOldResources of
+      ( surfaceFormat, imGuiRenderPass ) <- case mbOldResources of
         Nothing -> do
           logDebug "Choosing swapchain format & color space"
           surfaceFormat <- chooseSwapchainFormat preferredFormat physicalDevice surface
-          let Vulkan.SurfaceFormatKHR{format=colFmt} = surfaceFormat
+          let
+            colFmt :: Vulkan.Format
+            colFmt = ( Vulkan.format :: Vulkan.SurfaceFormatKHR -> Vulkan.Format ) surfaceFormat
           logDebug "Creating Dear ImGui render pass"
           ( _, imGuiRenderPass ) <-
             simpleRenderPass device
               ( noAttachments
                 { colorAttachments = Boxed.Vector.singleton $ presentableColorAttachmentDescription colFmt }
               )
-          pure ( colFmt, surfaceFormat, imGuiRenderPass )
+          pure ( surfaceFormat, imGuiRenderPass )
-        Just oldResources -> do
+        Just oldResources -> pure ( surfaceFormat oldResources, imGuiRenderPass oldResources )
-          let surFmt = surfaceFormat oldResources
+
-          let Vulkan.SurfaceFormatKHR{format=colFmt} = surFmt
+      let
-          pure ( colFmt, surFmt, imGuiRenderPass oldResources )
+        colFmt :: Vulkan.Format
+        colFmt = ( Vulkan.format :: Vulkan.SurfaceFormatKHR -> Vulkan.Format ) surfaceFormat
 
       logDebug "Creating swapchain"
       ( swapchainKey, swapchain, swapchainExtent ) <-
         createSwapchain
-          physicalDevice
+          physicalDevice device
-          device
+          surface surfaceFormat
-          surface
-          surfaceFormat
           surfaceUsage
           imageCount
           ( swapchain <$> mbOldResources )

generator/DearImGui/Generator.hs

@@ -24,10 +24,6 @@ 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
@@ -175,7 +171,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

src/DearImGui/FontAtlas.hs

@@ -119,8 +119,6 @@ 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)
 
@@ -334,10 +332,10 @@ addChar char =
     GlyphRanges.addChar builder char
 
 -- | UTF-8 string
-addText :: Text -> RangesBuilderSetup
+addText :: String -> RangesBuilderSetup
 addText str =
   RangesBuilderSetup \builder ->
-    Text.withCString str (GlyphRanges.addText builder)
+    withCString str (GlyphRanges.addText builder)
 
 -- | Existing ranges (as is)
 addRangesRaw :: GlyphRanges -> RangesBuilderSetup

src/DearImGui/Internal/Text.hs

@@ -1,72 +0,0 @@
-{-# LANGUAGE CPP #-}
-
-module DearImGui.Internal.Text
-  ( withCString
-  , withCStringOrNull
-  , withCStringLen
-  , withCStringEnd
-  , peekCString
-
-  , Text
-  , pack
-  , unpack
-  ) where
-
--- base
-import Control.Monad.IO.Class (liftIO)
-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,0)
-
-import Data.Text.Foreign (lengthWord8, unsafeCopyToPtr)
-import Data.Word (Word8)
-import Foreign (castPtr, free, mallocBytes, pokeByteOff)
-import UnliftIO.Exception (bracket)
-
-withCString :: MonadUnliftIO m => Text -> (CString -> m a) -> m a
-withCString t = bracket create destroy
-  where
-    size0 = lengthWord8 t + 1
-
-    create = liftIO $ do
-      ptr <- mallocBytes size0
-      unsafeCopyToPtr t (castPtr ptr)
-      pokeByteOff ptr size0 (0 :: Word8)
-      pure ptr
-
-    destroy ptr =
-      liftIO $ free ptr
-
-#else
-
-withCString :: MonadUnliftIO m => Text -> (CString -> m a) -> m a
-withCString t action = do
-  withUnliftIO $ \(UnliftIO unlift) ->
-    liftIO $
-      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)

src/DearImGui/Raw.hs

@@ -6,7 +6,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE QuasiQuotes #-}
-{-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE ViewPatterns #-}
 
@@ -164,14 +163,13 @@ module DearImGui.Raw
   , tableNextRow
   , tableNextColumn
   , tableSetColumnIndex
-
+  
   , tableSetupColumn
   , tableSetupScrollFreeze
   , tableHeadersRow
   , tableHeader
-
+  
   , tableGetSortSpecs
-  , tableClearSortSpecsDirty
 
   , tableGetColumnCount
   , tableGetColumnIndex
@@ -185,7 +183,6 @@ module DearImGui.Raw
   , treeNode
   , treePush
   , treePop
-  , setNextItemOpen
 
     -- ** Selectables
   , selectable
@@ -194,7 +191,6 @@ module DearImGui.Raw
   , listBox
 
     -- * Data Plotting
-  , plotLines
   , plotHistogram
 
     -- ** Menus
@@ -1100,7 +1096,7 @@ 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
@@ -1169,12 +1165,6 @@ tableGetSortSpecs = liftIO do
   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
@@ -1234,11 +1224,6 @@ 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
@@ -1257,10 +1242,6 @@ 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 ()

src/DearImGui/Raw/DrawList.hs

@@ -412,8 +412,8 @@ addText_ (DrawList drawList) pos col text_begin text_end = liftIO do
     }
   |]
 
-addText :: MonadIO m => DrawList -> Ptr ImFont -> CFloat -> Ptr ImVec2 -> ImU32 -> CString -> CString -> CFloat -> Ptr ImVec4 -> m ()
+addText :: MonadIO m => DrawList -> Ptr ImFont -> CFloat -> Ptr ImVec2 -> ImU32 -> CString -> CString -> CFloat -> CFloat -> Ptr ImVec4 -> m ()
-addText (DrawList drawList) fontPtr font_size pos col text_begin text_end wrap_width cpu_fine_clip_rect = liftIO do
+addText (DrawList drawList) fontPtr font_size pos col text_begin text_end wrap_width text_align cpu_fine_clip_rect = liftIO do
   [C.block|
     void {
       $(ImDrawList* drawList)->AddText(
@@ -424,6 +424,7 @@ addText (DrawList drawList) fontPtr font_size pos col text_begin text_end wrap_w
         $(char* text_begin),
         $(char* text_end),
         $(float wrap_width),
+        $(float text_align),
         $(ImVec4* cpu_fine_clip_rect)
       );
     }

src/DearImGui/Structs.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE CPP #-}
 
 module DearImGui.Structs where
@@ -14,12 +13,11 @@ import Data.Word
   )
 
 import Foreign
-  ( Storable(..), castPtr, plusPtr, Ptr, Int16, nullPtr )
+  ( Storable(..), castPtr, plusPtr, Ptr, Int16 )
 import Foreign.C
   ( CInt, CBool )
 
 import DearImGui.Enums
-import Data.Bits ((.&.))
 
 --------------------------------------------------------------------------------
 data ImVec2 = ImVec2 { x, y :: {-# unpack #-} !Float }
@@ -106,7 +104,7 @@ 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
+type ImGuiID = Word32
 
 -- | 32-bit unsigned integer (often used to store packed colors).
 type ImU32 = Word32
@@ -127,88 +125,62 @@ type ImWchar = Word16
 --   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
+     { imGuiTableColumnSortSpecs :: Ptr ImGuiTableColumnSortSpecs
-  , specsCount :: CInt
+     , imGuiTableSortSpecsCount :: CInt
-  , specsDirty :: CBool
+     , imGuiTableSortSpecsDirty :: CBool
-  } deriving (Show, Eq)
+     }
 
 instance Storable ImGuiTableSortSpecs where
-  sizeOf _ =
+  sizeOf _ = sizeOf (undefined :: Ptr ImGuiTableColumnSortSpecs)
-    sizeOf (undefined :: Ptr ImGuiTableColumnSortSpecs) +
+           + sizeOf (undefined :: CInt)
-    sizeOf (undefined :: CInt) +
+           + sizeOf (undefined :: CBool)
-    sizeOf (undefined :: CBool)
 
-  alignment _ =
+  alignment _ = 0
-    alignment nullPtr
 
-  poke ptr ImGuiTableSortSpecs{..} = do
+  poke ptr (ImGuiTableSortSpecs s c d) = do
-    let specsPtr = castPtr ptr
+    poke ( castPtr ptr                   ) s
-    poke specsPtr specs
+    poke ( castPtr ptr `plusPtr` sizeOf s) c
-
+    poke ((castPtr ptr `plusPtr` sizeOf s)
-    let specsCountPtr = castPtr $ specsPtr `plusPtr` sizeOf specs
+                       `plusPtr` sizeOf c) d
-    poke specsCountPtr specsCount
-
-    let specsDirtyPtr = castPtr $ specsCountPtr `plusPtr` sizeOf specsCount
-    poke specsDirtyPtr specsDirty
 
   peek ptr = do
-    let specsPtr = castPtr ptr
+    s <- peek ( castPtr ptr                   )
-    specs <- peek specsPtr
+    c <- peek ( castPtr ptr `plusPtr` sizeOf s)
-
+    d <- peek ((castPtr ptr `plusPtr` sizeOf s)
-    let specsCountPtr = castPtr $ specsPtr `plusPtr` sizeOf specs
+                            `plusPtr` sizeOf c)
-    specsCount <- peek specsCountPtr
+    return (ImGuiTableSortSpecs s c d)
-
-    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)
+     { imGuiTableColumnSortUserID      :: ImGuiID -- ^ User id of the column (if specified by a TableSetupColumn() call)
-  , columnIndex   :: ImS16              -- ^ Index of the column
+     , imGuiTableColumnSortColumnIndex :: 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)
+     , imGuiTableColumnSortOrder       :: 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'
+     , imGuiTableColumnSortDirection   :: ImGuiSortDirection -- ^ 'ImGuiSortDirection_Ascending' or 'ImGuiSortDirection_Descending'
-  } deriving (Show, Eq)
+     } deriving (Show, Eq)
 
 instance Storable ImGuiTableColumnSortSpecs where
-  sizeOf _ = 12
+  sizeOf _  = sizeOf (undefined :: ImGuiID)
-  alignment _ = 4
+            + sizeOf (undefined :: ImS16)
+            + sizeOf (undefined :: ImS16)
+            + sizeOf (undefined :: ImGuiSortDirection)
 
-  poke ptr ImGuiTableColumnSortSpecs{..} = do
+  alignment _ = 0
-    let columnUserIDPtr = castPtr ptr
-    poke columnUserIDPtr columnUserID
 
-    let columnIndexPtr = castPtr $ columnUserIDPtr `plusPtr` sizeOf columnUserID
+  poke ptr (ImGuiTableColumnSortSpecs a b c d) = do
-    poke columnIndexPtr columnIndex
+    poke (  castPtr ptr                   ) a
-
+    poke (  castPtr ptr `plusPtr` sizeOf a) b
-    let sortOrderPtr = castPtr $ columnIndexPtr `plusPtr` sizeOf columnIndex
+    poke (( castPtr ptr `plusPtr` sizeOf a)
-    poke sortOrderPtr sortOrder
+                        `plusPtr` sizeOf b) c
-
+    poke (((castPtr ptr `plusPtr` sizeOf a)
-    let sortDirectionPtr = castPtr $ sortOrderPtr `plusPtr` sizeOf sortOrder
+                        `plusPtr` sizeOf b)
-    poke sortDirectionPtr sortDirection
+                        `plusPtr` sizeOf c) d
 
   peek ptr = do
-    let columnUserIDPtr = castPtr ptr
+    a <- peek (  castPtr ptr                   )
-    columnUserID <- peek columnUserIDPtr
+    b <- peek (  castPtr ptr `plusPtr` sizeOf a)
-
+    c <- peek (( castPtr ptr `plusPtr` sizeOf a)
-    let columnIndexPtr = castPtr $ columnUserIDPtr `plusPtr` sizeOf columnUserID
+                             `plusPtr` sizeOf b)
-    columnIndex <- peek columnIndexPtr
+    d <- peek (((castPtr ptr `plusPtr` sizeOf a)
-
+                             `plusPtr` sizeOf b)
-    let sortOrderPtr = castPtr $ columnIndexPtr `plusPtr` sizeOf columnIndex
+                             `plusPtr` sizeOf c)
-    sortOrder <- peek sortOrderPtr
+    return (ImGuiTableColumnSortSpecs a b c d)
-
-    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{..}