Merge branch 'development' into Text-Wrapping

.appveyor.yml

@@ -15,8 +15,9 @@ environment:
     CCACHE_DIR: "%APPVEYOR_BUILD_FOLDER%\\.ccache"
     # our appveyor cache size is 1G
     CCACHE_MAXSIZE: 1G
-    # APP_BUILD embeds the git sha which changes on every commit, throwing the cache off - ignore it
-    CCACHE_IGNOREOPTIONS: "-DAPP_BUILD=*"
+    # APP_BUILD embeds the git sha which changes on every commit, throwing the cache off
+    # ignore it for snapshots but not for PTBs or releases
+    CCACHE_IGNOREOPTIONS: "-DAPP_BUILD=-testing*"
   signing_password:
     secure: JJDxNdreMgNn/IOcY+UVmlaqgDT4a7vcxsY3nfcgWY4=
   DEPLOY_KEY_PASS:

setup-windows-sdk.ps1

@@ -27,12 +27,14 @@ Write-Output "Running qmake"
 $Env:PATH="C:\Program Files (x86)\CMake\bin;C:\Program Files\7-Zip;$Env:QT_BASE_DIR\bin;$Env:MINGW_BASE_DIR\bin;" + (($Env:PATH.Split(';') | Where-Object { $_ -ne 'C:\Program Files\Git\usr\bin' }) -join ';')
 qmake CONFIG+=debug ../src/mudlet.pro
 if("$LastExitCode" -ne "0"){
+  Read-Host
   exit 1
 }
 
 Write-Output "Running make"
 mingw32-make -j $(Get-WmiObject win32_processor | Select -ExpandProperty "NumberOfLogicalProcessors")
 if("$LastExitCode" -ne "0"){
+  Read-Host
   exit 1
 }
 

src/dlgAboutDialog.cpp

@@ -1042,7 +1042,7 @@ void dlgAboutDialog::setSupportersTab(const QString& htmlHead)
 {
     // see https://www.patreon.com/mudlet if you'd like to be added!
     QStringList mightier_than_swords = {"Joshua C. Burt", "Maiyannah Bishop", "Qwindor Rousseau", "Stick In the MUD 🎙"};
-    QStringList on_a_plaque = {"Vadim Peretokin"};
+    QStringList on_a_plaque = {"demonnic", "Henry Hsiao"};
     int image_counter{1};
 
     if (!supportersDocument) {

src/mudlet-lua/lua/enable-accessibility/config.lua

@@ -0,0 +1,12 @@
+mpackage = [[enable-accessibility]]
+author = [[Mudlet]]
+title = [[Enables better accessibility on demand]]
+description = [[`mudlet accessibility on` will toggle a few settings for a better visually impaired experience:
+
+* auto clear input line after sent text
+* disable showing sent text
+* hide blank lines (on windows)
+* offer workaround VoiceOver announce issue (on macOS)
+* set Ctrl+Tab as a shortcut to enable caret mode]]
+version = [[1.0]]
+created = "2022-07-31T19:25:07+02:00"

src/mudlet-lua/lua/enable-accessibility/enable-accessibility.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE MudletPackage>
+<MudletPackage version="1.001">
+	<TriggerPackage />
+	<TimerPackage />
+	<AliasPackage>
+		<Alias isActive="yes" isFolder="no">
+			<name>mudlet accessibility on</name>
+			<script>echo("Welcome to Mudlet!\n")
+echo("Let's adjust a few preferences to improve the visually impaired experience:\n")
+
+setConfig("autoClearInputLine", true)
+echo("Text will now be removed from the input line after it was sent ✓\n")
+setConfig("showSentText", false)
+echo("Text sent to the game will not appear in the main window ✓\n")
+
+setConfig("caretShortcut", "ctrltab")
+echo("Shortcut to switch between input line and main window set to Ctrl+Tab. You can also change it to either Tab or F6 in settings.\n")
+
+if getOS() == "windows" then
+  setConfig("blankLinesBehaviour", "hide")
+  echo("Blank lines will be removed from the output ✓\n")
+end
+
+if getOS() == "mac" then
+  echo("\nYou're on a mac and VoiceOver will skip reading text when there's lots of it coming in. Would you like to install a third-party TTS plugin to alleviate this issue?\n")
+  echo("Type 'mudlet access reader' if so.\n")
+  echo("See https://wiki.mudlet.org/w/Accessibility_on_OSX if you'd like to learn more.\n")
+end
+
+echo("\nThat's all, enjoy Mudlet!\n")</script>
+			<command></command>
+			<packageName></packageName>
+			<regex>^mudlet access(?:ibility)? on$</regex>
+		</Alias>
+		<Alias isActive="yes" isFolder="no">
+			<name>mudlet accessibility reader</name>
+			<script>uninstallPackage"reader"
+installPackage"https://github.com/tspivey/mudlet-reader/releases/latest/download/reader.mpackage"</script>
+			<command></command>
+			<packageName></packageName>
+			<regex>^mudlet access(?:ibility)? reader$</regex>
+		</Alias>
+	</AliasPackage>
+	<ActionPackage />
+	<ScriptPackage />
+	<KeyPackage />
+	<VariablePackage>
+		<HiddenVariables />
+	</VariablePackage>
+</MudletPackage>

src/mudlet.cpp

@@ -4621,6 +4621,7 @@ void mudlet::setupPreInstallPackages(const QString& gameUrl)
         {qsl(":/run-lua-code-v4.xml"),    {qsl("*")}},
         {qsl(":/echo.xml"),               {qsl("*")}},
         {qsl(":/deleteOldProfiles.xml"),  {qsl("*")}},
+        {qsl(":/mudlet-lua/lua/enable-accessibility/enable-accessibility.xml"), {qsl("*")}},
         {qsl(":/CF-loader.xml"),          {qsl("carrionfields.net")}},
         {qsl(":/run-tests.xml"),          {qsl("mudlet.org")}},
         {qsl(":/mudlet-mapper.xml"),      {qsl("aetolia.com"),

src/mudlet.qrc

@@ -191,6 +191,7 @@
         <file>icons/zombiemud.png</file>
         <file>lua-function-list.json</file>
         <file>mudlet-lua/lua/generic-mapper/generic_mapper.xml</file>
+        <file>mudlet-lua/lua/enable-accessibility/enable-accessibility.xml</file>
         <file>mudlet-lua/lua/utf8_filenames.lua</file>
         <file>mudlet-mapper.xml</file>
         <file>Mudlet_splashscreen_development.png</file>