From a7f1ee6fbe1aa46f7bcc0d40740e0b6c98a12692 Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Sun, 1 Sep 2019 20:03:41 -0600 Subject: * Improvements to the pico manual as well as on the code that displays the table of color codes. --- doc/man1/pico.1 | 91 +++++++++++++++++++++++++++++---------------------------- pico/main.c | 19 ++++++------ pith/pine.hlp | 2 +- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/doc/man1/pico.1 b/doc/man1/pico.1 index 6d33ef4..e87a68e 100644 --- a/doc/man1/pico.1 +++ b/doc/man1/pico.1 @@ -172,61 +172,62 @@ type of text that is being configured, for example "nt" stands for \fInormal text\fR, so that -ntfc represents the color of the normal text, while -ntbc represents the color of the background of normal text. Here is a complete list of the color options supported by Pico. -.IP -color_codes +.IP \fB-color_code\fR displays the number of colors supported by the terminal, and a table showing the association of colors and numerical codes -.IP -ncolors \fInumber\fR +.IP \fB-ncolors\fB\ \fInumber\fR activates color support in Pico, and tells Pico how many colors to use. Depending on your terminal \fInumber\fR could be 8, 16, or 256. -.IP -ntfc \fInumber\fR +.IP \fB-ntfc\fB\ \fInum\fR specifies the number \fInum\fR of the color to be used to color normal text. -.IP -ntbc \fInumber\fR +.IP \fB-ntbc\fB\ \fInum\fR specifies the number \fInum\fR of the color of the background for normal text. -.IP -rtfc \fInumber\fR -number of the color of reverse text. Default: same as background color -of normal text (if specified.) -.IP -rtbc \fInumber\fR -number of the color of the background of reverse text. Default: same as -color of normal text (if specified.) -.IP -tbfc \fInumber\fR -number of color of text of the title bar. Default: same as -foreground color of reverse text. -.IP -tbbc \fInumber\fR -number of the color of background of the title bar. -.IP -klfc \fInumber\fR -number of the color of the text of the key label. -.IP -klbc \fInumber\fR -number of color of background of the key label. -.IP -knfc \fInumber\fR -number of color of text of the key name. -.IP -knbc \fInumber\fR -number of color of background of the key name. -.IP -stfc \fInumber\fR -number of color of text of the status line. -.IP -stbc \fInumber\fR -number of color of background of the status line. -.IP -prfc \fInumber\fR -number of color of text of a prompt. -.IP -prbc \fInumber\fR -number of color of background of a prompt. -.IP -q1fc \fInumber\fR -number of color of text of level one of quoted text. -.IP -q1bc \fnumber\fR -number of color of background of level one of quoted text. If the option +.IP \fB-rtfc\fB\ \fInum\fR +specifies the number \fInum\fR of the color of reverse text. Default: same +as background color of normal text (if specified.) +.IP \fB-rtbc\fB\ \fInum\fR +specifies the number \fInum\fR of the color of the background of +reverse text. Default: same as color of normal text (if specified.) +.IP \fB-tbfc\fB\ \fInum\fR +specifies the number \fInum\fR of then color of text of the title bar. +Default: same as foreground color of reverse text. +.IP \fB-tbbc\fB\ \fInum\fR +specifies the number \fInum\fR of the color in the background of the title bar. +.IP \fB-klfc\fB\ \fInum\fR +specifies the number \fInum\fR of the color of the text of the key label. +.IP \fB-klbc\fB\ \fInum\fR +specifies the number \fInum\fR of the color in the background of the key label. +.IP \fB-knfc\fB\ \fInum\fR +specifies the number \fInum\fR of the color of the text of the key name. +.IP \fB-knbc\fB\ \fInum\fR +specifies the number \fInum\fR of the color of the background of the key name. +.IP \fB-stfc\fB\ \fInum\fR +specifies the number \fInum\fR of the color of the text of the status line. +.IP \fB-stbc\fB\ \fInum\fR +specifies the number \fInum\fR of the color of the background of the status line. +.IP \fB-prfc\fB\ \fInum\fR +specifies the number \fInum\fR of the color of the text of a prompt. +.IP \fB-prbc\fB\ \fInum\fR +specifies the number \fInum\fR of the color of the background of a prompt. +.IP \fB-q1fc\fB\ \fInum\fR +specifies the number \fInum\fR of the color of the text of level one of quoted text. +.IP \fB-q1bc\fB\ \fInum\fR +specifies the number \fInum\fR of the color of the background of level one of quoted text. If the option -q1bc is used, the default value of this option is the background color or normal text. -.IP -q2fc \fInumber\fR -number of color of text of level two of quoted text. -.IP -q2bc \fInumber\fR -number of color of background of level two of quoted text. If the option +.IP \fB-q2fc\fB\ \fInum\fR +specifies the number \fInum\fR of the color of text of level two of quoted text. +.IP \fB-q2bc\fB\ \fInum\fR +specifies the number \fInum\fR of the color of the background of level two of quoted text. If the option -q1bc is used, the default value of this option is the background color or normal text. -.IP -q3fc \fInumber\fR -number of color of text of level three of quoted text. -.IP -sbfc \fInumber\fR -number of color of text of signature block text. -.IP -sbbc n\fIumber\fR -number of color of background of signature block text. +.IP \fB-q3fc\fB\ \fInum\fR +specifies the number \fInum\fR of the color of text of level three of quoted text. +.IP \fB-sbfc\fB\ \fInum\fR +specifies the number \fInum\fR of the color of text of signature block text. +.IP \fB-sbbc\fB\ \fInum\fR +specifies the number \fInum\fR of the color of the background of signature +block text. .PP .SH Bugs The manner in which lines longer than the display width are dealt diff --git a/pico/main.c b/pico/main.c index 68d5acf..29f5592 100644 --- a/pico/main.c +++ b/pico/main.c @@ -516,6 +516,8 @@ display_color_codes(void) exit(1); } + if(ncolors & 1) ncolors--; /* eliminate transparent colors at this time */ + fprintf(stdout, "%s", "The code of a color is the number in the same row plus\r\n"); fprintf(stdout, "%s", "the number in the same column as that color.\r\n\r\n"); @@ -530,16 +532,14 @@ display_color_codes(void) } pico_toggle_color(1); - if(ncolors != 256){ + if(ncolors < 256){ for(k = -1; 16*k < ncolors; k++){ for(l = -1; l < ncolors; l++){ if(k == -1){ - if(ncolors == 8){ - if(l == -1) - fprintf(stdout, "%s", " "); - else - fprintf(stdout, "%3d", l); - } + if(l == -1) + fprintf(stdout, "%s", " "); + else + fprintf(stdout, "%3d", l); } else{ if(l == -1){ @@ -558,10 +558,9 @@ display_color_codes(void) } } pico_toggle_color(0); - if(k == 0) + if(k == -1) fprintf(stdout, " (%d colors)", ncolors); - if(k != -1 || ncolors == 8) - fprintf(stdout, "%s", "\r\n"); + fprintf(stdout, "%s", "\r\n"); } } else { fprintf(stdout, "%s", "Codes for terminal with 256 colors:\r\n"); diff --git a/pith/pine.hlp b/pith/pine.hlp index 41d7521..5230d3e 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 366 2019-09-01 12:23:55 +Alpine Commit 367 2019-09-01 20:03:34 ============= h_news ================= -- cgit v1.2.3-54-g00ecf