This commit is contained in:
Alexander S. Aganichev
2000-12-22 00:14:04 +00:00
parent fe6812d9a6
commit 4156d37847
13 changed files with 51 additions and 5 deletions

View File

@@ -647,6 +647,7 @@ CfgGed::CfgGed() {
*printreset = 0;
*quotechars = 0;
strcpy(quotestring, " FL> ");
strcpy(quotestops, "<\"\'-");
*searchfor = 0;
strcpy(stylecodepunct, " !?\"$%&()+,.:;<=>@[\\]^`{|}~\n\r\t");
*stylecodestops = 0;

View File

@@ -288,6 +288,7 @@ const word CRC_QUOTECTRL = 0x4CC7;
const word CRC_QUOTEMARGIN = 0x13E6;
const word CRC_QUOTESPACING = 0xB403;
const word CRC_QUOTESTRING = 0xE44F;
const word CRC_QUOTESTOPS = 0xD2E4;
const word CRC_QUOTEWRAPHARD = 0x6BD4;
const word CRC_QWKBADMSGS = 0x0C2D;
const word CRC_QWKCONFMAP = 0xEAE1;

View File

@@ -472,6 +472,7 @@ SwitchQ:
case CRC_QUOTECTRL : CfgQuotectrl (); break;
case CRC_QUOTEMARGIN : CfgQuotemargin (); break;
case CRC_QUOTESTRING : CfgQuotestring (); break;
case CRC_QUOTESTOPS : CfgQuotestops (); break;
case CRC_QUOTEWRAPHARD : CfgQuotewraphard (); break;
case CRC_QWKBADMSGS : CfgQwkbadmsgs (); break;
case CRC_QWKCONFMAP : CfgQwkconfmap (); break;

View File

@@ -53,6 +53,24 @@ void CfgQuotestring() {
// ------------------------------------------------------------------
void CfgQuotestops() {
char buf[10];
strxcpy(buf, StripQuotes(val), sizeof(buf));
if(*buf == NUL)
strcpy(buf, " > ");
else {
if(buf[strlen(buf)-1] != ' ')
strcat(buf, " ");
}
if(cfgingroup)
CFG->grp.AddItm(GRP_QUOTESTOPS, buf, strlen(buf)+1);
else
strcpy(CFG->quotestops, buf);
}
// ------------------------------------------------------------------
void CfgQuotewraphard() {
bool flag = GetYesno(val);

View File

@@ -700,8 +700,8 @@ tglobalkey globalkeys[] = {
{ CRC_READDECREASEMARGIN , KK_ReadDecreaseMargin , KT_R }, // 0xD8EA
{ CRC_LISTASKEXIT , KK_ListAskExit , KT_M }, // 0xD922
{ CRC_AREACATCHUP , KK_AreaCatchUp , KT_A }, // 0xDA5C
{ CRC_READGOTOREPLYPREV , KK_ReadGotoReplyPrev , KT_R }, // 0xDBE7
{ CRC_READMOVEDIRQUOTEMSG , KK_ReadMoveDirQuoteMsg , KT_R }, // 0xDBC0
{ CRC_READGOTOREPLYPREV , KK_ReadGotoReplyPrev , KT_R }, // 0xDBE7
{ CRC_EDITANCHOR , KK_EditAnchor , KT_E }, // 0xDC07
{ CRC_FILEQUITNOW , KK_FileQuitNow , KT_F }, // 0xDD19
{ CRC_AREAINFO , KK_AreaInfo , KT_A }, // 0xDE54

View File

@@ -279,6 +279,7 @@ void CfgQuotechars ();
void CfgQuotemargin ();
void CfgQuotespacing ();
void CfgQuotestring ();
void CfgQuotestops ();
void CfgQuotewraphard ();
void CfgQwkbadmsgs ();
void CfgQwkconfmap ();

View File

@@ -287,6 +287,7 @@ public:
uint quotectrl;
int quotemargin;
char quotestring[10];
char quotestops[41];
bool quotewraphard;
int ra2usersbbs; // RA2;
int replylink;

View File

@@ -155,6 +155,7 @@ void Area::InitData() {
strcpy(adat->quotechars, CFG->quotechars);
adat->quotectrl = CFG->quotectrl;
strcpy(adat->quotestring, CFG->quotestring);
strcpy(adat->quotestops, CFG->quotestops);
adat->quotewraphard = CFG->quotewraphard;
adat->replyre = EDIT->ReplyRe();
if(*CFG->searchfor)
@@ -278,6 +279,8 @@ void Area::RandomizeData(int mode) {
CFG->grp.GetItm(GRP_QUOTECHARS, adat->quotechars, sizeof(adat->quotechars));
CFG->grp.GetItm(GRP_QUOTECTRL, adat->quotectrl);
CFG->grp.GetItm(GRP_QUOTESTRING, adat->quotestring, sizeof(adat->quotestring));
CFG->grp.GetItm(GRP_QUOTESTOPS, adat->quotestops, sizeof(adat->quotestops));
CFG->grp.GetItm(GRP_QUOTEWRAPHARD, adat->quotewraphard);
if(CFG->grp.GetItm(GRP_PLAY, buf, sizeof(buf))) {

View File

@@ -325,7 +325,7 @@ int is_quote(const char* ptr) {
if(spaces > 1)
return false;
}
else if((*ptr < ' ') or strchr("<\"\'-", *ptr)) {
else if((*ptr < ' ') or strchr(AA->Quotestops(), *ptr)) {
// Found a char that cannot occur in a quotestring
return false;
}

View File

@@ -298,6 +298,7 @@ struct AreaData {
char quotechars[11];
int quotectrl;
char quotestring[10];
char quotestops[41];
bool quotewraphard;
GPlay play;
int replyre;
@@ -551,6 +552,7 @@ public:
const char* Quotechars() const { return adat->quotechars; }
int Quotectrl() const { return adat->quotectrl; }
const char* Quotestring() const { return adat->quotestring; }
const char* Quotestops() const { return adat->quotestops; }
bool Quotewraphard() const { return adat->quotewraphard; }
const GPlay& Play() const { return adat->play; }
const int Replyre() const { return adat->replyre; }