termonad 4.4.0.0 → 4.5.0.0

raw patch · 11 files changed

+55/−35 lines, 11 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• .nix-helpers/overlays.nix +1/−1
• .nix-helpers/stack-shell.nix +1/−1
• CHANGELOG.md +7/−0
• flake.lock +3/−3
• flake.nix +0/−26
• glade/preferences.glade +15/−0
• src/Termonad/App.hs +8/−0
• src/Termonad/Lenses.hs +1/−0
• src/Termonad/Term.hs +3/−1
• src/Termonad/Types.hs +7/−0
• termonad.cabal +9/−3

@@ -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

@@ -8,7 +8,7 @@   buildInputs = [     cairo     git-    gobjectIntrospection+    gobject-introspection     gtk3     vte     zlib

@@ -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.

@@ -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": {

@@ -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";-      #       };-      #     }-      #   );-     }; }

@@ -281,6 +281,21 @@               </packing>             </child>             <child>+              <object class="GtkCheckButton" id="allowBold">+                <property name="label" translatable="yes">Allow bold</property>+                <property name="visible">True</property>+                <property name="can-focus">True</property>+                <property name="receives-default">True</property>+                <property name="tooltip-text" translatable="yes">Allow terminal to use bold text.</property>+                <property name="halign">start</property>+                <property name="draw-indicator">True</property>+              </object>+              <packing>+                <property name="left-attach">1</property>+                <property name="top-attach">11</property>+              </packing>+            </child>+            <child>               <placeholder/>             </child>             <child>

@@ -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

@@ -59,6 +59,7 @@     , ("showTabBar", "lensShowTabBar")     , ("cursorBlinkMode", "lensCursorBlinkMode")     , ("boldIsBright", "lensBoldIsBright")+    , ("allowBold", "lensAllowBold")     , ("enableSixel", "lensEnableSixel")     ]     ''ConfigOptions

@@ -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 

@@ -417,6 +417,11 @@     -- Note that even if you do the above, there may still be some problems     -- with SIXEL support in VTE. Follow     -- <https://gitlab.gnome.org/GNOME/vte/-/issues/253> 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'.

@@ -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