From 7bafb1e9e61a4ae450d793474834ec9240b25edf Mon Sep 17 00:00:00 2001 From: justin Date: Sat, 2 Nov 2024 21:56:28 +0000 Subject: [PATCH] Add cursor at end of input filters --- data/charMaps/cMap16x32.CodePage437.png | Bin 9425 -> 12227 bytes data/charMaps/cMap16x32.Custom.png | Bin 0 -> 12233 bytes ghcidOutput | 2 +- src/Dodge/DisplayInventory.hs | 19 +++++++++++++++---- src/Dodge/TestString.hs | 1 + src/Preload/Render.hs | 2 +- 6 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 data/charMaps/cMap16x32.Custom.png diff --git a/data/charMaps/cMap16x32.CodePage437.png b/data/charMaps/cMap16x32.CodePage437.png index 716bf2c64c7cd2314a8e66473166fde947869e99..8fcc818a97e483eb1f6a035466048bc038115a66 100644 GIT binary patch delta 8499 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 delta 5676 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 OjjOlx$~dpsKlvXtlHJ|_ diff --git a/data/charMaps/cMap16x32.Custom.png b/data/charMaps/cMap16x32.Custom.png new file mode 100644 index 0000000000000000000000000000000000000000..d4e39546d0687ce85c6a5077ea55fd106dd14816 GIT binary patch literal 12233 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 Opr>u5m3P|y>i+>5XdZ_E literal 0 HcmV?d00001 diff --git a/ghcidOutput b/ghcidOutput index bece4b4e1..c4e89a3f6 100644 --- a/ghcidOutput +++ b/ghcidOutput @@ -1 +1 @@ -All good (594 modules, at 02:32:29) +All good (594 modules, at 21:55:11) diff --git a/src/Dodge/DisplayInventory.hs b/src/Dodge/DisplayInventory.hs index 8a13742d2..48e41ba3c 100644 --- a/src/Dodge/DisplayInventory.hs +++ b/src/Dodge/DisplayInventory.hs @@ -47,8 +47,12 @@ updateCombineSections w cfig = (getAvailableListLines secondColumnParams cfig) [(0, sclose), (-1, sfclose)] where + filtcurs = case w ^? hud . hudElement . subInventory . ciSelection . _Just . _1 of + Just (-1) -> [toEnum 219] -- filled rect + _ -> [toEnum 128] -- wire rect (sfclose, sclose) = filterSectionsPair + filtcurs (flip . andOrRegex $ regexCombs invitms) (IM.fromDistinctAscList . zip [0 ..] $ combineList w) "COMBINATIONS" @@ -106,12 +110,18 @@ updateDisplaySections w cfig = Just (2, _) -> reverse [filtinv, filtclose, closex, invx, youx] Just (3, _) -> reverse [filtinv, filtclose, closex, invx, youx] _ -> reverse [filtinv, filtclose, invx, closex, youx] + invfiltcurs = case mselpos ^? _Just . _1 of + Just (-1) -> [toEnum 219] -- filled rect + _ -> [toEnum 128] -- wire rect (sfinv, sinv) = - filterSectionsPair plainRegex invitems "INVENTORY" $ + filterSectionsPair invfiltcurs plainRegex invitems "INVENTORY" $ w ^? hud . hudElement . diInvFilter . _Just (filtinv, invx) = ((-1, sfinv), (0, sinv)) + closefiltcurs = case mselpos ^? _Just . _1 of + Just (2) -> [toEnum 219] -- filled rect + _ -> [toEnum 128] -- wire rect (sfclose, sclose) = - filterSectionsPair plainRegex closeitms "NEARBY" $ + filterSectionsPair closefiltcurs plainRegex closeitms "NEARBY" $ w ^? hud . hudElement . diCloseFilter . _Just (filtclose, closex) = ((2, sfclose), (3, sclose)) youx = (1, youitems) @@ -143,12 +153,13 @@ updateDisplaySections w cfig = -- numfiltitems = " " ++ show (length itms - length itms') ++ " FILTERED" filterSectionsPair :: + String -> -- string at the end of the input (String -> SelectionItem a -> Bool) -> IM.IntMap (SelectionItem a) -> String -> Maybe String -> (IM.IntMap (SelectionItem a), IM.IntMap (SelectionItem a)) -filterSectionsPair filtfn itms filtdescription mfilt = +filterSectionsPair endstr filtfn itms filtdescription mfilt = ( filtsis , itms' ) @@ -159,7 +170,7 @@ filterSectionsPair filtfn itms filtdescription mfilt = IM.singleton 0 $ SelectionInfo - [filtdescription ++ " FILTER: " ++ str, numfiltitems] + [filtdescription ++ " FILTER:" ++ str ++ endstr, numfiltitems] 2 True white diff --git a/src/Dodge/TestString.hs b/src/Dodge/TestString.hs index 7e1ea1807..088607938 100644 --- a/src/Dodge/TestString.hs +++ b/src/Dodge/TestString.hs @@ -24,6 +24,7 @@ testStringInit :: Universe -> [String] testStringInit u = [show $ u ^? uvWorld . hud . hudElement . diSelection . _Just , show $ u ^? uvWorld . cWorld . lWorld . creatures . ix 0 . crManipulation . manObject ] +-- <> [[toEnum (i+j * 32) | i <- [0..31]] | j <- [0..7]] -- <> map show (IM.elems (L.postscan (L.premap _siHeight L.sum) -- $ fromMaybe mempty $ u ^? uvWorld . hud . hudElement . diSections . sssSections . ix 0 . ssItems) -- ) diff --git a/src/Preload/Render.hs b/src/Preload/Render.hs index 3a2c7865d..09289457d 100644 --- a/src/Preload/Render.hs +++ b/src/Preload/Render.hs @@ -95,7 +95,7 @@ preloadRender = do -- initTexture2DArray 50 "data/texture/charMapVertBig.png" 2 32 64 95 GL_NEAREST_MIPMAP_LINEAR GL_LINEAR --initTexture2DArray 50 "data/texture/charMapVert16Block.png" 2 16 32 95 GL_NEAREST GL_NEAREST --initTexture2DArray 50 "data/charMaps/charMapVert16Tall.png" 2 16 32 95 GL_NEAREST GL_NEAREST - initTexture2DArray 50 "data/charMaps/cMap16x32.CodePage437.png" 2 16 32 255 GL_NEAREST GL_NEAREST + initTexture2DArray 50 "data/charMaps/cMap16x32.Custom.png" 2 16 32 256 GL_NEAREST GL_NEAREST --initTexture2DArray 50 "data/texture/charMapVert8Block.png" 2 8 16 95 GL_NEAREST GL_NEAREST --initTexture2DArray 50 "data/texture/charMapVertBig.png" 2 32 64 95 GL_LINEAR_MIPMAP_LINEAR GL_LINEAR --initTexture2DArray 50 "data/texture/charMapVertBig.png" 2 32 64 95 GL_LINEAR_MIPMAP_NEAREST GL_LINEAR