svn commit: r322656 - head/sys/teken

[Bruce Evans]

Author: bde
Date: Fri Aug 18 14:04:14 2017
New Revision: 322656
URL: https://svnweb.freebsd.org/changeset/base/322656

Log:
  Improve names for cons25 sequences.
  
  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.

Modified:
  head/sys/teken/sequences
  head/sys/teken/teken_subr_compat.h

Modified: head/sys/teken/sequences
==============================================================================
--- head/sys/teken/sequences	Fri Aug 18 12:45:00 2017	(r322655)
+++ head/sys/teken/sequences	Fri Aug 18 14:04:14 2017	(r322656)
@@ -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

Modified: head/sys/teken/teken_subr_compat.h
==============================================================================
--- head/sys/teken/teken_subr_compat.h	Fri Aug 18 12:45:00 2017	(r322655)
+++ head/sys/teken/teken_subr_compat.h	Fri Aug 18 14:04:14 2017	(r322656)
@@ -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_BLA
     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, u
 }
 
 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);