More cleanup

src/Dodge/Update/Input.hs

@@ -1,38 +1,37 @@
-module Dodge.Update.Input 
+module Dodge.Update.Input (
-    ( updateKeyInGame
+    updateKeyInGame,
-    , updateKeysInTerminal
+    updateKeysInTerminal,
-    , doInputScreenInput
+    doInputScreenInput,
-    ) where
+) where
 
-import Dodge.Terminal.LeftButton
-import Dodge.Save
-import Dodge.Debug.Terminal
-import Dodge.WorldPos
-import Dodge.Button.Event
-import Dodge.Inventory
-import Dodge.Combine
-import Dodge.Event.Test
-import Dodge.Base.You
-import Dodge.Reloading
-import Dodge.Creature.Action
-import Dodge.Menu
-import Dodge.Data.Universe
-import SDL
-import LensHelp
-import qualified Data.Text as T
 import qualified Data.Map.Strict as M
+import qualified Data.Text as T
+import Dodge.Base.You
+import Dodge.Button.Event
+import Dodge.Combine
+import Dodge.Creature.Action
+import Dodge.Data.Universe
+import Dodge.Debug.Terminal
+import Dodge.Event.Test
+import Dodge.Inventory
+import Dodge.Menu
+import Dodge.Reloading
+import Dodge.Save
+import Dodge.Terminal.LeftButton
+import Dodge.WorldPos
+import LensHelp
+import SDL
 
 doInputScreenInput :: T.Text -> Universe -> Universe
-doInputScreenInput s u = u & uvScreenLayers . _head . scInput %~ (`T.append` T.toUpper thetext)
+doInputScreenInput s u =
+    u & uvScreenLayers . _head . scInput %~ (`T.append` T.toUpper thetext)
         & checkBackspace
         & checkEndStatus
   where
     thetext = u ^. uvWorld . input . textInput
-    checkBackspace = case u ^. uvWorld . input . pressedKeys . at ScancodeBackspace of
+    checkBackspace 
-        Just InitialPress -> f
+        | backspaceInputted u = uvScreenLayers . _head . scInput %~ doBackspace
-        Just LongPress -> f
+        | otherwise = id
-        _ -> id
-    f = uvScreenLayers . _head . scInput %~ doBackspace
     pkeys = u ^. uvWorld . input . pressedKeys
     checkEndStatus
         | ScancodeReturn `M.member` pkeys = (uvScreenLayers %~ tail) . applyTerminalString (words $ T.unpack s)
@@ -44,24 +43,27 @@ doBackspace t = case T.unsnoc t of
     Nothing -> t
     Just (t', _) -> t'
 
+backspaceInputted :: Universe -> Bool
+backspaceInputted u = case u ^. uvWorld . input . pressedKeys . at ScancodeBackspace of
+    Just InitialPress -> True
+    Just LongPress -> True
+    _ -> False
+
 updateKeysInTerminal :: Int -> Universe -> Universe
-updateKeysInTerminal tmid u= u & tmpoint %~ (`T.append` T.toUpper thetext)
+updateKeysInTerminal tmid u =
+    u & tmpoint %~ (`T.append` T.toUpper thetext)
         & checkBackspace
         & checkEndStatus
   where
     tmpoint = uvWorld . cWorld . lWorld . terminals . ix tmid . tmInput . tiText
     thetext = u ^. uvWorld . input . textInput
-    checkBackspace = case u ^. uvWorld . input . pressedKeys . at ScancodeBackspace of
+    checkBackspace
-        Just InitialPress -> f
+        | backspaceInputted u = tmpoint %~ doBackspace
-        Just LongPress -> f
+        | otherwise = id
-        _ -> id
-    f = tmpoint %~ doBackspace
     pkeys = u ^. uvWorld . input . pressedKeys
     checkEndStatus
-        | pkeys ^. at ScancodeReturn == Just InitialPress 
+        | pkeys ^. at ScancodeReturn == Just InitialPress =
-            = over uvWorld (\w -> terminalReturnEffect (w ^?! cWorld . lWorld . terminals . ix tmid) w)
+            over uvWorld (\w -> terminalReturnEffect (w ^?! cWorld . lWorld . terminals . ix tmid) w)
---        | pkeys ^. at ScancodeEscape == Just InitialPress 
---            = uvWorld . cWorld . lWorld . terminals . ix tmid . tmInput . tiFocus %~ const False
         | otherwise = id
 
 updateKeyInGame :: Universe -> Scancode -> PressType -> Universe