aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authory0ast <joost@joo.st>2020-11-30 22:07:03 +0000
committerReto Brunner <reto@labrat.space>2020-12-18 07:23:22 +0100
commit03650474e2190ef6e54413d433b3d1f63dc9993e (patch)
tree3b6f7df5a249eba9382de495553583795052bc3b /widgets
parentaf0a2b9a46e5d7f015682ebc1522bd421d7fe3dd (diff)
downloadaerc-03650474e2190ef6e54413d433b3d1f63dc9993e.tar.gz
update tcell to v2 and enable TrueColor support
Also update to the tcell v2 PaletteColor api, which should keep the chosen theme of the user intact. Note, that if $TRUECOLOR is defined and a truecolor given, aerc will now stop clipping the value to one of the theme colors. Generally this is desired behaviour though.
Diffstat (limited to 'widgets')
-rw-r--r--widgets/account-wizard.go2
-rw-r--r--widgets/account.go2
-rw-r--r--widgets/aerc.go2
-rw-r--r--widgets/compose.go2
-rw-r--r--widgets/dirlist.go2
-rw-r--r--widgets/exline.go2
-rw-r--r--widgets/getpasswd.go2
-rw-r--r--widgets/msglist.go2
-rw-r--r--widgets/msgviewer.go2
-rw-r--r--widgets/selector.go2
-rw-r--r--widgets/spinner.go2
-rw-r--r--widgets/status.go2
-rw-r--r--widgets/terminal.go6
13 files changed, 15 insertions, 15 deletions
diff --git a/widgets/account-wizard.go b/widgets/account-wizard.go
index f47e97e1..71ba6e16 100644
--- a/widgets/account-wizard.go
+++ b/widgets/account-wizard.go
@@ -11,7 +11,7 @@ import (
"strconv"
"strings"
- "github.com/gdamore/tcell"
+ "github.com/gdamore/tcell/v2"
"github.com/go-ini/ini"
"github.com/kyoh86/xdg"
diff --git a/widgets/account.go b/widgets/account.go
index f2795133..fc746a48 100644
--- a/widgets/account.go
+++ b/widgets/account.go
@@ -5,7 +5,7 @@ import (
"fmt"
"log"
- "github.com/gdamore/tcell"
+ "github.com/gdamore/tcell/v2"
"git.sr.ht/~sircmpwn/aerc/config"
"git.sr.ht/~sircmpwn/aerc/lib"
diff --git a/widgets/aerc.go b/widgets/aerc.go
index b5e8dd13..70bee7c6 100644
--- a/widgets/aerc.go
+++ b/widgets/aerc.go
@@ -10,7 +10,7 @@ import (
"time"
"github.com/emersion/go-message/mail"
- "github.com/gdamore/tcell"
+ "github.com/gdamore/tcell/v2"
"github.com/google/shlex"
"golang.org/x/crypto/openpgp"
diff --git a/widgets/compose.go b/widgets/compose.go
index e139f9ac..aab33088 100644
--- a/widgets/compose.go
+++ b/widgets/compose.go
@@ -16,7 +16,7 @@ import (
"time"
"github.com/emersion/go-message/mail"
- "github.com/gdamore/tcell"
+ "github.com/gdamore/tcell/v2"
"github.com/mattn/go-runewidth"
"github.com/mitchellh/go-homedir"
"github.com/pkg/errors"
diff --git a/widgets/dirlist.go b/widgets/dirlist.go
index aca14914..5711fe40 100644
--- a/widgets/dirlist.go
+++ b/widgets/dirlist.go
@@ -7,7 +7,7 @@ import (
"regexp"
"sort"
- "github.com/gdamore/tcell"
+ "github.com/gdamore/tcell/v2"
"github.com/mattn/go-runewidth"
"git.sr.ht/~sircmpwn/aerc/config"
diff --git a/widgets/exline.go b/widgets/exline.go
index 692c8e21..24c39c10 100644
--- a/widgets/exline.go
+++ b/widgets/exline.go
@@ -1,7 +1,7 @@
package widgets
import (
- "github.com/gdamore/tcell"
+ "github.com/gdamore/tcell/v2"
"git.sr.ht/~sircmpwn/aerc/config"
"git.sr.ht/~sircmpwn/aerc/lib"
diff --git a/widgets/getpasswd.go b/widgets/getpasswd.go
index 3cdc5cfe..b5c3d0ec 100644
--- a/widgets/getpasswd.go
+++ b/widgets/getpasswd.go
@@ -3,7 +3,7 @@ package widgets
import (
"fmt"
- "github.com/gdamore/tcell"
+ "github.com/gdamore/tcell/v2"
"git.sr.ht/~sircmpwn/aerc/config"
"git.sr.ht/~sircmpwn/aerc/lib/ui"
diff --git a/widgets/msglist.go b/widgets/msglist.go
index 61738a89..827282b3 100644
--- a/widgets/msglist.go
+++ b/widgets/msglist.go
@@ -5,7 +5,7 @@ import (
"log"
"math"
- "github.com/gdamore/tcell"
+ "github.com/gdamore/tcell/v2"
"github.com/mattn/go-runewidth"
"git.sr.ht/~sircmpwn/aerc/config"
diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go
index 6c695771..216a8c5e 100644
--- a/widgets/msgviewer.go
+++ b/widgets/msgviewer.go
@@ -11,7 +11,7 @@ import (
"strings"
"github.com/danwakefield/fnmatch"
- "github.com/gdamore/tcell"
+ "github.com/gdamore/tcell/v2"
"github.com/google/shlex"
"github.com/mattn/go-runewidth"
diff --git a/widgets/selector.go b/widgets/selector.go
index d19d38f6..196601bf 100644
--- a/widgets/selector.go
+++ b/widgets/selector.go
@@ -1,7 +1,7 @@
package widgets
import (
- "github.com/gdamore/tcell"
+ "github.com/gdamore/tcell/v2"
"git.sr.ht/~sircmpwn/aerc/config"
"git.sr.ht/~sircmpwn/aerc/lib/ui"
diff --git a/widgets/spinner.go b/widgets/spinner.go
index 0c724221..f49256aa 100644
--- a/widgets/spinner.go
+++ b/widgets/spinner.go
@@ -5,7 +5,7 @@ import (
"sync/atomic"
"time"
- "github.com/gdamore/tcell"
+ "github.com/gdamore/tcell/v2"
"git.sr.ht/~sircmpwn/aerc/config"
"git.sr.ht/~sircmpwn/aerc/lib/ui"
diff --git a/widgets/status.go b/widgets/status.go
index 122ca5f1..dfad08ca 100644
--- a/widgets/status.go
+++ b/widgets/status.go
@@ -3,7 +3,7 @@ package widgets
import (
"time"
- "github.com/gdamore/tcell"
+ "github.com/gdamore/tcell/v2"
"github.com/mattn/go-runewidth"
"git.sr.ht/~sircmpwn/aerc/config"
diff --git a/widgets/terminal.go b/widgets/terminal.go
index 77da71e6..e83c812f 100644
--- a/widgets/terminal.go
+++ b/widgets/terminal.go
@@ -10,7 +10,7 @@ import (
"github.com/creack/pty"
"github.com/ddevault/go-libvterm"
- "github.com/gdamore/tcell"
+ "github.com/gdamore/tcell/v2"
)
type vtermKey struct {
@@ -406,7 +406,7 @@ func (term *Terminal) styleFromCell(cell *vterm.ScreenCell) tcell.Style {
if background.IsDefaultBg() {
bg = tcell.ColorDefault
} else if background.IsIndexed() {
- bg = tcell.Color(background.GetIndex())
+ bg = tcell.Color(tcell.PaletteColor(int(background.GetIndex())))
} else if background.IsRgb() {
r, g, b := background.GetRGB()
bg = tcell.NewRGBColor(int32(r), int32(g), int32(b))
@@ -414,7 +414,7 @@ func (term *Terminal) styleFromCell(cell *vterm.ScreenCell) tcell.Style {
if foreground.IsDefaultFg() {
fg = tcell.ColorDefault
} else if foreground.IsIndexed() {
- fg = tcell.Color(foreground.GetIndex())
+ fg = tcell.Color(tcell.PaletteColor(int(foreground.GetIndex())))
} else if foreground.IsRgb() {
r, g, b := foreground.GetRGB()
fg = tcell.NewRGBColor(int32(r), int32(g), int32(b))