Partial rethink of terminal text input

src/Dodge/Data/Terminal.hs

@@ -13,32 +13,25 @@ import qualified Data.Map.Strict as M
 import Dodge.Data.WorldEffect
 import Dodge.Data.BlBl
 
-data TerminalStatus = TerminalOff | TerminalBusy | TerminalReady
+data TerminalStatus = TerminalOff | TerminalBusy | TerminalTextInput {_tiText :: String}
+--    | TerminalArgumentInput TerminalCommand
     deriving Eq
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TerminalInput = TerminalInput
-    { _tiText :: String
-    , _tiSel :: (Int, Int)
+    { --_tiText :: String
+     _tiSel :: (Int, Int)
     }
     --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
-data TerminalBootProgram
-    = TerminalBootMempty
-    | TerminalBootLines [TerminalLine]
-    --deriving (Eq, Show, Read) --, Generic)
-    --h--deriving (Eq, Show, Read) --Generic, Flat)
-
 data Terminal = Terminal
     { _tmID :: Int
     , _tmBootLines :: [TerminalLine]
     , _tmButtonID :: Int
     , _tmMachineID :: Int
-    , _tmName :: String
     , _tmExternalColor :: Color
     , _tmDisplayedLines :: [(String, Color)]
     , _tmFutureLines :: [TerminalLine]
-    , _tmTitle :: String
     , _tmInput :: TerminalInput
     , _tmScrollCommands :: [TerminalCommand]
     , _tmWriteCommands :: [TerminalCommand]
@@ -124,13 +117,13 @@ makeLenses ''TerminalLine
 makeLenses ''TerminalToggle
 makeLenses ''EffectArguments
 makeLenses ''TerminalCommand
+makeLenses ''TerminalStatus
 concat <$> mapM (deriveJSON defaultOptions)
     [ ''TerminalStatus
     , ''TerminalInput
     , ''TerminalLineString
     , ''TmTm
     , ''TerminalLine
-    , ''TerminalBootProgram
     , ''TerminalToggle
     , ''EffectArguments
     , ''TerminalCommandEffect