d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve names for cons25 sequences.

Browse Source 
In a recent commit, I forgot to expand an X to an abbreviation of "BORDER".
Fix this and some nearby bad names.

The descriptions were copied from comments in scterm-sc.c, but some
of these are bad.  The border [color] was inconsistently described as
a property of the "display", but I had changed this to "adapter" to
match the descriptions for other color settings.  All colors supported
by the cons25 sequences are actually properties of the current vty and
that should not be described.  But the other colors are defaults.
Change "adapter" to "default" for them and remove "adapter" for the
border.  Reduce the verbosity of the abbreviation from AD to D.
This commit is contained in:
bde 2017-08-18 14:04:14 +00:00
parent 05782903dc
commit 6525f532f9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/teken/sequences
View File

@ -101,11 +101,11 @@ TBC Tab Clear ^[ [ g r
VPA Vertical Position Absolute ^[ [ d n
# Cons25 compatibility sequences
C25ADX Cons25 set adapter border ^[ [ = A r
C25ADBG Cons25 set adapter background ^[ [ = G r
C25ADFG Cons25 set adapter foreground ^[ [ = F r
C25BLPD Cons25 set bell pitch duration ^[ [ = B r r
C25BORD Cons25 set border ^[ [ = A r
C25CURS Cons25 set cursor type ^[ [ = S r
C25DBG Cons25 set default background ^[ [ = G r
C25DFG Cons25 set default foreground ^[ [ = F r
C25MODE Cons25 set terminal mode ^[ [ = T r
C25SGR Cons25 set graphic rendition ^[ [ x r r
C25VTSW Cons25 switch virtual terminal ^[ [ z r

6
sys/teken/teken_subr_compat.h
View File

@ -27,7 +27,7 @@
*/
static void
teken_subr_cons25_set_adapter_border(teken_t *t, unsigned int c)
teken_subr_cons25_set_border(teken_t *t, unsigned int c)
{
teken_funcs_param(t, TP_SETBORDER, c);
@ -44,7 +44,7 @@ static const teken_color_t cons25_colors[8] = { TC_BLACK, TC_BLUE,
TC_GREEN, TC_CYAN, TC_RED, TC_MAGENTA, TC_BROWN, TC_WHITE };
static void
teken_subr_cons25_set_adapter_background(teken_t *t, unsigned int c)
teken_subr_cons25_set_default_background(teken_t *t, unsigned int c)
{
t->t_defattr.ta_bgcolor = cons25_colors[c % 8] | (c & 8);
@ -52,7 +52,7 @@ teken_subr_cons25_set_adapter_background(teken_t *t, unsigned int c)
}
static void
teken_subr_cons25_set_adapter_foreground(teken_t *t, unsigned int c)
teken_subr_cons25_set_default_foreground(teken_t *t, unsigned int c)
{
t->t_defattr.ta_fgcolor = cons25_colors[c % 8] | (c & 8);