diff --git a/build/nodelist-browser.js b/build/nodelist-browser.js
index 16fe613ead6f223b44ae286ce700cb42cb88777e..915ec368661474a596bc9b1c60f0541cc0701e4a 100644
--- a/build/nodelist-browser.js
+++ b/build/nodelist-browser.js
@@ -8520,7 +8520,7 @@ js.on_exit('console.write("[?25h");');
};
options.title.text = "Help";
this.window = new ControlledWindow(options);
- this.window.write("\r\nhwUse your cUPw/cDOWN wkeys to navigate the cNodelistw, cZonew, cNetw, and cNodew menus.\r\n\r\nOn most screens, hit cQw, cCw, cbackspacew, or cESCw to go back.\r\n\r\nUse cCTRL-S wto bring up the cSearch wscreen.\r\nHit cENTER win an empty input box to cancel a search.\r\nwUse your cUPw/cDOWN wkeys, or type to navigate the csearch results wmenu.\r\nHit cQw, cCw, cbackspacew, or cESCw to return to the search input.\r\n\r\nUse cCTRL-Q wat any time to cquitw.");
+ this.window.write("\r\nhwUse your cUPw/cDOWN wkeys to navigate the cNodelistw, cZonew, cNetw, and cNodew menus.\r\n\r\nOn most screens, hit cQw, cCw, cbackspacew, or cESCw to go back.\r\n\r\nUse c/ wto bring up the cSearch wscreen.\r\nHit cENTER win an empty input box to cancel a search.\r\nwUse your cUPw/cDOWN wkeys, or type to navigate the csearch results wmenu.\r\nHit cQw, cCw, cbackspacew, or cESCw to return to the search input.\r\n\r\nUse cESC wat the main screen to cquitw.");
}
return _createClass(Help2, [{
key: "getCmd",
@@ -9144,7 +9144,7 @@ js.on_exit('console.write("[?25h");');
this.helpWindow = new Help(windowManager, menuPosition, this.menuSize);
this.domainMenu = new DomainMenu(windowManager, menuPosition, this.menuSize, this.selectDomain.bind(this), this.settings);
this.activeComponent = this.domainMenu;
- var status = "hwCTRL-Qcuit b\xB3 hwCTRL-Scearch b\xB3 wCTRL-Gcet help";
+ var status = "hwESC cquit b\xB3 hw/ csearch b\xB3 w?c Help";
var statusBar = new Window({
windowManager: windowManager,
position: {
@@ -9212,14 +9212,12 @@ js.on_exit('console.write("[?25h");');
key: "getCmd",
value: function getCmd(cmd) {
var lc = cmd.toLowerCase();
- if (cmd === keydefs4.CTRL_Q)
- return false;
- if (cmd === keydefs4.CTRL_G && !(this.activeComponent instanceof Help)) {
+ if (cmd === "?" && !(this.activeComponent instanceof Search) && !(this.activeComponent instanceof Help)) {
this.stash();
this.helpWindow.window.open();
this.helpWindow.window.raise(true);
this.activeComponent = this.helpWindow;
- } else if (cmd === keydefs4.CTRL_S && !(this.activeComponent instanceof Search)) {
+ } else if (cmd === "/" && !(this.activeComponent instanceof Search)) {
this.stash();
this.searchWindow = new Search(this.windowManager, this.selectNode.bind(this));
this.activeComponent = this.searchWindow;
@@ -9228,6 +9226,10 @@ js.on_exit('console.write("[?25h");');
this.activeComponent.close();
this.unstash();
}
+ } else if (cmd === keydefs4.CTRL_Q) {
+ return false;
+ } else if (cmd === keydefs4.KEY_ESC && !(this.activeComponent instanceof Search) && !(this.activeComponent instanceof Help)) {
+ return false;
} else {
if (isBack(lc) && this.backStack.length > 0) {
this.activeComponent.close();
@@ -9253,7 +9255,7 @@ js.on_exit('console.write("[?25h");');
js.on_exit('console.write("\x1B[?25h");');
js.time_limit = 0;
bbs2.sys_status |= sbbsdefs2.SS_MOFF;
- console6.ctrlkey_passthru = "+GQS";
+ console6.ctrlkey_passthru = "+Q";
console6.clear(cgadefs9.BG_BLACK | cgadefs9.LIGHTGRAY);
migrate();
}
diff --git a/package-lock.json b/package-lock.json
index 5233507d2f2dcddb8b65e5354617c84c5bf9a61b..2b44bfa8eee6708197a2bf2849f916f5f24bebb2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1985,7 +1985,7 @@
},
"node_modules/@swag/ts4s": {
"version": "1.0.0",
- "resolved": "git+ssh://git@gitlab.synchro.net:swag/ts4s.git#ff71f3a266792ed3d03d4cfd2bf38701b12e34b4",
+ "resolved": "git+ssh://git@gitlab.synchro.net:swag/ts4s.git#6d00d432cf30c86f1b325eb3086f67d2fc5e3458",
"license": "MIT",
"dependencies": {
"@babel/cli": "^7.20.7",
diff --git a/src/lib/Help.ts b/src/lib/Help.ts
index 7acec2c0c8f122d40d78ea27084fa1a55e156610..cda60b2e44288123b95f5e5cbf23b5a98acc5e58 100644
--- a/src/lib/Help.ts
+++ b/src/lib/Help.ts
@@ -18,10 +18,10 @@ export default class Help {
this.window.write(
'\r\n\x01h\x01wUse your \x01cUP\x01w/\x01cDOWN \x01wkeys to navigate the \x01cNodelist\x01w, \x01cZone\x01w, \x01cNet\x01w, and \x01cNode\x01w menus.\r\n\r\n'
+ 'On most screens, hit \x01cQ\x01w, \x01cC\x01w, \x01cbackspace\x01w, or \x01cESC\x01w to go back.\r\n\r\n'
- + 'Use \x01cCTRL-S \x01wto bring up the \x01cSearch \x01wscreen.\r\nHit \x01cENTER \x01win an empty input box to cancel a search.\r\n'
+ + 'Use \x01c/ \x01wto bring up the \x01cSearch \x01wscreen.\r\nHit \x01cENTER \x01win an empty input box to cancel a search.\r\n'
+ '\x01wUse your \x01cUP\x01w/\x01cDOWN \x01wkeys, or type to navigate the \x01csearch results \x01wmenu.\r\n'
+ 'Hit \x01cQ\x01w, \x01cC\x01w, \x01cbackspace\x01w, or \x01cESC\x01w to return to the search input.\r\n\r\n'
- + 'Use \x01cCTRL-Q \x01wat any time to \x01cquit\x01w.'
+ + 'Use \x01cESC \x01wat the main screen to \x01cquit\x01w.'
);
}
diff --git a/src/lib/UI.ts b/src/lib/UI.ts
index 99ddddd45104eb4496ec54c79e08d7471b066ab9..66caf2e5c4aa5b93180a857b3a1d522976321745 100644
--- a/src/lib/UI.ts
+++ b/src/lib/UI.ts
@@ -86,7 +86,6 @@ export default class UI {
getCmd(cmd: string): boolean {
const lc = cmd.toLowerCase();
- if (cmd === keydefs.CTRL_Q || cmd === keydefs.KEY_ESC) return false;
if (cmd === '?' && !(this.activeComponent instanceof Search) && !(this.activeComponent instanceof Help)) {
this.stash();
this.helpWindow.window.open();
@@ -101,6 +100,10 @@ export default class UI {
this.activeComponent.close();
this.unstash();
}
+ } else if (cmd === keydefs.CTRL_Q) {
+ return false;
+ } else if (cmd === keydefs.KEY_ESC && !(this.activeComponent instanceof Search) && !(this.activeComponent instanceof Help)) {
+ return false;
} else {
if (isBack(lc) && this.backStack.length > 0) {
this.activeComponent.close();