gluturtle 0.0.8 → 0.0.9

raw patch · 3 files changed

+27/−10 lines, 3 files

Files

• gluturtle.cabal +1/−1
• src/Graphics/UI/GLUT/Turtle/Field.hs +24/−9
• tests/testGLUT.hs +2/−0

@@ -2,7 +2,7 @@ cabal-version:	>= 1.6  name:		gluturtle-version:	0.0.8+version:	0.0.9 stability:	alpha author:		Yoshikuni Jujo <PAF01143@nifty.ne.jp> maintainer:	Yoshikuni Jujo <PAF01143@nifty.ne.jp>

@@ -84,7 +84,7 @@ 	fAction :: IORef (IO ()), 	fActions :: IORef [IO ()], -	fString :: IORef String,+	fString :: IORef [String], 	fString2 :: IORef [String],  	fInputtext :: IORef (String -> IO Bool),@@ -110,7 +110,7 @@ 	layers <- newLayers 0 (return ()) (return ()) (return ()) 	action <- newIORef $ return () 	actions <- newIORef []-	str <- newIORef ""+	str <- newIORef [""] 	str2 <- newIORef [] 	inputtext <- newIORef $ const $ return True @@ -124,8 +124,13 @@ 		sequence_ . reverse =<< readIORef actions 		join $ readIORef action 		G.lineWidth $= 1.0-		printString (-2.5) (-1800) =<< readIORef str+		ss1 <- readIORef str+		ss2 <- readIORef str2+		zipWithM_ (printString (-2.8)) [-1800, -1600 .. 0] (reverse ss1 ++ ss2)+{-+		printString (-2.5) (-1800) . concat =<< readIORef str 		zipWithM_ (printString (-2.5)) [-1600, -1400 .. 0] =<< readIORef str2+-} 		swapBuffers) 	G.reshapeCallback $= Just (\size -> G.viewport $= (G.Position 0 0, size)) 	let f = Field{@@ -312,14 +317,24 @@  keyboardProc :: Field -> G.Key -> G.KeyState -> G.Modifiers -> G.Position -> IO () keyboardProc f (G.Char '\r') G.Down _ _ = do-	str <- readIORef $ fString f-	atomicModifyIORef_ (fString2 f) (str :)-	writeIORef (fString f) ""-	continue <- ($ str) =<< readIORef (fInputtext f)+	str <- readIORef (fString f)+	atomicModifyIORef_ (fString2 f) (reverse str ++)+	writeIORef (fString f) [""]+	continue <- ($ concat str) =<< readIORef (fInputtext f) 	unless continue G.leaveMainLoop keyboardProc f (G.Char '\b') G.Down _ _ =-	atomicModifyIORef_ (fString f) $ \s -> if null s then s else init s+	atomicModifyIORef_ (fString f) $ \s -> case s of+		[""] -> [""]+		s -> case last s of+			"" -> init (init s) ++ [init $ last $ init s]+			_ -> init s ++ [init $ last s] keyboardProc f (G.Char c) state _ _-	| state == G.Down = atomicModifyIORef_ (fString f) (++ [c])+	| state == G.Down = atomicModifyIORef_ (fString f) (`addToTail` c) 	| otherwise = return () keyboardProc _ _ _ _ _ = return ()++addToTail :: [String] -> Char -> [String]+addToTail strs c+	| null strs = error "bad"+	| length (last strs) < 50 = init strs ++ [last strs ++ [c]]+	| otherwise = strs ++ [[c]]

@@ -37,4 +37,6 @@ processInput f t "position" = position t >>= outputString f . show >> return True processInput _ t "penup" = penup t >> return True processInput _ t "message" = write t "KochiGothic" 100 "Hello, world!" >> return True+processInput _ t "0very1very2very3very4very5very6very7very8very9very0very-long-line"+	= putStrLn "very long line" >> return True processInput _ _ _ = return True