OrgGo/gocui
1
0
Fork 0
mirror of https://github.com/jroimartin/gocui.git synced 2025-05-10 19:29:16 +08:00
Code Issues Projects Releases Wiki Activity

prioritise editor keybindings over other views

Browse Source
This commit is contained in:
Jesse Duffield 2021-02-18 19:37:00 +11:00
parent df403d2beb
commit 77056cf8e0
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
edit.go
View File

@ -14,24 +14,26 @@ const maxInt = int(^uint(0) >> 1)
// Editor interface must be satisfied by gocui editors.
type Editor interface {
Edit(v *View, key Key, ch rune, mod Modifier)
Edit(v *View, key Key, ch rune, mod Modifier) bool
}
// The EditorFunc type is an adapter to allow the use of ordinary functions as
// Editors. If f is a function with the appropriate signature, EditorFunc(f)
// is an Editor object that calls f.
type EditorFunc func(v *View, key Key, ch rune, mod Modifier)
type EditorFunc func(v *View, key Key, ch rune, mod Modifier) bool
// Edit calls f(v, key, ch, mod)
func (f EditorFunc) Edit(v *View, key Key, ch rune, mod Modifier) {
f(v, key, ch, mod)
func (f EditorFunc) Edit(v *View, key Key, ch rune, mod Modifier) bool {
return f(v, key, ch, mod)
}
// DefaultEditor is the default editor.
var DefaultEditor Editor = EditorFunc(simpleEditor)
// simpleEditor is used as the default gocui editor.
func simpleEditor(v *View, key Key, ch rune, mod Modifier) {
func simpleEditor(v *View, key Key, ch rune, mod Modifier) bool {
matched := true
switch {
case ch != 0 && mod == 0:
v.EditWrite(ch)
@ -39,7 +41,7 @@ func simpleEditor(v *View, key Key, ch rune, mod Modifier) {
v.EditWrite(' ')
case key == KeyBackspace || key == KeyBackspace2:
v.EditDelete(true)
case key == KeyDelete:
case key == gocui.KeyCtrlD || key == gocui.KeyDelete:
v.EditDelete(false)
case key == KeyInsert:
v.Overwrite = !v.Overwrite
@ -63,9 +65,16 @@ func simpleEditor(v *View, key Key, ch rune, mod Modifier) {
v.EditGotoToStartOfLine()
case key == KeyCtrlE:
v.EditGotoToEndOfLine()
matched = true
default:
v.EditWrite(ch)
if ch != 0 && mod == 0 {
v.EditWrite(ch)
} else {
matched = false
}
}
return matched
}
// EditWrite writes a rune at the cursor position.

15
gui.go
View File

@ -1004,16 +1004,17 @@ func (g *Gui) draw(v *View) error {
func (g *Gui) onKey(ev *GocuiEvent) error {
switch ev.Type {
case eventKey:
matched, err := g.execKeybindings(g.currentView, ev)
if g.currentView != nil && g.currentView.Editable && g.currentView.Editor != nil {
matched := g.currentView.Editor.Edit(g.currentView, Key(ev.Key), ev.Ch, Modifier(ev.Mod))
if matched {
break
}
}
_, err := g.execKeybindings(g.currentView, ev)
if err != nil {
return err
}
if matched {
break
}
if g.currentView != nil && g.currentView.Editable && g.currentView.Editor != nil {
g.currentView.Editor.Edit(g.currentView, Key(ev.Key), ev.Ch, Modifier(ev.Mod))
}
case eventMouse:
mx, my := ev.MouseX, ev.MouseY
v, err := g.ViewByPosition(mx, my)