Cleanup

src/Dodge/Data.hs

@@ -204,7 +204,6 @@ data SubInventory
     | LockedInventory
     | DisplayTerminal 
         {_termID :: Int
-        ,_onInputLine :: Bool
         }
 --  deriving (Eq,Ord,Show)
 
@@ -413,6 +412,10 @@ data TerminalLine
         {_tlPause :: Int
         ,_tlString :: World -> (String, Color)
         }
+    | TerminalLineTerminalEffect
+        {_tlPause :: Int
+        ,_tlTermEffect :: Terminal -> Terminal
+        }
     | TerminalLineInput
         {_tlPause :: Int
 --        ,_tlScrollCommands :: [TerminalCommand]
@@ -937,6 +940,10 @@ data Block = Block
     }
 data BlockMaterial = WoodBlock | DirtBlock | StoneBlock | GlassBlock | MetalBlock
 data TerminalStatus = Connected | Disconnected
+data TerminalInput = TerminalInput
+    { _tiText   :: T.Text
+    , _tiFocus  :: Bool
+    }
 data Terminal = Terminal
     { _tmID         :: Int 
     , _tmProgram    :: Terminal -> World -> [TerminalLine]
@@ -948,7 +955,7 @@ data Terminal = Terminal
     , _tmMaxLines   :: Int
     , _tmTitle  :: String
     , _tmSel    :: Maybe (Int,Int)
-    , _tmInput  :: Maybe T.Text
+    , _tmInput  :: Maybe TerminalInput
     , _tmScrollCommands :: [TerminalCommand]
     , _tmWriteCommands  :: [TerminalCommand]
     , _tmDeathEffect    :: Terminal -> World -> World
@@ -1606,6 +1613,7 @@ makeLenses ''AllocateEquipment
 makeLenses ''ActivateEquipment
 makeLenses ''EquipParams
 makeLenses ''TerminalCommand
+makeLenses ''TerminalInput
 makeLenses ''GenParams
 makeLenses ''CreatureSkin
 makeLenses ''Corpse