mirror of
https://salsa.debian.org/dskoll/remind.git
synced 2026-04-17 06:48:47 +02:00
Finalize support for SPECIAL SHADE in "remind -c"
This commit is contained in:
Dianne Skoll
@@ -114,7 +114,11 @@ default) and \fIb=1\fR tells \fBRemind\fR to respect SPECIAL SHADE
|
||||
reminders by emitting VT100 escape codes to color the background of the
|
||||
calendar cell. Note that SHADE does not work well unless you are
|
||||
using the extended 256-color palette (\fIn\fR=1) or the true
|
||||
24-bit colors (\fIn\fR=2).
|
||||
24-bit colors (\fIn\fR=2). Note that for calendar cells that are
|
||||
shaded, the clamping mechanism described earlier for \fIm=0\fR or
|
||||
\fIm=1\fR is skipped; it is assumed that if you set \fIboth\fR the
|
||||
foreground color of a reminder and the background color of a cell,
|
||||
then you know what you are doing.
|
||||
.RE
|
||||
.TP
|
||||
.B \-w\fR\fIcol\fR[,\fIpad\fR[,\fIspc\fR]]]
|
||||
|
||||
@@ -664,11 +664,11 @@ Colorize(int r, int g, int b, int bg, int clamp)
|
||||
if (b > 64) b = 1;
|
||||
else b = 0;
|
||||
|
||||
if (TerminalBackground == TERMINAL_BACKGROUND_DARK && !bg) {
|
||||
if (clamp && TerminalBackground == TERMINAL_BACKGROUND_DARK && !bg) {
|
||||
/* Convert black-on-black to grey */
|
||||
if (!r && !g && !b) return VT100Colors[1][0][0][0];
|
||||
}
|
||||
if (TerminalBackground == TERMINAL_BACKGROUND_LIGHT && !bg) {
|
||||
if (clamp && TerminalBackground == TERMINAL_BACKGROUND_LIGHT && !bg) {
|
||||
/* Convert white-on-white to grey */
|
||||
if (r && g && b) return VT100Colors[1][0][0][0];
|
||||
}
|
||||
|
||||
@@ -140,6 +140,9 @@ rem 2 SPECIAL COLOR 0 0 65 BLUE
|
||||
rem 3 SPECIAL COLOR 0 65 0 GREEN
|
||||
rem 4 SPECIAL COLOR 0 65 65 CYAN
|
||||
rem 5 msg -@0
|
||||
rem 6 SPECIAL SHADE 255 255 0
|
||||
rem 7 SPECIAL SHADE 255 0 255
|
||||
rem 8 SPECIAL SHADE 0 255 255
|
||||
rem 15 SPECIAL COLOR 65 0 0 RED
|
||||
rem 16 SPECIAL COLOR 65 0 65 MAGENTA
|
||||
rem 17 SPECIAL COLOR 65 65 0 YELLOW
|
||||
@@ -159,6 +162,9 @@ rem 2 SPECIAL COLOR 0 0 65 BLUE
|
||||
rem 3 SPECIAL COLOR 0 65 0 GREEN
|
||||
rem 4 SPECIAL COLOR 0 65 65 CYAN
|
||||
rem 5 msg -@0,0
|
||||
rem 6 SPECIAL SHADE 255 255 0
|
||||
rem 7 SPECIAL SHADE 255 0 255
|
||||
rem 8 SPECIAL SHADE 0 255 255
|
||||
rem 15 SPECIAL COLOR 65 0 0 RED
|
||||
rem 16 SPECIAL COLOR 65 0 65 MAGENTA
|
||||
rem 17 SPECIAL COLOR 65 65 0 YELLOW
|
||||
@@ -178,6 +184,9 @@ rem 2 SPECIAL COLOR 0 0 65 BLUE
|
||||
rem 3 SPECIAL COLOR 0 65 0 GREEN
|
||||
rem 4 SPECIAL COLOR 0 65 65 CYAN
|
||||
rem 5 msg -@0,1
|
||||
rem 6 SPECIAL SHADE 255 255 0
|
||||
rem 7 SPECIAL SHADE 255 0 255
|
||||
rem 8 SPECIAL SHADE 0 255 255
|
||||
rem 15 SPECIAL COLOR 65 0 0 RED
|
||||
rem 16 SPECIAL COLOR 65 0 65 MAGENTA
|
||||
rem 17 SPECIAL COLOR 65 65 0 YELLOW
|
||||
@@ -197,6 +206,9 @@ rem 2 SPECIAL COLOR 0 0 65 BLUE
|
||||
rem 3 SPECIAL COLOR 0 65 0 GREEN
|
||||
rem 4 SPECIAL COLOR 0 65 65 CYAN
|
||||
rem 5 msg -@1
|
||||
rem 6 SPECIAL SHADE 255 255 0
|
||||
rem 7 SPECIAL SHADE 255 0 255
|
||||
rem 8 SPECIAL SHADE 0 255 255
|
||||
rem 15 SPECIAL COLOR 65 0 0 RED
|
||||
rem 16 SPECIAL COLOR 65 0 65 MAGENTA
|
||||
rem 17 SPECIAL COLOR 65 65 0 YELLOW
|
||||
@@ -216,6 +228,9 @@ rem 2 SPECIAL COLOR 0 0 65 BLUE
|
||||
rem 3 SPECIAL COLOR 0 65 0 GREEN
|
||||
rem 4 SPECIAL COLOR 0 65 65 CYAN
|
||||
rem 5 msg -@1,0
|
||||
rem 6 SPECIAL SHADE 255 255 0
|
||||
rem 7 SPECIAL SHADE 255 0 255
|
||||
rem 8 SPECIAL SHADE 0 255 255
|
||||
rem 15 SPECIAL COLOR 65 0 0 RED
|
||||
rem 16 SPECIAL COLOR 65 0 65 MAGENTA
|
||||
rem 17 SPECIAL COLOR 65 65 0 YELLOW
|
||||
@@ -235,6 +250,9 @@ rem 2 SPECIAL COLOR 0 0 65 BLUE
|
||||
rem 3 SPECIAL COLOR 0 65 0 GREEN
|
||||
rem 4 SPECIAL COLOR 0 65 65 CYAN
|
||||
rem 5 msg -@1,1
|
||||
rem 6 SPECIAL SHADE 255 255 0
|
||||
rem 7 SPECIAL SHADE 255 0 255
|
||||
rem 8 SPECIAL SHADE 0 255 255
|
||||
rem 15 SPECIAL COLOR 65 0 0 RED
|
||||
rem 16 SPECIAL COLOR 65 0 65 MAGENTA
|
||||
rem 17 SPECIAL COLOR 65 65 0 YELLOW
|
||||
@@ -254,6 +272,9 @@ rem 2 SPECIAL COLOR 0 0 65 BLUE
|
||||
rem 3 SPECIAL COLOR 0 65 0 GREEN
|
||||
rem 4 SPECIAL COLOR 0 65 65 CYAN
|
||||
rem 5 msg -@2
|
||||
rem 6 SPECIAL SHADE 255 255 0
|
||||
rem 7 SPECIAL SHADE 255 0 255
|
||||
rem 8 SPECIAL SHADE 0 255 255
|
||||
rem 15 SPECIAL COLOR 65 0 0 RED
|
||||
rem 16 SPECIAL COLOR 65 0 65 MAGENTA
|
||||
rem 17 SPECIAL COLOR 65 65 0 YELLOW
|
||||
@@ -273,6 +294,9 @@ rem 2 SPECIAL COLOR 0 0 65 BLUE
|
||||
rem 3 SPECIAL COLOR 0 65 0 GREEN
|
||||
rem 4 SPECIAL COLOR 0 65 65 CYAN
|
||||
rem 5 msg -@2,0
|
||||
rem 6 SPECIAL SHADE 255 255 0
|
||||
rem 7 SPECIAL SHADE 255 0 255
|
||||
rem 8 SPECIAL SHADE 0 255 255
|
||||
rem 15 SPECIAL COLOR 65 0 0 RED
|
||||
rem 16 SPECIAL COLOR 65 0 65 MAGENTA
|
||||
rem 17 SPECIAL COLOR 65 65 0 YELLOW
|
||||
@@ -292,6 +316,9 @@ rem 2 SPECIAL COLOR 0 0 65 BLUE
|
||||
rem 3 SPECIAL COLOR 0 65 0 GREEN
|
||||
rem 4 SPECIAL COLOR 0 65 65 CYAN
|
||||
rem 5 msg -@2,1
|
||||
rem 6 SPECIAL SHADE 255 255 0
|
||||
rem 7 SPECIAL SHADE 255 0 255
|
||||
rem 8 SPECIAL SHADE 0 255 255
|
||||
rem 15 SPECIAL COLOR 65 0 0 RED
|
||||
rem 16 SPECIAL COLOR 65 0 65 MAGENTA
|
||||
rem 17 SPECIAL COLOR 65 65 0 YELLOW
|
||||
|
||||
@@ -7823,9 +7823,9 @@ February 29
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[0;30mBLACK[0m |[0;34mBLUE[0m |[0;32mGREEN[0m |[0;36mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|-@0 | | |[0;30mBLACK[0m |[34;1mBRIGHT[0m |[32;1mBRIGHT[0m |[36;1mBRIGHT[0m |
|
||||
| | | | |[34;1mBLUE[0m |[32;1mGREEN[0m |[36;1mCYAN[0m |
|
||||
|5 |[0;43m6 [0m|[0;45m7 [0m|[0;46m8 [0m|9 |10 |11 |
|
||||
|-@0 |[0;43m [0m|[0;45m [0m|[0;46m[0;30mBLACK[0m[0;46m [0m|[34;1mBRIGHT[0m |[32;1mBRIGHT[0m |[36;1mBRIGHT[0m |
|
||||
| |[0;43m [0m|[0;45m [0m|[0;46m [0m|[34;1mBLUE[0m |[32;1mGREEN[0m |[36;1mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|12 |13 |14 |15 |16 |17 |18 |
|
||||
| | | |[0;31mRED[0m |[0;35mMAGENTA[0m |[0;33mYELLOW[0m |[0;37mWHITE[0m |
|
||||
@@ -7845,9 +7845,9 @@ February 29
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[30;1mBLACK[0m |[0;34mBLUE[0m |[0;32mGREEN[0m |[0;36mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|-@0,0 | | |[30;1mBLACK[0m |[34;1mBRIGHT[0m |[32;1mBRIGHT[0m |[36;1mBRIGHT[0m |
|
||||
| | | | |[34;1mBLUE[0m |[32;1mGREEN[0m |[36;1mCYAN[0m |
|
||||
|5 |[0;43m6 [0m|[0;45m7 [0m|[0;46m8 [0m|9 |10 |11 |
|
||||
|-@0,0 |[0;43m [0m|[0;45m [0m|[0;46m[0;30mBLACK[0m[0;46m [0m|[34;1mBRIGHT[0m |[32;1mBRIGHT[0m |[36;1mBRIGHT[0m |
|
||||
| |[0;43m [0m|[0;45m [0m|[0;46m [0m|[34;1mBLUE[0m |[32;1mGREEN[0m |[36;1mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|12 |13 |14 |15 |16 |17 |18 |
|
||||
| | | |[0;31mRED[0m |[0;35mMAGENTA[0m |[0;33mYELLOW[0m |[0;37mWHITE[0m |
|
||||
@@ -7867,9 +7867,9 @@ February 29
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[0;30mBLACK[0m |[0;34mBLUE[0m |[0;32mGREEN[0m |[0;36mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|-@0,1 | | |[0;30mBLACK[0m |[34;1mBRIGHT[0m |[32;1mBRIGHT[0m |[36;1mBRIGHT[0m |
|
||||
| | | | |[34;1mBLUE[0m |[32;1mGREEN[0m |[36;1mCYAN[0m |
|
||||
|5 |[0;43m6 [0m|[0;45m7 [0m|[0;46m8 [0m|9 |10 |11 |
|
||||
|-@0,1 |[0;43m [0m|[0;45m [0m|[0;46m[0;30mBLACK[0m[0;46m [0m|[34;1mBRIGHT[0m |[32;1mBRIGHT[0m |[36;1mBRIGHT[0m |
|
||||
| |[0;43m [0m|[0;45m [0m|[0;46m [0m|[34;1mBLUE[0m |[32;1mGREEN[0m |[36;1mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|12 |13 |14 |15 |16 |17 |18 |
|
||||
| | | |[0;31mRED[0m |[0;35mMAGENTA[0m |[0;33mYELLOW[0m |[30;1mWHITE[0m |
|
||||
@@ -7889,9 +7889,9 @@ February 29
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[38;5;0mBLACK[0m |[38;5;17mBLUE[0m |[38;5;22mGREEN[0m |[38;5;23mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|-@1 | | |[38;5;0mBLACK[0m |[38;5;20mBRIGHT[0m |[38;5;40mBRIGHT[0m |[38;5;44mBRIGHT[0m |
|
||||
| | | | |[38;5;20mBLUE[0m |[38;5;40mGREEN[0m |[38;5;44mCYAN[0m |
|
||||
|5 |[48;5;11m6 [0m|[48;5;13m7 [0m|[48;5;14m8 [0m|9 |10 |11 |
|
||||
|-@1 |[48;5;11m [0m|[48;5;13m [0m|[48;5;14m[38;5;0mBLACK[0m[48;5;14m [0m|[38;5;20mBRIGHT[0m |[38;5;40mBRIGHT[0m |[38;5;44mBRIGHT[0m |
|
||||
| |[48;5;11m [0m|[48;5;13m [0m|[48;5;14m [0m|[38;5;20mBLUE[0m |[38;5;40mGREEN[0m |[38;5;44mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|12 |13 |14 |15 |16 |17 |18 |
|
||||
| | | |[38;5;52mRED[0m |[38;5;53mMAGENTA[0m |[38;5;58mYELLOW[0m |[38;5;238mWHITE[0m |
|
||||
@@ -7911,9 +7911,9 @@ February 29
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[38;5;238mBLACK[0m |[38;5;17mBLUE[0m |[38;5;22mGREEN[0m |[38;5;23mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|-@1,0 | | |[38;5;238mBLACK[0m |[38;5;20mBRIGHT[0m |[38;5;40mBRIGHT[0m |[38;5;44mBRIGHT[0m |
|
||||
| | | | |[38;5;20mBLUE[0m |[38;5;40mGREEN[0m |[38;5;44mCYAN[0m |
|
||||
|5 |[48;5;11m6 [0m|[48;5;13m7 [0m|[48;5;14m8 [0m|9 |10 |11 |
|
||||
|-@1,0 |[48;5;11m [0m|[48;5;13m [0m|[48;5;14m[38;5;0mBLACK[0m[48;5;14m [0m|[38;5;20mBRIGHT[0m |[38;5;40mBRIGHT[0m |[38;5;44mBRIGHT[0m |
|
||||
| |[48;5;11m [0m|[48;5;13m [0m|[48;5;14m [0m|[38;5;20mBLUE[0m |[38;5;40mGREEN[0m |[38;5;44mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|12 |13 |14 |15 |16 |17 |18 |
|
||||
| | | |[38;5;52mRED[0m |[38;5;53mMAGENTA[0m |[38;5;58mYELLOW[0m |[38;5;238mWHITE[0m |
|
||||
@@ -7933,9 +7933,9 @@ February 29
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[38;5;0mBLACK[0m |[38;5;17mBLUE[0m |[38;5;22mGREEN[0m |[38;5;23mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|-@1,1 | | |[38;5;0mBLACK[0m |[38;5;20mBRIGHT[0m |[38;5;40mBRIGHT[0m |[38;5;44mBRIGHT[0m |
|
||||
| | | | |[38;5;20mBLUE[0m |[38;5;40mGREEN[0m |[38;5;44mCYAN[0m |
|
||||
|5 |[48;5;11m6 [0m|[48;5;13m7 [0m|[48;5;14m8 [0m|9 |10 |11 |
|
||||
|-@1,1 |[48;5;11m [0m|[48;5;13m [0m|[48;5;14m[38;5;0mBLACK[0m[48;5;14m [0m|[38;5;20mBRIGHT[0m |[38;5;40mBRIGHT[0m |[38;5;44mBRIGHT[0m |
|
||||
| |[48;5;11m [0m|[48;5;13m [0m|[48;5;14m [0m|[38;5;20mBLUE[0m |[38;5;40mGREEN[0m |[38;5;44mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|12 |13 |14 |15 |16 |17 |18 |
|
||||
| | | |[38;5;52mRED[0m |[38;5;53mMAGENTA[0m |[38;5;58mYELLOW[0m |[38;5;238mWHITE[0m |
|
||||
@@ -7955,9 +7955,9 @@ February 29
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[38;2;0;0;0mBLACK[0m |[38;2;0;0;65mBLUE[0m |[38;2;0;65;0mGREEN[0m |[38;2;0;65;65mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|-@2 | | |[38;2;0;0;0mBLACK[0m |[38;2;0;0;200mBRIGHT[0m |[38;2;0;200;0mBRIGHT[0m |[38;2;0;200;200mBRIGHT[0m |
|
||||
| | | | |[38;2;0;0;200mBLUE[0m |[38;2;0;200;0mGREEN[0m |[38;2;0;200;200mCYAN[0m |
|
||||
|5 |[48;2;255;255;0m6 [0m|[48;2;255;0;255m7 [0m|[48;2;0;255;255m8 [0m|9 |10 |11 |
|
||||
|-@2 |[48;2;255;255;0m [0m|[48;2;255;0;255m [0m|[48;2;0;255;255m[38;2;0;0;0mBLACK[0m[48;2;0;255;255m [0m|[38;2;0;0;200mBRIGHT[0m |[38;2;0;200;0mBRIGHT[0m |[38;2;0;200;200mBRIGHT[0m |
|
||||
| |[48;2;255;255;0m [0m|[48;2;255;0;255m [0m|[48;2;0;255;255m [0m|[38;2;0;0;200mBLUE[0m |[38;2;0;200;0mGREEN[0m |[38;2;0;200;200mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|12 |13 |14 |15 |16 |17 |18 |
|
||||
| | | |[38;2;65;0;0mRED[0m |[38;2;65;0;65mMAGENTA[0m |[38;2;65;65;0mYELLOW[0m |[38;2;65;65;65mWHITE[0m |
|
||||
@@ -7977,9 +7977,9 @@ February 29
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[38;2;65;65;65mBLACK[0m |[38;2;0;0;65mBLUE[0m |[38;2;0;65;0mGREEN[0m |[38;2;0;65;65mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|-@2,0 | | |[38;2;65;65;65mBLACK[0m |[38;2;0;0;200mBRIGHT[0m |[38;2;0;200;0mBRIGHT[0m |[38;2;0;200;200mBRIGHT[0m |
|
||||
| | | | |[38;2;0;0;200mBLUE[0m |[38;2;0;200;0mGREEN[0m |[38;2;0;200;200mCYAN[0m |
|
||||
|5 |[48;2;255;255;0m6 [0m|[48;2;255;0;255m7 [0m|[48;2;0;255;255m8 [0m|9 |10 |11 |
|
||||
|-@2,0 |[48;2;255;255;0m [0m|[48;2;255;0;255m [0m|[48;2;0;255;255m[38;2;0;0;0mBLACK[0m[48;2;0;255;255m [0m|[38;2;0;0;200mBRIGHT[0m |[38;2;0;200;0mBRIGHT[0m |[38;2;0;200;200mBRIGHT[0m |
|
||||
| |[48;2;255;255;0m [0m|[48;2;255;0;255m [0m|[48;2;0;255;255m [0m|[38;2;0;0;200mBLUE[0m |[38;2;0;200;0mGREEN[0m |[38;2;0;200;200mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|12 |13 |14 |15 |16 |17 |18 |
|
||||
| | | |[38;2;65;0;0mRED[0m |[38;2;65;0;65mMAGENTA[0m |[38;2;65;65;0mYELLOW[0m |[38;2;65;65;65mWHITE[0m |
|
||||
@@ -7999,9 +7999,9 @@ February 29
|
||||
| | | |1 |2 |3 |4 |
|
||||
| | | |[38;2;0;0;0mBLACK[0m |[38;2;0;0;65mBLUE[0m |[38;2;0;65;0mGREEN[0m |[38;2;0;65;65mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|5 |6 |7 |8 |9 |10 |11 |
|
||||
|-@2,1 | | |[38;2;0;0;0mBLACK[0m |[38;2;0;0;200mBRIGHT[0m |[38;2;0;200;0mBRIGHT[0m |[38;2;0;200;200mBRIGHT[0m |
|
||||
| | | | |[38;2;0;0;200mBLUE[0m |[38;2;0;200;0mGREEN[0m |[38;2;0;200;200mCYAN[0m |
|
||||
|5 |[48;2;255;255;0m6 [0m|[48;2;255;0;255m7 [0m|[48;2;0;255;255m8 [0m|9 |10 |11 |
|
||||
|-@2,1 |[48;2;255;255;0m [0m|[48;2;255;0;255m [0m|[48;2;0;255;255m[38;2;0;0;0mBLACK[0m[48;2;0;255;255m [0m|[38;2;0;0;200mBRIGHT[0m |[38;2;0;200;0mBRIGHT[0m |[38;2;0;200;200mBRIGHT[0m |
|
||||
| |[48;2;255;255;0m [0m|[48;2;255;0;255m [0m|[48;2;0;255;255m [0m|[38;2;0;0;200mBLUE[0m |[38;2;0;200;0mGREEN[0m |[38;2;0;200;200mCYAN[0m |
|
||||
+----------+----------+----------+----------+----------+----------+----------+
|
||||
|12 |13 |14 |15 |16 |17 |18 |
|
||||
| | | |[38;2;65;0;0mRED[0m |[38;2;65;0;65mMAGENTA[0m |[38;2;65;65;0mYELLOW[0m |[38;2;65;65;65mWHITE[0m |
|
||||
|
||||
Reference in New Issue
Block a user