Continue work on terminals
This commit is contained in:
@@ -84,12 +84,12 @@ subInventoryDisplay subinv cfig w = case subinv of
|
||||
, invHead cfig "TWEAK"
|
||||
, listTextPicturesAt subInvX 60 cfig $ map text (ammoTweakStrings it)
|
||||
]
|
||||
DisplayTerminal {_termID = tid,_onInputLine=isoninput} ->
|
||||
DisplayTerminal {_termID = tid,_onInputLine=inputstatus} ->
|
||||
let tp = w ^?! terminals . ix tid
|
||||
in pictures
|
||||
[ invHead cfig (_tmTitle tp ++ ":T" ++ show tid)
|
||||
, renderListAt subInvX 60 cfig
|
||||
. displayTermInput tp
|
||||
. displayTermInput inputstatus tp
|
||||
-- . (++ map (\(str,_) -> (str,white)) (_termOptions tp))
|
||||
. reverse
|
||||
. take (_tmMaxLines tp)
|
||||
@@ -124,9 +124,11 @@ subInventoryDisplay subinv cfig w = case subinv of
|
||||
]
|
||||
InspectInventory -> invHead cfig "INSPECT"
|
||||
where
|
||||
displayTermInput tp = case _tmInput tp of
|
||||
displayTermInput inputstatus tp = case _tmInput tp of
|
||||
Nothing -> id
|
||||
Just s -> (++ [('>':T.unpack s++clockCycle 10 (V.fromList ["_",""]) w,white)])
|
||||
Just s -> (++ [('>':T.unpack s++displayBlinkCursor inputstatus,white)])
|
||||
displayBlinkCursor inputstatus | inputstatus = clockCycle 10 (V.fromList ["_",""]) w
|
||||
| otherwise = []
|
||||
closeobjectcursor = case selectedCloseObject w of
|
||||
Nothing -> mempty
|
||||
Just (i,co) -> listCursorNS clObjFloatIn 0 cfig (selNumPos i w) (closeObjectCol co) topInvW (invSelSize i w)
|
||||
|
||||
Reference in New Issue
Block a user