Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(keys): spacebar now sends a KeySpace #289

Merged
merged 5 commits into from Apr 12, 2022
Merged

fix(keys): spacebar now sends a KeySpace #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d3f1e99
fix: replace keySP with working KeySpace
bashbunni Apr 11, 2022
d0951f5
test: update test to meet new reqs
bashbunni Apr 11, 2022
240f1fb
fix: fix test looking for 'space'
bashbunni Apr 11, 2022
caf1969
fix(keys): set type to KeySpace when sending a space
meowgorithm Apr 12, 2022
d5f2d23
docs(keys): comments
meowgorithm Apr 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 14 additions & 5 deletions key.go
View file
Open in desktop
Expand Up @@ -137,7 +137,6 @@ const (
keyGS KeyType = 29 // group separator
keyRS KeyType = 30 // record separator
keyUS KeyType = 31 // unit separator
keySP KeyType = 32 // space
keyDEL KeyType = 127 // delete. on most systems this is mapped to backspace, I hear
)

Expand All @@ -148,7 +147,6 @@ const (
KeyEnter KeyType = keyCR
KeyBackspace KeyType = keyDEL
KeyTab KeyType = keyHT
KeySpace KeyType = keySP
KeyEsc KeyType = keyESC
KeyEscape KeyType = keyESC

Expand Down Expand Up @@ -200,6 +198,7 @@ const (
KeyPgUp
KeyPgDown
KeyDelete
KeySpace
KeyF1
KeyF2
KeyF3
Expand All @@ -222,8 +221,9 @@ const (
KeyF20
)

// Mapping for control keys to friendly consts.
// Mappings for control keys and other special keys to friendly consts.
var keyNames = map[KeyType]string{
// Control keys.
keyNUL: "ctrl+@", // also ctrl+`
keySOH: "ctrl+a",
keySTX: "ctrl+b",
Expand Down Expand Up @@ -256,13 +256,14 @@ var keyNames = map[KeyType]string{
keyGS: "ctrl+]",
keyRS: "ctrl+^",
keyUS: "ctrl+_",
keySP: "space",
keyDEL: "backspace",

// Other keys.
KeyRunes: "runes",
KeyUp: "up",
KeyDown: "down",
KeyRight: "right",
KeySpace: " ", // for backwards compatibility
KeyLeft: "left",
KeyShiftTab: "shift+tab",
KeyHome: "home",
Expand Down Expand Up @@ -480,7 +481,15 @@ func readInputs(input io.Reader) ([]Msg, error) {
}, nil
}

// Welp, it's just a regular, ol' single rune
// If it's a space, override the type with KeySpace (but still include the
// rune).
if len(runes) == 1 && runes[0] == ' ' {
return []Msg{
KeyMsg(Key{Type: KeySpace, Runes: runes}),
}, nil
}

// Welp, it's just a regular, ol' single rune.
return []Msg{
KeyMsg(Key{Type: KeyRunes, Runes: runes}),
}, nil
Expand Down
10 changes: 5 additions & 5 deletions key_test.go
View file
Open in desktop
Expand Up @@ -8,10 +8,10 @@ import (
func TestKeyString(t *testing.T) {
t.Run("alt+space", func(t *testing.T) {
if got := KeyMsg(Key{
Type: keySP,
Type: KeySpace,
Alt: true,
}).String(); got != "alt+space" {
t.Fatalf(`expected a "alt+space", got %q`, got)
}).String(); got != "alt+ " {
t.Fatalf(`expected a "alt+ ", got %q`, got)
}
})

Expand All @@ -35,8 +35,8 @@ func TestKeyString(t *testing.T) {

func TestKeyTypeString(t *testing.T) {
t.Run("space", func(t *testing.T) {
if got := keySP.String(); got != "space" {
t.Fatalf(`expected a "space", got %q`, got)
if got := KeySpace.String(); got != " " {
t.Fatalf(`expected a " ", got %q`, got)
}
})

Expand Down