Hopiu/micro
1
0
Fork 0
mirror of https://github.com/Hopiu/micro.git synced 2026-05-21 04:41:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure screen cannot draw during a term prompt

Browse source 
Fixes #2528
This commit is contained in:
Zachary Yedidia 2022-08-16 22:07:41 -07:00
parent 225927b9a2
commit 3d6b0c6dd6
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/micro/micro.go
View file

@ -388,6 +388,7 @@ func DoEvent() {
var event tcell.Event var event tcell.Event
// Display everything // Display everything
screen.DrawLock.Lock()
screen.Screen.Fill(' ', config.DefStyle) screen.Screen.Fill(' ', config.DefStyle)
screen.Screen.HideCursor() screen.Screen.HideCursor()
action.Tabs.Display() action.Tabs.Display()
@ -397,6 +398,7 @@ func DoEvent() {
action.MainTab().Display() action.MainTab().Display()
action.InfoBar.Display() action.InfoBar.Display()
screen.Screen.Show() screen.Screen.Show()
screen.DrawLock.Unlock()
// Check for new events // Check for new events
select { select {

3
internal/screen/screen.go
View file

@ -24,6 +24,7 @@ var Events chan (tcell.Event)
// The lock is necessary since the screen is polled on a separate thread // The lock is necessary since the screen is polled on a separate thread
var lock sync.Mutex var lock sync.Mutex
var DrawLock sync.Mutex
// drawChan is a channel that will cause the screen to redraw when // drawChan is a channel that will cause the screen to redraw when
// written to even if no event user event has occurred // written to even if no event user event has occurred
@ -120,6 +121,7 @@ func TempFini() bool {
if !screenWasNil { if !screenWasNil {
Screen.Fini() Screen.Fini()
Lock() Lock()
DrawLock.Lock()
Screen = nil Screen = nil
} }
return screenWasNil return screenWasNil
@ -130,6 +132,7 @@ func TempStart(screenWasNil bool) {
if !screenWasNil { if !screenWasNil {
Init() Init()
Unlock() Unlock()
DrawLock.Unlock()
} }
} }