6 files changed, 38 insertions(+), 10 deletions(-)

D Graphics/Text/Font/Choose/Constant.hs
M Graphics/Text/Font/Choose/Init.hs
D Graphics/Text/Font/Choose/LangResult.hs
M Graphics/Text/Font/Choose/LangSet.hs
D Graphics/Text/Font/Choose/ObjectType.hs
M Graphics/Text/Font/Choose/Result.hs

@@ 1,3 0,0 @@
-module Graphics.Text.Font.Choose.Constant where
-
-data Constant = Constant { name :: String, object :: String, value :: Int }

@@ 3,8 3,10 @@ module Graphics.Text.Font.Choose.Init ({-Config, initLoadConfig, initLoadConfigA
 
 import Prelude hiding (init)
 
-{-foreign import ccall "FcInitLoadConfig" initLoadConfig :: IO Config
-foreign import ccall "FcInitLoadConfigAndFonts" initLoadConfigAndFonts :: IO Config-}
+import Graphics.Text.Font.Choose.Config
+
+foreign import ccall "FcInitLoadConfig" initLoadConfig :: IO Config
+foreign import ccall "FcInitLoadConfigAndFonts" initLoadConfigAndFonts :: IO Config
 
 foreign import ccall "FcInit" init :: IO Bool
 foreign import ccall "FcFini" fini :: IO ()

@@ 21,6 21,13 @@ langs :: LangSet
 langs = unsafePerformIO (thawStrSet =<< fcGetLangs)
 foreign import ccall "FcGetLangs" fcGetLangs :: IO StrSet_
 
+data LangResult = SameLang | DifferentTerritory | DifferentLang deriving Enum
+langSetCompare :: LangSet -> LangSet -> LangResult
+langSetCompare a b = unsafePerformIO $ withLangSet a $ \a' -> withLangSet b $ \b' ->
+    (toEnum <$> fcLangSetCompare a' b')
+foreign import ccall "FcLangSetCompare" fcLangSetCompare ::
+    LangSet_ -> LangSet_ -> IO Int
+
 langNormalize :: String -> String
 langNormalize = unsafePerformIO $ flip withCString (peekCString . fcLangNormalize)
 foreign import ccall "FcLangNormalize" fcLangNormalize :: CString -> CString

@@ 1,5 0,0 @@
-module Graphics.Text.Font.Choose.ObjectType
-
-import Graphics.Text.Font.Choose.Value (Value)
-
-data ObjectType = ObjectType String Value

@@ 1,9 1,36 @@
 module Graphics.Text.Font.Choose.Result (Result(..), resultFromPointer) where
 
 import Foreign.Storable (peek)
+import Foreign.Ptr (Ptr, ptrNull)
+import Control.Exception (throwIO, throw, Exception)
 
 data Result = Match | NoMatch | TypeMismatch | ResultNoId | OutOfMemory
     deriving (Eq, Show, Read, Enum)
 
 resultFromPointer :: Ptr Int -> IO Result
 resultFromPointer res = toEnum <$> peek res
+
+data Error = ErrTypeMismatch | ErrResultNoId | ErrOutOfMemory deriving (Eq, Show, Read)
+instance Exception Error
+
+throwResult :: Result -> IO a -> IO (Maybe a)
+throwResult Match x = Just <$> x
+throwResult NoMatch _ = return Nothing
+throwResult TypeMismatch = throwIO ErrTypeMismatch
+throwResult ResultNoId = throwIO ErrResultNoId
+throwResult OutOfMemory = throwIO ErrOutOfMemory
+
+throwInt :: Int -> IO a -> IO (Maybe a)
+throwInt = throwResult . toEnum
+throwPtr :: Ptr Int -> IO a -> IO (Maybe a)
+throwPtr a b = resultFromPointer a >>= flip throwResult b
+
+throwFalse :: Bool -> IO ()
+throwFalse True = return ()
+throwFalse False = throwIO ErrOutOfMemory
+throwFalse' :: IO Bool -> IO ()
+throwFalse' = (>>= throwFalse)
+
+throwNull :: Ptr a -> Ptr a
+throwNull ptr | ptr == ptrNull = throw ErrOutOfMemory
+    | otherwise = ptr