Release build squashed

Behaviorally: This change makes it so that Enter will never cancel
a dialog, unless that dialog only contains info to be read. Escape
will never unpredictably be treated as Enter. And some dialogs without
Escape to cancel, now can be canceled with Escape.

A lot of this just refactors dialogs to define the cancel button
at the top, not as a hotkey on a cancel button deep in the XML.
I think this makes enter/escape behavior in dialogxml files more
legible at a glance.

.github/workflows/mac-universal.yml

@@ -0,0 +1,73 @@
+name: Mac universal build
+on:
+  push:
+    branches:
+      - universal
+  release:
+    types: [published]
+jobs:
+  build:
+    runs-on: macos-14
+    env:
+      CONFIGURATION: ${{ matrix.configuration }}
+      BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
+      PROD_MACOS_CERTIFICATE: '${{ secrets.PROD_MACOS_CERTIFICATE }}'
+      PROD_MACOS_CERTIFICATE_PWD: '${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}'
+      PROD_MACOS_CERTIFICATE_NAME: '${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}'
+      PROD_MACOS_CI_KEYCHAIN_PWD: '${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}'
+      PROD_MACOS_NOTARIZATION_APPLE_ID: '${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}'
+      PROD_MACOS_NOTARIZATION_TEAM_ID: '${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}'
+      PROD_MACOS_NOTARIZATION_PWD: '${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}'
+      BUILD_OS: macos
+    strategy:
+      fail-fast: false
+      matrix:
+        configuration:
+          - Release
+          - Debug
+    steps:
+      - uses: actions/checkout@v4
+
+      # Download macos-intel
+      - uses: robinraju/release-downloader@v1
+        id: download
+        with:
+          latest: true
+          fileName: 'cboe-macos-intel-${{ matrix.configuration }}.tar'
+          extract: true
+          out-file-path: 'cboe-macos-intel-${{ matrix.configuration }}'
+
+      # Download macos-silicon
+      - uses: robinraju/release-downloader@v1
+        with:
+          latest: true
+          fileName: 'cboe-macos-silicon-${{ matrix.configuration }}.tar'
+          extract: true
+          out-file-path: 'cboe-macos-silicon-${{ matrix.configuration }}'
+
+      - run: .github/workflows/scripts/mac/make-universal.sh
+
+      # Skipping this for now because of issue nqnstudios#13
+      - name: Codesign and notarize
+        run: 'SIGN="no" NOTARIZE="no" .github/workflows/scripts/mac/sign-apps.sh'
+
+      - name: 'Tar files'
+        run: 'tar -cvf cboe-macos-universal-${{matrix.configuration}}.tar "build/Blades of Exile"'
+
+      # Upload everything as artifact
+      - uses: actions/upload-artifact@v4
+        with:
+          name: mac-universal-dependencies-${{matrix.configuration}}
+          path: cboe-macos-universal-${{matrix.configuration}}.tar
+
+      # upload a release
+      - name: Github release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: cboe-macos-universal-${{ matrix.configuration }}.tar
+          tag_name: ${{ steps.download.outputs.tag_name }}
+
+      - name: 'Itch.io release'
+        run: './.github/workflows/scripts/butler_push.sh'
+        shell: bash
+        if: ${{ matrix.configuration == 'Release' }}

.github/workflows/release.yml

