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

Fixes to the recent patches

Browse Source
This commit is contained in:
Alexander S. Aganichev 2002-09-23 09:23:45 +00:00
parent c283d9e260
commit dbeb60a30e
7 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/notework.txt
View File

@ -12,6 +12,10 @@ ______________________________________________________________________
Notes for GoldED+ 1.1.5, /snapshot/ Notes for GoldED+ 1.1.5, /snapshot/
______________________________________________________________________ ______________________________________________________________________
- Fixed keyboard macro handling broken somewhere in pre-1.1.5s.
- Fixed Synchronet configuration parser :-)
+ Added Synchronet configuration parser: + Added Synchronet configuration parser:
Areafile Synchronet path\to\msgs.cnf Areafile Synchronet path\to\msgs.cnf

2
golded3/gckeys.cpp
View File

@ -922,7 +922,7 @@ static void SetKeybDefaults() {
int keys = (sizeof(DefaultKeyset) / sizeof(CmdKey)) - 1; int keys = (sizeof(DefaultKeyset) / sizeof(CmdKey)) - 1;
int k = 0; int k = 0;
while(k < keys) { while(k < keys) {
if(tmp->key < 0xFF) if(tmp->key <= 0xFF)
tmp->key = (gkey)tolower(tmp->key); tmp->key = (gkey)tolower(tmp->key);
KeyCmdAdd(tmp->cmd, tmp->key, tmp->type); KeyCmdAdd(tmp->cmd, tmp->key, tmp->type);
tmp++; tmp++;

8
golded3/geglob.cpp
View File

@ -255,6 +255,10 @@ bool inline samekey(gkey key1, gkey key2) {
if(key1 >= KK_Commands) // special key if(key1 >= KK_Commands) // special key
return false; return false;
if(key1 == key2)
return true;
if((key1 > 0xFF) || (key2 > 0xFF))
return false;
return (tolower(key1) == key2) or (tolower(key2) == key1); return (tolower(key1) == key2) or (tolower(key2) == key1);
} }
@ -265,7 +269,7 @@ int IsMacro(gkey key, int type) {
std::vector<Macro>::iterator m = CFG->macro.begin(); std::vector<Macro>::iterator m = CFG->macro.begin();
while(m != CFG->macro.end()) { while(m != CFG->macro.end()) {
if(((key == m->key) or samekey(key, m->key)) and (type == m->type)) if(samekey(key, m->key) and (type == m->type))
return true; return true;
m++; m++;
} }
@ -280,7 +284,7 @@ int PlayMacro(gkey key, int type) {
std::vector<Macro>::iterator m = CFG->macro.begin(); std::vector<Macro>::iterator m = CFG->macro.begin();
while(m != CFG->macro.end()) { while(m != CFG->macro.end()) {
if(((key == m->key) or samekey(key, m->key)) and (type == m->type)) { if(samekey(key, m->key) and (type == m->type)) {
RunMacro(&(*m)); RunMacro(&(*m));
return true; return true;
} }

2
goldlib/gall/gfilutil.h
View File

@ -34,7 +34,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef _POSIX_SOURCE #ifndef _MSC_VER
#include <unistd.h> #include <unistd.h>
#else #else
#include <cstdlib> #include <cstdlib>

4
goldlib/gcfg/gxsync.cpp
View File

@ -94,8 +94,8 @@ void gareafile::ReadSynchronet(char* tag) {
aa.setechoid(sub.code); aa.setechoid(sub.code);
aa.setdesc(sub.lname); aa.setdesc(sub.lname);
aa.groupid = 0x8000 + sub.grp; aa.groupid = 0x8000 + sub.grp;
if(*sub.echopath) if(*sub.data_dir)
MakePathname(file, sub.echopath, sub.code); MakePathname(file, sub.data_dir, sub.code);
else else
MakePathname(file, path, sub.code); MakePathname(file, path, sub.code);
aa.setpath(file); aa.setpath(file);

2
goldlib/glibc/config.h
View File

@ -6,7 +6,7 @@
#define HAVE_DIRENT_H 1 #define HAVE_DIRENT_H 1
#define STDC_HEADERS 1 #define STDC_HEADERS 1
#ifdef _POSIX_SOURCE #ifndef _MSC_VER
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
#endif #endif
#define HAVE_STRING_H 1 #define HAVE_STRING_H 1

4
goldlib/uulib/config.h
View File

@ -55,7 +55,7 @@
#define HAVE_FCNTL_H 1 #define HAVE_FCNTL_H 1
/* Define if you have the <io.h> header file. */ /* Define if you have the <io.h> header file. */
#ifndef _POSIX_SOURCE #ifdef _MSC_VER
#define HAVE_IO_H #define HAVE_IO_H
#endif #endif
@ -72,7 +72,7 @@
#define HAVE_SYS_TIME_H 1 #define HAVE_SYS_TIME_H 1
/* Define if you have the <unistd.h> header file. */ /* Define if you have the <unistd.h> header file. */
#ifdef _POSIX_SOURCE #ifndef _MSC_VER
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
#endif #endif