Commit 76ec3a7a authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Greg Kroah-Hartman

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

Replacing the default case with the iffery by case ranges makes the code
more understandable at last.
Signed-off-by: default avatar"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.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 09e7f9f6
...@@ -1795,25 +1795,22 @@ static void csi_m(struct vc_data *vc) ...@@ -1795,25 +1795,22 @@ static void csi_m(struct vc_data *vc)
vc->state.color = (vc->vc_def_color & 0xf0) | vc->state.color = (vc->vc_def_color & 0xf0) |
(vc->state.color & 0x0f); (vc->state.color & 0x0f);
break; break;
default: case CSI_m_BRIGHT_FG_COLOR_BEG ... CSI_m_BRIGHT_FG_COLOR_END:
if (vc->vc_par[i] >= CSI_m_BRIGHT_FG_COLOR_BEG && vc->state.intensity = VCI_BOLD;
vc->vc_par[i] <= CSI_m_BRIGHT_BG_COLOR_END) { vc->vc_par[i] -= CSI_m_BRIGHT_FG_COLOR_OFF;
if (vc->vc_par[i] < CSI_m_BRIGHT_BG_COLOR_BEG) fallthrough;
vc->state.intensity = VCI_BOLD; case CSI_m_FG_COLOR_BEG ... CSI_m_FG_COLOR_END:
vc->vc_par[i] -= CSI_m_BRIGHT_FG_COLOR_OFF; vc->vc_par[i] -= CSI_m_FG_COLOR_BEG;
} vc->state.color = color_table[vc->vc_par[i]] |
if (vc->vc_par[i] >= CSI_m_FG_COLOR_BEG && (vc->state.color & 0xf0);
vc->vc_par[i] <= CSI_m_FG_COLOR_END) { break;
vc->vc_par[i] -= CSI_m_FG_COLOR_BEG; case CSI_m_BRIGHT_BG_COLOR_BEG ... CSI_m_BRIGHT_BG_COLOR_END:
vc->state.color = color_table[vc->vc_par[i]] | vc->vc_par[i] -= CSI_m_BRIGHT_BG_COLOR_OFF;
(vc->state.color & 0xf0); fallthrough;
} else if (vc->vc_par[i] >= CSI_m_BG_COLOR_BEG && case CSI_m_BG_COLOR_BEG ... CSI_m_BG_COLOR_END:
vc->vc_par[i] <= CSI_m_BG_COLOR_END) { vc->vc_par[i] -= CSI_m_BG_COLOR_BEG;
vc->vc_par[i] -= CSI_m_BG_COLOR_BEG; vc->state.color = (color_table[vc->vc_par[i]] << 4) |
vc->state.color = (color_table[vc->vc_par[i]] << 4) | (vc->state.color & 0x0f);
(vc->state.color & 0x0f);
}
break; break;
} }
update_attr(vc); update_attr(vc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment