From a5ec528fba8223a6d48bc0198e70f4398d4d36ec Mon Sep 17 00:00:00 2001 From: TomAwezome Date: Sat, 16 Apr 2022 20:43:02 -0400 Subject: [PATCH] Invert bottom-right window border text. --- src/Doc/ChangeLog.DD | 3 +++ src/System/DolDoc/DocEd.ZC | 32 ++++++++++++++++---------------- src/System/DolDoc/DocTerm.ZC | 14 +++++++------- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/src/Doc/ChangeLog.DD b/src/Doc/ChangeLog.DD index dc531326..26091eb9 100755 --- a/src/Doc/ChangeLog.DD +++ b/src/Doc/ChangeLog.DD @@ -1,4 +1,7 @@ $WW,1$$FG,5$$TX+CX,"ChangeLog"$$FG$ +$IV,1$----04/16/22 20:24:18----$IV,0$ +* Inverted $LK+PU,"DocBorderNew",A="MN:DocBorderNew"$ and $LK+PU,"DocEd",A="MN:DocEd"$ bottom-right window text, adjusted DolDoc tag placement to make solid, changed Ed callbacks ($LK+PU,"EdOverStrikeCB",A="MN:EdOverStrikeCB"$, $LK+PU,"EdAutoSaveCB",A="MN:EdAutoSaveCB"$, $LK+PU,"EdFilterCB",A="MN:EdFilterCB"$, $LK+PU,"EdDollarCB",A="MN:EdDollarCB"$, $LK+PU,"EdMoreCB",A="MN:EdMoreCB"$) to return ' ' SPACE character(s) for disabled flags now since invert renders it solid foreground color, appended ' ' SPACE character at $LK+PU,"EdDollarTypeCB",A="FF:::/System/DolDoc/DocEd.ZC,\"%-3ts \""$ to pad. + $IV,1$----04/16/22 18:47:11----$IV,0$ * Raised version number to 1.13. * Added ISO9660 support from "TempleOSCD_2017-05-21T03 56 09.ISO". diff --git a/src/System/DolDoc/DocEd.ZC b/src/System/DolDoc/DocEd.ZC index ff447df3..aa278581 100755 --- a/src/System/DolDoc/DocEd.ZC +++ b/src/System/DolDoc/DocEd.ZC @@ -19,7 +19,7 @@ U8 *EdOverStrikeCB(CDoc *, CDocEntry *doc_e, CTask *mem_task) if (doc->flags & DOCF_OVERSTRIKE) *st = 'O'; else - *st = 'Ä'; + *st = ' '; st[1] = 0; return st; @@ -33,7 +33,7 @@ U8 *EdAutoSaveCB(CDoc *, CDocEntry *doc_e, CTask *mem_task) if (doc->flags & DOCF_AUTO_SAVE) *st = 'S'; else - *st = 'Ä'; + *st = ' '; st[1] = 0; return st; @@ -47,7 +47,7 @@ U8 *EdFilterCB(CDoc *, CDocEntry *doc_e, CTask *mem_task) if (doc->find_replace->filter_lines) *st = 'F'; else - *st = 'Ä'; + *st = ' '; st[1] = 0; return st; @@ -61,7 +61,7 @@ U8 *EdDollarCB(CDoc *, CDocEntry *doc_e, CTask *mem_task) if (doc->flags & DOCF_IN_DOLLAR) *st = '$$'; else - *st = 'Ä'; + *st = ' '; st[1] = 0; return st; @@ -73,9 +73,9 @@ U8 *EdMoreCB(CDoc *, CDocEntry *doc_e, CTask *mem_task) U8 *st = MAlloc(8, mem_task); if (doc->flags & DOCF_MORE) - StrCopy(st, "MoreÄ"); + StrCopy(st, "More "); else - StrCopy(st, "ÄÄÄÄÄ"); + StrCopy(st, " "); return st; } @@ -89,7 +89,7 @@ U8 *EdDollarTypeCB(CDoc *, CDocEntry *doc_e, CTask *mem_task) src = "EOF"; else if (!src) src = "ERR"; - StrPrint(st, "%-3ts", src); + StrPrint(st, "%-3ts ", src); return st; } @@ -134,34 +134,34 @@ public Bool DocEd(CDoc *doc, I64 dof_flags=0) if (doc->flags & DOCF_ALLOW_UNDO) { DocPrint(bdoc, "$$CM+BY+LX+NC,1,1$$"); - doc_e = DocPrint(bdoc, "$$DA+BD+RD-TRM,RT=U32,A=\"Undo:%%03d\"$$\n"); + doc_e = DocPrint(bdoc, "$$DA+BD+RD+IV-TRM,RT=U32,A=\"Undo:%%03d\"$$\n"); doc_e->data = &doc->undo_count; DocDataFormat(bdoc, doc_e); } DocPrint(bdoc, "$$CM+BY+RX+NC,-31,1$$"); - doc_e = DocPrint(bdoc, "$$TX+BD+TC,\" \"$$"); + doc_e = DocPrint(bdoc, "$$TX+BD+TC+IV,\" \"$$"); doc_e->user_data = doc; doc_e->tag_cb = &EdMoreCB; - doc_e = DocPrint(bdoc, "$$TX+BD+TC,\" \"$$"); + doc_e = DocPrint(bdoc, "$$TX+BD+TC+IV,\" \"$$"); doc_e->user_data = doc; doc_e->tag_cb = &EdDollarTypeCB; - doc_e = DocPrint(bdoc, "$$TX+BD+TC,\" \"$$"); + doc_e = DocPrint(bdoc, "$$TX+BD+TC+IV,\" \"$$"); doc_e->user_data = doc; doc_e->tag_cb = &EdFilterCB; - doc_e = DocPrint(bdoc, "$$TX+BD+TC,\" \"$$"); + doc_e = DocPrint(bdoc, "$$TX+BD+TC+IV,\" \"$$"); doc_e->user_data = doc; doc_e->tag_cb = &EdOverStrikeCB; - doc_e = DocPrint(bdoc, "$$TX+BD+TC,\" \"$$"); + doc_e = DocPrint(bdoc, "$$TX+BD+TC+IV,\" \"$$"); doc_e->user_data = doc; doc_e->tag_cb = &EdAutoSaveCB; - doc_e = DocPrint(bdoc, "$$TX+BD+TC,\" \"$$"); + doc_e = DocPrint(bdoc, "$$TX+BD+TC+IV,\" \"$$"); doc_e->user_data = doc; doc_e->tag_cb = &EdDollarCB; - doc_e = DocPrint(bdoc, "$$DA+BD+RD-TRM,A=\"Line:%%04d \"$$"); + doc_e = DocPrint(bdoc, "$$DA+BD+RD+IV-TRM,A=\"Line:%%04d \"$$"); doc_e->data = &doc->line; DocDataFormat(bdoc,doc_e); - doc_e = DocPrint(bdoc, "$$DA+BD+RD-TRM,A=\"Col:%%04d\"$$\n"); + doc_e = DocPrint(bdoc, "$$DA+BD+RD+IV-TRM,A=\"Col:%%04d\"$$\n"); doc_e->data = &doc->col; DocDataFormat(bdoc, doc_e); diff --git a/src/System/DolDoc/DocTerm.ZC b/src/System/DolDoc/DocTerm.ZC index 0021095a..2e387227 100755 --- a/src/System/DolDoc/DocTerm.ZC +++ b/src/System/DolDoc/DocTerm.ZC @@ -8,21 +8,21 @@ public CDoc *DocBorderNew(CDoc *pdoc) bdoc->flags |= DOCF_BORDER_DOC; if (pdoc) { - DocPrint(bdoc, "$$CM+H+BY+RX+NC,-7,1$$"); - doc_e=DocPrint(bdoc, "$$TX+H+BD+TC,\" \"$$"); + DocPrint(bdoc, "$$CM+H+BY+RX+NC,-3,1$$"); + doc_e = DocPrint(bdoc, "$$TX+H+BD+TC+IV,\" \"$$"); doc_e->user_data = pdoc; doc_e->tag_cb = &EdFilterCB; - doc_e=DocPrint(bdoc, "$$TX+H+BD+TC,\" \"$$"); + doc_e = DocPrint(bdoc, "$$TX+H+BD+TC+IV,\" \"$$"); doc_e->user_data = pdoc; doc_e->tag_cb = &EdOverStrikeCB; - doc_e=DocPrint(bdoc, "$$TX+H+BD+TC,\" \"$$"); + doc_e = DocPrint(bdoc, "$$TX+H+BD+TC+IV,\" \"$$"); doc_e->user_data = pdoc; doc_e->tag_cb = &EdDollarCB; - DocPrint(bdoc, "$$CM+H+BY+RX+NC,-18,1$$"); - doc_e=DocPrint(bdoc, "$$TX+BD+TC,\" \"$$"); + DocPrint(bdoc, "$$CM+H+BY+RX+NC,-12,1$$"); + doc_e = DocPrint(bdoc, "$$TX+BD+TC+IV,\" \"$$"); doc_e->user_data = pdoc; doc_e->tag_cb = &EdMoreCB; - doc_e=DocPrint(bdoc, "$$TX+H+BD+TC,\" \"$$"); + doc_e = DocPrint(bdoc, "$$TX+H+BD+TC+IV,\" \"$$"); doc_e->user_data = pdoc; doc_e->tag_cb = &EdDollarTypeCB; }