circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Okay, so I screwed up when testing this, doh. Unbreak so that CAN/SUB actually 

do cancel the sequence, and tweak to make the code more clear.
This commit is contained in:
Nicholas Marriott 2009-06-25 15:54:03 +00:00
parent 4eed190649
commit cd71a13a14
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
input.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: input.c,v 1.5 2009/06/04 14:24:49 nicm Exp $ */ /* $OpenBSD: input.c,v 1.6 2009/06/04 14:42:14 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -399,13 +399,16 @@ input_state_sequence_first(u_char ch, struct input_ctx *ictx)
if (ch == 0x1b) { /* ESC */ if (ch == 0x1b) { /* ESC */
/* Abort sequence and begin with new. */ /* Abort sequence and begin with new. */
input_state(ictx, input_state_escape); input_state(ictx, input_state_escape);
} else if (ch != 0x18 && ch != 0x1a) { /* CAN and SUB */ return;
} else if (ch == 0x18 || ch == 0x1a) { /* CAN and SUB */
/* Abort sequence. */ /* Abort sequence. */
input_state(ictx, input_state_first); input_state(ictx, input_state_first);
} else { return;
/* Handle C0 immediately. */
input_handle_c0_control(ch, ictx);
} }
/* Handle C0 immediately. */
input_handle_c0_control(ch, ictx);
/* /*
* Just come back to this state, in case the next character * Just come back to this state, in case the next character
* is the start of a private sequence. * is the start of a private sequence.
@ -467,13 +470,16 @@ input_state_sequence_next(u_char ch, struct input_ctx *ictx)
if (ch == 0x1b) { /* ESC */ if (ch == 0x1b) { /* ESC */
/* Abort sequence and begin with new. */ /* Abort sequence and begin with new. */
input_state(ictx, input_state_escape); input_state(ictx, input_state_escape);
} else if (ch != 0x18 && ch != 0x1a) { /* CAN and SUB */ return;
} else if (ch == 0x18 || ch == 0x1a) { /* CAN and SUB */
/* Abort sequence. */ /* Abort sequence. */
input_state(ictx, input_state_first); input_state(ictx, input_state_first);
} else { return;
/* Handle C0 immediately. */
input_handle_c0_control(ch, ictx);
} }
/* Handle C0 immediately. */
input_handle_c0_control(ch, ictx);
return; return;
} }