system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-05 02:44:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

tty: vt: separate ESesc state handling into handle_esc()

Browse source 
Similar to the ASCII handling, the ESC handling can be easily moved away
from do_con_trol(). So create a new handle_esc() for that.

And add a comment with an example.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20240202065608.14019-13-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby (SUSE) 2024-02-02 07:55:58 +01:00 committed by Greg Kroah-Hartman
parent ce66f8e387
commit a9ffb22347
1 changed files with 72 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
drivers/tty/vt/vt.c
View file

@ -2267,6 +2267,77 @@ static bool handle_ascii(struct tty_struct *tty, struct vc_data *vc, u8 c)
return false;
}
/*
* Handle a character (@c) following an ESC (when @vc is in the ESesc state).
* E.g. previous ESC with @c == '[' here yields the ESsquare state (that is:
* CSI).
*/
static void handle_esc(struct tty_struct *tty, struct vc_data *vc, u8 c)
{
vc->vc_state = ESnormal;
switch (c) {
case '[':
vc->vc_state = ESsquare;
break;
case ']':
vc->vc_state = ESnonstd;
break;
case '_':
vc->vc_state = ESapc;
break;
case '^':
vc->vc_state = ESpm;
break;
case '%':
vc->vc_state = ESpercent;
break;
case 'E':
cr(vc);
lf(vc);
break;
case 'M':
ri(vc);
break;
case 'D':
lf(vc);
break;
case 'H':
if (vc->state.x < VC_TABSTOPS_COUNT)
set_bit(vc->state.x, vc->vc_tab_stop);
break;
case 'P':
vc->vc_state = ESdcs;
break;
case 'Z':
respond_ID(tty);
break;
case '7':
save_cur(vc);
break;
case '8':
restore_cur(vc);
break;
case '(':
vc->vc_state = ESsetG0;
break;
case ')':
vc->vc_state = ESsetG1;
break;
case '#':
vc->vc_state = EShash;
break;
case 'c':
reset_terminal(vc, 1);
break;
case '>': /* Numeric keypad */
clr_kbd(vc, kbdapplic);
break;
case '=': /* Appl. keypad */
set_kbd(vc, kbdapplic);
break;
}
}
/* console_lock is held */
static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, u8 c)
{
@ -2283,68 +2354,7 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, u8 c)
switch(vc->vc_state) {
case ESesc:
vc->vc_state = ESnormal;
switch (c) {
case '[':
vc->vc_state = ESsquare;
return;
case ']':
vc->vc_state = ESnonstd;
return;
case '_':
vc->vc_state = ESapc;
return;
case '^':
vc->vc_state = ESpm;
return;
case '%':
vc->vc_state = ESpercent;
return;
case 'E':
cr(vc);
lf(vc);
return;
case 'M':
ri(vc);
return;
case 'D':
lf(vc);
return;
case 'H':
if (vc->state.x < VC_TABSTOPS_COUNT)
set_bit(vc->state.x, vc->vc_tab_stop);
return;
case 'P':
vc->vc_state = ESdcs;
return;
case 'Z':
respond_ID(tty);
return;
case '7':
save_cur(vc);
return;
case '8':
restore_cur(vc);
return;
case '(':
vc->vc_state = ESsetG0;
return;
case ')':
vc->vc_state = ESsetG1;
return;
case '#':
vc->vc_state = EShash;
return;
case 'c':
reset_terminal(vc, 1);
return;
case '>': /* Numeric keypad */
clr_kbd(vc, kbdapplic);
return;
case '=': /* Appl. keypad */
set_kbd(vc, kbdapplic);
return;
}
handle_esc(tty, vc, c);
return;
case ESnonstd:
if (c=='P') { /* palette escape sequence */