Mostly use String instead of Text

src/Dodge/Render/HUD.hs

@@ -7,7 +7,6 @@ import Dodge.Creature.Info
 import Control.Lens
 import qualified Data.Map.Strict as M
 import Data.Maybe
-import qualified Data.Text as T
 import qualified Data.Vector as V
 import Dodge.Base
 import Dodge.Clock
@@ -97,7 +96,7 @@ drawSubInventory subinv cfig w = case subinv of
         titledSub
             cfig
             ("COMBINE")
-            (combineListSelection w mi (T.unpack regex) x)
+            (combineListSelection w mi regex x)
             <> combineInventoryExtra mi cfig w
 
 titledSub :: Configuration -> String -> SelectionList a -> Picture
@@ -250,7 +249,7 @@ displayTerminal tid cfig w = fromMaybe mempty $ do
     displayTermInput tm = case _tmInput tm of
         TerminalInput s hasfoc _ -> (++ [(displayInputText tm s ++ displayBlinkCursor hasfoc, white)])
     displayInputText tm s
-        | _tmStatus tm == TerminalReady = '>' : T.unpack s
+        | _tmStatus tm == TerminalReady = '>' : s
         | otherwise = ""
     displayBlinkCursor hasfoc
         | hasfoc = clockCycle 10 (V.fromList ["_", ""]) w

src/Dodge/Render/List.hs

@@ -1,7 +1,7 @@
 module Dodge.Render.List where
 
 --import Data.Foldable
-import Regex
+import Dodge.SelectionList
 import Data.Maybe
 import Dodge.Base.WinScale
 import Dodge.Base.Window
@@ -26,20 +26,9 @@ drawSelectionList ldps cfig sl =
         <> drawSelectionCursor ldps cfig sl
 
 makeSelectionListPictures :: SelectionList a -> [Picture]
-makeSelectionListPictures sl = regex ++ concatMap f theitems
+makeSelectionListPictures sl = concatMap f $ getShownItems sl
   where
-    theitems = case sl ^. slRegex of
-        "" -> _slItems sl
-        str -> filter (doregex str) (_slItems sl)
-    doregex str = regexList str . _siPictures
-    regex = case sl ^. slRegex of
-        "" | not (sl ^. slRegexInput) -> []
-        str -> [text $ "SEARCH: " ++ str]
     f si = map (color (_siColor si) . text) $ _siPictures si
-        --case sl ^. slSizeRestriction of
---    SelectionSizeRestriction {} -> concatMap (_siPictures . fst) $ _slShownItems sl
---    _ -> concatMap _siPictures $ _slItems sl
-
 
 drawCursorAt :: ListDisplayParams -> Configuration -> Maybe Int -> [SelectionItem a] -> Picture
 drawCursorAt ldps cfig mi lis = fromMaybe mempty $ do
@@ -57,16 +46,13 @@ drawCursorAt ldps cfig mi lis = fromMaybe mempty $ do
         _ -> 1
 
 drawSelectionCursor :: ListDisplayParams -> Configuration -> SelectionList a -> Picture
-drawSelectionCursor ldps cfig sl = drawCursorAt ldps cfig (f $ sl ^. slSelPos) (g $ sl ^. slItems)
+drawSelectionCursor ldps cfig sl = drawCursorAt ldps cfig (f $ sl ^. slSelPos) (getShownItems sl)
   where
     -- the following is quite hacky
     f = case sl ^. slRegex of
+        _ | sl ^. slRegexInput -> const (Just 0)
         "" | not (sl ^. slRegexInput) -> id
         _ -> fmap (+1)
-    g (x:xs) = case sl ^. slRegex of
-        "" | not (sl ^. slRegexInput) -> (x:xs)
-        _ -> ((x & siHeight .~ 1) : x : xs)
-    g _ = []
 
 -- given a list of pictures that are each the size of a "text" call, displays them as
 -- a list on the screen

src/Dodge/Render/MenuScreen.hs

@@ -6,7 +6,6 @@ module Dodge.Render.MenuScreen (
 import Dodge.Base.WinScale
 import Dodge.Data.SelectionList
 import Dodge.Render.List
-import qualified Data.Text as T
 import Dodge.Base.Window
 import Dodge.Data.Universe
 import Picture
@@ -15,7 +14,7 @@ drawMenuScreen :: Configuration -> ScreenLayer -> Picture
 drawMenuScreen cfig screen = case screen of
     OptionScreen{_scTitle = titf, _scSelectionList = selpos, _scListDisplayParams = ldps} ->
         drawOptions ldps cfig titf selpos
-    InputScreen inputstr help -> drawInputMenu cfig ('>' : T.unpack inputstr) help
+    InputScreen inputstr help -> drawInputMenu cfig ('>' : inputstr) help
 
 drawInputMenu :: 
     Configuration ->