1 files changed, 19 insertions(+), 8 deletions(-)

M Graphics/Text/Font/Choose/FontSet.hs

@@ 28,21 28,32 @@ foreign import ccall "FcFontSetList" fcFontSetList ::
     Config_ -> Ptr FontSet_ -> Int -> Pattern_ -> ObjectSet_ -> IO FontSet_
 
 fontSetMatch :: Config -> [FontSet] -> Pattern -> Maybe Pattern
-fontSetMatch config fontss pattern = withConfig config $ \config' ->
+fontSetMatch config fontss pattern = unsafePerformIO $ withConfig config $ \config' ->
     withFontSets fontss $ \fontss' -> withPattern $ \pattern' ->  alloca $ \res' -> do
         ret <- fcFontSetMatch config' fontss' n pattern' res'
         throwPtr res' $ thawPattern_ $ pure ret
+fontSetMatch' :: [FontSet] -> Pattern -> Maybe Pattern
+fontSetMatch' fontss pattern = unsafePerformIO $ withFontSets fontss $ \fontss' ->
+    withPattern $ \pattern' -> alloca $ \res' -> do
+        ret <- fcFontSetMatch nullPtr fontss' n pattern' res'
+        throwPtr res' $ thawPattern_ $ pure ret
 foreign import ccall "FcFontSetMatch" fcFontSetMatch ::
     Config_ -> Ptr FontSet_ -> Int -> Pattern_ -> IO Pattern_
 
 fontSetSort :: Config -> [FontSet] -> Pattern -> Bool -> CharSet -> Maybe FontSet
-fontSetSort config fontss pattern trim csp cb = withConfig config $ \config' ->
-        withFontSets fontss $ \fontss' withPattern $ \pattern' ->
-            withCharSet csp $ \csp' -> alloca $ \res' -> do
-                ret' <- fcFontSetSort config' fontss' n pattern' trim csp' res'
-                throwPtr res' $ thawFontSet_ $ pure ret'
-foreign import ccall "FcFontSetSort" fcFontSetSort ::
-    Config_ -> Ptr FontSet_ -> Int -> Pattern_ -> Bool -> CharSet_ -> Ptr Int -> IO FontSet_ -}
+fontSetSort config fontss pattern trim csp = unsafePerformIO $
+    withConfig config $ \config' -> withFontSets fontss $ \fontss' n ->
+        withPattern $ \pattern' -> withCharSet csp $ \csp' -> alloca $ \res' -> do
+            ret' <- fcFontSetSort config' fontss' n pattern' trim csp' res'
+            throwPtr res' $ thawFontSet_ $ pure ret'
+fontSetSort' :: [FontSet] -> Pattern -> Bool -> CharSet -> Maybe FontSet
+fontSetSort' fontss pattern trim csp = unsafePerformIO $ withConfig $ \config' ->
+    withFontSets fontss $ \fontss' n -> withPattern $ \pattern' withCharSet csp $ \csp' ->
+        alloca $ \res' -> do
+            ret' <- fcFontSetSort nullPtr fontss' n pattern' trim csp' res'
+            throwPtr res' $ thawFontSet_ $ pure ret'
+foreign import ccall "FcFontSetSort" fcFontSetSort :: Config_ -> Ptr FontSet_
+    -> Int -> Pattern_ -> Bool -> CharSet_ -> Ptr Int -> IO FontSet_ -}
 
 ------
 --- Low-level