Synchronet now requires the libarchive development package (e.g. libarchive-dev on Debian-based Linux distros, libarchive.org for more info) to build successfully.

Commit 7164d945 authored by Eric Oulashin's avatar Eric Oulashin

[Issue 206] When using SlyEdit CTRL-Space on a MAC sends a 0x0 NUL character...

[Issue 206] When using SlyEdit CTRL-Space on a MAC sends a 0x0 NUL character causing execution in the timeout logic

With the addition of K_NUL (8b8ed215), this patch changes SlyEdit so that it no longer thinks a 0x0 is a timeout
parent ee3920f6
...@@ -123,6 +123,11 @@ ...@@ -123,6 +123,11 @@
* scrolling normally behaves in other apps. However, SlyEdit's * scrolling normally behaves in other apps. However, SlyEdit's
* choice menu now is only used for the user settings * choice menu now is only used for the user settings
* menu, where only 1 page of items is shown. * menu, where only 1 page of items is shown.
* 2021-01-23 Deon George Version 1.74
* Making use of the new K_NUL and checking user input against null,
* SlyEdit no longer thinks a 0x0 (sent with CTRL-Space on a Mac) is
* a timeout. K_NUL was added on Jan. 21, 2021 by Rob Swindell:
* https://gitlab.synchro.net/main/sbbs/-/commit/8b8ed2159c31057764d260c0860335c85e33d6d8
*/ */
/* Command-line arguments: /* Command-line arguments:
...@@ -219,8 +224,8 @@ if (console.screen_columns < 80) ...@@ -219,8 +224,8 @@ if (console.screen_columns < 80)
} }
// Constants // Constants
const EDITOR_VERSION = "1.73"; const EDITOR_VERSION = "1.74";
const EDITOR_VER_DATE = "2020-03-31"; const EDITOR_VER_DATE = "2021-01-23";
// Program variables // Program variables
...@@ -1084,7 +1089,7 @@ function doEditLoop() ...@@ -1084,7 +1089,7 @@ function doEditLoop()
var continueOn = true; var continueOn = true;
while (continueOn) while (continueOn)
{ {
userInput = getKeyWithESCChars(K_NOCRLF|K_NOSPIN, gConfigSettings); userInput = getKeyWithESCChars(K_NOCRLF|K_NOSPIN|K_NUL, gConfigSettings)
// If the cursor is at the end of the last line and the user // If the cursor is at the end of the last line and the user
// pressed the DEL key, then treat it as a backspace. Some // pressed the DEL key, then treat it as a backspace. Some
...@@ -1103,9 +1108,9 @@ function doEditLoop() ...@@ -1103,9 +1108,9 @@ function doEditLoop()
returnCode = 1; // Aborted returnCode = 1; // Aborted
saveMessageToFile(); saveMessageToFile();
} }
// If userInput is blank, then the input timeout was probably // If userInput is null, then the input timeout was probably
// reached, so abort. // reached, so abort.
else if (userInput == "") else if (userInput == null)
{ {
returnCode = 1; // Aborted returnCode = 1; // Aborted
continueOn = false; continueOn = false;
......
...@@ -178,7 +178,7 @@ var ESC_MENU_USER_SETTINGS = 12; ...@@ -178,7 +178,7 @@ var ESC_MENU_USER_SETTINGS = 12;
var ESC_MENU_SPELL_CHECK = 13; var ESC_MENU_SPELL_CHECK = 13;
var COPYRIGHT_YEAR = 2020; var COPYRIGHT_YEAR = 2021;
// Store the full path & filename of the Digital Distortion Message // Store the full path & filename of the Digital Distortion Message
// Lister, since it will be used more than once. // Lister, since it will be used more than once.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment