Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-06 05:06:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tty: vt: move CSI DEC handling to a separate function

Browse Source 
The handling of "CSI ? ..." (i.e. vc_priv == EPdec) can be easily moved
out of do_con_trol() into a separate function. This again increases
readability of do_con_trol().

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20240202065608.14019-14-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:59 +01:00 committed by Greg Kroah-Hartman
parent a9ffb22347
commit de0f61f342
1 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
drivers/tty/vt/vt.c
View File

@ -2338,6 +2338,43 @@ static void handle_esc(struct tty_struct *tty, struct vc_data *vc, u8 c)
}
}
/*
* Handle special DEC control sequences ("ESC [ ? parameters char"). Parameters
* are in @vc->vc_par and the char is in @c here.
*/
static void csi_DEC(struct tty_struct *tty, struct vc_data *vc, u8 c)
{
switch (c) {
case 'h':
csi_DEC_hl(vc, true);
break;
case 'l':
csi_DEC_hl(vc, false);
break;
case 'c':
if (vc->vc_par[0])
vc->vc_cursor_type = CUR_MAKE(vc->vc_par[0],
vc->vc_par[1],
vc->vc_par[2]);
else
vc->vc_cursor_type = cur_default;
break;
case 'm':
clear_selection();
if (vc->vc_par[0])
vc->vc_complement_mask = vc->vc_par[0] << 8 | vc->vc_par[1];
else
vc->vc_complement_mask = vc->vc_s_complement_mask;
break;
case 'n':
if (vc->vc_par[0] == 5)
status_report(tty);
else if (vc->vc_par[0] == 6)
cursor_report(vc, tty);
break;
}
}
/* console_lock is held */
static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, u8 c)
{
@ -2427,40 +2464,16 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, u8 c)
return;
}
vc->vc_state = ESnormal;
switch(c) {
case 'h':
if (vc->vc_priv == EPdec)
csi_DEC_hl(vc, true);
switch (vc->vc_priv) {
case EPdec:
csi_DEC(tty, vc, c);
return;
case 'l':
if (vc->vc_priv == EPdec)
csi_DEC_hl(vc, false);
case EPecma:
break;
default:
return;
case 'c':
if (vc->vc_priv == EPdec) {
if (vc->vc_par[0])
vc->vc_cursor_type =
CUR_MAKE(vc->vc_par[0],
vc->vc_par[1],
vc->vc_par[2]);
else
vc->vc_cursor_type = cur_default;
return;
}
break;
case 'm':
if (vc->vc_priv == EPdec) {
clear_selection();
if (vc->vc_par[0])
vc->vc_complement_mask = vc->vc_par[0] << 8 | vc->vc_par[1];
else
vc->vc_complement_mask = vc->vc_s_complement_mask;
return;
}
break;
}
if (vc->vc_priv != EPecma)
return;
switch(c) {
case 'G':