Compare commits
1
Commits
next
..
e2aaf6dc35
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e2aaf6dc35 |
@@ -627,10 +627,6 @@ func (a *App) cmdWindow(args string) {
|
||||
nick, buf.Name, "connected",
|
||||
)
|
||||
} else {
|
||||
a.mu.Lock()
|
||||
a.target = ""
|
||||
a.mu.Unlock()
|
||||
|
||||
a.ui.SetStatus(nick, "", "connected")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -219,63 +219,6 @@ func TestJoinResponse(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// TestAltDigit checks that Alt and a digit shows that window and
|
||||
// makes its channel or user the target, as /window does. Window
|
||||
// 0, the status window, leaves no target.
|
||||
func TestAltDigit(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
digit rune
|
||||
// The buffer shown and the target after the key.
|
||||
wantBuffer string
|
||||
wantTarget string
|
||||
}{
|
||||
{
|
||||
name: "channel window",
|
||||
digit: '1',
|
||||
wantBuffer: testChannel,
|
||||
wantTarget: testChannel,
|
||||
},
|
||||
{
|
||||
name: "status window",
|
||||
digit: '0',
|
||||
wantBuffer: "(status)",
|
||||
wantTarget: "",
|
||||
},
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
app := &App{ui: NewUI(), nick: testNick, target: testOtherNick}
|
||||
app.ui.OnInput(app.handleInput)
|
||||
runUI(t, app.ui)
|
||||
|
||||
// Window 1 is the channel. Window 2, the one shown, is
|
||||
// the other user's.
|
||||
app.ui.SwitchToBuffer(testChannel)
|
||||
app.ui.SwitchToBuffer(testOtherNick)
|
||||
|
||||
key := tcell.NewEventKey(tcell.KeyRune, test.digit, tcell.ModAlt)
|
||||
app.ui.app.GetInputCapture()(key)
|
||||
|
||||
var shown string
|
||||
|
||||
app.ui.app.QueueUpdate(func() {
|
||||
shown = app.ui.buffers[app.ui.currentBuffer].Name
|
||||
})
|
||||
|
||||
if shown != test.wantBuffer || app.target != test.wantTarget {
|
||||
t.Fatalf("got buffer %s and target %q, want %s and %q",
|
||||
shown, app.target, test.wantBuffer, test.wantTarget)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestOwnEventFromOtherClient checks that a message, notice,
|
||||
// join or part that the user's session makes from another
|
||||
// client shows as one line in the buffer it belongs to.
|
||||
|
||||
+2
-5
@@ -240,13 +240,10 @@ func (ui *UI) initKeyCapture() {
|
||||
return event
|
||||
}
|
||||
|
||||
// Alt and a digit runs /window with that digit.
|
||||
// SwitchBuffer alone would leave the target as it was.
|
||||
r := event.Rune()
|
||||
if r >= '0' && r <= '9' {
|
||||
if ui.onInput != nil {
|
||||
ui.onInput("/window " + string(r))
|
||||
}
|
||||
idx := int(r - '0')
|
||||
ui.SwitchBuffer(idx)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user