diff --git a/.nix-helpers/overlays.nix b/.nix-helpers/overlays.nix --- a/.nix-helpers/overlays.nix +++ b/.nix-helpers/overlays.nix @@ -78,7 +78,7 @@ # # Either this, or termonadKnownWorkingHaskellPkgSet can be changed in an overlay # if you want to use a different GHC to build Termonad. - termonadCompilerVersion = "ghc902"; + termonadCompilerVersion = "ghc92"; # A Haskell package set where we know the GHC version works to compile # Termonad. This is basically just a shortcut so that other Nix files diff --git a/.nix-helpers/stack-shell.nix b/.nix-helpers/stack-shell.nix --- a/.nix-helpers/stack-shell.nix +++ b/.nix-helpers/stack-shell.nix @@ -8,7 +8,7 @@ buildInputs = [ cairo git - gobjectIntrospection + gobject-introspection gtk3 vte zlib diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 4.5.0.0 + +* Add an `allowBold` option (which defaults to `True`). This can be used if + you want disable use of bold text. + Thanks [@zanculmarktum](https://github.com/zanculmarktum)! + [#225](https://github.com/cdepillabout/termonad/pull/225) + ## 4.4.0.0 * Add support for opening URLs in a browser by right-clicking on them. diff --git a/flake.lock b/flake.lock --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1665732960, - "narHash": "sha256-WBZ+uSHKFyjvd0w4inbm0cNExYTn8lpYFcHEes8tmec=", + "lastModified": 1680213900, + "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4428e23312933a196724da2df7ab78eb5e67a88e", + "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix --- a/flake.nix +++ b/flake.nix @@ -63,31 +63,5 @@ program = "${self.packages.${system}.termonad}/bin/termonad"; }; }); - - # Tests run by 'nix flake check' and by Hydra. - # checks = forAllSystems - # (system: - # with nixpkgsFor.${system}; - # { - # inherit (self.packages.${system}) hello; - - # # Additional tests, if applicable. - # test = stdenv.mkDerivation { - # name = "hello-test-${version}"; - - # buildInputs = [ hello ]; - - # unpackPhase = "true"; - - # buildPhase = '' - # echo 'running some integration tests' - # [[ $(hello) = 'Hello Nixers!' ]] - # ''; - - # installPhase = "mkdir -p $out"; - # }; - # } - # ); - }; } diff --git a/glade/preferences.glade b/glade/preferences.glade --- a/glade/preferences.glade +++ b/glade/preferences.glade @@ -281,6 +281,21 @@ + + Allow bold + True + True + True + Allow terminal to use bold text. + start + True + + + 1 + 11 + + + diff --git a/src/Termonad/App.hs b/src/Termonad/App.hs --- a/src/Termonad/App.hs +++ b/src/Termonad/App.hs @@ -120,6 +120,7 @@ , terminalSetFont , terminalSetScrollbackLines , terminalSetWordCharExceptions + , terminalSetAllowBold ) import System.Environment (getExecutablePath) import System.FilePath (takeFileName) @@ -130,6 +131,7 @@ import Termonad.Lenses ( lensBoldIsBright , lensEnableSixel + , lensAllowBold , lensConfirmExit , lensCursorBlinkMode , lensFontConfig @@ -729,6 +731,7 @@ terminalSetScrollbackLines term (fromIntegral (scrollbackLen options)) terminalSetBoldIsBright term (boldIsBright options) terminalSetEnableSixelIfExists term (enableSixel options) + terminalSetAllowBold term (allowBold options) let vScrollbarPolicy = showScrollbarToPolicy (options ^. lensShowScrollbar) scrolledWindowSetPolicy scrolledWin PolicyTypeAutomatic vScrollbarPolicy @@ -756,6 +759,8 @@ objFromBuildUnsafe preferencesBuilder "boldIsBright" CheckButton enableSixelCheckButton <- objFromBuildUnsafe preferencesBuilder "enableSixel" CheckButton + allowBoldCheckButton <- + objFromBuildUnsafe preferencesBuilder "allowBold" CheckButton wordCharExceptionsEntryBuffer <- objFromBuildUnsafe preferencesBuilder "wordCharExceptions" Entry >>= getEntryBuffer @@ -811,6 +816,7 @@ toggleButtonSetActive showMenuCheckButton $ showMenu options toggleButtonSetActive boldIsBrightCheckButton $ boldIsBright options toggleButtonSetActive enableSixelCheckButton $ enableSixel options + toggleButtonSetActive allowBoldCheckButton $ allowBold options entryBufferSetText wordCharExceptionsEntryBuffer (wordCharExceptions options) (-1) -- Run dialog then close @@ -833,6 +839,7 @@ showMenuVal <- toggleButtonGetActive showMenuCheckButton boldIsBrightVal <- toggleButtonGetActive boldIsBrightCheckButton enableSixelVal <- toggleButtonGetActive enableSixelCheckButton + allowBoldVal <- toggleButtonGetActive allowBoldCheckButton wordCharExceptionsVal <- entryBufferGetText wordCharExceptionsEntryBuffer -- Apply the changes to mvarTMState @@ -843,6 +850,7 @@ . set lensShowMenu showMenuVal . set lensBoldIsBright boldIsBrightVal . set lensEnableSixel enableSixelVal + . set lensAllowBold allowBoldVal . set lensWordCharExceptions wordCharExceptionsVal . over lensFontConfig (`fromMaybe` maybeFontConfig) . set lensScrollbackLen scrollbackLenVal diff --git a/src/Termonad/Lenses.hs b/src/Termonad/Lenses.hs --- a/src/Termonad/Lenses.hs +++ b/src/Termonad/Lenses.hs @@ -59,6 +59,7 @@ , ("showTabBar", "lensShowTabBar") , ("cursorBlinkMode", "lensCursorBlinkMode") , ("boldIsBright", "lensBoldIsBright") + , ("allowBold", "lensAllowBold") , ("enableSixel", "lensEnableSixel") ] ''ConfigOptions diff --git a/src/Termonad/Term.hs b/src/Termonad/Term.hs --- a/src/Termonad/Term.hs +++ b/src/Termonad/Term.hs @@ -105,6 +105,7 @@ , terminalSetScrollbackLines , terminalSetWordCharExceptions , terminalSpawnSync + , terminalSetAllowBold ) import System.Directory (getSymbolicLinkTarget) import System.Environment (lookupEnv) @@ -126,7 +127,7 @@ ) import Termonad.Types ( ConfigHooks(createTermHook) - , ConfigOptions(scrollbackLen, wordCharExceptions, cursorBlinkMode, boldIsBright, enableSixel) + , ConfigOptions(scrollbackLen, wordCharExceptions, cursorBlinkMode, boldIsBright, enableSixel, allowBold) , ShowScrollbar(..) , ShowTabBar(..) , TMConfig(hooks, options) @@ -376,6 +377,7 @@ terminalSetCursorBlinkMode vteTerm (cursorBlinkMode curOpts) terminalSetBoldIsBright vteTerm (boldIsBright curOpts) terminalSetEnableSixelIfExists vteTerm (enableSixel curOpts) + terminalSetAllowBold vteTerm (allowBold curOpts) widgetShow vteTerm pure vteTerm diff --git a/src/Termonad/Types.hs b/src/Termonad/Types.hs --- a/src/Termonad/Types.hs +++ b/src/Termonad/Types.hs @@ -417,6 +417,11 @@ -- Note that even if you do the above, there may still be some problems -- with SIXEL support in VTE. Follow -- for more information. + , allowBold :: !Bool + -- ^ Allow terminal to use bold text. + -- + -- You may want to disable this, for instance, if you use a font that + -- doesn't look good when bold. } deriving (Eq, Generic, FromJSON, Show, ToJSON) instance FromJSON CursorBlinkMode where @@ -449,6 +454,7 @@ -- , cursorBlinkMode = CursorBlinkModeOn -- , boldIsBright = False -- , enableSixel = False +-- , allowBold = True -- } -- in defaultConfigOptions == defConfOpt -- :} @@ -466,6 +472,7 @@ , cursorBlinkMode = CursorBlinkModeOn , boldIsBright = False , enableSixel = False + , allowBold = True } -- | The Termonad 'ConfigOptions' along with the 'ConfigHooks'. diff --git a/termonad.cabal b/termonad.cabal --- a/termonad.cabal +++ b/termonad.cabal @@ -1,5 +1,5 @@ name: termonad -version: 4.4.0.0 +version: 4.5.0.0 synopsis: Terminal emulator configurable in Haskell description: Termonad is a terminal emulator configurable in Haskell. It is extremely @@ -36,8 +36,14 @@ , shell.nix data-files: img/termonad-lambda.png custom-setup - setup-depends: base - , Cabal + -- Hackage apparently gives an error if you don't specify an + -- upper bound on your setup-depends. But I don't want to + -- have to remember to bump the upper bound of each of these + -- setup depends every time I want to make a release of Termonad, + -- especially send I already have upper bounds on important things + -- like base below. + setup-depends: base <999 + , Cabal <999 , cabal-doctest >=1.0.2 && <1.1 -- This flag builds the example code in the example-config/ directory, as well