Update to work with text-2.0

Author: Mikolaj

src/SDL/Font.hs

@@ -94,10 +94,10 @@ import Data.ByteString        (ByteString)
 import Data.ByteString.Unsafe (unsafeUseAsCStringLen, unsafePackCString)
 import Data.Text              (Text)
 import Data.Text.Encoding     (decodeUtf8)
-import Data.Text.Foreign      (lengthWord16, unsafeCopyToPtr)
+import Data.Text.Foreign      (lengthWord8, unsafeCopyToPtr)
 import Data.Word              (Word8, Word16)
 import Foreign.C.String       (CString, withCString)
-import Foreign.C.Types        (CUShort, CInt)
+import Foreign.C.Types        (CChar, CUShort, CInt)
 import Foreign.Marshal.Alloc  (allocaBytes, alloca)
 import Foreign.Marshal.Utils  (with, fromBool, toBool)
 import Foreign.Ptr            (Ptr, castPtr, nullPtr)
@@ -244,14 +244,14 @@ blended (Font font) (V4 r g b a) text =
 
 -- Analogous to Data.Text.Foreign.useAsPtr, just appends a null-byte.
 -- FIXME: Is this even necessary?
-withText :: Text -> (Ptr Word16 -> IO a) -> IO a
+withText :: Text -> (Ptr Word8 -> IO a) -> IO a
 withText text act =
   allocaBytes len $ \ptr -> do
     unsafeCopyToPtr text ptr
-    pokeByteOff ptr (len - 2) (0 :: CUShort)
+    pokeByteOff ptr (len - 2) (0 :: CChar)
     act ptr
   where
-    len = 2*(lengthWord16 text + 1)
+    len = lengthWord8 text + 1
 
 -- Helper function for converting a bitmask into a list of values.
 fromMaskWith :: (Enum a, Bounded a) => (a -> CInt) -> CInt -> [a]
@@ -505,7 +505,7 @@ blendedGlyph (Font font) (V4 r g b a) ch =
         with (SDL.Raw.Color r g b a) $ \fg ->
           SDL.Raw.Font.renderGlyph_Blended font (fromChar ch) fg
 
--- | Same as 'blended', but renders across multiple lines. 
+-- | Same as 'blended', but renders across multiple lines.
 --   Text is wrapped to multiple lines on line endings and on word boundaries
 --   if it extends beyond wrapLength in pixels.
 blendedWrapped :: MonadIO m => Font -> Color -> Int -> Text -> m SDL.Surface