gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2024-06-09 09:20:44 +00:00
Code Issues Releases Wiki Activity

Prevent input fighting between terminal and other input listeners. (#278)

Browse Source
This commit is contained in:
Alex Yatskov 2020-02-01 11:35:55 -08:00 committed by GitHub
parent 568bc7977e
commit e878ebcbcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
d2core/d2term/terminal.go
View File

@ -133,14 +133,18 @@ func (t *terminal) advance(elapsed float64) error {
func (t *terminal) OnKeyDown(event d2input.KeyEvent) bool {
maxOutputIndex := d2helper.MaxInt(0, len(t.outputHistory)-t.lineCount)
if event.Key == d2input.KeyGraveAccent {
switch t.visState {
case termVisShowing, termVisShown:
t.hide()
case termVisHiding, termVisHidden:
if t.visState == termVisHiding || t.visState == termVisHidden {
if event.Key == d2input.KeyGraveAccent {
t.show()
return true
}
// When terminal is not visible, only d2input.KeyGraveAccent is consumed.
return false
}
if event.Key == d2input.KeyGraveAccent {
t.hide()
return true
}
@ -221,7 +225,8 @@ func (t *terminal) OnKeyDown(event d2input.KeyEvent) bool {
return true
}
return false
// When terminal is visible, all keys are consumed.
return true
}
func (t *terminal) OnKeyChars(event d2input.KeyCharsEvent) bool {