Alexander/gomuks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove ctrl+a from default keybindings and fix esc

Browse Source
This commit is contained in:
Tulir Asokan 2022-03-06 22:44:02 +02:00
parent 686f7025cb
commit daf0067d53
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.go
View File

@ -226,6 +226,10 @@ func parseKeybindings(input map[string]string) (output map[Keybind]string) {
if err != nil { if err != nil {
panic(fmt.Errorf("failed to parse keybinding %s -> %s: %w", shortcut, action, err)) panic(fmt.Errorf("failed to parse keybinding %s -> %s: %w", shortcut, action, err))
} }
// TODO find out if other keys are parsed incorrectly like this
if key == tcell.KeyEscape {
ch = 0
}
parsedShortcut := Keybind{ parsedShortcut := Keybind{
Mod: mod, Mod: mod,
Key: key, Key: key,

1
config/keybindings.yaml
View File

@ -5,7 +5,6 @@ main:
'Ctrl+Home': scroll_up 'Ctrl+Home': scroll_up
'Ctrl+End': scroll_down 'Ctrl+End': scroll_down
'Ctrl+Enter': add_newline 'Ctrl+Enter': add_newline
'Ctrl+a': next_active_room
'Ctrl+l': show_bare 'Ctrl+l': show_bare
'Alt+Down': next_room 'Alt+Down': next_room
'Alt+Up': prev_room 'Alt+Up': prev_room

7
ui/help-modal.go
View File

@ -1,10 +1,10 @@
package ui package ui
import ( import (
"maunium.net/go/gomuks/config" "maunium.net/go/mauview"
"maunium.net/go/tcell" "maunium.net/go/tcell"
"maunium.net/go/mauview" "maunium.net/go/gomuks/config"
) )
const helpText = `# General const helpText = `# General
@ -100,7 +100,8 @@ func (hm *HelpModal) OnKeyEvent(event mauview.KeyEvent) bool {
Ch: event.Rune(), Ch: event.Rune(),
Mod: event.Modifiers(), Mod: event.Modifiers(),
} }
if hm.parent.config.Keybindings.Room[kb] == "cancel" { // TODO unhardcode q
if hm.parent.config.Keybindings.Modal[kb] == "cancel" || event.Rune() == 'q' {
hm.parent.HideModal() hm.parent.HideModal()
return true return true
} }