Added getStringWith.

Author: svenpanne

src/Graphics/Rendering/OpenGL/GL/ByteString.hs

@@ -16,11 +16,13 @@
 module Graphics.Rendering.OpenGL.GL.ByteString (
    B.ByteString, stringQuery, createAndTrimByteString,
    withByteString, withGLstring,
-   packUtf8, unpackUtf8
+   packUtf8, unpackUtf8,
+   getStringWith
 ) where
 
 import Data.StateVar
 import Foreign.Ptr
+import Graphics.Rendering.OpenGL.GL.QueryUtils
 import Graphics.Rendering.OpenGL.Raw
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Internal as BI
@@ -60,3 +62,9 @@ packUtf8 = TE.encodeUtf8 . T.pack
 
 unpackUtf8 :: B.ByteString -> String
 unpackUtf8 = T.unpack . TE.decodeUtf8
+
+getStringWith :: IO (Ptr GLubyte) -> IO String
+getStringWith getStr = getStr >>= maybeNullPtr (return "") peekGLstring
+
+peekGLstring :: Ptr GLubyte -> IO String
+peekGLstring p = fmap unpackUtf8 $ BU.unsafePackCString (castPtr p)

src/Graphics/Rendering/OpenGL/GL/StringQueries.hs

@@ -21,8 +21,7 @@ module Graphics.Rendering.OpenGL.GL.StringQueries (
 import Data.Bits
 import Data.Char
 import Data.StateVar
-import Foreign.C.String
-import Foreign.Ptr
+import Graphics.Rendering.OpenGL.GL.ByteString
 import Graphics.Rendering.OpenGL.GL.QueryUtils
 import Graphics.Rendering.OpenGL.Raw
 
@@ -66,7 +65,7 @@ i2cps bitfield =
 --------------------------------------------------------------------------------
 
 getString :: GLenum -> IO String
-getString n = glGetString n >>= maybeNullPtr (return "") (peekCString . castPtr)
+getString = getStringWith . glGetString
 
 --------------------------------------------------------------------------------
 

src/Graphics/Rendering/OpenGL/GLU/Initialization.hs

@@ -17,10 +17,8 @@ module Graphics.Rendering.OpenGL.GLU.Initialization (
 ) where
 
 import Data.StateVar
-import Foreign.C.String
-import Foreign.Ptr
 import Graphics.Rendering.GLU.Raw
-import Graphics.Rendering.OpenGL.GL.QueryUtils
+import Graphics.Rendering.OpenGL.GL.ByteString
 import Graphics.Rendering.OpenGL.Raw
 
 --------------------------------------------------------------------------------
@@ -32,5 +30,4 @@ gluExtensions :: GettableStateVar [String]
 gluExtensions = makeGettableStateVar (fmap words $ getString glu_EXTENSIONS)
 
 getString :: GLenum -> IO String
-getString n = gluGetString n >>=
-              maybeNullPtr (return "") (peekCString . castPtr)
+getString = getStringWith . gluGetString