git.iko.soy/vty
on master help sign in
Graphics.Vty.Config: expose widthTableFilename, vtyDataDirectory, and terminalWidthTablePath
154800bJonathan Daugherty
src/Graphics/Vty/Config.hs+21−1
compare with master
unifiedsplit
@@ -66,6 +66,10 @@ module Graphics.Vty.Config
66 , parseConfigFile
66 , parseConfigFile
67 , defaultConfig
67 , defaultConfig
68 , getTtyEraseChar
68 , getTtyEraseChar
69+
70+ , widthTableFilename
71+ , vtyDataDirectory
72+ , terminalWidthTablePath
69 )
73 )
70where
74where
71
75
@@ -91,6 +95,7 @@ import GHC.Generics
91
95
92import System.Directory (getAppUserDataDirectory)
96import System.Directory (getAppUserDataDirectory)
93import System.Environment (lookupEnv)
97import System.Environment (lookupEnv)
98+import System.FilePath ((</>))
94import System.Posix.IO (stdInput, stdOutput)
99import System.Posix.IO (stdInput, stdOutput)
95import System.Posix.Types (Fd(..))
100import System.Posix.Types (Fd(..))
96import Foreign.C.Types (CInt(..), CChar(..))
101import Foreign.C.Types (CInt(..), CChar(..))
@@ -175,15 +180,30 @@ instance Monoid Config where
175 mappend = (<>)
180 mappend = (<>)
176#endif
181#endif
177
182
183+vtyDataDirectory :: IO FilePath
184+vtyDataDirectory = getAppUserDataDirectory "vty"
185+
178-- | Load a configuration from @'getAppUserDataDirectory'/config@ and
186-- | Load a configuration from @'getAppUserDataDirectory'/config@ and
179-- @$VTY_CONFIG_FILE@.
187-- @$VTY_CONFIG_FILE@.
180userConfig :: IO Config
188userConfig :: IO Config
181userConfig = do
189userConfig = do
182− configFile <- (mappend <$> getAppUserDataDirectory "vty" <*> pure "/config") >>= parseConfigFile
190+ configFile <- (mappend <$> vtyDataDirectory <*> pure "/config") >>= parseConfigFile
183 overrideConfig <- maybe (return defaultConfig) parseConfigFile =<< lookupEnv "VTY_CONFIG_FILE"
191 overrideConfig <- maybe (return defaultConfig) parseConfigFile =<< lookupEnv "VTY_CONFIG_FILE"
184 let base = configFile <> overrideConfig
192 let base = configFile <> overrideConfig
185 mappend base <$> overrideEnvConfig
193 mappend base <$> overrideEnvConfig
186
194
195+widthTableFilename :: String -> String
196+widthTableFilename term = "width_table_" <> term <> ".dat"
197+
198+terminalWidthTablePath :: IO (Maybe FilePath)
199+terminalWidthTablePath = do
200+ dataDir <- vtyDataDirectory
201+ result <- lookupEnv "TERM"
202+ case result of
203+ Nothing -> return Nothing
204+ Just term -> do
205+ return $ Just $ dataDir </> widthTableFilename term
206+
187overrideEnvConfig :: IO Config
207overrideEnvConfig :: IO Config
188overrideEnvConfig = do
208overrideEnvConfig = do
189 d <- lookupEnv "VTY_DEBUG_LOG"
209 d <- lookupEnv "VTY_DEBUG_LOG"