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

Few fixes to the keyboard driver/config, URLHandler now accepts options

Browse Source
This commit is contained in:
Alexander S. Aganichev
2001-12-11 23:24:14 +00:00
parent 8b4f37b868
commit e36516c1c7
9 changed files with 138 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
golded3/gccfgg8.cpp
View File

@@ -276,7 +276,22 @@ void CfgTwitsubj() {
void CfgUrlhandler() {
CFG->urlhandler = val;
// Get util number
char* _key;
char* _val = val;
// Get options
int _optbak = CFG->externoptions;
while(strchr("-", *_val)) {
getkeyval(&_key, &_val);
val = _key;
CfgExternoptions();
}
CFG->urlhandler.options = CFG->externoptions;
CFG->externoptions = _optbak;
// Get commandline
strxcpy(CFG->urlhandler.cmdline, _val, sizeof(CFG->urlhandler.cmdline));
}
// ------------------------------------------------------------------

2
golded3/gckeys.cpp
View File

@@ -648,7 +648,7 @@ tglobalkey globalkeys[] = {
{ CRC_EDITBLOCKHOME , KK_EditBlockHome , KT_E }, // 0x8B82
{ CRC_READDELETEMSG , KK_ReadDeleteMsg , KT_R }, // 0x8BCE
{ CRC_EDITTAB , KK_EditTab , KT_E }, // 0x8C26
{ CRC_K_KEY5 , Key_5 , 0 }, // 0x9062
{ CRC_K_KEY5 , Key_5Num , 0 }, // 0x9062
{ CRC_EDITPASTE , KK_EditPaste , KT_E }, // 0x90C4
{ CRC_HEADERTOGGLEAUDIT , KK_HeaderToggleAudit , KT_H }, // 0x91B7
{ CRC_EDITGOBOTLINE , KK_EditGoBotLine , KT_E }, // 0x92DD

2
golded3/gecfgg.h
View File

@@ -337,7 +337,7 @@ public:
int twitmode; // showtwits;
std::vector<Node> twitname;
gstrarray twitsubj;
std::string urlhandler;
ExtUtil urlhandler;
bool usearea;
bool usecharset;
int usefwd;

6
golded3/gemlst.cpp
View File

@@ -389,8 +389,10 @@ bool GMsgList::handle_key() {
{
GMenuQuit MenuQuit;
aborted = gkbd.quitall = (MenuQuit.Run());
if(gkbd.quitall)
if(gkbd.quitall) {
AA->bookmark = AA->Msgn.CvtReln(msgmark2);
return false;
}
}
break;
@@ -1031,6 +1033,8 @@ bool GThreadlist::handle_key() {
{
GMenuQuit MenuQuit;
aborted = gkbd.quitall = (MenuQuit.Run());
if(gkbd.quitall)
return false;
}
break;

10
golded3/geread2.cpp
View File

@@ -726,7 +726,7 @@ void ReadPeekURLs(GMsg* msg) {
if(n != -1) {
char cmdline[1024];
strxcpy(cmdline, CFG->urlhandler.c_str(), sizeof(cmdline));
strxcpy(cmdline, CFG->urlhandler.cmdline, sizeof(cmdline));
strxmerge(buf, sizeof(buf), "\"", strtrim(strltrim(Listi[n])), "\"", NULL);
strischg(cmdline, "@url", buf);
strxcpy(buf, CFG->goldpath, sizeof(buf));
@@ -735,14 +735,14 @@ void ReadPeekURLs(GMsg* msg) {
TokenXlat(MODE_NEW, cmdline, msg, msg, CurrArea);
int pauseval = 0;
if(CFG->externoptions & EXTUTIL_PAUSEONERROR)
if(CFG->urlhandler.options & EXTUTIL_PAUSEONERROR)
pauseval = -1;
if(CFG->externoptions & EXTUTIL_PAUSE)
if(CFG->urlhandler.options & EXTUTIL_PAUSE)
pauseval = 1;
ShellToDos(cmdline, "",
CFG->externoptions & EXTUTIL_CLS ? LGREY|_BLACK : 0,
CFG->externoptions & EXTUTIL_CURSOR,
CFG->urlhandler.options & EXTUTIL_CLS ? LGREY|_BLACK : 0,
CFG->urlhandler.options & EXTUTIL_CURSOR,
pauseval
);
}

2
golded3/getpls.cpp
View File

@@ -210,7 +210,7 @@ int TemplateToText(int mode, GMsg* msg, GMsg* oldmsg, const char* tpl, int origa
fputs("@header Msg : @msgno of @msgs@align{44}@attr\n", fp);
if(AA->isinternet()) {
fputs("@header From : @ofrom@align{60}@odtime\n", fp);
fputs("@header From : @oto\n", fp);
fputs("@header To : @oto\n", fp);
}
else {
fputs("@header From : @oname@align{44}@oaddr@align{60}@odtime\n", fp);