mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-02 07:42:50 -06:00
Use terminfo to highlight warnings and errors in blue and red
This replaces the hardwired ANSI escape codes that were accidentally included in a previous patch. This adds a dependency on terminfo, but this should be unproblematic, since haskeline already depends on the same underlying C library. The color highlighting is omitted on Windows.
This commit is contained in:
@@ -1,11 +1,18 @@
|
||||
{-# LANGUAGE CPP #-}
|
||||
module GF.System.Console(
|
||||
-- ** Changing which character encoding to use for console IO
|
||||
setConsoleEncoding,changeConsoleEncoding) where
|
||||
setConsoleEncoding,changeConsoleEncoding,
|
||||
-- ** Console colors
|
||||
TermColors(..),getTermColors
|
||||
) where
|
||||
import System.IO
|
||||
import Control.Monad(guard)
|
||||
import Control.Monad.Trans(MonadIO(..))
|
||||
#ifdef mingw32_HOST_OS
|
||||
import System.Win32.Console
|
||||
import System.Win32.NLS
|
||||
#else
|
||||
import System.Console.Terminfo
|
||||
#endif
|
||||
|
||||
-- | Set the console encoding (for Windows, has no effect on Unix-like systems)
|
||||
@@ -43,3 +50,21 @@ readCP code =
|
||||
"UTF-8" -> Just 65001
|
||||
_ -> Nothing
|
||||
#endif
|
||||
|
||||
data TermColors = TermColors { redFg,blueFg,restore :: String } deriving Show
|
||||
noTermColors = TermColors "" "" ""
|
||||
|
||||
getTermColors :: MonadIO m => m TermColors
|
||||
#ifdef mingw32_HOST_OS
|
||||
getTermColors = return noTermColors
|
||||
#else
|
||||
getTermColors =
|
||||
liftIO $
|
||||
do term <- setupTermFromEnv
|
||||
return $ maybe noTermColors id $ getCapability term $
|
||||
do n <- termColors
|
||||
guard (n>=8)
|
||||
fg <- setForegroundColor
|
||||
restore <- restoreDefaultColors
|
||||
return $ TermColors (fg Red) (fg Blue) restore
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user