Work on terminals

src/Dodge/Update/Input/InGame.hs

@@ -90,10 +90,9 @@ updatePressedButtonsCarte' pkeys w
 
 updateKeysInTerminal :: Int -> Universe -> Universe
 updateKeysInTerminal tmid u =
-    u & doTextInputOver tmpoint
+    u & doTextInputOver (uvWorld . cWorld . lWorld . terminals . ix tmid . tmInput . tiText)
         & checkEndStatus
   where
-    tmpoint = uvWorld . cWorld . lWorld . terminals . ix tmid . tmInput . tiText
     pkeys = u ^. uvWorld . input . pressedKeys
     checkEndStatus
         | pkeys ^. at ScancodeReturn == Just InitialPress =
@@ -110,7 +109,6 @@ updateInitialPressInGame :: Universe -> Scancode -> Universe
 updateInitialPressInGame uv sc = case sc of
     ScancodeF1 -> useNormalCamera uv
     ScancodeF2 -> pauseAndFloatCam uv
---    ScancodeF3 -> pauseAndPanCam uv
     ScancodeF5 -> doQuicksave uv
     ScancodeF9 -> doQuickload uv
     ScancodeEscape -> pauseGame uv
@@ -152,7 +150,7 @@ doRegexInput u i sss
         any
             ((== Just InitialPress) . (`M.lookup` pkeys))
             [ScancodeReturn, ScancodeSlash]
-    endmouse = (Just 0 == ) $ u ^? uvWorld . input . mouseButtons . ix ButtonLeft
+    endmouse = (Just 0 ==) $ u ^? uvWorld . input . mouseButtons . ix ButtonLeft
     backspacetonothing =
         sss ^? sssExtra . sssFilters . ix i . _Just == Just ""
             && ScancodeBackspace `M.lookup` pkeys == Just InitialPress

src/Dodge/Update/Input/Text.hs

@@ -4,7 +4,7 @@ module Dodge.Update.Input.Text (
 ) where
 
 import Data.Either
-import Data.Char
+--import Data.Char
 import Dodge.Data.Universe
 import LensHelp
 import SDL
@@ -14,7 +14,8 @@ doTextInputOver p u = doTextInputOver' u p u
 
 doTextInputOver' :: Universe -> ASetter' a String -> a -> a
 doTextInputOver' u p x =
-    x & p %~ (++ map toUpper (rights str))
+    --x & p %~ (++ map toUpper (rights str))
+    x & p %~ (++ rights str)
         & checkBackspace
   where
     str = u ^. uvWorld . input . textInput