From 77792ea6cc66ca778530c092e16f7ed2ec8b79cd Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Tue, 23 Oct 2018 02:40:24 +0000
Subject: [PATCH] Removed WIN_HLP from mode flags passed to uifc.list()
function: This mode flag is only for use with ufic.showbuf(). Previously
(before revision 1.226 of uifc32.c), this would result in a NOOP, but when I
added "Cut" (to clipboard) support, I introduced WIN_CUT and used the same
bit value as WIN_HLP (since it wasn't used in uifc.list).
I noticed a new "Shift-DEL Cut" menu option appeared in SyncTERM (with
no corresponding way to paste) and this reuse of the WIN_HLP flag was the
reason why.
---
src/syncterm/bbslist.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/syncterm/bbslist.c b/src/syncterm/bbslist.c
index 0f7515eff4..b19482e90f 100644
--- a/src/syncterm/bbslist.c
+++ b/src/syncterm/bbslist.c
@@ -1562,7 +1562,7 @@ struct bbslist *show_bbslist(char *current, int connected)
load_bbslist(list, sizeof(list), &defaults, settings.list_path, sizeof(settings.list_path), shared_list, sizeof(shared_list), &listcount, &opt, &bar, current?strdup(current):NULL);
uifc.helpbuf="Help Button Hack";
- uifc.list(WIN_T2B|WIN_RHT|WIN_EXTKEYS|WIN_DYN|WIN_HLP|WIN_ACT|WIN_INACT
+ uifc.list(WIN_T2B|WIN_RHT|WIN_EXTKEYS|WIN_DYN|WIN_ACT|WIN_INACT
,0,0,0,&sopt,&sbar,"SyncTERM Settings",connected?connected_settings_menu:settings_menu);
for(;;) {
if (quitting)
@@ -1598,14 +1598,14 @@ struct bbslist *show_bbslist(char *current, int connected)
oldopt=opt;
val=uifc.list((listcount<MAX_OPTS?WIN_XTR:0)
|WIN_ACT|WIN_INSACT|WIN_DELACT|WIN_UNGETMOUSE|WIN_SAV|WIN_ESC
- |WIN_T2B|WIN_INS|WIN_DEL|WIN_EDIT|WIN_EXTKEYS|WIN_DYN|WIN_HLP
+ |WIN_T2B|WIN_INS|WIN_DEL|WIN_EDIT|WIN_EXTKEYS|WIN_DYN
,0,0,0,&opt,&bar,"Directory",(char **)list);
if(val==listcount)
val=listcount|MSK_INS;
if(val==-7) { /* CTRL-E */
uifc.list((listcount<MAX_OPTS?WIN_XTR:0)
|WIN_ACT|WIN_INSACT|WIN_DELACT|WIN_SAV|WIN_ESC
- |WIN_T2B|WIN_INS|WIN_DEL|WIN_EDIT|WIN_EXTKEYS|WIN_DYN|WIN_HLP
+ |WIN_T2B|WIN_INS|WIN_DEL|WIN_EDIT|WIN_EXTKEYS|WIN_DYN
|WIN_SEL
,0,0,0,&opt,&bar,"Directory",(char **)list);
val=opt|MSK_EDIT;
@@ -1615,7 +1615,7 @@ struct bbslist *show_bbslist(char *current, int connected)
case -2-0x13: /* CTRL-S - Sort */
uifc.list((listcount<MAX_OPTS?WIN_XTR:0)
|WIN_ACT|WIN_INSACT|WIN_DELACT|WIN_SAV|WIN_ESC
- |WIN_T2B|WIN_INS|WIN_DEL|WIN_EDIT|WIN_EXTKEYS|WIN_DYN|WIN_HLP
+ |WIN_T2B|WIN_INS|WIN_DEL|WIN_EDIT|WIN_EXTKEYS|WIN_DYN
|WIN_SEL
,0,0,0,&opt,&bar,"Directory",(char **)list);
edit_sorting(list,&listcount, &opt, &bar, list[opt]?list[opt]->name:NULL);
@@ -1623,7 +1623,7 @@ struct bbslist *show_bbslist(char *current, int connected)
case -2-0x3000: /* ALT-B - Scrollback */
if(!connected) {
viewofflinescroll();
- uifc.list(WIN_T2B|WIN_RHT|WIN_EXTKEYS|WIN_DYN|WIN_HLP|WIN_ACT|WIN_INACT
+ uifc.list(WIN_T2B|WIN_RHT|WIN_EXTKEYS|WIN_DYN|WIN_ACT|WIN_INACT
,0,0,0,&sopt,&sbar,"SyncTERM Settings",settings_menu);
}
break;
@@ -1636,7 +1636,7 @@ struct bbslist *show_bbslist(char *current, int connected)
case -11: /* TAB */
uifc.list((listcount<MAX_OPTS?WIN_XTR:0)
|WIN_ACT|WIN_INSACT|WIN_DELACT|WIN_SAV|WIN_ESC
- |WIN_T2B|WIN_INS|WIN_DEL|WIN_EDIT|WIN_EXTKEYS|WIN_DYN|WIN_HLP
+ |WIN_T2B|WIN_INS|WIN_DEL|WIN_EDIT|WIN_EXTKEYS|WIN_DYN
|WIN_SEL
,0,0,0,&opt,&bar,"Directory",(char **)list);
at_settings=!at_settings;
@@ -1656,7 +1656,7 @@ struct bbslist *show_bbslist(char *current, int connected)
"[(rlogin|telnet|ssh)://][user[:password]@]domainname[:port]\n";
uifc.list((listcount<MAX_OPTS?WIN_XTR:0)
|WIN_ACT|WIN_INSACT|WIN_DELACT|WIN_SAV|WIN_ESC
- |WIN_T2B|WIN_INS|WIN_DEL|WIN_EDIT|WIN_EXTKEYS|WIN_DYN|WIN_HLP
+ |WIN_T2B|WIN_INS|WIN_DEL|WIN_EDIT|WIN_EXTKEYS|WIN_DYN
|WIN_SEL
,0,0,0,&opt,&bar,"Directory",(char **)list);
uifc.input(WIN_MID|WIN_SAV,0,0,"Address",addy,LIST_ADDR_MAX,0);
@@ -1863,7 +1863,7 @@ struct bbslist *show_bbslist(char *current, int connected)
if(oldopt != -2)
settitle(syncterm_version);
oldopt=-2;
- val=uifc.list(WIN_T2B|WIN_RHT|WIN_EXTKEYS|WIN_DYN|WIN_UNGETMOUSE|WIN_HLP|WIN_ACT|WIN_ESC
+ val=uifc.list(WIN_T2B|WIN_RHT|WIN_EXTKEYS|WIN_DYN|WIN_UNGETMOUSE|WIN_ACT|WIN_ESC
,0,0,0,&sopt,&sbar,"SyncTERM Settings",connected?connected_settings_menu:settings_menu);
if(connected && val >= 1)
val++;
@@ -1873,7 +1873,7 @@ struct bbslist *show_bbslist(char *current, int connected)
viewofflinescroll();
uifc.list((listcount<MAX_OPTS?WIN_XTR:0)
|WIN_ACT|WIN_INSACT|WIN_DELACT|WIN_SAV|WIN_ESC
- |WIN_T2B|WIN_INS|WIN_DEL|WIN_EDIT|WIN_EXTKEYS|WIN_DYN|WIN_HLP
+ |WIN_T2B|WIN_INS|WIN_DEL|WIN_EDIT|WIN_EXTKEYS|WIN_DYN
|WIN_SEL|WIN_INACT
,0,0,0,&opt,&bar,"Directory",(char **)list);
}
@@ -1885,7 +1885,7 @@ struct bbslist *show_bbslist(char *current, int connected)
case -2-0x4b00: /* Left Arrow */
case -2-0x4d00: /* Right Arrow */
case -11: /* TAB */
- uifc.list(WIN_T2B|WIN_RHT|WIN_EXTKEYS|WIN_DYN|WIN_HLP|WIN_ACT|WIN_SEL
+ uifc.list(WIN_T2B|WIN_RHT|WIN_EXTKEYS|WIN_DYN|WIN_ACT|WIN_SEL
,0,0,0,&sopt,&sbar,"SyncTERM Settings",connected?connected_settings_menu:settings_menu);
at_settings=!at_settings;
break;
@@ -1924,7 +1924,7 @@ struct bbslist *show_bbslist(char *current, int connected)
init_uifc(TRUE, TRUE);
uifc.list((listcount<MAX_OPTS?WIN_XTR:0)
|WIN_ACT|WIN_INSACT|WIN_DELACT|WIN_SAV|WIN_ESC
- |WIN_T2B|WIN_INS|WIN_DEL|WIN_EDIT|WIN_EXTKEYS|WIN_DYN|WIN_HLP
+ |WIN_T2B|WIN_INS|WIN_DEL|WIN_EDIT|WIN_EXTKEYS|WIN_DYN
|WIN_SEL|WIN_INACT
,0,0,0,&opt,&bar,"Directory",(char **)list);
}
--
GitLab