diff --git a/ChangeLog b/ChangeLog index d03f3719..28d4728e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ $Id$ +v0.71.0 27-Oct-2004 + + v0.70.0 06-Jun-2004 - 26-Oct-2004. upgrade: diff --git a/README.developer b/README.developer index 6023d7cb..52984d0b 100644 --- a/README.developer +++ b/README.developer @@ -29,6 +29,6 @@ mbsebbs-0_51_00_current 09-Feb-2004 Start 0.51 development. mbsebbs-0_60_00_release 04-Jun-2004 Version 0.60.0 release. mbsebbs-0_61_00_current 06-Jun-2004 Start 0.61 development. mbsebbs-0_70_00_release 26-Oct-2004 Version 0.70.0 release. - +mbsebbs-0_71_00_current 27-Oct-2004 Start 0.71 development. Michiel. diff --git a/TODO b/TODO index a50ec1c8..ccf5852e 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,6 @@ $Id$ - MBSE BBS V0.70.0 TODO list. + MBSE BBS V0.71.0 TODO list. --------------------------- These are a list of things that must be implemented one way or diff --git a/configure b/configure index e6302cc8..545a08c9 100755 --- a/configure +++ b/configure @@ -1309,7 +1309,7 @@ SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbnntp mbtask mbsetup unix lang example PACKAGE="mbsebbs" MAJOR="0" -MINOR="70" +MINOR="71" REVISION="0" VERSION="$MAJOR.$MINOR.$REVISION" COPYRIGHT="Copyright (C) 1997-2004 Michiel Broek, All Rights Reserved" diff --git a/configure.in b/configure.in index b6ce7c90..f694fe29 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ dnl After changeing the version number, run autoconf! dnl PACKAGE="mbsebbs" MAJOR="0" -MINOR="70" +MINOR="71" REVISION="0" VERSION="$MAJOR.$MINOR.$REVISION" COPYRIGHT="Copyright (C) 1997-2004 Michiel Broek, All Rights Reserved" diff --git a/lib/mbselib.h b/lib/mbselib.h index c82e49f4..be28f6c6 100644 --- a/lib/mbselib.h +++ b/lib/mbselib.h @@ -2278,18 +2278,11 @@ char *TearLine(void); /* * From term.c */ -void TermInit(int, int, int); -void Enter(int); -void pout(int, int, char *); -void poutCR(int, int, char *); -void poutCenter(int,int,char *); -void colour(int, int); -void Center(char *); -void clear(void); -void locate(int, int); -void fLine(int); -void sLine(void); -void mvprintw(int, int, const char *, ...); +void mbse_TermInit(int, int, int); +void mbse_colour(int, int); +void mbse_clear(void); +void mbse_locate(int, int); +void mbse_mvprintw(int, int, const char *, ...); diff --git a/lib/msg.c b/lib/msg.c index 0a15db5a..a1fe3e4f 100644 --- a/lib/msg.c +++ b/lib/msg.c @@ -324,6 +324,55 @@ typedef struct { +/* + * Changes ansi background and foreground color + */ +void msg_colour(int, int); +void msg_colour(int fg, int bg) +{ + int att=0, fore=37, back=40; + + if (fg<0 || fg>31 || bg<0 || bg>7) { + fprintf(stdout, "ANSI: Illegal colour specified: %i, %i\n", fg, bg); + fflush(stdout); + return; + } + fprintf(stdout, "ESC["); + + if ( fg > WHITE) { + fprintf(stdout, "5;"); + fg-= 16; + } + if (fg > LIGHTGRAY) { + att=1; + fg=fg-8; + } + + if (fg == BLACK) fore=30; + else if (fg == BLUE) fore=34; + else if (fg == GREEN) fore=32; + else if (fg == CYAN) fore=36; + else if (fg == RED) fore=31; + else if (fg == MAGENTA) fore=35; + else if (fg == BROWN) fore=33; + else fore=37; + + if (bg == BLUE) back=44; + else if (bg == GREEN) back=42; + else if (bg == CYAN) back=46; + else if (bg == RED) back=41; + else if (bg == MAGENTA) back=45; + else if (bg == BROWN) back=43; + else if (bg == LIGHTGRAY) back=47; + else back=40; + + fprintf(stdout, "%d;%d;%dm", att, fore, back); + fflush(stdout); +} + + + + /* * Link messages in one area. * Returns -1 if error, else the number of linked messages. @@ -340,9 +389,9 @@ int Msg_Link(char *Path, int do_quiet, int slow_util) } if (!do_quiet) { - colour(12, 0); + msg_colour(12, 0); printf(" (linking)"); - colour(13, 0); + msg_colour(13, 0); fflush(stdout); } @@ -439,6 +488,8 @@ int Msg_Link(char *Path, int do_quiet, int slow_util) return msg_link; } + + /* * Fgets() is like fgets() but never returns the line terminator * at end of line and handles that line terminators: diff --git a/lib/rearc.c b/lib/rearc.c index 44f84cc7..279a9965 100644 --- a/lib/rearc.c +++ b/lib/rearc.c @@ -44,14 +44,14 @@ int rearc(char *filename, char *arctype, int do_quiet) Syslog('f', "rearc(%s, %s)", filename, arctype); if (!do_quiet) { - colour(12, 0); + mbse_colour(12, 0); printf(" ReArc file %s ", filename); fflush(stdout); } if (strchr(filename, '/') == NULL) { if (!do_quiet) { - colour(LIGHTRED, BLACK); + mbse_colour(LIGHTRED, BLACK); printf(" no path in filename\n"); } Syslog('+', "rearc(%s, %s), no path in filename", filename, arctype); @@ -60,7 +60,7 @@ int rearc(char *filename, char *arctype, int do_quiet) if ((unarc = unpacker(filename)) == NULL) { if (!do_quiet) { - colour(LIGHTRED, BLACK); + mbse_colour(LIGHTRED, BLACK); printf(" unknown archive type\n"); } return -1; @@ -68,7 +68,7 @@ int rearc(char *filename, char *arctype, int do_quiet) if (!getarchiver(unarc)) { if (!do_quiet) { - colour(LIGHTRED, BLACK); + mbse_colour(LIGHTRED, BLACK); printf(" no unarchiver available\n"); } Syslog('+', "rearc(%s, %s), no unarchiver available", filename, arctype); @@ -78,7 +78,7 @@ int rearc(char *filename, char *arctype, int do_quiet) uncmd = xstrcpy(archiver.funarc); if ((uncmd == NULL) || (uncmd == "")) { if (!do_quiet) { - colour(LIGHTRED, BLACK); + mbse_colour(LIGHTRED, BLACK); printf(" no unarchive command available\n"); } Syslog('+', "rearc(%s, %s), no unarchive command available", filename, arctype); @@ -93,7 +93,7 @@ int rearc(char *filename, char *arctype, int do_quiet) if (!getarchiver(arctype)) { if (!do_quiet) { - colour(LIGHTRED, BLACK); + mbse_colour(LIGHTRED, BLACK); printf(" no archiver available\n"); } Syslog('+', "rearc(%s, %s), no archiver available", filename, arctype); @@ -104,7 +104,7 @@ int rearc(char *filename, char *arctype, int do_quiet) if (strcmp(unarc, archiver.name) == 0) { if (!do_quiet) { - colour(LIGHTRED, BLACK); + mbse_colour(LIGHTRED, BLACK); printf(" already in %s format\n", arctype); } Syslog('+', "rearc(%s, %s), already in %s format", filename, arctype, arctype); @@ -119,7 +119,7 @@ int rearc(char *filename, char *arctype, int do_quiet) arccmd = xstrcpy(archiver.farc); if ((arccmd == NULL) || (arccmd == "")) { if (!do_quiet) { - colour(LIGHTRED, BLACK); + mbse_colour(LIGHTRED, BLACK); printf(" no archive command available\n"); } Syslog('+', "rearc(%s, %s), no archive command available", filename, arctype); @@ -145,7 +145,7 @@ int rearc(char *filename, char *arctype, int do_quiet) } if (!do_quiet) { - colour(11, 0); + mbse_colour(11, 0); printf("\rUnpacking file %s ", filename); fflush(stdout); } @@ -165,7 +165,7 @@ int rearc(char *filename, char *arctype, int do_quiet) } if (!do_quiet) { - colour(10, 0); + mbse_colour(10, 0); printf("\r Packing file %s ", newname); } diff --git a/lib/term.c b/lib/term.c index df6bc3c7..368a314a 100644 --- a/lib/term.c +++ b/lib/term.c @@ -39,7 +39,7 @@ int termx = 80; int termy = 24; -void TermInit(int mode, int x, int y) +void mbse_TermInit(int mode, int x, int y) { termmode = mode; termx = x; @@ -48,52 +48,10 @@ void TermInit(int mode, int x, int y) -/* - * Function will print about of enters specified - */ -void Enter(int num) -{ - int i; - - for (i = 0; i < num; i++) - fprintf(stdout, "\n"); - fflush(stdout); -} - - - - -void pout(int fg, int bg, char *Str) -{ - colour(fg, bg); - fprintf(stdout, Str); - fflush(stdout); -} - - - -void poutCenter(int fg, int bg, char *Str) -{ - colour(fg, bg); - Center(Str); -} - - - -void poutCR(int fg, int bg, char *Str) -{ - colour(fg, bg); - fputs(Str, stdout); - fprintf(stdout, "\n"); - fflush(stdout); -} - - - /* * Changes ansi background and foreground color */ -void colour(int fg, int bg) +void mbse_colour(int fg, int bg) { if (termmode == 1) { @@ -140,42 +98,16 @@ void colour(int fg, int bg) -void Center(char *string) -{ - int Strlen; - int Maxlen = termx; - int i, x, z; - char *Str; - - Str = calloc(1024, sizeof(char)); - Strlen = strlen(string); - - if (Strlen == Maxlen) - fprintf(stdout, "%s\n", string); - else { - x = Maxlen - Strlen; - z = x / 2; - for (i = 0; i < z; i++) - strcat(Str, " "); - strcat(Str, string); - fprintf(stdout, "%s\n", Str); - } - - fflush(stdout); - free(Str); -} - - - -void clear() +void mbse_clear() { if (termmode == 1) { - colour(LIGHTGRAY, BLACK); + mbse_colour(LIGHTGRAY, BLACK); fprintf(stdout, ANSI_HOME); fprintf(stdout, ANSI_CLEAR); - fflush(stdout); - } else - Enter(1); + } else { + fprintf(stdout, "\n"); + } + fflush(stdout); } @@ -183,7 +115,7 @@ void clear() /* * Moves cursor to specified position */ -void locate(int y, int x) +void mbse_locate(int y, int x) { if (termmode > 0) { if (y > termy || x > termx) { @@ -198,36 +130,10 @@ void locate(int y, int x) -void fLine(int Len) -{ - int x; - - if (termmode == 0) - for (x = 0; x < Len; x++) - fprintf(stdout, "-"); - - if (termmode == 1) - for (x = 0; x < Len; x++) - fprintf(stdout, "%c", 196); - - fprintf(stdout, " \n"); - fflush(stdout); -} - - - - -void sLine() -{ - fLine(termx -1); -} - - - /* * curses compatible functions */ -void mvprintw(int y, int x, const char *format, ...) +void mbse_mvprintw(int y, int x, const char *format, ...) { char *outputstr; va_list va_ptr; @@ -238,11 +144,10 @@ void mvprintw(int y, int x, const char *format, ...) vsprintf(outputstr, format, va_ptr); va_end(va_ptr); - locate(y, x); + mbse_locate(y, x); fprintf(stdout, outputstr); free(outputstr); fflush(stdout); } - diff --git a/mbcico/mbcico.c b/mbcico/mbcico.c index 4eb7ba52..d8b8b350 100644 --- a/mbcico/mbcico.c +++ b/mbcico/mbcico.c @@ -181,7 +181,7 @@ int main(int argc, char *argv[]) InitConfig(); InitNode(); InitFidonet(); - TermInit(1, 80, 25); + mbse_TermInit(1, 80, 25); t_start = c_start = c_end = time(NULL); InitClient(pw->pw_name, (char *)"mbcico", CFG.location, CFG.logfile, diff --git a/mbcico/mbout.c b/mbcico/mbout.c index 385ecd4c..8b176ff6 100644 --- a/mbcico/mbout.c +++ b/mbcico/mbout.c @@ -59,9 +59,9 @@ void ProgName() if (do_quiet) return; - colour(15, 0); + mbse_colour(15, 0); printf("\nMBOUT: MBSE BBS %s Outbound Manager\n", VERSION); - colour(14, 0); + mbse_colour(14, 0); printf(" %s\n", COPYRIGHT); } @@ -97,7 +97,7 @@ void die(int onsig) do_quiet = FALSE; if (!do_quiet) - colour(3, 0); + mbse_colour(3, 0); if (onsig) { if (onsig <= NSIG) @@ -110,7 +110,7 @@ void die(int onsig) Syslog(' ', "MBOUT finished in %s", t_elapsed(t_start, t_end)); if (!do_quiet) { - colour(7, 0); + mbse_colour(7, 0); printf("\n"); } ExitClient(onsig); @@ -124,11 +124,11 @@ void Help() do_quiet = FALSE; ProgName(); - colour(11, 0); + mbse_colour(11, 0); printf("\nUsage: mbout [command] \n\n"); - colour(9, 0); + mbse_colour(9, 0); printf(" Commands are:\n\n"); - colour(3, 0); + mbse_colour(3, 0); printf(" a att Attach a file to a node\n"); printf(" n node Show nodelist information\n"); printf(" p poll [node..node] Poll node(s) (always crash)\n"); @@ -139,11 +139,11 @@ void Help() printf("\n"); printf(" Should be in domain form, e.g. f16.n2801.z2.domain\n"); printf(" Flavor's are: crash | immediate | normal | hold\n"); - colour(9, 0); + mbse_colour(9, 0); printf("\n Options are:\n\n"); - colour(3, 0); + mbse_colour(3, 0); printf(" -quiet Quiet mode\n"); - colour(7, 0); + mbse_colour(7, 0); die(MBERR_OK); } @@ -154,7 +154,7 @@ void Fatal(char *msg, int error) { show_log = TRUE; if (!do_quiet) { - colour(12, 0); + mbse_colour(12, 0); printf("%s\n", msg); } WriteError(msg); @@ -177,7 +177,7 @@ int main(int argc, char *argv[]) InitConfig(); InitNode(); InitFidonet(); - TermInit(1, 80, 25); + mbse_TermInit(1, 80, 25); t_start = time(NULL); umask(002); @@ -234,7 +234,7 @@ int main(int argc, char *argv[]) free(cmd); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("\n"); } diff --git a/mbcico/nlinfo.c b/mbcico/nlinfo.c index 605d4b36..9195af33 100644 --- a/mbcico/nlinfo.c +++ b/mbcico/nlinfo.c @@ -50,7 +50,7 @@ int nlinfo(faddr *addr) nlent = getnlent(addr); if (nlent->pflag != NL_DUMMY) { - colour(3, 0); + mbse_colour(3, 0); printf("System : %s\n", nlent->name); printf("Sysop : %s@%s\n", nlent->sysop, ascinode(addr, 0x3f)); printf("Location : %s\n", nlent->location); diff --git a/mbcico/outstat.c b/mbcico/outstat.c index 8ec0a3fd..a45b7660 100644 --- a/mbcico/outstat.c +++ b/mbcico/outstat.c @@ -282,9 +282,9 @@ int outstat() } if (!do_quiet) { - colour(10, 0); + mbse_colour(10, 0); printf("flavor try size age address\n"); - colour(3, 0); + mbse_colour(3, 0); } Syslog('+', "Flavor Try Size Age Address"); diff --git a/mbfido/announce.c b/mbfido/announce.c index ab75ba6b..ebb38a32 100644 --- a/mbfido/announce.c +++ b/mbfido/announce.c @@ -67,7 +67,7 @@ void Uploads() IsDoing("Check uploads"); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf(" Checking uploads...\n"); } @@ -373,7 +373,7 @@ int Announce() int i, groups, any; if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("Announce new files\n"); } diff --git a/mbfido/filefind.c b/mbfido/filefind.c index 540aaa3d..636c893b 100644 --- a/mbfido/filefind.c +++ b/mbfido/filefind.c @@ -94,11 +94,11 @@ void ScanArea(ff_list **ffl) unsigned long Number, Highest; if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("\r %-40s", scanmgr.Comment); - colour(12, 0); + mbse_colour(12, 0); printf(" (Scanning) "); - colour(13, 0); + mbse_colour(13, 0); fflush(stdout); } Syslog('+', "Scanning %s", scanmgr.Comment); @@ -267,12 +267,12 @@ void ScanFiles(ff_list *tmp) Syslog('+', "ff: %s [%s]", temp, tmp->subject); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); temp[40] = '\0'; printf("\r %-40s", temp); - colour(12, 0); + mbse_colour(12, 0); printf(" (Searching)"); - colour(13, 0); + mbse_colour(13, 0); fflush(stdout); } @@ -363,7 +363,7 @@ void ScanFiles(ff_list *tmp) if (found) { if (!do_quiet) { - colour(14, 0); + mbse_colour(14, 0); printf(" (Replying)"); fflush(stdout); } @@ -488,7 +488,7 @@ int Filefind() IsDoing("FileFind"); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("Processing FileFind requests\n"); } Syslog('+', "Processing FileFind requests"); @@ -520,7 +520,7 @@ int Filefind() if (Replies) rc = TRUE; if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("Processed %d requests, created %d replies\n", Requests, Replies); } } diff --git a/mbfido/makestat.c b/mbfido/makestat.c index 24563449..fde3223b 100644 --- a/mbfido/makestat.c +++ b/mbfido/makestat.c @@ -121,7 +121,7 @@ void MakeStat(void) } if (!do_quiet) { - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); printf("\rMaking statistical HTML pages"); fflush(stdout); } diff --git a/mbfido/mbaff.c b/mbfido/mbaff.c index 459231a8..7529d795 100644 --- a/mbfido/mbaff.c +++ b/mbfido/mbaff.c @@ -53,9 +53,9 @@ void ProgName(void) if (do_quiet) return; - colour(15, 0); + mbse_colour(15, 0); printf("\nMBAFF: MBSE BBS %s Announce new files and FileFind\n", VERSION); - colour(14, 0); + mbse_colour(14, 0); printf(" %s\n", COPYRIGHT); } @@ -77,7 +77,7 @@ void die(int onsig) Syslog(' ', "MBAFF finished in %s", t_elapsed(t_start, t_end)); if (!do_quiet) { - colour(7, 0); + mbse_colour(7, 0); printf("\n"); } ExitClient(onsig); @@ -93,7 +93,7 @@ int main(int argc, char **argv) struct tm *t; InitConfig(); - TermInit(1, 80, 25); + mbse_TermInit(1, 80, 25); t_start = time(NULL); t = localtime(&t_start); Diw = t->tm_wday; @@ -178,18 +178,18 @@ void Help(void) do_quiet = FALSE; ProgName(); - colour(11, 0); + mbse_colour(11, 0); printf("\nUsage: mbaff [command] \n\n"); - colour(9, 0); + mbse_colour(9, 0); printf(" Commands are:\n\n"); - colour(3, 0); + mbse_colour(3, 0); printf(" a announce Announce new files\n"); printf(" f filefind FileFind service\n"); - colour(9, 0); + mbse_colour(9, 0); printf("\n Options are:\n\n"); - colour(3, 0); + mbse_colour(3, 0); printf(" -q -quiet Quiet mode\n"); - colour(7, 0); + mbse_colour(7, 0); printf("\n"); die(MBERR_COMMANDLINE); } diff --git a/mbfido/mbdiff.c b/mbfido/mbdiff.c index 2f990660..78ded4a3 100644 --- a/mbfido/mbdiff.c +++ b/mbfido/mbdiff.c @@ -58,9 +58,9 @@ void ProgName(void) if (do_quiet) return; - colour(15, 0); + mbse_colour(15, 0); printf("\nMBDIFF: MBSE BBS %s Nodelist diff processor\n", VERSION); - colour(14, 0); + mbse_colour(14, 0); printf(" %s\n", COPYRIGHT); } @@ -100,7 +100,7 @@ void die(int onsig) Syslog(' ', "MBDIFF finished in %s", t_elapsed(t_start, t_end)); if (!do_quiet) { - colour(7, 0); + mbse_colour(7, 0); printf("\n"); } ExitClient(onsig); @@ -117,7 +117,7 @@ int main(int argc, char **argv) struct dirent *de; InitConfig(); - TermInit(1, 80, 25); + mbse_TermInit(1, 80, 25); t_start = time(NULL); umask(002); @@ -165,7 +165,7 @@ int main(int argc, char **argv) free(cmd); if (!do_quiet) { - colour(12, 0); + mbse_colour(12, 0); printf("\n"); } @@ -363,7 +363,7 @@ int main(int argc, char **argv) Syslog('+', "Apply %s with %s to %s", onl, ond, nn); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("Apply %s with %s to %s\n", onl, ond, nn); } rc = apply(onl, ond, nn); @@ -433,20 +433,20 @@ void Help(void) do_quiet = FALSE; ProgName(); - colour(11, 0); + mbse_colour(11, 0); printf("\nUsage: mbdiff [nodelist] [nodediff] \n\n"); - colour(3, 0); + mbse_colour(3, 0); printf(" The nodelist must be the full path and filename\n"); printf(" without the dot and daynumber digits to the working\n"); printf(" directory of that nodelist.\n"); printf(" The nodediff must be the full path and filename\n"); printf(" to the (compressed) nodediff file in the download\n"); printf(" directory.\n"); - colour(9, 0); + mbse_colour(9, 0); printf("\n Options are:\n\n"); - colour(3, 0); + mbse_colour(3, 0); printf(" -quiet Quiet mode\n"); - colour(7, 0); + mbse_colour(7, 0); printf("\n"); die(MBERR_COMMANDLINE); } @@ -539,7 +539,7 @@ int apply(char *nl, char *nd, char *nn) if ((rc != 0) && !do_quiet) { show_log = TRUE; - colour(12, 0); + mbse_colour(12, 0); } if ((rc == 0) && (mycrc != theircrc)) diff --git a/mbfido/mbfadopt.c b/mbfido/mbfadopt.c index ef6f7716..46a42264 100644 --- a/mbfido/mbfadopt.c +++ b/mbfido/mbfadopt.c @@ -56,7 +56,7 @@ void AdoptFile(int Area, char *File, char *Description) Syslog('f', "Adopt(%d, %s, %s)", Area, MBSE_SS(File), MBSE_SS(Description)); if (!do_quiet) - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); if (LoadAreaRec(Area) == FALSE) die(MBERR_INIT_ERROR); diff --git a/mbfido/mbfcheck.c b/mbfido/mbfcheck.c index 9938e605..388f6112 100644 --- a/mbfido/mbfcheck.c +++ b/mbfido/mbfcheck.c @@ -80,7 +80,7 @@ void Check(long AreaNr) newdir = calloc(PATH_MAX, sizeof(char)); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("Checking file database...\n"); } diff --git a/mbfido/mbfdel.c b/mbfido/mbfdel.c index 74b983c1..70c8d666 100644 --- a/mbfido/mbfdel.c +++ b/mbfido/mbfdel.c @@ -54,7 +54,7 @@ void Delete(int UnDel, int Area, char *File) IsDoing("Undelete file"); else IsDoing("Delete file"); - colour(LIGHTRED, BLACK); + mbse_colour(LIGHTRED, BLACK); /* * Check area @@ -80,7 +80,7 @@ void Delete(int UnDel, int Area, char *File) die(MBERR_GENERAL); - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); strcpy(mask, re_mask(File, FALSE)); if (re_comp(mask)) die(MBERR_GENERAL); diff --git a/mbfido/mbfido.c b/mbfido/mbfido.c index f22f8758..0a304ed5 100644 --- a/mbfido/mbfido.c +++ b/mbfido/mbfido.c @@ -110,11 +110,11 @@ void Help(void) do_quiet = FALSE; ProgName(); - colour(LIGHTCYAN, BLACK); + mbse_colour(LIGHTCYAN, BLACK); printf("\nUsage: mbfido [command(s)] \n\n"); - colour(LIGHTBLUE, BLACK); + mbse_colour(LIGHTBLUE, BLACK); printf(" Commands are:\n\n"); - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); printf(" a areas Process Areas taglists\n"); printf(" m mail ... MTA Mail mode\n"); printf(" ne news Scan for new news\n"); @@ -127,9 +127,9 @@ void Help(void) printf(" to toss Toss incoming Fido mail\n"); printf(" u uucp Process UUCP batchfile\n"); printf(" w web Create WWW statistics\n\n"); - colour(LIGHTBLUE, BLACK); + mbse_colour(LIGHTBLUE, BLACK); printf(" Options are:\n\n"); - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); printf(" -f -full Full Mailscan\n"); printf(" -l -learn Learn News dupes\n"); printf(" -noc -nocrc Skip CRC checking\n"); @@ -137,7 +137,7 @@ void Help(void) printf(" -q -quiet Quiet mode\n"); printf(" -uns -unsecure Toss unsecure\n"); printf(" -unp -unprotect Toss unprotected inbound\n"); - colour(LIGHTGRAY, BLACK); + mbse_colour(LIGHTGRAY, BLACK); ExitClient(MBERR_COMMANDLINE); } @@ -151,9 +151,9 @@ void ProgName(void) if (do_quiet) return; - colour(WHITE, BLACK); + mbse_colour(WHITE, BLACK); printf("\nMBFIDO: MBSE BBS %s - Fidonet File and Mail processor\n", VERSION); - colour(YELLOW, BLACK); + mbse_colour(YELLOW, BLACK); printf(" %s\n", COPYRIGHT); } @@ -196,7 +196,7 @@ void die(int onsig) if (!do_quiet) { show_log = TRUE; - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); } if (onsig) { @@ -246,7 +246,7 @@ void die(int onsig) Syslog(' ', "MBFIDO finished in %s", t_elapsed(t_start, t_end)); if (!do_quiet) - colour(LIGHTGRAY, BLACK); + mbse_colour(LIGHTGRAY, BLACK); ExitClient(onsig); } @@ -298,7 +298,7 @@ int main(int argc, char **argv) InitTic(); InitUser(); InitFidonet(); - TermInit(1, 80, 25); + mbse_TermInit(1, 80, 25); t_start = time(NULL); t = localtime(&t_start); Diw = t->tm_wday; @@ -608,7 +608,7 @@ int main(int argc, char **argv) NewsUUCP(); if (do_areas) { if (!do_quiet) { - colour(LIGHTGREEN, BLACK); + mbse_colour(LIGHTGREEN, BLACK); printf("Are you sure to process all area lists [y/N] "); fflush(stdout); x = Getone(); diff --git a/mbfido/mbfile.c b/mbfido/mbfile.c index e36807f4..be3d80db 100644 --- a/mbfido/mbfile.c +++ b/mbfido/mbfile.c @@ -76,7 +76,7 @@ int main(int argc, char **argv) struct passwd *pw; InitConfig(); - TermInit(1, 80, 25); + mbse_TermInit(1, 80, 25); t_start = time(NULL); umask(002); diff --git a/mbfido/mbfimport.c b/mbfido/mbfimport.c index d1afe684..293b72e3 100644 --- a/mbfido/mbfimport.c +++ b/mbfido/mbfimport.c @@ -57,7 +57,7 @@ void ImportFiles(int Area) Syslog('f', "Import(%d)", Area); if (!do_quiet) - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); if (LoadAreaRec(Area) == FALSE) die(MBERR_INIT_ERROR); diff --git a/mbfido/mbfindex.c b/mbfido/mbfindex.c index f1a99ac4..94f0c146 100644 --- a/mbfido/mbfindex.c +++ b/mbfido/mbfindex.c @@ -328,7 +328,7 @@ void ReqIndex(void) IsDoing("Index files"); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("Create index files...\n"); } @@ -516,7 +516,7 @@ void HtmlIndex(char *Lang) IsDoing("Create html"); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("\rCreate html pages... \n"); } diff --git a/mbfido/mbfkill.c b/mbfido/mbfkill.c index fe0fcb40..66357676 100644 --- a/mbfido/mbfkill.c +++ b/mbfido/mbfkill.c @@ -63,7 +63,7 @@ void Kill(void) IsDoing("Kill files"); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("Kill/move files...\n"); } diff --git a/mbfido/mbflist.c b/mbfido/mbflist.c index abc75486..9879eca5 100644 --- a/mbfido/mbflist.c +++ b/mbfido/mbflist.c @@ -63,7 +63,7 @@ void ListFileAreas(int Area) columns = i; } - colour(LIGHTRED, BLACK); + mbse_colour(LIGHTRED, BLACK); sAreas = calloc(PATH_MAX, sizeof(char)); fAreas = calloc(PATH_MAX, sizeof(char)); sTic = calloc(PATH_MAX, sizeof(char)); @@ -110,7 +110,7 @@ void ListFileAreas(int Area) fdb_area = mbsedb_OpenFDB(Area, 30); fcount = 0; fsize = 0L; - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); printf("File listing of area %d, %s\n\n", Area, area.Name); printf("Short name Kb. File date Down Flg TIC Area Long name\n"); printf("------------ ----- ---------- ---- --- -------------------- "); @@ -118,7 +118,7 @@ void ListFileAreas(int Area) printf("-"); printf("\n"); - colour(LIGHTGRAY, BLACK); + mbse_colour(LIGHTGRAY, BLACK); while (fread(&fdb, fdbhdr.recsize, 1, fdb_area->fp) == 1) { sprintf(flags, "---"); @@ -137,7 +137,7 @@ void ListFileAreas(int Area) } fsize = fsize / 1024; - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); printf("------------------------------------------------------------"); for (i = 60; i < columns; i++) printf("-"); @@ -161,10 +161,10 @@ void ListFileAreas(int Area) } IsDoing("List fileareas"); - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); printf(" Area Files MByte File Group Area name\n"); printf("----- ----- ----- ------------ --------------------------------------------\n"); - colour(LIGHTGRAY, BLACK); + mbse_colour(LIGHTGRAY, BLACK); for (i = 1; i <= iAreas; i++) { fseek(pAreas, ((i-1) * areahdr.recsize) + areahdr.hdrsize, SEEK_SET); @@ -189,7 +189,7 @@ void ListFileAreas(int Area) } } - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); printf("----- ----- ----- ---------------------------------------------------------\n"); printf("%5d %5d %5ld \n", iTotal, tcount, tsize); fclose(pAreas); diff --git a/mbfido/mbfmove.c b/mbfido/mbfmove.c index 76d59a09..01cd7d06 100644 --- a/mbfido/mbfmove.c +++ b/mbfido/mbfmove.c @@ -52,7 +52,7 @@ void Move(int From, int To, char *File) struct _fdbarea *src_area = NULL; IsDoing("Move file"); - colour(LIGHTRED, BLACK); + mbse_colour(LIGHTRED, BLACK); if (From == To) { WriteError("Area numbers are the same"); @@ -172,7 +172,7 @@ void Move(int From, int To, char *File) } mbsedb_PackFDB(src_area); mbsedb_CloseFDB(src_area); - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); Syslog('+', "Move %s from %d to %d %s", File, From, To, rc ? "successfull":"failed"); if (!do_quiet) diff --git a/mbfido/mbfpack.c b/mbfido/mbfpack.c index e05632ab..c26f15c6 100644 --- a/mbfido/mbfpack.c +++ b/mbfido/mbfpack.c @@ -57,7 +57,7 @@ void PackFileBase(void) IsDoing("Pack filebase"); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("Packing file database...\n"); } diff --git a/mbfido/mbfrearc.c b/mbfido/mbfrearc.c index 6153f658..3c843f75 100644 --- a/mbfido/mbfrearc.c +++ b/mbfido/mbfrearc.c @@ -53,7 +53,7 @@ void ReArc(int Area, char *File) struct _fdbarea *fdb_area = NULL; IsDoing("ReArc file(s)"); - colour(LIGHTRED, BLACK); + mbse_colour(LIGHTRED, BLACK); /* * Check area @@ -88,7 +88,7 @@ void ReArc(int Area, char *File) if ((fdb_area = mbsedb_OpenFDB(Area, 30)) == NULL) die(MBERR_GENERAL); - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); strcpy(mask, re_mask(File, FALSE)); if (re_comp(mask)) die(MBERR_GENERAL); @@ -105,7 +105,7 @@ void ReArc(int Area, char *File) * Success, update the file entry */ if (!do_quiet) { - colour(9, 0); + mbse_colour(9, 0); printf("\r Update file %s ", temp); fflush(stdout); } @@ -203,7 +203,7 @@ void ReArc(int Area, char *File) break; // stop when something goes wrong } if (!do_quiet) { - colour(7, 0); + mbse_colour(7, 0); printf("\r"); for (i = 0; i < (strlen(temp) + 20); i++) printf(" "); diff --git a/mbfido/mbfsort.c b/mbfido/mbfsort.c index c7637f1e..8930a788 100644 --- a/mbfido/mbfsort.c +++ b/mbfido/mbfsort.c @@ -56,7 +56,7 @@ void SortFileBase(int Area) IsDoing("Sort filebase"); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); } sprintf(sAreas, "%s/etc/fareas.data", getenv("MBSE_ROOT")); diff --git a/mbfido/mbftoberep.c b/mbfido/mbftoberep.c index 545a4a3f..8803672b 100644 --- a/mbfido/mbftoberep.c +++ b/mbfido/mbftoberep.c @@ -55,7 +55,7 @@ void ToBeRep(void) IsDoing("Toberep"); - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); temp = calloc(PATH_MAX, sizeof(char)); sprintf(temp, "%s/etc/toberep.data", getenv("MBSE_ROOT")); if ((fp = fopen(temp, "r")) == NULL) { @@ -65,7 +65,7 @@ void ToBeRep(void) // 12345678901234567890123456789012345678901234567890123456789012345678901234567890 printf(" File echo Group File name Kbyte Date Announce\n"); printf("-------------------- ------------ ------------ ----- ---------- --------\n"); - colour(LIGHTGRAY, BLACK); + mbse_colour(LIGHTGRAY, BLACK); while (fread(&rep, sizeof(rep), 1, fp) == 1) { printf("%-20s %-12s %-12s %5ld %s %s\n", diff --git a/mbfido/mbfutil.c b/mbfido/mbfutil.c index fa76f24e..2a4d2990 100644 --- a/mbfido/mbfutil.c +++ b/mbfido/mbfutil.c @@ -50,9 +50,9 @@ void ProgName(void) if (do_quiet) return; - colour(WHITE, BLACK); + mbse_colour(WHITE, BLACK); printf("\nMBFILE: MBSE BBS %s File maintenance utility\n", VERSION); - colour(YELLOW, BLACK); + mbse_colour(YELLOW, BLACK); printf(" %s\n", COPYRIGHT); } @@ -94,7 +94,7 @@ void die(int onsig) Syslog(' ', "MBFILE finished in %s", t_elapsed(t_start, t_end)); if (!do_quiet) { - colour(LIGHTGRAY, BLACK); + mbse_colour(LIGHTGRAY, BLACK); fflush(stdout); } ExitClient(onsig); @@ -107,11 +107,11 @@ void Help(void) do_quiet = FALSE; ProgName(); - colour(LIGHTCYAN, BLACK); + mbse_colour(LIGHTCYAN, BLACK); printf("Usage: mbfile [command] \n\n"); - colour(LIGHTBLUE, BLACK); + mbse_colour(LIGHTBLUE, BLACK); printf(" Commands are:\n\n"); - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); printf(" a adopt [desc] Adopt file to area\n"); printf(" c check [area] Check filebase\n"); printf(" d delete \"\" Mark file(s) in area for deletion\n"); @@ -125,9 +125,9 @@ void Help(void) printf(" s sort Sort files in a file area\n"); printf(" t toberep Show toberep database\n"); printf(" u undelete \"\" Mark file(s) in area for undeletion\n"); - colour(LIGHTBLUE, BLACK); + mbse_colour(LIGHTBLUE, BLACK); printf("\n Options are:\n\n"); - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); printf(" -a -announce Suppress announce added files\n"); printf(" -q -quiet Quiet mode\n"); printf(" -v -virus Suppress virus scanning, use with care\n"); diff --git a/mbfido/mbindex.c b/mbfido/mbindex.c index 9eb40cdd..e1de5cfa 100644 --- a/mbfido/mbindex.c +++ b/mbfido/mbindex.c @@ -73,13 +73,13 @@ void Help(void) do_quiet = FALSE; ProgName(); - colour(LIGHTCYAN, BLACK); + mbse_colour(LIGHTCYAN, BLACK); printf("\nUsage: mbindex \n\n"); - colour(LIGHTBLUE, BLACK); + mbse_colour(LIGHTBLUE, BLACK); printf(" Options are:\n\n"); - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); printf(" -quiet Quiet mode\n"); - colour(LIGHTGRAY, BLACK); + mbse_colour(LIGHTGRAY, BLACK); printf("\n"); die(MBERR_COMMANDLINE); } @@ -94,11 +94,11 @@ void ProgName(void) if (do_quiet) return; - colour(WHITE, BLACK); + mbse_colour(WHITE, BLACK); printf("\nMBINDEX: MBSE BBS %s Nodelist Index Compiler\n", VERSION); - colour(YELLOW, BLACK); + mbse_colour(YELLOW, BLACK); printf(" %s\n", COPYRIGHT); - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); } @@ -111,7 +111,7 @@ void die(int onsig) ulockprogram((char *)"mbindex"); if (!do_quiet) { - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); show_log = TRUE; } @@ -129,7 +129,7 @@ void die(int onsig) Syslog(' ', "MBINDEX finished in %s", t_elapsed(t_start, t_end)); if (!do_quiet) - colour(LIGHTGRAY, BLACK); + mbse_colour(LIGHTGRAY, BLACK); ExitClient(onsig); } @@ -144,7 +144,7 @@ int main(int argc,char *argv[]) InitConfig(); InitFidonet(); - TermInit(1, 80, 25); + mbse_TermInit(1, 80, 25); t_start = time(NULL); umask(002); @@ -873,7 +873,7 @@ int nodebld(void) } if (!do_quiet) { - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); printf("\n"); } diff --git a/mbfido/mbmsg.c b/mbfido/mbmsg.c index 6fadec16..96f30783 100644 --- a/mbfido/mbmsg.c +++ b/mbfido/mbmsg.c @@ -67,11 +67,11 @@ void ProgName() if (do_quiet) return; - colour(15, 0); + mbse_colour(15, 0); printf("\nMBMSG: MBSE BBS %s - Message Base Maintenance Utility\n", VERSION); - colour(14, 0); + mbse_colour(14, 0); printf(" %s\n", COPYRIGHT); - colour(7, 0); + mbse_colour(7, 0); } @@ -85,7 +85,7 @@ int main(int argc, char **argv) InitConfig(); - TermInit(1, 80, 25); + mbse_TermInit(1, 80, 25); oldmask = umask(007); t_start = time(NULL); @@ -159,7 +159,7 @@ int main(int argc, char **argv) if (!do_quiet) { printf("\n"); - colour(3, 0); + mbse_colour(3, 0); } if (do_index || do_link || do_kill || do_pack) { @@ -183,19 +183,19 @@ void Help() do_quiet = FALSE; ProgName(); - colour(12, 0); + mbse_colour(12, 0); printf("\n Usage: mbmsg [command(s)] \n\n"); - colour(9, 0); + mbse_colour(9, 0); printf(" Commands are:\n\n"); - colour(3, 0); + mbse_colour(3, 0); // printf(" i index Create new index files\n"); printf(" l link Link messages by subject\n"); printf(" k kill Kill messages (age & count)\n"); printf(" pa pack Pack deleted messages\n"); printf(" po post <#> Post file in message area #\n\n"); - colour(9, 0); + mbse_colour(9, 0); printf(" Options are:\n\n"); - colour(3, 0); + mbse_colour(3, 0); printf(" -a -area <#> Process area <#> only\n"); printf(" -q -quiet Quiet mode\n"); @@ -210,7 +210,7 @@ void die(int onsig) signal(onsig, SIG_IGN); if (!do_quiet) { printf("\r"); - colour(3, 0); + mbse_colour(3, 0); } if (MsgBase.Locked) @@ -238,7 +238,7 @@ void die(int onsig) umask(oldmask); if (!do_quiet) { - colour(7, 0); + mbse_colour(7, 0); printf("\r \n"); } ExitClient(onsig); @@ -284,7 +284,7 @@ void DoMsgBase() die(MBERR_DISK_FULL); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("\r%5ld .. %-40s", do_area, msgs.Name); fflush(stdout); } @@ -314,7 +314,7 @@ void DoMsgBase() Nopper(); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("\r%5ld .. %-40s", arearec, msgs.Name); fflush(stdout); } @@ -351,7 +351,7 @@ void DoMsgBase() Nopper(); sprintf(Name, "User %s email area: mailbox", usrconfig.Name); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("\r .. %-40s", Name); fflush(stdout); } @@ -447,9 +447,9 @@ void KillArea(char *Path, char *Name, int DaysOld, int MaxMsgs, long Areanr) if (Msg_Open(Path)) { if (!do_quiet) { - colour(12, 0); + mbse_colour(12, 0); printf(" (Killing)"); - colour(13, 0); + mbse_colour(13, 0); fflush(stdout); } @@ -565,7 +565,7 @@ void PackArea(char *Path, long Areanr) if (Msg_Open(Path)) { if (!do_quiet) { - colour(12, 0); + mbse_colour(12, 0); printf(" (Packing)"); fflush(stdout); } diff --git a/mbfido/mgrutil.c b/mbfido/mgrutil.c index b1db25a3..09e9da5c 100644 --- a/mbfido/mgrutil.c +++ b/mbfido/mgrutil.c @@ -535,7 +535,7 @@ int Areas(void) Mgrlog("Process areas taglists"); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("Processing areas taglists...\n"); } @@ -552,7 +552,7 @@ int Areas(void) while ((fread(&mgroup, mgrouphdr.recsize, 1, gp)) == 1) { if (mgroup.Active && mgroup.AutoChange && strlen(mgroup.AreaFile) && mgroup.UpLink.zone && SearchNode(mgroup.UpLink)) { if (!do_quiet) { - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); printf("\rEcho group %-12s ", mgroup.Name); fflush(stdout); } @@ -573,7 +573,7 @@ int Areas(void) * Mark areas already present in the taglist. */ if (!do_quiet) { - colour(LIGHTRED, BLACK); + mbse_colour(LIGHTRED, BLACK); printf("(check missing areas)\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); fflush(stdout); } @@ -750,7 +750,7 @@ int Areas(void) while ((fread(&fgroup, fgrouphdr.recsize, 1, gp)) == 1) { if (fgroup.Active && fgroup.AutoChange && strlen(fgroup.AreaFile) && fgroup.UpLink.zone && SearchNode(fgroup.UpLink)) { if (!do_quiet) { - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); printf("\r TIC group %-12s ", fgroup.Name); fflush(stdout); } @@ -815,7 +815,7 @@ int Areas(void) * Mark areas already present in the taglist. */ if (!do_quiet) { - colour(LIGHTRED, BLACK); + mbse_colour(LIGHTRED, BLACK); printf("(check missing areas)\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); fflush(stdout); } diff --git a/mbfido/notify.c b/mbfido/notify.c index dfb40442..fb4d45d7 100644 --- a/mbfido/notify.c +++ b/mbfido/notify.c @@ -62,9 +62,9 @@ int Notify(char *Options) Syslog('+', "Notify \"%s\"", Options); if (!do_quiet) { - colour(9, 0); + mbse_colour(9, 0); printf("Writing notify messages\n"); - colour(3, 0); + mbse_colour(3, 0); } if (strlen(Options)) { diff --git a/mbfido/post.c b/mbfido/post.c index bbb4827e..044bedf5 100644 --- a/mbfido/post.c +++ b/mbfido/post.c @@ -51,7 +51,7 @@ int Post(char *To, long Area, char *Subj, char *File, char *Flavor) struct tm *t; if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("Post \"%s\" to \"%s\" in area %ld\n", File, To, Area); } diff --git a/mbfido/ptic.c b/mbfido/ptic.c index 00d79c6d..29a7d42d 100644 --- a/mbfido/ptic.c +++ b/mbfido/ptic.c @@ -91,7 +91,7 @@ int ProcessTic(fa_list *sbl) Temp = calloc(PATH_MAX, sizeof(char)); if (!do_quiet) { - colour(10, 0); + mbse_colour(10, 0); printf("Checking \b\b\b\b\b\b\b\b\b\b"); fflush(stdout); } diff --git a/mbfido/queue.c b/mbfido/queue.c index bd1d7256..86d16ad0 100644 --- a/mbfido/queue.c +++ b/mbfido/queue.c @@ -620,9 +620,9 @@ void flush_queue(void) IsDoing("Flush queue"); if (!do_quiet) { - colour(LIGHTBLUE, BLACK); + mbse_colour(LIGHTBLUE, BLACK); printf("Flushing outbound queue\n"); - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); } temp = calloc(PATH_MAX, sizeof(char)); diff --git a/mbfido/rnews.c b/mbfido/rnews.c index 29445c44..3b03d148 100644 --- a/mbfido/rnews.c +++ b/mbfido/rnews.c @@ -543,7 +543,7 @@ void NewsUUCP(void) IsDoing((char *)"UUCP Batch"); if (!do_quiet) { - colour(10, 0); + mbse_colour(10, 0); printf("Process UUCP Newsbatch\n"); } diff --git a/mbfido/scan.c b/mbfido/scan.c index a1b37a88..9690c429 100644 --- a/mbfido/scan.c +++ b/mbfido/scan.c @@ -148,9 +148,9 @@ void ScanFull() IsDoing("Scanning mail"); if (!do_quiet) { - colour(9, 0); + mbse_colour(9, 0); printf("Scanning mail\n"); - colour(3, 0); + mbse_colour(3, 0); fflush(stdout); } @@ -164,9 +164,9 @@ void ScanFull() Nopper(); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("\r%8s %-40s", usrconfig.Name, usrconfig.sUserName); - colour(13, 0); + mbse_colour(13, 0); fflush(stdout); } @@ -228,9 +228,9 @@ void ScanFull() Nopper(); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("\r%5ld .. %-40s", arearec, msgs.Name); - colour(13, 0); + mbse_colour(13, 0); fflush(stdout); } @@ -343,9 +343,9 @@ void ScanOne(char *path, unsigned long MsgNum) IsDoing("Scanning mail"); if (!do_quiet) { - colour(9, 0); + mbse_colour(9, 0); printf("Scanning mail\n"); - colour(3, 0); + mbse_colour(3, 0); fflush(stdout); } @@ -396,9 +396,9 @@ void ScanOne(char *path, unsigned long MsgNum) if ((msgs.Active) && (msgs.Type == ECHOMAIL || msgs.Type == NETMAIL || msgs.Type == NEWS)) { if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("\r%5ld .. %-40s", Area, msgs.Name); - colour(13, 0); + mbse_colour(13, 0); fflush(stdout); } @@ -491,9 +491,9 @@ int RescanOne(faddr *L, char *marea, unsigned long Num) IsDoing("ReScan mail"); if (!do_quiet) { - colour(9, 0); + mbse_colour(9, 0); printf("ReScan mail\n"); - colour(3, 0); + mbse_colour(3, 0); fflush(stdout); } @@ -520,9 +520,9 @@ int RescanOne(faddr *L, char *marea, unsigned long Num) if ((msgs.Active) && ((msgs.Type == ECHOMAIL) || (msgs.Type == NEWS) || (msgs.Type == LIST))) { if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("\r%5ld .. %-40s", Area, msgs.Name); - colour(13, 0); + mbse_colour(13, 0); fflush(stdout); } diff --git a/mbfido/scannews.c b/mbfido/scannews.c index 54b7e96a..b8f48e0f 100644 --- a/mbfido/scannews.c +++ b/mbfido/scannews.c @@ -191,7 +191,7 @@ void ScanNews(void) } if (!do_quiet) { - colour(10, 0); + mbse_colour(10, 0); printf("Scan for new news articles\n"); } @@ -216,7 +216,7 @@ void ScanNews(void) } Syslog('m', "Scan newsgroup: %s", Msgs.Newsgroup); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("\r%-40s", Msgs.Newsgroup); fflush(stdout); } diff --git a/mbfido/storeecho.c b/mbfido/storeecho.c index 359d1758..7484533a 100644 --- a/mbfido/storeecho.c +++ b/mbfido/storeecho.c @@ -104,7 +104,7 @@ int storeecho(faddr *f, faddr *t, time_t mdate, int flags, char *subj, char *msg echo_imp++; if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("\r%6u => %-40s\r", echo_in, msgs.Name); fflush(stdout); } diff --git a/mbfido/tic.c b/mbfido/tic.c index 50968edb..68116d58 100644 --- a/mbfido/tic.c +++ b/mbfido/tic.c @@ -355,7 +355,7 @@ int LoadTic(char *inb, char *tfn) * Show on screen what we are doing */ if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("\r"); for (i = 0; i < 79; i++) printf(" "); diff --git a/mbfido/tosspkt.c b/mbfido/tosspkt.c index 12ba01cd..4070fc73 100644 --- a/mbfido/tosspkt.c +++ b/mbfido/tosspkt.c @@ -268,7 +268,7 @@ int TossPkt(char *fn) FILE *pkt; if (!do_quiet) { - colour(10, 0); + mbse_colour(10, 0); printf("Tossing packet %s\n", fn); } diff --git a/mbfido/tracker.c b/mbfido/tracker.c index a36799c9..76a85604 100644 --- a/mbfido/tracker.c +++ b/mbfido/tracker.c @@ -712,7 +712,7 @@ void TestTracker(faddr *dest) addr.node = dest->node; addr.point = dest->point; - colour(7, 0); + mbse_colour(7, 0); Syslog('+', "Test route to %s", aka2str(addr)); rc = TrackMail(addr, &result); diff --git a/mbfido/unpack.c b/mbfido/unpack.c index f1883e23..9157e2cc 100644 --- a/mbfido/unpack.c +++ b/mbfido/unpack.c @@ -70,7 +70,7 @@ int unpack(char *fn) int rc = 0, ld; if (!do_quiet) { - colour(11, 0); + mbse_colour(11, 0); printf("Unpacking file %s\n", fn); } diff --git a/mbmon/mbmon.c b/mbmon/mbmon.c index bb69b768..32a0d789 100644 --- a/mbmon/mbmon.c +++ b/mbmon/mbmon.c @@ -84,15 +84,15 @@ void ShowSysinfo(void) clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "4. SHOW BBS SYSTEM INFO"); + mbse_mvprintw( 5, 6, "4. SHOW BBS SYSTEM INFO"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Total calls"); - mvprintw( 8, 6, "2. Pots calls"); - mvprintw( 9, 6, "3. ISDN calls"); - mvprintw(10, 6, "4. Network calls"); - mvprintw(11, 6, "5. Local calls"); - mvprintw(12, 6, "6. Date started"); - mvprintw(13, 6, "7. Last caller"); + mbse_mvprintw( 7, 6, "1. Total calls"); + mbse_mvprintw( 8, 6, "2. Pots calls"); + mbse_mvprintw( 9, 6, "3. ISDN calls"); + mbse_mvprintw(10, 6, "4. Network calls"); + mbse_mvprintw(11, 6, "5. Local calls"); + mbse_mvprintw(12, 6, "6. Date started"); + mbse_mvprintw(13, 6, "7. Last caller"); center_addstr(lines - 3, (char *)"Press any key"); IsDoing("View System Info"); @@ -104,13 +104,13 @@ void ShowSysinfo(void) sprintf(buf, "%s", socket_receive()); if (strncmp(buf, "100:7,", 6) == 0) { cnt = strtok(buf, ","); - mvprintw( 7,26, "%s", strtok(NULL, ",")); - mvprintw( 8,26, "%s", strtok(NULL, ",")); - mvprintw( 9,26, "%s", strtok(NULL, ",")); - mvprintw(10,26, "%s", strtok(NULL, ",")); - mvprintw(11,26, "%s", strtok(NULL, ",")); - mvprintw(12,26, "%s", strtok(NULL, ",")); - mvprintw(13,26, "%s", strtok(NULL, ";")); + mbse_mvprintw( 7,26, "%s", strtok(NULL, ",")); + mbse_mvprintw( 8,26, "%s", strtok(NULL, ",")); + mbse_mvprintw( 9,26, "%s", strtok(NULL, ",")); + mbse_mvprintw(10,26, "%s", strtok(NULL, ",")); + mbse_mvprintw(11,26, "%s", strtok(NULL, ",")); + mbse_mvprintw(12,26, "%s", strtok(NULL, ",")); + mbse_mvprintw(13,26, "%s", strtok(NULL, ";")); fflush(stdout); } } @@ -127,9 +127,9 @@ void ShowLastcaller(void) clr_index(); set_color(WHITE, BLACK); - mvprintw( 4, 6, "5. SHOW BBS LASTCALLERS"); + mbse_mvprintw( 4, 6, "5. SHOW BBS LASTCALLERS"); set_color(YELLOW, RED); - mvprintw( 6, 1, "Nr Username Location Level Device Time Mins Calls Speed Actions "); + mbse_mvprintw( 6, 1, "Nr Username Location Level Device Time Mins Calls Speed Actions "); set_color(CYAN, BLACK); center_addstr(lines - 1, (char *)"Press any key"); IsDoing("View Lastcallers"); @@ -160,16 +160,16 @@ void ShowLastcaller(void) sprintf(buf, "%s", socket_receive()); if (strncmp(buf, "100:9,", 6) == 0) { cnt = strtok(buf, ","); - mvprintw(y, 1, "%2d", i); - mvprintw(y, 4, "%s", strtok(NULL, ",")); - mvprintw(y,19, "%s", strtok(NULL, ",")); - mvprintw(y,32, "%s", strtok(NULL, ",")); - mvprintw(y,38, "%s", strtok(NULL, ",")); - mvprintw(y,45, "%s", strtok(NULL, ",")); - mvprintw(y,51, "%s", strtok(NULL, ",")); - mvprintw(y,56, "%s", strtok(NULL, ",")); - mvprintw(y,62, "%s", strtok(NULL, ",")); - mvprintw(y,72, "%s", strtok(NULL, ";")); + mbse_mvprintw(y, 1, "%2d", i); + mbse_mvprintw(y, 4, "%s", strtok(NULL, ",")); + mbse_mvprintw(y,19, "%s", strtok(NULL, ",")); + mbse_mvprintw(y,32, "%s", strtok(NULL, ",")); + mbse_mvprintw(y,38, "%s", strtok(NULL, ",")); + mbse_mvprintw(y,45, "%s", strtok(NULL, ",")); + mbse_mvprintw(y,51, "%s", strtok(NULL, ",")); + mbse_mvprintw(y,56, "%s", strtok(NULL, ",")); + mbse_mvprintw(y,62, "%s", strtok(NULL, ",")); + mbse_mvprintw(y,72, "%s", strtok(NULL, ";")); y++; } } @@ -189,9 +189,9 @@ void system_moni(void) clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "1. SERVER CLIENTS"); + mbse_mvprintw( 5, 6, "1. SERVER CLIENTS"); set_color(YELLOW, RED); - mvprintw( 7, 1, "Pid tty user program city doing time "); + mbse_mvprintw( 7, 1, "Pid tty user program city doing time "); set_color(CYAN, BLACK); center_addstr(lines - 1, (char *)"Press any key"); IsDoing("System Monitor"); @@ -210,7 +210,7 @@ void system_moni(void) if (eof == 0) { if (socket_send(buf) == 0) { strcpy(buf, socket_receive()); - locate(y, 1); + mbse_locate(y, 1); clrtoeol(); if (strncmp(buf, "100:0;", 6) == 0) { /* @@ -219,22 +219,22 @@ void system_moni(void) eof = 1; } else { cnt = strtok(buf, ","); - mvprintw(y, 1, (char *)"%.5s", strtok(NULL, ",")); - mvprintw(y, 7, (char *)"%.6s", strtok(NULL, ",")); - mvprintw(y,14, (char *)"%.8s", strtok(NULL, ",")); - mvprintw(y,23, (char *)"%.8s", strtok(NULL, ",")); - mvprintw(y,32, (char *)"%.15s", strtok(NULL, ",")); - mvprintw(y,48, (char *)"%.26s", strtok(NULL, ",")); + mbse_mvprintw(y, 1, (char *)"%.5s", strtok(NULL, ",")); + mbse_mvprintw(y, 7, (char *)"%.6s", strtok(NULL, ",")); + mbse_mvprintw(y,14, (char *)"%.8s", strtok(NULL, ",")); + mbse_mvprintw(y,23, (char *)"%.8s", strtok(NULL, ",")); + mbse_mvprintw(y,32, (char *)"%.15s", strtok(NULL, ",")); + mbse_mvprintw(y,48, (char *)"%.26s", strtok(NULL, ",")); start = atoi(strtok(NULL, ";")); now = time(NULL); - mvprintw(y,75, (char *)"%s", t_elapsed(start, now)); + mbse_mvprintw(y,75, (char *)"%s", t_elapsed(start, now)); } } } else { /* * If no valid data, clear line */ - locate(y, 1); + mbse_locate(y, 1); clrtoeol(); } } /* for () */ @@ -253,28 +253,28 @@ void system_stat(void) clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "2. SERVER STATISTICS"); + mbse_mvprintw( 5, 6, "2. SERVER STATISTICS"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "First date started"); - mvprintw( 7,62, "BBS Open"); - mvprintw( 8, 6, "Last date started"); - mvprintw( 8,62, "ZMH"); - mvprintw( 9, 6, "Total server starts"); - mvprintw( 9,62, "Internet"); - mvprintw(10, 6, "Connected clients"); - mvprintw(10,62, "Need inet"); - mvprintw(11,62, "Running"); - mvprintw(12,30, "Total Today"); - mvprintw(12,62, "Load avg"); + mbse_mvprintw( 7, 6, "First date started"); + mbse_mvprintw( 7,62, "BBS Open"); + mbse_mvprintw( 8, 6, "Last date started"); + mbse_mvprintw( 8,62, "ZMH"); + mbse_mvprintw( 9, 6, "Total server starts"); + mbse_mvprintw( 9,62, "Internet"); + mbse_mvprintw(10, 6, "Connected clients"); + mbse_mvprintw(10,62, "Need inet"); + mbse_mvprintw(11,62, "Running"); + mbse_mvprintw(12,30, "Total Today"); + mbse_mvprintw(12,62, "Load avg"); hor_lin(13,30,8); hor_lin(13,45,8); - mvprintw(13,62, "Diskspace"); - mvprintw(14, 6, "Client connects"); - mvprintw(15, 6, "Peak connections"); - mvprintw(16, 6, "Protocol syntax errors"); - mvprintw(17, 6, "Communication errors"); - mvprintw(19, 6, "Next sequence number"); - mvprintw(19,62, "Press any key"); + mbse_mvprintw(13,62, "Diskspace"); + mbse_mvprintw(14, 6, "Client connects"); + mbse_mvprintw(15, 6, "Peak connections"); + mbse_mvprintw(16, 6, "Protocol syntax errors"); + mbse_mvprintw(17, 6, "Communication errors"); + mbse_mvprintw(19, 6, "Next sequence number"); + mbse_mvprintw(19,62, "Press any key"); IsDoing("System Statistics"); do { @@ -286,37 +286,37 @@ void system_stat(void) set_color(LIGHTGRAY, BLACK); cnt = strtok(buf, ","); now = atoi(strtok(NULL, ",")); - mvprintw(7, 30, "%s", ctime(&now)); + mbse_mvprintw(7, 30, "%s", ctime(&now)); now = atoi(strtok(NULL, ",")); - mvprintw(8, 30, "%s", ctime(&now)); + mbse_mvprintw(8, 30, "%s", ctime(&now)); cnt = strtok(NULL, ","); - mvprintw(9, 30, (char *)"%s ", strtok(NULL, ",")); - mvprintw(10,30, (char *)"%s ", strtok(NULL, ",")); - mvprintw(14,30, (char *)"%s ", strtok(NULL, ",")); - mvprintw(15,30, (char *)"%s ", strtok(NULL, ",")); - mvprintw(16,30, (char *)"%s ", strtok(NULL, ",")); - mvprintw(17,30, (char *)"%s ", strtok(NULL, ",")); - mvprintw(14,45, (char *)"%s ", strtok(NULL, ",")); - mvprintw(15,45, (char *)"%s ", strtok(NULL, ",")); - mvprintw(16,45, (char *)"%s ", strtok(NULL, ",")); - mvprintw(17,45, (char *)"%s ", strtok(NULL, ",")); - mvprintw(7,72, "%s", atoi(strtok(NULL, ",")) == 1?"Yes":"No "); - mvprintw(8,72, "%s", atoi(strtok(NULL, ",")) == 1?"Yes":"No "); - mvprintw(9,72, "%s", atoi(strtok(NULL, ",")) == 1?"Yes":"No "); - mvprintw(10,72,"%s", atoi(strtok(NULL, ",")) == 1?"Yes":"No "); - mvprintw(11,72,"%s", atoi(strtok(NULL, ",")) == 1?"Yes":"No "); - mvprintw(12,72, "%s ", strtok(NULL, ",")); - mvprintw(19,30, (char *)"%s", strtok(NULL, ";")); + mbse_mvprintw(9, 30, (char *)"%s ", strtok(NULL, ",")); + mbse_mvprintw(10,30, (char *)"%s ", strtok(NULL, ",")); + mbse_mvprintw(14,30, (char *)"%s ", strtok(NULL, ",")); + mbse_mvprintw(15,30, (char *)"%s ", strtok(NULL, ",")); + mbse_mvprintw(16,30, (char *)"%s ", strtok(NULL, ",")); + mbse_mvprintw(17,30, (char *)"%s ", strtok(NULL, ",")); + mbse_mvprintw(14,45, (char *)"%s ", strtok(NULL, ",")); + mbse_mvprintw(15,45, (char *)"%s ", strtok(NULL, ",")); + mbse_mvprintw(16,45, (char *)"%s ", strtok(NULL, ",")); + mbse_mvprintw(17,45, (char *)"%s ", strtok(NULL, ",")); + mbse_mvprintw(7,72, "%s", atoi(strtok(NULL, ",")) == 1?"Yes":"No "); + mbse_mvprintw(8,72, "%s", atoi(strtok(NULL, ",")) == 1?"Yes":"No "); + mbse_mvprintw(9,72, "%s", atoi(strtok(NULL, ",")) == 1?"Yes":"No "); + mbse_mvprintw(10,72,"%s", atoi(strtok(NULL, ",")) == 1?"Yes":"No "); + mbse_mvprintw(11,72,"%s", atoi(strtok(NULL, ",")) == 1?"Yes":"No "); + mbse_mvprintw(12,72, "%s ", strtok(NULL, ",")); + mbse_mvprintw(19,30, (char *)"%s", strtok(NULL, ";")); } switch (enoughspace(CFG.freespace)) { - case 0: mvprintw(13, 72, "Full "); + case 0: mbse_mvprintw(13, 72, "Full "); break; - case 1: mvprintw(13, 72, "Ok "); + case 1: mbse_mvprintw(13, 72, "Ok "); break; - case 2: mvprintw(13, 72, "N/A "); + case 2: mbse_mvprintw(13, 72, "N/A "); break; - case 3: mvprintw(13, 72, "Error"); + case 3: mbse_mvprintw(13, 72, "Error"); break; } @@ -334,11 +334,11 @@ void disk_stat(void) clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "3. FILESYSTEM USAGE"); + mbse_mvprintw( 5, 6, "3. FILESYSTEM USAGE"); set_color(YELLOW, RED); - mvprintw( 7, 1, " Size MB Free MB Used FS-Type St Mountpoint "); + mbse_mvprintw( 7, 1, " Size MB Free MB Used FS-Type St Mountpoint "); set_color(CYAN, BLACK); - mvprintw(lines - 2, 6, "Press any key"); + mbse_mvprintw(lines - 2, 6, "Press any key"); IsDoing("Filesystem Usage"); for (i = 0; i < 10; i++) last[i] = 0; @@ -371,7 +371,7 @@ void disk_stat(void) sign = ' '; last[i] = used; set_color(CYAN, BLACK); - mvprintw(i+8, 1, "%8lu %8lu ", size, avail); + mbse_mvprintw(i+8, 1, "%8lu %8lu ", size, avail); set_color(WHITE, BLACK); printf("%c ", sign); if (ro == 0) { @@ -389,7 +389,7 @@ void disk_stat(void) set_color(CYAN, BLACK); printf(" %-8s %s %-37s", type, ro ?"RO":"RW", fs); } - locate(i+8, 1); + mbse_locate(i+8, 1); clrtoeol(); } } @@ -466,25 +466,25 @@ void Showline(int y, int x, char *msg) if (strlen(msg)) { if (msg[0] == '<') { - locate(y, x); - colour(LIGHTCYAN, BLACK); + mbse_locate(y, x); + mbse_colour(LIGHTCYAN, BLACK); putchar('<'); - colour(LIGHTBLUE, BLACK); + mbse_colour(LIGHTBLUE, BLACK); for (i = 1; i < strlen(msg); i++) { if (msg[i] == '>') { - colour(LIGHTCYAN, BLACK); + mbse_colour(LIGHTCYAN, BLACK); putchar(msg[i]); - colour(CYAN, BLACK); + mbse_colour(CYAN, BLACK); } else { putchar(msg[i]); } } } else if (msg[0] == '*') { - colour(LIGHTRED, BLACK); - mvprintw(y, x, msg); + mbse_colour(LIGHTRED, BLACK); + mbse_mvprintw(y, x, msg); } else { - colour(GREEN, BLACK); - mvprintw(y, x, msg); + mbse_colour(GREEN, BLACK); + mbse_mvprintw(y, x, msg); } } } @@ -506,7 +506,7 @@ void DispMsg(char *msg) * Scroll buffer */ for (i = 0; i <= rsize; i++) { - locate(i+4,1); + mbse_locate(i+4,1); clrtoeol(); sprintf(rbuf[i], "%s", rbuf[i+1]); Showline(i+4, 1, rbuf[i]); @@ -543,7 +543,7 @@ void Chat(int sysop) msg = strtok(NULL, "\0"); msg[strlen(msg)-1] = '\0'; set_color(LIGHTRED, BLACK); - mvprintw(4, 1, msg); + mbse_mvprintw(4, 1, msg); working(2, 0, 0); working(0, 0, 0); center_addstr(lines -4, (char *)"Press any key"); @@ -552,13 +552,13 @@ void Chat(int sysop) } } - locate(lines - 2, 1); + mbse_locate(lines - 2, 1); set_color(WHITE, BLUE); clrtoeol(); - mvprintw(lines - 2, 2, "Chat, type \"/EXIT\" to exit"); + mbse_mvprintw(lines - 2, 2, "Chat, type \"/EXIT\" to exit"); set_color(WHITE, BLACK); - mvprintw(lines - 1, 1, ">"); + mbse_mvprintw(lines - 1, 1, ">"); memset(&sbuf, 0, sizeof(sbuf)); memset(&rbuf, 0, sizeof(rbuf)); @@ -660,10 +660,10 @@ void Chat(int sysop) } curpos = 0; memset(&sbuf, 0, sizeof(sbuf)); - locate(lines - 1, 2); + mbse_locate(lines - 1, 2); clrtoeol(); set_color(WHITE, BLACK); - mvprintw(lines - 1, 1, ">"); + mbse_mvprintw(lines - 1, 1, ">"); } } @@ -782,16 +782,16 @@ int main(int argc, char *argv[]) IsDoing("Browsing Menu"); clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "0. MBSE BBS MONITOR"); + mbse_mvprintw( 5, 6, "0. MBSE BBS MONITOR"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. View Server Clients"); - mvprintw( 8, 6, "2. View Server Statistics"); - mvprintw( 9, 6, "3. View Filesystem Usage"); - mvprintw(10, 6, "4. View BBS System Information"); - mvprintw(11, 6, "5. View BBS Lastcallers List"); - mvprintw(12, 6, "6. Chat with any user"); - mvprintw(13, 6, "7. Respond to sysop page"); - mvprintw(14, 6, "8. View Software Information"); + mbse_mvprintw( 7, 6, "1. View Server Clients"); + mbse_mvprintw( 8, 6, "2. View Server Statistics"); + mbse_mvprintw( 9, 6, "3. View Filesystem Usage"); + mbse_mvprintw(10, 6, "4. View BBS System Information"); + mbse_mvprintw(11, 6, "5. View BBS Lastcallers List"); + mbse_mvprintw(12, 6, "6. Chat with any user"); + mbse_mvprintw(13, 6, "7. Respond to sysop page"); + mbse_mvprintw(14, 6, "8. View Software Information"); switch(select_menu(8)) { case 0: diff --git a/mbmon/mutil.c b/mbmon/mutil.c index f9461f1c..50b3e5f6 100644 --- a/mbmon/mutil.c +++ b/mbmon/mutil.c @@ -54,7 +54,7 @@ unsigned char readkey(int y, int x, int fg, int bg) if ((i % 10) == 0) show_date(fg, bg, 0, 0); - locate(y, x); + mbse_locate(y, x); fflush(stdout); rc = Waitchar(&ch, 5); if ((rc == 1) && (ch != KEY_ESCAPE)) @@ -83,7 +83,7 @@ unsigned char testkey(int y, int x) unsigned char ch = 0; Nopper(); - locate(y, x); + mbse_locate(y, x); fflush(stdout); if ((ttyfd = open("/dev/tty", O_RDWR|O_NONBLOCK)) < 0) { @@ -111,7 +111,7 @@ unsigned char testkey(int y, int x) void show_field(int y, int x, char *str, int length, int fill) { - mvprintw(y, x, padleft(str, length, fill)); + mbse_mvprintw(y, x, padleft(str, length, fill)); } @@ -122,9 +122,9 @@ void newinsert(int i, int fg, int bg) insertflag = i; set_color(YELLOW, RED); if (insertflag != 0) { - mvprintw(2,36," INS "); + mbse_mvprintw(2,36," INS "); } else { - mvprintw(2,36," OVR "); + mbse_mvprintw(2,36," OVR "); } set_color(fg, bg); } @@ -147,7 +147,7 @@ char *edit_field(int y, int x, int w, int p, char *s_) do { set_color(YELLOW, BLUE); show_field(y, x, s, w, '_'); - locate(y, x + curpos); + mbse_locate(y, x + curpos); do { ch = readkey(y, x + curpos, YELLOW, BLUE); set_color(YELLOW, BLUE); @@ -281,7 +281,7 @@ char *edit_field(int y, int x, int w, int p, char *s_) } while ((ch != KEY_ENTER) && (ch != KEY_LINEFEED) && (ch != KEY_ESCAPE)); set_color(LIGHTGRAY, BLUE); - mvprintw(2,36, " "); + mbse_mvprintw(2,36, " "); set_color(LIGHTGRAY, BLACK); return s; } @@ -305,10 +305,10 @@ int select_menu(int max) * Loop forever until it's right. */ for (;;) { - mvprintw(lines - 2, 6, "Enter your choice >"); + mbse_mvprintw(lines - 2, 6, "Enter your choice >"); menu = (char *)"-"; menu = edit_field(lines - 2, 26, 3, '9', menu); - locate(lines -2, 6); + mbse_locate(lines -2, 6); clrtoeol(); if (strncmp(menu, "-", 1) == 0) @@ -342,7 +342,7 @@ void hor_lin(int y, int x, int len) { int i; - locate(y, x); + mbse_locate(y, x); for (i = 0; i < len; i++) putchar('-'); fflush(stdout); @@ -358,7 +358,7 @@ void set_color(int f, int b) if ((f != old_f) || (b != old_b)) { old_f = f; old_b = b; - colour(f, b); + mbse_colour(f, b); fflush(stdout); } } @@ -382,10 +382,10 @@ void show_date(int fg, int bg, int y, int x) set_color(LIGHTGREEN, BLUE); p = ctime(&now); Striplf(p); - mvprintw(1, columns - 36, (char *)"%s TZUTC %s", p, gmtoffset(now)); + mbse_mvprintw(1, columns - 36, (char *)"%s TZUTC %s", p, gmtoffset(now)); p = asctime(gmtime(&now)); Striplf(p); - mvprintw(2, columns - 36, (char *)"%s UTC", p); + mbse_mvprintw(2, columns - 36, (char *)"%s UTC", p); /* * Indicator if bbs is free @@ -395,15 +395,15 @@ void show_date(int fg, int bg, int y, int x) strcpy(buf, SockR("SBBS:0;")); if (strncmp(buf, "100:2,1", 7) == 0) { set_color(WHITE, RED); - mvprintw(2,columns - 6, (char *)" Down "); + mbse_mvprintw(2,columns - 6, (char *)" Down "); } else { set_color(WHITE, BLUE); - mvprintw(2,columns - 6, (char *)" Free "); + mbse_mvprintw(2,columns - 6, (char *)" Free "); } bbs_free = TRUE; } else { set_color(WHITE, RED); - mvprintw(2,columns - 6, (char *)" Busy "); + mbse_mvprintw(2,columns - 6, (char *)" Busy "); bbs_free = FALSE; } @@ -412,7 +412,7 @@ void show_date(int fg, int bg, int y, int x) */ strcpy(buf, SockR("CCKP:0;")); if (strcmp(buf, "100:0;") == 0) { - locate(3, 1); + mbse_locate(3, 1); set_color(LIGHTGRAY, BLACK); clrtoeol(); } else { @@ -424,21 +424,21 @@ void show_date(int fg, int bg, int y, int x) if (strlen(reason) > 60) reason[60] = '\0'; - locate(3, 1); + mbse_locate(3, 1); if (strcmp(page, "1")) { set_color(RED, BLACK); - mvprintw(3, 1, " Old page (%s) %-60s", pid, reason); + mbse_mvprintw(3, 1, " Old page (%s) %-60s", pid, reason); if ((now % 10) == 0) /* Every 10 seconds */ putchar(7); } else { set_color(LIGHTRED, BLACK); - mvprintw(3, 1, " Sysop page (%s) %-60s", pid, reason); + mbse_mvprintw(3, 1, " Sysop page (%s) %-60s", pid, reason); putchar(7); /* Each second */ } } if (y && x) - locate(y, x); + mbse_locate(y, x); set_color(fg, bg); } } @@ -447,7 +447,7 @@ void show_date(int fg, int bg, int y, int x) void center_addstr(int y, char *s) { - mvprintw(y, (columns / 2) - (strlen(s) / 2), s); + mbse_mvprintw(y, (columns / 2) - (strlen(s) / 2), s); } @@ -459,16 +459,16 @@ void screen_start(char *name) { int i; - TermInit(1, columns, lines); + mbse_TermInit(1, columns, lines); /* * Overwrite screen the first time, if user had it black on white * it will change to white on black. clear() won't do the trick. */ set_color(LIGHTGRAY, BLUE); - locate(1, 1); + mbse_locate(1, 1); for (i = 0; i < lines; i++) { if (i == 3) - colour(LIGHTGRAY, BLACK); + mbse_colour(LIGHTGRAY, BLACK); clrtoeol(); if (i < lines) printf("\n"); @@ -476,10 +476,10 @@ void screen_start(char *name) fflush(stdout); set_color(WHITE, BLUE); - locate(1, 1); + mbse_locate(1, 1); printf((char *)"%s for MBSE BBS version %s", name, VERSION); set_color(YELLOW, BLUE); - locate(2, 1); + mbse_locate(2, 1); printf((char *)SHORTRIGHT); set_color(LIGHTGRAY, BLACK); show_date(LIGHTGRAY, BLACK, 0, 0); @@ -494,7 +494,7 @@ void screen_start(char *name) void screen_stop() { set_color(LIGHTGRAY, BLACK); - clear(); + mbse_clear(); fflush(stdout); } @@ -521,11 +521,11 @@ void working(int txno, int y, int x) set_color(LIGHTGRAY, BLACK); switch (txno) { - case 0: mvprintw(4, columns - 14, (char *)" "); + case 0: mbse_mvprintw(4, columns - 14, (char *)" "); break; - case 1: mvprintw(4, columns - 14, (char *)"Working . . ."); + case 1: mbse_mvprintw(4, columns - 14, (char *)"Working . . ."); break; - case 2: mvprintw(4, columns - 14, (char *)">>> ERROR <<<"); + case 2: mbse_mvprintw(4, columns - 14, (char *)">>> ERROR <<<"); for (i = 1; i <= 5; i++) { putchar(7); fflush(stdout); @@ -533,12 +533,12 @@ void working(int txno, int y, int x) } msleep(550); break; - case 3: mvprintw(4, columns - 14, (char *)"Form inserted"); + case 3: mbse_mvprintw(4, columns - 14, (char *)"Form inserted"); putchar(7); fflush(stdout); sleep(1); break; - case 4: mvprintw(4, columns - 14, (char *)"Form deleted "); + case 4: mbse_mvprintw(4, columns - 14, (char *)"Form deleted "); putchar(7); fflush(stdout); sleep(1); @@ -548,7 +548,7 @@ void working(int txno, int y, int x) show_date(LIGHTGRAY, BLACK, 0, 0); set_color(LIGHTGRAY, BLACK); if (y && x) - locate(y, x); + mbse_locate(y, x); fflush(stdout); } @@ -563,7 +563,7 @@ void clr_index() set_color(LIGHTGRAY, BLACK); for (i = 4; i <= (lines); i++) { - locate(i, 1); + mbse_locate(i, 1); clrtoeol(); } } @@ -578,7 +578,7 @@ void showhelp(char *T) int f, i, x, forlim; f = FALSE; - locate(lines, 1); + mbse_locate(lines, 1); set_color(WHITE, RED); clrtoeol(); x = 0; diff --git a/mbnntp/commands.c b/mbnntp/commands.c index 233e69ec..b625a836 100644 --- a/mbnntp/commands.c +++ b/mbnntp/commands.c @@ -376,7 +376,7 @@ void command_list(char *cmd) send_nntp("503 Function not available"); msleep(1); /* For the linker only */ - colour(0, 0); + mbse_colour(0, 0); } diff --git a/mbnntp/mbnntp.c b/mbnntp/mbnntp.c index 0c9e3909..3e7476f8 100644 --- a/mbnntp/mbnntp.c +++ b/mbnntp/mbnntp.c @@ -78,7 +78,7 @@ void die(int onsig) ExitClient(onsig); msleep(1); /* For the linker only */ - colour(0, 0); + mbse_colour(0, 0); } diff --git a/mbsebbs/Makefile b/mbsebbs/Makefile index 2965cabd..5c65e14d 100644 --- a/mbsebbs/Makefile +++ b/mbsebbs/Makefile @@ -7,7 +7,7 @@ include ../Makefile.global SRCS = signature.c filesub.c language.c mbtoberep.c \ msgutil.c oneline.c bbslist.c morefile.c \ email.c fsedit.c lineedit.c mblang.c mbuser.c page.c \ - bye.c funcs.c mail.c \ + bye.c funcs.c mail.c term.c \ newuser.c pinfo.c timecheck.c change.c \ exitinfo.c mball.c mbsebbs.c menu.c pop3.c lastcallers.c \ timeout.c chat.c file.c mbstat.c misc.c \ @@ -16,7 +16,7 @@ SRCS = signature.c filesub.c language.c mbtoberep.c \ HDRS = signature.h filesub.h language.h mbsebbs.h misc.h offline.h \ timeout.h bbslist.h email.h fsedit.h lineedit.h \ mbstat.h msgutil.h oneline.h user.h bye.h morefile.h \ - funcs.h mail.h mbuser.h page.h \ + funcs.h mail.h mbuser.h page.h term.h \ change.h exitinfo.h mball.h newuser.h \ pinfo.h chat.h file.h menu.h \ pop3.h timecheck.h mbnewusr.h input.h whoson.h \ @@ -26,10 +26,10 @@ MBSEBBS_OBJS = signature.o bbslist.o chat.o file.o funcs.o mail.o menu.o \ bye.o change.o mbsebbs.o timeout.o user.o timecheck.o \ exitinfo.o filesub.o lineedit.o offline.o language.o msgutil.o \ pop3.o email.o input.o whoson.o door.o dispfile.o userlist.o timestats.o \ - logentry.o morefile.o lastcallers.o + logentry.o morefile.o lastcallers.o term.o MBSEBBS_LIBS = ../lib/libmbse.a ../lib/libmsgbase.a ../lib/libdbase.a ../lib/libmbinet.a ../lib/libnodelist.a MBNEWUSR_OBJS = mbnewusr.o newuser.o language.o timeout.o dispfile.o oneline.o \ - timecheck.o input.o exitinfo.o funcs.o misc.o change.o door.o \ + timecheck.o input.o exitinfo.o funcs.o misc.o change.o door.o term.o \ filesub.o mail.o email.o msgutil.o pop3.o lineedit.o fsedit.o whoson.o MBNEWUSR_LIBS = ../lib/libmbse.a ../lib/libmsgbase.a ../lib/libdbase.a ../lib/libmbinet.a ../lib/libnodelist.a MBALL_OBJS = mball.o @@ -118,46 +118,47 @@ depend: # DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT # Dependencies generated by make depend -signature.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h signature.h funcs.h input.h language.h timeout.h -filesub.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/mbsedb.h filesub.h funcs.h language.h input.h misc.h timeout.h exitinfo.h change.h -language.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h input.h language.h +signature.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h signature.h funcs.h input.h language.h timeout.h term.h +filesub.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/mbsedb.h filesub.h funcs.h language.h input.h misc.h timeout.h exitinfo.h change.h term.h +language.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h input.h language.h term.h mbtoberep.o: ../config.h ../lib/mbselib.h msgutil.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msgtext.h ../lib/msg.h oneline.h msgutil.h -oneline.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h oneline.h funcs.h input.h language.h -bbslist.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h bbslist.h funcs.h input.h language.h +oneline.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h oneline.h funcs.h input.h language.h term.h +bbslist.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h bbslist.h funcs.h input.h language.h term.h morefile.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h input.h language.h morefile.h timeout.h -email.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msgtext.h ../lib/msg.h ../lib/mbinet.h exitinfo.h language.h mail.h timeout.h msgutil.h input.h email.h whoson.h -fsedit.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h mail.h input.h language.h timeout.h pinfo.h fsedit.h -lineedit.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h mail.h input.h language.h timeout.h lineedit.h +email.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msgtext.h ../lib/msg.h ../lib/mbinet.h exitinfo.h language.h mail.h timeout.h msgutil.h input.h email.h whoson.h term.h +fsedit.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h mail.h input.h language.h timeout.h pinfo.h fsedit.h term.h +lineedit.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h mail.h input.h language.h timeout.h lineedit.h term.h mblang.o: ../config.h ../lib/mbselib.h mbuser.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/mbsedb.h mbuser.h -page.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h dispfile.h input.h chat.h page.h timeout.h mail.h language.h -bye.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/nodelist.h dispfile.h misc.h language.h bye.h +page.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h dispfile.h input.h chat.h page.h timeout.h mail.h language.h term.h +bye.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/nodelist.h dispfile.h misc.h language.h bye.h term.h funcs.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msgtext.h ../lib/msg.h funcs.h -mail.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/nodelist.h ../lib/msgtext.h ../lib/msg.h mail.h funcs.h input.h language.h misc.h timeout.h oneline.h exitinfo.h lineedit.h fsedit.h filesub.h msgutil.h pop3.h email.h door.h whoson.h -newuser.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h funcs.h input.h newuser.h language.h timeout.h change.h dispfile.h -pinfo.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h pinfo.h input.h -timecheck.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h timecheck.h funcs.h bye.h exitinfo.h language.h input.h -change.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h change.h dispfile.h funcs.h input.h language.h misc.h timeout.h exitinfo.h bye.h +mail.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/nodelist.h ../lib/msgtext.h ../lib/msg.h mail.h funcs.h input.h language.h misc.h timeout.h oneline.h exitinfo.h lineedit.h fsedit.h filesub.h msgutil.h pop3.h email.h door.h whoson.h term.h +term.o: ../config.h ../lib/mbselib.h ../lib/users.h term.h +newuser.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h funcs.h input.h newuser.h language.h timeout.h change.h dispfile.h term.h +pinfo.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h pinfo.h input.h term.h +timecheck.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h timecheck.h funcs.h bye.h exitinfo.h language.h input.h term.h +change.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h change.h dispfile.h funcs.h input.h language.h misc.h timeout.h exitinfo.h bye.h term.h exitinfo.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h funcs.h input.h language.h oneline.h misc.h bye.h timeout.h timecheck.h exitinfo.h mball.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/mbsedb.h mball.h -mbsebbs.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msg.h mbsebbs.h user.h dispfile.h language.h menu.h misc.h bye.h timeout.h funcs.h -menu.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h oneline.h mail.h bbslist.h change.h chat.h file.h funcs.h input.h misc.h timeout.h menu.h page.h pinfo.h bye.h timecheck.h whoson.h language.h offline.h email.h door.h dispfile.h userlist.h timestats.h logentry.h morefile.h lastcallers.h signature.h -pop3.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/mbinet.h ../lib/msgtext.h ../lib/msg.h msgutil.h pop3.h -lastcallers.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h input.h language.h lastcallers.h -timeout.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msg.h timeout.h funcs.h bye.h filesub.h language.h -chat.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h chat.h funcs.h input.h language.h misc.h whoson.h -file.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/mbsedb.h filesub.h file.h funcs.h input.h language.h misc.h timeout.h exitinfo.h whoson.h change.h dispfile.h +mbsebbs.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msg.h mbsebbs.h user.h dispfile.h language.h menu.h misc.h bye.h timeout.h funcs.h term.h +menu.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h oneline.h mail.h bbslist.h change.h chat.h file.h funcs.h input.h misc.h timeout.h menu.h page.h pinfo.h bye.h timecheck.h whoson.h language.h offline.h email.h door.h dispfile.h userlist.h timestats.h logentry.h morefile.h lastcallers.h signature.h term.h +pop3.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/mbinet.h ../lib/msgtext.h ../lib/msg.h msgutil.h pop3.h term.h +lastcallers.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h input.h language.h lastcallers.h term.h +timeout.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msg.h timeout.h funcs.h bye.h filesub.h language.h term.h +chat.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h chat.h funcs.h input.h language.h misc.h whoson.h term.h +file.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/mbsedb.h filesub.h file.h funcs.h input.h language.h misc.h timeout.h exitinfo.h whoson.h change.h dispfile.h term.h mbstat.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/mbsedb.h mbstat.h misc.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h funcs.h input.h language.h misc.h timeout.h exitinfo.h -offline.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/bluewave.h ../lib/msgtext.h ../lib/msg.h mail.h funcs.h input.h language.h file.h filesub.h exitinfo.h timeout.h msgutil.h pop3.h offline.h whoson.h -user.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h timeout.h user.h dispfile.h funcs.h input.h misc.h bye.h file.h mail.h change.h menu.h exitinfo.h language.h offline.h email.h -mbnewusr.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h mbnewusr.h funcs.h input.h language.h misc.h timeout.h newuser.h -input.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h input.h timeout.h language.h -whoson.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h input.h language.h exitinfo.h whoson.h -door.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h language.h input.h timeout.h exitinfo.h whoson.h door.h -dispfile.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msgtext.h ../lib/msg.h funcs.h language.h oneline.h misc.h timeout.h timecheck.h exitinfo.h mail.h email.h input.h dispfile.h filesub.h -userlist.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h userlist.h language.h input.h timeout.h -timestats.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h timestats.h funcs.h language.h input.h exitinfo.h +offline.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/bluewave.h ../lib/msgtext.h ../lib/msg.h mail.h funcs.h input.h language.h file.h filesub.h exitinfo.h timeout.h msgutil.h pop3.h offline.h whoson.h term.h +user.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h timeout.h user.h dispfile.h funcs.h input.h misc.h bye.h file.h mail.h change.h menu.h exitinfo.h language.h offline.h email.h term.h +mbnewusr.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h mbnewusr.h funcs.h input.h language.h misc.h timeout.h newuser.h term.h +input.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h input.h timeout.h language.h term.h +whoson.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h input.h language.h exitinfo.h whoson.h term.h +door.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h language.h input.h timeout.h exitinfo.h whoson.h door.h term.h +dispfile.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msgtext.h ../lib/msg.h funcs.h language.h oneline.h misc.h timeout.h timecheck.h exitinfo.h mail.h email.h input.h dispfile.h filesub.h term.h +userlist.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h userlist.h language.h input.h timeout.h term.h +timestats.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h timestats.h funcs.h language.h input.h exitinfo.h term.h logentry.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h logentry.h # End of generated dependencies diff --git a/mbsebbs/bbslist.c b/mbsebbs/bbslist.c index 500fd543..e43e5b94 100644 --- a/mbsebbs/bbslist.c +++ b/mbsebbs/bbslist.c @@ -39,7 +39,7 @@ #include "funcs.h" #include "input.h" #include "language.h" - +#include "term.h" void BBS_Add(void) diff --git a/mbsebbs/bye.c b/mbsebbs/bye.c index ba7b4eb9..0d77286e 100644 --- a/mbsebbs/bye.c +++ b/mbsebbs/bye.c @@ -37,6 +37,7 @@ #include "misc.h" #include "language.h" #include "bye.h" +#include "term.h" extern pid_t mypid; diff --git a/mbsebbs/change.c b/mbsebbs/change.c index 737f478d..cbb3206b 100644 --- a/mbsebbs/change.c +++ b/mbsebbs/change.c @@ -41,6 +41,7 @@ #include "timeout.h" #include "exitinfo.h" #include "bye.h" +#include "term.h" int Chg_Language(int NewMode) diff --git a/mbsebbs/chat.c b/mbsebbs/chat.c index eb3c4fd1..76a1d562 100644 --- a/mbsebbs/chat.c +++ b/mbsebbs/chat.c @@ -38,6 +38,7 @@ #include "language.h" #include "misc.h" #include "whoson.h" +#include "term.h" int chat_with_sysop = FALSE; /* Global sysop chat flag */ diff --git a/mbsebbs/dispfile.c b/mbsebbs/dispfile.c index 879ecf6c..dc04bd5e 100644 --- a/mbsebbs/dispfile.c +++ b/mbsebbs/dispfile.c @@ -46,7 +46,7 @@ #include "input.h" #include "dispfile.h" #include "filesub.h" - +#include "term.h" /* diff --git a/mbsebbs/door.c b/mbsebbs/door.c index 3a82bb32..e21116de 100644 --- a/mbsebbs/door.c +++ b/mbsebbs/door.c @@ -38,6 +38,7 @@ #include "exitinfo.h" #include "whoson.h" #include "door.h" +#include "term.h" extern time_t t_start; diff --git a/mbsebbs/email.c b/mbsebbs/email.c index c81f963e..d253bc7c 100644 --- a/mbsebbs/email.c +++ b/mbsebbs/email.c @@ -43,7 +43,7 @@ #include "input.h" #include "email.h" #include "whoson.h" - +#include "term.h" extern unsigned long LastNum; extern int Kludges; diff --git a/mbsebbs/file.c b/mbsebbs/file.c index 1e12ba8b..ceebebf0 100644 --- a/mbsebbs/file.c +++ b/mbsebbs/file.c @@ -44,7 +44,7 @@ #include "whoson.h" #include "change.h" #include "dispfile.h" - +#include "term.h" extern long arecno; /* File area number in xxxScan() functions */ diff --git a/mbsebbs/filesub.c b/mbsebbs/filesub.c index 101e9694..962b3f9a 100644 --- a/mbsebbs/filesub.c +++ b/mbsebbs/filesub.c @@ -41,6 +41,7 @@ #include "timeout.h" #include "exitinfo.h" #include "change.h" +#include "term.h" extern pid_t mypid; diff --git a/mbsebbs/fsedit.c b/mbsebbs/fsedit.c index 01a443fa..96803064 100644 --- a/mbsebbs/fsedit.c +++ b/mbsebbs/fsedit.c @@ -38,6 +38,8 @@ #include "timeout.h" #include "pinfo.h" #include "fsedit.h" +#include "term.h" + void Show_Ins(void) { diff --git a/mbsebbs/input.c b/mbsebbs/input.c index 7656f673..b6735404 100644 --- a/mbsebbs/input.c +++ b/mbsebbs/input.c @@ -35,6 +35,7 @@ #include "input.h" #include "timeout.h" #include "language.h" +#include "term.h" diff --git a/mbsebbs/language.c b/mbsebbs/language.c index 818e2f79..d86f9c40 100644 --- a/mbsebbs/language.c +++ b/mbsebbs/language.c @@ -34,7 +34,7 @@ #include "../lib/users.h" #include "input.h" #include "language.h" - +#include "term.h" diff --git a/mbsebbs/lastcallers.c b/mbsebbs/lastcallers.c index 5d18bc0c..4a535a11 100644 --- a/mbsebbs/lastcallers.c +++ b/mbsebbs/lastcallers.c @@ -35,7 +35,7 @@ #include "input.h" #include "language.h" #include "lastcallers.h" - +#include "term.h" /* diff --git a/mbsebbs/lineedit.c b/mbsebbs/lineedit.c index da8de4fe..170f1091 100644 --- a/mbsebbs/lineedit.c +++ b/mbsebbs/lineedit.c @@ -37,6 +37,7 @@ #include "language.h" #include "timeout.h" #include "lineedit.h" +#include "term.h" extern int Line; diff --git a/mbsebbs/mail.c b/mbsebbs/mail.c index 99614496..0fbca0a1 100644 --- a/mbsebbs/mail.c +++ b/mbsebbs/mail.c @@ -58,7 +58,7 @@ #include "email.h" #include "door.h" #include "whoson.h" - +#include "term.h" /* diff --git a/mbsebbs/mball.c b/mbsebbs/mball.c index 85e38d32..9a908591 100644 --- a/mbsebbs/mball.c +++ b/mbsebbs/mball.c @@ -51,9 +51,9 @@ void ProgName() if (do_quiet) return; - colour(15, 0); + mbse_colour(15, 0); printf("\nMBALL: MBSE BBS %s Allfiles Listing Creator\n", VERSION); - colour(14, 0); + mbse_colour(14, 0); printf(" %s\n", COPYRIGHT); } @@ -94,7 +94,7 @@ void die(int onsig) Syslog(' ', "MBALL finished in %s", t_elapsed(t_start, t_end)); if (!do_quiet) { - colour(7, 0); + mbse_colour(7, 0); printf("\n"); } ExitClient(onsig); @@ -107,18 +107,18 @@ void Help() do_quiet = FALSE; ProgName(); - colour(11, 0); + mbse_colour(11, 0); printf("\nUsage: mball [command] \n\n"); - colour(9, 0); + mbse_colour(9, 0); printf(" Commands are:\n\n"); - colour(3, 0); + mbse_colour(3, 0); printf(" l list Create allfiles and newfiles lists\n"); - colour(9, 0); + mbse_colour(9, 0); printf("\n Options are:\n\n"); - colour(3, 0); + mbse_colour(3, 0); printf(" -q -quiet Quiet mode\n"); printf(" -z -zip Create .zip archives\n"); - colour(7, 0); + mbse_colour(7, 0); printf("\n"); die(MBERR_COMMANDLINE); } @@ -132,7 +132,7 @@ int main(int argc, char **argv) struct passwd *pw; InitConfig(); - TermInit(1, 80, 24); + mbse_TermInit(1, 80, 24); t_start = time(NULL); umask(000); @@ -180,7 +180,7 @@ int main(int argc, char **argv) free(cmd); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("\n"); } @@ -285,7 +285,7 @@ void Masterlist() if(( pAreas = fopen (sAreas, "r")) == NULL) { WriteError("Can't open File Areas File: %s", sAreas); - colour(7,0); + mbse_colour(7,0); die(MBERR_GENERAL); } fread(&areahdr, sizeof(areahdr), 1, pAreas); diff --git a/mbsebbs/mbnewusr.c b/mbsebbs/mbnewusr.c index 7b6cecc5..2748b2c1 100644 --- a/mbsebbs/mbnewusr.c +++ b/mbsebbs/mbnewusr.c @@ -39,6 +39,7 @@ #include "misc.h" #include "timeout.h" #include "newuser.h" +#include "term.h" diff --git a/mbsebbs/mbsebbs.c b/mbsebbs/mbsebbs.c index 082e4e20..d3ca2b4b 100644 --- a/mbsebbs/mbsebbs.c +++ b/mbsebbs/mbsebbs.c @@ -42,6 +42,7 @@ #include "bye.h" #include "timeout.h" #include "funcs.h" +#include "term.h" #include #include diff --git a/mbsebbs/mbstat.c b/mbsebbs/mbstat.c index 39166ea5..14ceef72 100644 --- a/mbsebbs/mbstat.c +++ b/mbsebbs/mbstat.c @@ -44,20 +44,20 @@ void Help(void) do_quiet = FALSE; ProgName(); - colour(11, 0); + mbse_colour(11, 0); printf("\nUsage: mbstat [command] \n\n"); - colour(9, 0); + mbse_colour(9, 0); printf(" Commands are:\n\n"); - colour(3, 0); + mbse_colour(3, 0); printf(" c close Close the BBS for users\n"); printf(" o open Open the BBS for users\n"); printf(" s set semafore Set named semafore\n"); printf(" w wait Wait until the BBS is free\n\n"); - colour(9,0); + mbse_colour(9,0); printf(" Options are:\n\n"); - colour(3, 0); + mbse_colour(3, 0); printf(" -q -quiet Quiet, no screen output\n"); - colour(7, 0); + mbse_colour(7, 0); die(MBERR_COMMANDLINE); } @@ -68,11 +68,11 @@ void ProgName(void) if (do_quiet) return; - colour(15, 0); + mbse_colour(15, 0); printf("\nMBSTAT: MBSE BBS %s Status Changer\n", VERSION); - colour(14, 0); + mbse_colour(14, 0); printf(" %s\n", COPYRIGHT); - colour(3, 0); + mbse_colour(3, 0); } @@ -85,7 +85,7 @@ void die(int onsig) WriteError("Terminated on signal %d", onsig); if (!do_quiet) { - colour(7, 0); + mbse_colour(7, 0); printf("\n"); } @@ -108,7 +108,7 @@ int main(int argc, char **argv) struct passwd *pw; InitConfig(); - TermInit(1, 80, 24); + mbse_TermInit(1, 80, 24); t_start = time(NULL); /* @@ -155,7 +155,7 @@ int main(int argc, char **argv) free(cmd); if (!do_quiet) { - colour(3, 0); + mbse_colour(3, 0); printf("\n"); } diff --git a/mbsebbs/mbuser.c b/mbsebbs/mbuser.c index 9948041f..a574e0ef 100644 --- a/mbsebbs/mbuser.c +++ b/mbsebbs/mbuser.c @@ -52,7 +52,7 @@ int main(int argc, char **argv) struct passwd *pw; InitConfig(); - TermInit(1, 80, 24); + mbse_TermInit(1, 80, 24); Days = 0; Level = 0; @@ -111,7 +111,7 @@ int main(int argc, char **argv) oldmask = umask(027); if (!do_quiet) - colour(3, 0); + mbse_colour(3, 0); UserPack(Days, Level, pack); umask(oldmask); @@ -120,7 +120,7 @@ int main(int argc, char **argv) Syslog(' ', "MBUSER finished in %s", t_elapsed(t_start, t_end)); if (!do_quiet) - colour(7, 0); + mbse_colour(7, 0); ExitClient(MBERR_OK); return 0; } @@ -135,11 +135,11 @@ void ProgName(void) if (do_quiet) return; - colour(15, 0); + mbse_colour(15, 0); printf("\nMBUSER: MBSE BBS %s - User maintenance utility\n", VERSION); - colour(14, 0); + mbse_colour(14, 0); printf(" %s\n\n", COPYRIGHT); - colour(7, 0); + mbse_colour(7, 0); } @@ -149,19 +149,19 @@ void Help(void) do_quiet = FALSE; ProgName(); - colour(11, 0); + mbse_colour(11, 0); printf("\nUsage: mbuser [commands] \n\n"); - colour(9, 0); + mbse_colour(9, 0); printf(" Commands are:\n\n"); - colour(3, 0); + mbse_colour(3, 0); printf(" kill [n] [l] Kill users not called in \"n\" days below level \"l\"\n"); printf(" pack Pack the userbase\n"); - colour(9, 0); + mbse_colour(9, 0); printf("\n Options are:\n\n"); - colour(3, 0); + mbse_colour(3, 0); printf(" -quiet Quiet mode, (no screen output)\n\n"); - colour(7, 0); + mbse_colour(7, 0); printf("\n"); ExitClient(MBERR_COMMANDLINE); } diff --git a/mbsebbs/menu.c b/mbsebbs/menu.c index ee262ccb..058906bc 100644 --- a/mbsebbs/menu.c +++ b/mbsebbs/menu.c @@ -59,6 +59,7 @@ #include "morefile.h" #include "lastcallers.h" #include "signature.h" +#include "term.h" extern pid_t mypid; diff --git a/mbsebbs/newuser.c b/mbsebbs/newuser.c index bcc5ee6b..d0b3ad02 100644 --- a/mbsebbs/newuser.c +++ b/mbsebbs/newuser.c @@ -40,6 +40,7 @@ #include "timeout.h" #include "change.h" #include "dispfile.h" +#include "term.h" /* diff --git a/mbsebbs/offline.c b/mbsebbs/offline.c index c0d3be17..6fd64259 100644 --- a/mbsebbs/offline.c +++ b/mbsebbs/offline.c @@ -47,7 +47,7 @@ #include "pop3.h" #include "offline.h" #include "whoson.h" - +#include "term.h" long Total, TotalPersonal, Current, Personal; diff --git a/mbsebbs/oneline.c b/mbsebbs/oneline.c index 70c5033f..868ab967 100644 --- a/mbsebbs/oneline.c +++ b/mbsebbs/oneline.c @@ -36,6 +36,7 @@ #include "funcs.h" #include "input.h" #include "language.h" +#include "term.h" char sOneliner[81]; diff --git a/mbsebbs/page.c b/mbsebbs/page.c index 4b6c436b..76a79fab 100644 --- a/mbsebbs/page.c +++ b/mbsebbs/page.c @@ -40,6 +40,7 @@ #include "timeout.h" #include "mail.h" #include "language.h" +#include "term.h" extern pid_t mypid; diff --git a/mbsebbs/pinfo.c b/mbsebbs/pinfo.c index 29a2d27b..b91f0073 100644 --- a/mbsebbs/pinfo.c +++ b/mbsebbs/pinfo.c @@ -34,7 +34,7 @@ #include "../lib/users.h" #include "pinfo.h" #include "input.h" - +#include "term.h" void ls(int a) diff --git a/mbsebbs/pop3.c b/mbsebbs/pop3.c index 85c329ef..8ad5c752 100644 --- a/mbsebbs/pop3.c +++ b/mbsebbs/pop3.c @@ -37,7 +37,7 @@ #include "../lib/msg.h" #include "msgutil.h" #include "pop3.h" - +#include "term.h" void error_popmail(char *); diff --git a/mbsebbs/signature.c b/mbsebbs/signature.c index 14572b9e..64b0a8da 100644 --- a/mbsebbs/signature.c +++ b/mbsebbs/signature.c @@ -37,6 +37,7 @@ #include "input.h" #include "language.h" #include "timeout.h" +#include "term.h" #define MAXSIGLINES 4 diff --git a/mbsebbs/term.c b/mbsebbs/term.c new file mode 100644 index 00000000..dc1f0e95 --- /dev/null +++ b/mbsebbs/term.c @@ -0,0 +1,249 @@ +/***************************************************************************** + * + * $Id$ + * Purpose ...............: Terminal output routines. + * + ***************************************************************************** + * Copyright (C) 1997-2004 + * + * Michiel Broek FIDO: 2:280/2802 + * Beekmansbos 10 + * 1971 BV IJmuiden + * the Netherlands + * + * This file is part of MBSE BBS. + * + * This BBS is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2, or (at your option) any + * later version. + * + * MBSE BBS is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with MBSE BBS; see the file COPYING. If not, write to the Free + * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + *****************************************************************************/ + + +#include "../config.h" +#include "../lib/mbselib.h" +#include "../lib/users.h" +#include "term.h" + + +int termmode; /* 0 = tty, 1 = ANSI */ +int termx = 80; +int termy = 24; + + +void TermInit(int mode, int x, int y) +{ + termmode = mode; + termx = x; + termy = y; +} + + + +/* + * Function will print about of enters specified + */ +void Enter(int num) +{ + int i; + + for (i = 0; i < num; i++) + fprintf(stdout, "\n"); + fflush(stdout); +} + + + + +void pout(int fg, int bg, char *Str) +{ + colour(fg, bg); + fprintf(stdout, Str); + fflush(stdout); +} + + + +void poutCenter(int fg, int bg, char *Str) +{ + colour(fg, bg); + Center(Str); +} + + + +void poutCR(int fg, int bg, char *Str) +{ + colour(fg, bg); + fputs(Str, stdout); + fprintf(stdout, "\n"); + fflush(stdout); +} + + + +/* + * Changes ansi background and foreground color + */ +void colour(int fg, int bg) +{ + if (termmode == 1) { + + int att=0, fore=37, back=40; + + if (fg<0 || fg>31 || bg<0 || bg>7) { + fprintf(stdout, "ANSI: Illegal colour specified: %i, %i\n", fg, bg); + fflush(stdout); + return; + } + + fprintf(stdout, "["); + if ( fg > WHITE) { + fprintf(stdout, "5;"); + fg-= 16; + } + if (fg > LIGHTGRAY) { + att=1; + fg=fg-8; + } + + if (fg == BLACK) fore=30; + else if (fg == BLUE) fore=34; + else if (fg == GREEN) fore=32; + else if (fg == CYAN) fore=36; + else if (fg == RED) fore=31; + else if (fg == MAGENTA) fore=35; + else if (fg == BROWN) fore=33; + else fore=37; + + if (bg == BLUE) back=44; + else if (bg == GREEN) back=42; + else if (bg == CYAN) back=46; + else if (bg == RED) back=41; + else if (bg == MAGENTA) back=45; + else if (bg == BROWN) back=43; + else if (bg == LIGHTGRAY) back=47; + else back=40; + + fprintf(stdout, "%d;%d;%dm", att, fore, back); + fflush(stdout); + } +} + + + +void Center(char *string) +{ + int Strlen; + int Maxlen = termx; + int i, x, z; + char *Str; + + Str = calloc(1024, sizeof(char)); + Strlen = strlen(string); + + if (Strlen == Maxlen) + fprintf(stdout, "%s\n", string); + else { + x = Maxlen - Strlen; + z = x / 2; + for (i = 0; i < z; i++) + strcat(Str, " "); + strcat(Str, string); + fprintf(stdout, "%s\n", Str); + } + + fflush(stdout); + free(Str); +} + + + +void clear() +{ + if (termmode == 1) { + colour(LIGHTGRAY, BLACK); + fprintf(stdout, ANSI_HOME); + fprintf(stdout, ANSI_CLEAR); + fflush(stdout); + } else + Enter(1); +} + + + +/* + * Moves cursor to specified position + */ +void locate(int y, int x) +{ + if (termmode > 0) { + if (y > termy || x > termx) { + fprintf(stdout, "ANSI: Invalid screen coordinates: %i, %i\n", y, x); + fflush(stdout); + return; + } + fprintf(stdout, "\x1B[%i;%iH", y, x); + fflush(stdout); + } +} + + + +void fLine(int Len) +{ + int x; + + if (termmode == 0) + for (x = 0; x < Len; x++) + fprintf(stdout, "-"); + + if (termmode == 1) + for (x = 0; x < Len; x++) + fprintf(stdout, "%c", 196); + + fprintf(stdout, " \n"); + fflush(stdout); +} + + + + +void sLine() +{ + fLine(termx -1); +} + + + +/* + * curses compatible functions + */ +void mvprintw(int y, int x, const char *format, ...) +{ + char *outputstr; + va_list va_ptr; + + outputstr = calloc(2048, sizeof(char)); + + va_start(va_ptr, format); + vsprintf(outputstr, format, va_ptr); + va_end(va_ptr); + + locate(y, x); + fprintf(stdout, outputstr); + free(outputstr); + fflush(stdout); +} + + + diff --git a/mbsebbs/term.h b/mbsebbs/term.h new file mode 100644 index 00000000..3730515c --- /dev/null +++ b/mbsebbs/term.h @@ -0,0 +1,18 @@ +#ifndef _TERM_H +#define _TERM_H + +void TermInit(int, int, int); +void Enter(int); +void pout(int, int, char *); +void poutCR(int, int, char *); +void poutCenter(int,int,char *); +void colour(int, int); +void Center(char *); +void clear(void); +void locate(int, int); +void fLine(int); +void sLine(void); +void mvprintw(int, int, const char *, ...); + + +#endif diff --git a/mbsebbs/timecheck.c b/mbsebbs/timecheck.c index c8b351a9..e736fba9 100644 --- a/mbsebbs/timecheck.c +++ b/mbsebbs/timecheck.c @@ -38,6 +38,7 @@ #include "exitinfo.h" #include "language.h" #include "input.h" +#include "term.h" extern pid_t mypid; /* Pid of this program */ diff --git a/mbsebbs/timeout.c b/mbsebbs/timeout.c index bda0f688..ee26fbe1 100644 --- a/mbsebbs/timeout.c +++ b/mbsebbs/timeout.c @@ -38,6 +38,7 @@ #include "bye.h" #include "filesub.h" #include "language.h" +#include "term.h" extern int e_pid; /* Pid of external program */ diff --git a/mbsebbs/timestats.c b/mbsebbs/timestats.c index 9b03e209..3a4ac460 100644 --- a/mbsebbs/timestats.c +++ b/mbsebbs/timestats.c @@ -37,7 +37,7 @@ #include "language.h" #include "input.h" #include "exitinfo.h" - +#include "term.h" void TimeStats() diff --git a/mbsebbs/user.c b/mbsebbs/user.c index 80494276..cb0c684b 100644 --- a/mbsebbs/user.c +++ b/mbsebbs/user.c @@ -49,7 +49,7 @@ #include "language.h" #include "offline.h" #include "email.h" - +#include "term.h" extern int sock; diff --git a/mbsebbs/userlist.c b/mbsebbs/userlist.c index 523a04ae..b6e98c28 100644 --- a/mbsebbs/userlist.c +++ b/mbsebbs/userlist.c @@ -36,7 +36,7 @@ #include "language.h" #include "input.h" #include "timeout.h" - +#include "term.h" void UserList(char *OpData) diff --git a/mbsebbs/whoson.c b/mbsebbs/whoson.c index 0995012d..0fe7ca3d 100644 --- a/mbsebbs/whoson.c +++ b/mbsebbs/whoson.c @@ -36,6 +36,7 @@ #include "language.h" #include "exitinfo.h" #include "whoson.h" +#include "term.h" extern int LC_Download, LC_Upload, LC_Read, LC_Chat, LC_Olr, LC_Door; diff --git a/mbsetup/grlist.c b/mbsetup/grlist.c index 0746f1ed..4e4a66aa 100644 --- a/mbsetup/grlist.c +++ b/mbsetup/grlist.c @@ -123,7 +123,7 @@ int E_Group(gr_list **fdp, char *title) clr_index(); set_color(WHITE, BLACK); - mvprintw(5, 6, (char *)"%s", title); + mbse_mvprintw(5, 6, (char *)"%s", title); set_color(CYAN, BLACK); for (tmp = *fdp; tmp; tmp = tmp->next) @@ -139,9 +139,9 @@ int E_Group(gr_list **fdp, char *title) j++; if ((j >= (o + 1)) && (j < (o + 41))) { if (tmp->tagged) - mvprintw(y, x, (char *)"%2d. + %s", j, tmp->group); + mbse_mvprintw(y, x, (char *)"%2d. + %s", j, tmp->group); else - mvprintw(y, x, (char *)"%2d. %s", j, tmp->group); + mbse_mvprintw(y, x, (char *)"%2d. %s", j, tmp->group); y++; if (y == 17) { y = 7; @@ -159,7 +159,7 @@ int E_Group(gr_list **fdp, char *title) case -2:if ((o - 40) >= 0) { clr_index(); set_color(WHITE, BLACK); - mvprintw(5, 5, (char *)"%s", title); + mbse_mvprintw(5, 5, (char *)"%s", title); set_color(CYAN, BLACK); o -= 40; } @@ -167,7 +167,7 @@ int E_Group(gr_list **fdp, char *title) case -1:if ((o + 40) < n) { clr_index(); set_color(WHITE, BLACK); - mvprintw(5, 5, (char *)"%s", title); + mbse_mvprintw(5, 5, (char *)"%s", title); set_color(CYAN, BLACK); o += 40; } @@ -197,7 +197,7 @@ int E_Group(gr_list **fdp, char *title) o = ((i -1) / 40) * 40; clr_index(); set_color(WHITE, BLACK); - mvprintw(5, 5, (char *)"%s", title); + mbse_mvprintw(5, 5, (char *)"%s", title); set_color(CYAN, BLACK); } } diff --git a/mbsetup/ledit.c b/mbsetup/ledit.c index 2f5b3413..be95994e 100644 --- a/mbsetup/ledit.c +++ b/mbsetup/ledit.c @@ -50,13 +50,13 @@ int yes_no(char *T_) strcpy(t, T_); strcat(t, " Y/n "); set_color(LIGHTGRAY, BLACK); - locate(LINES - 3, 1); + mbse_locate(LINES - 3, 1); clrtoeol(); - mvprintw(LINES -3, 6, t); + mbse_mvprintw(LINES -3, 6, t); do { ch = toupper(readkey(LINES - 3, strlen(t) + 6, LIGHTGRAY, BLACK)); } while (ch != KEY_ENTER && ch != 'Y' && ch != 'N' && ch != '\012'); - locate(LINES - 3, 6); + mbse_locate(LINES - 3, 6); clrtoeol(); if (ch == KEY_ENTER || ch == 'Y' || ch == KEY_LINEFEED) return 1; @@ -80,12 +80,12 @@ void errmsg(const char *format, ...) t = xstrcat(t, (char *)", Press any key "); set_color(LIGHTGRAY, BLACK); - locate(LINES - 3, 1); + mbse_locate(LINES - 3, 1); clrtoeol(); - mvprintw(LINES - 3, 6, t); + mbse_mvprintw(LINES - 3, 6, t); putchar(7); ch = readkey(LINES - 3, strlen(t) + 6, LIGHTGRAY, BLACK); - locate(LINES - 3, 6); + mbse_locate(LINES - 3, 6); clrtoeol(); free(t); } @@ -140,7 +140,7 @@ void show_field(int y, int x, char *str, int length, int fill) { int i; - locate(y, x); + mbse_locate(y, x); for (i = 0; i < strlen(str); i++) putchar(str[i]); if (strlen(str) < length) @@ -157,9 +157,9 @@ void newinsert(int i, int fg, int bg) insertflag = i; set_color(YELLOW, RED); if (insertflag != 0) { - mvprintw(2,36," INS "); + mbse_mvprintw(2,36," INS "); } else { - mvprintw(2,36," OVR "); + mbse_mvprintw(2,36," OVR "); } set_color(fg, bg); } @@ -182,7 +182,7 @@ char *edit_field(int y, int x, int w, int p, char *s_) do { set_color(YELLOW, BLUE); show_field(y, x, s, w, '_'); - locate(y, x + curpos); + mbse_locate(y, x + curpos); do { ch = readkey(y, x + curpos, YELLOW, BLUE); set_color(YELLOW, BLUE); @@ -314,7 +314,7 @@ char *edit_field(int y, int x, int w, int p, char *s_) } while ((ch != KEY_ENTER) && (ch != KEY_LINEFEED) && (ch != KEY_ESCAPE)); set_color(LIGHTGRAY, BLUE); - mvprintw(2,36, " "); + mbse_mvprintw(2,36, " "); set_color(LIGHTGRAY, BLACK); if (strlen(s)) { AllSpaces = TRUE; @@ -351,10 +351,10 @@ char *select_show(int max) * Loop until the answer is right */ for (;;) { - mvprintw(LINES - 3, 6, "Enter your choice >"); + mbse_mvprintw(LINES - 3, 6, "Enter your choice >"); menu = (char *)"-"; menu = edit_field(LINES - 3, 26, 6, '!', menu); - locate(LINES - 3, 6); + mbse_locate(LINES - 3, 6); clrtoeol(); if (strncmp(menu, "-", 1) == 0) @@ -396,10 +396,10 @@ char *select_record(int max, int items) * Loop until the answer is right */ for (;;) { - mvprintw(LINES - 3, 6, "Enter your choice >"); + mbse_mvprintw(LINES - 3, 6, "Enter your choice >"); menu = (char *)"-"; menu = edit_field(LINES - 3, 26, 6, '!', menu); - locate(LINES - 3, 6); + mbse_locate(LINES - 3, 6); clrtoeol(); if (strncmp(menu, "A", 1) == 0) @@ -448,10 +448,10 @@ char *select_area(int max, int items) * Loop until the answer is right */ for (;;) { - mvprintw(LINES - 3, 6, "Enter your choice >"); + mbse_mvprintw(LINES - 3, 6, "Enter your choice >"); menu = (char *)"-"; menu = edit_field(LINES - 3, 26, 6, '!', menu); - locate(LINES - 3, 6); + mbse_locate(LINES - 3, 6); clrtoeol(); if (strncmp(menu, "A", 1) == 0) @@ -500,10 +500,10 @@ char *select_filearea(int max, int items) * Loop until the answer is right */ for (;;) { - mvprintw(LINES - 3, 6, "Enter your choice >"); + mbse_mvprintw(LINES - 3, 6, "Enter your choice >"); menu = (char *)"-"; menu = edit_field(LINES - 3, 26, 6, '!', menu); - locate(LINES - 3, 6); + mbse_locate(LINES - 3, 6); clrtoeol(); if (strncmp(menu, "A", 1) == 0) @@ -550,10 +550,10 @@ char *select_pick(int max, int items) * Loop until the answer is right */ for (;;) { - mvprintw(LINES - 3, 6, "Enter your choice >"); + mbse_mvprintw(LINES - 3, 6, "Enter your choice >"); menu = (char *)"-"; menu = edit_field(LINES - 3, 26, 6, '!', menu); - locate(LINES - 3, 6); + mbse_locate(LINES - 3, 6); clrtoeol(); if (strncmp(menu, "-", 1) == 0) @@ -598,10 +598,10 @@ char *select_aka(int max, int items) * Loop until the answer is right */ for (;;) { - mvprintw(LINES - 3, 6, "Enter your choice >"); + mbse_mvprintw(LINES - 3, 6, "Enter your choice >"); menu = (char *)"-"; menu = edit_field(LINES - 3, 26, 6, '!', menu); - locate(LINES - 3, 6); + mbse_locate(LINES - 3, 6); clrtoeol(); if (strncmp(menu, "-", 1) == 0) @@ -669,10 +669,10 @@ int select_menu_sub(int max, int items, int allowall, char *hlp) * Loop forever until it's right. */ for (;;) { - mvprintw(LINES - 3, 6, "Enter your choice >"); + mbse_mvprintw(LINES - 3, 6, "Enter your choice >"); menu = (char *)"-"; menu = edit_field(LINES - 3, 26, 3, '!', menu); - locate(LINES -3, 6); + mbse_locate(LINES -3, 6); clrtoeol(); if (strncmp(menu, "-", 1) == 0) @@ -886,7 +886,7 @@ char *getboolean(int val) void show_bool(int y, int x, int val) { - mvprintw(y, x, getboolean(val)); + mbse_mvprintw(y, x, getboolean(val)); } @@ -964,31 +964,31 @@ long edit_logl(long val, char *txt) { clr_index(); set_color(WHITE, BLACK); - mvprintw(5, 5, (char *)"%s EDIT LOGLEVEL", txt); + mbse_mvprintw(5, 5, (char *)"%s EDIT LOGLEVEL", txt); set_color(CYAN, BLACK); - mvprintw( 5,45, "Logflags"); + mbse_mvprintw( 5,45, "Logflags"); - mvprintw( 7, 5, "1. ! Attention"); - mvprintw( 8, 5, "2. + Normal"); - mvprintw( 9, 5, "3. - Verbose"); - mvprintw(10, 5, "4. A Debug TCP"); - mvprintw(11, 5, "5. B Debug BBS/binkp"); - mvprintw(12, 5, "6. C Chat modems"); - mvprintw(13, 5, "7. D Device IO"); - mvprintw(14, 5, "8. E Execute"); - mvprintw(15, 5, "9. F File forward"); - mvprintw(16, 5, "10. H Hydra debug"); - mvprintw(17, 5, "11. I EMSI debug"); - mvprintw( 7,45, "12. L Locking"); - mvprintw( 8,45, "13. M Mail/News"); - mvprintw( 9,45, "14. N Nodelist"); - mvprintw(10,45, "15. O Outboundscan"); - mvprintw(11,45, "16. P Packing"); - mvprintw(12,45, "17. R Routing"); - mvprintw(13,45, "18. S Session"); - mvprintw(14,45, "19. T TTY debug"); - mvprintw(15,45, "20. X Xmodem debug"); - mvprintw(16,45, "21. Z Zmodem debug"); + mbse_mvprintw( 7, 5, "1. ! Attention"); + mbse_mvprintw( 8, 5, "2. + Normal"); + mbse_mvprintw( 9, 5, "3. - Verbose"); + mbse_mvprintw(10, 5, "4. A Debug TCP"); + mbse_mvprintw(11, 5, "5. B Debug BBS/binkp"); + mbse_mvprintw(12, 5, "6. C Chat modems"); + mbse_mvprintw(13, 5, "7. D Device IO"); + mbse_mvprintw(14, 5, "8. E Execute"); + mbse_mvprintw(15, 5, "9. F File forward"); + mbse_mvprintw(16, 5, "10. H Hydra debug"); + mbse_mvprintw(17, 5, "11. I EMSI debug"); + mbse_mvprintw( 7,45, "12. L Locking"); + mbse_mvprintw( 8,45, "13. M Mail/News"); + mbse_mvprintw( 9,45, "14. N Nodelist"); + mbse_mvprintw(10,45, "15. O Outboundscan"); + mbse_mvprintw(11,45, "16. P Packing"); + mbse_mvprintw(12,45, "17. R Routing"); + mbse_mvprintw(13,45, "18. S Session"); + mbse_mvprintw(14,45, "19. T TTY debug"); + mbse_mvprintw(15,45, "20. X Xmodem debug"); + mbse_mvprintw(16,45, "21. Z Zmodem debug"); for (;;) { set_color(WHITE, BLACK); @@ -1048,8 +1048,8 @@ long edit_logl(long val, char *txt) void show_int(int y, int x, int val) { - mvprintw(y, x, (char *)" "); - mvprintw(y, x, (char *)"%d", val); + mbse_mvprintw(y, x, (char *)" "); + mbse_mvprintw(y, x, (char *)"%d", val); } @@ -1093,7 +1093,7 @@ int edit_int_range(int y, int x, int val, int min, int max, char *help) void show_ushort(int y, int x, unsigned short val) { - mvprintw(y, x, (char *)"%d", val); + mbse_mvprintw(y, x, (char *)"%d", val); } @@ -1207,7 +1207,7 @@ char *getflag(unsigned long flag, unsigned long not) void show_sec(int y, int x, securityrec sec) { show_int(y, x, sec.level); - mvprintw(y, x + 6, getflag(sec.flags, sec.notflags)); + mbse_mvprintw(y, x + 6, getflag(sec.flags, sec.notflags)); } @@ -1221,7 +1221,7 @@ securityrec edit_sec(int y, int x, securityrec sec, char *shdr) clr_index(); set_color(WHITE, BLACK); - mvprintw(4,3,shdr); + mbse_mvprintw(4,3,shdr); set_color(CYAN, BLACK); xx = 3; yy = 6; @@ -1236,10 +1236,10 @@ securityrec edit_sec(int y, int x, securityrec sec, char *shdr) yy = 6; } set_color(CYAN,BLACK); - mvprintw(yy, xx, (char *)"%2d. %-16s", i+1, CFG.fname[i]); + mbse_mvprintw(yy, xx, (char *)"%2d. %-16s", i+1, CFG.fname[i]); yy++; } - mvprintw(16,53, "33. Security level"); + mbse_mvprintw(16,53, "33. Security level"); for (;;) { set_color(WHITE, BLACK); @@ -1265,7 +1265,7 @@ securityrec edit_sec(int y, int x, securityrec sec, char *shdr) */ if (((sec.flags >> i) & 1) && ((sec.notflags >> i) & 1)) c = '!'; - mvprintw(yy,xx,(char *)"%c", c); + mbse_mvprintw(yy,xx,(char *)"%c", c); yy++; } show_int(16,74, sec.level); @@ -1304,7 +1304,7 @@ securityrec edit_usec(int y, int x, securityrec sec, char *shdr) clr_index(); set_color(WHITE, BLACK); - mvprintw(4,3,shdr); + mbse_mvprintw(4,3,shdr); set_color(CYAN, BLACK); xx = 3; yy = 6; @@ -1319,10 +1319,10 @@ securityrec edit_usec(int y, int x, securityrec sec, char *shdr) yy = 6; } set_color(CYAN,BLACK); - mvprintw(yy, xx, (char *)"%2d. %-16s", i+1, CFG.fname[i]); + mbse_mvprintw(yy, xx, (char *)"%2d. %-16s", i+1, CFG.fname[i]); yy++; } - mvprintw(16,53, "33. Security level"); + mbse_mvprintw(16,53, "33. Security level"); for (;;) { set_color(WHITE, BLACK); @@ -1348,7 +1348,7 @@ securityrec edit_usec(int y, int x, securityrec sec, char *shdr) */ if (((sec.flags >> i) & 1) && ((sec.notflags >> i) & 1)) c = '!'; - mvprintw(yy,xx,(char *)"%c", c); + mbse_mvprintw(yy,xx,(char *)"%c", c); yy++; } show_int(16,74, sec.level); @@ -1382,7 +1382,7 @@ securityrec edit_asec(securityrec sec, char *shdr) clr_index(); set_color(WHITE, BLACK); - mvprintw(4,3,shdr); + mbse_mvprintw(4,3,shdr); set_color(CYAN, BLACK); xx = 3; yy = 6; @@ -1397,7 +1397,7 @@ securityrec edit_asec(securityrec sec, char *shdr) yy = 6; } set_color(CYAN,BLACK); - mvprintw(yy, xx, (char *)"%2d. %-16s", i+1, CFG.aname[i]); + mbse_mvprintw(yy, xx, (char *)"%2d. %-16s", i+1, CFG.aname[i]); yy++; } @@ -1425,7 +1425,7 @@ securityrec edit_asec(securityrec sec, char *shdr) */ if (((sec.flags >> i) & 1) && ((sec.notflags >> i) & 1)) c = '!'; - mvprintw(yy,xx,(char *)"%c", c); + mbse_mvprintw(yy,xx,(char *)"%c", c); yy++; } @@ -1459,7 +1459,7 @@ securityrec edit_nsec(securityrec sec, char *shdr) clr_index(); set_color(WHITE, BLACK); - mvprintw(4,3,shdr); + mbse_mvprintw(4,3,shdr); set_color(CYAN, BLACK); xx = 3; yy = 6; @@ -1474,7 +1474,7 @@ securityrec edit_nsec(securityrec sec, char *shdr) yy = 6; } set_color(CYAN,BLACK); - mvprintw(yy, xx, (char *)"%2d. %-16s", i+1, CFG.aname[i]); + mbse_mvprintw(yy, xx, (char *)"%2d. %-16s", i+1, CFG.aname[i]); yy++; } @@ -1502,7 +1502,7 @@ securityrec edit_nsec(securityrec sec, char *shdr) */ if (((sec.flags >> i) & 1) && ((sec.notflags >> i) & 1)) c = '!'; - mvprintw(yy,xx,(char *)"%c", c); + mbse_mvprintw(yy,xx,(char *)"%c", c); yy++; } @@ -1549,7 +1549,7 @@ char *getmsgtype(int val) void show_msgtype(int y, int x, int val) { - mvprintw(y, x, getmsgtype(val)); + mbse_mvprintw(y, x, getmsgtype(val)); } @@ -1594,7 +1594,7 @@ char *getemailmode(int val) void show_emailmode(int y, int x, int val) { - mvprintw(y, x, getemailmode(val)); + mbse_mvprintw(y, x, getemailmode(val)); } @@ -1641,7 +1641,7 @@ char *getmsgkinds(int val) void show_msgkinds(int y, int x, int val) { - mvprintw(y, x, getmsgkinds(val)); + mbse_mvprintw(y, x, getmsgkinds(val)); } @@ -1686,7 +1686,7 @@ char *getlinetype(int val) void show_linetype(int y, int x, int val) { - mvprintw(y, x, getlinetype(val)); + mbse_mvprintw(y, x, getlinetype(val)); } @@ -1730,7 +1730,7 @@ char *getservice(int val) void show_service(int y, int x, int val) { - mvprintw(y, x, getservice(val)); + mbse_mvprintw(y, x, getservice(val)); } @@ -1774,7 +1774,7 @@ char *getnewsmode(int val) void show_newsmode(int y, int x, int val) { - mvprintw(y, x, getnewsmode(val)); + mbse_mvprintw(y, x, getnewsmode(val)); } @@ -1818,7 +1818,7 @@ char *getmsgeditor(int val) void show_msgeditor(int y, int x, int val) { - mvprintw(y, x, getmsgeditor(val)); + mbse_mvprintw(y, x, getmsgeditor(val)); } @@ -1851,7 +1851,7 @@ int edit_msgeditor(int y, int x, int val) void show_magictype(int y, int x, int val) { - mvprintw(y, x, getmagictype(val)); + mbse_mvprintw(y, x, getmagictype(val)); } @@ -1915,7 +1915,7 @@ char *get_asktype(int val) void show_asktype(int y, int x, int val) { - mvprintw(y, x, get_asktype(val)); + mbse_mvprintw(y, x, get_asktype(val)); } @@ -1959,7 +1959,7 @@ char *get_sessiontype(int val) void show_sessiontype(int y, int x, int val) { - mvprintw(y, x, get_sessiontype(val)); + mbse_mvprintw(y, x, get_sessiontype(val)); } @@ -2007,7 +2007,7 @@ char *get_routetype(int val) void show_routetype(int y, int x, int val) { - mvprintw(y, x, get_routetype(val)); + mbse_mvprintw(y, x, get_routetype(val)); } @@ -2046,7 +2046,7 @@ void show_aka(int y, int x, fidoaddr aka) sprintf(temp, "%d:%d/%d@%s", aka.zone, aka.net, aka.node, aka.domain); else sprintf(temp, "%d:%d/%d.%d@%s", aka.zone, aka.net, aka.node, aka.point, aka.domain); - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); } @@ -2058,14 +2058,14 @@ void edit_color(int *fg, int *bg, char *title, char *help) clr_index(); set_color(WHITE, BLACK); - mvprintw(5, 6, title); + mbse_mvprintw(5, 6, title); sprintf(temp, "Change the ^%s^ color with arrow keys, press whene done", help); showhelp(temp); for (f = 0; f < 16; f++) for (b = 0; b < 8; b++) { set_color(f, b); - mvprintw(b + 9, f + 33, "."); + mbse_mvprintw(b + 9, f + 33, "."); } f = (*fg) & 15; @@ -2073,11 +2073,11 @@ void edit_color(int *fg, int *bg, char *title, char *help) for (;;) { set_color(f, b); - mvprintw(7, 6, "This is an example..."); + mbse_mvprintw(7, 6, "This is an example..."); fflush(stdout); - mvprintw(b + 9, f + 33, "*"); + mbse_mvprintw(b + 9, f + 33, "*"); ch = readkey(7,28, f, b); - mvprintw(b + 9, f + 33, "."); + mbse_mvprintw(b + 9, f + 33, "."); switch(ch) { case KEY_LINEFEED: case KEY_ENTER: (* fg) = f; diff --git a/mbsetup/ledit.h b/mbsetup/ledit.h index 9cedb265..bbe71778 100644 --- a/mbsetup/ledit.h +++ b/mbsetup/ledit.h @@ -98,7 +98,7 @@ int edit_charset(int, int, int); #define E_INT(y,x,value,help) value = edit_int(y,x,value,(char *)help); break; #define E_IRC(y,x,value,min,max,help) value = edit_int_range(y,x,value,min,max,(char *)help); break; #define E_LOGL(grade,txt,af) grade = edit_logl(grade,(char *)txt); af(); break; -#define S_COL(y,x,name,fg,bg) set_color(fg,bg); mvprintw(y,x,name); +#define S_COL(y,x,name,fg,bg) set_color(fg,bg); mbse_mvprintw(y,x,name); #define E_SEC(y,x,sec,hdr,af) sec = edit_sec(y,x,sec,(char *)hdr); af(); break; #define E_USEC(y,x,sec,hdr,af) sec = edit_usec(y,x,sec,(char *)hdr); af(); break; diff --git a/mbsetup/m_archive.c b/mbsetup/m_archive.c index d774ea63..23b90e46 100644 --- a/mbsetup/m_archive.c +++ b/mbsetup/m_archive.c @@ -535,20 +535,20 @@ int EditArchRec(int Area) crc = upd_crc32((char *)&archiver, crc, sizeof(archiver)); set_color(WHITE, BLACK); - mvprintw( 5, 2, "3. EDIT ARCHIVER"); + mbse_mvprintw( 5, 2, "3. EDIT ARCHIVER"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Comment"); - mvprintw( 8, 2, "2. Name"); - mvprintw( 9, 2, "3. Available"); - mvprintw(10, 2, "4. Deleted"); - mvprintw(11, 2, "5. Arc files"); - mvprintw(12, 2, "6. Arc mail"); - mvprintw(13, 2, "7. Banners"); - mvprintw(14, 2, "8. Arc test"); - mvprintw(15, 2, "9. Un. files"); - mvprintw(16, 2, "10. Un. mail"); - mvprintw(17, 2, "11. FILE_ID"); - mvprintw(18, 2, "12. List arc"); + mbse_mvprintw( 7, 2, "1. Comment"); + mbse_mvprintw( 8, 2, "2. Name"); + mbse_mvprintw( 9, 2, "3. Available"); + mbse_mvprintw(10, 2, "4. Deleted"); + mbse_mvprintw(11, 2, "5. Arc files"); + mbse_mvprintw(12, 2, "6. Arc mail"); + mbse_mvprintw(13, 2, "7. Banners"); + mbse_mvprintw(14, 2, "8. Arc test"); + mbse_mvprintw(15, 2, "9. Un. files"); + mbse_mvprintw(16, 2, "10. Un. mail"); + mbse_mvprintw(17, 2, "11. FILE_ID"); + mbse_mvprintw(18, 2, "12. List arc"); for (;;) { set_color(WHITE, BLACK); @@ -636,7 +636,7 @@ void EditArchive(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 4, "3. ARCHIVER SETUP"); + mbse_mvprintw( 5, 4, "3. ARCHIVER SETUP"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/archiver.temp", getenv("MBSE_ROOT")); @@ -660,7 +660,7 @@ void EditArchive(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-5s %-26s", i, archiver.name, archiver.comment); temp[38] = 0; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } @@ -737,7 +737,7 @@ char *PickArchive(char *shdr) clr_index(); set_color(WHITE, BLACK); sprintf(temp, "%s. ARCHIVER SELECT", shdr); - mvprintw( 5, 4, temp); + mbse_mvprintw( 5, 4, temp); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/archiver.data", getenv("MBSE_ROOT")); @@ -760,7 +760,7 @@ char *PickArchive(char *shdr) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-32s", i, archiver.comment); temp[37] = 0; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } strcpy(pick, select_pick(records, 20)); diff --git a/mbsetup/m_bbs.c b/mbsetup/m_bbs.c index 0c4e9013..39eb0e59 100644 --- a/mbsetup/m_bbs.c +++ b/mbsetup/m_bbs.c @@ -51,15 +51,15 @@ void bbs_menu(void) clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "8. BBS SETUP"); + mbse_mvprintw( 5, 6, "8. BBS SETUP"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Edit Security Limits"); - mvprintw( 8, 6, "2. Edit Language Setup"); - mvprintw( 9, 6, "3. Edit BBS Menus"); - mvprintw(10, 6, "4. Edit File Areas"); - mvprintw(11, 6, "5. Edit Transfer Protocols"); - mvprintw(12, 6, "6. Edit BBS List Data"); - mvprintw(13, 6, "7. Edit Oneliners"); + mbse_mvprintw( 7, 6, "1. Edit Security Limits"); + mbse_mvprintw( 8, 6, "2. Edit Language Setup"); + mbse_mvprintw( 9, 6, "3. Edit BBS Menus"); + mbse_mvprintw(10, 6, "4. Edit File Areas"); + mbse_mvprintw(11, 6, "5. Edit Transfer Protocols"); + mbse_mvprintw(12, 6, "6. Edit BBS List Data"); + mbse_mvprintw(13, 6, "7. Edit Oneliners"); switch(select_menu(7)) { case 0: return; diff --git a/mbsetup/m_bbslist.c b/mbsetup/m_bbslist.c index 4460e2d6..ec64df35 100644 --- a/mbsetup/m_bbslist.c +++ b/mbsetup/m_bbslist.c @@ -218,28 +218,28 @@ int EditBBSlistRec(int Area) crc = upd_crc32((char *)&bbs, crc, sizeof(bbs)); set_color(WHITE, BLACK); - mvprintw( 4, 1, "8.6.1 EDIT BBSLIST"); + mbse_mvprintw( 4, 1, "8.6.1 EDIT BBSLIST"); set_color(CYAN, BLACK); - mvprintw( 6, 1, " 1. BBS"); - mvprintw( 7, 1, " 2. Desc."); - mvprintw( 8, 1, " 3. Desc."); - mvprintw( 9, 1, " 4. Phn 1"); - mvprintw(10, 1, " 5. Phn 2"); - mvprintw(11, 1, " 6. Phn 3"); - mvprintw(12, 1, " 7. Phn 4"); - mvprintw(13, 1, " 8. Phn 5"); - mvprintw(14, 1, " 9. TCPIP"); - mvprintw(15, 1, "10. Name"); - mvprintw(16, 1, "11. Sysop"); - mvprintw(17, 1, "12. Date"); - mvprintw(18, 1, "13. Lines"); - mvprintw(19, 1, "14. Open"); + mbse_mvprintw( 6, 1, " 1. BBS"); + mbse_mvprintw( 7, 1, " 2. Desc."); + mbse_mvprintw( 8, 1, " 3. Desc."); + mbse_mvprintw( 9, 1, " 4. Phn 1"); + mbse_mvprintw(10, 1, " 5. Phn 2"); + mbse_mvprintw(11, 1, " 6. Phn 3"); + mbse_mvprintw(12, 1, " 7. Phn 4"); + mbse_mvprintw(13, 1, " 8. Phn 5"); + mbse_mvprintw(14, 1, " 9. TCPIP"); + mbse_mvprintw(15, 1, "10. Name"); + mbse_mvprintw(16, 1, "11. Sysop"); + mbse_mvprintw(17, 1, "12. Date"); + mbse_mvprintw(18, 1, "13. Lines"); + mbse_mvprintw(19, 1, "14. Open"); - mvprintw(16,46, "15. Verified"); - mvprintw(17,46, "16. Available"); - mvprintw(18,46, "17. Software"); - mvprintw(19,46, "18. Storage"); + mbse_mvprintw(16,46, "15. Verified"); + mbse_mvprintw(17,46, "16. Available"); + mbse_mvprintw(18,46, "17. Software"); + mbse_mvprintw(19,46, "18. Storage"); for (;;) { set_color(WHITE, BLACK); @@ -352,7 +352,7 @@ void EditBBSlist(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "8.6.1 BBS LISTS SETUP"); + mbse_mvprintw( 5, 2, "8.6.1 BBS LISTS SETUP"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/bbslist.temp", getenv("MBSE_ROOT")); @@ -377,7 +377,7 @@ void EditBBSlist(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-32s", o + i, bbs.BBSName); temp[38] = '\0'; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } @@ -436,7 +436,7 @@ void PurgeBBSlist(void) clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "8.6.2 BBS LISTS PURGE"); + mbse_mvprintw( 5, 6, "8.6.2 BBS LISTS PURGE"); set_color(CYAN, BLACK); working(1, 0, 0); @@ -461,9 +461,9 @@ void PurgeBBSlist(void) } sprintf(temp, "%d records, %d records to purge", recno, iCount); - mvprintw(7, 6, temp); + mbse_mvprintw(7, 6, temp); if (iCount == 0) { - mvprintw(9, 6, "Press any key"); + mbse_mvprintw(9, 6, "Press any key"); readkey(9, 20, LIGHTGRAY, BLACK); return; } @@ -492,10 +492,10 @@ void bbslist_menu(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "8.6 BBS LISTS SETUP"); + mbse_mvprintw( 5, 6, "8.6 BBS LISTS SETUP"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Edit BBS lists"); - mvprintw( 8, 6, "2. Purge BBS lists"); + mbse_mvprintw( 7, 6, "1. Edit BBS lists"); + mbse_mvprintw( 8, 6, "2. Purge BBS lists"); switch(select_menu(2)) { case 0: diff --git a/mbsetup/m_domain.c b/mbsetup/m_domain.c index 5bf32ac7..4cd06a63 100644 --- a/mbsetup/m_domain.c +++ b/mbsetup/m_domain.c @@ -216,12 +216,12 @@ void DomainScreen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "17. EDIT DOMAINS"); + mbse_mvprintw( 5, 2, "17. EDIT DOMAINS"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Fidonet"); - mvprintw( 8, 2, "2. Internet"); - mvprintw( 9, 2, "3. Active"); - mvprintw(10, 2, "4. Deleted"); + mbse_mvprintw( 7, 2, "1. Fidonet"); + mbse_mvprintw( 8, 2, "2. Internet"); + mbse_mvprintw( 9, 2, "3. Active"); + mbse_mvprintw(10, 2, "4. Deleted"); } @@ -332,7 +332,7 @@ void EditDomain(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 4, "17. DOMAIN MANAGER"); + mbse_mvprintw( 5, 4, "17. DOMAIN MANAGER"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/domain.temp", getenv("MBSE_ROOT")); @@ -354,7 +354,7 @@ void EditDomain(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-31s %-31s", o+i, domtrans.ftndom, domtrans.intdom); temp[75] = 0; - mvprintw(y, 3, temp); + mbse_mvprintw(y, 3, temp); y++; } } @@ -379,7 +379,7 @@ void EditDomain(void) } if (strncmp(pick, "D", 1) == 0) { - mvprintw(LINES -3, 6, "Enter domain number (1..%d) to delete >", records); + mbse_mvprintw(LINES -3, 6, "Enter domain number (1..%d) to delete >", records); y = 0; y = edit_int(LINES -3, 44, y, (char *)"Enter record number"); if ((y > 0) && (y <= records) && yes_no((char *)"Remove record")) { @@ -399,11 +399,11 @@ void EditDomain(void) if (strncmp(pick, "M", 1) == 0) { from = too = 0; - mvprintw(LINES -3, 6, "Enter domain number (1..%d) to move >", records); + mbse_mvprintw(LINES -3, 6, "Enter domain number (1..%d) to move >", records); from = edit_int(LINES -3, 42, from, (char *)"Enter record number"); - locate(LINES -3, 6); + mbse_locate(LINES -3, 6); clrtoeol(); - mvprintw(LINES -3, 6, "Enter new position (1..%d) >", records); + mbse_mvprintw(LINES -3, 6, "Enter new position (1..%d) >", records); too = edit_int(LINES -3, 36, too, (char *)"Enter destination record number, other will move away"); if ((from == too) || (from == 0) || (too == 0) || (from > records) || (too > records)) { errmsg("That makes no sense"); diff --git a/mbsetup/m_farea.c b/mbsetup/m_farea.c index d6ea050f..51ac523a 100644 --- a/mbsetup/m_farea.c +++ b/mbsetup/m_farea.c @@ -208,35 +208,35 @@ void FileScreen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 4, 2, "8.4 EDIT FILE AREA"); + mbse_mvprintw( 4, 2, "8.4 EDIT FILE AREA"); set_color(CYAN, BLACK); - mvprintw( 6, 2, "1. Area Name"); - mvprintw( 7, 2, "2. Path"); - mvprintw( 8, 2, "3. Down Sec."); - mvprintw( 9, 2, "4. Upl. Sec."); - mvprintw(10, 2, "5. List Sec."); - mvprintw(11, 2, "6. Files.bbs"); - mvprintw(12, 2, "7. Available"); - mvprintw(13, 2, "8. Check new"); - mvprintw(14, 2, "9. Dupecheck"); - mvprintw(15, 2, "10. Free area"); - mvprintw(16, 2, "11. Direct DL"); - mvprintw(17, 2, "12. Pwd upl."); - mvprintw(18, 2, "13. Filefind"); + mbse_mvprintw( 6, 2, "1. Area Name"); + mbse_mvprintw( 7, 2, "2. Path"); + mbse_mvprintw( 8, 2, "3. Down Sec."); + mbse_mvprintw( 9, 2, "4. Upl. Sec."); + mbse_mvprintw(10, 2, "5. List Sec."); + mbse_mvprintw(11, 2, "6. Files.bbs"); + mbse_mvprintw(12, 2, "7. Available"); + mbse_mvprintw(13, 2, "8. Check new"); + mbse_mvprintw(14, 2, "9. Dupecheck"); + mbse_mvprintw(15, 2, "10. Free area"); + mbse_mvprintw(16, 2, "11. Direct DL"); + mbse_mvprintw(17, 2, "12. Pwd upl."); + mbse_mvprintw(18, 2, "13. Filefind"); - mvprintw(12,30, "14. Add alpha"); - mvprintw(13,30, "15. CDrom"); - mvprintw(14,30, "16. File req."); - mvprintw(15,30, "17. BBS Group"); - mvprintw(16,30, "18. New group"); - mvprintw(17,30, "19. Min. age"); - mvprintw(18,30, "20. Password"); + mbse_mvprintw(12,30, "14. Add alpha"); + mbse_mvprintw(13,30, "15. CDrom"); + mbse_mvprintw(14,30, "16. File req."); + mbse_mvprintw(15,30, "17. BBS Group"); + mbse_mvprintw(16,30, "18. New group"); + mbse_mvprintw(17,30, "19. Min. age"); + mbse_mvprintw(18,30, "20. Password"); - mvprintw(12,59, "21. DL days"); - mvprintw(13,59, "22. FD days"); - mvprintw(14,59, "23. Move area"); - mvprintw(15,59, "24. Archiver"); - mvprintw(16,59, "25. Upload"); + mbse_mvprintw(12,59, "21. DL days"); + mbse_mvprintw(13,59, "22. FD days"); + mbse_mvprintw(14,59, "23. Move area"); + mbse_mvprintw(15,59, "24. Archiver"); + mbse_mvprintw(16,59, "25. Upload"); } @@ -485,7 +485,7 @@ void EditFilearea(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 4, "8.4 FILE AREA SETUP"); + mbse_mvprintw( 5, 4, "8.4 FILE AREA SETUP"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/fareas.temp", getenv("MBSE_ROOT")); @@ -510,7 +510,7 @@ void EditFilearea(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-32s", o + i, area.Name); temp[37] = 0; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } @@ -536,9 +536,9 @@ void EditFilearea(void) if (strncmp(pick, "M", 1) == 0) { from = too = 0; - mvprintw(LINES -3, 5, "From"); + mbse_mvprintw(LINES -3, 5, "From"); from = edit_int(LINES -3, 10, from, (char *)"Wich ^area^ you want to move"); - mvprintw(LINES -3,15, "To"); + mbse_mvprintw(LINES -3,15, "To"); too = edit_int(LINES -3, 18, too, (char *)"Too which ^area^ to move"); sprintf(temp, "%s/etc/fareas.temp", getenv("MBSE_ROOT")); @@ -679,7 +679,7 @@ long PickFilearea(char *shdr) clr_index(); set_color(WHITE, BLACK); sprintf(temp, "%s. FILE AREA SELECT", shdr); - mvprintw(5,3,temp); + mbse_mvprintw(5,3,temp); set_color(CYAN, BLACK); if (records) { sprintf(temp, "%s/etc/fareas.data", getenv("MBSE_ROOT")); @@ -704,7 +704,7 @@ long PickFilearea(char *shdr) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-31s", o + i, area.Name); temp[38] = '\0'; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } diff --git a/mbsetup/m_fdb.c b/mbsetup/m_fdb.c index 5f96c827..225cc08c 100644 --- a/mbsetup/m_fdb.c +++ b/mbsetup/m_fdb.c @@ -48,23 +48,23 @@ void FHeader(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "14. EDIT FILE"); + mbse_mvprintw( 5, 2, "14. EDIT FILE"); set_color(CYAN, BLACK); - mvprintw( 7, 2, " FileName"); - mvprintw( 8, 2, " Long fn"); - mvprintw( 9, 2, " FileSize"); - mvprintw(10, 2, " FileDate"); - mvprintw(11, 2, " Last DL."); - mvprintw(12, 2, " Upl.Date"); - mvprintw(13, 2, " TIC area"); - mvprintw(14, 2, " Magic"); - mvprintw(15, 2, "1. Uploader"); - mvprintw(16, 2, "2. Times DL"); - mvprintw(17, 2, "3. Password"); + mbse_mvprintw( 7, 2, " FileName"); + mbse_mvprintw( 8, 2, " Long fn"); + mbse_mvprintw( 9, 2, " FileSize"); + mbse_mvprintw(10, 2, " FileDate"); + mbse_mvprintw(11, 2, " Last DL."); + mbse_mvprintw(12, 2, " Upl.Date"); + mbse_mvprintw(13, 2, " TIC area"); + mbse_mvprintw(14, 2, " Magic"); + mbse_mvprintw(15, 2, "1. Uploader"); + mbse_mvprintw(16, 2, "2. Times DL"); + mbse_mvprintw(17, 2, "3. Password"); - mvprintw(15,61, "4. Deleted"); - mvprintw(16,61, "5. No Kill"); - mvprintw(17,61, "6. Announced"); + mbse_mvprintw(15,61, "4. Deleted"); + mbse_mvprintw(16,61, "5. No Kill"); + mbse_mvprintw(17,61, "6. Announced"); } @@ -78,9 +78,9 @@ void EditFile() show_str( 7,16,12, fdb.Name); show_str( 8,16,64, fdb.LName); show_int( 9,16, fdb.Size); - mvprintw(10,16, (char *)"%s %s", StrDateDMY(fdb.FileDate), StrTimeHM(fdb.FileDate)); - mvprintw(11,16, (char *)"%s %s", StrDateDMY(fdb.LastDL), StrTimeHM(fdb.LastDL)); - mvprintw(12,16, (char *)"%s %s", StrDateDMY(fdb.UploadDate), StrTimeHM(fdb.UploadDate)); + mbse_mvprintw(10,16, (char *)"%s %s", StrDateDMY(fdb.FileDate), StrTimeHM(fdb.FileDate)); + mbse_mvprintw(11,16, (char *)"%s %s", StrDateDMY(fdb.LastDL), StrTimeHM(fdb.LastDL)); + mbse_mvprintw(12,16, (char *)"%s %s", StrDateDMY(fdb.UploadDate), StrTimeHM(fdb.UploadDate)); show_str(13,16,20, fdb.TicArea); show_str(14,16,20, fdb.Magic); show_str(15,16,36, fdb.Uploader); @@ -135,13 +135,13 @@ void E_F(long areanr) clr_index(); set_color(WHITE, BLACK); - mvprintw(5, 4, "14. EDIT FILES DATABASE"); + mbse_mvprintw(5, 4, "14. EDIT FILES DATABASE"); y = 8; working(1, 0, 0); set_color(YELLOW, BLUE); - mvprintw(7, 1, " Nr Filename Size Date Time Description "); + mbse_mvprintw(7, 1, " Nr Filename Size Date Time Description "); /* 1234 12345678901234 12345678 12-34-1998 12:45 123456789012345678901234567890*/ set_color(CYAN, BLACK); @@ -152,7 +152,7 @@ void E_F(long areanr) fread(&fdb, fdbhdr.recsize, 1, fil); set_color(WHITE, BLACK); - mvprintw(y, 1, (char *)"%4d.", o + i); + mbse_mvprintw(y, 1, (char *)"%4d.", o + i); sprintf(temp, "%s/%s", area.Path, fdb.LName); Ondisk = ((stat(temp, &statfile)) != -1); @@ -163,27 +163,27 @@ void E_F(long areanr) set_color(CYAN, BLACK); else set_color(LIGHTRED, BLACK); - mvprintw(y, 8, (char *)"%-14s", fdb.Name); + mbse_mvprintw(y, 8, (char *)"%-14s", fdb.Name); if (Ondisk) { if (fdb.Size == statfile.st_size) set_color(CYAN, BLACK); else set_color(LIGHTRED, BLACK); - mvprintw(y,23, (char *)"%8ld", fdb.Size); + mbse_mvprintw(y,23, (char *)"%8ld", fdb.Size); if (fdb.FileDate == statfile.st_mtime) set_color(CYAN, BLACK); else set_color(LIGHTRED, BLACK); Time = fdb.FileDate; - mvprintw(y,32, (char *)"%s %s", StrDateDMY(Time), StrTimeHM(Time)); + mbse_mvprintw(y,32, (char *)"%s %s", StrDateDMY(Time), StrTimeHM(Time)); } set_color(CYAN, BLACK); sprintf(temp, "%s", fdb.Desc[0]); temp[30] = '\0'; - mvprintw(y,49, (char *)"%s", temp); + mbse_mvprintw(y,49, (char *)"%s", temp); y++; } } @@ -199,10 +199,10 @@ void E_F(long areanr) showhelp(help); while(TRUE) { - mvprintw(LINES - 4, 6, "Enter your choice >"); + mbse_mvprintw(LINES - 4, 6, "Enter your choice >"); menu = (char *)"-"; menu = edit_field(LINES - 4, 26, 6, '!', menu); - locate(LINES - 4, 6); + mbse_locate(LINES - 4, 6); clrtoeol(); if (strncmp(menu, "-", 1) == 0) { @@ -282,7 +282,7 @@ void EditFDB() for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 4, "14. EDIT FILES DATABSE"); + mbse_mvprintw( 5, 4, "14. EDIT FILES DATABSE"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/fareas.data", getenv("MBSE_ROOT")); @@ -307,7 +307,7 @@ void EditFDB() set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-32s", o + i, area.Name); temp[37] = 0; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } diff --git a/mbsetup/m_ff.c b/mbsetup/m_ff.c index fab33cd4..5e85a1ed 100644 --- a/mbsetup/m_ff.c +++ b/mbsetup/m_ff.c @@ -214,20 +214,20 @@ void FFScreen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "13. EDIT FILEFIND AREAS"); + mbse_mvprintw( 5, 2, "13. EDIT FILEFIND AREAS"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Comment"); - mvprintw( 8, 2, "2. Origin"); - mvprintw( 9, 2, "3. Aka to use"); - mvprintw(10, 2, "4. Scan area"); - mvprintw(11, 2, "5. Reply area"); - mvprintw(12, 2, "6. Language"); - mvprintw(13, 2, "7. Template"); - mvprintw(14, 2, "8. Active"); - mvprintw(15, 2, "9. Deleted"); - mvprintw(16, 2, "10. Net. reply"); - mvprintw(17, 2, "11. Hi Ascii"); - mvprintw(18, 2, "12. Keywrd len"); + mbse_mvprintw( 7, 2, "1. Comment"); + mbse_mvprintw( 8, 2, "2. Origin"); + mbse_mvprintw( 9, 2, "3. Aka to use"); + mbse_mvprintw(10, 2, "4. Scan area"); + mbse_mvprintw(11, 2, "5. Reply area"); + mbse_mvprintw(12, 2, "6. Language"); + mbse_mvprintw(13, 2, "7. Template"); + mbse_mvprintw(14, 2, "8. Active"); + mbse_mvprintw(15, 2, "9. Deleted"); + mbse_mvprintw(16, 2, "10. Net. reply"); + mbse_mvprintw(17, 2, "11. Hi Ascii"); + mbse_mvprintw(18, 2, "12. Keywrd len"); } @@ -356,7 +356,7 @@ void EditFilefind(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 4, "13. FILEFIND AREAS"); + mbse_mvprintw( 5, 4, "13. FILEFIND AREAS"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/scanmgr.temp", getenv("MBSE_ROOT")); @@ -381,7 +381,7 @@ void EditFilefind(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-32s", o + i, scanmgr.Comment); temp[37] = 0; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } diff --git a/mbsetup/m_fgroup.c b/mbsetup/m_fgroup.c index 6a99e508..c0be3c22 100644 --- a/mbsetup/m_fgroup.c +++ b/mbsetup/m_fgroup.c @@ -263,41 +263,41 @@ void FgScreen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 4, 2, "10.1 EDIT FILE GROUP"); + mbse_mvprintw( 4, 2, "10.1 EDIT FILE GROUP"); set_color(CYAN, BLACK); - mvprintw( 6, 2, "1. Name"); - mvprintw( 7, 2, "2. Comment"); - mvprintw( 8, 2, "3. Base path"); - mvprintw( 9, 2, "4. Use Aka"); - mvprintw(10, 2, "5. Uplink"); - mvprintw(11, 2, "6. Areas"); - mvprintw(12, 2, "7. Filegate"); - mvprintw(13, 2, "8. Banner"); - mvprintw(14, 2, "9. Convert"); - mvprintw(15, 2, "10. BBS group"); - mvprintw(16, 2, "11. New group"); - mvprintw(17, 2, "12. Active"); - mvprintw(18, 2, "13. Deleted"); - mvprintw(19, 2, "14. Start at"); + mbse_mvprintw( 6, 2, "1. Name"); + mbse_mvprintw( 7, 2, "2. Comment"); + mbse_mvprintw( 8, 2, "3. Base path"); + mbse_mvprintw( 9, 2, "4. Use Aka"); + mbse_mvprintw(10, 2, "5. Uplink"); + mbse_mvprintw(11, 2, "6. Areas"); + mbse_mvprintw(12, 2, "7. Filegate"); + mbse_mvprintw(13, 2, "8. Banner"); + mbse_mvprintw(14, 2, "9. Convert"); + mbse_mvprintw(15, 2, "10. BBS group"); + mbse_mvprintw(16, 2, "11. New group"); + mbse_mvprintw(17, 2, "12. Active"); + mbse_mvprintw(18, 2, "13. Deleted"); + mbse_mvprintw(19, 2, "14. Start at"); - mvprintw(12,32, "15. Auto chng"); - mvprintw(13,32, "16. User chng"); - mvprintw(14,32, "17. Replace"); - mvprintw(15,32, "18. Dupecheck"); - mvprintw(16,32, "19. Secure"); - mvprintw(17,32, "20. Touch"); - mvprintw(18,32, "21. Virscan"); - mvprintw(19,32, "22. Announce"); + mbse_mvprintw(12,32, "15. Auto chng"); + mbse_mvprintw(13,32, "16. User chng"); + mbse_mvprintw(14,32, "17. Replace"); + mbse_mvprintw(15,32, "18. Dupecheck"); + mbse_mvprintw(16,32, "19. Secure"); + mbse_mvprintw(17,32, "20. Touch"); + mbse_mvprintw(18,32, "21. Virscan"); + mbse_mvprintw(19,32, "22. Announce"); - mvprintw(11,56, "23. Upd magic"); - mvprintw(12,56, "24. File ID"); - mvprintw(13,56, "25. Conv. all"); - mvprintw(14,56, "26. Send orig"); - mvprintw(15,56, "27. DL sec"); - mvprintw(16,56, "28. UP sec"); - mvprintw(17,56, "29. LT sec"); - mvprintw(18,56, "30. Upl. area"); - mvprintw(19,56, "31. Link sec"); + mbse_mvprintw(11,56, "23. Upd magic"); + mbse_mvprintw(12,56, "24. File ID"); + mbse_mvprintw(13,56, "25. Conv. all"); + mbse_mvprintw(14,56, "26. Send orig"); + mbse_mvprintw(15,56, "27. DL sec"); + mbse_mvprintw(16,56, "28. UP sec"); + mbse_mvprintw(17,56, "29. LT sec"); + mbse_mvprintw(18,56, "30. Upl. area"); + mbse_mvprintw(19,56, "31. Link sec"); } @@ -512,7 +512,7 @@ void EditFGroup(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 4, "10.1 FILE GROUPS SETUP"); + mbse_mvprintw( 5, 4, "10.1 FILE GROUPS SETUP"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/fgroups.temp", getenv("MBSE_ROOT")); @@ -537,7 +537,7 @@ void EditFGroup(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-12s %-18s", o + i, fgroup.Name, fgroup.Comment); temp[38] = '\0'; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } @@ -619,7 +619,7 @@ char *PickFGroup(char *shdr) clr_index(); set_color(WHITE, BLACK); sprintf(temp, "%s. FILE GROUP SELECT", shdr); - mvprintw( 5, 4, temp); + mbse_mvprintw( 5, 4, temp); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/fgroups.data", getenv("MBSE_ROOT")); @@ -644,7 +644,7 @@ char *PickFGroup(char *shdr) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-12s %-18s", o + i, fgroup.Name, fgroup.Comment); temp[38] = '\0'; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } diff --git a/mbsetup/m_fido.c b/mbsetup/m_fido.c index d1a25f56..90b36295 100644 --- a/mbsetup/m_fido.c +++ b/mbsetup/m_fido.c @@ -252,25 +252,25 @@ int EditFidoRec(int Area) crc = upd_crc32((char *)&fidonet, crc, sizeof(fidonet)); set_color(WHITE, BLACK); - mvprintw( 5, 6, "2. EDIT FIDONET NETWORK"); + mbse_mvprintw( 5, 6, "2. EDIT FIDONET NETWORK"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Comment"); - mvprintw( 8, 6, "2. Domain name"); - mvprintw( 9, 6, "3. Available"); - mvprintw(10, 6, "4. Deleted"); - mvprintw(11, 6, "5. Main Nodelist"); - mvprintw(12, 6, "6. Merge list #1"); - mvprintw(13, 6, "7. Merge list #2"); - mvprintw(14, 6, "8. Merge list #3"); - mvprintw(15, 6, "9. Merge list #4"); - mvprintw(16, 6, "10. Merge list #5"); - mvprintw(17, 6, "11. Merge list #6"); - mvprintw(12,55, "12. Primary zone"); - mvprintw(13,55, "13. Zone number #2"); - mvprintw(14,55, "14. Zone number #3"); - mvprintw(15,55, "15. Zone number #4"); - mvprintw(16,55, "16. Zone number #5"); - mvprintw(17,55, "17. Zone number #6"); + mbse_mvprintw( 7, 6, "1. Comment"); + mbse_mvprintw( 8, 6, "2. Domain name"); + mbse_mvprintw( 9, 6, "3. Available"); + mbse_mvprintw(10, 6, "4. Deleted"); + mbse_mvprintw(11, 6, "5. Main Nodelist"); + mbse_mvprintw(12, 6, "6. Merge list #1"); + mbse_mvprintw(13, 6, "7. Merge list #2"); + mbse_mvprintw(14, 6, "8. Merge list #3"); + mbse_mvprintw(15, 6, "9. Merge list #4"); + mbse_mvprintw(16, 6, "10. Merge list #5"); + mbse_mvprintw(17, 6, "11. Merge list #6"); + mbse_mvprintw(12,55, "12. Primary zone"); + mbse_mvprintw(13,55, "13. Zone number #2"); + mbse_mvprintw(14,55, "14. Zone number #3"); + mbse_mvprintw(15,55, "15. Zone number #4"); + mbse_mvprintw(16,55, "16. Zone number #5"); + mbse_mvprintw(17,55, "17. Zone number #6"); temp = calloc(18, sizeof(char)); for (;;) { @@ -405,7 +405,7 @@ void EditFidonet(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 4, "2. FIDONET SETUP"); + mbse_mvprintw( 5, 4, "2. FIDONET SETUP"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/fidonet.temp", getenv("MBSE_ROOT")); @@ -428,7 +428,7 @@ void EditFidonet(void) } sprintf(temp, "%3d. z%d: %-32s", i, fidonet.zone[0], fidonet.comment); temp[38] = 0; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } fclose(fil); diff --git a/mbsetup/m_global.c b/mbsetup/m_global.c index f98c5f39..da5f9b07 100644 --- a/mbsetup/m_global.c +++ b/mbsetup/m_global.c @@ -131,17 +131,17 @@ void e_reginfo(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "1.2 EDIT REGISTRATION INFO"); + mbse_mvprintw( 5, 6, "1.2 EDIT REGISTRATION INFO"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. System name"); - mvprintw( 8, 6, "2. Domain name"); - mvprintw( 9, 6, "3. Sysop uid"); - mvprintw(10, 6, "4. Sysop Fido"); - mvprintw(11, 6, "5. Location"); - mvprintw(12, 6, "6. QWK/Bluewave"); - mvprintw(13, 6, "7. Comment"); - mvprintw(14, 6, "8. Origin line"); - mvprintw(15, 6, "9. Startup uid"); + mbse_mvprintw( 7, 6, "1. System name"); + mbse_mvprintw( 8, 6, "2. Domain name"); + mbse_mvprintw( 9, 6, "3. Sysop uid"); + mbse_mvprintw(10, 6, "4. Sysop Fido"); + mbse_mvprintw(11, 6, "5. Location"); + mbse_mvprintw(12, 6, "6. QWK/Bluewave"); + mbse_mvprintw(13, 6, "7. Comment"); + mbse_mvprintw(14, 6, "8. Origin line"); + mbse_mvprintw(15, 6, "9. Startup uid"); for (;;) { set_color(WHITE, BLACK); @@ -177,16 +177,16 @@ void e_filenames(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "1.3 EDIT GLOBAL FILENAMES"); + mbse_mvprintw( 5, 6, "1.3 EDIT GLOBAL FILENAMES"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. System logfile"); - mvprintw( 8, 6, "2. Error logfile"); - mvprintw( 9, 6, "3. Debug logfile"); - mvprintw(10, 6, "4. Mgr logfile"); - mvprintw(11, 6, "5. Default Menu"); - mvprintw(12, 6, "6. Default Language"); - mvprintw(13, 6, "7. Chat Logfile"); - mvprintw(14, 6, "8. Welcome Logo"); + mbse_mvprintw( 7, 6, "1. System logfile"); + mbse_mvprintw( 8, 6, "2. Error logfile"); + mbse_mvprintw( 9, 6, "3. Debug logfile"); + mbse_mvprintw(10, 6, "4. Mgr logfile"); + mbse_mvprintw(11, 6, "5. Default Menu"); + mbse_mvprintw(12, 6, "6. Default Language"); + mbse_mvprintw(13, 6, "7. Chat Logfile"); + mbse_mvprintw(14, 6, "8. Welcome Logo"); for (;;) { set_color(WHITE, BLACK); @@ -219,22 +219,22 @@ void e_global2(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 4, 6, "1.4 EDIT GLOBAL PATHS - 2"); + mbse_mvprintw( 4, 6, "1.4 EDIT GLOBAL PATHS - 2"); set_color(CYAN, BLACK); - mvprintw( 6, 2, "1. Magic's"); - mvprintw( 7, 2, "2. DOS path"); - mvprintw( 8, 2, "3. Unix path"); - mvprintw( 9, 2, "4. LeaveCase"); - mvprintw(10, 2, "5. Nodelists"); - mvprintw(11, 2, "6. Inbound"); - mvprintw(12, 2, "7. Prot inb."); - mvprintw(13, 2, "8. Outbound"); - mvprintw(14, 2, "9. Out queue"); - mvprintw(15, 2, "10. *.msgs"); - mvprintw(16, 2, "11. Bad TIC's"); - mvprintw(17, 2, "12. TIC queue"); - mvprintw(18, 2, "13. TMail DOS"); - mvprintw(19, 2, "14. TMail Win"); + mbse_mvprintw( 6, 2, "1. Magic's"); + mbse_mvprintw( 7, 2, "2. DOS path"); + mbse_mvprintw( 8, 2, "3. Unix path"); + mbse_mvprintw( 9, 2, "4. LeaveCase"); + mbse_mvprintw(10, 2, "5. Nodelists"); + mbse_mvprintw(11, 2, "6. Inbound"); + mbse_mvprintw(12, 2, "7. Prot inb."); + mbse_mvprintw(13, 2, "8. Outbound"); + mbse_mvprintw(14, 2, "9. Out queue"); + mbse_mvprintw(15, 2, "10. *.msgs"); + mbse_mvprintw(16, 2, "11. Bad TIC's"); + mbse_mvprintw(17, 2, "12. TIC queue"); + mbse_mvprintw(18, 2, "13. TMail DOS"); + mbse_mvprintw(19, 2, "14. TMail Win"); for (;;) { set_color(WHITE, BLACK); @@ -283,17 +283,17 @@ void s_global(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 4, 6, "1.4 EDIT GLOBAL PATHS"); + mbse_mvprintw( 4, 6, "1.4 EDIT GLOBAL PATHS"); set_color(CYAN, BLACK); - mvprintw( 6, 2, "1. BBS menus"); - mvprintw( 7, 2, "2. Txtfiles"); - mvprintw( 8, 2, "3. Macro's"); - mvprintw( 9, 2, "4. Home dirs"); - mvprintw(10, 2, "5. Ftp base"); - mvprintw(11, 2, "6. Arealists"); - mvprintw(12, 2, "7. Ext. edit"); - mvprintw(13, 2, "8. Rules dir"); - mvprintw(14, 2, "9. Next Screen"); + mbse_mvprintw( 6, 2, "1. BBS menus"); + mbse_mvprintw( 7, 2, "2. Txtfiles"); + mbse_mvprintw( 8, 2, "3. Macro's"); + mbse_mvprintw( 9, 2, "4. Home dirs"); + mbse_mvprintw(10, 2, "5. Ftp base"); + mbse_mvprintw(11, 2, "6. Arealists"); + mbse_mvprintw(12, 2, "7. Ext. edit"); + mbse_mvprintw(13, 2, "8. Rules dir"); + mbse_mvprintw(14, 2, "9. Next Screen"); } @@ -336,32 +336,32 @@ void b_screen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "1.5 EDIT GLOBAL SETTINGS"); + mbse_mvprintw( 5, 2, "1.5 EDIT GLOBAL SETTINGS"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Exclude Sysop"); - mvprintw( 8, 2, "2. Show Connect"); - mvprintw( 9, 2, "3. Ask Protocols"); - mvprintw(10, 2, "4. Sysop Level"); - mvprintw(11, 2, "5. Password Length"); - mvprintw(12, 2, "6. Passwd Character"); - mvprintw(13, 2, "7. Idle timeout"); - mvprintw(14, 2, "8. Login Enters"); - mvprintw(15, 2, "9. Homedir Quota"); - mvprintw(16, 2, "10. Location length"); - mvprintw(17, 2, "11. Show new msgarea"); - mvprintw(18, 2, "12. OLR Max. msgs."); + mbse_mvprintw( 7, 2, "1. Exclude Sysop"); + mbse_mvprintw( 8, 2, "2. Show Connect"); + mbse_mvprintw( 9, 2, "3. Ask Protocols"); + mbse_mvprintw(10, 2, "4. Sysop Level"); + mbse_mvprintw(11, 2, "5. Password Length"); + mbse_mvprintw(12, 2, "6. Passwd Character"); + mbse_mvprintw(13, 2, "7. Idle timeout"); + mbse_mvprintw(14, 2, "8. Login Enters"); + mbse_mvprintw(15, 2, "9. Homedir Quota"); + mbse_mvprintw(16, 2, "10. Location length"); + mbse_mvprintw(17, 2, "11. Show new msgarea"); + mbse_mvprintw(18, 2, "12. OLR Max. msgs."); - mvprintw( 7,37, "13. OLR Newfile days"); - mvprintw( 8,37, "14. OLR Max Filereq"); - mvprintw( 9,37, "15. BBS Log Level"); - mvprintw(10,37, "16. Utils loglevel"); - mvprintw(11,37, "17. Utils slowly"); - mvprintw(12,37, "18. CrashMail level"); - mvprintw(13,37, "19. FileAttach level"); - mvprintw(14,37, "20. Min diskspace MB"); - mvprintw(15,37, "21. Simult. logins"); - mvprintw(16,37, "22. Child priority"); - mvprintw(17,37, "23. Filesystem sync"); + mbse_mvprintw( 7,37, "13. OLR Newfile days"); + mbse_mvprintw( 8,37, "14. OLR Max Filereq"); + mbse_mvprintw( 9,37, "15. BBS Log Level"); + mbse_mvprintw(10,37, "16. Utils loglevel"); + mbse_mvprintw(11,37, "17. Utils slowly"); + mbse_mvprintw(12,37, "18. CrashMail level"); + mbse_mvprintw(13,37, "19. FileAttach level"); + mbse_mvprintw(14,37, "20. Min diskspace MB"); + mbse_mvprintw(15,37, "21. Simult. logins"); + mbse_mvprintw(16,37, "22. Child priority"); + mbse_mvprintw(17,37, "23. Filesystem sync"); set_color(WHITE, BLACK); show_bool( 7,24, CFG.exclude_sysop); @@ -433,26 +433,26 @@ void s_newuser(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "1.7 EDIT NEW USERS DEFAULTS"); + mbse_mvprintw( 5, 6, "1.7 EDIT NEW USERS DEFAULTS"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Access level"); - mvprintw( 8, 6, "2. Cap. Username"); - mvprintw( 9, 6, "3. Ask ANSI"); - mvprintw(10, 6, "4. Ask Sex"); - mvprintw(11, 6, "5. Ask Voicephone"); - mvprintw(12, 6, "6. Ask Dataphone"); - mvprintw(13, 6, "7. Telephone scan"); - mvprintw(14, 6, "8. Ask Handle"); - mvprintw(15, 6, "9. Ask Birth date"); - mvprintw(16, 6, "10. Ask Location"); + mbse_mvprintw( 7, 6, "1. Access level"); + mbse_mvprintw( 8, 6, "2. Cap. Username"); + mbse_mvprintw( 9, 6, "3. Ask ANSI"); + mbse_mvprintw(10, 6, "4. Ask Sex"); + mbse_mvprintw(11, 6, "5. Ask Voicephone"); + mbse_mvprintw(12, 6, "6. Ask Dataphone"); + mbse_mvprintw(13, 6, "7. Telephone scan"); + mbse_mvprintw(14, 6, "8. Ask Handle"); + mbse_mvprintw(15, 6, "9. Ask Birth date"); + mbse_mvprintw(16, 6, "10. Ask Location"); - mvprintw( 8,46, "11. Ask Hot-Keys"); - mvprintw( 9,46, "12. One word names"); - mvprintw(10,46, "13. Ask Address"); - mvprintw(11,46, "14. Give email"); - mvprintw(12,46, "15. Ask screenlen"); - mvprintw(13,46, "16. Do Newmail"); - mvprintw(14,46, "17. Do newfiles"); + mbse_mvprintw( 8,46, "11. Ask Hot-Keys"); + mbse_mvprintw( 9,46, "12. One word names"); + mbse_mvprintw(10,46, "13. Ask Address"); + mbse_mvprintw(11,46, "14. Give email"); + mbse_mvprintw(12,46, "15. Ask screenlen"); + mbse_mvprintw(13,46, "16. Do Newmail"); + mbse_mvprintw(14,46, "17. Do newfiles"); } @@ -524,19 +524,19 @@ void e_colors(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "1.8 EDIT TEXT COLOURS"); + mbse_mvprintw( 5, 6, "1.8 EDIT TEXT COLOURS"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Normal text"); - mvprintw( 8, 6, "2. Underline"); - mvprintw( 9, 6, "3. Input lines"); - mvprintw(10, 6, "4. CR text"); - mvprintw(11, 6, "5. More prompt"); - mvprintw(12, 6, "6. Hilite text"); - mvprintw(13, 6, "7. File name"); - mvprintw(14, 6, "8. File size"); - mvprintw(15, 6, "9. File date"); - mvprintw(16, 6, "10. File descr."); - mvprintw(17, 6, "11. Msg. input"); + mbse_mvprintw( 7, 6, "1. Normal text"); + mbse_mvprintw( 8, 6, "2. Underline"); + mbse_mvprintw( 9, 6, "3. Input lines"); + mbse_mvprintw(10, 6, "4. CR text"); + mbse_mvprintw(11, 6, "5. More prompt"); + mbse_mvprintw(12, 6, "6. Hilite text"); + mbse_mvprintw(13, 6, "7. File name"); + mbse_mvprintw(14, 6, "8. File size"); + mbse_mvprintw(15, 6, "9. File date"); + mbse_mvprintw(16, 6, "10. File descr."); + mbse_mvprintw(17, 6, "11. Msg. input"); S_COL( 7,24, "Normal Text ", CFG.TextColourF, CFG.TextColourB) S_COL( 8,24, "Underline Text ", CFG.UnderlineColourF, CFG.UnderlineColourB) S_COL( 9,24, "Input Text ", CFG.InputColourF, CFG.InputColourB) @@ -572,15 +572,15 @@ void e_paging(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "1.9 EDIT SYSOP PAGING"); + mbse_mvprintw( 5, 2, "1.9 EDIT SYSOP PAGING"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Page Length"); - mvprintw( 8, 2, "2. Page Times"); - mvprintw( 9, 2, "3. Sysop Area"); - mvprintw(10, 2, "4. Ask Reason"); - mvprintw(11, 2, "5. Log Chat"); - mvprintw(12, 2, "6. Prompt Chk."); - mvprintw(13, 2, "7. Freeze Time"); + mbse_mvprintw( 7, 2, "1. Page Length"); + mbse_mvprintw( 8, 2, "2. Page Times"); + mbse_mvprintw( 9, 2, "3. Sysop Area"); + mbse_mvprintw(10, 2, "4. Ask Reason"); + mbse_mvprintw(11, 2, "5. Log Chat"); + mbse_mvprintw(12, 2, "6. Prompt Chk."); + mbse_mvprintw(13, 2, "7. Freeze Time"); for (;;) { set_color(WHITE, BLACK); @@ -615,19 +615,19 @@ void e_flags(int Users) clr_index(); set_color(WHITE, BLACK); if (Users) - mvprintw( 5, 6, "1.6 EDIT USER FLAG DESCRIPTIONS"); + mbse_mvprintw( 5, 6, "1.6 EDIT USER FLAG DESCRIPTIONS"); else - mvprintw( 5, 6, "1.16 EDIT MANAGER FLAG DESCRIPTIONS"); + mbse_mvprintw( 5, 6, "1.16 EDIT MANAGER FLAG DESCRIPTIONS"); set_color(CYAN, BLACK); for (i = 0; i < 32; i++) { if (i < 11) - mvprintw(i + 7, 2, (char *)"%d.", i+1); + mbse_mvprintw(i + 7, 2, (char *)"%d.", i+1); else if (i < 22) - mvprintw(i - 4, 28, (char *)"%d.", i+1); + mbse_mvprintw(i - 4, 28, (char *)"%d.", i+1); else - mvprintw(i - 15, 54, (char *)"%d.", i+1); + mbse_mvprintw(i - 15, 54, (char *)"%d.", i+1); } for (;;) { @@ -687,24 +687,24 @@ void e_ticconf(void) clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "1.10 EDIT FILEECHO PROCESSING"); + mbse_mvprintw( 5, 6, "1.10 EDIT FILEECHO PROCESSING"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Keep days"); - mvprintw( 8, 2, "2. Hatch pwd"); - mvprintw( 9, 2, "3. Systems"); - mvprintw(10, 2, "4. Groups"); - mvprintw(11, 2, "5. Max. dupes"); - mvprintw(12, 2, "6. Keep date"); - mvprintw(13, 2, "7. Keep netm"); + mbse_mvprintw( 7, 2, "1. Keep days"); + mbse_mvprintw( 8, 2, "2. Hatch pwd"); + mbse_mvprintw( 9, 2, "3. Systems"); + mbse_mvprintw(10, 2, "4. Groups"); + mbse_mvprintw(11, 2, "5. Max. dupes"); + mbse_mvprintw(12, 2, "6. Keep date"); + mbse_mvprintw(13, 2, "7. Keep netm"); - mvprintw( 7,42, "8. Loc resp"); - mvprintw( 8,42, "9. Plus all"); - mvprintw( 9,42, "10. Notify"); - mvprintw(10,42, "11. Passwd"); - mvprintw(11,42, "12. Message"); - mvprintw(12,42, "13. Tic on/off"); - mvprintw(13,42, "14. Pause"); + mbse_mvprintw( 7,42, "8. Loc resp"); + mbse_mvprintw( 8,42, "9. Plus all"); + mbse_mvprintw( 9,42, "10. Notify"); + mbse_mvprintw(10,42, "11. Passwd"); + mbse_mvprintw(11,42, "12. Message"); + mbse_mvprintw(12,42, "13. Tic on/off"); + mbse_mvprintw(13,42, "14. Pause"); for (;;) { set_color(WHITE, BLACK); @@ -773,28 +773,28 @@ void s_fidomailcfg(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 5, "1.11 EDIT FIDONET MAIL AND ECHOMAIL PROCESSING"); + mbse_mvprintw( 5, 5, "1.11 EDIT FIDONET MAIL AND ECHOMAIL PROCESSING"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Badboard"); - mvprintw( 8, 2, "2. Dupeboard"); - mvprintw( 9, 2, "3. Pktdate"); - mvprintw(10, 2, "4. Max pkts."); - mvprintw(11, 2, "5. Max arcs."); - mvprintw(12, 2, "6. Keep days"); - mvprintw(13, 2, "7. Echo dupes"); - mvprintw(14, 2, "8. Reject old"); - mvprintw(15, 2, "9. Max msgs"); - mvprintw(16, 1, "10. Days old"); - mvprintw(17, 1, "11. Max systems"); - mvprintw(18, 1, "12. Max groups"); + mbse_mvprintw( 7, 2, "1. Badboard"); + mbse_mvprintw( 8, 2, "2. Dupeboard"); + mbse_mvprintw( 9, 2, "3. Pktdate"); + mbse_mvprintw(10, 2, "4. Max pkts."); + mbse_mvprintw(11, 2, "5. Max arcs."); + mbse_mvprintw(12, 2, "6. Keep days"); + mbse_mvprintw(13, 2, "7. Echo dupes"); + mbse_mvprintw(14, 2, "8. Reject old"); + mbse_mvprintw(15, 2, "9. Max msgs"); + mbse_mvprintw(16, 1, "10. Days old"); + mbse_mvprintw(17, 1, "11. Max systems"); + mbse_mvprintw(18, 1, "12. Max groups"); - mvprintw(12,42, "13. 4d address"); - mvprintw(13,42, "14. Split at"); - mvprintw(14,42, "15. Force at"); - mvprintw(15,42, "16. Allow +*"); - mvprintw(16,42, "17. Notify"); - mvprintw(17,42, "18. Passwd"); - mvprintw(18,42, "19. Pause"); + mbse_mvprintw(12,42, "13. 4d address"); + mbse_mvprintw(13,42, "14. Split at"); + mbse_mvprintw(14,42, "15. Force at"); + mbse_mvprintw(15,42, "16. Allow +*"); + mbse_mvprintw(16,42, "17. Notify"); + mbse_mvprintw(17,42, "18. Passwd"); + mbse_mvprintw(18,42, "19. Pause"); set_color(WHITE, BLACK); show_str( 7,16,64, CFG.badboard); @@ -881,42 +881,42 @@ void s_intmailcfg(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 5, "1.12 EDIT INTERNET MAIL AND NEWS PROCESSING"); + mbse_mvprintw( 5, 5, "1.12 EDIT INTERNET MAIL AND NEWS PROCESSING"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. POP3 node"); - mvprintw( 8, 2, "2. Usr@domain"); - mvprintw( 9, 2, "3. SMTP node"); + mbse_mvprintw( 7, 2, "1. POP3 node"); + mbse_mvprintw( 8, 2, "2. Usr@domain"); + mbse_mvprintw( 9, 2, "3. SMTP node"); switch (CFG.newsfeed) { - case FEEDINN: mvprintw(10, 2, "4. N/A"); - mvprintw(11, 2, "5. NNTP node"); - mvprintw(12, 2, "6. NNTP m.r."); - mvprintw(13, 2, "7. NNTP user"); - mvprintw(14, 2, "8. NNTP pass"); + case FEEDINN: mbse_mvprintw(10, 2, "4. N/A"); + mbse_mvprintw(11, 2, "5. NNTP node"); + mbse_mvprintw(12, 2, "6. NNTP m.r."); + mbse_mvprintw(13, 2, "7. NNTP user"); + mbse_mvprintw(14, 2, "8. NNTP pass"); break; - case FEEDRNEWS: mvprintw(10, 2, "4. Path rnews"); - mvprintw(11, 2, "5. N/A"); - mvprintw(12, 2, "6. N/A"); - mvprintw(13, 2, "7. N/A"); - mvprintw(14, 2, "8. N/A"); + case FEEDRNEWS: mbse_mvprintw(10, 2, "4. Path rnews"); + mbse_mvprintw(11, 2, "5. N/A"); + mbse_mvprintw(12, 2, "6. N/A"); + mbse_mvprintw(13, 2, "7. N/A"); + mbse_mvprintw(14, 2, "8. N/A"); break; - case FEEDUUCP: mvprintw(10, 2, "4. UUCP path"); - mvprintw(11, 2, "5. UUCP node"); - mvprintw(12, 2, "6. N/A"); - mvprintw(13, 2, "7. N/A"); - mvprintw(14, 2, "8. N/A"); + case FEEDUUCP: mbse_mvprintw(10, 2, "4. UUCP path"); + mbse_mvprintw(11, 2, "5. UUCP node"); + mbse_mvprintw(12, 2, "6. N/A"); + mbse_mvprintw(13, 2, "7. N/A"); + mbse_mvprintw(14, 2, "8. N/A"); break; } - mvprintw(15, 2, "9. News dupes"); - mvprintw(16, 1, "10. Email aka"); - mvprintw(17, 1, "11. UUCP aka"); - mvprintw(18, 1, "12. Emailmode"); + mbse_mvprintw(15, 2, "9. News dupes"); + mbse_mvprintw(16, 1, "10. Email aka"); + mbse_mvprintw(17, 1, "11. UUCP aka"); + mbse_mvprintw(18, 1, "12. Emailmode"); - mvprintw(13,42, "13. Articles"); - mvprintw(14,42, "14. News mode"); - mvprintw(15,42, "15. Split at"); - mvprintw(16,42, "16. Force at"); - mvprintw(17,42, "17. Control ok"); - mvprintw(18,42, "18. No regate"); + mbse_mvprintw(13,42, "13. Articles"); + mbse_mvprintw(14,42, "14. News mode"); + mbse_mvprintw(15,42, "15. Split at"); + mbse_mvprintw(16,42, "16. Force at"); + mbse_mvprintw(17,42, "17. Control ok"); + mbse_mvprintw(18,42, "18. No regate"); set_color(WHITE, BLACK); show_str( 7,16,64, CFG.popnode); @@ -959,13 +959,13 @@ void e_uucp(void) clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "1.12 EDIT UUCP GATEWAY"); + mbse_mvprintw( 5, 6, "1.12 EDIT UUCP GATEWAY"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Zone"); - mvprintw( 8, 6, "2. Net"); - mvprintw( 9, 6, "3. Node"); - mvprintw(10, 6, "4. Point"); - mvprintw(11, 6, "5. Domain"); + mbse_mvprintw( 7, 6, "1. Zone"); + mbse_mvprintw( 8, 6, "2. Net"); + mbse_mvprintw( 9, 6, "3. Node"); + mbse_mvprintw(10, 6, "4. Point"); + mbse_mvprintw(11, 6, "5. Domain"); for (;;) { set_color(WHITE, BLACK); @@ -1044,11 +1044,11 @@ void s_newfiles(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "1.13 ALLFILES & NEWFILES LISTINGS"); + mbse_mvprintw( 5, 2, "1.13 ALLFILES & NEWFILES LISTINGS"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. New days"); - mvprintw( 8, 2, "2. Security"); - mvprintw( 9, 2, "3. Groups"); + mbse_mvprintw( 7, 2, "1. New days"); + mbse_mvprintw( 8, 2, "2. Security"); + mbse_mvprintw( 9, 2, "3. Groups"); } @@ -1094,14 +1094,14 @@ void e_aka(int Area) clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "1.1 EDIT AKA"); + mbse_mvprintw( 5, 6, "1.1 EDIT AKA"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Zone"); - mvprintw( 8, 6, "2. Net"); - mvprintw( 9, 6, "3. Node"); - mvprintw(10, 6, "4. Point"); - mvprintw(11, 6, "5. Domain"); - mvprintw(12, 6, "6. Active"); + mbse_mvprintw( 7, 6, "1. Zone"); + mbse_mvprintw( 8, 6, "2. Net"); + mbse_mvprintw( 9, 6, "3. Node"); + mbse_mvprintw(10, 6, "4. Point"); + mbse_mvprintw(11, 6, "5. Domain"); + mbse_mvprintw(12, 6, "6. Active"); for (;;) { set_color(WHITE, BLACK); @@ -1136,7 +1136,7 @@ void e_fidoakas(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "1.1 EDIT FIDONET AKA'S"); + mbse_mvprintw( 5, 2, "1.1 EDIT FIDONET AKA'S"); set_color(CYAN, BLACK); x = 2; y = 7; @@ -1156,7 +1156,7 @@ void e_fidoakas(void) temp[38] = '\0'; } else sprintf(temp, "%3d", o+i); - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } @@ -1207,11 +1207,11 @@ void e_fidoakas(void) if (strncmp(pick, "M", 1) == 0) { from = too = 0; - mvprintw(LINES -3, 6, "Enter aka number (1..40) to move >"); + mbse_mvprintw(LINES -3, 6, "Enter aka number (1..40) to move >"); from = edit_int(LINES -3, 42, from, (char *)"Enter record number"); - locate(LINES -3, 6); + mbse_locate(LINES -3, 6); clrtoeol(); - mvprintw(LINES -3, 6, "Enter new position (1..40) >"); + mbse_mvprintw(LINES -3, 6, "Enter new position (1..40) >"); too = edit_int(LINES -3, 36, too, (char *)"Enter destination record number"); if ((from == too) || (from == 0) || (too == 0) || (from > 40) || (too > 40)) { errmsg("That makes no sense"); @@ -1242,32 +1242,32 @@ void s_mailer(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "1.14 EDIT MAILER SETTINGS"); + mbse_mvprintw( 5, 2, "1.14 EDIT MAILER SETTINGS"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Mailer logl."); - mvprintw( 8, 2, "2. TCP/IP \"phone\""); - mvprintw( 9, 2, "3. TCP/IP flags"); - mvprintw(10, 2, "4. TCP/IP speed"); - mvprintw(11, 2, "5. Timeout reset"); - mvprintw(12, 2, "6. Timeout connect"); - mvprintw(13, 2, "7. Dial delay"); - mvprintw(14, 2, "8. No Filerequests"); - mvprintw(15, 2, "9. No callout"); - mvprintw(16, 2, "10. No EMSI session"); - mvprintw(17, 2, "11. No Yooho/2U2"); + mbse_mvprintw( 7, 2, "1. Mailer logl."); + mbse_mvprintw( 8, 2, "2. TCP/IP \"phone\""); + mbse_mvprintw( 9, 2, "3. TCP/IP flags"); + mbse_mvprintw(10, 2, "4. TCP/IP speed"); + mbse_mvprintw(11, 2, "5. Timeout reset"); + mbse_mvprintw(12, 2, "6. Timeout connect"); + mbse_mvprintw(13, 2, "7. Dial delay"); + mbse_mvprintw(14, 2, "8. No Filerequests"); + mbse_mvprintw(15, 2, "9. No callout"); + mbse_mvprintw(16, 2, "10. No EMSI session"); + mbse_mvprintw(17, 2, "11. No Yooho/2U2"); - mvprintw(13,31, "12. No Zmodem"); - mvprintw(14,31, "13. No Zedzap"); - mvprintw(15,31, "14. No Hydra"); - mvprintw(16,31, "15. No MD5"); - mvprintw(17,31, "16. Zero Locks OK"); + mbse_mvprintw(13,31, "12. No Zmodem"); + mbse_mvprintw(14,31, "13. No Zedzap"); + mbse_mvprintw(15,31, "14. No Hydra"); + mbse_mvprintw(16,31, "15. No MD5"); + mbse_mvprintw(17,31, "16. Zero Locks OK"); - mvprintw(12,59, "17. Phonetrans 1-10"); - mvprintw(13,59, "18. Phonetrans 11-20"); - mvprintw(14,59, "19. Phonetrans 21-30"); - mvprintw(15,59, "20. Phonetrans 31-40"); - mvprintw(16,59, "21. Max. files"); - mvprintw(17,59, "22. Max. MB."); + mbse_mvprintw(12,59, "17. Phonetrans 1-10"); + mbse_mvprintw(13,59, "18. Phonetrans 11-20"); + mbse_mvprintw(14,59, "19. Phonetrans 21-30"); + mbse_mvprintw(15,59, "20. Phonetrans 31-40"); + mbse_mvprintw(16,59, "21. Max. files"); + mbse_mvprintw(17,59, "22. Max. MB."); } @@ -1279,12 +1279,12 @@ void e_trans(int start, int item) clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "1.14.%d EDIT PHONE TRANSLATION", item); + mbse_mvprintw( 5, 6, "1.14.%d EDIT PHONE TRANSLATION", item); set_color(CYAN, BLACK); - mvprintw( 7, 12, "String to match String to replace"); + mbse_mvprintw( 7, 12, "String to match String to replace"); for (i = 0; i < 10; i++) { sprintf(temp, "%2d.", i+1); - mvprintw( 9+i, 6, temp); + mbse_mvprintw( 9+i, 6, temp); } for (;;) { set_color(WHITE, BLACK); @@ -1367,15 +1367,15 @@ void e_html(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "1.15 EDIT HTML SETTINGS"); + mbse_mvprintw( 5, 2, "1.15 EDIT HTML SETTINGS"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Docs root"); - mvprintw( 8, 2, "2. Link to ftp"); - mvprintw( 9, 2, "3. URL name"); - mvprintw(10, 2, "4. Charset"); - mvprintw(11, 2, "5. Author name"); - mvprintw(12, 2, "6. Convert cmd"); - mvprintw(13, 2, "7. Files/page"); + mbse_mvprintw( 7, 2, "1. Docs root"); + mbse_mvprintw( 8, 2, "2. Link to ftp"); + mbse_mvprintw( 9, 2, "3. URL name"); + mbse_mvprintw(10, 2, "4. Charset"); + mbse_mvprintw(11, 2, "5. Author name"); + mbse_mvprintw(12, 2, "6. Convert cmd"); + mbse_mvprintw(13, 2, "7. Files/page"); set_color(WHITE, BLACK); show_str( 7,18,59, CFG.www_root); @@ -1483,25 +1483,25 @@ void global_menu(void) clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "1. GLOBAL SETUP"); + mbse_mvprintw( 5, 6, "1. GLOBAL SETUP"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Edit Fidonet Aka's"); - mvprintw( 8, 6, "2. Edit Registration Info"); - mvprintw( 9, 6, "3. Edit Global Filenames"); - mvprintw(10, 6, "4. Edit Global Paths"); - mvprintw(11, 6, "5. Edit Global Settings"); - mvprintw(12, 6, "6. Edit User flag Descriptions"); - mvprintw(13, 6, "7. Edit New Users defaults"); - mvprintw(14, 6, "8. Edit Text Colors"); + mbse_mvprintw( 7, 6, "1. Edit Fidonet Aka's"); + mbse_mvprintw( 8, 6, "2. Edit Registration Info"); + mbse_mvprintw( 9, 6, "3. Edit Global Filenames"); + mbse_mvprintw(10, 6, "4. Edit Global Paths"); + mbse_mvprintw(11, 6, "5. Edit Global Settings"); + mbse_mvprintw(12, 6, "6. Edit User flag Descriptions"); + mbse_mvprintw(13, 6, "7. Edit New Users defaults"); + mbse_mvprintw(14, 6, "8. Edit Text Colors"); - mvprintw( 7,46, "9. Edit Sysop Paging"); - mvprintw( 8,46, "10. Edit Files Processing"); - mvprintw( 9,46, "11. Edit Fidonet Mail/Echomail"); - mvprintw(10,46, "12. Edit Internet Mail/News"); - mvprintw(11,46, "13. Edit All-/Newfiles lists"); - mvprintw(12,46, "14. Edit Mailer global setup"); - mvprintw(13,46, "15. Edit HTML pages setup"); - mvprintw(14,46, "16. Edit Mgr flag descriptions"); + mbse_mvprintw( 7,46, "9. Edit Sysop Paging"); + mbse_mvprintw( 8,46, "10. Edit Files Processing"); + mbse_mvprintw( 9,46, "11. Edit Fidonet Mail/Echomail"); + mbse_mvprintw(10,46, "12. Edit Internet Mail/News"); + mbse_mvprintw(11,46, "13. Edit All-/Newfiles lists"); + mbse_mvprintw(12,46, "14. Edit Mailer global setup"); + mbse_mvprintw(13,46, "15. Edit HTML pages setup"); + mbse_mvprintw(14,46, "16. Edit Mgr flag descriptions"); switch(select_menu(16)) { case 0: @@ -1587,7 +1587,7 @@ int PickAka(char *msg, int openit) clr_index(); set_color(WHITE, BLACK); sprintf(temp, "%s. AKA SELECT", msg); - mvprintw( 5, 4, temp); + mbse_mvprintw( 5, 4, temp); set_color(CYAN, BLACK); x = 2; y = 7; @@ -1605,7 +1605,7 @@ int PickAka(char *msg, int openit) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d", o+i); } - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } diff --git a/mbsetup/m_hatch.c b/mbsetup/m_hatch.c index 3568dbb4..3ae8daea 100644 --- a/mbsetup/m_hatch.c +++ b/mbsetup/m_hatch.c @@ -226,18 +226,18 @@ void HatchScreen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "10.3 EDIT HATCH MANAGER"); + mbse_mvprintw( 5, 2, "10.3 EDIT HATCH MANAGER"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Mask"); - mvprintw( 8, 2, "2. Area"); - mvprintw( 9, 2, "3. Replace"); - mvprintw(10, 2, "4. Magic"); - mvprintw(11, 2, "5. Desc"); - mvprintw(12, 2, "6. Dupe"); - mvprintw(13, 2, "7. Active"); - mvprintw(14, 2, "8. Deleted"); - mvprintw(15, 2, "9. Days"); - mvprintw(16, 2, "10. Month"); + mbse_mvprintw( 7, 2, "1. Mask"); + mbse_mvprintw( 8, 2, "2. Area"); + mbse_mvprintw( 9, 2, "3. Replace"); + mbse_mvprintw(10, 2, "4. Magic"); + mbse_mvprintw(11, 2, "5. Desc"); + mbse_mvprintw(12, 2, "6. Dupe"); + mbse_mvprintw(13, 2, "7. Active"); + mbse_mvprintw(14, 2, "8. Deleted"); + mbse_mvprintw(15, 2, "9. Days"); + mbse_mvprintw(16, 2, "10. Month"); } @@ -250,12 +250,12 @@ void EditDates(void) clr_index(); for (;;) { set_color(WHITE, BLACK); - mvprintw( 5, 6, "10.3.9 EDIT DATES IN MONTH"); + mbse_mvprintw( 5, 6, "10.3.9 EDIT DATES IN MONTH"); set_color(CYAN, BLACK); y = 7; x = 5; for (i = 0; i < 32; i++) { - mvprintw(y, x, (char *)"%2d. %s", i+1, Month[i]); + mbse_mvprintw(y, x, (char *)"%2d. %s", i+1, Month[i]); y++; if (y == 17) { y = 7; @@ -307,10 +307,10 @@ void EditDays(void) clr_index(); for (;;) { set_color(WHITE, BLACK); - mvprintw( 5, 6, "10.3.8 EDIT DAYS IN WEEK"); + mbse_mvprintw( 5, 6, "10.3.8 EDIT DAYS IN WEEK"); set_color(CYAN, BLACK); for (i = 0; i < 7; i++) - mvprintw(7+i, 6, (char *)"%d. %s", i+1, Days[i]); + mbse_mvprintw(7+i, 6, (char *)"%d. %s", i+1, Days[i]); set_color(WHITE, BLACK); for (i = 0; i < 7; i++) show_bool(7+i,14, hatch.Days[i]); @@ -481,7 +481,7 @@ void EditHatch(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 4, "10.3. HATCH MANAGER"); + mbse_mvprintw( 5, 4, "10.3. HATCH MANAGER"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/hatch.temp", getenv("MBSE_ROOT")); @@ -506,7 +506,7 @@ void EditHatch(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-32s", o + i, hatch.Spec); temp[37] = 0; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } diff --git a/mbsetup/m_lang.c b/mbsetup/m_lang.c index fe3c0e07..d4cc5a6d 100644 --- a/mbsetup/m_lang.c +++ b/mbsetup/m_lang.c @@ -274,17 +274,17 @@ void s_lang(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "8.2 EDIT LANGUAGE"); + mbse_mvprintw( 5, 2, "8.2 EDIT LANGUAGE"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Select"); - mvprintw( 8, 2, "2. Name"); - mvprintw( 9, 2, "3. Menupath"); - mvprintw(10, 2, "4. Textpath"); - mvprintw(11, 2, "5. Macropath"); - mvprintw(12, 2, "6. Available"); - mvprintw(13, 2, "7. Datafile"); - mvprintw(14, 2, "8. Security"); - mvprintw(15, 2, "9. Deleted"); + mbse_mvprintw( 7, 2, "1. Select"); + mbse_mvprintw( 8, 2, "2. Name"); + mbse_mvprintw( 9, 2, "3. Menupath"); + mbse_mvprintw(10, 2, "4. Textpath"); + mbse_mvprintw(11, 2, "5. Macropath"); + mbse_mvprintw(12, 2, "6. Available"); + mbse_mvprintw(13, 2, "7. Datafile"); + mbse_mvprintw(14, 2, "8. Security"); + mbse_mvprintw(15, 2, "9. Deleted"); } @@ -402,7 +402,7 @@ void EditLanguage(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "8.2 LANGUAGE SETUP"); + mbse_mvprintw( 5, 6, "8.2 LANGUAGE SETUP"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/language.temp", getenv("MBSE_ROOT")); @@ -421,7 +421,7 @@ void EditLanguage(void) else set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %s %-30s", i, lang.LangKey, lang.Name); - mvprintw(i + 6, x, temp); + mbse_mvprintw(i + 6, x, temp); } fclose(fil); } @@ -486,7 +486,7 @@ int PickLanguage(char *nr) clr_index(); set_color(WHITE, BLACK); sprintf(temp, "%s. LANGUAGE SELECT", nr); - mvprintw( 5, 4, temp); + mbse_mvprintw( 5, 4, temp); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/language.data", getenv("MBSE_ROOT")); @@ -505,7 +505,7 @@ int PickLanguage(char *nr) else set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %s %-28s", i, lang.LangKey, lang.Name); - mvprintw(i + 6, x, temp); + mbse_mvprintw(i + 6, x, temp); } strcpy(pick, select_pick(records, 20)); diff --git a/mbsetup/m_limits.c b/mbsetup/m_limits.c index 4a2dee95..fefad9ce 100644 --- a/mbsetup/m_limits.c +++ b/mbsetup/m_limits.c @@ -295,15 +295,15 @@ int EditLimRec(int Area) crc = upd_crc32((char *)&LIMIT, crc, sizeof(LIMIT)); set_color(WHITE, BLACK); - mvprintw( 5, 6, "8.1 EDIT SECURITY LIMIT"); + mbse_mvprintw( 5, 6, "8.1 EDIT SECURITY LIMIT"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Access Level"); - mvprintw( 8, 6, "2. Maximum Time"); - mvprintw( 9, 6, "3. Download Kb."); - mvprintw(10, 6, "4. Download Files"); - mvprintw(11, 6, "5. Description"); - mvprintw(12, 6, "6. Available"); - mvprintw(13, 6, "7. Deleted"); + mbse_mvprintw( 7, 6, "1. Access Level"); + mbse_mvprintw( 8, 6, "2. Maximum Time"); + mbse_mvprintw( 9, 6, "3. Download Kb."); + mbse_mvprintw(10, 6, "4. Download Files"); + mbse_mvprintw(11, 6, "5. Description"); + mbse_mvprintw(12, 6, "6. Available"); + mbse_mvprintw(13, 6, "7. Deleted"); for (;;) { set_color(WHITE, BLACK); @@ -380,7 +380,7 @@ void EditLimits(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 7, "8.1 LIMITS SETUP"); + mbse_mvprintw( 5, 7, "8.1 LIMITS SETUP"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/limits.temp", getenv("MBSE_ROOT")); @@ -403,7 +403,7 @@ void EditLimits(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-6ld %-40s", i, LIMIT.Security, LIMIT.Description); temp[37] = '\0'; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } fclose(fil); @@ -468,7 +468,7 @@ char *PickLimits(int nr) clr_index(); set_color(WHITE, BLACK); sprintf(temp, "%d. LIMITS SELECT", nr); - mvprintw( 5, 4, temp); + mbse_mvprintw( 5, 4, temp); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/limits.data", getenv("MBSE_ROOT")); @@ -491,7 +491,7 @@ char *PickLimits(int nr) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-6ld %-40s", i, LIMIT.Security, LIMIT.Description); temp[37] = '\0'; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } strcpy(pick, select_pick(records, 20)); diff --git a/mbsetup/m_magic.c b/mbsetup/m_magic.c index ced7c150..2fb91912 100644 --- a/mbsetup/m_magic.c +++ b/mbsetup/m_magic.c @@ -210,33 +210,33 @@ void ScreenM(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "10.4. EDIT MAGIC"); + mbse_mvprintw( 5, 2, "10.4. EDIT MAGIC"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Magic"); - mvprintw( 8, 2, "2. Filemask"); - mvprintw( 9, 2, "3. Active"); - mvprintw(10, 2, "4. Deleted"); - mvprintw(11, 2, "5. Area"); + mbse_mvprintw( 7, 2, "1. Magic"); + mbse_mvprintw( 8, 2, "2. Filemask"); + mbse_mvprintw( 9, 2, "3. Active"); + mbse_mvprintw(10, 2, "4. Deleted"); + mbse_mvprintw(11, 2, "5. Area"); switch(magic.Attrib) { case MG_ADOPT: case MG_MOVE: - mvprintw(12, 2, "6. To Area"); + mbse_mvprintw(12, 2, "6. To Area"); break; case MG_EXEC: - mvprintw(12, 2, "6. Command"); - mvprintw(13, 2, "7. Compile"); + mbse_mvprintw(12, 2, "6. Command"); + mbse_mvprintw(13, 2, "7. Compile"); break; case MG_COPY: case MG_UNPACK: - mvprintw(12, 2, "6. To path"); - mvprintw(13, 2, "7. Compile"); + mbse_mvprintw(12, 2, "6. To path"); + mbse_mvprintw(13, 2, "7. Compile"); break; case MG_KEEPNUM: - mvprintw(12, 2, "6. Keep Num"); + mbse_mvprintw(12, 2, "6. Keep Num"); break; } } @@ -411,7 +411,7 @@ void EditMagics(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "10.4. MAGICS EDITOR"); + mbse_mvprintw( 5, 2, "10.4. MAGICS EDITOR"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/magic.temp", getenv("MBSE_ROOT")); @@ -436,7 +436,7 @@ void EditMagics(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %s %s", o + i, getmagictype(magic.Attrib), magic.Mask); temp[37] = 0; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } diff --git a/mbsetup/m_mail.c b/mbsetup/m_mail.c index 36c92baa..3b58ee74 100644 --- a/mbsetup/m_mail.c +++ b/mbsetup/m_mail.c @@ -54,10 +54,10 @@ void mail_menu(void) clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "9. MAIL PROCESSING"); + mbse_mvprintw( 5, 6, "9. MAIL PROCESSING"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Edit Echomail Groups"); - mvprintw( 8, 6, "2. Edit Echomail Areas"); + mbse_mvprintw( 7, 6, "1. Edit Echomail Groups"); + mbse_mvprintw( 8, 6, "2. Edit Echomail Areas"); switch(select_menu(2)) { case 0: diff --git a/mbsetup/m_marea.c b/mbsetup/m_marea.c index 8641350c..c1ff5b5b 100644 --- a/mbsetup/m_marea.c +++ b/mbsetup/m_marea.c @@ -374,14 +374,14 @@ void EditSystem(sysconnect *Sys) if (refresh) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5,6, "9.2.26 EDIT CONNECTION"); + mbse_mvprintw( 5,6, "9.2.26 EDIT CONNECTION"); set_color(CYAN, BLACK); - mvprintw( 7,6, "1. Aka"); - mvprintw( 8,6, "2. Send to"); - mvprintw( 9,6, "3. Recv from"); - mvprintw(10,6, "4. Pause"); - mvprintw(11,6, "5. Excluded"); - mvprintw(12,6, "6. Delete"); + mbse_mvprintw( 7,6, "1. Aka"); + mbse_mvprintw( 8,6, "2. Send to"); + mbse_mvprintw( 9,6, "3. Recv from"); + mbse_mvprintw(10,6, "4. Pause"); + mbse_mvprintw(11,6, "5. Excluded"); + mbse_mvprintw(12,6, "6. Delete"); refresh = FALSE; } set_color(WHITE, BLACK); @@ -437,7 +437,7 @@ int EditConnections(FILE *fil) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 5, "9.2.29 MESSAGE AREA CONNECTIONS"); + mbse_mvprintw( 5, 5, "9.2.29 MESSAGE AREA CONNECTIONS"); set_color(CYAN, BLACK); y = 7; x = 2; @@ -471,7 +471,7 @@ int EditConnections(FILE *fil) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d.", o+i); } - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } @@ -507,50 +507,50 @@ void SetScreen() { clr_index(); set_color(WHITE, BLACK); - mvprintw( 4, 2, "9.2 EDIT MESSAGE AREA"); + mbse_mvprintw( 4, 2, "9.2 EDIT MESSAGE AREA"); set_color(CYAN, BLACK); - mvprintw( 6, 2, "1. Area Name"); - mvprintw( 7, 2, "2. FTN area"); - mvprintw( 8, 2, "3. Group"); - mvprintw( 9, 2, "4. Newsgroup"); - mvprintw(10, 2, "5. JAM base"); - mvprintw(11, 2, "6. Origin"); - mvprintw(12, 2, "7. Fido Aka"); - mvprintw(13, 2, "8. QWK name"); - mvprintw(14, 2, "9. Distrib."); - mvprintw(15, 2, "10. Area Type"); - mvprintw(16, 2, "11. Msg Kinds"); - mvprintw(17, 2, "12. Charset"); - mvprintw(18, 2, "13. Active"); - mvprintw(19, 2, "14. Days Old"); + mbse_mvprintw( 6, 2, "1. Area Name"); + mbse_mvprintw( 7, 2, "2. FTN area"); + mbse_mvprintw( 8, 2, "3. Group"); + mbse_mvprintw( 9, 2, "4. Newsgroup"); + mbse_mvprintw(10, 2, "5. JAM base"); + mbse_mvprintw(11, 2, "6. Origin"); + mbse_mvprintw(12, 2, "7. Fido Aka"); + mbse_mvprintw(13, 2, "8. QWK name"); + mbse_mvprintw(14, 2, "9. Distrib."); + mbse_mvprintw(15, 2, "10. Area Type"); + mbse_mvprintw(16, 2, "11. Msg Kinds"); + mbse_mvprintw(17, 2, "12. Charset"); + mbse_mvprintw(18, 2, "13. Active"); + mbse_mvprintw(19, 2, "14. Days Old"); - mvprintw(13,34, "15. Max. Msgs"); + mbse_mvprintw(13,34, "15. Max. Msgs"); switch (msgs.Type) { - case ECHOMAIL: mvprintw(14,34, "16. Netreply"); + case ECHOMAIL: mbse_mvprintw(14,34, "16. Netreply"); break; - case NEWS: mvprintw(14,34, "16. Articles"); + case NEWS: mbse_mvprintw(14,34, "16. Articles"); break; - default: mvprintw(14,34, "16. N/A"); + default: mbse_mvprintw(14,34, "16. N/A"); break; } - mvprintw(15,34, "17. Read Sec."); - mvprintw(16,34, "18. Write Sec."); - mvprintw(17,34, "19. Sysop Sec."); - mvprintw(18,34, "20. User Del."); - mvprintw(19,34, "21. Aliases"); + mbse_mvprintw(15,34, "17. Read Sec."); + mbse_mvprintw(16,34, "18. Write Sec."); + mbse_mvprintw(17,34, "19. Sysop Sec."); + mbse_mvprintw(18,34, "20. User Del."); + mbse_mvprintw(19,34, "21. Aliases"); - mvprintw(13,58, "22. Quotes"); - mvprintw(14,58, "23. Mandatory"); - mvprintw(15,58, "24. UnSecure"); - mvprintw(16,58, "25. OLR Default"); - mvprintw(17,58, "26. OLR Forced"); + mbse_mvprintw(13,58, "22. Quotes"); + mbse_mvprintw(14,58, "23. Mandatory"); + mbse_mvprintw(15,58, "24. UnSecure"); + mbse_mvprintw(16,58, "25. OLR Default"); + mbse_mvprintw(17,58, "26. OLR Forced"); switch (msgs.Type) { case ECHOMAIL: case NEWS: - case LIST: mvprintw(18,58, "27. Connections"); + case LIST: mbse_mvprintw(18,58, "27. Connections"); break; } - mvprintw(19,58, "28. Security"); + mbse_mvprintw(19,58, "28. Security"); } @@ -685,11 +685,11 @@ void ShowStatus(sysconnect S) { clr_index(); set_color(CYAN, BLACK); - mvprintw( 7, 6, "Aka"); - mvprintw( 8, 6, "Send to"); - mvprintw( 9, 6, "Recv from"); - mvprintw(10, 6, "Pause"); - mvprintw(11, 6, "Excluded"); + mbse_mvprintw( 7, 6, "Aka"); + mbse_mvprintw( 8, 6, "Send to"); + mbse_mvprintw( 9, 6, "Recv from"); + mbse_mvprintw(10, 6, "Pause"); + mbse_mvprintw(11, 6, "Excluded"); set_color(WHITE, BLACK); show_str( 7,16,23, aka2str(S.aka)); show_bool( 8,16, S.sendto); @@ -750,22 +750,22 @@ void MsgGlobal(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "9.2 GLOBAL EDIT MESSAGE AREAS"); + mbse_mvprintw( 5, 6, "9.2 GLOBAL EDIT MESSAGE AREAS"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Delete connection"); - mvprintw( 8, 6, "2. Add new connection"); - mvprintw( 9, 6, "3. Replace connection"); - mvprintw(10, 6, "4. Change connection status"); - mvprintw(11, 6, "5. Change days old"); - mvprintw(12, 6, "6. Change max. messages"); - mvprintw(13, 6, "7. Change max. articles"); - mvprintw(14, 6, "8. Change bbs security"); - mvprintw(15, 6, "9. Change link security"); - mvprintw(16, 6, "10. Change aka to use"); - mvprintw( 7,41, "11. Change origin line"); - mvprintw( 8,41, "12. Change netmail reply"); - mvprintw( 9,41, "13. Change character set"); - mvprintw(10,41, "14. Delete message area"); + mbse_mvprintw( 7, 6, "1. Delete connection"); + mbse_mvprintw( 8, 6, "2. Add new connection"); + mbse_mvprintw( 9, 6, "3. Replace connection"); + mbse_mvprintw(10, 6, "4. Change connection status"); + mbse_mvprintw(11, 6, "5. Change days old"); + mbse_mvprintw(12, 6, "6. Change max. messages"); + mbse_mvprintw(13, 6, "7. Change max. articles"); + mbse_mvprintw(14, 6, "8. Change bbs security"); + mbse_mvprintw(15, 6, "9. Change link security"); + mbse_mvprintw(16, 6, "10. Change aka to use"); + mbse_mvprintw( 7,41, "11. Change origin line"); + mbse_mvprintw( 8,41, "12. Change netmail reply"); + mbse_mvprintw( 9,41, "13. Change character set"); + mbse_mvprintw(10,41, "14. Delete message area"); memset(&a1, 0, sizeof(fidoaddr)); memset(&a2, 0, sizeof(fidoaddr)); @@ -788,11 +788,11 @@ void MsgGlobal(void) S.pause = edit_bool(10,16,S.pause, (char *)"Is this node ^paused^"); S.cutoff = edit_bool(11,16,S.cutoff, (char *)"Is this node ^excluded^"); break; - case 5: mvprintw(LINES -3, 5, "Days old"); + case 5: mbse_mvprintw(LINES -3, 5, "Days old"); E_INT(LINES -3, 14, daysold, (char *)"Enter new number of ^days old^") - case 6: mvprintw(LINES -3, 5, "Max. messages"); + case 6: mbse_mvprintw(LINES -3, 5, "Max. messages"); E_INT(LINES -3, 19, maxmsgs, (char *)"Enter ^maximum messages^") - case 7: mvprintw(LINES -3, 6, "Max. articles"); + case 7: mbse_mvprintw(LINES -3, 6, "Max. articles"); E_INT(LINES -3, 19, maxarticles, (char *)"Enter ^maximum news articles^ to fetch") case 8: rs = edit_sec(6, 5, rs, (char *)"9.2.8 READ SECURITY"); ws = edit_sec(7, 5, ws, (char *)"9.2.8 WRITE SECURITY"); @@ -803,9 +803,9 @@ void MsgGlobal(void) case 10:akan = PickAka((char *)"9.2.8", TRUE); break; case 11:E_STR(LINES -3, 5, 64, mfile, "Enter new ^origin^ line"); - case 12:mvprintw(LINES -3, 5, "Netmail reply board"); + case 12:mbse_mvprintw(LINES -3, 5, "Netmail reply board"); E_INT(LINES -3, 25, netbrd, (char *)"The ^netmail reply^ board number") - case 13:mvprintw(LINES -3, 5, "Character set to set"); + case 13:mbse_mvprintw(LINES -3, 5, "Character set to set"); charset = edit_charset(LINES -3,26, charset); break; } @@ -816,47 +816,47 @@ void MsgGlobal(void) * Show settings before proceeding */ switch (menu) { - case 1: mvprintw(7, 6, "Delete aka %s", aka2str(a1)); + case 1: mbse_mvprintw(7, 6, "Delete aka %s", aka2str(a1)); break; - case 2: mvprintw(7, 6, "Add aka %s", aka2str(a2)); + case 2: mbse_mvprintw(7, 6, "Add aka %s", aka2str(a2)); break; case 3: p = xstrcpy(aka2str(a1)); - mvprintw(7, 6, "Replace aka %s with %s", p, aka2str(a2)); + mbse_mvprintw(7, 6, "Replace aka %s with %s", p, aka2str(a2)); free(p); break; case 4: ShowStatus(S); - mvprintw(14, 6, "Change the link status"); + mbse_mvprintw(14, 6, "Change the link status"); break; - case 5: mvprintw(7, 6, "Change days old to %d", daysold); + case 5: mbse_mvprintw(7, 6, "Change days old to %d", daysold); break; - case 6: mvprintw(7, 6, "Change maximum messages to %d", maxmsgs); + case 6: mbse_mvprintw(7, 6, "Change maximum messages to %d", maxmsgs); break; - case 7: mvprintw(7, 6, "Change maximum news articles to fetch to %d", maxarticles); + case 7: mbse_mvprintw(7, 6, "Change maximum news articles to fetch to %d", maxarticles); break; case 8: set_color(CYAN, BLACK); - mvprintw(7, 6, "Read security"); - mvprintw(8, 6, "Write security"); - mvprintw(9, 6, "Sysop security"); + mbse_mvprintw(7, 6, "Read security"); + mbse_mvprintw(8, 6, "Write security"); + mbse_mvprintw(9, 6, "Sysop security"); set_color(WHITE, BLACK); show_sec(7, 21, rs); show_sec(8, 21, ws); show_sec(9, 21, ss); break; case 9: set_color(CYAN, BLACK); - mvprintw(7, 6, "Link security"); + mbse_mvprintw(7, 6, "Link security"); set_color(WHITE, BLACK); - mvprintw(7,21, getflag(as.flags, as.notflags)); + mbse_mvprintw(7,21, getflag(as.flags, as.notflags)); break; case 10:if (akan != -1) - mvprintw( 7, 6, "Set %s as new aka to use", aka2str(CFG.aka[akan])); + mbse_mvprintw( 7, 6, "Set %s as new aka to use", aka2str(CFG.aka[akan])); break; - case 11:mvprintw(7, 6, "Origin: %s", mfile); + case 11:mbse_mvprintw(7, 6, "Origin: %s", mfile); break; - case 12:mvprintw(7, 6, "New netmail reply board %d", netbrd); + case 12:mbse_mvprintw(7, 6, "New netmail reply board %d", netbrd); break; - case 13:mvprintw(7, 6, "New character set %s", getchrs(charset)); + case 13:mbse_mvprintw(7, 6, "New character set %s", getchrs(charset)); break; - case 14:mvprintw(7, 6, "Delete message areas"); + case 14:mbse_mvprintw(7, 6, "Delete message areas"); break; } @@ -1067,7 +1067,7 @@ void MsgGlobal(void) tfil = NULL; } - mvprintw(LINES -3, 6,"Made %d changes in %d possible areas", Done, Total); + mbse_mvprintw(LINES -3, 6,"Made %d changes in %d possible areas", Done, Total); (void)readkey(LINES -3, 50, LIGHTGRAY, BLACK); if (Done) MsgUpdated = TRUE; @@ -1441,7 +1441,7 @@ void EditMsgarea(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 3, "9.2 MESSAGE AREA SETUP"); + mbse_mvprintw( 5, 3, "9.2 MESSAGE AREA SETUP"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/mareas.temp", getenv("MBSE_ROOT")); @@ -1462,7 +1462,7 @@ void EditMsgarea(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d.", o+i); } - mvprintw(y, 2, temp); + mbse_mvprintw(y, 2, temp); y++; } } @@ -1500,9 +1500,9 @@ void EditMsgarea(void) if (strncmp(pick, "M", 1) == 0) { from = too = 0; - mvprintw(LINES -3, 5, "From"); + mbse_mvprintw(LINES -3, 5, "From"); from = edit_int(LINES -3, 10, from, (char *)"Wich ^area^ you want to move"); - mvprintw(LINES -3,15, "To"); + mbse_mvprintw(LINES -3,15, "To"); too = edit_int(LINES -3, 18, too, (char *)"Too which ^area^ to move"); rc = 0; @@ -1600,7 +1600,7 @@ char *PickMsgarea(char *shdr) clr_index(); set_color(WHITE, BLACK); sprintf(temp, "%s. MESSAGE AREA SELECT", shdr); - mvprintw(5, 3, temp); + mbse_mvprintw(5, 3, temp); set_color(CYAN, BLACK); if (records) { @@ -1626,7 +1626,7 @@ char *PickMsgarea(char *shdr) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-31s", o + i, msgs.Name); temp[38] = '\0'; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } diff --git a/mbsetup/m_menu.c b/mbsetup/m_menu.c index 71240dde..c009cc81 100644 --- a/mbsetup/m_menu.c +++ b/mbsetup/m_menu.c @@ -58,10 +58,10 @@ char *select_menurec(int max) showhelp(help); for (;;) { - mvprintw(LINES - 3, 6, "Enter your choice >"); + mbse_mvprintw(LINES - 3, 6, "Enter your choice >"); menu = (char *)"-"; menu = edit_field(LINES - 3, 26, 6, '!', menu); - locate(LINES -3, 6); + mbse_locate(LINES -3, 6); clrtoeol(); if (strncmp(menu, "A", 1) == 0) @@ -95,26 +95,26 @@ void Show_A_Menu(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "8.3. EDIT MENU ITEM"); + mbse_mvprintw( 5, 2, "8.3. EDIT MENU ITEM"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Sel. key"); - mvprintw( 8, 2, "2. Type nr."); - mvprintw( 9, 2, "3. Opt. data"); - mvprintw(11, 2, "4. Display"); - mvprintw(12, 2, "5. Security"); - mvprintw(13, 2, "6. Min. age"); - mvprintw(14, 2, "7. Lo-colors"); - mvprintw(15, 2, "8. Hi-colors"); - mvprintw(16, 2, "9. Autoexec"); + mbse_mvprintw( 7, 2, "1. Sel. key"); + mbse_mvprintw( 8, 2, "2. Type nr."); + mbse_mvprintw( 9, 2, "3. Opt. data"); + mbse_mvprintw(11, 2, "4. Display"); + mbse_mvprintw(12, 2, "5. Security"); + mbse_mvprintw(13, 2, "6. Min. age"); + mbse_mvprintw(14, 2, "7. Lo-colors"); + mbse_mvprintw(15, 2, "8. Hi-colors"); + mbse_mvprintw(16, 2, "9. Autoexec"); if (le_int(menus.MenuType) == 7) { - mvprintw(17, 2, "10. Door Name"); - mvprintw(18, 2, "11. Y2K style"); - mvprintw(13,42, "12. No door.sys"); - mvprintw(14,42, "13. Use COMport"); - mvprintw(15,42, "14. Run nosuid"); - mvprintw(16,42, "15. No Prompt"); - mvprintw(17,42, "16. Single User"); - mvprintw(18,42, "17. Hidden door"); + mbse_mvprintw(17, 2, "10. Door Name"); + mbse_mvprintw(18, 2, "11. Y2K style"); + mbse_mvprintw(13,42, "12. No door.sys"); + mbse_mvprintw(14,42, "13. Use COMport"); + mbse_mvprintw(15,42, "14. Run nosuid"); + mbse_mvprintw(16,42, "15. No Prompt"); + mbse_mvprintw(17,42, "16. Single User"); + mbse_mvprintw(18,42, "17. Hidden door"); } set_color(WHITE, BLACK); @@ -151,14 +151,14 @@ int GetSubmenu(int Base, int Max) clr_index(); set_color(WHITE, BLACK); - mvprintw( 4, 2, "8.3 EDIT MENU - SELECT MENUTYPE"); + mbse_mvprintw( 4, 2, "8.3 EDIT MENU - SELECT MENUTYPE"); set_color(CYAN, BLACK); y = 6; x = 2; for (i = 1; i <= Max; i++) { sprintf(temp, "%2d. %s", i, getmenutype(i - 1 + Base)); - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; if ((i % 13) == 0) { y = 6; @@ -180,14 +180,14 @@ int GetMenuType(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "8.3 EDIT MENU - SELECT MENUTYPE"); + mbse_mvprintw( 5, 6, "8.3 EDIT MENU - SELECT MENUTYPE"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Global system menus"); - mvprintw( 8, 6, "2. File areas menus"); - mvprintw( 9, 6, "3. Message areas menus"); - mvprintw(10, 6, "4. User setting menus"); - mvprintw(11, 6, "5. Oneliner menus"); - mvprintw(12, 6, "6. BBS List menus"); + mbse_mvprintw( 7, 6, "1. Global system menus"); + mbse_mvprintw( 8, 6, "2. File areas menus"); + mbse_mvprintw( 9, 6, "3. Message areas menus"); + mbse_mvprintw(10, 6, "4. User setting menus"); + mbse_mvprintw(11, 6, "5. Oneliner menus"); + mbse_mvprintw(12, 6, "6. BBS List menus"); switch (select_menu(6)) { case 1: return GetSubmenu(1, 22); @@ -335,7 +335,7 @@ void EditMenu(char *Name) clr_index(); working(1, 0, 0); sprintf(temp, "8.3 EDIT MENU \"%s\" (%s)", Name, lang.Name); - mvprintw( 5, 6, tu(temp)); + mbse_mvprintw( 5, 6, tu(temp)); set_color(CYAN, BLACK); fseek(tmp, 0, SEEK_SET); @@ -348,13 +348,13 @@ void EditMenu(char *Name) fread(&menus, sizeof(menus), 1, tmp); if (menus.MenuKey[0] || menus.AutoExec) { set_color(CYAN, BLACK); - mvprintw(y, 5, "%3d. ", o + i); + mbse_mvprintw(y, 5, "%3d. ", o + i); if (menus.AutoExec) { set_color(LIGHTRED, BLACK); - mvprintw(y, 10, "a"); + mbse_mvprintw(y, 10, "a"); set_color(CYAN, BLACK); } else { - mvprintw(y, 10, "%1s", menus.MenuKey); + mbse_mvprintw(y, 10, "%1s", menus.MenuKey); } if (le_int(menus.MenuType) == 999 ) { sprintf(temp, "%-29s %5d %s", menus.TypeDesc, le_int(menus.MenuSecurity.level), menus.Display); @@ -362,10 +362,10 @@ void EditMenu(char *Name) sprintf(temp, "%-29s %5d %s", menus.TypeDesc, le_int(menus.MenuSecurity.level), menus.OptionalData); } temp[68] = '\0'; - mvprintw(y, 12, temp); + mbse_mvprintw(y, 12, temp); } else { set_color(LIGHTBLUE, BLACK); - mvprintw(y, 5, "%3d.", o + i); + mbse_mvprintw(y, 5, "%3d.", o + i); } y++; } @@ -410,7 +410,7 @@ void EditMenu(char *Name) } if (strncmp(pick, "D", 1) == 0) { - mvprintw(LINES -3, 6, "Enter menu number (1..%d) to delete >", records); + mbse_mvprintw(LINES -3, 6, "Enter menu number (1..%d) to delete >", records); y = 0; y = edit_int(LINES -3, 44, y, (char *)"Enter record number"); if ((y > 0) && (y <= records) && yes_no((char *)"Remove record")) { @@ -427,11 +427,11 @@ void EditMenu(char *Name) if (strncmp(pick, "M", 1) == 0) { from = too = 0; - mvprintw(LINES -3, 6, "Enter menu number (1..%d) to move >", records); + mbse_mvprintw(LINES -3, 6, "Enter menu number (1..%d) to move >", records); from = edit_int(LINES -3, 42, from, (char *)"Enter record number"); - locate(LINES -3, 6); + mbse_locate(LINES -3, 6); clrtoeol(); - mvprintw(LINES -3, 6, "Enter new position (1..%d) >", records); + mbse_mvprintw(LINES -3, 6, "Enter new position (1..%d) >", records); too = edit_int(LINES -3, 36, too, (char *)"Enter destination record number, other will move away"); if ((from == too) || (from == 0) || (too == 0) || (from > records) || (too > records)) { errmsg("That makes no sense"); @@ -521,7 +521,7 @@ void EditMenus(void) } set_color(WHITE, BLACK); - mvprintw( 5, 6, "8.3 MENU EDIT: %s", lang.Name); + mbse_mvprintw( 5, 6, "8.3 MENU EDIT: %s", lang.Name); set_color(CYAN, BLACK); if (mcount) { @@ -530,7 +530,7 @@ void EditMenus(void) set_color(CYAN, BLACK); for (i = 1; i <= mcount; i++) { sprintf(temp, "%2d. %s", i, menuname[i-1]); - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; if ((i % 10) == 0) { x+=15; @@ -547,7 +547,7 @@ void EditMenus(void) if (strncmp(pick, "A", 1) == 0) { set_color(WHITE, BLACK); - mvprintw(LINES -3, 6, (char *)"New menu name >"); + mbse_mvprintw(LINES -3, 6, (char *)"New menu name >"); memset(&temp, 0, sizeof(temp)); strcpy(temp, edit_str(LINES -3, 22, 10, temp, (char *)"Enter a new ^menu^ name without extension")); if (strlen(temp)) { diff --git a/mbsetup/m_mgroup.c b/mbsetup/m_mgroup.c index 6e263141..1ab57535 100644 --- a/mbsetup/m_mgroup.c +++ b/mbsetup/m_mgroup.c @@ -246,30 +246,30 @@ void MgScreen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "9.1 EDIT MESSAGE GROUP"); + mbse_mvprintw( 5, 2, "9.1 EDIT MESSAGE GROUP"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Name"); - mvprintw( 8, 2, "2. Comment"); - mvprintw( 9, 2, "3. Base path"); - mvprintw(10, 2, "4. Read sec"); - mvprintw(11, 2, "5. Write sec"); - mvprintw(12, 2, "6. Sysop sec"); - mvprintw(13, 2, "7. Link sec"); - mvprintw(14, 2, "8. Start at"); - mvprintw(15, 2, "9. Net reply"); - mvprintw(16, 2, "10. Users del"); - mvprintw(17, 2, "11. Aliases"); - mvprintw(18, 2, "12. Quotes"); - mvprintw(19, 2, "13. Active"); + mbse_mvprintw( 7, 2, "1. Name"); + mbse_mvprintw( 8, 2, "2. Comment"); + mbse_mvprintw( 9, 2, "3. Base path"); + mbse_mvprintw(10, 2, "4. Read sec"); + mbse_mvprintw(11, 2, "5. Write sec"); + mbse_mvprintw(12, 2, "6. Sysop sec"); + mbse_mvprintw(13, 2, "7. Link sec"); + mbse_mvprintw(14, 2, "8. Start at"); + mbse_mvprintw(15, 2, "9. Net reply"); + mbse_mvprintw(16, 2, "10. Users del"); + mbse_mvprintw(17, 2, "11. Aliases"); + mbse_mvprintw(18, 2, "12. Quotes"); + mbse_mvprintw(19, 2, "13. Active"); - mvprintw(14,26, "14. Deleted"); - mvprintw(15,26, "15. Auto change"); - mvprintw(16,26, "16. User change"); - mvprintw(17,26, "17. Use Aka"); - mvprintw(18,26, "18. Uplink"); - mvprintw(19,26, "19. Areas"); + mbse_mvprintw(14,26, "14. Deleted"); + mbse_mvprintw(15,26, "15. Auto change"); + mbse_mvprintw(16,26, "16. User change"); + mbse_mvprintw(17,26, "17. Use Aka"); + mbse_mvprintw(18,26, "18. Uplink"); + mbse_mvprintw(19,26, "19. Areas"); - mvprintw(14,54, "20. Charset"); + mbse_mvprintw(14,54, "20. Charset"); } @@ -335,7 +335,7 @@ int EditMGrpRec(int Area) show_sec( 10,16, mgroup.RDSec); show_sec( 11,16, mgroup.WRSec); show_sec( 12,16, mgroup.SYSec); - mvprintw( 13,22, getflag(mgroup.LinkSec.flags, mgroup.LinkSec.notflags)); + mbse_mvprintw( 13,22, getflag(mgroup.LinkSec.flags, mgroup.LinkSec.notflags)); show_int( 14,16, mgroup.StartArea); show_int( 15,16, mgroup.NetReply); show_bool(16,16, mgroup.UsrDelete); @@ -469,7 +469,7 @@ void EditMGroup(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 4, "9.1 MESSAGE GROUPS SETUP"); + mbse_mvprintw( 5, 4, "9.1 MESSAGE GROUPS SETUP"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/mgroups.temp", getenv("MBSE_ROOT")); @@ -494,7 +494,7 @@ void EditMGroup(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-12s %-18s", o + i, mgroup.Name, mgroup.Comment); temp[38] = '\0'; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } @@ -577,7 +577,7 @@ char *PickMGroup(char *shdr) clr_index(); set_color(WHITE, BLACK); sprintf(temp, "%s. MESSAGE GROUP SELECT", shdr); - mvprintw( 5, 4, temp); + mbse_mvprintw( 5, 4, temp); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/mgroups.data", getenv("MBSE_ROOT")); @@ -602,7 +602,7 @@ char *PickMGroup(char *shdr) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-12s %-18s", o + i, mgroup.Name, mgroup.Comment); temp[38] = '\0'; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } diff --git a/mbsetup/m_modem.c b/mbsetup/m_modem.c index b52301ca..8d2a1936 100644 --- a/mbsetup/m_modem.c +++ b/mbsetup/m_modem.c @@ -312,26 +312,26 @@ void Modem_Screen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "5. EDIT MODEM TYPE"); + mbse_mvprintw( 5, 2, "5. EDIT MODEM TYPE"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Type"); - mvprintw( 8, 2, "2. Init 1"); - mvprintw( 9, 2, "3. Init 2"); - mvprintw(10, 2, "4. Init 3"); - mvprintw(11, 2, "5. Reset"); - mvprintw(12, 2, "6. Hangup"); - mvprintw(13, 2, "7. Dial"); - mvprintw(14, 2, "8. Info"); - mvprintw(15, 2, "9. Ok"); - mvprintw(16, 2, "10. Offset"); - mvprintw(17, 2, "11. Speed"); + mbse_mvprintw( 7, 2, "1. Type"); + mbse_mvprintw( 8, 2, "2. Init 1"); + mbse_mvprintw( 9, 2, "3. Init 2"); + mbse_mvprintw(10, 2, "4. Init 3"); + mbse_mvprintw(11, 2, "5. Reset"); + mbse_mvprintw(12, 2, "6. Hangup"); + mbse_mvprintw(13, 2, "7. Dial"); + mbse_mvprintw(14, 2, "8. Info"); + mbse_mvprintw(15, 2, "9. Ok"); + mbse_mvprintw(16, 2, "10. Offset"); + mbse_mvprintw(17, 2, "11. Speed"); - mvprintw(15,30, "12. Available"); - mvprintw(16,30, "13. Deleted"); - mvprintw(17,30, "14. Stripdash"); + mbse_mvprintw(15,30, "12. Available"); + mbse_mvprintw(16,30, "13. Deleted"); + mbse_mvprintw(17,30, "14. Stripdash"); - mvprintw(15,58, "15. Connect strings"); - mvprintw(16,58, "16. Error strings"); + mbse_mvprintw(15,58, "15. Connect strings"); + mbse_mvprintw(16,58, "16. Error strings"); } @@ -342,12 +342,12 @@ void EditConnect(void) clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "5.15 EDIT MODEM CONNECT STRINGS"); + mbse_mvprintw( 5, 2, "5.15 EDIT MODEM CONNECT STRINGS"); set_color(CYAN, BLACK); for (i = 0; i < 10; i++) { - mvprintw( 7+i, 2, (char *)"%2d.", i+1); - mvprintw( 7+i,42, (char *)"%2d.", i+11); + mbse_mvprintw( 7+i, 2, (char *)"%2d.", i+1); + mbse_mvprintw( 7+i,42, (char *)"%2d.", i+11); } for (;;) { @@ -375,11 +375,11 @@ void EditError(void) clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "5.16 EDIT MODEM ERROR STRINGS"); + mbse_mvprintw( 5, 2, "5.16 EDIT MODEM ERROR STRINGS"); set_color(CYAN, BLACK); for (i = 0; i < 10; i++) { - mvprintw( 7+i, 2, (char *)"%2d.", i+1); + mbse_mvprintw( 7+i, 2, (char *)"%2d.", i+1); } for (;;) { @@ -529,7 +529,7 @@ void EditModem(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 4, "5. MODEM TYPES SETUP"); + mbse_mvprintw( 5, 4, "5. MODEM TYPES SETUP"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/modem.temp", getenv("MBSE_ROOT")); @@ -552,7 +552,7 @@ void EditModem(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-30s", i, modem.modem); temp[37] = 0; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } fclose(fil); @@ -618,7 +618,7 @@ char *PickModem(char *shdr) clr_index(); set_color(WHITE, BLACK); sprintf(temp, "%s. MODEM SELECT", shdr); - mvprintw(5,3,temp); + mbse_mvprintw(5,3,temp); set_color(CYAN, BLACK); if (records) { sprintf(temp, "%s/etc/modem.data", getenv("MBSE_ROOT")); @@ -643,7 +643,7 @@ char *PickModem(char *shdr) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-31s", o + i, modem.modem); temp[38] = '\0'; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } diff --git a/mbsetup/m_new.c b/mbsetup/m_new.c index 8ea4ca7e..48b045ae 100644 --- a/mbsetup/m_new.c +++ b/mbsetup/m_new.c @@ -266,21 +266,21 @@ void NewScreen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "12. EDIT NEW FILES REPORTS"); + mbse_mvprintw( 5, 2, "12. EDIT NEW FILES REPORTS"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Comment"); - mvprintw( 8, 2, "2. Msg area"); - mvprintw( 9, 2, "3. Origin line"); - mvprintw(10, 2, "4. From name"); - mvprintw(11, 2, "5. To name"); - mvprintw(12, 2, "6. Subject"); - mvprintw(13, 2, "7. Language"); - mvprintw(14, 2, "8. Template"); - mvprintw(15, 2, "9. Aka to use"); - mvprintw(16, 2, "10. Active"); - mvprintw(17, 2, "11. Deleted"); - mvprintw(16,42, "12. High ASCII"); - mvprintw(17,42, "13. New groups"); + mbse_mvprintw( 7, 2, "1. Comment"); + mbse_mvprintw( 8, 2, "2. Msg area"); + mbse_mvprintw( 9, 2, "3. Origin line"); + mbse_mvprintw(10, 2, "4. From name"); + mbse_mvprintw(11, 2, "5. To name"); + mbse_mvprintw(12, 2, "6. Subject"); + mbse_mvprintw(13, 2, "7. Language"); + mbse_mvprintw(14, 2, "8. Template"); + mbse_mvprintw(15, 2, "9. Aka to use"); + mbse_mvprintw(16, 2, "10. Active"); + mbse_mvprintw(17, 2, "11. Deleted"); + mbse_mvprintw(16,42, "12. High ASCII"); + mbse_mvprintw(17,42, "13. New groups"); } @@ -459,7 +459,7 @@ void EditNewfiles(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 4, "12. NEWFILES REPORTS"); + mbse_mvprintw( 5, 4, "12. NEWFILES REPORTS"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/newfiles.temp", getenv("MBSE_ROOT")); @@ -484,7 +484,7 @@ void EditNewfiles(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-32s", o + i, newfiles.Comment); temp[37] = 0; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } diff --git a/mbsetup/m_ngroup.c b/mbsetup/m_ngroup.c index a9544e89..e10c5896 100644 --- a/mbsetup/m_ngroup.c +++ b/mbsetup/m_ngroup.c @@ -218,12 +218,12 @@ void NgScreen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "9.1 EDIT NEWFILES GROUP"); + mbse_mvprintw( 5, 6, "9.1 EDIT NEWFILES GROUP"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Name"); - mvprintw( 8, 6, "2. Comment"); - mvprintw( 9, 6, "3. Active"); - mvprintw(10, 6, "4. Deleted"); + mbse_mvprintw( 7, 6, "1. Name"); + mbse_mvprintw( 8, 6, "2. Comment"); + mbse_mvprintw( 9, 6, "3. Active"); + mbse_mvprintw(10, 6, "4. Deleted"); } @@ -332,7 +332,7 @@ void EditNGroup(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 4, "11. NEWFILES GROUPS SETUP"); + mbse_mvprintw( 5, 4, "11. NEWFILES GROUPS SETUP"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/ngroups.temp", getenv("MBSE_ROOT")); @@ -357,7 +357,7 @@ void EditNGroup(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-12s %-18s", o + i, ngroup.Name, ngroup.Comment); temp[38] = '\0'; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } @@ -434,7 +434,7 @@ char *PickNGroup(char *shdr) clr_index(); set_color(WHITE, BLACK); sprintf(temp, "%s. NEWFILES GROUP SELECT", shdr); - mvprintw( 5, 4, temp); + mbse_mvprintw( 5, 4, temp); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/ngroups.data", getenv("MBSE_ROOT")); @@ -459,7 +459,7 @@ char *PickNGroup(char *shdr) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-12s %-18s", o + i, ngroup.Name, ngroup.Comment); temp[38] = '\0'; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } diff --git a/mbsetup/m_node.c b/mbsetup/m_node.c index 38ae2808..e85d5643 100644 --- a/mbsetup/m_node.c +++ b/mbsetup/m_node.c @@ -397,15 +397,15 @@ void E_UplMgr(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "7.10 EDIT NODE - UPLINK MANAGERS"); + mbse_mvprintw( 5, 6, "7.10 EDIT NODE - UPLINK MANAGERS"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Uplink AreaMgr program"); - mvprintw( 8, 6, "2. Uplink AreaMgr password"); - mvprintw( 9, 6, "3. Uplink AreaMgr is BBBS"); - mvprintw(10, 6, "4. Uplink FileMgr program"); - mvprintw(11, 6, "5. Uplink FileMgr password"); - mvprintw(12, 6, "6. Uplink FileMgr is BBBS"); - mvprintw(13, 6, "7. Our Area/Filemgr passwd"); + mbse_mvprintw( 7, 6, "1. Uplink AreaMgr program"); + mbse_mvprintw( 8, 6, "2. Uplink AreaMgr password"); + mbse_mvprintw( 9, 6, "3. Uplink AreaMgr is BBBS"); + mbse_mvprintw(10, 6, "4. Uplink FileMgr program"); + mbse_mvprintw(11, 6, "5. Uplink FileMgr password"); + mbse_mvprintw(12, 6, "6. Uplink FileMgr is BBBS"); + mbse_mvprintw(13, 6, "7. Our Area/Filemgr passwd"); for (;;) { set_color(WHITE, BLACK); @@ -437,13 +437,13 @@ void E_Mail(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "7.4 EDIT NODE - MAIL PROCESSING"); + mbse_mvprintw( 5, 6, "7.4 EDIT NODE - MAIL PROCESSING"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. PKT password"); - mvprintw( 8, 6, "2. Check PKT pwd"); - mvprintw( 9, 6, "3. Mail forward"); - mvprintw(10, 6, "4. ARCmail comp."); - mvprintw(11, 6, "5. ARCmail a..z"); + mbse_mvprintw( 7, 6, "1. PKT password"); + mbse_mvprintw( 8, 6, "2. Check PKT pwd"); + mbse_mvprintw( 9, 6, "3. Mail forward"); + mbse_mvprintw(10, 6, "4. ARCmail comp."); + mbse_mvprintw(11, 6, "5. ARCmail a..z"); for (;;) { set_color(WHITE, BLACK); @@ -471,15 +471,15 @@ void E_Files(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "7.6 EDIT NODE - FILES PROCESSING"); + mbse_mvprintw( 5, 6, "7.6 EDIT NODE - FILES PROCESSING"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Files password"); - mvprintw( 8, 6, "2. Incl. message"); - mvprintw( 9, 6, "3. Send TIC file"); - mvprintw(10, 6, "4. Advanced TIC"); - mvprintw(11, 6, "5. Advanced SB"); - mvprintw(12, 6, "6. To line in TIC"); - mvprintw(13, 6, "7. File forward"); + mbse_mvprintw( 7, 6, "1. Files password"); + mbse_mvprintw( 8, 6, "2. Incl. message"); + mbse_mvprintw( 9, 6, "3. Send TIC file"); + mbse_mvprintw(10, 6, "4. Advanced TIC"); + mbse_mvprintw(11, 6, "5. Advanced SB"); + mbse_mvprintw(12, 6, "6. To line in TIC"); + mbse_mvprintw(13, 6, "7. File forward"); for (;;) { set_color(WHITE, BLACK); @@ -515,16 +515,16 @@ void S_Stat(void) clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "7.11 NODE STATISTICS"); + mbse_mvprintw( 5, 6, "7.11 NODE STATISTICS"); set_color(CYAN, BLACK); - mvprintw( 8,18, " This week Last week This month Last month Total"); - mvprintw( 9,18, "---------- ---------- ---------- ---------- ----------"); - mvprintw(10,6, "Files sent"); - mvprintw(11,6, "Kbytes sent"); - mvprintw(12,6, "Files rcvd"); - mvprintw(13,6, "Kbytes rcvd"); - mvprintw(14,6, "Mail sent"); - mvprintw(15,6, "Mail rcvd"); + mbse_mvprintw( 8,18, " This week Last week This month Last month Total"); + mbse_mvprintw( 9,18, "---------- ---------- ---------- ---------- ----------"); + mbse_mvprintw(10,6, "Files sent"); + mbse_mvprintw(11,6, "Kbytes sent"); + mbse_mvprintw(12,6, "Files rcvd"); + mbse_mvprintw(13,6, "Kbytes rcvd"); + mbse_mvprintw(14,6, "Mail sent"); + mbse_mvprintw(15,6, "Mail rcvd"); set_color(WHITE, BLACK); Now = time(NULL); @@ -537,17 +537,17 @@ void S_Stat(void) else LMiy = Miy - 1; - mvprintw(10,18, (char *)"%10lu %10lu %10lu %10lu %10lu", nodes.FilesSent.tweek, + mbse_mvprintw(10,18, (char *)"%10lu %10lu %10lu %10lu %10lu", nodes.FilesSent.tweek, nodes.FilesSent.lweek, nodes.FilesSent.month[Miy], nodes.FilesSent.month[LMiy], nodes.FilesSent.total); - mvprintw(11,18, (char *)"%10lu %10lu %10lu %10lu %10lu", nodes.F_KbSent.tweek, + mbse_mvprintw(11,18, (char *)"%10lu %10lu %10lu %10lu %10lu", nodes.F_KbSent.tweek, nodes.F_KbSent.lweek, nodes.F_KbSent.month[Miy], nodes.F_KbSent.month[LMiy], nodes.F_KbSent.total); - mvprintw(12,18, (char *)"%10lu %10lu %10lu %10lu %10lu", nodes.FilesRcvd.tweek, + mbse_mvprintw(12,18, (char *)"%10lu %10lu %10lu %10lu %10lu", nodes.FilesRcvd.tweek, nodes.FilesRcvd.lweek, nodes.FilesRcvd.month[Miy], nodes.FilesRcvd.month[LMiy], nodes.FilesRcvd.total); - mvprintw(13,18, (char *)"%10lu %10lu %10lu %10lu %10lu", nodes.F_KbRcvd.tweek, + mbse_mvprintw(13,18, (char *)"%10lu %10lu %10lu %10lu %10lu", nodes.F_KbRcvd.tweek, nodes.F_KbRcvd.lweek, nodes.F_KbRcvd.month[Miy], nodes.F_KbRcvd.month[LMiy], nodes.F_KbRcvd.total); - mvprintw(14,18, (char *)"%10lu %10lu %10lu %10lu %10lu", nodes.MailSent.tweek, + mbse_mvprintw(14,18, (char *)"%10lu %10lu %10lu %10lu %10lu", nodes.MailSent.tweek, nodes.MailSent.lweek, nodes.MailSent.month[Miy], nodes.MailSent.month[LMiy], nodes.MailSent.total); - mvprintw(15,18, (char *)"%10lu %10lu %10lu %10lu %10lu", nodes.MailRcvd.tweek, + mbse_mvprintw(15,18, (char *)"%10lu %10lu %10lu %10lu %10lu", nodes.MailRcvd.tweek, nodes.MailRcvd.lweek, nodes.MailRcvd.month[Miy], nodes.MailRcvd.month[LMiy], nodes.MailRcvd.total); set_color(CYAN, BLACK); center_addstr(LINES - 4, (char *)"Press any key"); @@ -566,14 +566,14 @@ fidoaddr e_a(fidoaddr n, int x) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, (char *)"7.%d EDIT AKA", x); + mbse_mvprintw( 5, 6, (char *)"7.%d EDIT AKA", x); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Zone"); - mvprintw( 8, 6, "2. Net"); - mvprintw( 9, 6, "3. Node"); - mvprintw(10, 6, "4. Point"); - mvprintw(11, 6, " Domain"); - mvprintw(12, 6, "5. Delete"); + mbse_mvprintw( 7, 6, "1. Zone"); + mbse_mvprintw( 8, 6, "2. Net"); + mbse_mvprintw( 9, 6, "3. Node"); + mbse_mvprintw(10, 6, "4. Point"); + mbse_mvprintw(11, 6, " Domain"); + mbse_mvprintw(12, 6, "5. Delete"); set_color(WHITE, BLACK); show_int( 7,17, n.zone); show_int( 8,17, n.net); @@ -620,16 +620,16 @@ void N_Akas(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "7.2 EDIT NODES AKA'S"); + mbse_mvprintw( 5, 6, "7.2 EDIT NODES AKA'S"); set_color(CYAN, BLACK); y = 7; x = 6; for (i = 0; i < 20; i++) { if (i == 10) { y = 7; x = 46; } - mvprintw( y, x, (char *)"%d.", i + 1); + mbse_mvprintw( y, x, (char *)"%d.", i + 1); if (nodes.Aka[i].zone) - mvprintw(y, x + 5, (char *)"%s", aka2str(nodes.Aka[i])); + mbse_mvprintw(y, x + 5, (char *)"%s", aka2str(nodes.Aka[i])); y++; } @@ -668,24 +668,24 @@ void GeneralScreen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "7.1 EDIT NODE GENERAL"); + mbse_mvprintw( 5, 2, "7.1 EDIT NODE GENERAL"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Sysop name"); - mvprintw( 8, 2, "2. Outbox dir"); - mvprintw( 9, 2, "3. Pvt. phone"); - mvprintw(10, 2, "4. Pvt. fax"); - mvprintw(11, 2, "5. Pvt. Cellphone"); - mvprintw(12, 2, "6. Pvt. e-mail"); - mvprintw(13, 2, "7. Pvt. remark"); - mvprintw(14, 2, "8. Route via"); - mvprintw(15, 2, "9. Netmail direct"); - mvprintw(16, 2, "10. Netmail crash"); - mvprintw(17, 2, "11. Netmail hold"); - mvprintw(18, 2, "12. Pack mail"); + mbse_mvprintw( 7, 2, "1. Sysop name"); + mbse_mvprintw( 8, 2, "2. Outbox dir"); + mbse_mvprintw( 9, 2, "3. Pvt. phone"); + mbse_mvprintw(10, 2, "4. Pvt. fax"); + mbse_mvprintw(11, 2, "5. Pvt. Cellphone"); + mbse_mvprintw(12, 2, "6. Pvt. e-mail"); + mbse_mvprintw(13, 2, "7. Pvt. remark"); + mbse_mvprintw(14, 2, "8. Route via"); + mbse_mvprintw(15, 2, "9. Netmail direct"); + mbse_mvprintw(16, 2, "10. Netmail crash"); + mbse_mvprintw(17, 2, "11. Netmail hold"); + mbse_mvprintw(18, 2, "12. Pack mail"); - mvprintw(16,42, "13. Send notify"); - mvprintw(17,42, "14. Language"); - mvprintw(18,42, "15. Deleted"); + mbse_mvprintw(16,42, "13. Send notify"); + mbse_mvprintw(17,42, "14. Language"); + mbse_mvprintw(18,42, "15. Deleted"); } @@ -786,28 +786,28 @@ void SessionScreen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "7.3 EDIT NODE SESSION"); + mbse_mvprintw( 5, 6, "7.3 EDIT NODE SESSION"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Session passwd"); - mvprintw( 8, 6, "2. Dial command"); - mvprintw( 9, 6, "3. Phone number 1"); - mvprintw(10, 6, "4. Phone number 2"); - mvprintw(11, 6, "5. Nodelist flags"); - mvprintw(12, 6, "6. Inet hostname"); - mvprintw(13, 6, "7. Outbound sess."); - mvprintw(14, 6, "8. Inbound sess."); - mvprintw(15, 6, "9. No EMSI"); - mvprintw(16, 6, "10. No YooHoo/2U2"); - mvprintw(17, 6, "11. No Filerequest"); - mvprintw(18, 6, "12. Don't call"); - mvprintw(19, 6, "13. 8.3 names"); + mbse_mvprintw( 7, 6, "1. Session passwd"); + mbse_mvprintw( 8, 6, "2. Dial command"); + mbse_mvprintw( 9, 6, "3. Phone number 1"); + mbse_mvprintw(10, 6, "4. Phone number 2"); + mbse_mvprintw(11, 6, "5. Nodelist flags"); + mbse_mvprintw(12, 6, "6. Inet hostname"); + mbse_mvprintw(13, 6, "7. Outbound sess."); + mbse_mvprintw(14, 6, "8. Inbound sess."); + mbse_mvprintw(15, 6, "9. No EMSI"); + mbse_mvprintw(16, 6, "10. No YooHoo/2U2"); + mbse_mvprintw(17, 6, "11. No Filerequest"); + mbse_mvprintw(18, 6, "12. Don't call"); + mbse_mvprintw(19, 6, "13. 8.3 names"); - mvprintw(15,41, "14. No Zmodem"); - mvprintw(16,41, "15. No Zedzap"); - mvprintw(17,41, "16. No Hydra"); - mvprintw(18,41, "17. Binkp old esc"); - mvprintw(19,41, "18. No binkp/1.1"); + mbse_mvprintw(15,41, "14. No Zmodem"); + mbse_mvprintw(16,41, "15. No Zedzap"); + mbse_mvprintw(17,41, "16. No Hydra"); + mbse_mvprintw(18,41, "17. Binkp old esc"); + mbse_mvprintw(19,41, "18. No binkp/1.1"); } @@ -873,25 +873,25 @@ void DirectoryScreen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "7.8 EDIT NODE DIRECTORY SESSION"); - mvprintw( 7, 2, " Outbound settings"); + mbse_mvprintw( 5, 2, "7.8 EDIT NODE DIRECTORY SESSION"); + mbse_mvprintw( 7, 2, " Outbound settings"); set_color(CYAN, BLACK); - mvprintw( 8, 2, "1. Files path"); - mvprintw( 9, 2, "2. Check for lock"); - mvprintw( 9,41, "3. Wait clear lock"); - mvprintw(10, 2, "4. Check lockfile"); - mvprintw(11, 2, "5. Create lock"); - mvprintw(12, 2, "6. Create lockfile"); + mbse_mvprintw( 8, 2, "1. Files path"); + mbse_mvprintw( 9, 2, "2. Check for lock"); + mbse_mvprintw( 9,41, "3. Wait clear lock"); + mbse_mvprintw(10, 2, "4. Check lockfile"); + mbse_mvprintw(11, 2, "5. Create lock"); + mbse_mvprintw(12, 2, "6. Create lockfile"); set_color(WHITE, BLACK); - mvprintw(14, 2, " Inbound settings"); + mbse_mvprintw(14, 2, " Inbound settings"); set_color(CYAN, BLACK); - mvprintw(15, 2, "7. Files path"); - mvprintw(16, 2, "8. Check for lock"); - mvprintw(16,41, "9. Wait clear lock"); - mvprintw(17, 2, "10. Check lockfile"); - mvprintw(18, 2, "11. Create lock"); - mvprintw(19, 2, "12. Create lockfile"); + mbse_mvprintw(15, 2, "7. Files path"); + mbse_mvprintw(16, 2, "8. Check for lock"); + mbse_mvprintw(16,41, "9. Wait clear lock"); + mbse_mvprintw(17, 2, "10. Check lockfile"); + mbse_mvprintw(18, 2, "11. Create lock"); + mbse_mvprintw(19, 2, "12. Create lockfile"); } @@ -1095,19 +1095,19 @@ int EditNodeRec(int Area) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "7. EDIT NODE - %s, %s", nodes.Sysop, aka2str(nodes.Aka[0])); + mbse_mvprintw( 5, 6, "7. EDIT NODE - %s, %s", nodes.Sysop, aka2str(nodes.Aka[0])); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. General setup"); - mvprintw( 8, 6, "2. Aka's setup"); - mvprintw( 9, 6, "3. Session setup"); - mvprintw(10, 6, "4. Mail setup"); - mvprintw(11, 6, "5. Mail groups"); - mvprintw(12, 6, "6. Files setup"); - mvprintw(13, 6, "7. Files groups"); - mvprintw(14, 6, "8. Directory session"); - mvprintw(15, 6, "9. Security flags"); - mvprintw(16, 6, "10. Area/File managers"); - mvprintw(17, 6, "11. Statistics"); + mbse_mvprintw( 7, 6, "1. General setup"); + mbse_mvprintw( 8, 6, "2. Aka's setup"); + mbse_mvprintw( 9, 6, "3. Session setup"); + mbse_mvprintw(10, 6, "4. Mail setup"); + mbse_mvprintw(11, 6, "5. Mail groups"); + mbse_mvprintw(12, 6, "6. Files setup"); + mbse_mvprintw(13, 6, "7. Files groups"); + mbse_mvprintw(14, 6, "8. Directory session"); + mbse_mvprintw(15, 6, "9. Security flags"); + mbse_mvprintw(16, 6, "10. Area/File managers"); + mbse_mvprintw(17, 6, "11. Statistics"); switch(select_menu(11)) { case 0: crc1 = 0xffffffff; @@ -1222,7 +1222,7 @@ void EditNodes(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "7. NODES SETUP"); + mbse_mvprintw( 5, 6, "7. NODES SETUP"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/nodes.temp", getenv("MBSE_ROOT")); @@ -1247,7 +1247,7 @@ void EditNodes(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %s (%s)", o + i, nodes.Sysop, strtok(aka2str(nodes.Aka[0]), "@")); temp[37] = 0; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } @@ -1333,7 +1333,7 @@ fidoaddr PullUplink(char *Hdr) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 4, "%s. UPLINK SELECT", Hdr); + mbse_mvprintw( 5, 4, "%s. UPLINK SELECT", Hdr); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/nodes.data", getenv("MBSE_ROOT")); @@ -1358,7 +1358,7 @@ fidoaddr PullUplink(char *Hdr) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %s (%s)", o + i, nodes.Sysop, strtok(aka2str(nodes.Aka[0]), "@")); temp[37] = 0; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } @@ -1393,16 +1393,16 @@ fidoaddr PullUplink(char *Hdr) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "%s. SELECT NODE AKA", Hdr); + mbse_mvprintw( 5, 6, "%s. SELECT NODE AKA", Hdr); set_color(CYAN, BLACK); y = 7; x = 6; for (i = 0; i < 20; i++) { if (i == 10) { y = 7; x = 46; } - mvprintw( y, x, (char *)"%d.", i + 1); + mbse_mvprintw( y, x, (char *)"%d.", i + 1); if (nodes.Aka[i].zone) - mvprintw(y, x + 5, (char *)"%s", aka2str(nodes.Aka[i])); + mbse_mvprintw(y, x + 5, (char *)"%s", aka2str(nodes.Aka[i])); y++; } diff --git a/mbsetup/m_ol.c b/mbsetup/m_ol.c index 7a0b7fa4..f8705c66 100644 --- a/mbsetup/m_ol.c +++ b/mbsetup/m_ol.c @@ -242,12 +242,12 @@ int EditOnelRec(int Area) crc = upd_crc32((char *)&ol, crc, sizeof(ol)); set_color(WHITE, BLACK); - mvprintw( 5, 2, "8.7.1 EDIT ONELINER"); + mbse_mvprintw( 5, 2, "8.7.1 EDIT ONELINER"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Text"); - mvprintw( 8, 2, "2. User"); - mvprintw( 9, 2, "3. Date"); - mvprintw(10, 2, "4. Avail"); + mbse_mvprintw( 7, 2, "1. Text"); + mbse_mvprintw( 8, 2, "2. User"); + mbse_mvprintw( 9, 2, "3. Date"); + mbse_mvprintw(10, 2, "4. Avail"); for (;;) { set_color(WHITE, BLACK); @@ -319,7 +319,7 @@ void EditOneline(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "8.7.1 ONELINERS SETUP"); + mbse_mvprintw( 5, 2, "8.7.1 ONELINERS SETUP"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/oneline.temp", getenv("MBSE_ROOT")); @@ -344,7 +344,7 @@ void EditOneline(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-32s", o + i, ol.Oneline); temp[38] = '\0'; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } @@ -401,7 +401,7 @@ void PurgeOneline(void) clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "8.7.2 ONELINERS PURGE"); + mbse_mvprintw( 5, 6, "8.7.2 ONELINERS PURGE"); set_color(CYAN, BLACK); working(1, 0, 0); @@ -428,9 +428,9 @@ void PurgeOneline(void) } sprintf(temp, "%d records, %d records to purge", recno, iCount); - mvprintw(7, 6, temp); + mbse_mvprintw(7, 6, temp); if (iCount == 0) { - mvprintw(9, 6, "Press any key"); + mbse_mvprintw(9, 6, "Press any key"); readkey(9, 20, LIGHTGRAY, BLACK); free(sFileName); return; @@ -471,7 +471,7 @@ void ImportOneline(void) clr_index(); set_color(WHITE, BLACK); - mvprintw(5, 6, "8.7.3 IMPORT ONELINERS"); + mbse_mvprintw(5, 6, "8.7.3 IMPORT ONELINERS"); set_color(CYAN, BLACK); temp = calloc(PATH_MAX, sizeof(char)); memset(temp, 0, sizeof(temp)); @@ -490,7 +490,7 @@ void ImportOneline(void) if ((Imp = fopen(temp, "r")) == NULL) { working(2, 0, 0); - mvprintw(21, 6, temp); + mbse_mvprintw(21, 6, temp); readkey(22, 6, LIGHTGRAY, BLACK); free(temp); return; @@ -517,7 +517,7 @@ void ImportOneline(void) if ((pOneline = fopen(temp, "a+")) == NULL) { working(2, 0, 0); fclose(Imp); - mvprintw(21, 6, temp); + mbse_mvprintw(21, 6, temp); readkey(22, 6, LIGHTGRAY, BLACK); free(temp); return; @@ -547,7 +547,7 @@ void ImportOneline(void) sprintf(temp, "Imported %d oneliners, skipped %d long/empty lines", recno, skipped); Syslog('+', temp); - mvprintw(21, 6, temp); + mbse_mvprintw(21, 6, temp); readkey(21, 7 + strlen(temp), LIGHTGRAY, BLACK); free(temp); } @@ -559,11 +559,11 @@ void ol_menu(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "8.7 ONELINER SETUP"); + mbse_mvprintw( 5, 6, "8.7 ONELINER SETUP"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Edit Oneliners"); - mvprintw( 8, 6, "2. Purge Oneliners"); - mvprintw( 9, 6, "3. Import Oneliners"); + mbse_mvprintw( 7, 6, "1. Edit Oneliners"); + mbse_mvprintw( 8, 6, "2. Purge Oneliners"); + mbse_mvprintw( 9, 6, "3. Import Oneliners"); switch(select_menu(3)) { case 0: return; diff --git a/mbsetup/m_protocol.c b/mbsetup/m_protocol.c index 1f303588..579304c1 100644 --- a/mbsetup/m_protocol.c +++ b/mbsetup/m_protocol.c @@ -264,19 +264,19 @@ void s_protrec(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "8.5 EDIT PROTOCOL"); + mbse_mvprintw( 5, 6, "8.5 EDIT PROTOCOL"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Select Key"); - mvprintw( 8, 6, "2. Name"); - mvprintw( 9, 6, "3. Upload"); - mvprintw(10, 6, "4. Download"); - mvprintw(11, 6, "5. Available"); - mvprintw(12, 6, "6. Batching"); - mvprintw(13, 6, "7. Bi direct"); - mvprintw(14, 6, "8. Advice"); - mvprintw(15, 6, "9. Efficiency"); - mvprintw(16, 6, "10. Deleted"); - mvprintw(17, 6, "11. Sec. level"); + mbse_mvprintw( 7, 6, "1. Select Key"); + mbse_mvprintw( 8, 6, "2. Name"); + mbse_mvprintw( 9, 6, "3. Upload"); + mbse_mvprintw(10, 6, "4. Download"); + mbse_mvprintw(11, 6, "5. Available"); + mbse_mvprintw(12, 6, "6. Batching"); + mbse_mvprintw(13, 6, "7. Bi direct"); + mbse_mvprintw(14, 6, "8. Advice"); + mbse_mvprintw(15, 6, "9. Efficiency"); + mbse_mvprintw(16, 6, "10. Deleted"); + mbse_mvprintw(17, 6, "11. Sec. level"); } @@ -398,7 +398,7 @@ void EditProtocol(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "8.5 PROTOCOL SETUP"); + mbse_mvprintw( 5, 6, "8.5 PROTOCOL SETUP"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/protocol.temp", getenv("MBSE_ROOT")); @@ -418,7 +418,7 @@ void EditProtocol(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %s %-30s", i, PROT.ProtKey, PROT.ProtName); temp[37] = '\0'; - mvprintw(i + 6, x, temp); + mbse_mvprintw(i + 6, x, temp); } fclose(fil); } @@ -483,7 +483,7 @@ char *PickProtocol(int nr) clr_index(); set_color(WHITE, BLACK); sprintf(temp, "%d. PROTOCOL SELECT", nr); - mvprintw( 5, 4, temp); + mbse_mvprintw( 5, 4, temp); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/protocol.data", getenv("MBSE_ROOT")); @@ -503,7 +503,7 @@ char *PickProtocol(int nr) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %s %-30s", i, PROT.ProtKey, PROT.ProtName); temp[37] = '\0'; - mvprintw(i + 6, x, temp); + mbse_mvprintw(i + 6, x, temp); } strcpy(pick, select_pick(records, 20)); diff --git a/mbsetup/m_route.c b/mbsetup/m_route.c index 5a4e87d2..41fde983 100644 --- a/mbsetup/m_route.c +++ b/mbsetup/m_route.c @@ -290,15 +290,15 @@ void RouteScreen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 5, "19. EDIT ROUTING TABLE"); + mbse_mvprintw( 5, 5, "19. EDIT ROUTING TABLE"); set_color(CYAN, BLACK); - mvprintw( 7, 5, "1. Mask"); -// mvprintw( 8, 5, "2. Src name"); - mvprintw( 9, 5, "3. Action"); - mvprintw(10, 5, "4. Dest addr"); -// mvprintw(11, 5, "5. Dest name"); - mvprintw(12, 5, "6. Active"); - mvprintw(13, 5, "7. Deleted"); + mbse_mvprintw( 7, 5, "1. Mask"); +// mbse_mvprintw( 8, 5, "2. Src name"); + mbse_mvprintw( 9, 5, "3. Action"); + mbse_mvprintw(10, 5, "4. Dest addr"); +// mbse_mvprintw(11, 5, "5. Dest name"); + mbse_mvprintw(12, 5, "6. Active"); + mbse_mvprintw(13, 5, "7. Deleted"); } @@ -436,7 +436,7 @@ void EditRoute(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 4, "19. ROUTING TABLE"); + mbse_mvprintw( 5, 4, "19. ROUTING TABLE"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/route.temp", getenv("MBSE_ROOT")); @@ -459,7 +459,7 @@ void EditRoute(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-25s %s %s", o + i, route.mask, get_routetype(route.routetype), aka2str(route.dest)); // temp[37] = 0; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } diff --git a/mbsetup/m_service.c b/mbsetup/m_service.c index d475b2ac..62cddf26 100644 --- a/mbsetup/m_service.c +++ b/mbsetup/m_service.c @@ -225,12 +225,12 @@ void ServiceScreen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 2, "16. EDIT SERVICES"); + mbse_mvprintw( 5, 2, "16. EDIT SERVICES"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Name"); - mvprintw( 8, 2, "2. Type"); - mvprintw( 9, 2, "3. Active"); - mvprintw(10, 2, "4. Deleted"); + mbse_mvprintw( 7, 2, "1. Name"); + mbse_mvprintw( 8, 2, "2. Type"); + mbse_mvprintw( 9, 2, "3. Active"); + mbse_mvprintw(10, 2, "4. Deleted"); } @@ -338,7 +338,7 @@ void EditService(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 4, "16. SERVICE MANAGER"); + mbse_mvprintw( 5, 4, "16. SERVICE MANAGER"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/service.temp", getenv("MBSE_ROOT")); @@ -363,7 +363,7 @@ void EditService(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-15s %s", o+i, servrec.Service, getservice(servrec.Action)); temp[37] = 0; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } diff --git a/mbsetup/m_task.c b/mbsetup/m_task.c index 25e367c8..7f429e94 100644 --- a/mbsetup/m_task.c +++ b/mbsetup/m_task.c @@ -103,23 +103,23 @@ int EditTask() IsDoing("Edit Taskmanager"); set_color(WHITE, BLACK); - mvprintw( 4, 1, "18. EDIT TASK MANAGER"); + mbse_mvprintw( 4, 1, "18. EDIT TASK MANAGER"); set_color(CYAN, BLACK); - mvprintw( 6, 1, " 1. Mailout"); - mvprintw( 7, 1, " 2. Mailin"); - mvprintw( 8, 1, " 3. Newnews"); - mvprintw( 9, 1, " 4. Index 1"); - mvprintw(10, 1, " 5. Index 2"); - mvprintw(11, 1, " 6. Index 3"); - mvprintw(12, 1, " 7. Msglink"); - mvprintw(13, 1, " 8. Reqindex"); - mvprintw(14, 1, " 9. Ping #1"); - mvprintw(15, 1, "10. Ping #2"); - mvprintw(16, 1, "11. Max TCP"); - mvprintw(17, 1, "12. Max Load"); + mbse_mvprintw( 6, 1, " 1. Mailout"); + mbse_mvprintw( 7, 1, " 2. Mailin"); + mbse_mvprintw( 8, 1, " 3. Newnews"); + mbse_mvprintw( 9, 1, " 4. Index 1"); + mbse_mvprintw(10, 1, " 5. Index 2"); + mbse_mvprintw(11, 1, " 6. Index 3"); + mbse_mvprintw(12, 1, " 7. Msglink"); + mbse_mvprintw(13, 1, " 8. Reqindex"); + mbse_mvprintw(14, 1, " 9. Ping #1"); + mbse_mvprintw(15, 1, "10. Ping #2"); + mbse_mvprintw(16, 1, "11. Max TCP"); + mbse_mvprintw(17, 1, "12. Max Load"); - mvprintw(16,41, "13. ZMH start"); - mvprintw(17,41, "14. ZMH end"); + mbse_mvprintw(16,41, "13. ZMH start"); + mbse_mvprintw(17,41, "14. ZMH end"); for (;;) { diff --git a/mbsetup/m_tic.c b/mbsetup/m_tic.c index 4fd918aa..54231ac8 100644 --- a/mbsetup/m_tic.c +++ b/mbsetup/m_tic.c @@ -46,12 +46,12 @@ void tic_menu(void) clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "10. FILEECHO SETUP"); + mbse_mvprintw( 5, 6, "10. FILEECHO SETUP"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Edit Fileecho Groups"); - mvprintw( 8, 6, "2. Edit Fileecho Areas"); - mvprintw( 9, 6, "3. Edit Hatch Manager"); - mvprintw(10, 6, "4. Edit Magic files"); + mbse_mvprintw( 7, 6, "1. Edit Fileecho Groups"); + mbse_mvprintw( 8, 6, "2. Edit Fileecho Areas"); + mbse_mvprintw( 9, 6, "3. Edit Hatch Manager"); + mbse_mvprintw(10, 6, "4. Edit Magic files"); switch(select_menu(4)) { case 0: diff --git a/mbsetup/m_ticarea.c b/mbsetup/m_ticarea.c index 35eb4e02..41bba603 100644 --- a/mbsetup/m_ticarea.c +++ b/mbsetup/m_ticarea.c @@ -281,13 +281,13 @@ void EditTicSystem(sysconnect *Sys) if (refresh) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5,6, "10.2.26 EDIT CONNECTION"); + mbse_mvprintw( 5,6, "10.2.26 EDIT CONNECTION"); set_color(CYAN, BLACK); - mvprintw( 7,6, "1. Aka"); - mvprintw( 8,6, "2. Send to"); - mvprintw( 9,6, "3. Recv from"); - mvprintw(10,6, "4. Pause"); - mvprintw(11,6, "5. Delete"); + mbse_mvprintw( 7,6, "1. Aka"); + mbse_mvprintw( 8,6, "2. Send to"); + mbse_mvprintw( 9,6, "3. Recv from"); + mbse_mvprintw(10,6, "4. Pause"); + mbse_mvprintw(11,6, "5. Delete"); refresh = FALSE; } @@ -341,7 +341,7 @@ int EditTicConnections(FILE *fil) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 5, "10.2.26 TIC AREA CONNECTIONS"); + mbse_mvprintw( 5, 5, "10.2.26 TIC AREA CONNECTIONS"); set_color(CYAN, BLACK); y = 7; x = 2; @@ -372,7 +372,7 @@ int EditTicConnections(FILE *fil) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d.", o+i); } - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } @@ -408,37 +408,37 @@ void SetTicScreen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 4, 2, "10.2 EDIT TIC AREA"); + mbse_mvprintw( 4, 2, "10.2 EDIT TIC AREA"); set_color(CYAN, BLACK); - mvprintw( 6, 2, "1. Comment"); - mvprintw( 7, 2, "2. Area tag"); - mvprintw( 8, 2, "3. Security"); - mvprintw( 9, 2, "4. BBS area"); - mvprintw(10, 2, "5. Message"); - mvprintw(11, 2, "6. Group"); - mvprintw(12, 2, "7. Keep #"); - mvprintw(13, 2, "8. Fido aka"); - mvprintw(14, 2, "9. Convert"); - mvprintw(15, 2, "10. Banner"); - mvprintw(16, 2, "11. Replace"); + mbse_mvprintw( 6, 2, "1. Comment"); + mbse_mvprintw( 7, 2, "2. Area tag"); + mbse_mvprintw( 8, 2, "3. Security"); + mbse_mvprintw( 9, 2, "4. BBS area"); + mbse_mvprintw(10, 2, "5. Message"); + mbse_mvprintw(11, 2, "6. Group"); + mbse_mvprintw(12, 2, "7. Keep #"); + mbse_mvprintw(13, 2, "8. Fido aka"); + mbse_mvprintw(14, 2, "9. Convert"); + mbse_mvprintw(15, 2, "10. Banner"); + mbse_mvprintw(16, 2, "11. Replace"); - mvprintw( 9,41, "12. Dupecheck"); - mvprintw(10,41, "13. Secure"); - mvprintw(11,41, "14. Touch"); - mvprintw(12,41, "15. Virus sc."); - mvprintw(13,41, "16. Announce"); - mvprintw(14,41, "17. Upd magic"); - mvprintw(15,41, "18. File_id"); - mvprintw(16,41, "19. Conv.all"); + mbse_mvprintw( 9,41, "12. Dupecheck"); + mbse_mvprintw(10,41, "13. Secure"); + mbse_mvprintw(11,41, "14. Touch"); + mbse_mvprintw(12,41, "15. Virus sc."); + mbse_mvprintw(13,41, "16. Announce"); + mbse_mvprintw(14,41, "17. Upd magic"); + mbse_mvprintw(15,41, "18. File_id"); + mbse_mvprintw(16,41, "19. Conv.all"); - mvprintw( 9,60, "20. Send org."); - mvprintw(10,60, "21. Mandatory"); - mvprintw(11,60, "22. Notified"); - mvprintw(12,60, "23. Upl discon"); - mvprintw(13,60, "24. Deleted"); - mvprintw(14,60, "25. Active"); - mvprintw(15,60, "26. Systems"); + mbse_mvprintw( 9,60, "20. Send org."); + mbse_mvprintw(10,60, "21. Mandatory"); + mbse_mvprintw(11,60, "22. Notified"); + mbse_mvprintw(12,60, "23. Upl discon"); + mbse_mvprintw(13,60, "24. Deleted"); + mbse_mvprintw(14,60, "25. Active"); + mbse_mvprintw(15,60, "26. Systems"); } @@ -532,10 +532,10 @@ void ShowTicStatus(sysconnect S) { clr_index(); set_color(CYAN, BLACK); - mvprintw( 7, 6, "Aka"); - mvprintw( 8, 6, "Send to"); - mvprintw( 9, 6, "Recv from"); - mvprintw(10, 6, "Pause"); + mbse_mvprintw( 7, 6, "Aka"); + mbse_mvprintw( 8, 6, "Send to"); + mbse_mvprintw( 9, 6, "Recv from"); + mbse_mvprintw(10, 6, "Pause"); set_color(WHITE, BLACK); show_str( 7,16,23, aka2str(S.aka)); show_bool( 8,16, S.sendto); @@ -586,15 +586,15 @@ void TicGlobal(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "10.2 GLOBAL EDIT TIC AREAS"); + mbse_mvprintw( 5, 6, "10.2 GLOBAL EDIT TIC AREAS"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Delete connection"); - mvprintw( 8, 6, "2. Add new connection"); - mvprintw( 9, 6, "3. Replace connection"); - mvprintw(10, 6, "4. Change connection status"); - mvprintw(11, 6, "5. Change aka to use"); - mvprintw(12, 6, "6. Change security flags"); - mvprintw(13, 6, "7. Delete TIC area"); + mbse_mvprintw( 7, 6, "1. Delete connection"); + mbse_mvprintw( 8, 6, "2. Add new connection"); + mbse_mvprintw( 9, 6, "3. Replace connection"); + mbse_mvprintw(10, 6, "4. Change connection status"); + mbse_mvprintw(11, 6, "5. Change aka to use"); + mbse_mvprintw(12, 6, "6. Change security flags"); + mbse_mvprintw(13, 6, "7. Delete TIC area"); memset(&a1, 0, sizeof(fidoaddr)); memset(&a2, 0, sizeof(fidoaddr)); @@ -628,25 +628,25 @@ void TicGlobal(void) * Show settings before proceeding */ switch (menu) { - case 1: mvprintw(7, 6, "Delete aka %s", aka2str(a1)); + case 1: mbse_mvprintw(7, 6, "Delete aka %s", aka2str(a1)); break; - case 2: mvprintw(7, 6, "Add aka %s", aka2str(a2)); + case 2: mbse_mvprintw(7, 6, "Add aka %s", aka2str(a2)); break; case 3: p = xstrcpy(aka2str(a1)); - mvprintw(7, 6, "Replace aka %s with %s", p, aka2str(a2)); + mbse_mvprintw(7, 6, "Replace aka %s with %s", p, aka2str(a2)); free(p); break; case 4: ShowTicStatus(S); - mvprintw(14, 6, "Change the link status"); + mbse_mvprintw(14, 6, "Change the link status"); case 5: if (akan != -1) - mvprintw( 7, 6, "Set %s as new aka to use", aka2str(CFG.aka[akan])); + mbse_mvprintw( 7, 6, "Set %s as new aka to use", aka2str(CFG.aka[akan])); break; case 6: set_color(CYAN, BLACK); - mvprintw(7, 6, "Link security"); + mbse_mvprintw(7, 6, "Link security"); set_color(WHITE, BLACK); - mvprintw(7,21, getflag(as.flags, as.notflags)); + mbse_mvprintw(7,21, getflag(as.flags, as.notflags)); break; - case 7: mvprintw(7, 6, "Delete TIC areas"); + case 7: mbse_mvprintw(7, 6, "Delete TIC areas"); break; } @@ -789,7 +789,7 @@ void TicGlobal(void) fclose(ttfil); } - mvprintw(LINES -3, 6,"Made %d changes in %d possible areas", Done, Total); + mbse_mvprintw(LINES -3, 6,"Made %d changes in %d possible areas", Done, Total); (void)readkey(LINES -3, 50, LIGHTGRAY, BLACK); if (Done) TicUpdated = TRUE; @@ -840,7 +840,7 @@ int EditTicRec(int Area) set_color(WHITE, BLACK); show_str( 6,16,55, tic.Comment); show_str( 7,16,20, tic.Name); - mvprintw( 8,16, getflag(tic.LinkSec.flags, tic.LinkSec.notflags)); + mbse_mvprintw( 8,16, getflag(tic.LinkSec.flags, tic.LinkSec.notflags)); show_str( 9,16,24, temp); show_str(10,16,14, tic.Message); show_str(11,16,12, tic.Group); @@ -1022,7 +1022,7 @@ void EditTicarea(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 3, "10.2 TIC AREA SETUP"); + mbse_mvprintw( 5, 3, "10.2 TIC AREA SETUP"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/tic.temp", getenv("MBSE_ROOT")); @@ -1044,7 +1044,7 @@ Comment); set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d.", o + i); } - mvprintw(y, 2, temp); + mbse_mvprintw(y, 2, temp); y++; } } @@ -1129,7 +1129,7 @@ char *PickTicarea(char *shdr) clr_index(); set_color(WHITE, BLACK); sprintf(temp, "%s. TIC AREA SELECT", shdr); - mvprintw(5, 3, temp); + mbse_mvprintw(5, 3, temp); set_color(CYAN, BLACK); if (records) { @@ -1150,7 +1150,7 @@ char *PickTicarea(char *shdr) else set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-20s %-40s", o + i, tic.Name, tic.Comment); - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } diff --git a/mbsetup/m_tty.c b/mbsetup/m_tty.c index 623bcafd..2194d8b1 100644 --- a/mbsetup/m_tty.c +++ b/mbsetup/m_tty.c @@ -283,23 +283,23 @@ void TtyScreen(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "6. EDIT TTY LINE"); + mbse_mvprintw( 5, 6, "6. EDIT TTY LINE"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Comment"); - mvprintw( 8, 6, "2. TTY Device"); - mvprintw( 9, 6, "3. Phone nr."); - mvprintw(10, 6, "4. Line Speed"); - mvprintw(11, 6, "5. Fido Flags"); - mvprintw(12, 6, "6. Line Type"); - mvprintw(13, 6, "7. Available"); - mvprintw(14, 6, "8. Auth. log"); - mvprintw(15, 6, "9. Honor ZMH"); - mvprintw(16, 6, "10. Deleted"); - mvprintw(17, 6, "11. Callout"); + mbse_mvprintw( 7, 6, "1. Comment"); + mbse_mvprintw( 8, 6, "2. TTY Device"); + mbse_mvprintw( 9, 6, "3. Phone nr."); + mbse_mvprintw(10, 6, "4. Line Speed"); + mbse_mvprintw(11, 6, "5. Fido Flags"); + mbse_mvprintw(12, 6, "6. Line Type"); + mbse_mvprintw(13, 6, "7. Available"); + mbse_mvprintw(14, 6, "8. Auth. log"); + mbse_mvprintw(15, 6, "9. Honor ZMH"); + mbse_mvprintw(16, 6, "10. Deleted"); + mbse_mvprintw(17, 6, "11. Callout"); - mvprintw(15,31, "12. Portspeed"); - mvprintw(16,31, "13. Modemtype"); - mvprintw(17,31, "14. EMSI name"); + mbse_mvprintw(15,31, "12. Portspeed"); + mbse_mvprintw(16,31, "13. Modemtype"); + mbse_mvprintw(17,31, "14. EMSI name"); } @@ -449,7 +449,7 @@ void EditTtyinfo(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 4, "6. TTY LINES SETUP"); + mbse_mvprintw( 5, 4, "6. TTY LINES SETUP"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/ttyinfo.temp", getenv("MBSE_ROOT")); @@ -473,7 +473,7 @@ void EditTtyinfo(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-6s %-25s", o+i, ttyinfo.tty, ttyinfo.comment); temp[37] = 0; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } diff --git a/mbsetup/m_users.c b/mbsetup/m_users.c index f69f0ef9..45719d65 100644 --- a/mbsetup/m_users.c +++ b/mbsetup/m_users.c @@ -195,34 +195,34 @@ void Screen1(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 4, 2, "15. EDIT USER"); + mbse_mvprintw( 4, 2, "15. EDIT USER"); set_color(CYAN, BLACK); - mvprintw( 6, 2, "1. Full Name"); - mvprintw( 7, 2, "2. Security"); - mvprintw( 8, 2, "3. Expirydate"); - mvprintw( 9, 2, "4. Expiry Sec"); - mvprintw(10, 2, "5. Unix name"); - mvprintw(11, 2, " 1st login"); - mvprintw(12, 2, " Last login"); - mvprintw(13, 2, " Pwdchange"); - mvprintw(14, 2, "6. Credit"); - mvprintw(15, 2, "7. Hidden"); - mvprintw(16, 2, "8. Deleted"); - mvprintw(17, 2, "9. No Kill"); - mvprintw(18, 2, "10. Comment"); + mbse_mvprintw( 6, 2, "1. Full Name"); + mbse_mvprintw( 7, 2, "2. Security"); + mbse_mvprintw( 8, 2, "3. Expirydate"); + mbse_mvprintw( 9, 2, "4. Expiry Sec"); + mbse_mvprintw(10, 2, "5. Unix name"); + mbse_mvprintw(11, 2, " 1st login"); + mbse_mvprintw(12, 2, " Last login"); + mbse_mvprintw(13, 2, " Pwdchange"); + mbse_mvprintw(14, 2, "6. Credit"); + mbse_mvprintw(15, 2, "7. Hidden"); + mbse_mvprintw(16, 2, "8. Deleted"); + mbse_mvprintw(17, 2, "9. No Kill"); + mbse_mvprintw(18, 2, "10. Comment"); - mvprintw( 6,54, "11. Locked"); - mvprintw( 7,54, "12. Guest"); - mvprintw( 8,54, "13. Ext Info"); - mvprintw( 9,54, "14. Email"); - mvprintw(10,54, " Calls"); - mvprintw(11,54, " Downlds"); - mvprintw(12,54, " Down Kb"); - mvprintw(13,54, " Uploads"); - mvprintw(14,54, " Upload Kb"); - mvprintw(15,54, " Posted"); - mvprintw(16,54, "15. Time left"); - mvprintw(17,54, "16. Screen 2"); + mbse_mvprintw( 6,54, "11. Locked"); + mbse_mvprintw( 7,54, "12. Guest"); + mbse_mvprintw( 8,54, "13. Ext Info"); + mbse_mvprintw( 9,54, "14. Email"); + mbse_mvprintw(10,54, " Calls"); + mbse_mvprintw(11,54, " Downlds"); + mbse_mvprintw(12,54, " Down Kb"); + mbse_mvprintw(13,54, " Uploads"); + mbse_mvprintw(14,54, " Upload Kb"); + mbse_mvprintw(15,54, " Posted"); + mbse_mvprintw(16,54, "15. Time left"); + mbse_mvprintw(17,54, "16. Screen 2"); } @@ -281,34 +281,34 @@ void Screen2(void) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 4, 2, "15. EDIT USER PRIVATE SETTINGS"); + mbse_mvprintw( 4, 2, "15. EDIT USER PRIVATE SETTINGS"); set_color(CYAN, BLACK); - mvprintw( 6, 2, "1. Handle"); - mvprintw( 7, 2, "2. Location"); - mvprintw( 8, 2, "3. Address 1"); - mvprintw( 9, 2, "4. Address 2"); - mvprintw(10, 2, "5. Address 3"); - mvprintw(11, 2, "6. Voicephone"); - mvprintw(12, 2, "7. Dataphone"); - mvprintw(13, 2, "8. Birthdate"); - mvprintw(14, 2, "9. Password"); - mvprintw(15, 2, "10. Sex"); - mvprintw(16, 2, "11. Protocol"); - mvprintw(17, 2, "12. Archiver"); - mvprintw(18, 2, "13. Charset"); + mbse_mvprintw( 6, 2, "1. Handle"); + mbse_mvprintw( 7, 2, "2. Location"); + mbse_mvprintw( 8, 2, "3. Address 1"); + mbse_mvprintw( 9, 2, "4. Address 2"); + mbse_mvprintw(10, 2, "5. Address 3"); + mbse_mvprintw(11, 2, "6. Voicephone"); + mbse_mvprintw(12, 2, "7. Dataphone"); + mbse_mvprintw(13, 2, "8. Birthdate"); + mbse_mvprintw(14, 2, "9. Password"); + mbse_mvprintw(15, 2, "10. Sex"); + mbse_mvprintw(16, 2, "11. Protocol"); + mbse_mvprintw(17, 2, "12. Archiver"); + mbse_mvprintw(18, 2, "13. Charset"); - mvprintw( 7,63, "14. Screenlen"); - mvprintw( 8,63, "15. Language"); - mvprintw( 9,63, "16. Hotkeys"); - mvprintw(10,63, "17. Color"); - mvprintw(11,63, "18. Silent"); - mvprintw(12,63, "19. CLS"); - mvprintw(13,63, "20. More"); - mvprintw(14,63, "21. Editor"); - mvprintw(15,63, "22. MailScan"); - mvprintw(16,63, "23. ShowNews"); - mvprintw(17,63, "24. NewFiles"); - mvprintw(18,63, "25. Emacs"); + mbse_mvprintw( 7,63, "14. Screenlen"); + mbse_mvprintw( 8,63, "15. Language"); + mbse_mvprintw( 9,63, "16. Hotkeys"); + mbse_mvprintw(10,63, "17. Color"); + mbse_mvprintw(11,63, "18. Silent"); + mbse_mvprintw(12,63, "19. CLS"); + mbse_mvprintw(13,63, "20. More"); + mbse_mvprintw(14,63, "21. Editor"); + mbse_mvprintw(15,63, "22. MailScan"); + mbse_mvprintw(16,63, "23. ShowNews"); + mbse_mvprintw(17,63, "24. NewFiles"); + mbse_mvprintw(18,63, "25. Emacs"); } @@ -605,7 +605,7 @@ void EditUsers(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 3, "15. USERS EDITOR"); + mbse_mvprintw( 5, 3, "15. USERS EDITOR"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/users.temp", getenv("MBSE_ROOT")); @@ -630,7 +630,7 @@ void EditUsers(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-32s", o + i, usrconfig.sUserName); temp[37] = 0; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } } diff --git a/mbsetup/m_virus.c b/mbsetup/m_virus.c index b444c0e3..9dc7f688 100644 --- a/mbsetup/m_virus.c +++ b/mbsetup/m_virus.c @@ -280,14 +280,14 @@ int EditVirRec(int Area) crc = upd_crc32((char *)&virscan, crc, sizeof(virscan)); set_color(WHITE, BLACK); - mvprintw( 5, 2, "4. EDIT VIRUS SCANNER"); + mbse_mvprintw( 5, 2, "4. EDIT VIRUS SCANNER"); set_color(CYAN, BLACK); - mvprintw( 7, 2, "1. Comment"); - mvprintw( 8, 2, "2. Command"); - mvprintw( 9, 2, "3. Options"); - mvprintw(10, 2, "4. Available"); - mvprintw(11, 2, "5. Deleted"); - mvprintw(12, 2, "6. Error lvl"); + mbse_mvprintw( 7, 2, "1. Comment"); + mbse_mvprintw( 8, 2, "2. Command"); + mbse_mvprintw( 9, 2, "3. Options"); + mbse_mvprintw(10, 2, "4. Available"); + mbse_mvprintw(11, 2, "5. Deleted"); + mbse_mvprintw(12, 2, "6. Error lvl"); for (;;) { set_color(WHITE, BLACK); @@ -362,7 +362,7 @@ void EditVirus(void) for (;;) { clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 4, "4. VIRUS SCANNERS SETUP"); + mbse_mvprintw( 5, 4, "4. VIRUS SCANNERS SETUP"); set_color(CYAN, BLACK); if (records != 0) { sprintf(temp, "%s/etc/virscan.temp", getenv("MBSE_ROOT")); @@ -385,7 +385,7 @@ void EditVirus(void) set_color(LIGHTBLUE, BLACK); sprintf(temp, "%3d. %-32s", i, virscan.comment); temp[37] = 0; - mvprintw(y, x, temp); + mbse_mvprintw(y, x, temp); y++; } fclose(fil); diff --git a/mbsetup/mbsetup.c b/mbsetup/mbsetup.c index f6a405df..4a7f0b1e 100644 --- a/mbsetup/mbsetup.c +++ b/mbsetup/mbsetup.c @@ -215,9 +215,9 @@ void site_docs(void) Syslog('+', "Start creating sitedocs"); set_color(WHITE, BLACK); - mvprintw( 5, 6, "21. CREATING SITEDOCS"); + mbse_mvprintw( 5, 6, "21. CREATING SITEDOCS"); set_color(CYAN, BLACK); - mvprintw( 7,11, (char *)"Erasing directory %s/share/doc/html", getenv("MBSE_ROOT")); + mbse_mvprintw( 7,11, (char *)"Erasing directory %s/share/doc/html", getenv("MBSE_ROOT")); fflush(stdout); sprintf(temp, "-r -f %s/share/doc/html", getenv("MBSE_ROOT")); @@ -258,7 +258,7 @@ void site_docs(void) Syslog('+', "Can't create html documentation"); } - mvprintw(8,11, (char *)"Creating site documents"); + mbse_mvprintw(8,11, (char *)"Creating site documents"); fflush(stdout); horiz = 35; page = global_doc(fp, toc, page); @@ -299,7 +299,7 @@ void site_docs(void) dotter(); ol_doc(); clrtoeol(); - mvprintw( 8,11, (char *)"Created site documents in %s/share/doc", getenv("MBSE_ROOT")); + mbse_mvprintw( 8,11, (char *)"Created site documents in %s/share/doc", getenv("MBSE_ROOT")); fflush(stdout); /* @@ -348,7 +348,7 @@ void initdatabases(void) clr_index(); working(1, 0, 0); set_color(WHITE, BLACK); - mvprintw( 5, 6, " INIT DATABASES"); + mbse_mvprintw( 5, 6, " INIT DATABASES"); IsDoing("Init Databases"); } @@ -448,29 +448,29 @@ int main(int argc, char *argv[]) IsDoing("Browsing Menu"); clr_index(); set_color(WHITE, BLACK); - mvprintw( 5, 6, "0. MAIN SETUP"); + mbse_mvprintw( 5, 6, "0. MAIN SETUP"); set_color(CYAN, BLACK); - mvprintw( 7, 6, "1. Edit Global configuration"); - mvprintw( 8, 6, "2. Edit Fido Networks"); - mvprintw( 9, 6, "3. Edit Archiver Programs"); - mvprintw(10, 6, "4. Edit Virus Scanners"); - mvprintw(11, 6, "5. Edit Modem types"); - mvprintw(12, 6, "6. Edit TTY lines info"); - mvprintw(13, 6, "7. Edit Fidonet Nodes"); - mvprintw(14, 6, "8. Edit BBS Setup"); - mvprintw(15, 6, "9. Edit Mail Setup"); - mvprintw(16, 6, "10. Edit File Echo's setup"); - mvprintw(17, 6, "11. Edit Newfiles Groups"); - mvprintw( 7,46, "12. Edit Newfiles Reports"); - mvprintw( 8,46, "13. Edit FileFind Setup"); - mvprintw( 9,46, "14. Edit Files Database"); - mvprintw(10,46, "15. Edit BBS Users"); - mvprintw(11,46, "16. Edit Services"); - mvprintw(12,46, "17. Edit Domains"); - mvprintw(13,46, "18. Edit Task Manager"); - mvprintw(14,46, "19. Edit Routing Table"); - mvprintw(15,46, "20. Show software information"); - mvprintw(16,46, "21. Create site documents"); + mbse_mvprintw( 7, 6, "1. Edit Global configuration"); + mbse_mvprintw( 8, 6, "2. Edit Fido Networks"); + mbse_mvprintw( 9, 6, "3. Edit Archiver Programs"); + mbse_mvprintw(10, 6, "4. Edit Virus Scanners"); + mbse_mvprintw(11, 6, "5. Edit Modem types"); + mbse_mvprintw(12, 6, "6. Edit TTY lines info"); + mbse_mvprintw(13, 6, "7. Edit Fidonet Nodes"); + mbse_mvprintw(14, 6, "8. Edit BBS Setup"); + mbse_mvprintw(15, 6, "9. Edit Mail Setup"); + mbse_mvprintw(16, 6, "10. Edit File Echo's setup"); + mbse_mvprintw(17, 6, "11. Edit Newfiles Groups"); + mbse_mvprintw( 7,46, "12. Edit Newfiles Reports"); + mbse_mvprintw( 8,46, "13. Edit FileFind Setup"); + mbse_mvprintw( 9,46, "14. Edit Files Database"); + mbse_mvprintw(10,46, "15. Edit BBS Users"); + mbse_mvprintw(11,46, "16. Edit Services"); + mbse_mvprintw(12,46, "17. Edit Domains"); + mbse_mvprintw(13,46, "18. Edit Task Manager"); + mbse_mvprintw(14,46, "19. Edit Routing Table"); + mbse_mvprintw(15,46, "20. Show software information"); + mbse_mvprintw(16,46, "21. Create site documents"); switch(select_menu(21)) { case 0: diff --git a/mbsetup/mutil.c b/mbsetup/mutil.c index 24f23398..6737237c 100644 --- a/mbsetup/mutil.c +++ b/mbsetup/mutil.c @@ -54,7 +54,7 @@ unsigned char readkey(int y, int x, int fg, int bg) if ((i % 10) == 0) show_date(fg, bg, 0, 0); - locate(y, x); + mbse_locate(y, x); fflush(stdout); rc = Waitchar(&ch, 5); if ((rc == 1) && (ch != KEY_ESCAPE)) @@ -82,7 +82,7 @@ unsigned char testkey(int y, int x) int rc; unsigned char ch = 0; - locate(y, x); + mbse_locate(y, x); fflush(stdout); if ((ttyfd = open("/dev/tty", O_RDWR|O_NONBLOCK)) < 0) { @@ -267,7 +267,7 @@ int horiz; void dotter(void) { Nopper(); - mvprintw(8, horiz++, (char *)"."); + mbse_mvprintw(8, horiz++, (char *)"."); fflush(stdout); } diff --git a/mbsetup/screen.c b/mbsetup/screen.c index ca22e9e6..65b01258 100644 --- a/mbsetup/screen.c +++ b/mbsetup/screen.c @@ -61,7 +61,7 @@ void hor_lin(int y, int x, int len) { int i; - locate(y, x); + mbse_locate(y, x); for (i = 0; i < len; i++) fputc('-', stdout); fflush(stdout); @@ -80,7 +80,7 @@ void set_color(int f, int b) if ((f != old_f) || (b != old_b)) { old_f = f; old_b = b; - colour(f, b); + mbse_colour(f, b); fflush(stdout); } } @@ -103,10 +103,10 @@ void show_date(int fg, int bg, int y, int x) set_color(LIGHTGREEN, BLUE); p = ctime(&now); Striplf(p); - mvprintw(1, 44, (char *)"%s TZUTC %s", p, gmtoffset(now)); + mbse_mvprintw(1, 44, (char *)"%s TZUTC %s", p, gmtoffset(now)); p = asctime(gmtime(&now)); Striplf(p); - mvprintw(2, 44, (char *)"%s UTC", p); + mbse_mvprintw(2, 44, (char *)"%s UTC", p); /* * Indicator if bbs is free @@ -116,20 +116,20 @@ void show_date(int fg, int bg, int y, int x) strcpy(buf, SockR("SBBS:0;")); if (strncmp(buf, "100:2,1", 7) == 0) { set_color(WHITE, RED); - mvprintw(2,74, (char *)" Down "); + mbse_mvprintw(2,74, (char *)" Down "); } else { set_color(WHITE, BLUE); - mvprintw(2,74, (char *)" Free "); + mbse_mvprintw(2,74, (char *)" Free "); } bbs_free = TRUE; } else { set_color(WHITE, RED); - mvprintw(2,74, (char *)" Busy "); + mbse_mvprintw(2,74, (char *)" Busy "); bbs_free = FALSE; } if (y && x) - locate(y, x); + mbse_locate(y, x); set_color(fg, bg); } } @@ -138,7 +138,7 @@ void show_date(int fg, int bg, int y, int x) void center_addstr(int y, char *s) { - mvprintw(y, (COLS / 2) - (strlen(s) / 2), s); + mbse_mvprintw(y, (COLS / 2) - (strlen(s) / 2), s); } @@ -150,16 +150,16 @@ void screen_start(char *name) { int i; - TermInit(1, COLS, LINES); + mbse_TermInit(1, COLS, LINES); /* * Overwrite screen the first time, if user had it black on white * it will change to white on black. clear() won't do the trick. */ set_color(LIGHTGRAY, BLUE); - locate(1, 1); + mbse_locate(1, 1); for (i = 0; i < LINES; i++) { if (i == 3) - colour(LIGHTGRAY, BLACK); + mbse_colour(LIGHTGRAY, BLACK); clrtoeol(); if (i < LINES) fprintf(stdout, "\n"); @@ -167,10 +167,10 @@ void screen_start(char *name) fflush(stdout); set_color(WHITE, BLUE); - locate(1, 1); + mbse_locate(1, 1); printf((char *)"%s for MBSE BBS version %s", name, VERSION); set_color(YELLOW, BLUE); - locate(2, 1); + mbse_locate(2, 1); printf((char *)SHORTRIGHT); set_color(LIGHTGRAY, BLACK); show_date(LIGHTGRAY, BLACK, 0, 0); @@ -185,7 +185,7 @@ void screen_start(char *name) void screen_stop() { set_color(LIGHTGRAY, BLACK); - clear(); + mbse_clear(); fflush(stdout); } @@ -215,11 +215,11 @@ void working(int txno, int y, int x) set_color(LIGHTGRAY, BLACK); switch (txno) { - case 0: mvprintw(4, 66, (char *)" "); + case 0: mbse_mvprintw(4, 66, (char *)" "); break; - case 1: mvprintw(4, 66, (char *)"Working . . ."); + case 1: mbse_mvprintw(4, 66, (char *)"Working . . ."); break; - case 2: mvprintw(4, 66, (char *)">>> ERROR <<<"); + case 2: mbse_mvprintw(4, 66, (char *)">>> ERROR <<<"); for (i = 1; i <= 5; i++) { fputc(7, stdout); fflush(stdout); @@ -227,19 +227,19 @@ void working(int txno, int y, int x) } msleep(550); break; - case 3: mvprintw(4, 66, (char *)"Form inserted"); + case 3: mbse_mvprintw(4, 66, (char *)"Form inserted"); fputc(7, stdout); fflush(stdout); sleep(1); break; - case 4: mvprintw(4, 66, (char *)"Form deleted "); + case 4: mbse_mvprintw(4, 66, (char *)"Form deleted "); fputc(7, stdout); fflush(stdout); sleep(1); break; - case 5: mvprintw(4, 66, (char *)"Moving . . . "); + case 5: mbse_mvprintw(4, 66, (char *)"Moving . . . "); break; - case 6: mvprintw(4, 66, (char *)"Data updated "); + case 6: mbse_mvprintw(4, 66, (char *)"Data updated "); fputc(7, stdout); fflush(stdout); sleep(1); @@ -249,7 +249,7 @@ void working(int txno, int y, int x) show_date(LIGHTGRAY, BLACK, 0, 0); set_color(LIGHTGRAY, BLACK); if (y && x) - locate(y, x); + mbse_locate(y, x); fflush(stdout); } @@ -264,7 +264,7 @@ void clr_index() set_color(LIGHTGRAY, BLACK); for (i = 3; i <= (LINES - 1); i++) { - locate(i, 1); + mbse_locate(i, 1); clrtoeol(); } } @@ -279,7 +279,7 @@ void showhelp(char *T) int f, i, x, forlim; f = FALSE; - locate(LINES-1, 1); + mbse_locate(LINES-1, 1); set_color(WHITE, RED); clrtoeol(); x = 0;