diff --git a/src/syncterm/bbslist.c b/src/syncterm/bbslist.c
index 11552023ec19626a2bd3eb95c725cfe48b4e8436..15fbaca16488e63755cd02115ddc3b98d48fb8e2 100644
--- a/src/syncterm/bbslist.c
+++ b/src/syncterm/bbslist.c
@@ -307,10 +307,6 @@ int edit_list(struct bbslist *item,char *listpath,int isdefault)
i+=2;
switch(i) {
case -1:
-#ifdef PCM
- if(!confirm("Quit editing?", NULL))
- continue;
-#endif
if(!safe_mode) {
if((listfile=fopen(listpath,"w"))!=NULL) {
iniWriteFile(listfile,inifile);
@@ -320,10 +316,6 @@ int edit_list(struct bbslist *item,char *listpath,int isdefault)
strListFreeStrings(inifile);
return(changed);
case 0:
-#ifdef PCM
- if(!confirm("Edit BBS Name?",NULL))
- continue;
-#endif
uifc.helpbuf= "`BBS Name`\n\n"
"Enter the BBS name as it is to appear in the list.";
strcpy(tmp,itemname);
@@ -331,10 +323,6 @@ int edit_list(struct bbslist *item,char *listpath,int isdefault)
iniRenameSection(&inifile,tmp,itemname);
break;
case 1:
-#ifdef PCM
- if(!confirm("Edit BBS Address?",NULL))
- continue;
-#endif
uifc.helpbuf= "`Address`\n\n"
"Enter the domain name of the system to connect to ie:\n"
"nix.synchro.net";
@@ -342,10 +330,6 @@ int edit_list(struct bbslist *item,char *listpath,int isdefault)
iniSetString(&inifile,itemname,"Address",item->addr,&ini_style);
break;
case 2:
-#ifdef PCM
- if(!confirm("Edit BBS Port?",NULL))
- continue;
-#endif
i=item->port;
sprintf(str,"%hu",item->port?item->port:513);
uifc.helpbuf= "`Port`\n\n"
@@ -363,30 +347,18 @@ int edit_list(struct bbslist *item,char *listpath,int isdefault)
uifc.changes=0;
break;
case 3:
-#ifdef PCM
- if(!confirm("Edit BBS Username?",NULL))
- continue;
-#endif
uifc.helpbuf= "`Username`\n\n"
"Enter the username to attempt auto-login to the remote with.";
uifc.input(WIN_MID|WIN_SAV,0,0,"Username",item->user,MAX_USER_LEN,K_EDIT);
iniSetString(&inifile,itemname,"UserName",item->user,&ini_style);
break;
case 4:
-#ifdef PCM
- if(!confirm("Edit BBS Password?",NULL))
- continue;
-#endif
uifc.helpbuf= "`Password`\n\n"
"Enter your password for auto-login.";
uifc.input(WIN_MID|WIN_SAV,0,0,"Password",item->password,MAX_PASSWD_LEN,K_EDIT);
iniSetString(&inifile,itemname,"Password",item->password,&ini_style);
break;
case 5:
-#ifdef PCM
- if(!confirm("Edit BBS System Password?",NULL))
- continue;
-#endif
uifc.helpbuf= "`System Password`\n\n"
"Enter your System password for auto-login."
"For non-Synchronet systems, or non-SysOp accounts,"
@@ -395,10 +367,6 @@ int edit_list(struct bbslist *item,char *listpath,int isdefault)
iniSetString(&inifile,itemname,"SystemPassword",item->syspass,&ini_style);
break;
case 6:
-#ifdef PCM
- if(!confirm("Edit BBS Connection Type?",NULL))
- continue;
-#endif
item->conn_type--;
uifc.helpbuf= "`Connection Type`\n\n"
"Select the type of connection you wish to make:\n"
@@ -411,19 +379,11 @@ int edit_list(struct bbslist *item,char *listpath,int isdefault)
changed=1;
break;
case 7:
-#ifdef PCM
- if(!confirm("Edit BBS Reversed RLogin Setting?",NULL))
- continue;
-#endif
item->reversed=!item->reversed;
changed=1;
iniSetBool(&inifile,itemname,"Reversed",item->reversed,&ini_style);
break;
case 8:
-#ifdef PCM
- if(!confirm("Edit BBS Screen Mode?",NULL))
- continue;
-#endif
uifc.helpbuf= "`Screen Mode`\n\n"
"Select the screen size for this connection\n";
uifc.list(WIN_SAV,0,0,0,&(item->screen_mode),NULL,"Screen Mode",screen_modes);
@@ -431,49 +391,29 @@ int edit_list(struct bbslist *item,char *listpath,int isdefault)
changed=1;
break;
case 9:
-#ifdef PCM
- if(!confirm("Edit Status Line Visibility?",NULL))
- continue;
-#endif
item->nostatus=!item->nostatus;
changed=1;
iniSetBool(&inifile,itemname,"NoStatus",item->nostatus,&ini_style);
break;
case 10:
-#ifdef PCM
- if(!confirm("Edit BBS Download Path?",NULL))
- continue;
-#endif
uifc.helpbuf= "`Download Path`\n\n"
"Enter the path where downloads will be placed.";
uifc.input(WIN_MID|WIN_SAV,0,0,"Download Path",item->dldir,MAX_PATH,K_EDIT);
iniSetString(&inifile,itemname,"DownloadPath",item->dldir,&ini_style);
break;
case 11:
-#ifdef PCM
- if(!confirm("Edit BBS Upload Path?",NULL))
- continue;
-#endif
uifc.helpbuf= "`Upload Path`\n\n"
"Enter the path where uploads will be browsed for.";
uifc.input(WIN_MID|WIN_SAV,0,0,"Upload Path",item->uldir,MAX_PATH,K_EDIT);
iniSetString(&inifile,itemname,"UploadPath",item->uldir,&ini_style);
break;
case 12:
-#ifdef PCM
- if(!confirm("Edit Log Filename?",NULL))
- continue;
-#endif
uifc.helpbuf= "`Log Filename`\n\n"
"Enter the path to the optional log file.";
uifc.input(WIN_MID|WIN_SAV,0,0,"Log File",item->logfile,MAX_PATH,K_EDIT);
iniSetString(&inifile,itemname,"LogFile",item->logfile,&ini_style);
break;
case 13:
-#ifdef PCM
- if(!confirm("Edit File Transfer Log Level?",NULL))
- continue;
-#endif
item->xfer_loglevel--;
if(item->xfer_loglevel<0)
item->xfer_loglevel=LOG_DEBUG;
@@ -483,10 +423,6 @@ int edit_list(struct bbslist *item,char *listpath,int isdefault)
changed=1;
break;
case 14:
-#ifdef PCM
- if(!confirm("Edit Telnet Command Log Level?",NULL))
- continue;
-#endif
item->telnet_loglevel--;
if(item->telnet_loglevel<0)
item->telnet_loglevel=LOG_DEBUG;
@@ -496,10 +432,6 @@ int edit_list(struct bbslist *item,char *listpath,int isdefault)
changed=1;
break;
case 15:
-#ifdef PCM
- if(!confirm("Edit BBS Simulated BPS Rate?",NULL))
- continue;
-#endif
uifc.helpbuf= "`Simulated BPS Rate`\n\n"
"Select the rate which recieved characters will be displayed.\n\n"
"This allows ANSImation to work as intended.";
@@ -510,10 +442,6 @@ int edit_list(struct bbslist *item,char *listpath,int isdefault)
changed=1;
break;
case 16:
-#ifdef PCM
- if(!confirm("Edit BBS ANSI Music Setting?",NULL))
- continue;
-#endif
uifc.helpbuf="`ANSI Music Setup`\n\n"
"~ ANSI Music Disabled ~ Completely disables ANSI music\n"
" Enables Delete Line\n"
@@ -542,10 +470,6 @@ int edit_list(struct bbslist *item,char *listpath,int isdefault)
}
break;
case 17:
-#ifdef PCM
- if(!confirm("Edit BBS Font?",NULL))
- continue;
-#endif
uifc.helpbuf= "`Font`\n\n"
"Select the desired font for this connection.\n\n"
"Some fonts do not allow some modes. When this is the case, 80x25 will be"
@@ -801,10 +725,6 @@ struct bbslist *show_bbslist(int mode)
at_settings=!at_settings;
break;
case -7: /* CTRL-E */
- #ifdef PCM
- if(!confirm("Edit this entry?",NULL))
- continue;
- #endif
i=list[opt]->id;
if(edit_list(list[opt],listpath,FALSE)) {
sort_list(list);
@@ -820,10 +740,6 @@ struct bbslist *show_bbslist(int mode)
uifc.helpbuf= "`SyncTERM QuickDial`\n\n"
"Enter a URL in the format [(rlogin|telnet)://][user[:password]@]domainname[:port]\n";
uifc.input(WIN_MID|WIN_SAV,0,0,"BBS Address",addy,LIST_ADDR_MAX,0);
- #ifdef PCM
- if(!confirm("Connect to This Address?",NULL))
- continue;
- #endif
memcpy(&retlist, &defaults, sizeof(defaults));
if(uifc.changes) {
parse_url(addy,&retlist,defaults.conn_type,FALSE);
@@ -855,10 +771,6 @@ struct bbslist *show_bbslist(int mode)
uifc.msg("Cannot edit list in safe mode");
break;
}
- #ifdef PCM
- if(!confirm("Add new Entry?",NULL))
- continue;
- #endif
listcount++;
list[listcount]=list[listcount-1];
list[listcount-1]=(struct bbslist *)malloc(sizeof(struct bbslist));
@@ -936,10 +848,6 @@ struct bbslist *show_bbslist(int mode)
uifc.msg("Cannot edit list in safe mode");
break;
}
- #ifdef PCM
- if(!confirm("Edit this entry?",NULL))
- continue;
- #endif
i=list[opt]->id;
if(edit_list(list[opt],listpath,FALSE)) {
sort_list(list);
@@ -961,10 +869,6 @@ struct bbslist *show_bbslist(int mode)
uifc.msg("Cannot edit list in safe mode");
break;
}
- #ifdef PCM
- if(!confirm("Edit this entry?",NULL))
- continue;
- #endif
i=list[opt]->id;
if(edit_list(list[opt],listpath,FALSE)) {
sort_list(list);
@@ -976,10 +880,6 @@ struct bbslist *show_bbslist(int mode)
}
}
else {
- #ifdef PCM
- if(!confirm("Connect to this system?",NULL))
- continue;
- #endif
memcpy(&retlist,list[val],sizeof(struct bbslist));
free_list(&list[0],listcount);
return(&retlist);
diff --git a/src/syncterm/menu.c b/src/syncterm/menu.c
index aa61670d76d902fd35e7c48357fee5ec36fb6627..a77eeddf8255361e630c83bc155619d280269661 100644
--- a/src/syncterm/menu.c
+++ b/src/syncterm/menu.c
@@ -161,33 +161,17 @@ int syncmenu(struct bbslist *bbs, int *speed)
i=uifc.list(WIN_MID|WIN_SAV,0,0,0,&opt,NULL,"SyncTERM Online Menu",opts);
switch(i) {
case -1: /* Cancel */
-#ifdef PCM
- if(!confirm("Exit the menu?",NULL))
- continue;
-#endif
ret=1;
break;
case 0: /* Scrollback */
-#ifdef PCM
- if(!confirm("View scrollback?",NULL))
- continue;
-#endif
uifcbail();
puttext(1,1,txtinfo.screenwidth,txtinfo.screenheight,buf);
viewscroll();
break;
case 1: /* Disconnect */
-#ifdef PCM
- if(!confirm("Disconect?",NULL))
- continue;
-#endif
ret=-1;
break;
case 2: /* Login */
-#ifdef PCM
- if(!confirm("Send login credentials?",NULL))
- continue;
-#endif
ret=1;
conn_send(bbs->user,strlen(bbs->user),0);
conn_send("\r",1,0);
@@ -201,10 +185,6 @@ int syncmenu(struct bbslist *bbs, int *speed)
}
break;
case 5: /* Output rate */
-#ifdef PCM
- if(!confirm("Modify output rate?",NULL))
- continue;
-#endif
if(speed != NULL) {
j=get_rate_num(*speed);
uifc.helpbuf="`Output Rate`\n\n"
@@ -218,10 +198,6 @@ int syncmenu(struct bbslist *bbs, int *speed)
ret=5;
break;
case 6: /* Change log level (temporarily) */
-#ifdef PCM
- if(!confirm("Change log level for this session?",NULL))
- continue;
-#endif
j=log_level;
uifc.helpbuf="`Log Level\n\n"
"The log level changes the verbosity of messages shown in the transfer\n"
diff --git a/src/syncterm/syncterm.c b/src/syncterm/syncterm.c
index 2c8a0afcb3322f943ed2e779a861e4ae55b2e5a1..2a0b4ac564bd64203724d378623cff023c0f8269 100644
--- a/src/syncterm/syncterm.c
+++ b/src/syncterm/syncterm.c
@@ -24,12 +24,9 @@
#include "uifcinit.h"
#include "window.h"
-char* syncterm_version = "SyncTERM 0.7"
+char* syncterm_version = "SyncTERM 0.8"
#ifdef _DEBUG
" Debug ("__DATE__")"
-#endif
-#ifdef PCM
- " Clippy Edition"
#endif
;
diff --git a/src/syncterm/term.c b/src/syncterm/term.c
index 880c227981663082668e311c023695c16c2faa65..fd1978109afc7cbd9bd773efb2684569a25b7c5a 100644
--- a/src/syncterm/term.c
+++ b/src/syncterm/term.c
@@ -1301,42 +1301,22 @@ BOOL doterm(struct bbslist *bbs)
conn_send("\033Ox",3,0);
break;
case 0x3000: /* ALT-B - Scrollback */
-#ifdef PCM
- if(!confirm("View scrollback?",NULL))
- continue;
-#endif
viewscroll();
showmouse();
break;
case 0x2e00: /* ALT-C - Capture */
-#ifdef PCM
- if(!confirm("Go to capture control menu?",NULL))
- continue;
-#endif
capture_control(bbs);
showmouse();
break;
case 0x2000: /* ALT-D - Download */
-#ifdef PCM
- if(!confirm("Begin download?",NULL))
- continue;
-#endif
zmodem_download(bbs);
showmouse();
break;
case 0x2100: /* ALT-F */
-#ifdef PCM
- if(!confirm("Go to font control menu?",NULL))
- continue;
-#endif
font_control(bbs);
showmouse();
break;
case 0x2600: /* ALT-L */
-#ifdef PCM
- if(!confirm("Send login credentials?",NULL))
- continue;
-#endif
conn_send(bbs->user,strlen(bbs->user),0);
conn_send("\r",1,0);
SLEEP(10);
@@ -1349,18 +1329,10 @@ BOOL doterm(struct bbslist *bbs)
}
break;
case 0x3200: /* ALT-M */
-#ifdef PCM
- if(!confirm("Go to music control menu?",NULL))
- continue;
-#endif
music_control(bbs);
showmouse();
break;
case 0x1600: /* ALT-U - Upload */
-#ifdef PCM
- if(!confirm("Begin upload?",NULL))
- continue;
-#endif
begin_upload(bbs, FALSE);
showmouse();
break;
@@ -1420,10 +1392,6 @@ BOOL doterm(struct bbslist *bbs)
j=wherey();
switch(syncmenu(bbs, &speed)) {
case -1:
-#ifdef PCM
- if(!confirm("Disconnect?",NULL))
- continue;
-#endif
cterm_write("\x0c",1,NULL,0,NULL); /* Clear screen into scrollback */
scrollback_lines=cterm.backpos;
cterm_end();
@@ -1431,45 +1399,21 @@ BOOL doterm(struct bbslist *bbs)
hidemouse();
return(FALSE);
case 3:
-#ifdef PCM
- if(!confirm("Begin upload?",NULL))
- continue;
-#endif
begin_upload(bbs, FALSE);
break;
case 4:
-#ifdef PCM
- if(!confirm("Begin download?",NULL))
- continue;
-#endif
zmodem_download(bbs);
break;
case 7:
-#ifdef PCM
- if(!confirm("Got to capture control menu?",NULL))
- continue;
-#endif
capture_control(bbs);
break;
case 8:
-#ifdef PCM
- if(!confirm("Go to music control menu?",NULL))
- continue;
-#endif
music_control(bbs);
break;
case 9:
-#ifdef PCM
- if(!confirm("Go to font control menu?",NULL))
- continue;
-#endif
font_control(bbs);
break;
case 10:
-#ifdef PCM
- if(!confirm("Disconnect?",NULL))
- continue;
-#endif
cterm_write("\x0c",1,NULL,0,NULL); /* Clear screen into scrollback */
scrollback_lines=cterm.backpos;
cterm_end();
@@ -1481,20 +1425,12 @@ BOOL doterm(struct bbslist *bbs)
gotoxy(i,j);
break;
case 0x9800: /* ALT-Up */
-#ifdef PCM
- if(!confirm("Increase simulated BPS rate?",NULL))
- continue;
-#endif
if(speed)
speed=rates[get_rate_num(speed)+1];
else
speed=rates[0];
break;
case 0xa000: /* ALT-Down */
-#ifdef PCM
- if(!confirm("Decrease simulated BPS rate?",NULL))
- continue;
-#endif
i=get_rate_num(speed);
if(i==0)
speed=0;