Compatibility patch for vty-5.20.

SOwOphie · Feb 20, 2018 · 8a62c4f · 8a62c4f
1 parent 25c5223
commit 8a62c4f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+# v1.2.2b
+
+- Small compatibility patch for `vty-5.20`.
+- Added `/usr/local/etc/wsedit` to the config search path.
+
 # v1.2.2
 
 ## New Features

diff --git a/src/WSEdit/Data.hs b/src/WSEdit/Data.hs
@@ -108,7 +108,7 @@ import qualified WSEdit.Buffer as B
 
 -- | Version number constant.
 version :: String
-version = "1.2.2.18"
+version = "1.2.2.19"
 
 -- | Upstream URL.
 upstream :: String

diff --git a/src/WSEdit/Help.hs b/src/WSEdit/Help.hs
@@ -25,6 +25,8 @@ import Graphics.Vty
         ( BLeft
         , BMiddle
         , BRight
+        , BScrollUp
+        , BScrollDown
         )
     , Event
         ( EvKey
@@ -193,9 +195,11 @@ keymapHelp km =
         showKey  k           = drop 1 $ show k
 
         showBtn :: Button -> String
-        showBtn BLeft   = "LMB"
-        showBtn BMiddle = "MMB"
-        showBtn BRight  = "RMB"
+        showBtn BLeft       = "LMB"
+        showBtn BMiddle     = "MMB"
+        showBtn BRight      = "RMB"
+        showBtn BScrollUp   = "Scroll Up"
+        showBtn BScrollDown = "Scroll Down"
 
 
 

diff --git a/src/WSEdit/Output.hs b/src/WSEdit/Output.hs
@@ -50,6 +50,7 @@ import Graphics.Vty
         , attrBackColor
         , attrForeColor
         , attrStyle
+        , attrURL
         )
     , Background
         ( ClearBackground
@@ -367,6 +368,10 @@ lineRep lNo off str = do
                                         , attrBackColor = tryPreserve
                                             (attrBackColor $ csNominal cs)
                                             (attrBackColor $  sNominal x )
+
+                                        , attrURL       = tryPreserve
+                                            (attrURL       $ csNominal cs)
+                                            (attrURL       $  sNominal x )
                                         }
                                     , csStr     = sStr x
                                     }

diff --git a/src/WSEdit/Util.hs b/src/WSEdit/Util.hs
@@ -93,6 +93,7 @@ import Graphics.Vty
         , attrStyle
         , attrForeColor
         , attrBackColor
+        , attrURL
         )
     , MaybeDefault
         ( Default
@@ -623,6 +624,7 @@ combineAttrs a b = Attr
     { attrStyle     = combineMayDef (attrStyle     a) (attrStyle     b)
     , attrForeColor = combineMayDef (attrForeColor a) (attrForeColor b)
     , attrBackColor = combineMayDef (attrBackColor a) (attrBackColor b)
+    , attrURL       = combineMayDef (attrURL       a) (attrURL       b)
     }
     where
         combineMayDef :: MaybeDefault a -> MaybeDefault a -> MaybeDefault a

diff --git a/stack.yaml b/stack.yaml
@@ -1,6 +1,7 @@
 flags: {}
 extra-package-dbs: []
 packages:
-- '.'
+- .
 extra-deps:
+- vty-5.20
 resolver: lts-8.0
diff --git a/wsedit.cabal b/wsedit.cabal
@@ -1,5 +1,5 @@
 name:          wsedit
-version:       1.2.2.18
+version:       1.2.2.19
 synopsis:      A simple terminal source code editor.
 description:
 homepage:      https://github.com/LadyBoonami/wsedit
@@ -68,7 +68,7 @@ library
     strict           >= 0.3.2  && < 1,
     transformers     >= 0.4.2  && < 1,
     unix             >= 2.7    && < 3,
-    vty              >= 5.6    && < 6
+    vty              >= 5.20   && < 6
 
   ghc-options:
     -Wall