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

Solving attribute constants definition conflicts

Browse Source
This commit is contained in:
Ianos Gnatiuc
2006-01-20 00:15:05 +00:00
parent bcf87c8591
commit 10f34e6765
33 changed files with 133 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
golded3/gcmisc.cpp
View File

@@ -237,69 +237,69 @@ const word CRC_SCERROR = 0xAB65;
vattr GetColor(char* ink)
{
word crc;
vattr color = BLACK|_BLACK;
vattr color = BLACK_|_BLACK;
crc = strCrc16(strupr(ink));
switch(crc) {
// Black is the default
case CRC_BLACK:
color = BLACK|_BLACK;
color = BLACK_|_BLACK;
break;
case CRC_BLUE:
color = BLUE|_BLACK;
color = BLUE_|_BLACK;
break;
case CRC_GREEN:
color = GREEN|_BLACK;
color = GREEN_|_BLACK;
break;
case CRC_CYAN:
color = CYAN|_BLACK;
color = CYAN_|_BLACK;
break;
case CRC_RED:
color = RED|_BLACK;
color = RED_|_BLACK;
break;
case CRC_MAGENTA:
color = MAGENTA|_BLACK;
color = MAGENTA_|_BLACK;
break;
case CRC_BROWN:
color = BROWN|_BLACK;
color = BROWN_|_BLACK;
break;
case CRC_LGRAY:
case CRC_LGREY:
case CRC_LIGHTGRAY:
case CRC_LIGHTGREY:
color = LGREY|_BLACK;
color = LGREY_|_BLACK;
break;
case CRC_DGRAY:
case CRC_DGREY:
case CRC_DARKGRAY:
case CRC_DARKGREY:
color = DGREY|_BLACK;
color = DGREY_|_BLACK;
break;
case CRC_LBLUE:
case CRC_LIGHTBLUE:
color = LBLUE|_BLACK;
color = LBLUE_|_BLACK;
break;
case CRC_LGREEN:
case CRC_LIGHTGREEN:
color = LGREEN|_BLACK;
color = LGREEN_|_BLACK;
break;
case CRC_LCYAN:
case CRC_LIGHTCYAN:
color = LCYAN|_BLACK;
color = LCYAN_|_BLACK;
break;
case CRC_LRED:
case CRC_LIGHTRED:
color = LRED|_BLACK;
color = LRED_|_BLACK;
break;
case CRC_LMAGENTA:
case CRC_LIGHTMAGENTA:
color = LMAGENTA|_BLACK;
color = LMAGENTA_|_BLACK;
break;
case CRC_YELLOW:
color = YELLOW|_BLACK;
color = YELLOW_|_BLACK;
break;
case CRC_WHITE:
color = WHITE|_BLACK;
color = WHITE_|_BLACK;
break;
case CRC_UNDERLINE:
color = UNDERLINE;

2
golded3/gealst.cpp
View File

@@ -467,7 +467,7 @@ public:
void SelMaskPick::open() {
window.openxy(ypos, xpos, ylen+2, xlen+2, btype, battr, LGREY);
window.openxy(ypos, xpos, ylen+2, xlen+2, btype, battr, LGREY_|_BLACK);
window.title(title, tattr);
window.shadow(C_SHADOW);
update();

6
golded3/gecmfd.cpp
View File

@@ -192,7 +192,7 @@ void Area::DelMsgs(GMsg* msg) {
if(delask) {
if(msg->attr.uns() and not (msg->attr.rcv() or msg->attr.del())) {
AA->LoadMsg(msg, msgno, CFG->dispmargin-(int)CFG->switches.get(disppagebar));
w_progress(MODE_QUIT, BLACK|_BLACK, 0, 0, NULL);
w_progress(MODE_QUIT, BLACK_|_BLACK, 0, 0, NULL);
HeaderView->Use(AA, msg);
HeaderView->Paint();
BodyView->Use(AA, msg, topline);
@@ -213,7 +213,7 @@ void Area::DelMsgs(GMsg* msg) {
}
if(msg->attr.lok() and not dellocked and not deletethis) {
AA->LoadMsg(msg, msgno, CFG->dispmargin-(int)CFG->switches.get(disppagebar));
w_progress(MODE_QUIT, BLACK|_BLACK, 0, 0, NULL);
w_progress(MODE_QUIT, BLACK_|_BLACK, 0, 0, NULL);
HeaderView->Use(AA, msg);
HeaderView->Paint();
BodyView->Use(AA, msg, topline);
@@ -238,7 +238,7 @@ void Area::DelMsgs(GMsg* msg) {
isreadmark = false;
Mark.ResetAll();
}
w_progress(MODE_QUIT, BLACK|_BLACK, 0, 0, NULL);
w_progress(MODE_QUIT, BLACK_|_BLACK, 0, 0, NULL);
}
}
if(n == 0) {

2
golded3/gedoit.cpp
View File

@@ -262,7 +262,7 @@ static void WriteMsgs(GMsg* msg) {
remove(fname);
}
w_progress(MODE_QUIT, BLACK|_BLACK, 0, 0, NULL);
w_progress(MODE_QUIT, BLACK_|_BLACK, 0, 0, NULL);
}
else if(source == WRITE_CURRENT) {
if(target & WRITE_FILE) {

12
golded3/gedoss.cpp
View File

@@ -147,7 +147,7 @@ void Cleanup(void) {
}
// Reset border color
if (C_BACKB != (BLACK|_BLACK))
if (C_BACKB != (BLACK_|_BLACK))
gvid->setoverscan(gvid->orig.color.overscan);
wcloseall(); // Close all windows
@@ -294,11 +294,11 @@ int ShellToDos(char* command, char* message, vattr cls, int cursor, int pause) {
gvid->setmode(gvid->orig.screen.mode);
// Clear screen
if (cls != (BLACK|_BLACK))
if (cls != (BLACK_|_BLACK))
vclrscr(cls);
// Reset border color
if (C_BACKB != (BLACK|_BLACK))
if (C_BACKB != (BLACK_|_BLACK))
gvid->setoverscan(gvid->orig.color.overscan);
// Turn on the blinking attributes
@@ -316,7 +316,7 @@ int ShellToDos(char* command, char* message, vattr cls, int cursor, int pause) {
#endif
// Return cursor into 1st column
if (cls != (BLACK|_BLACK)) puts("");
if (cls != (BLACK_|_BLACK)) puts("");
// Write message on screen
if(*message) puts(message);
@@ -406,7 +406,7 @@ int ShellToDos(char* command, char* message, vattr cls, int cursor, int pause) {
gvid->setintensity(CFG->intensecolors);
// Restore border color
if (C_BACKB != (BLACK|_BLACK))
if (C_BACKB != (BLACK_|_BLACK))
gvid->setoverscan(C_BACKB);
// Set palette if changes were specified
@@ -515,7 +515,7 @@ const char* Unpack(const char* archive) {
getcwd(orgdir, sizeof(Path));
gchdir(newdir);
// Now unpack it
ShellToDos(cmdline, "", LGREY|_BLACK, 0, -1);
ShellToDos(cmdline, "", LGREY_|_BLACK, 0, -1);
// Restore current directory
gchdir(orgdir);
strxcpy(newname, AddPath(AddBackslash(newdir), filename), sizeof(Path));

2
golded3/geedit.cpp
View File

@@ -2913,7 +2913,7 @@ int IEclass::Start(int __mode, uint* __position, GMsg* __msg) {
gotorowcol(col, row);
batch_mode = 0;
vattr backattr = BLACK|_BLACK;
vattr backattr = BLACK_|_BLACK;
if(blockcol == -1) {
backattr = dispchar(currline->txt.c_str()[col], C_READC);
gotorowcol(col, row);

6
golded3/geedit2.cpp
View File

@@ -949,7 +949,7 @@ void IEclass::editimport(Line* __line, char* __filename, bool imptxt) {
isPipe = YES;
mktemp(strxcpy(tmpfile, AddPath(CFG->temppath, "GIXXXXXX"), sizeof(Path)));
strxmerge(cmdline, sizeof(Path), filenamebuf.c_str()+1, " > ", tmpfile, NULL);
ShellToDos(cmdline, "", BLACK|_BLACK, NO);
ShellToDos(cmdline, "", BLACK_|_BLACK, NO);
filenamebuf = tmpfile;
fileselected = true;
} else {
@@ -1324,7 +1324,7 @@ void IEclass::SpellCheck() {
strchg(_buf2, GOLD_WRONG_SLASH_CHR, GOLD_SLASH_CHR);
strischg(_buf, "@file", _buf2);
sprintf(_buf2, LNG->SpellChecker, _buf);
ShellToDos(_buf, _buf2, LGREY|_BLACK, YES);
ShellToDos(_buf, _buf2, LGREY_|_BLACK, YES);
LoadFile();
GFTRK(NULL);
@@ -1357,7 +1357,7 @@ void IEclass::DosShell() {
GFTRK("EditDosShell");
ShellToDos(getenv(GOLD_SHELL_ENV), LNG->DOS_Shell, LGREY|_BLACK, YES);
ShellToDos(getenv(GOLD_SHELL_ENV), LNG->DOS_Shell, LGREY_|_BLACK, YES);
cursoron();
cursoroff();

2
golded3/gefile.cpp
View File

@@ -608,7 +608,7 @@ void CreateFileMsgs(int mode, GMsg* msg) {
msg->TextToLines(CFG->dispmargin);
if(specfiles > 1)
w_progress(MODE_QUIT, BLACK|_BLACK, 0, 0, NULL);
w_progress(MODE_QUIT, BLACK_|_BLACK, 0, 0, NULL);
}

2
golded3/gefind.cpp
View File

@@ -181,7 +181,7 @@ bool FindString(GMsg* msg, const char* prompt, int what) {
AA->set_lastread(last);
}
w_progress(MODE_QUIT, BLACK|_BLACK, 0, 0, NULL);
w_progress(MODE_QUIT, BLACK_|_BLACK, 0, 0, NULL);
if(breakloop)
HandleGEvent(EVTT_BREAKLOOP);

2
golded3/geinit.cpp
View File

@@ -785,7 +785,7 @@ void Initialize(int argc, char* argv[]) {
gvid->setintensity(CFG->intensecolors);
if (C_BACKB != (BLACK|_BLACK))
if (C_BACKB != (BLACK_|_BLACK))
gvid->setoverscan(C_BACKB);
vcurhide();

2
golded3/gemlst.cpp
View File

@@ -733,7 +733,7 @@ public:
void GThreadlist::open() {
window.openxy(ypos, xpos, ylen+2, xlen+2, btype, battr, LGREY);
window.openxy(ypos, xpos, ylen+2, xlen+2, btype, battr, LGREY_|_BLACK);
update_title();
center(CFG->displistcursor);

2
golded3/gemrks.cpp
View File

@@ -209,7 +209,7 @@ void MarkMsgs_Txt(int item, char* markstring) {
}
}
w_progress(MODE_QUIT, BLACK|_BLACK, 0, 0, NULL);
w_progress(MODE_QUIT, BLACK_|_BLACK, 0, 0, NULL);
ResetMsg(msg);
throw_free(msg);

2
golded3/gepost.cpp
View File

@@ -540,7 +540,7 @@ static void MakeMsg2(int& mode, int& status, int& forwstat, int& topline, GMsg*
strischg(buf, "@file", buf2);
long ftbefore = GetFiletime(AddPath(CFG->goldpath, EDIT->File()));
sprintf(buf2, LNG->EditCmd, buf);
ShellToDos(buf, buf2, LGREY|_BLACK, YES);
ShellToDos(buf, buf2, LGREY_|_BLACK, YES);
long ftafter = GetFiletime(AddPath(CFG->goldpath, EDIT->File()));
if(status != MODE_SAVE) {
status = MODE_SAVE;

2
golded3/geqwks.cpp
View File

@@ -337,7 +337,7 @@ int ImportQWK() {
if(imported and *QWK->ReplyLinker()) {
char buf[256];
sprintf(buf, LNG->Replylinker, QWK->ReplyLinker());
ShellToDos(QWK->ReplyLinker(), buf, LGREY|_BLACK, YES);
ShellToDos(QWK->ReplyLinker(), buf, LGREY_|_BLACK, YES);
}
}

12
golded3/geread2.cpp
View File

@@ -510,7 +510,7 @@ void NewArea(bool jumpnext) {
void DosShell() {
ShellToDos(getenv(GOLD_SHELL_ENV), LNG->DOS_Shell, LGREY|_BLACK, YES);
ShellToDos(getenv(GOLD_SHELL_ENV), LNG->DOS_Shell, LGREY_|_BLACK, YES);
}
@@ -567,7 +567,7 @@ int ExternUtil(GMsg *msg, ExtUtil *extutil) {
pauseval = 1;
ShellToDos(cmdline, "",
extutil->options & EXTUTIL_CLS ? LGREY|_BLACK : BLACK|_BLACK,
extutil->options & EXTUTIL_CLS ? LGREY_|_BLACK : BLACK_|_BLACK,
extutil->options & EXTUTIL_CURSOR,
pauseval
);
@@ -777,7 +777,7 @@ void ReadPeekURLs(GMsg* msg) {
pauseval = 1;
ShellToDos(cmdline, "",
CFG->urlhandler.options & EXTUTIL_CLS ? LGREY|_BLACK : BLACK|_BLACK,
CFG->urlhandler.options & EXTUTIL_CLS ? LGREY_|_BLACK : BLACK_|_BLACK,
CFG->urlhandler.options & EXTUTIL_CURSOR,
pauseval
);
@@ -827,7 +827,7 @@ void UUDecode(GMsg* msg) {
SaveLines(overwrite ? MODE_WRITE : MODE_APPEND, infile, msg, 79);
}
if(AA->Mark.Count())
w_progress(MODE_QUIT, BLACK|_BLACK, 0, 0, NULL);
w_progress(MODE_QUIT, BLACK_|_BLACK, 0, 0, NULL);
}
else if(source == WRITE_CURRENT) {
AA->LoadMsg(msg, msg->msgno, 79);
@@ -903,7 +903,7 @@ void Make_Userlist(const char* userlist) {
}
}
throw_free(crclist);
w_progress(MODE_QUIT, BLACK|_BLACK, 0, 0, NULL);
w_progress(MODE_QUIT, BLACK_|_BLACK, 0, 0, NULL);
fclose(fp);
}
@@ -982,7 +982,7 @@ void make_pathreport(const char* reportfile) {
fp.printf("%s\n", path.c_str());
}
}
w_progress(MODE_QUIT, BLACK|_BLACK, 0, 0, NULL);
w_progress(MODE_QUIT, BLACK_|_BLACK, 0, 0, NULL);
fp.fclose();
ResetMsg(msg);
throw_free(msg);

2
golded3/gesoup.cpp
View File

@@ -591,7 +591,7 @@ int ImportSOUP() {
if(importedmsgs and *CFG->soupreplylinker) {
sprintf(buf, LNG->Replylinker, CFG->soupreplylinker);
ShellToDos(CFG->soupreplylinker, buf, LGREY|_BLACK, YES);
ShellToDos(CFG->soupreplylinker, buf, LGREY_|_BLACK, YES);
}
}
}

22
golded3/gesrch.cpp
View File

@@ -429,9 +429,9 @@ void search_mgr_form::select(gstrarray& menu, const char* title) {
GMnu m;
m.Init();
m.SetColor(LGREY, LGREY, LGREY, _LGREY, DGREY);
m.SetTitle(title, YELLOW);
m.SetBorder(0, LGREY);
m.SetColor(LGREY_|_BLACK, LGREY_|_BLACK, LGREY_|_BLACK, BLACK_|_LGREY, DGREY_|_BLACK);
m.SetTitle(title, YELLOW_|_BLACK);
m.SetBorder(0, LGREY_|_BLACK);
m.SetPos(srow, scol);
m.SetMask(0);
m.Begin();
@@ -526,14 +526,14 @@ void AdvancedSearch(GMsg*, int&, int&) {
int widths[3] = { 55, 5, 7 };
int field_widths[3] = { 100, 5, 7 };
int border_type = BT_SINGLE;
vattr title_color = YELLOW | _BLUE;
vattr heading_color = YELLOW | _BLUE;
vattr window_color = LGREY | _BLUE;
vattr border_color = LBLUE | _BLUE;
vattr edit_color = YELLOW | _BLUE;
vattr idle_color = LGREY | _BLUE;
vattr active_color = WHITE | _BLUE;
vattr shadow_color = DGREY | _BLACK;
vattr title_color = YELLOW_|_BLUE;
vattr heading_color = YELLOW_|_BLUE;
vattr window_color = LGREY_ |_BLUE;
vattr border_color = LBLUE_ |_BLUE;
vattr edit_color = YELLOW_|_BLUE;
vattr idle_color = LGREY_ |_BLUE;
vattr active_color = WHITE_ |_BLUE;
vattr shadow_color = DGREY_ |_BLACK;
widths[0] = width - 3*2 - 2 - 5 - 7 - 2;

2
golded3/geusrbse.cpp
View File

@@ -167,7 +167,7 @@ void guserbase::unlock() {
void guserbase::open() {
window.openxy(ypos, xpos, ylen+2, xlen+2, btype, battr, LGREY);
window.openxy(ypos, xpos, ylen+2, xlen+2, btype, battr, LGREY_|_BLACK);
cwidth = (xlen-28) / 2;
window.message(LNG->UserHeaderName, TP_BORD, 3, tattr);

8
golded3/geutil2.cpp
View File

@@ -283,9 +283,9 @@ void ScreenBlankIdle() {
if(blanked and (whb == -1)) {
wascurhid = vcurhidden();
vcurhide();
if (C_BACKB != (BLACK|_BLACK))
gvid->setoverscan(BLACK|_BLACK);
whb = wopen(0,0,MAXROW-1,MAXCOL-1, 5, LGREY, LGREY);
if (C_BACKB != (BLACK_|_BLACK))
gvid->setoverscan(BLACK_|_BLACK);
whb = wopen(0,0,MAXROW-1,MAXCOL-1, 5, LGREY_|_BLACK, LGREY_|_BLACK);
if(CFG->screenblankertype == BLANK_SLIDEWIN)
whh = wopen_(ry, rx, windowheight, blankmsglen+2, W_BINFO, C_INFOB, C_INFOW);
lastmoved = gkbd.tickvalue;
@@ -300,7 +300,7 @@ void ScreenBlankIdle() {
wactiv_(whb);
wclose();
whb = -1;
if (C_BACKB != (BLACK|_BLACK))
if (C_BACKB != (BLACK_|_BLACK))
gvid->setoverscan(C_BACKB);
if(wascurhid)
vcurhide();

16
golded3/geview.cpp
View File

@@ -39,10 +39,10 @@ GMsgHeaderView::GMsgHeaderView() {
alive = false;
at_row = at_column = width = height = 0;
border_type = gwindow::bordertype_none;
window_color = from_color = to_color = subject_color = BLUE|_LGREY;
location_color = BLUE|_LGREY;
title_color = highlight_color = RED|_LGREY;
border_color = YELLOW|_LGREY;
window_color = from_color = to_color = subject_color = BLUE_|_LGREY;
location_color = BLUE_|_LGREY;
title_color = highlight_color = RED_|_LGREY;
border_color = YELLOW_|_LGREY;
}
@@ -367,10 +367,10 @@ GMsgBodyView::GMsgBodyView() {
scrollbar_visible = false;
at_row = at_column = width = height = visible_width = 0;
border_type = gwindow::bordertype_none;
window_color = BLACK|_LGREY;
highlight_color = WHITE|_RED;
scrollbar_color = DGREY|_LGREY;
border_color = YELLOW|_LGREY;
window_color = BLACK_|_LGREY;
highlight_color = WHITE_|_RED;
scrollbar_color = DGREY_|_LGREY;
border_color = YELLOW_|_LGREY;
}