summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2009-06-04 14:24:50 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2009-06-04 14:24:50 +0000
commit8b840c2795fe09404f4b3d0f544f7dd3d3f3ff89 (patch)
treee42684df6fe5197775f90941960573724069b281
parentcc78740c4c7f38d6418b210b4dd4a0146b7760d0 (diff)
Oops, CAN and SUB should abort the sequence (return to first state), not remain
in the same state.
-rw-r--r--usr.bin/tmux/input.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/usr.bin/tmux/input.c b/usr.bin/tmux/input.c
index a4557838aca..d5bf0900a75 100644
--- a/usr.bin/tmux/input.c
+++ b/usr.bin/tmux/input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: input.c,v 1.4 2009/06/04 14:15:50 nicm Exp $ */
+/* $OpenBSD: input.c,v 1.5 2009/06/04 14:24:49 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -400,6 +400,9 @@ input_state_sequence_first(u_char ch, struct input_ctx *ictx)
/* Abort sequence and begin with new. */
input_state(ictx, input_state_escape);
} else if (ch != 0x18 && ch != 0x1a) { /* CAN and SUB */
+ /* Abort sequence. */
+ input_state(ictx, input_state_first);
+ } else {
/* Handle C0 immediately. */
input_handle_c0_control(ch, ictx);
}
@@ -465,6 +468,9 @@ input_state_sequence_next(u_char ch, struct input_ctx *ictx)
/* Abort sequence and begin with new. */
input_state(ictx, input_state_escape);
} else if (ch != 0x18 && ch != 0x1a) { /* CAN and SUB */
+ /* Abort sequence. */
+ input_state(ictx, input_state_first);
+ } else {
/* Handle C0 immediately. */
input_handle_c0_control(ch, ictx);
}