tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tty: vt: use case ranges for CSI+m fg/bg colors

Browse Source 
Replacing the default case with the iffery by case ranges makes the code
more understandable at last.

Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Tested-by: Helge Deller <deller@gmx.de> # parisc STI console
Link: https://lore.kernel.org/r/20240122110401.7289-11-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby (SUSE)
2024-01-22 12:03:24 +01:00
committed by Greg Kroah-Hartman
parent 09e7f9f6c5
commit 76ec3a7a51
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/tty/vt/vt.c
+16 -19
View File
@@ -1795,25 +1795,22 @@ static void csi_m(struct vc_data *vc)
vc->state.color = (vc->vc_def_color & 0xf0) |
(vc->state.color & 0x0f);
break;
default:
if (vc->vc_par[i] >= CSI_m_BRIGHT_FG_COLOR_BEG &&
vc->vc_par[i] <= CSI_m_BRIGHT_BG_COLOR_END) {
if (vc->vc_par[i] < CSI_m_BRIGHT_BG_COLOR_BEG)
vc->state.intensity = VCI_BOLD;
vc->vc_par[i] -= CSI_m_BRIGHT_FG_COLOR_OFF;
}
if (vc->vc_par[i] >= CSI_m_FG_COLOR_BEG &&
vc->vc_par[i] <= CSI_m_FG_COLOR_END) {
vc->vc_par[i] -= CSI_m_FG_COLOR_BEG;
vc->state.color = color_table[vc->vc_par[i]] |
(vc->state.color & 0xf0);
} else if (vc->vc_par[i] >= CSI_m_BG_COLOR_BEG &&
vc->vc_par[i] <= CSI_m_BG_COLOR_END) {
vc->vc_par[i] -= CSI_m_BG_COLOR_BEG;
vc->state.color = (color_table[vc->vc_par[i]] << 4) |
(vc->state.color & 0x0f);
}
case CSI_m_BRIGHT_FG_COLOR_BEG ... CSI_m_BRIGHT_FG_COLOR_END:
vc->state.intensity = VCI_BOLD;
vc->vc_par[i] -= CSI_m_BRIGHT_FG_COLOR_OFF;
fallthrough;
case CSI_m_FG_COLOR_BEG ... CSI_m_FG_COLOR_END:
vc->vc_par[i] -= CSI_m_FG_COLOR_BEG;
vc->state.color = color_table[vc->vc_par[i]] |
(vc->state.color & 0xf0);
break;
case CSI_m_BRIGHT_BG_COLOR_BEG ... CSI_m_BRIGHT_BG_COLOR_END:
vc->vc_par[i] -= CSI_m_BRIGHT_BG_COLOR_OFF;
fallthrough;
case CSI_m_BG_COLOR_BEG ... CSI_m_BG_COLOR_END:
vc->vc_par[i] -= CSI_m_BG_COLOR_BEG;
vc->state.color = (color_table[vc->vc_par[i]] << 4) |
(vc->state.color & 0x0f);
break;
}
update_attr(vc);