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.
pull/1/head
Nicholas Marriott 2009-06-04 14:42:14 +00:00
parent 6c1f03578d
commit d6015824dd
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
input.c
View File

@ -399,13 +399,16 @@ input_state_sequence_first(u_char ch, struct input_ctx *ictx)
if (ch == 0x1b) { /* ESC */
/* Abort sequence and begin with new. */
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. */
input_state(ictx, input_state_first);
} else {
/* Handle C0 immediately. */
input_handle_c0_control(ch, ictx);
return;
}
/* Handle C0 immediately. */
input_handle_c0_control(ch, ictx);
/*
* Just come back to this state, in case the next character
* 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 */
/* Abort sequence and begin with new. */
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. */
input_state(ictx, input_state_first);
} else {
/* Handle C0 immediately. */
input_handle_c0_control(ch, ictx);
return;
}
/* Handle C0 immediately. */
input_handle_c0_control(ch, ictx);
return;
}