@@ -0,0 +1,131 @@
+on:
+  push:
+    branches:
+      - 'itch-edition'
+    tags:
+      - "v*.*.*"
+  pull_request:
+    branches:
+      - itch-edition
+jobs:
+  release:
+    env:
+      ARCH: ${{ matrix.os.flag }}
+      MACOSX_DEPLOYMENT_TARGET: 10.15
+      BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
+      PROD_MACOS_CERTIFICATE: '${{ secrets.PROD_MACOS_CERTIFICATE }}'
+      PROD_MACOS_CERTIFICATE_PWD: '${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}'
+      PROD_MACOS_CERTIFICATE_NAME: '${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}'
+      PROD_MACOS_CI_KEYCHAIN_PWD: '${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}'
+      PROD_MACOS_NOTARIZATION_APPLE_ID: '${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}'
+      PROD_MACOS_NOTARIZATION_TEAM_ID: '${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}'
+      PROD_MACOS_NOTARIZATION_PWD: '${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}'
+      VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+      DEBUG_FLAG: ${{ matrix.configuration == 'Debug' && 'true' || 'false' }}
+      BUILD_OS: ${{ matrix.os.name }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+        - name: macos
+          suffix: '-intel'
+          flag: x86_64
+          deps: macos-universal
+          version: 13
+          scons-script: './.github/workflows/scripts/mac/scons-build.sh'
+        - name: macos
+          flag: arm64
+          suffix: '-silicon'
+          deps: macos-universal
+          version: 14
+          scons-script: './.github/workflows/scripts/mac/scons-build.sh'
+#        - name: ubuntu
+#          suffix: ''
+#          version: 22.04
+#          scons-script: scons
+        - name: windows
+          suffix: ''
+          version: 2019
+          scons-script: './.github/workflows/scripts/win/scons-build.bat'
+        configuration:
+        - Release
+        - Debug
+    runs-on: '${{ matrix.os.name }}-${{ matrix.os.version }}'
+    steps:
+      - name: Export GitHub Actions cache environment variables
+        uses: actions/github-script@v7
+        with:
+          script: "core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');"
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Download dependency build
+        uses: robinraju/release-downloader@v1
+        with:
+          repository: NQNStudios/cboe-dependencies
+          latest: true
+          fileName: 'dependencies-${{ matrix.os.deps || matrix.os.name }}-${{ matrix.configuration }}.tar'
+          extract: true
+          out-file-path: 'deps'
+      - name: Windows build dependencies
+        run: 'vcpkg install libxml2 && pip install scons'
+        if: ${{ matrix.os.name == 'windows' }}
+      - name: Mac build dependencies
+        run: brew install scons
+        if: ${{ matrix.os.name == 'macos' }}
+      - name: Linux build dependencies
+        run: sudo apt-get update && sudo apt-get install scons libxml2-utils libgl-dev libopenal-dev
+        if: ${{ matrix.os.name == 'ubuntu' }}
+      - name: Install TGUI
+        run: 'sudo ./.github/workflows/scripts/linux/install-tgui.sh'
+        if: ${{ matrix.os.name == 'ubuntu' }}
+      - name: Build
+        run: '${{ matrix.os.scons-script }} test=false debug=$DEBUG_FLAG'
+        shell: bash
+
+      - name: Download fix-rpaths.py script
+        run: git clone https://gist.github.com/NQNStudios/7145bcf6621891f5176c8caa165d6b93
+        if: ${{ matrix.os.name == 'macos' }}
+      - name: Fix rpaths game
+        run: 'python 7145bcf6621891f5176c8caa165d6b93/fix-rpaths.py "build/Blades of Exile/Blades of Exile.app"'
+        if: ${{ matrix.os.name == 'macos' }}
+      - name: Fix rpaths scenario editor
+        run: 'python 7145bcf6621891f5176c8caa165d6b93/fix-rpaths.py "build/Blades of Exile/BoE Scenario Editor.app"'
+        if: ${{ matrix.os.name == 'macos' }}
+      - name: Fix rpaths character editor
+        run: 'python 7145bcf6621891f5176c8caa165d6b93/fix-rpaths.py "build/Blades of Exile/BoE Character Editor.app"'
+        if: ${{ matrix.os.name == 'macos' }}
+
+      - run: cp .itch.toml "build/Blades of Exile/"
+        shell: bash
+
+      - name: 'Tar unsigned files'
+        run: 'tar -cvf cboe-${{ matrix.os.name }}${{ matrix.os.suffix }}-${{ matrix.configuration }}-unsigned.tar "Blades of Exile"'
+        working-directory: '${{ github.workspace }}/build'
+      - name: upload pre-signing artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: cboe-${{ matrix.os.name }}${{ matrix.os.suffix }}-${{ matrix.configuration }}-unsigned
+          path: '${{ github.workspace }}/build/cboe-${{ matrix.os.name }}${{ matrix.os.suffix }}-${{ matrix.configuration }}-unsigned.tar'
+      # Skipping this for now because of issue nqnstudios#13
+      - name: Codesign and notarize
+        run: 'SIGN="no" NOTARIZE="no" ./.github/workflows/scripts/mac/sign-apps.sh'
+        if: ${{ matrix.os.name == 'macos' }}
+      - name: 'Tar files'
+        run: 'tar -cvf cboe-${{ matrix.os.name }}${{ matrix.os.suffix }}-${{ matrix.configuration }}.tar "Blades of Exile"'
+        working-directory: '${{ github.workspace }}/build'
+      - name: 'Upload Artifact'
+        uses: actions/upload-artifact@v4
+        with:
+          name: cboe-${{ matrix.os.name }}${{ matrix.os.suffix }}-${{ matrix.configuration }}
+          path: '${{ github.workspace }}/build/cboe-${{ matrix.os.name }}${{ matrix.os.suffix }}-${{ matrix.configuration }}.tar'
+      - name: Github release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: '${{ github.workspace }}/build/cboe-${{ matrix.os.name }}${{ matrix.os.suffix }}-${{ matrix.configuration }}.tar'
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+      - name: 'Itch.io release'
+        run: './.github/workflows/scripts/butler_push.sh'
+        shell: bash
+        if: ${{ startsWith(github.ref, 'refs/tags/') && matrix.configuration == 'Release' && matrix.os.name != 'macos' }}

.github/workflows/scripts/butler_push.sh

@@ -0,0 +1,28 @@
+#! /bin/bash
+
+butler_channel=""
+butler_exe=""
+release_dir=""
+if [ "$BUILD_OS" = "ubuntu" ]; then
+    butler_channel=linux-amd64
+    butler_exe=butler
+    release_dir="linux"
+elif [ "$BUILD_OS" = "windows" ]; then
+    butler_channel=windows-amd64
+    butler_exe=butler.exe
+    release_dir="windows"
+elif [ "$BUILD_OS" = "macos" ]; then
+    butler_channel=darwin-amd64
+    butler_exe=butler
+    release_dir="macos"
+fi
+
+# -L follows redirects
+# -O specifies output name
+curl -L -o butler.zip https://broth.itch.ovh/butler/${butler_channel}/LATEST/archive/default
+unzip butler.zip
+# GNU unzip tends to not set the executable bit even though it's set in the .zip
+chmod +x ${butler_exe}
+# just a sanity check run (and also helpful in case you're sharing CI logs)
+./${butler_exe} -V
+./${butler_exe} push "build/Blades of Exile/" nqn/blades-of-exile:${butler_channel}

.github/workflows/scripts/linux/install-tgui.sh

@@ -3,7 +3,7 @@
 git clone --depth 1 -b 0.9 https://github.com/texus/TGUI.git
 cd TGUI
 export CLICOLOR_FORCE=1
-cmake -D TGUI_CXX_STANDARD=14 .
+SFML_DIR=../deps/lib/cmake/SFML cmake -D TGUI_CXX_STANDARD=14 -D SFML_DIR=../deps/lib/cmake/SFML .
 make
 cmake --install .
 cd .. # Probably not needed but...

.github/workflows/scripts/mac/make-universal.sh

@@ -0,0 +1,27 @@
+#! /bin/bash
+
+if [ -z "$CONFIGURATION" ]; then
+    CONFIGURATION=Release
+fi
+
+INTEL=cboe-macos-intel-$CONFIGURATION
+SILICON=cboe-macos-silicon-$CONFIGURATION
+
+combine() {
+    mkdir -p "build/Blades of Exile/$1.app/Contents/MacOS"
+    lipo -create "$SILICON/Blades of Exile/$1.app/Contents/MacOS/$1" "$INTEL/Blades of Exile/$1.app/Contents/MacOS/$1" -output "build/Blades of Exile/$1.app/Contents/MacOS/$1"
+    cp -r "$SILICON/Blades of Exile/$1.app/Contents/Frameworks" "build/Blades of Exile/$1.app/Contents/"
+    cp -r "$SILICON/Blades of Exile/$1.app/Contents/Resources" "build/Blades of Exile/$1.app/Contents/"
+    cp "$SILICON/Blades of Exile/$1.app/Contents/Info.plist" "build/Blades of Exile/$1.app/Contents/"
+    cp "$SILICON/Blades of Exile/$1.app/Contents/PkgInfo" "build/Blades of Exile/$1.app/Contents/"
+}
+
+combine "Blades of Exile"
+combine "BoE Scenario Editor"
+combine "BoE Character Editor"
+
+cp -r "$SILICON/Blades of Exile/Blades of Exile Base" "build/Blades of Exile/"
+cp -r "$SILICON/Blades of Exile/Blades of Exile Scenarios" "build/Blades of Exile/"
+cp -r "$SILICON/Blades of Exile/data" "build/Blades of Exile/"
+cp -r "$SILICON/Blades of Exile/docs" "build/Blades of Exile/"
+cp "$SILICON/Blades of Exile/.itch.toml" "build/Blades of Exile/"

.github/workflows/scripts/mac/scons-build.sh

@@ -4,4 +4,4 @@ export CC="$(brew --prefix llvm)/bin/clang"
 export CXX="$(brew --prefix llvm)/bin/clang++"
 export SDKROOT="$(xcrun --show-sdk-path)"
 
-scons CXXFLAGS="-I/usr/local/opt/zlib/include" LINKFLAGS="-L/usr/local/opt/zlib/lib" $@
+scons CXXFLAGS="-I/usr/local/opt/zlib/include -arch $ARCH" LINKFLAGS="-L/usr/local/opt/zlib/lib" $@

.github/workflows/scripts/mac/sign-apps.sh

@@ -0,0 +1,79 @@
+#! /bin/bash
+
+# CODE-SIGNING STEP
+# Original Source: https://federicoterzi.com/blog/automatic-code-signing-and-notarization-for-macos-apps-using-github-actions/
+# Modified by NQNStudios
+
+# Turn our base64-encoded certificate back to a regular .p12 file
+
+echo $PROD_MACOS_CERTIFICATE | base64 --decode > certificate.p12
+
+# We need to create a new keychain, otherwise using the certificate will prompt
+# with a UI dialog asking for the certificate password, which we can't
+# use in a headless CI environment
+
+security create-keychain -p "$PROD_MACOS_CI_KEYCHAIN_PWD" build.keychain
+security default-keychain -s build.keychain
+security unlock-keychain -p "$PROD_MACOS_CI_KEYCHAIN_PWD" build.keychain
+security import certificate.p12 -k build.keychain -P "$PROD_MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
+security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$PROD_MACOS_CI_KEYCHAIN_PWD" build.keychain
+
+sign() {
+    if [ "$SIGN" = "no" ];
+    then
+        return
+    fi
+    APP_PATH="build/Blades of Exile/$1.app"
+
+    # We finally codesign our app bundle, specifying the Hardened runtime option
+
+    /usr/bin/codesign --force -s "$PROD_MACOS_CERTIFICATE_NAME" --options runtime "$APP_PATH"/Contents/Frameworks/*.dylib -v
+    (cd "$APP_PATH" && frameworks=Contents/Frameworks/*.framework/Versions/A/* && \
+        for framework in $frameworks; do
+            if [ -f "$framework" ]; then
+                /usr/bin/codesign --force -s "$PROD_MACOS_CERTIFICATE_NAME" --options runtime "$framework" -v
+            fi
+        done)
+    /usr/bin/codesign --force -s "$PROD_MACOS_CERTIFICATE_NAME" --options runtime "$APP_PATH"/Contents/Frameworks/*.framework/Versions/A/Resources/Info.plist -v
+    /usr/bin/codesign --force -s "$PROD_MACOS_CERTIFICATE_NAME" --options runtime "$APP_PATH/Contents/Info.plist" -v
+
+    /usr/bin/codesign --force -s "$PROD_MACOS_CERTIFICATE_NAME" --options runtime "$APP_PATH" -v
+
+    # NOTARIZATION STEP
+    if [ "$NOTARIZE" = "no" ];
+    then
+        return
+    fi
+
+    # (same source)
+
+    # Store the notarization credentials so that we can prevent a UI password dialog
+    # from blocking the CI
+
+    echo "Create keychain profile"
+    xcrun notarytool store-credentials "notarytool-profile" --apple-id "$PROD_MACOS_NOTARIZATION_APPLE_ID" --team-id "$PROD_MACOS_NOTARIZATION_TEAM_ID" --password "$PROD_MACOS_NOTARIZATION_PWD"
+
+    # We can't notarize an app bundle directly, but we need to compress it as an archive.
+    # Therefore, we create a zip file containing our app bundle, so that we can send it to the
+    # notarization service
+
+    echo "Creating temp notarization archive"
+    ditto -c -k --keepParent "$APP_PATH" "notarization.zip"
+
+    # Here we send the notarization request to the Apple's Notarization service, waiting for the result.
+    # This typically takes a few seconds inside a CI environment, but it might take more depending on the App
+    # characteristics. Visit the Notarization docs for more information and strategies on how to optimize it if
+    # you're curious
+
+    echo "Notarize app"
+    xcrun notarytool submit "notarization.zip" --keychain-profile "notarytool-profile" --wait
+
+    # Finally, we need to "attach the staple" to our executable, which will allow our app to be
+    # validated by macOS even when an internet connection is not available.
+    echo "Attach staple"
+    xcrun stapler staple "$APP_PATH" || exit 1
+}
+
+sign "Blades of Exile"
+sign "BoE Scenario Editor"
+sign "BoE Character Editor"

.itch.toml

@@ -0,0 +1,9 @@
+[[actions]]
+name = "Play"
+path = "Blades of Exile.exe"
+platform = "windows"
+
+[[actions]]
+name = "Play"
+path = "Blades of Exile.app"
+platform = "osx"

SConstruct

@@ -232,13 +232,15 @@ elif platform == "win32":
 		vcpkg_other_libs = list(filter(path.exists, vcpkg_other_libs))
 		vcpkg_other_bins = [path.join(d.get_abspath(), 'bin') for d in vcpkg_other_packages]
 		vcpkg_other_bins = list(filter(path.exists, vcpkg_other_bins))
-
-		include_paths=[path.join(vcpkg_installed, 'include')] + vcpkg_other_includes
+		project_includes = []
+		for (root, dirs, files) in os.walk('src'):
+			project_includes.append(path.join(os.getcwd(), root))
+		include_paths=project_includes
 		env.Append(
-			LINKFLAGS=['/SUBSYSTEM:WINDOWS','/ENTRY:mainCRTStartup',f'/MACHINE:X{arch_short}'],
+			LINKFLAGS=['/SUBSYSTEM:WINDOWS','/ENTRY:mainCRTStartup',f'/MACHINE:X{arch_short}', '/VERBOSE', '/NODEFAULTLIB:libboost_filesystem-vc142-mt-x64-1_85.lib'],
 			CXXFLAGS=['/EHsc','/MD','/FIglobal.hpp'],
 			CPPPATH=include_paths,
-			LIBPATH=[path.join(vcpkg_installed, 'lib')] + vcpkg_other_libs + vcpkg_other_bins,
+			LIBPATH=[],
 			LIBS=Split("""
 				kernel32
 				user32
@@ -259,7 +261,10 @@ elif platform == "win32":
 	def build_app_package(env, source, build_dir, info):
 		env.Install(build_dir, source)
 elif platform == "posix":
-	env.Append(CXXFLAGS=["-std=c++14","-include","global.hpp"])
+	env.Append(
+		CXXFLAGS=["-std=c++14","-include","global.hpp"],
+		#LINKFLAGS=["-rpath-link", "deps/lib/", "-rpath", "./"]
+		)
 	def build_app_package(env, source, build_dir, info):
 		env.Install(build_dir, source)
 
@@ -415,6 +420,7 @@ if not env.GetOption('clean'):
 	if platform == 'posix':
 		def check_tgui(conf, second_attempt=False):
 			if conf.CheckLib('libtgui', language='C++'):
+				bundled_libs.append('tgui')
 				return conf
 			else:
 				if second_attempt:
@@ -496,7 +502,31 @@ Export("data_dir")
 SConscript(["rsrc/SConscript", "doc/SConscript"])
 
 # Bundle required frameworks and libraries
-
+def handle_bundled_libs(extension, prefix=''):
+	target_dirs = ["#build/Blades of Exile", "#build/test"]
+	for lib in bundled_libs:
+		for lpath in env['LIBPATH']:
+			def check_path(src_file):
+				_dir = os.path.dirname(src_file)
+				print(f'checking {_dir} for {prefix}{lib}')
+				try:
+					print(os.listdir(_dir))
+				except:
+					pass
+				if path.exists(src_file) and src_file != "/usr/lib/x86_64-linux-gnu/libz.so":
+					for targ in target_dirs:
+						for so in os.listdir(_dir):
+							if os.path.basename(src_file) in so:
+								print(f'found {path.join(_dir, so)}')
+								env.Install(targ, path.join(_dir, so))
+						return True
+				return False
+			if check_path(path.join(lpath, prefix + lib + extension)):
+				break
+			elif check_path(path.join(lpath.replace('lib', 'bin'), prefix + lib + extension)):
+				break
+			elif check_path(path.join(lpath, 'x86_64-linux-gnu', prefix + lib + extension)):
+				break
 if platform == "darwin":
 	app_targets = []
 	if 'game' in targets:
@@ -535,20 +565,7 @@ elif platform == "win32":
 		brotlidec
 		brotlicommon
 	""")
-	target_dirs = ["#build/Blades of Exile", "#build/test"]
-	for lib in bundled_libs:
-		for lpath in env['LIBPATH']:
-			src_file = path.join(lpath, lib + ".dll")
-			if path.exists(src_file):
-				for targ in target_dirs:
-					env.Install(targ, src_file)
-				break
-			elif 'lib' in lpath:
-				src_file = path.join(lpath.replace('lib', 'bin'), lib + ".dll")
-				if path.exists(src_file):
-					for targ in target_dirs:
-						env.Install(targ, src_file)
-					break
+	handle_bundled_libs(".dll")
 	# Extra: Microsoft redistributable libraries installer
 	if 'msvc' in env["TOOLS"]:
 		if path.exists("deps/VCRedistInstall.exe"):
@@ -556,11 +573,41 @@ elif platform == "win32":
 		else:
 			print("WARNING: Cannot find installer for the MSVC redistributable libraries for your version of Visual Studio.")
 			print("Please download it from Microsoft's website and place it at:")
-			print("      deps/VCRedistInstall.exe")
+			print("	  deps/VCRedistInstall.exe")
 			# Create it so its lack doesn't cause makensis to break
 			# (Because the installer is an optional component.)
 			os.makedirs("build/Blades of Exile", exist_ok=True)
 			open("build/Blades of Exile/VCRedistInstall.exe", 'w').close()
+elif platform == "posix":
+	targets = [
+		"Blades of Exile",
+		"BoE Character Editor",
+		"BoE Scenario Editor",
+	]
+	def patchelf():
+		to_patch = targets + [so for so in os.listdir("build/Blades of Exile") if '.so' in so]
+		for targ in to_patch:
+			subprocess.call(['patchelf', '--set-rpath', '.', targ], cwd='build/Blades of Exile')
+	atexit.register(patchelf)
+	bundled_libs += Split("""
+		GL
+		X11
+		stdc++
+		Xrandr
+		Xcursor
+		udev
+		openal
+		vorbisenc
+		vorbisfile
+		vorbis
+		ogg
+		FLAC
+		freetype
+		GLdispatch
+		GLX
+		xcb
+	""")
+	handle_bundled_libs(".so", "lib")
 
 if env["package"]:
 	if platform == "darwin":

rsrc/dialogs/1str-lg.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done'>
+<dialog defbtn='done' escbtn='done'>
 	<pict name='pict' type='dlog' size='large' num='0' top='9' left='9'/>
 	<text name='str1' framed='true' top='8' left='91' width='257' height='90'/>
 	<button name='done' type='done' top='107' left='287'/>

rsrc/dialogs/1str-title-lg.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done'>
+<dialog defbtn='done' escbtn='done'>
 	<pict name='pict' type='dlog' size='large' num='0' top='9' left='9'/>
 	<text name='title' framed='true' top='9' left='91' width='257' height='19'/>
 	<text name='str1' framed='true' top='39' left='91' width='257' height='87'/>

rsrc/dialogs/1str-title.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done'>
+<dialog defbtn='done' escbtn='done'>
 	<pict name='pict' type='dlog' num='8' top='9' left='9'/>
 	<text name='title' framed='true' top='9' left='55' width='257' height='19'/>
 	<text name='str1' framed='true' top='39' left='55' width='257' height='87'/>

rsrc/dialogs/1str.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done'>
+<dialog defbtn='done' escbtn='done'>
 	<pict name='pict' type='dlog' num='8' top='9' left='9'/>
 	<text name='str1' framed='true' top='8' left='55' width='257' height='90'/>
 	<button name='done' type='done' top='107' left='251'/>

rsrc/dialogs/2str-lg.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done'>
+<dialog defbtn='done' escbtn='done'>
 	<pict name='pict' type='dlog' size='large' num='0' top='9' left='9'/>
 	<text name='str1' framed='true' top='8' left='91' width='257' height='90'/>
 	<text name='str2' framed='true' top='107' left='91' width='257' height='98'/>

rsrc/dialogs/2str-title-lg.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done'>
+<dialog defbtn='done' escbtn='done'>
 	<pict name='pict' type='dlog' size='large' num='0' top='9' left='9'/>
 	<text name='title' framed='true' top='9' left='91' width='257' height='19'/>
 	<text name='str1' framed='true' top='39' left='91' width='257' height='87'/>

rsrc/dialogs/2str-title.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done'>
+<dialog defbtn='done' escbtn='done'>
 	<pict name='pict' type='dlog' num='8' top='9' left='9'/>
 	<text name='title' framed='true' top='9' left='55' width='257' height='19'/>
 	<text name='str1' framed='true' top='39' left='55' width='257' height='87'/>

rsrc/dialogs/2str.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done'>
+<dialog defbtn='done' escbtn='done'>
 	<pict name='pict' type='dlog' num='8' top='9' left='9'/>
 	<text name='str1' framed='true' top='8' left='55' width='257' height='90'/>
 	<text name='str2' framed='true' top='107' left='55' width='257' height='98'/>

rsrc/dialogs/abort-game.xml

@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='cancel'>
+<dialog escbtn='cancel'>
 	<pict type='dlog' num='23' top='9' left='9'/>
 	<text top='6' left='53' width='249' height='31'>
 		If you return to the Main Menu, your unsaved progress will be lost.
 		Are you sure you want to do this?
 	</text>
-	<button name='cancel' type='regular' def-key='esc' top='45' left='244'>Cancel</button>
+	<button name='cancel' type='regular' top='45' left='244'>Cancel</button>
 	<button name='okay' type='large' top='45' left='134'>Main Menu</button>
 </dialog>

rsrc/dialogs/about-boe.xml

@@ -4,7 +4,7 @@
 	tpkg/credits/about-boe-template.xml. Do not modify it manually!
 -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='okay'>
 	<!--
 	 TODO: This dialog contains out-of-date information, such as pricing.
 	-->

rsrc/dialogs/about-pced.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='okay'>
 	<pict top='6' left='6' type='dlog' num='16'/>
 	<text top='6' left='50' width='338' height='34'>
 		Blades of Exile Character Editor v2.0 alpha<br/>

rsrc/dialogs/about-scened.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='okay'>
 	<pict type='dlog' num='16' top='6' left='6'/>
 	<text top='6' left='50' width='420' height='33'>
 		Blades of Exile Scenario Editor v2.0 alpha<br/>

rsrc/dialogs/add-new-sheet.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='new'>
+<dialog defbtn='new' escbtn='cancel'>
 	<pict type='dlog' num='16' top='6' left='6'/>
 	<text top='6' left='48' width='252' height='101'>
 		Before you create the new sheet, you need to decide what its sheet number will be.
@@ -11,6 +11,6 @@
 	</text>
 	<text top='111' left='48' width='80' height='16'>Sheet number:</text>
 	<field name='num' top='110' left='138' width='80' height='16'/>
-	<button name='cancel' type='regular' top='141' left='234'>Cancel</button>
-	<button name='new' type='regular' top='141' left='169'>Create</button>
+	<button name='cancel' type='regular' top='141' left='169'>Cancel</button>
+	<button name='new' type='regular' top='141' left='234'>Create</button>
 </dialog>

rsrc/dialogs/add-random-items.xml

@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<button name='okay' type='regular' top='89' left='252'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='89' left='187'>Cancel</button>
+	<button name='cancel' type='regular' top='89' left='187'>Cancel</button>
 	<pict type='dlog' num='16' top='6' left='6'/>
 	<text top='6' left='49' width='270' height='81'>
 		This option places random items in this town.

rsrc/dialogs/adventure-notes.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done'>
+<dialog defbtn='done' escbtn='done'>
 	<button name='done' type='done' top='341' left='319'/>
 	<pict type='dlog' num='8' top='9' left='9'/>
 	<text name='str1' framed='true' top='37' left='53' width='257' height='92'/>

rsrc/dialogs/ask-save-replay.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='no'>
+<dialog defbtn='yes' escbtn='no'>
 	<pict type='dlog' num='7' top='6' left='6'/>
 	<text top='6' left='48' width='249'>
 		Want to help improve OpenBoE? 
@@ -14,6 +14,6 @@
 	<text relative='pos-in pos' rel-anchor='prev' top='4' left='0' width='249'>
 		Save a replay log?
 	</text>
-	<button name='no' relative='abs pos' rel-anchor='prev' type='regular' def-key='n' top='4' left='239'>No</button>
-	<button name='yes' relative='abs pos-in' rel-anchor='prev' type='regular' def-key='y' top='0' left='172'>Yes</button>
+	<button name='no' relative='abs pos' rel-anchor='prev' type='regular' def-key='n' top='4' left='172'>No</button>
+	<button name='yes' relative='abs pos-in' rel-anchor='prev' type='regular' def-key='y' top='0' left='239'>Yes</button>
 </dialog>

rsrc/dialogs/attack-friendly.xml

@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='cancel'>
+<dialog escbtn='cancel'>
 	<pict type='dlog' num='10' top='6' left='6'/>
 	<text top='6' left='48' width='192' height='40'>
 		This creature isn't hostile.<br/>
 		Attack anyway?
 	</text>
-	<button name='cancel' type='regular' def-key='esc' top='53' left='182'>Cancel</button>
-	<button name='attack' type='regular' top='53' left='114'>Attack</button>
+	<button name='cancel' type='regular' top='53' left='114'>Cancel</button>
+	<button name='attack' type='regular' top='53' left='182'>Attack</button>
 </dialog>

rsrc/dialogs/basic-button.xml

@@ -2,8 +2,8 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='no'>
-	<button name='no' type='regular' def-key='n' top='39' left='244'>No</button>
-	<button name='yes' type='regular' def-key='y' top='39' left='178'>Yes</button>
+	<button name='no' type='regular' def-key='n' top='39' left='178'>No</button>
+	<button name='yes' type='regular' def-key='y' top='39' left='244'>Yes</button>
 	<pict type='dlog' num='11' top='9' left='9'/>
 	<text top='4' left='51' width='251' height='32'>
 		There is a large button here, waiting to be pressed.

rsrc/dialogs/basic-lever.xml

@@ -3,7 +3,7 @@
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='leave'>
 	<pict type='dlog' num='9' top='9' left='8'/>
-	<button name='leave' type='regular' top='46' left='244'>Leave</button>
-	<button name='pull' type='regular' top='46' left='176'>Pull</button>
+	<button name='leave' type='regular' top='46' left='176'>Leave</button>
+	<button name='pull' type='regular' top='46' left='244'>Pull</button>
 	<text top='4' left='50' width='253' height='43'>There is a stout wooden lever protruding from the ground here. Pull it?</text>
 </dialog>

rsrc/dialogs/basic-portal.xml

@@ -2,8 +2,8 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='no'>
-	<button name='no' type='regular' def-key='n' top='39' left='244'>No</button>
-	<button name='yes' type='regular' def-key='y' top='39' left='178'>Yes</button>
+	<button name='no' type='regular' def-key='n' top='39' left='178'>No</button>
+	<button name='yes' type='regular' def-key='y' top='39' left='244'>Yes</button>
 	<pict type='dlog' num='22' top='9' left='9'/>
 	<text top='4' left='51' width='251' height='32'>
 		There is a glowing teleporter here.

rsrc/dialogs/basic-slope-down.xml

@@ -2,8 +2,8 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='leave'>
-	<button name='leave' type='regular' top='35' left='243'>Leave</button>
-	<button name='climb' type='regular' top='35' left='177'>Climb</button>
+	<button name='leave' type='regular' top='35' left='177'>Leave</button>
+	<button name='climb' type='regular' top='35' left='243'>Climb</button>
 	<pict type='dlog' num='19' top='8' left='8'/>
 	<text top='3' left='50' width='251' height='31'>
 		The passageway you're walking down slopes sharply downward here.

rsrc/dialogs/basic-slope-up.xml

@@ -2,8 +2,8 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='leave'>
-	<button name='leave' type='regular' top='35' left='243'>Leave</button>
-	<button name='climb' type='regular' top='35' left='177'>Climb</button>
+	<button name='leave' type='regular' top='35' left='177'>Leave</button>
+	<button name='climb' type='regular' top='35' left='243'>Climb</button>
 	<pict type='dlog' num='19' top='8' left='8'/>
 	<text top='3' left='50' width='251' height='31'>
 		The passageway you're walking down slopes sharply upward here.

rsrc/dialogs/basic-stair-down.xml

@@ -2,8 +2,8 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='leave'>
-	<button name='leave' type='regular' top='27' left='242'>Leave</button>
-	<button name='climb' type='regular' top='27' left='176'>Climb</button>
+	<button name='leave' type='regular' top='27' left='176'>Leave</button>
+	<button name='climb' type='regular' top='27' left='242'>Climb</button>
 	<pict type='dlog' num='19' top='8' left='8'/>
 	<text top='3' left='50' width='250' height='22'>
 		You find a stairway heading down.

rsrc/dialogs/basic-stair-up.xml

@@ -2,8 +2,8 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='leave'>
-	<button name='leave' type='regular' top='27' left='242'>Leave</button>
-	<button name='climb' type='regular' top='27' left='176'>Climb</button>
+	<button name='leave' type='regular' top='27' left='176'>Leave</button>
+	<button name='climb' type='regular' top='27' left='242'>Climb</button>
 	<pict type='dlog' num='19' top='8' left='8'/>
 	<text top='3' left='50' width='250' height='22'>
 		You find a stairway heading up.

rsrc/dialogs/basic-trap.xml

@@ -2,8 +2,8 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='no'>
-	<button name='no' type='regular' def-key='n' top='39' left='244'>No</button>
-	<button name='yes' type='regular' def-key='y' top='39' left='178'>Yes</button>
+	<button name='no' type='regular' def-key='n' top='39' left='178'>No</button>
+	<button name='yes' type='regular' def-key='y' top='39' left='244'>Yes</button>
 	<pict type='dlog' num='27' top='9' left='9'/>
 	<text top='4' left='51' width='251' height='32'>
 		You think you've found a trap.

rsrc/dialogs/cast-spell.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='cast'>
+<dialog defbtn='cast' escbtn='cancel'>
 	<pict name='pic' type='dlog' num='12' top='9' left='9'/>
 	<text size='large' top='6' left='54' width='139' height='18'>Select a Spell:</text>
 	<!-- To the left of PC names, buttons to select caster -->
@@ -225,6 +225,6 @@
 	<button name='help' type='help' def-key='help' top='6' left='596'/>
 
 	<!-- Main buttons -->
-	<button name='cancel' type='regular' def-key='esc' top='394' left='479'>Cancel</button>
+	<button name='cancel' type='regular' top='394' left='479'>Cancel</button>
 	<button name='cast' type='regular' top='394' left='549'>Cast</button>
 </dialog>

rsrc/dialogs/change-terrain.xml

@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<!-- OK button -->
 	<field name='from' type='uint' top='99' left='205' width='64' height='17'>0</field>
 	<field name='to' type='uint' top='125' left='205' width='64' height='17'>0</field>
 	<field name='chance' type='uint' top='151' left='205' width='64' height='17'>100</field>
 	<button name='okay' type='regular' top='177' left='280'>OK</button>
-	<button name='cancel' type='regular' top='177' left='214' def-key='esc'>Cancel</button>
+	<button name='cancel' type='regular' top='177' left='214'>Cancel</button>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' top='6' left='50' width='167' height='17'>Change Terrain Randomly</text>
 	<text top='25' left='50' width='286' height='67'>

rsrc/dialogs/choose-bg.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done'>
+<dialog defbtn='done' escbtn='cancel'>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text name='title' size='large' top='6' left='50' width='256' height='14'>Select background pattern:</text>
 	<group name='group'>
@@ -29,5 +29,5 @@
 		<led name='led21' top='189' left='216'>Sandstone</led>
 	</group>
 	<button name='done' type='regular' top='223' left='338'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='223' left='272'>Cancel</button>
+	<button name='cancel' type='regular' top='223' left='272'>Cancel</button>
 </dialog>

rsrc/dialogs/choose-edit-string.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done'>
+<dialog defbtn='done' escbtn='cancel'>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text name='title' size='large' top='6' left='50' width='256' height='14'>Select:</text>
 	<text top='24' left='50'>Note: Edits to the names will be saved even if you click Cancel.</text>
@@ -50,5 +50,5 @@
 	<button name='left' type='left' def-key='left' top='358' left='8'/>
 	<button name='right' type='right' def-key='right' top='358' left='71'/>
 	<button name='done' type='regular' top='358' left='338'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='358' left='272'>Cancel</button>
+	<button name='cancel' type='regular' top='358' left='272'>Cancel</button>
 </dialog>

rsrc/dialogs/choose-location.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done'>
+<dialog defbtn='done' escbtn='cancel'>
 	<pict name='mainpic' type='dlog' num='16' top='6' left='6'/>
 	<text name='prompt' anchor='mainpic' relative='pos pos-in' size='large' top='0' left='12' width='248' height='14'>Select a location:</text>
 	<tilemap name='map' anchor='mainpic' relative='pos-in pos' framed='true' top='8' left='0' rows='18' cols='18'>
@@ -12,7 +12,7 @@
 	<button name='left' anchor='map' relative='pos-in pos' type='left' top='10' left='0' def-key='left'/>
 	<button name='down' anchor='left' relative='pos pos-in' type='down' top='0' left='121' def-key='down'/>
 	<button name='right' anchor='down' relative='pos pos-in' type='right' top='0' left='121' def-key='right'/>
-	<button name='cancel' anchor='done' relative='neg pos-in' type='regular' top='0' left='67' def-key='esc'>Cancel</button>
+	<button name='cancel' anchor='done' relative='neg pos-in' type='regular' top='0' left='67'>Cancel</button>
 	<button name='done' anchor='right' relative='pos-in pos' type='done' top='4' left='0'/>
 	<button name='up' anchor='down' relative='pos-in neg' type='up' top='473' left='0' def-key='up'/>
 	<button name='switch' anchor='right' relative='pos-in neg' type='regular' top='473' left='0'>Switch</button>

rsrc/dialogs/choose-pattern.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done'>
+<dialog defbtn='done' escbtn='cancel'>
 	<pict name='mainpic' type='dlog' num='16' top='6' left='6'/>
 	<text name='prompt' size='large' top='6' left='50' width='248' height='14'>Which spell pattern?</text>
 	<group name='group'>
@@ -100,5 +100,5 @@
 	<button name='left' type='left' top='314' left='6' def-key='left'/>
 	<button name='right' type='right' top='314' left='69' def-key='right'/>
 	<button name='done' type='done' top='314' left='393'/>
-	<button name='cancel' type='regular' top='314' left='322' def-key='esc'>Cancel</button>
+	<button name='cancel' type='regular' top='314' left='322'>Cancel</button>
 </dialog>

rsrc/dialogs/choose-pict.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done'>
+<dialog defbtn='done' escbtn='cancel'>
 	<pict name='mainpic' type='dlog' num='16' top='6' left='6'/>
 	<text name='prompt' size='large' top='6' left='50' width='248' height='14'>Select a graphic:</text>
 	<group name='group'>
@@ -82,5 +82,5 @@
 	<button name='left' type='left' top='314' left='6' def-key='left'/>
 	<button name='right' type='right' top='314' left='69' def-key='right'/>
 	<button name='done' type='done' top='314' left='393'/>
-	<button name='cancel' type='regular' top='314' left='322' def-key='esc'>Cancel</button>
+	<button name='cancel' type='regular' top='314' left='322'>Cancel</button>
 </dialog>

rsrc/dialogs/choose-sdf.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done'>
+<dialog defbtn='done' escbtn='cancel'>
 	<pict name='mainpic' type='dlog' num='16' top='6' left='6'/>
 	<text name='prompt' anchor='mainpic' relative='pos pos-in' size='large' top='0' left='12' width='248' height='14'>Select a Stuff Done Flag:</text>
 	<tilemap name='cols' anchor='mainpic' relative='pos' top='8' left='0' rows='1' cols='5' cellspacing='10'>
@@ -19,7 +19,7 @@
 	<button name='left' anchor='map' relative='pos-in pos' type='left' top='10' left='0' def-key='left'/>
 	<button name='down' anchor='left' relative='pos pos-in' type='down' top='0' left='228' def-key='down'/>
 	<button name='right' anchor='down' relative='pos pos-in' type='right' top='0' left='228' def-key='right'/>
-	<button name='cancel' anchor='done' relative='neg pos-in' type='regular' top='0' left='67' def-key='esc'>Cancel</button>
+	<button name='cancel' anchor='done' relative='neg pos-in' type='regular' top='0' left='67'>Cancel</button>
 	<button name='done' anchor='right' relative='pos-in pos' type='done' top='4' left='0'/>
 	<button name='up' anchor='down' relative='pos-in neg' type='up' top='284' left='0' def-key='up'/>
 </dialog>

rsrc/dialogs/choose-string.xml

@@ -1,53 +1,58 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done'>
+<dialog defbtn='done' escbtn='cancel'>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text name='title' size='large' top='6' left='50' width='256' height='14'>Select:</text>
+	<field name='search-field' relative='pos-in pos' rel-anchor='prev' top='0' left='2' width='200' height='16'/>
+	<button name='search' type='regular' def-key='ctrl f' relative='pos neg' rel-anchor='prev' left='5' top='4'>Search</button>
+	<led name='reverse' state='off' relative='pos pos-in' rel-anchor='prev' top='6' left='7'>Reverse</led>
+	<text name='search-label' size='9' framed='true' relative='pos-in pos' anchor='search-field' top='4' left='0' width='250' height='10'/>
 	<group name='strings'>
+		<!-- Column 1 -->
 		<led name='led1' state='off' top='54' left='8'/>
-		<led name='led2' state='off' top='69' left='8'/>
-		<led name='led3' state='off' top='84' left='8'/>
-		<led name='led4' state='off' top='99' left='8'/>
-		<led name='led5' state='off' top='114' left='8'/>
-		<led name='led6' state='off' top='129' left='8'/>
-		<led name='led7' state='off' top='144' left='8'/>
-		<led name='led8' state='off' top='159' left='8'/>
-		<led name='led9' state='off' top='174' left='8'/>
-		<led name='led10' state='off' top='189' left='8'/>
-		<led name='led11' state='off' top='204' left='8'/>
-		<led name='led12' state='off' top='219' left='8'/>
-		<led name='led13' state='off' top='234' left='8'/>
-		<led name='led14' state='off' top='249' left='8'/>
-		<led name='led15' state='off' top='264' left='8'/>
-		<led name='led16' state='off' top='279' left='8'/>
-		<led name='led17' state='off' top='294' left='8'/>
-		<led name='led18' state='off' top='309' left='8'/>
-		<led name='led19' state='off' top='324' left='8'/>
-		<led name='led20' state='off' top='339' left='8'/>
+		<led name='led2' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led3' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led4' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led5' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led6' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led7' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led8' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led9' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led10' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led11' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led12' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led13' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led14' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led15' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led16' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led17' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led18' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led19' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led20' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<!-- Column 2 -->
 		<led name='led21' state='off' top='54' left='216'/>
-		<led name='led22' state='off' top='69' left='216'/>
-		<led name='led23' state='off' top='84' left='216'/>
-		<led name='led24' state='off' top='99' left='216'/>
-		<led name='led25' state='off' top='114' left='216'/>
-		<led name='led26' state='off' top='129' left='216'/>
-		<led name='led27' state='off' top='144' left='216'/>
-		<led name='led28' state='off' top='159' left='216'/>
-		<led name='led29' state='off' top='174' left='216'/>
-		<led name='led30' state='off' top='189' left='216'/>
-		<led name='led31' state='off' top='204' left='216'/>
-		<led name='led32' state='off' top='219' left='216'/>
-		<led name='led33' state='off' top='234' left='216'/>
-		<led name='led34' state='off' top='249' left='216'/>
-		<led name='led35' state='off' top='264' left='216'/>
-		<led name='led36' state='off' top='279' left='216'/>
-		<led name='led37' state='off' top='294' left='216'/>
-		<led name='led38' state='off' top='309' left='216'/>
-		<led name='led39' state='off' top='324' left='216'/>
-		<led name='led40' state='off' top='339' left='216'/>
+		<led name='led22' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led23' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led24' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led25' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led26' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led27' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led28' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led29' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led30' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led31' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led32' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led33' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led34' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led35' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led36' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led37' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led38' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led39' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
+		<led name='led40' state='off' relative='pos-in pos-in' rel-anchor='prev' top='15' left='0'/>
 	</group>
-	<button name='left' type='left' def-key='left' top='358' left='8'/>
-	<button name='right' type='right' def-key='right' top='358' left='71'/>
-	<button name='done' type='regular' top='358' left='338'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='358' left='272'>Cancel</button>
+	<button name='left' type='left' def-key='left' relative='pos-in pos-in' anchor='led20' top='19' left='0'/>
+	<button name='right' type='right' def-key='right' relative='pos-in pos-in' rel-anchor='prev' top='0' left='63'/>
+	<button name='cancel' type='regular' relative='pos-in pos-in' rel-anchor='prev' top='0' left='201'>Cancel</button>
+	<button name='done' type='regular' def-key='ctrl enter' relative='pos-in pos-in' rel-anchor='prev' top='0' left='66'>OK</button>
 </dialog>

rsrc/dialogs/clear-items-confirm.xml

@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<button name='okay' type='regular' top='39' left='239'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='39' left='174'>Cancel</button>
+	<button name='cancel' type='regular' top='39' left='174'>Cancel</button>
 	<pict type='dlog' num='16' top='6' left='6'/>
 	<text top='6' left='49' width='258' height='32'>
 		This option erases all items in the town. Go ahead?

rsrc/dialogs/confirm-interrupt-replay.xml

@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='cancel'>
+<dialog defbtn='quit' escbtn='cancel'>
 	<pict type='dlog' num='23' top='9' left='9'/>
 	<text top='5' left='51' width='255' height='72'>
 		Are you sure you wish to stop this replay?</text>
-	<button name='quit' type='regular' top='86' left='178'>Stop</button>
-	<button name='cancel' type='regular' def-key='esc' top='86' left='248'>Cancel</button>
+	<button name='cancel' type='regular' top='86' left='178'>Cancel</button>
+	<button name='quit' type='regular' top='86' left='248'>Stop</button>
 </dialog>

rsrc/dialogs/confirm-interrupt-special.xml

@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='cancel'>
+<dialog defbtn='quit' escbtn='cancel'>
 	<pict type='dlog' num='23' top='9' left='9'/>
 	<text top='5' left='51' width='255' height='72'>
 		Warning: If you terminate the special node sequence, the scenario may be left in an unexpected state.
 		It is recommended that you immediately reload from a saved game after doing this.
 		<br/>                     Are you sure you wish to proceed?</text>
-	<button name='quit' type='regular' top='86' left='178'>Kill it!</button>
-	<button name='cancel' type='regular' def-key='esc' top='86' left='248'>Not yet</button>
+	<button name='cancel' type='regular' top='86' left='178'>Not yet</button>
+	<button name='quit' type='regular' top='86' left='248'>Kill it!</button>
 </dialog>

rsrc/dialogs/confirm-overwrite.xml

@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='cancel'>
+<dialog escbtn='cancel'>
 	<pict type='dlog' num='23' top='9' left='9'/>
 	<text name='prompt' top='5' left='51' width='255' height='32'>Are you sure you want to overwrite {File}?</text>
-	<button name='save' type='regular' top='46' left='178'>Save</button>
-	<button name='cancel' type='regular' def-key='esc' top='46' left='248'>Cancel</button>
+	<button name='cancel' type='regular' top='46' left='178'>Cancel</button>
+	<button name='save' type='regular' top='46' left='248'>Save</button>
 </dialog>

rsrc/dialogs/confirm-reset-help.xml

@@ -2,8 +2,8 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='no'>
-	<button name='no' type='regular' def-key='n' top='39' left='244'>No</button>
-	<button name='yes' type='regular' def-key='y' top='39' left='178'>Yes</button>
+	<button name='no' type='regular' def-key='n' top='39' left='178'>No</button>
+	<button name='yes' type='regular' def-key='y' top='39' left='244'>Yes</button>
 	<pict type='dlog' num='11' top='9' left='9'/>
 	<text top='4' left='51' width='251' height='32'>
 		Really reset instant help messages?

rsrc/dialogs/congrats-save.xml

@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='cancel'>
-	<button name='cancel' type='regular' top='91' left='234'>Cancel</button>
-	<button name='save' type='large' top='91' left='128'>Save First</button>
+<dialog defbtn='save' escbtn='cancel'>
 	<pict type='dlog' num='16' top='6' left='6'/>
 	<text top='6' left='48' width='252' height='81'>
 		Congratulations - you have just completed this scenario!
 		If you want, you can save your adventurers now before returning to the starting screen.
 		If you have any items stored in this scenario, you can get them back when you start the next.
 	</text>
+	<button name='cancel' type='regular' top='91' left='128'>Cancel</button>
+	<button name='save' type='large' top='91' left='198'>Save First</button>
 </dialog>

rsrc/dialogs/convert-pics-now.xml

@@ -10,6 +10,6 @@
 		Be aware that the conversion converts white to transparency,
 		so it may create unwanted holes if you had terrain or dialog graphics that used pure white.
 	</text>
-	<button name='cancel' type='regular' top='131' left='234'>Cancel</button>
-	<button name='convert' type='large' top='131' left='128'>Convert Now</button>
+	<button name='cancel' type='regular' top='131' left='128'>Cancel</button>
+	<button name='convert' type='large' top='131' left='198'>Convert Now</button>
 </dialog>

rsrc/dialogs/dark-slope-down.xml

@@ -2,8 +2,8 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='leave'>
-	<button name='leave' type='regular' top='50' left='246'>Leave</button>
-	<button name='climb' type='regular' top='50' left='180'>Climb</button>
+	<button name='leave' type='regular' top='50' left='180'>Leave</button>
+	<button name='climb' type='regular' top='50' left='246'>Climb</button>
 	<pict type='dlog' num='19' top='8' left='8'/>
 	<text top='3' left='50' width='254' height='45'>
 		The passageway you're walking down slopes downward here,

rsrc/dialogs/dark-slope-up.xml

@@ -2,8 +2,8 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='leave'>
-	<button name='leave' type='regular' top='35' left='243'>Leave</button>
-	<button name='climb' type='regular' top='35' left='177'>Climb</button>
+	<button name='leave' type='regular' top='35' left='177'>Leave</button>
+	<button name='climb' type='regular' top='35' left='243'>Climb</button>
 	<pict type='dlog' num='19' top='8' left='8'/>
 	<text top='3' left='50' width='251' height='31'>
 		The passageway you're walking down slopes upward into darkness. 

rsrc/dialogs/data-dump-confirm.xml

@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<button name='okay' type='regular' top='74' left='255'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='74' left='190'>Cancel</button>
+	<button name='cancel' type='regular' top='74' left='190'>Cancel</button>
 	<pict type='dlog' num='16' top='6' left='6'/>
 	<text top='6' left='49' width='271' height='66'>
 		Lists of all the terrain types, monster types, and item types in your scenario are about to be put in a file called 'Scenario data'.

rsrc/dialogs/debug-crash-confirm.xml

@@ -7,6 +7,6 @@
 		<br/>
 		Are you sure you want to do this?
 	</text>
-	<button name='no' type='regular' def-key='n' top='84' left='239'>No</button>
-	<button name='yes' type='regular' def-key='y' top='84' left='172'>Yes</button>
+	<button name='no' type='regular' def-key='n' top='84' left='172'>No</button>
+	<button name='yes' type='regular' def-key='y' top='84' left='239'>Yes</button>
 </dialog>

rsrc/dialogs/delete-pc-confirm.xml

@@ -8,6 +8,6 @@
 		<br/>
 		Are you sure you want to do this?
 	</text>
-	<button name='no' type='regular' def-key='n' top='84' left='239'>No</button>
-	<button name='yes' type='regular' def-key='y' top='84' left='172'>Yes</button>
+	<button name='no' type='regular' def-key='n' top='84' left='172'>No</button>
+	<button name='yes' type='regular' def-key='y' top='84' left='239'>Yes</button>
 </dialog>

rsrc/dialogs/delete-town-confirm.xml

@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<button name='okay' type='regular' top='143' left='252'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='143' left='187'>Cancel</button>
+	<button name='cancel' type='regular' top='143' left='187'>Cancel</button>
 	<pict type='dlog' num='16' top='6' left='6'/>
 	<text top='6' left='49' width='271' height='66'>
 		You are about to delete the last town in your scenario's town list

rsrc/dialogs/discard-special-node.xml

@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='save'>
+<dialog escbtn='save'>
 	<pict type='dlog' num='16' top='6' left='6'/>
 	<text top='6' left='49' width='296' height='47'>
 		If you exit the dialog now, you may lose changes to special nodes you were previously working on.
 		Do you want to exit so anyway, or just cancel editing the current node and return to the previous one?
 	</text>
-	<button name='save' type='large' top='54' left='240'>Forget It</button>
-	<button name='cancel' type='large' def-key='esc' top='54' left='136'>Cancel All</button>
-	<button name='revert' type='large' top='54' left='31'>Just One</button>
+	<button name='save' type='large' top='54' left='31'>Forget It</button>
+	<button name='cancel' type='large' top='54' left='136'>Cancel All</button>
+	<button name='revert' type='large' top='54' left='240'>Just One</button>
 </dialog>

rsrc/dialogs/drop-item-confirm.xml

@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='cancel'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='2' top='8' left='8'/>
 	<text size='large' top='8' left='48' width='248' height='33'>
 		This item will be gone forever. Still drop it?
 	</text>
-	<button name='cancel' type='regular' def-key='esc' top='42' left='238'>Cancel</button>
-	<button name='okay' type='regular' top='42' left='169'>OK</button>
+	<button name='cancel' type='regular' top='42' left='169'>Cancel</button>
+	<button name='okay' type='regular' top='42' left='238'>OK</button>
 </dialog>

rsrc/dialogs/edit-dialog-text.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<field name='str1' top='55' left='57' width='545' height='48'/>
 	<field name='str2' top='111' left='57' width='545' height='48'/>
 	<field name='str3' top='167' left='57' width='545' height='48'/>
@@ -9,7 +9,7 @@
 	<field name='str5' top='279' left='57' width='545' height='48'/>
 	<field name='str6' top='335' left='57' width='545' height='48'/>
 	<button name='okay' type='regular' top='388' left='544'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='388' left='479'>Cancel</button>
+	<button name='cancel' type='regular' top='388' left='479'>Cancel</button>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' top='6' left='50' width='256' height='17'>Edit dialog box text:</text>
 	<text top='23' left='50' width='550' height='28'>

rsrc/dialogs/edit-intro.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<field name='str1' top='83' left='57' width='540' height='39'/>
 	<field name='str2' top='129' left='57' width='540' height='39'/>
 	<field name='str3' top='175' left='57' width='540' height='39'/>
@@ -10,7 +10,7 @@
 	<field name='str6' top='313' left='57' width='540' height='39'/>
 	<field name='picnum' type='uint' top='19' left='523' width='70' height='16'/>
 	<button name='okay' type='regular' top='358' left='541'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='358' left='475'>Cancel</button>
+	<button name='cancel' type='regular' top='358' left='475'>Cancel</button>
 	<pict name='pic' type='scen' num='0' top='8' left='8'/>
 	<text size='large' top='6' left='50' width='156' height='17'>Scenario Details</text>
 	<text top='22' left='50' width='300' height='40'>

rsrc/dialogs/edit-item-abils.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='16' top='8' left='11'/>
 	<text name='title' size='large' top='6' left='50' width='158' height='16'>Edit Item' Abilities</text>
 	<text anchor='title' relative='pos pos-in' top='0' left='14' width='111' height='14'>Item number:</text>
@@ -53,6 +53,6 @@
 		<led name='type5' anchor='type4' relative='pos-in pos' state='off' top='5' left='0'>Type 5: Unique/Rare, Not left</led>
 	</group>
 	
-	<button name='cancel' relative='neg' type='regular' top='28' left='134' def-key='esc'>Cancel</button>
+	<button name='cancel' relative='neg' type='regular' top='28' left='134'>Cancel</button>
 	<button name='okay' relative='neg' type='regular' top='28' left='68'>OK</button>
 </dialog>

rsrc/dialogs/edit-item-shortcut.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<field name='item1' type='uint' top='188' left='73' width='39' height='16'/>
 	<field name='item2' type='uint' top='216' left='73' width='39' height='16'/>
 	<field name='item3' type='uint' top='244' left='73' width='39' height='16'/>
@@ -24,7 +24,7 @@
 	<field name='odds10' type='uint' top='300' left='428' width='39' height='16'/>
 	<field name='ter' type='int' top='113' left='410' width='42' height='17'/>
 	<button name='okay' type='regular' top='334' left='462'>OK</button>
-	<button name='cancel' type='regular' top='334' left='396' def-key='esc'>Cancel</button>
+	<button name='cancel' type='regular' top='334' left='396'>Cancel</button>
 	<button name='right' type='right' top='334' left='73' def-key='right'/>
 	<button name='left' type='left' top='334' left='10' def-key='left'/>
 	<text name='num' top='115' left='211' width=' 46' height='14'/>

rsrc/dialogs/edit-item.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<!--
 	 TODO: Assign numeric types (type = 'int' or 'uint') to fields as appropriate
 	 -->
@@ -18,7 +18,7 @@
 	<field name='weight' top='267' left='366' width='52' height='16'/>
 	<field name='class' top='291' left='366' width='52' height='16'/>
 	<button name='okay' type='regular' top='357' left='509'>OK</button>
-	<button name='cancel' type='regular' top='357' left='434' def-key='esc'>Cancel</button>
+	<button name='cancel' type='regular' top='357' left='434'>Cancel</button>
 	<button name='prev' type='left' top='357' left='13'/>
 	<button name='next' type='right' top='357' left='76'/>
 	<!--

rsrc/dialogs/edit-mabil-general.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' top='18' left='50' width='250' height='17'>Edit Monster Ability:</text>
 	<text top='52' left='10' width='100' height='16'>For monster:</text>
@@ -38,6 +38,6 @@
 	<button name='pick-extra' type='regular' top='271' left='200'>Choose</button>
 	
 	<button name='okay' type='regular' top='300' left='330'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='300' left='265'>Cancel</button>
+	<button name='cancel' type='regular' top='300' left='265'>Cancel</button>
 	<button name='delete' type='regular' top='300' left='10'>Delete</button>
 </dialog>

rsrc/dialogs/edit-mabil-missile.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' top='18' left='50' width='250' height='17'>Edit Monster Ability:</text>
 	<text top='52' left='10' width='100' height='16'>For monster:</text>
@@ -36,6 +36,6 @@
 	<field name='skill' top='274' left='120' width='70' height='16'/>
 	
 	<button name='okay' type='regular' top='300' left='330'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='300' left='265'>Cancel</button>
+	<button name='cancel' type='regular' top='300' left='265'>Cancel</button>
 	<button name='delete' type='regular' top='300' left='10'>Delete</button>
 </dialog>

rsrc/dialogs/edit-mabil-radiate.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' top='18' left='50' width='250' height='17'>Edit Monster Ability:</text>
 	<text top='52' left='10' width='100' height='16'>For monster:</text>
@@ -23,6 +23,6 @@
 	<button name='pick-pat' type='regular' top='187' left='180'>Choose</button>
 	
 	<button name='okay' type='regular' top='216' left='330'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='216' left='265'>Cancel</button>
+	<button name='cancel' type='regular' top='216' left='265'>Cancel</button>
 	<button name='delete' type='regular' top='216' left='10'>Delete</button>
 </dialog>

rsrc/dialogs/edit-mabil-special.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' top='18' left='50' width='250' height='17'>Edit Monster Ability:</text>
 	<text top='52' left='10' width='100' height='16'>For monster:</text>
@@ -24,6 +24,6 @@
 	<field name='extra3' top='218' left='220' width='70' height='16'/>
 	
 	<button name='okay' type='regular' top='244' left='339'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='244' left='274'>Cancel</button>
+	<button name='cancel' type='regular' top='244' left='274'>Cancel</button>
 	<button name='delete' type='regular' top='244' left='10'>Delete</button>
 </dialog>

rsrc/dialogs/edit-mabil-summon.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' top='18' left='50' width='250' height='17'>Edit Monster Ability:</text>
 	<text top='52' left='10' width='100' height='16'>For monster:</text>
@@ -30,6 +30,6 @@
 	<field name='odds' top='218' left='290' width='50' height='16'/>
 	
 	<button name='okay' type='regular' top='244' left='330'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='244' left='265'>Cancel</button>
+	<button name='cancel' type='regular' top='244' left='265'>Cancel</button>
 	<button name='delete' type='regular' top='244' left='10'>Delete</button>
 </dialog>

rsrc/dialogs/edit-monster-abils.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<!--
 	 TODO: Assign numeric types (type = 'int' or 'uint') to fields as appropriate
 	 -->
@@ -67,5 +67,5 @@
 	<field name='snd' top='360' left='270' width='50' height='16'/>
 	<button name='pick-snd' type='regular' top='357' left='330'>Choose</button>
 	<button name='okay' type='regular' top='385' left='572'>OK</button>
-	<button name='cancel' type='regular' top='385' left='506' def-key='esc'>Cancel</button>
+	<button name='cancel' type='regular' top='385' left='506'>Cancel</button>
 </dialog>

rsrc/dialogs/edit-monster.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<!--
 	 TODO: Assign numeric types (type = 'int' or 'uint') to fields as appropriate
 	 -->
@@ -98,7 +98,7 @@
 	<button name='preview' type='regular' top='8' left='600'>Preview</button>
 	<button name='abils' type='large' top='337' left='561'>Abilities</button>
 	<button name='okay' type='regular' top='367' left='600'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='367' left='527'>Cancel</button>
+	<button name='cancel' type='regular' top='367' left='527'>Cancel</button>
 	<button name='left' type='left' top='367' left='335'/>
 	<button name='right' type='right' top='367' left='398'/>
 </dialog>

rsrc/dialogs/edit-outdoor-encounter.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<!-- OK button -->
 	<field name='onmeet' top='189' left='361' width='46' height='16'/>
 	<field name='onwin' top='231' left='361' width='46' height='16'/>
@@ -19,7 +19,7 @@
 	<text name='ally2' framed='true' top='327' left='129' width='145' height='14'/>
 	<text name='ally3' framed='true' top='351' left='129' width='145' height='14'/>
 	<button name='okay' type='regular' top='370' left='489'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='370' left='423'>Cancel</button>
+	<button name='cancel' type='regular' top='370' left='423'>Cancel</button>
 	<button name='left' type='left' def-key='left' top='370' left='11'/>
 	<button name='right' type='right' def-key='right' top='370' left='74'/>
 	<button name='choose-foe1' type='regular' top='130' left='280'>Choose</button>

rsrc/dialogs/edit-personality.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<!-- OK button -->
 	<field name='title' top='42' left='174' width='189' height='16'/>
 	<field name='dunno' top='66' left='254' width='246' height='43'/>
@@ -9,7 +9,7 @@
 	<field name='name' top='215' left='73' width='427' height='67'/>
 	<field name='job' top='308' left='73' width='427' height='67'/>
 	<button name='okay' type='regular' top='381' left='441'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='381' left='375'>Cancel</button>
+	<button name='cancel' type='regular' top='381' left='375'>Cancel</button>
 	<button name='left' type='left' top='381' left='47'/>
 	<button name='right' type='right' top='381' left='110'/>
 	<pict type='dlog' num='16' top='8' left='8'/>

rsrc/dialogs/edit-quest.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' top='8' left='50' width='100' height='17'>Editing Quests</text>
 	<text top='8' left='200' width='100' height='16'>Quest number:</text>
@@ -29,6 +29,6 @@
 	<button name='choose-bank2' type='regular' anchor='bank2' relative='pos pos-in' top='-4' left='8'>Choose</button>
 	<button name='left' type='left' def-key='left' top='358' left='50'/>
 	<button name='right' type='right' def-key='right' top='358' left='115'/>
-	<button name='cancel' type='regular' def-key='esc' top='358' left='322'>Cancel</button>
+	<button name='cancel' type='regular' top='358' left='322'>Cancel</button>
 	<button name='okay' type='regular' top='358' left='387'>OK</button>
 </dialog>

rsrc/dialogs/edit-shop-item.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' top='8' left='50' width='150' height='17'>Editing Shop Entry</text>
 	<text name='item' framed='true' top='50' left='10' width='200' height='16'/>
@@ -11,6 +11,6 @@
 	<text top='75' left='200' width='80' height='16'>0 = infinite</text>
 	<text name='chance-prompt' top='100' left='10' width='100' height='16'>Chance:</text>
 	<field name='chance' type='uint' top='98' left='110' width='80' height='16'/>
-	<button name='cancel' type='regular' def-key='esc' top='120' left='10'>Cancel</button>
+	<button name='cancel' type='regular' top='120' left='10'>Cancel</button>
 	<button name='okay' type='regular' top='120' left='220'>OK</button>
 </dialog>

rsrc/dialogs/edit-shop-special.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' top='8' left='50' width='150' height='17'>Editing Shop Entry</text>
 	<text top='50' left='10' width='100' height='16'>Name:</text>
@@ -18,6 +18,6 @@
 	<button name='pickicon' top='96' left='247' type='regular'>Choose</button>
 	<text top='150' left='10' width='100' height='16'>Description:</text>
 	<field name='descr' top='148' left='110' width='200' height='100'/>
-	<button name='cancel' type='regular' def-key='esc' top='255' left='10'>Cancel</button>
+	<button name='cancel' type='regular' top='255' left='10'>Cancel</button>
 	<button name='okay' type='regular' top='255' left='247'>OK</button>
 </dialog>

rsrc/dialogs/edit-shop.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' top='8' left='50' width='200' height='17'>Editing Shop</text>
 	<text top='8' left='250' width='100' height='16'>Shop number:</text>
@@ -82,6 +82,6 @@
 	
 	<button name='left' type='left' top='430' left='10'/>
 	<button name='right' type='right' top='430' left='75'/>
-	<button name='cancel' type='regular' def-key='esc' top='430' left='345'>Cancel</button>
+	<button name='cancel' type='regular' top='430' left='345'>Cancel</button>
 	<button name='okay' type='regular' top='430' left='410'>OK</button>
 </dialog>

rsrc/dialogs/edit-sign.xml

@@ -1,14 +1,13 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
-	<!-- OK button -->
+<dialog defbtn='okay' escbtn='cancel'>
 	<field name='text' top='34' left='55' width='293' height='98'/>
-	<button name='cancel' type='regular' top='141' left='222' def-key='esc'>Cancel</button>
 	<text top='142' left='7' width='198' height='15'>Use a '|' to indicate a line break.</text>
 	<text name='num' top='8' left='287' width='37' height='14'/>
 	<pict name='pic' type='dlog' num='16' top='8' left='12'/>
 	<text size='large' top='6' left='50' width='138' height='17'>Editing Sign</text>
 	<text top='8' left='197' width='89' height='14'>Sign number:</text>
+	<button name='cancel' type='regular' top='141' left='222'>Cancel</button>
 	<button name='okay' type='regular' top='141' left='288'>OK</button>
 </dialog>

rsrc/dialogs/edit-sounds.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='16' top='6' left='6'/>
 	<text size='large' top='18' left='50' width='250' height='17'>Edit Custom Sounds:</text>
 	
@@ -81,6 +81,6 @@
 	</text>
 	<button name='left' type='left' def-key='left' top='386' left='20'/>
 	<button name='right' type='right' def-key='right' top='386' left='85'/>
-	<button name='cancel' type='regular' def-key='esc' top='386' left='405'>Cancel</button>
+	<button name='cancel' type='regular' top='386' left='405'>Cancel</button>
 	<button name='okay' type='regular' top='386' left='470'>OK</button>
 </dialog>

rsrc/dialogs/edit-special-assign.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<field name='num' type='uint' top='64' left='209' width='75' height='16'/>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<button name='okay' type='regular' top='87' left='311'>OK</button>
@@ -10,5 +10,5 @@
 		Which special node should be called when this space is entered/examined?
 	</text>
 	<text top='64' left='120' width='84' height='16'>Special node:</text>
-	<button name='cancel' type='regular' def-key='esc' top='87' left='246'>Cancel</button>
+	<button name='cancel' type='regular' top='87' left='246'>Cancel</button>
 </dialog>

rsrc/dialogs/edit-special-item.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<field name='name' top='57' left='195' width='252' height='16'/>
 	<field name='descr' top='84' left='195' width='252' height='104'/>
 	<field name='spec' type='int' top='249' left='268' width='87' height='16'/>
@@ -11,7 +11,7 @@
 	<text top='58' left='50' width='132' height='14'>Name of Special Item:</text>
 	<text top='85' left='50' width='118' height='27'>Special Item Description:</text>
 	<text top='243' left='51' width='208' height='28'>Scenario special node to be called when item is used:</text>
-	<button name='cancel' type='regular' top='288' left='332' def-key='esc'>Cancel</button>
+	<button name='cancel' type='regular' top='288' left='332'>Cancel</button>
 	<button name='clear' type='large' top='15' left='329'>Clear Special</button>
 	<button name='edit-spec' type='large' top='246' left='363'>Create/Edit</button>
 	<led name='start-with' state='off' top='198' left='50'>Party starts scen. with item</led>

rsrc/dialogs/edit-special-node.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<!--
 	 TODO: Assign numeric types (type = 'int' or 'uint') to fields as appropriate
 	 -->
@@ -109,6 +109,6 @@
 	
 	
 	<button name='okay' type='regular' top='494' left='522'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='494' left='456'>Cancel</button>
+	<button name='cancel' type='regular' top='494' left='456'>Cancel</button>
 	<button name='back' type='large' top='494' left='10'>Go Back</button>
 </dialog>

rsrc/dialogs/edit-special-text-sm.xml

@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<field name='str1' top='32' left='53' width='293' height='96'/>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' top='6' left='50' width='169' height='16'>Editing Special Message:</text>
 	<button name='okay' type='regular' top='134' left='285'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='134' left='219'>Cancel</button>
+	<button name='cancel' type='regular' top='134' left='219'>Cancel</button>
 </dialog>

rsrc/dialogs/edit-special-text.xml

@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<field name='str1' top='60' left='53' width='293' height='96'/>
 	<field name='str2' top='164' left='53' width='293' height='96'/>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' top='6' left='50' width='169' height='16'>Editing Special Message:</text>
 	<button name='okay' type='regular' top='266' left='285'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='266' left='219'>Cancel</button>
+	<button name='cancel' type='regular' top='266' left='219'>Cancel</button>
 	<text top='24' left='50' width='289' height='28'>
 		This encounter can have one or two pieces of text appear.
 		You can leave one or both blank.

rsrc/dialogs/edit-talk-node.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<!-- OK button -->
 	<field name='who' top='26' left='186' width='64' height='16'/>
 	<field name='key1' top='54' left='165' width='52' height='16' max-chars='4'/>
@@ -15,7 +15,7 @@
 	<field name='str1' top='223' left='72' width='430' height='80'/>
 	<field name='str2' top='328' left='72' width='434' height='80'/>
 	<button name='okay' type='regular' top='415' left='445'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='415' left='380'>Cancel</button>
+	<button name='cancel' type='regular' top='415' left='380'>Cancel</button>
 	<button name='back' type='large' top='415' left='49'>Go Back</button>
 	<button name='new' type='large' top='415' left='155'>Create New</button>
 	<text name='type' framed='true' top='79' left='135' width='160' height='14'/>

rsrc/dialogs/edit-ter-obj.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<tilemap name='map' framed='true' top='12' left='60' rows='4' cols='4'>
 		<pict framed='false' type='ter' num='0' top='0' left='0'/>
@@ -16,6 +16,6 @@
 	<field name='y' type='uint' top='212' left='170' width='40' height='16'/>
 	<text top='242' left='10' width='100' height='16'>Object unique ID:</text>
 	<field name='id' type='uint' top='240' left='120' width='50' height='16'/>
-	<button name='cancel' type='regular' def-key='esc' top='264' left='85'>Cancel</button>
+	<button name='cancel' type='regular' top='264' left='85'>Cancel</button>
 	<button name='okay' type='regular' top='264' left='150'>OK</button>
 </dialog>

rsrc/dialogs/edit-terrain.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done'>
+<dialog defbtn='done' escbtn='cancel'>
 	<!--
 	 TODO: Assign numeric types (type = 'int' or 'uint') to fields as appropriate
 	 -->
@@ -117,7 +117,7 @@
 	<button name='pickflag3' top='431' left='404' type='regular'>Choose</button>
 	
 	<button name='done' type='regular' top='455' left='517'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='455' left='451'>Cancel</button>
+	<button name='cancel' type='regular' top='455' left='451'>Cancel</button>
 	<button name='left' type='left' top='455' left='11'/>
 	<button name='right' type='right' top='455' left='74'/>
 </dialog>

rsrc/dialogs/edit-text.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<field name='text' type='text' top='40' left='55' width='293' height='98'/>
 	<button name='left' type='left' top='147' left='6'/>
 	<button name='right' type='right' top='147' left='69'/>
@@ -9,6 +9,6 @@
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' top='6' left='50' width='138' height='17'>Editing text:</text>
 	<text name='num-lbl' top='8' left='197' width='100' height='14'>Text number:</text>
-	<button name='cancel' type='regular' def-key='esc' top='147' left='214'>Cancel</button>
+	<button name='cancel' type='regular' top='147' left='214'>Cancel</button>
 	<button name='okay' type='regular' top='147' left='279'>OK</button>
 </dialog>

rsrc/dialogs/edit-town-advanced.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' relative='pos pos-in' rel-anchor='prev' top='-2' left='10' width='256' height='17'>Advanced town details</text>
 	<text relative='pos-in pos' rel-anchor='prev' top='2' left='0' width='439' height='40'>
@@ -73,5 +73,5 @@
 	<button name='saved-help' type='help' relative='neg-in pos-in' anchor='saved-items' top='2' left='18'/>
 	
 	<button name='okay' relative='neg' type='regular' top='28' left='68'>OK</button>
-	<button name='cancel' relative='neg' type='regular' def-key='esc' top='28' left='136'>Cancel</button>
+	<button name='cancel' relative='neg' type='regular' top='28' left='136'>Cancel</button>
 </dialog>

rsrc/dialogs/edit-townperson-advanced.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<!--
 	 TODO: Assign numeric types (type = 'int' or 'uint') to fields as appropriate
 	 -->
@@ -36,7 +36,7 @@
 	<button name='editsdf' type='regular' top='358' left='360'>Choose</button>
 	<text size='large' top='182' left='9' width='205' height='17'>Creature and special encs.</text>
 	<button name='okay' type='regular' top='358' left='512'>OK</button>
-	<button name='cancel' type='regular' def-key='esc' top='358' left='438'>Cancel</button>
+	<button name='cancel' type='regular' top='358' left='438'>Cancel</button>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text top='7' left='317' width='126' height='15'>Creature number:</text>
 	<text name='num' top='7' left='454' width='50' height='15'/>

rsrc/dialogs/edit-vehicle.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text name='title' size='large' rel-anchor='prev' relative='pos pos-in' top='-2' left='6' width='256' height='17'>Edit Vehicle</text>
 	
@@ -18,7 +18,7 @@
 
 	<led name='owned' anchor='name-lbl' relative='pos-in pos' top='11' left='10'>Not Party Property</led>
 	
-	<button name='cancel' rel-anchor='prev' relative='neg pos' type='regular' def-key='esc' top='15' left='10'>Cancel</button>
+	<button name='cancel' rel-anchor='prev' relative='neg pos' type='regular' top='15' left='10'>Cancel</button>
 	<button name='del' rel-anchor='prev' relative='pos pos-in' type='regular' top='0' left='0'>Delete</button>
 	<button name='okay' rel-anchor='prev' relative='pos pos-in' type='regular' top='0' left='100'>OK</button>
 </dialog>

rsrc/dialogs/get-num.xml

@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<field name="number" type='int' top='33' left='90' width='75' height='16'/>
 	<button name='choose' type='regular' relative='pos neg' rel-anchor='prev' top='3' left='5'>Choose</button>
 	<pict type='dlog' num='2' top='8' left='8'/>
 	<text name='prompt' size='large' top='8' left='49' width='193' height='16'>How many?</text>
-	<button name='cancel' type='regular' top='63' left='70' def-key='esc'>Cancel</button>
+	<button name='cancel' type='regular' top='63' left='70'>Cancel</button>
 	<button name='okay' type='regular' top='63' left='141'>OK</button>
 </dialog>

rsrc/dialogs/graphic-sheets.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='16' top='6' left='6'/>
 	<text size='large' top='18' left='50' width='250' height='17'>Edit Custom Graphics:</text>
 	<text top='36' left='152' width='80' height='16'>Sheet Number:</text>
@@ -15,6 +15,6 @@
 	<button name='left' type='left' def-key='left' top='426' left='20'/>
 	<button name='right' type='right' def-key='right' top='426' left='85'/>
 	<button name='new' type='regular' def-key='ctrl n' top='426' left='162'>New</button>
-	<button name='cancel' type='regular' def-key='esc' top='426' left='239'>Cancel</button>
+	<button name='cancel' type='regular' top='426' left='239'>Cancel</button>
 	<button name='okay' type='regular' top='426' left='304'>OK</button>
 </dialog>

rsrc/dialogs/graphic-types.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='16' top='6' left='6'/>
 	<text size='large' top='18' left='50' width='250' height='17'>Classify Custom Graphics:</text>
 	<text top='18' left='372' width='80' height='16'>First Graphic:</text>
@@ -227,6 +227,6 @@
 	</text>
 	<button name='left' type='left' def-key='left' top='454' left='30'/>
 	<button name='right' type='right' def-key='right' top='454' left='95'/>
-	<button name='cancel' type='regular' def-key='esc' top='454' left='384'>Cancel</button>
+	<button name='cancel' type='regular' top='454' left='384'>Cancel</button>
 	<button name='okay' type='regular' top='454' left='449'>OK</button>
 </dialog>

rsrc/dialogs/have-no-pics.xml

@@ -8,6 +8,6 @@
 		Would you like to create a new empty sheet?
 		You can then paste your graphics in or import them from a file.
 	</text>
-	<button name='cancel' type='regular' top='61' left='234'>Cancel</button>
-	<button name='new' type='large' top='61' left='128'>Create New</button>
+	<button name='cancel' type='regular' top='61' left='128'>Cancel</button>
+	<button name='new' type='large' top='61' left='198'>Create New</button>
 </dialog>

rsrc/dialogs/have-only-full-pics.xml

@@ -10,6 +10,6 @@
 		Would you like to create a blank sheet #0?
 		You can then paste in your graphics or import from a file.
 	</text>
-	<button name='cancel' type='regular' top='101' left='234'>Cancel</button>
-	<button name='new' type='large' top='101' left='128'>Create New</button>
+	<button name='cancel' type='regular' top='101' left='128'>Cancel</button>
+	<button name='new' type='large' top='101' left='198'>Create New</button>
 </dialog>

rsrc/dialogs/help-combat.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='okay'>
 	<pict type='dlog' num='24' top='9' left='9'/>
 	<text top='9' left='53' width='322' height='16'>BLADES OF EXILE HELP: COMBAT COMMANDS</text>
 	<text top='26' left='66' width='473' height='49'>

rsrc/dialogs/help-contest.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='okay'>
 	<!--
 	 TODO: This dialog has out-of-date information
 	 -->

rsrc/dialogs/help-debug.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='okay'>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text top='8' left='50' width='400' height='16'>DEBUG MODE HELP</text>
 	<text top='22' left='50' width='400' height='64'>

rsrc/dialogs/help-distributing.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='okay'>
 	<!--
 	 TODO: This dialog contains out-of-date information
 	 -->

rsrc/dialogs/help-editing.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='okay'>
 	<!--
 	 TODO: This dialog has out-of-date information in it
 	 -->