Simplify the main loop, events only perform functional update

src/Dodge/Update/Input.hs

@@ -1,8 +1,11 @@
 module Dodge.Update.Input 
     ( updateKeyInGame
+    , updateKeysInTerminal
     , doInputScreenInput
     ) where
 
+import Dodge.Terminal.LeftButton
+import Dodge.Save
 import Dodge.Debug.Terminal
 import Dodge.WorldPos
 import Dodge.Button.Event
@@ -41,9 +44,30 @@ doBackspace t = case T.unsnoc t of
     Nothing -> t
     Just (t', _) -> t'
 
+updateKeysInTerminal :: Int -> Universe -> Universe
+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
+        Just InitialPress -> f
+        Just LongPress -> f
+        _ -> id
+    f = tmpoint %~ doBackspace
+    pkeys = u ^. uvWorld . input . pressedKeys
+    checkEndStatus
+        | pkeys ^. at ScancodeReturn == Just InitialPress 
+            = 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
 updateKeyInGame  uv sc InitialPress = case sc of
+    ScancodeF5 -> doQuicksave uv
+    ScancodeF9 -> loadSaveSlot QuicksaveSlot uv
     ScancodeEscape -> pauseGame uv
     ScancodeSpace -> over uvWorld spaceAction uv
     ScancodeP -> pauseGame uv

src/Dodge/Update/Scroll.hs

@@ -6,7 +6,6 @@ import qualified Data.Text as T
 import Dodge.Base
 import Dodge.Combine
 import Dodge.Data.Universe
-import Dodge.Event.Keyboard
 import Dodge.HeldScroll
 import Dodge.InputFocus
 import Dodge.Inventory
@@ -75,6 +74,11 @@ updateWheelEvent yi w = case w ^. cWorld . lWorld . hud . hudElement of
     lbDown = ButtonLeft `M.member` _mouseButtons (_input w)
     invKeyDown = ScancodeCapsLock `M.member` _pressedKeys (_input w)
 
+guardDisconnectedID :: Int -> World -> World -> World
+guardDisconnectedID tmid w w' = case w ^? cWorld . lWorld . terminals . ix tmid . tmStatus of
+    Just TerminalReady -> w'
+    _ -> w
+
 scrollRBOption :: Float -> World -> World
 scrollRBOption y w
     | y < 0 = w & rbOptions . opSel %~ (min (length (_opEquip (_rbOptions w)) -1) . (+ 1))