From 56b84d3da5db01c97ec201390dadef2191dda7f4 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sat, 1 Jun 2019 11:28:29 -0400 Subject: [PATCH] Use forked version of tcell --- go.mod | 6 +++--- go.sum | 11 +++++++++++ widgets/terminal.go | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 5178583..9170ae1 100644 --- a/go.mod +++ b/go.mod @@ -10,15 +10,13 @@ require ( github.com/emersion/go-message v0.10.3 github.com/emersion/go-sasl v0.0.0-20190517184301-63aa71ca65a3 github.com/emersion/go-smtp v0.11.0 - github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635 // indirect github.com/gdamore/tcell v1.0.0 github.com/go-ini/ini v1.42.0 github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf github.com/kyoh86/xdg v0.0.0-20171127140545-8db68a8ea76a - github.com/lucasb-eyer/go-colorful v0.0.0-20180531031333-d9cec903b20c // indirect github.com/martinlindhe/base36 v0.0.0-20190418230009-7c6542dfbb41 github.com/mattn/go-isatty v0.0.3 - github.com/mattn/go-runewidth v0.0.2 + github.com/mattn/go-runewidth v0.0.4 github.com/miolini/datacounter v0.0.0-20171104152933-fd4e42a1d5e0 github.com/mitchellh/go-homedir v1.1.0 github.com/pkg/errors v0.8.1 @@ -28,3 +26,5 @@ require ( golang.org/x/sys v0.0.0-20190516110030-61b9204099cb // indirect gopkg.in/ini.v1 v1.42.0 // indirect ) + +replace github.com/gdamore/tcell => git.sr.ht/~sircmpwn/tcell v0.0.0-20190601152711-385f170020ec diff --git a/go.sum b/go.sum index 4a5a805..cc9ed68 100644 --- a/go.sum +++ b/go.sum @@ -10,6 +10,11 @@ git.sr.ht/~sircmpwn/go-libvterm v0.0.0-20190526184212-d093d527d591 h1:wV0nD68X13 git.sr.ht/~sircmpwn/go-libvterm v0.0.0-20190526184212-d093d527d591/go.mod h1:cp37LbiS1y4CrTOmKSF87ZMLwawWUF612RYKTi8vbDc= git.sr.ht/~sircmpwn/pty v0.0.0-20190330154901-3a43678975a9 h1:WWPN5lf6KzXp3xWRrPQZ4MLR3yrFEI4Ysz7HSQ1G/yo= git.sr.ht/~sircmpwn/pty v0.0.0-20190330154901-3a43678975a9/go.mod h1:8Jmcax8M9nYoEwBhVBhv2ixLRCoUqlbQPE95VpPu43I= +git.sr.ht/~sircmpwn/tcell v0.0.0-20190601152106-e7ca7079ad34 h1:g3qmiAJERRdN8YFf47uMI1CBRtOtDE+xoHLE70eZBTk= +git.sr.ht/~sircmpwn/tcell v0.0.0-20190601152106-e7ca7079ad34/go.mod h1:h3kq4HO9l2On+V9ed8w8ewqQEmGCSSHOgQ+2h8uzurE= +git.sr.ht/~sircmpwn/tcell v0.0.0-20190601152711-385f170020ec h1:FOcYOoOx9ZubpUAtLtebkXZbaKfeuatBqbHJAKqOeRQ= +git.sr.ht/~sircmpwn/tcell v0.0.0-20190601152711-385f170020ec/go.mod h1:h3kq4HO9l2On+V9ed8w8ewqQEmGCSSHOgQ+2h8uzurE= +github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 h1:y5HC9v93H5EPKqaS1UYVg1uYah5Xf51mBfIoWehClUQ= github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod h1:Xd9hchkHSWYkEqJwUGisez3G1QY8Ryz0sdWrLPMGjLk= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= @@ -39,6 +44,8 @@ github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe h1:40SWqY0 github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe/go.mod h1:aqO8z8wPrjkscevZJFVE1wXJrLpC5LtJG7fqLOsPb2U= github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635 h1:hheUEMzaOie/wKeIc1WPa7CDVuIO5hqQxjS+dwTQEnI= github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635/go.mod h1:yrQYJKKDTrHmbYxI7CYi+/hbdiDT2m4Hj+t0ikCjsrQ= +github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= +github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= github.com/gdamore/tcell v1.0.0 h1:oaly4AkxvDT5ffKHV/n4L8iy6FxG2QkAVl0M6cjryuE= github.com/gdamore/tcell v1.0.0/go.mod h1:tqyG50u7+Ctv1w5VX67kLzKcj9YXR/JSBZQq/+mLl1A= github.com/go-ini/ini v1.42.0 h1:TWr1wGj35+UiWHlBA8er89seFXxzwFn11spilrrj+38= @@ -53,6 +60,8 @@ github.com/kyoh86/xdg v0.0.0-20171127140545-8db68a8ea76a h1:vLFQnHOnCnmlySdpHAKF github.com/kyoh86/xdg v0.0.0-20171127140545-8db68a8ea76a/go.mod h1:Z5mDqe0fxyxn3W2yTxsBAOQqIrXADQIh02wrTnaRM38= github.com/lucasb-eyer/go-colorful v0.0.0-20180531031333-d9cec903b20c h1:b11Y3yxg40v2/9KUz76a4mSC1DMlgnPGAt+4pJSgmyU= github.com/lucasb-eyer/go-colorful v0.0.0-20180531031333-d9cec903b20c/go.mod h1:NXg0ArsFk0Y01623LgUqoqcouGDB+PwCCQlrwrG6xJ4= +github.com/lucasb-eyer/go-colorful v1.0.2 h1:mCMFu6PgSozg9tDNMMK3g18oJBX7oYGrC09mS6CXfO4= +github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s= github.com/martinlindhe/base36 v0.0.0-20190418230009-7c6542dfbb41 h1:CVsnY46BCLkX9XOhALJ/S7yb9ayc4eqjXSXO3tyB66A= github.com/martinlindhe/base36 v0.0.0-20190418230009-7c6542dfbb41/go.mod h1:+AtEs8xrBpCeYgSLoY/aJ6Wf37jtBuR0s35750M27+8= github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI= @@ -61,6 +70,8 @@ github.com/mattn/go-pointer v0.0.0-20180825124634-49522c3f3791 h1:PfHMsLQJwoc0cc github.com/mattn/go-pointer v0.0.0-20180825124634-49522c3f3791/go.mod h1:2zXcozF6qYGgmsG+SeTZz3oAbFLdD3OWqnUbNvJZAlc= github.com/mattn/go-runewidth v0.0.2 h1:UnlwIPBGaTZfPQ6T1IGzPI0EkYAQmT9fAEJ/poFC63o= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= +github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/miolini/datacounter v0.0.0-20171104152933-fd4e42a1d5e0 h1:clkDYGefEWUCwyCrwYn900sOaVGDpinPJgD0W6ebEjs= github.com/miolini/datacounter v0.0.0-20171104152933-fd4e42a1d5e0/go.mod h1:P6fDJzlxN+cWYR09KbE9/ta+Y6JofX9tAUhJpWkWPaM= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= diff --git a/widgets/terminal.go b/widgets/terminal.go index 82190cc..437c995 100644 --- a/widgets/terminal.go +++ b/widgets/terminal.go @@ -101,7 +101,7 @@ type Terminal struct { start chan interface{} vterm *vterm.VTerm - damage []vterm.Rect // protected by damageMutex + damage []vterm.Rect // protected by damageMutex damageMutex sync.Mutex writeMutex sync.Mutex