Added old fastecho back, fixed dot problem in win32, added new keywords
This commit is contained in:
@@ -636,6 +636,7 @@ CfgGed::CfgGed() {
|
||||
*internetdomain = 0;
|
||||
*keybstack = 0;
|
||||
*nickname = 0;
|
||||
*netname = 0;
|
||||
*organization = 0;
|
||||
#ifdef __UNIX__
|
||||
strcpy(printdevice, "/usr/bin/lpr > /dev/null 2>&1");
|
||||
|
@@ -256,6 +256,7 @@ const word CRC_MSGLISTVIEWSUBJ = 0xED92;
|
||||
const word CRC_MSGLISTWIDESUBJ = 0xF385;
|
||||
const word CRC_NAMESFILE = 0x1743;
|
||||
const word CRC_NICKNAME = 0x70D8;
|
||||
const word CRC_NETNAME = 0xB574;
|
||||
const word CRC_NODELIST = 0x0E0A;
|
||||
const word CRC_NODELISTWARN = 0xF818;
|
||||
const word CRC_NODEPATH = 0xCE00;
|
||||
|
@@ -427,6 +427,7 @@ SwitchN:
|
||||
switch(crc) {
|
||||
case CRC_NAMESFILE : CfgNamesfile (); break;
|
||||
case CRC_NICKNAME : CfgNickname (); break;
|
||||
case CRC_NETNAME : CfgNetname (); break;
|
||||
case CRC_NODELIST : CfgNodelist (); break;
|
||||
case CRC_NODEPATH : CfgNodepath (); break;
|
||||
case CRC_NODEPATHFD : CfgNodepathfd (); break;
|
||||
|
@@ -88,6 +88,19 @@ void CfgNickname() {
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
void CfgNetname() {
|
||||
|
||||
Name buf;
|
||||
|
||||
strxcpy(buf, val, sizeof(buf));
|
||||
if(cfgingroup)
|
||||
CFG->grp.AddItm(GRP_NETNAME, buf, strlen(buf)+1);
|
||||
else
|
||||
strcpy(CFG->netname, buf);
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
void CfgNodelist() {
|
||||
|
||||
// Only used by GoldNODE
|
||||
|
@@ -653,6 +653,7 @@ tglobalkey globalkeys[] = {
|
||||
#endif
|
||||
{ CRC_READTOGGLEQUOTE , KK_ReadToggleQuote , KT_R }, // 0xB293
|
||||
{ CRC_EDITUNDO , KK_EditUndo , KT_E }, // 0xB295
|
||||
{ CRC_READDIRQUOTEMSG , KK_ReadDirQuoteMsg , KT_R }, // 0xB351
|
||||
{ CRC_FILETOGGLEMARK , KK_FileToggleMark , KT_F }, // 0xB431
|
||||
{ CRC_FILEGOTOPREV , KK_FileGotoPrev , KT_F }, // 0xB644
|
||||
{ CRC_EDITLOOKUPCURSOR , KK_EditLookupCursor , KT_E }, // 0xB7CC
|
||||
@@ -700,6 +701,7 @@ tglobalkey globalkeys[] = {
|
||||
{ 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_EDITANCHOR , KK_EditAnchor , KT_E }, // 0xDC07
|
||||
{ CRC_FILEQUITNOW , KK_FileQuitNow , KT_F }, // 0xDD19
|
||||
{ CRC_AREAINFO , KK_AreaInfo , KT_A }, // 0xDE54
|
||||
|
@@ -252,6 +252,7 @@ const word CRC_READMENU = 0x3D0A;
|
||||
const word CRC_READMESSAGELIST = 0xD5D8;
|
||||
const word CRC_READMOVECOMMENTMSG = 0xE4E7;
|
||||
const word CRC_READMOVEQUOTEMSG = 0x1B41;
|
||||
const word CRC_READMOVEDIRQUOTEMSG = 0xDBC0;
|
||||
const word CRC_READMSGCONTINUE = 0x4511;
|
||||
const word CRC_READMSGEND = 0xC5AD;
|
||||
const word CRC_READMSGHOME = 0x4BD1;
|
||||
@@ -264,6 +265,7 @@ const word CRC_READNEWMSG = 0x30CA;
|
||||
const word CRC_READQUITNOW = 0xAC15;
|
||||
const word CRC_READQUOTEBUF = 0x49EE;
|
||||
const word CRC_READQUOTEMSG = 0xBE00;
|
||||
const word CRC_READDIRQUOTEMSG = 0xB351;
|
||||
const word CRC_READREPLYMSG = 0x172F;
|
||||
const word CRC_READSEARCH = 0x48EF;
|
||||
const word CRC_READSOUNDKILL = 0xAE29;
|
||||
|
@@ -248,6 +248,7 @@ void CfgMsglistwidesubj ();
|
||||
void CfgNamesfile ();
|
||||
void CfgNewsgroups ();
|
||||
void CfgNickname ();
|
||||
void CfgNetname ();
|
||||
void CfgNodelist ();
|
||||
void CfgNodelistwarn ();
|
||||
void CfgNodepath ();
|
||||
|
@@ -447,6 +447,10 @@ void GPickArealist::print_line(uint idx, uint pos, bool isbar) {
|
||||
|
||||
void GPickArealist::AreaCatchUp(uint n) {
|
||||
|
||||
// Do not do catch up if there's active area
|
||||
if(AA->isopen())
|
||||
return false;
|
||||
|
||||
GMenuAreaCatchup MenuAreaCatchup;
|
||||
GMsg* msg = (GMsg*)throw_calloc(1, sizeof(GMsg));
|
||||
|
||||
|
@@ -262,6 +262,7 @@ public:
|
||||
bool msglistwidesubj;
|
||||
Path namesfile;
|
||||
Name nickname;
|
||||
Name netname;
|
||||
Path nodepath;
|
||||
Path nodepathfd;
|
||||
Path nodepathv7;
|
||||
|
@@ -45,9 +45,9 @@ char* MakeOrigin(GMsg* msg, const char* orig) {
|
||||
strxcpy(origin, orig, sizeof(origin));
|
||||
|
||||
if(msg->orig.net)
|
||||
msg->orig.make_string(buf);
|
||||
msg->orig.make_string(buf, *AA->Netname() ? (*msg->odom ? msg->odom : AA->Netname()) : NULL);
|
||||
else
|
||||
AA->Aka().addr.make_string(buf);
|
||||
AA->Aka().addr.make_string(buf, *AA->Netname() ? (*AA->Aka().domain ? AA->Aka().domain : AA->Netname()) : NULL);
|
||||
|
||||
if(*origin == '@')
|
||||
GetRandomLine(origin, sizeof(origin), origin+1);
|
||||
|
@@ -65,7 +65,7 @@ int inforow = 18;
|
||||
char goldmark = ' ';
|
||||
|
||||
int startecho = -1;
|
||||
Echo stecho;
|
||||
Echo stecho = "";
|
||||
|
||||
int fieldupd = 2; // State of field mode in winpdef()
|
||||
|
||||
|
@@ -307,6 +307,8 @@ const gkey KK_ReadTouchSemaphore = 0xFF9E;
|
||||
const gkey KK_ReadUserbase = 0xFF9F;
|
||||
const gkey KK_ReadUUDecode = 0xFFA0;
|
||||
const gkey KK_ReadWriteMsg = 0xFFA1;
|
||||
const gkey KK_ReadDirQuoteMsg = 0xFFA2;
|
||||
const gkey KK_ReadMoveDirQuoteMsg = 0xFFA3;
|
||||
|
||||
const gkey KK_AreaUndefine = 0xFFB0;
|
||||
const gkey KK_EditUndefine = 0xFFB1;
|
||||
|
@@ -977,28 +977,29 @@ int GMenuNavigate::Run() {
|
||||
|
||||
enum {
|
||||
TAG_MAIN = 100,
|
||||
TAG_MAIN_SHELL = (int)KK_ReadDosShell,
|
||||
TAG_MAIN_QUIT = (int)KK_ReadQuitNow,
|
||||
TAG_MAIN_SHELL = (int)KK_ReadDosShell,
|
||||
TAG_MAIN_QUIT = (int)KK_ReadQuitNow,
|
||||
TAG_EDIT = 101,
|
||||
TAG_EDIT_ENTER = (int)KK_ReadNewMsg,
|
||||
TAG_EDIT_QUOTE = (int)KK_ReadQuoteMsg,
|
||||
TAG_EDIT_COMMENT = (int)KK_ReadCommentMsg,
|
||||
TAG_EDIT_ENTER = (int)KK_ReadNewMsg,
|
||||
TAG_EDIT_QUOTE = (int)KK_ReadQuoteMsg,
|
||||
TAG_EDIT_DIRQUOTE = (int)KK_ReadDirQuoteMsg,
|
||||
TAG_EDIT_COMMENT = (int)KK_ReadCommentMsg,
|
||||
TAG_EDIT_OTHER = 1010,
|
||||
TAG_EDIT_OTHER_QUOTE = (int)KK_ReadMoveQuoteMsg,
|
||||
TAG_EDIT_OTHER_COMMENT = (int)KK_ReadMoveCommentMsg,
|
||||
TAG_EDIT_OTHER_QUOTE = (int)KK_ReadMoveQuoteMsg,
|
||||
TAG_EDIT_OTHER_DIRQUOTE = (int)KK_ReadMoveQuoteMsg,
|
||||
TAG_EDIT_OTHER_COMMENT = (int)KK_ReadMoveCommentMsg,
|
||||
TAG_SEL = 102,
|
||||
TAG_SEL_ORIGIN = (int)KK_ReadChangeOrigin,
|
||||
TAG_SEL_USERNAME = (int)KK_ReadChangeUsername,
|
||||
TAG_SEL_AKA = (int)KK_ReadChangeAka,
|
||||
TAG_SEL_ATTRS = (int)KK_ReadChangeAttrs,
|
||||
TAG_SEL_TEMPLATE = (int)KK_ReadChangeTemplate,
|
||||
TAG_SEL_ORIGIN = (int)KK_ReadChangeOrigin,
|
||||
TAG_SEL_USERNAME = (int)KK_ReadChangeUsername,
|
||||
TAG_SEL_AKA = (int)KK_ReadChangeAka,
|
||||
TAG_SEL_ATTRS = (int)KK_ReadChangeAttrs,
|
||||
TAG_SEL_TEMPLATE = (int)KK_ReadChangeTemplate,
|
||||
TAG_UTIL = 103,
|
||||
TAG_UTIL_CMF = (int)KK_ReadCopyMoveForward,
|
||||
TAG_UTIL_LIST = (int)KK_ReadMessageList,
|
||||
TAG_UTIL_WRITE = (int)KK_ReadWriteMsg,
|
||||
TAG_UTIL_FREQ = (int)KK_ReadFileRequest,
|
||||
TAG_SEPARATOR,
|
||||
TAG_END
|
||||
TAG_UTIL_CMF = (int)KK_ReadCopyMoveForward,
|
||||
TAG_UTIL_LIST = (int)KK_ReadMessageList,
|
||||
TAG_UTIL_WRITE = (int)KK_ReadWriteMsg,
|
||||
TAG_UTIL_FREQ = (int)KK_ReadFileRequest,
|
||||
TAG_END = 104
|
||||
};
|
||||
|
||||
Init();
|
||||
@@ -1019,14 +1020,16 @@ int GMenuNavigate::Run() {
|
||||
End();
|
||||
Item(TAG_EDIT, "E Edit ");
|
||||
BeginPullDown();
|
||||
Item(TAG_EDIT_ENTER, "E Enter new msg ");
|
||||
Item(TAG_EDIT_QUOTE, "Q Quote-reply ");
|
||||
Item(TAG_EDIT_COMMENT, "C Comment-reply ");
|
||||
Item(TAG_EDIT_OTHER, "O Other area reply >");
|
||||
Item(TAG_EDIT_ENTER, "E Enter new msg ");
|
||||
Item(TAG_EDIT_QUOTE, "Q Quote-reply ");
|
||||
Item(TAG_EDIT_DIRQUOTE, "D Direct quote-reply (ignore Reply-To) ");
|
||||
Item(TAG_EDIT_COMMENT, "C Comment-reply ");
|
||||
Item(TAG_EDIT_OTHER, "O Other area reply > ");
|
||||
SetTitle(" Other Area ");
|
||||
Begin();
|
||||
Item(TAG_EDIT_OTHER_QUOTE, "Q Quote-reply ");
|
||||
Item(TAG_EDIT_OTHER_COMMENT, "C Comment-reply ");
|
||||
Item(TAG_EDIT_OTHER_QUOTE, "Q Quote-reply ");
|
||||
Item(TAG_EDIT_OTHER_DIRQUOTE, "D Direct quote-reply (ignore Reply-To) ");
|
||||
Item(TAG_EDIT_OTHER_COMMENT, "C Comment-reply ");
|
||||
End();
|
||||
End();
|
||||
Item(TAG_SEL, "C Change ");
|
||||
@@ -1046,7 +1049,7 @@ int GMenuNavigate::Run() {
|
||||
End();
|
||||
End();
|
||||
Start();
|
||||
if((finaltag >= TAG_MAIN) and (finaltag < (TAG_END*10)))
|
||||
if((finaltag >= TAG_MAIN) and (finaltag <= TAG_END))
|
||||
finaltag = -1;
|
||||
return finaltag;
|
||||
}
|
||||
|
@@ -316,9 +316,11 @@ void MessageBrowse();
|
||||
void NewArea(bool jumpnext = false);
|
||||
void NewMsg();
|
||||
void OtherAreaQuoteMsg();
|
||||
void OtherAreaDirQuoteMsg();
|
||||
void OtherAreaCommentMsg();
|
||||
void QuitNow();
|
||||
void QuoteBuf(GMsg* msg);
|
||||
void DirQuoteMsg();
|
||||
void QuoteMsg();
|
||||
void RenumberArea();
|
||||
void ReplyMsg();
|
||||
|
@@ -171,6 +171,7 @@ void Area::InitData() {
|
||||
adat->viewkludge = CFG->viewkludge;
|
||||
adat->viewquote = CFG->viewquote;
|
||||
strcpy(adat->nickname, CFG->nickname);
|
||||
strcpy(adat->netname, CFG->netname);
|
||||
strcpy(adat->whoto, CFG->whoto);
|
||||
strcpy(adat->xlatexport, CFG->xlatexport);
|
||||
strcpy(adat->xlatimport, CFG->xlatimport);
|
||||
@@ -362,6 +363,9 @@ void Area::RandomizeData(int mode) {
|
||||
if(CFG->grp.GetItm(GRP_NICKNAME, buf, sizeof(buf)))
|
||||
strxcpy(adat->nickname, buf, sizeof(adat->nickname));
|
||||
|
||||
if(CFG->grp.GetItm(GRP_NETNAME, buf, sizeof(buf)))
|
||||
strxcpy(adat->netname, buf, sizeof(adat->netname));
|
||||
|
||||
if(CFG->grp.GetItm(GRP_WHOTO, buf, sizeof(buf))) {
|
||||
if(*buf == '@')
|
||||
GetRandomLine(buf, sizeof(buf), buf+1);
|
||||
|
@@ -605,6 +605,10 @@ void Reader() {
|
||||
OtherAreaQuoteMsg();
|
||||
break;
|
||||
|
||||
case KK_ReadMoveDirQuoteMsg:
|
||||
OtherAreaDirQuoteMsg();
|
||||
break;
|
||||
|
||||
case KK_ReadMoveCommentMsg:
|
||||
OtherAreaCommentMsg();
|
||||
break;
|
||||
@@ -617,6 +621,10 @@ void Reader() {
|
||||
QuoteMsg();
|
||||
break;
|
||||
|
||||
case KK_ReadDirQuoteMsg:
|
||||
DirQuoteMsg();
|
||||
break;
|
||||
|
||||
case KK_ReadCommentMsg:
|
||||
CommentMsg();
|
||||
break;
|
||||
|
@@ -107,6 +107,10 @@ int AreaList::SetActiveAreaNo(int __areano) {
|
||||
|
||||
int AreaList::AreaScan(int mode, uint currno, int pmscan, int& pmails, int& pmareas, const char* file) {
|
||||
|
||||
// Never scan if there's active area
|
||||
if(AA->isopen())
|
||||
return false;
|
||||
|
||||
gstrarray bag;
|
||||
int groupid = -1;
|
||||
|
||||
|
@@ -942,6 +942,15 @@ void ReplyMsg() {
|
||||
}
|
||||
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
void DirQuoteMsg() {
|
||||
|
||||
if(reader_msg->ireplyto) *reader_msg->ireplyto = NUL;
|
||||
QuoteMsg();
|
||||
}
|
||||
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
void QuoteMsg() {
|
||||
@@ -1006,6 +1015,15 @@ void CommentMsg() {
|
||||
}
|
||||
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
void OtherAreaDirQuoteMsg() {
|
||||
|
||||
if(reader_msg->ireplyto) *reader_msg->ireplyto = NUL;
|
||||
OtherAreaQuoteMsg();
|
||||
}
|
||||
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
void OtherAreaQuoteMsg() {
|
||||
|
@@ -291,6 +291,7 @@ struct AreaData {
|
||||
bool msglistheader;
|
||||
bool msglistwidesubj;
|
||||
Name nickname;
|
||||
Name netname;
|
||||
INam organization;
|
||||
char origin[160];
|
||||
Path quotebuffile;
|
||||
@@ -542,6 +543,7 @@ public:
|
||||
bool Msglistheader() const { return adat->msglistheader; }
|
||||
bool Msglistwidesubj() const { return adat->msglistwidesubj; }
|
||||
const char* Nickname() const { return adat->nickname; }
|
||||
const char* Netname() const { return adat->netname; }
|
||||
const char* Organization() const { return adat->organization; }
|
||||
const char* Origin() const { return adat->origin; }
|
||||
const char* Outputfile() const { return adat->outputfile; }
|
||||
@@ -706,7 +708,6 @@ public:
|
||||
int Run(const char* _title, int wpos, int& idx);
|
||||
|
||||
GPickArealist();
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
@@ -47,7 +47,7 @@
|
||||
#undef __GVER_PREVERSION__
|
||||
#define __GVER_PREVERSION__ ""
|
||||
#undef __GVER_POSTVERSION__
|
||||
#define __GVER_POSTVERSION__ ".7"
|
||||
__GVER__(1,1,4)
|
||||
#define __GVER_POSTVERSION__ ""
|
||||
__GVER__(1,1,5)
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user