bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement the display level of the charset (2nd parameter of 3rd line of .CHS. Test this please!

Browse Source
This commit is contained in:
Stas Degteff 2007-10-29 21:33:07 +00:00
parent a1eb96afda
commit e1ffb097c6
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
golded3/gcmisc.cpp
View File

@ -667,12 +667,23 @@ void ReadXlatTables()
ch = 0; ch = 0;
else else
ch = 128; ch = 128;
if(ChsTable.level)
{
for(;*ptr&&isdigit(*ptr);ptr++);
for(;*ptr&&isspace(*ptr);ptr++);
if(*ptr&&isdigit(*ptr))
{
ChsTable.displaylevel = atoi(ptr);
if(!ChsTable.displaylevel) ChsTable.displaylevel = ChsTable.level;
}
else ChsTable.displaylevel = ChsTable.level;
}
break; break;
case 4: case 4:
strcpy(ChsTable.imp, strbtrim(ptr)); strcpy(ChsTable.imp, strbtrim(ptr));
break; break;
case 5: case 5:
if (ChsTable.level) if (ChsTable.level && ChsTable.version!=-1)
{ {
gsprintf(PRINTF_DECLARE_BUFFER(ChsTable.exp), "%s %d", gsprintf(PRINTF_DECLARE_BUFFER(ChsTable.exp), "%s %d",
strbtrim(ptr), ChsTable.level); strbtrim(ptr), ChsTable.level);

6
golded3/gepost.cpp
View File

@ -242,7 +242,8 @@ static void MakeMsg3(int& mode, GMsg* msg) {
{ {
msg->charsetlevel = LoadCharset(CFG->xlatlocalset, AA->Xlatexport()); msg->charsetlevel = LoadCharset(CFG->xlatlocalset, AA->Xlatexport());
if (msg->charsetlevel) if (msg->charsetlevel)
gsprintf(PRINTF_DECLARE_BUFFER(msg->charset), "%s %d", AA->Xlatexport(), msg->charsetlevel); // gsprintf(PRINTF_DECLARE_BUFFER(msg->charset), "%s %d", AA->Xlatexport(), msg->charsetlevel);
gsprintf(PRINTF_DECLARE_BUFFER(msg->charset), "%s %d", AA->Xlatexport(), CharTable->displaylevel);
else else
gsprintf(PRINTF_DECLARE_BUFFER(msg->charset), "%s 2", CFG->xlatlocalset); gsprintf(PRINTF_DECLARE_BUFFER(msg->charset), "%s 2", CFG->xlatlocalset);
} }
@ -748,7 +749,8 @@ void MakeMsg(int mode, GMsg* omsg, bool ignore_replyto) {
msg->orig = AA->Aka().addr; msg->orig = AA->Aka().addr;
msg->charsetlevel = LoadCharset(CFG->xlatlocalset, AA->Xlatexport()); msg->charsetlevel = LoadCharset(CFG->xlatlocalset, AA->Xlatexport());
if (msg->charsetlevel) if (msg->charsetlevel)
gsprintf(PRINTF_DECLARE_BUFFER(msg->charset), "%s %d", AA->Xlatexport(), msg->charsetlevel); // gsprintf(PRINTF_DECLARE_BUFFER(msg->charset), "%s %d", AA->Xlatexport(), msg->charsetlevel);
gsprintf(PRINTF_DECLARE_BUFFER(msg->charset), "%s %d", AA->Xlatexport(), CharTable->displaylevel);
else else
gsprintf(PRINTF_DECLARE_BUFFER(msg->charset), "%s 2", CFG->xlatlocalset); gsprintf(PRINTF_DECLARE_BUFFER(msg->charset), "%s 2", CFG->xlatlocalset);
strcpy(msg->odom, CFG->aka[AkaMatch(&msg->orig, &AA->Aka().addr)].domain); strcpy(msg->odom, CFG->aka[AkaMatch(&msg->orig, &AA->Aka().addr)].domain);

2
golded3/geread.cpp
View File

@ -1218,7 +1218,7 @@ int LoadMessage(GMsg* msg, int margin) {
msg->attr.upd0(); msg->attr.upd0();
if((reader_rcv_noise > 1) and AA->isnet() and msg->attr.cfm())) if((reader_rcv_noise > 1) and AA->isnet() and msg->attr.cfm())
reader_gen_confirm = true; reader_gen_confirm = true;
} }
} }

1
goldlib/gall/geall.h
View File

@ -852,6 +852,7 @@ struct Chs {
long id; long id;
int version; int version;
int level; int level;
int displaylevel;
XlatName imp; // From Charset XlatName imp; // From Charset
XlatName exp; // To Charset XlatName exp; // To Charset
ChsTab t[256]; // The Translation Table ChsTab t[256]; // The Translation Table