Fix cdGetMaxTrack for download edition of Daiakuji

It should return the maximum index of the BGM archive. Fixes #43.
Version 2.10.0
2026-09-22 22:48:08 +03:00 · 2023-12-09 14:57:01 +09:00 · 2023-12-09 13:08:30 +09:00 · 2023-12-09 11:35:40 +09:00 · 2023-12-08 08:57:56 +09:00 · 2023-12-08 08:35:45 +09:00
61 changed files with 1136 additions and 850 deletions
@@ -15,7 +15,7 @@ jobs:
      run: |
        cd android
        echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > keystore.jks
-        ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk-bundle ./gradlew assembleRelease
+        JAVA_HOME=$JAVA_HOME_17_X64 ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk-bundle ./gradlew assembleRelease
      env:
        KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
        KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
@@ -8,7 +8,7 @@ jobs:
      matrix:
        include:
          - { sys: MINGW32, installer: "xsystem35-32bit" }
-          - { sys: MINGW64, installer: "xsystem35-64bit" }
+          - { sys: UCRT64, installer: "xsystem35-64bit" }
    defaults:
      run:
        shell: msys2 {0}
@@ -19,7 +19,6 @@ jobs:
      uses: msys2/setup-msys2@v2
      with:
        msystem: ${{ matrix.sys }}
-        update: true
        pacboy: >-
          gcc:p
          cmake:p
@@ -30,7 +29,7 @@ jobs:
          libwebp:p
          cjson:p
          nsis:p
-          ntldd-git:p
+          ntldd:p

    - name: Checkout
      uses: actions/checkout@v3
@@ -3,22 +3,22 @@
 This is a multi-platform port of `xsystem35`, a free implementation of
 AliceSoft's System 3.x game engine.

-## Compatiblity
+## Compatibility

 See the [game compatibility table](game_compatibility.md) for a list of games
-that can be played on xsystem35-sdl2.
+that can be played with xsystem35-sdl2.

 ## Unique Features

-In addition to the original System 3.x's functionalities, xsystem35-sdl2 has
-the following features.
+In addition to the original System 3.x functionalities, xsystem35-sdl2 offers
+the following features:

-### Playing audio files as fake CD music
+### Playing Audio Files as Virtual CD Music

-Many System 3.x games had music as audio tracks on the CD-ROM. Xsystem35 can
-play music from audio files instead, to avoid the hassle of inserting CDs. To
-use ripped audio files, create a file named `playlist.txt` in the game
-directory, and enter the paths to your tracks, one per line. For example:
+Many System 3.x games feature music as audio tracks on the CD-ROM. xsystem35
+can play music from audio files, eliminating the need to insert CDs. To use
+ripped audio files, create a file named `playlist.txt` in the game directory
+and list the paths to your tracks, one per line. For example:

 ```
 # The first line is not used
@@ -27,89 +27,109 @@ BGM/track03.mp3
 ...
 ```

-The first line is not used, because track 1 of game CD is usually a data track.
+The first line is not used because the first track on a game CD is typically a
+data track.

-### Unicode translation support
+Some games have integrated music as MIDI. In such cases, the music won't play
+using the virtual CD feature. If you encounter a `Cannot load MIDI` error
+message, you might need to set the `SDL_SOUNDFONTS` environment variable to
+point to an `.sf2` file. For example:

-The original System 3.x only supported Shift_JIS (a Japanese character
-encoding), but xsystem35 supports Unicode and is able to run games translated
-into languages other than Japanese and English.
+```
+SDL_SOUNDFONTS=/usr/share/soundfonts/GeneralUser.sf2 xsystem35
+```

-See [xsys35c](https://github.com/kichikuou/xsys35c)'s document for how to
-build a game with Unicode mode.
+### Unicode Translation Support
+
+While the original System 3.x only supported Shift_JIS (a Japanese character
+encoding), xsystem35 supports Unicode and can run games translated into
+languages other than Japanese and English.
+
+For instructions on how to build a game with Unicode support, see the
+[xsys35c](https://github.com/kichikuou/xsys35c) documentation.

 ### Debugging

-Xsystem35 has a built-in debugger that allows you to step through the game and
-examine / modify variables in the game. There are two ways to use the debugger:
+xsystem35 features a built-in debugger that allows you to step through the game
+and examine or modify game variables. There are two ways to use the debugger:

 - Through [Visual Studio Code](https://code.visualstudio.com/) (recommended):
  The [vscode-system3x](https://github.com/kichikuou/vscode-system3x) extension
-  provides graphical debugging interface for System 3.x.
- Using CUI debugger: Running xsystem35 with `-debug` option will start the
-  debugger with console interface. Type `help` to see a list of available
-  commands.
+  provides a graphical debugging interface for System 3.x.
+- Using the CLI Debugger: Running xsystem35 with the `-debug` option will
+  launch the debugger with a console interface. Type `help` to see a list of
+  available commands.

-## Installing
+## Installation

 Prebuilt packages for Windows and Android can be downloaded from the
 [Releases](https://github.com/kichikuou/xsystem35-sdl2/releases) page. For
-other platforms, see the [Building](#building) section.
+other platforms, refer to the [Building](#building) section.

 ## Running
 ### Windows

-Execute `xsytem35`, and it will show a dialog to select a folder. Select the
-game folder (where the ALD files are located).
+Execute `xsystem35`, and a dialog will appear for you to select a folder.
+Choose the game folder (where the ALD files are located).

 ### Android

-See [android/README.md](https://github.com/kichikuou/xsystem35-sdl2/blob/master/android/README.md#use).
+See [android/README.md](android/README.md#use).

 ### Other Platforms

 Run xsystem35 from within the game directory.

-    cd /path/to/game_directory
-    xsystem35
+```bash
+$ cd /path/to/game_directory
+$ xsystem35
+```

 ## Building
 ### Linux (Debian / Ubuntu)

-    $ sudo apt install build-essential cmake libgtk-3-dev libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libwebp-dev libcjson-dev
-    $ mkdir -p out/debug
-    $ cd out/debug
-    $ cmake -DCMAKE_BUILD_TYPE=Debug ../../
-    $ make && make install
+```bash
+$ sudo apt install build-essential cmake libgtk-3-dev libsdl2-dev libsdl2-ttf-dev libsdl2-mixer-dev libwebp-dev libcjson-dev
+$ mkdir -p out/debug
+$ cd out/debug
+$ cmake -DCMAKE_BUILD_TYPE=Debug ../../
+$ make && make install
+```

 ### MacOS

-[Homebrew](https://brew.sh/index_ja) is needed.
+[Homebrew](https://brew.sh/) is required.

-    $ brew install cmake pkg-config sdl2 sdl2_mixer sdl2_ttf webp cjson
-    $ mkdir -p out/debug
-    $ cd out/debug
-    $ cmake -DCMAKE_BUILD_TYPE=Debug ../../
-    $ make && make install
+```bash
+$ brew install cmake pkg-config sdl2 sdl2_mixer sdl2_ttf webp cjson
+$ mkdir -p out/debug
+$ cd out/debug
+$ cmake -DCMAKE_BUILD_TYPE=Debug ../../
+$ make && make install
+```

 ### Windows

-[MSYS2](https://www.msys2.org) is needed.
+[MSYS2](https://www.msys2.org) is required.

-    $ pacman -S cmake mingw-w64-x86_64-cmake mingw-w64-x86_64-SDL2 mingw-w64-x86_64-SDL2_ttf mingw-w64-x86_64-SDL2_mixer mingw-w64-x86_64-libwebp mingw-w64-x86_64-cjson
-    $ mkdir -p out/debug
-    $ cd out/debug
-    $ cmake -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug ../../
-    $ make
+```bash
+$ pacman -S cmake mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-SDL2 mingw-w64-ucrt-x86_64-SDL2_ttf mingw-w64-ucrt-x86_64-SDL2_mixer mingw-w64-ucrt-x86_64-libwebp mingw-w64-ucrt-x86_64-cjson
+$ mkdir -p out/debug
+$ cd out/debug
+$ cmake -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug ../../
+$ make
+```

 ### Emscripten

-    $ mkdir -p out/wasm
-    $ cd out/wasm
-    $ emcmake cmake -DCMAKE_BUILD_TYPE=MinSizeRel ../../
-    $ make
+```bash
+$ mkdir -p out/wasm
+$ cd out/wasm
+$ emcmake cmake -DCMAKE_BUILD_TYPE=MinSizeRel ../../
+$ make
+```

-To use the generated binary, checkout
+To use the generated binary, check out
 [Kichikuou on Web](https://github.com/kichikuou/web) and copy `out/xsystem35.*`
 into its `docs` directory.

@@ -1,7 +1,8 @@
 # xsystem35 for Android

 ## Download
-Prebuilt APKs are [here](https://github.com/kichikuou/xsystem35-sdl2/releases).
+You can download prebuilt APKs
+[here](https://github.com/kichikuou/xsystem35-sdl2/releases).

 ## Build
 Prerequisites:
@@ -11,10 +12,10 @@ Prerequisites:
 ### Using Android Studio
 Open this directory as an Android Studio project.

-### Command line build
-Configure environment variables and run the `gradlew` script in this folder.
+### Command Line Build
+Set environment variables and run the `gradlew` script in this directory.

-Example build instructions (for Debian bullseye):
+Example build instructions (for Debian bookworm):
 ```sh
 # Install necessary packages
 sudo apt install git wget unzip default-jdk-headless ninja-build
@@ -22,38 +23,51 @@ sudo apt install git wget unzip default-jdk-headless ninja-build
 # Install Android SDK / NDK
 export ANDROID_SDK_ROOT=$HOME/android-sdk
 mkdir -p $ANDROID_SDK_ROOT/cmdline-tools
-wget https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip
-unzip commandlinetools-linux-8512546_latest.zip -d $ANDROID_SDK_ROOT/cmdline-tools
+wget https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip
+unzip commandlinetools-linux-10406996_latest.zip -d $ANDROID_SDK_ROOT/cmdline-tools
 mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/tools
-yes |$ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager --licenses
+yes | $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager --licenses
 $ANDROID_SDK_ROOT/cmdline-tools/tools/bin/sdkmanager ndk-bundle 'cmake;3.22.1'
 export ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk-bundle

-# Check out and build xsystem35
+# Clone and build xsystem35
 git clone https://github.com/kichikuou/xsystem35-sdl2.git
 cd xsystem35-sdl2/android
 ./gradlew build  # or ./gradlew installDebug if you have a connected device
 ```

-## Use
+## Usage
 ### Basic Usage
-1. Create a ZIP file containing all the game files and BGM files (see [below](#preparing-a-zip) for details), and transfer it to your device.
-2. Open the app. A list of installed games is displayed. Since nothing has been installed yet, only the "Install from ZIP" button is displayed. Tap it.
-3. Select the ZIP file you created in 1.
-4. The game starts. To simulate right-click, tap the black bars on the left/right or top/bottom of the screen.
+1. Create a ZIP file containing all the game files and BGM files (see
+   [below](#preparing-a-zip) for details), and transfer it to your device.
+2. Open the app. A list of installed games will be displayed. Since no games
+   have been installed yet, only the "Install from ZIP" button will be visible.
+   Tap it.
+3. Select the ZIP file you created in step 1.
+4. The game will start. To simulate a right-click, tap the black bars on either
+   the left or right, or top or bottom of the screen.

 ### Preparing a ZIP
- Include all files in the `GAMEDATA` folder (`.ALD` files and others). `.EXE` and `.DLL` are not really needed, but you can include them as well.
- Music files (`.mp3`, `.ogg` or `.wav`) whose file names end with a number are recognized as BGM files. For example:
+- Include all files from the `GAMEDATA` folder (such as `.ALD` files and
+  others). `.EXE` and `.DLL` files are not necessary, but you can include them
+  if you want.
+- Music files (`.mp3`, `.ogg`, or `.wav`) whose filenames end with a number
+  will be recognized as BGM files. For example:
  - `Track2.mp3`
  - `15.ogg`
-  - `rance4_03.wav` (This shouldn't be `rance403.wav`, because it would be treated as the 403rd track)
+  - `rance4_03.wav` (Note: The filename shouldn't be `rance403.wav`, as it
+    would be treated as the 403rd track.)

-Note: This form of ZIP can be used in [Kichikuou on Web](http://kichikuou.github.io/web/) as well.
+Note: This ZIP format is also compatible with
+[Kichikuou on Web](http://kichikuou.github.io/web/).

 ### Miscellaneous
- You can export / import saved files using the option menu of the game list.
- To uninstall a game, long-tap the title in the game list.
+- You can export or import save files via the game list's option menu.
+- To uninstall a game, long-tap its title in the game list.

 ## Known Issues
- Android versions older than 7.0 cannot handle ZIPs containing Shift-JIS file names. This is the case with some ZIPs distributed on [retroc.net](http://retropc.net/alice/). If you get the error "This type of ZIP is not supported.", unzip the ZIP file on your PC and re-archive it with a modern ZIP creation software.
+- Android versions older than 7.0 cannot handle ZIP files containing Shift-JIS
+  filenames. This issue occurs with some ZIP files distributed on
+  [retroc.net](http://retropc.net/alice/). If you encounter the error message
+  "This type of ZIP is not supported," unzip the file on your PC and re-archive
+  it using modern ZIP creation software.
@@ -9,18 +9,18 @@ else {
 apply plugin: 'kotlin-android'

 android {
-    compileSdkVersion 31
+    if (buildAsApplication) {
+        namespace "io.github.kichikuou.xsystem35"
+    }
+    compileSdkVersion 34
    defaultConfig {
-        if (buildAsApplication) {
-            applicationId "io.github.kichikuou.xsystem35"
-        }
        minSdkVersion 19
-        targetSdkVersion 31
-        versionCode 14
-        versionName "2.9.0" + gitRevision()
+        targetSdkVersion 34
+        versionCode 16
+        versionName "2.10.0" + gitRevision()
        externalNativeBuild {
            cmake {
-                arguments "-DANDROID_APP_PLATFORM=android-16", "-DANDROID_STL=c++_static"
+                arguments "-DANDROID_APP_PLATFORM=android-19", "-DANDROID_STL=c++_static"
                // abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
                abiFilters 'armeabi-v7a', 'arm64-v8a'
            }
@@ -38,7 +38,9 @@ android {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
+            if (rootProject.file('keystore.jks').exists()) {
+                signingConfig signingConfigs.release
+            }
        }
    }
    applicationVariants.all { variant ->
@@ -62,10 +64,10 @@ android {
        }
       
    }
-    lintOptions {
+    lint {
        abortOnError false
    }
-    
+
    if (buildAsLibrary) {
        libraryVariants.all { variant ->
            variant.outputs.each { output ->
@@ -6,8 +6,8 @@ set(PROJECT_ROOT_DIR ../../..)
 include(FetchContent)
 FetchContent_Declare(
  SDL
-  URL https://github.com/libsdl-org/SDL/releases/download/release-2.26.1/SDL2-2.26.1.tar.gz
-  URL_HASH SHA1=08a8cec21ffcebf44e4633a786d594a7811100d2
+  URL https://github.com/libsdl-org/SDL/releases/download/release-2.28.5/SDL2-2.28.5.tar.gz
+  URL_HASH SHA1=50af6b564890d702e57e2a72d6429b43778ed29a
 )
 FetchContent_Declare(
  SDL_ttf
@@ -4,7 +4,6 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
-    package="io.github.kichikuou.xsystem35"
    android:installLocation="auto">

    <!-- OpenGL ES 2.0 -->
@@ -186,7 +186,7 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
    // Because on Chromebooks we show up as a dual-mode device, it will attempt to connect TRANSPORT_AUTO, which will use TRANSPORT_BREDR instead
    // of TRANSPORT_LE.  Let's force ourselves to connect low energy.
    private BluetoothGatt connectGatt(boolean managed) {
-        if (Build.VERSION.SDK_INT >= 23) {
+        if (Build.VERSION.SDK_INT >= 23 /* Android 6.0 (M) */) {
            try {
                return mDevice.connectGatt(mManager.getContext(), managed, this, TRANSPORT_LE);
            } catch (Exception e) {
@@ -429,7 +429,7 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
                    }
                });
            }
-        } 
+        }
        else if (newState == 0) {
            mIsConnected = false;
        }
@@ -170,7 +170,7 @@ public class HIDDeviceManager {
                Log.i(TAG,"  Interface protocol: " + mUsbInterface.getInterfaceProtocol());
                Log.i(TAG,"  Endpoint count: " + mUsbInterface.getEndpointCount());

-                // Get endpoint details 
+                // Get endpoint details
                for (int epi = 0; epi < mUsbInterface.getEndpointCount(); epi++)
                {
                    UsbEndpoint mEndpoint = mUsbInterface.getEndpoint(epi);
@@ -251,6 +251,8 @@ public class HIDDeviceManager {
            0x20d6, // PowerA
            0x24c6, // PowerA
            0x2c22, // Qanba
+            0x2dc8, // 8BitDo
+            0x9886, // ASTRO Gaming
        };

        if (usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC &&
@@ -271,14 +273,17 @@ public class HIDDeviceManager {
        final int XB1_IFACE_SUBCLASS = 71;
        final int XB1_IFACE_PROTOCOL = 208;
        final int[] SUPPORTED_VENDORS = {
+            0x03f0, // HP
+            0x044f, // Thrustmaster
            0x045e, // Microsoft
            0x0738, // Mad Catz
            0x0e6f, // PDP
            0x0f0d, // Hori
+            0x10f5, // Turtle Beach
            0x1532, // Razer Wildcat
            0x20d6, // PowerA
            0x24c6, // PowerA
-            0x2dc8, /* 8BitDo */
+            0x2dc8, // 8BitDo
            0x2e24, // Hyperkin
        };

@@ -353,13 +358,13 @@ public class HIDDeviceManager {
    private void initializeBluetooth() {
        Log.d(TAG, "Initializing Bluetooth");

-        if (Build.VERSION.SDK_INT <= 30 &&
+        if (Build.VERSION.SDK_INT <= 30 /* Android 11.0 (R) */ &&
            mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) {
            Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH");
            return;
        }

-        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE) || (Build.VERSION.SDK_INT < 18)) {
+        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE) || (Build.VERSION.SDK_INT < 18 /* Android 4.3 (JELLY_BEAN_MR2) */)) {
            Log.d(TAG, "Couldn't initialize Bluetooth, this version of Android does not support Bluetooth LE");
            return;
        }
@@ -524,7 +529,7 @@ public class HIDDeviceManager {
            for (HIDDevice device : mDevicesById.values()) {
                device.setFrozen(frozen);
            }
-        }        
+        }
    }

    //////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -573,7 +578,7 @@ public class HIDDeviceManager {
            try {
                final int FLAG_MUTABLE = 0x02000000; // PendingIntent.FLAG_MUTABLE, but don't require SDK 31
                int flags;
-                if (Build.VERSION.SDK_INT >= 31) {
+                if (Build.VERSION.SDK_INT >= 31 /* Android 12.0 (S) */) {
                    flags = FLAG_MUTABLE;
                } else {
                    flags = 0;
@@ -52,7 +52,7 @@ class HIDDeviceUSB implements HIDDevice {
    @Override
    public String getSerialNumber() {
        String result = null;
-        if (Build.VERSION.SDK_INT >= 21) {
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
            try {
                result = mDevice.getSerialNumber();
            }
@@ -74,7 +74,7 @@ class HIDDeviceUSB implements HIDDevice {
    @Override
    public String getManufacturerName() {
        String result = null;
-        if (Build.VERSION.SDK_INT >= 21) {
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
            result = mDevice.getManufacturerName();
        }
        if (result == null) {
@@ -86,7 +86,7 @@ class HIDDeviceUSB implements HIDDevice {
    @Override
    public String getProductName() {
        String result = null;
-        if (Build.VERSION.SDK_INT >= 21) {
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
            result = mDevice.getProductName();
        }
        if (result == null) {
@@ -29,6 +29,7 @@ public class SDL {

    // This function stores the current activity (SDL or not)
    public static void setContext(Context context) {
+        SDLAudioManager.setContext(context);
        mContext = context;
    }

@@ -60,8 +60,8 @@ import java.util.Locale;
 public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener {
    private static final String TAG = "SDL";
    private static final int SDL_MAJOR_VERSION = 2;
-    private static final int SDL_MINOR_VERSION = 26;
-    private static final int SDL_MICRO_VERSION = 1;
+    private static final int SDL_MINOR_VERSION = 28;
+    private static final int SDL_MICRO_VERSION = 5;
 /*
    // Display InputType.SOURCE/CLASS of events and devices
    //
@@ -93,7 +93,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh

        s2 = s_copy & InputDevice.SOURCE_ANY; // keep source only, no class;

-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        if (Build.VERSION.SDK_INT >= 23) {
            tst = InputDevice.SOURCE_BLUETOOTH_STYLUS;
            if ((s & tst) == tst) src += " BLUETOOTH_STYLUS";
            s2 &= ~tst;
@@ -107,7 +107,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
        if ((s & tst) == tst) src += " GAMEPAD";
        s2 &= ~tst;

-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (Build.VERSION.SDK_INT >= 21) {
            tst = InputDevice.SOURCE_HDMI;
            if ((s & tst) == tst) src += " HDMI";
            s2 &= ~tst;
@@ -146,7 +146,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
        if ((s & tst) == tst) src += " TOUCHSCREEN";
        s2 &= ~tst;

-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+        if (Build.VERSION.SDK_INT >= 18) {
            tst = InputDevice.SOURCE_TOUCH_NAVIGATION;
            if ((s & tst) == tst) src += " TOUCH_NAVIGATION";
            s2 &= ~tst;
@@ -170,7 +170,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
 */

    public static boolean mIsResumedCalled, mHasFocus;
-    public static final boolean mHasMultiWindow = (Build.VERSION.SDK_INT >= 24);
+    public static final boolean mHasMultiWindow = (Build.VERSION.SDK_INT >= 24  /* Android 7.0 (N) */);

    // Cursor types
    // private static final int SDL_SYSTEM_CURSOR_NONE = -1;
@@ -224,9 +224,9 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh

    protected static SDLGenericMotionListener_API12 getMotionListener() {
        if (mMotionListener == null) {
-            if (Build.VERSION.SDK_INT >= 26) {
+            if (Build.VERSION.SDK_INT >= 26 /* Android 8.0 (O) */) {
                mMotionListener = new SDLGenericMotionListener_API26();
-            } else if (Build.VERSION.SDK_INT >= 24) {
+            } else if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
                mMotionListener = new SDLGenericMotionListener_API24();
            } else {
                mMotionListener = new SDLGenericMotionListener_API12();
@@ -393,7 +393,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
        mHIDDeviceManager = HIDDeviceManager.acquire(this);

        // Set up the surface
-        mSurface = createSDLSurface(getApplication());
+        mSurface = createSDLSurface(this);

        mLayout = new RelativeLayout(this);
        mLayout.addView(mSurface);
@@ -404,7 +404,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
        SDLActivity.onNativeOrientationChanged(mCurrentOrientation);

        try {
-            if (Build.VERSION.SDK_INT < 24) {
+            if (Build.VERSION.SDK_INT < 24 /* Android 7.0 (N) */) {
                mCurrentLocale = getContext().getResources().getConfiguration().locale;
            } else {
                mCurrentLocale = getContext().getResources().getConfiguration().getLocales().get(0);
@@ -588,6 +588,8 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
            mHIDDeviceManager = null;
        }

+        SDLAudioManager.release(this);
+
        if (SDLActivity.mBrokenLibraries) {
           super.onDestroy();
           return;
@@ -766,7 +768,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
                }
                break;
            case COMMAND_CHANGE_WINDOW_STYLE:
-                if (Build.VERSION.SDK_INT >= 19) {
+                if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
                    if (context instanceof Activity) {
                        Window window = ((Activity) context).getWindow();
                        if (window != null) {
@@ -841,7 +843,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
        msg.obj = data;
        boolean result = commandHandler.sendMessage(msg);

-        if (Build.VERSION.SDK_INT >= 19) {
+        if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
            if (command == COMMAND_CHANGE_WINDOW_STYLE) {
                // Ensure we don't return until the resize has actually happened,
                // or 500ms have passed.
@@ -969,15 +971,18 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
        /* If set, hint "explicitly controls which UI orientations are allowed". */
        if (hint.contains("LandscapeRight") && hint.contains("LandscapeLeft")) {
            orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
-        } else if (hint.contains("LandscapeRight")) {
-            orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
        } else if (hint.contains("LandscapeLeft")) {
+            orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+        } else if (hint.contains("LandscapeRight")) {
            orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE;
        }

-        if (hint.contains("Portrait") && hint.contains("PortraitUpsideDown")) {
+        /* exact match to 'Portrait' to distinguish with PortraitUpsideDown */
+        boolean contains_Portrait = hint.contains("Portrait ") || hint.endsWith("Portrait");
+
+        if (contains_Portrait && hint.contains("PortraitUpsideDown")) {
            orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT;
-        } else if (hint.contains("Portrait")) {
+        } else if (contains_Portrait) {
            orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
        } else if (hint.contains("PortraitUpsideDown")) {
            orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT;
@@ -1090,7 +1095,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
        // thus SDK version 27.  If we are in DeX mode and not API 27 or higher, as a result,
        // we should stick to relative mode.
        //
-        if ((Build.VERSION.SDK_INT < 27) && isDeXMode()) {
+        if (Build.VERSION.SDK_INT < 27 /* Android 8.1 (O_MR1) */ && isDeXMode()) {
            return false;
        }

@@ -1180,7 +1185,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     * This method is called by SDL using JNI.
     */
    public static boolean isDeXMode() {
-        if (Build.VERSION.SDK_INT < 24) {
+        if (Build.VERSION.SDK_INT < 24 /* Android 7.0 (N) */) {
            return false;
        }
        try {
@@ -1340,23 +1345,6 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
            }
        }

-        if ((source & InputDevice.SOURCE_KEYBOARD) == InputDevice.SOURCE_KEYBOARD) {
-            if (event.getAction() == KeyEvent.ACTION_DOWN) {
-                if (isTextInputEvent(event)) {
-                    if (ic != null) {
-                        ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
-                    } else {
-                        SDLInputConnection.nativeCommitText(String.valueOf((char) event.getUnicodeChar()), 1);
-                    }
-                }
-                onNativeKeyDown(keyCode);
-                return true;
-            } else if (event.getAction() == KeyEvent.ACTION_UP) {
-                onNativeKeyUp(keyCode);
-                return true;
-            }
-        }
-
        if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) {
            // on some devices key events are sent for mouse BUTTON_BACK/FORWARD presses
            // they are ignored here because sending them as mouse input to SDL is messy
@@ -1371,6 +1359,21 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
            }
        }

+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+            if (isTextInputEvent(event)) {
+                if (ic != null) {
+                    ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
+                } else {
+                    SDLInputConnection.nativeCommitText(String.valueOf((char) event.getUnicodeChar()), 1);
+                }
+            }
+            onNativeKeyDown(keyCode);
+            return true;
+        } else if (event.getAction() == KeyEvent.ACTION_UP) {
+            onNativeKeyUp(keyCode);
+            return true;
+        }
+
        return false;
    }

@@ -1617,7 +1620,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
    private final Runnable rehideSystemUi = new Runnable() {
        @Override
        public void run() {
-            if (Build.VERSION.SDK_INT >= 19) {
+            if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
                int flags = View.SYSTEM_UI_FLAG_FULLSCREEN |
                        View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
                        View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY |
@@ -1670,7 +1673,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
        Bitmap bitmap = Bitmap.createBitmap(colors, width, height, Bitmap.Config.ARGB_8888);
        ++mLastCursorID;

-        if (Build.VERSION.SDK_INT >= 24) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
            try {
                mCursors.put(mLastCursorID, PointerIcon.create(bitmap, hotSpotX, hotSpotY));
            } catch (Exception e) {
@@ -1686,7 +1689,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     * This method is called by SDL using JNI.
     */
    public static void destroyCustomCursor(int cursorID) {
-        if (Build.VERSION.SDK_INT >= 24) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
            try {
                mCursors.remove(cursorID);
            } catch (Exception e) {
@@ -1700,7 +1703,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     */
    public static boolean setCustomCursor(int cursorID) {

-        if (Build.VERSION.SDK_INT >= 24) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
            try {
                mSurface.setPointerIcon(mCursors.get(cursorID));
            } catch (Exception e) {
@@ -1755,7 +1758,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
            cursor_type = 1002; //PointerIcon.TYPE_HAND;
            break;
        }
-        if (Build.VERSION.SDK_INT >= 24) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
            try {
                mSurface.setPointerIcon(PointerIcon.getSystemIcon(SDL.getContext(), cursor_type));
            } catch (Exception e) {
@@ -1769,7 +1772,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     * This method is called by SDL using JNI.
     */
    public static void requestPermission(String permission, int requestCode) {
-        if (Build.VERSION.SDK_INT < 23) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
            nativePermissionResult(requestCode, true);
            return;
        }
@@ -1798,7 +1801,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
            i.setData(Uri.parse(url));

            int flags = Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
-            if (Build.VERSION.SDK_INT >= 21) {
+            if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
                flags |= Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
            } else {
                flags |= Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET;
@@ -2002,6 +2005,18 @@ class SDLInputConnection extends BaseInputConnection {

    @Override
    public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+        if (Build.VERSION.SDK_INT <= 29 /* Android 10.0 (Q) */) {
+            // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions>/14560344/android-backspace-in-webview-baseinputconnection
+            // and https://bugzilla.libsdl.org/show_bug.cgi?id=2265
+            if (beforeLength > 0 && afterLength == 0) {
+                // backspace(s)
+                while (beforeLength-- > 0) {
+                    nativeGenerateScancodeForUnichar('\b');
+                }
+                return true;
+           }
+        }
+
        if (!super.deleteSurroundingText(beforeLength, afterLength)) {
            return false;
        }
@@ -1,5 +1,8 @@
 package org.libsdl.app;

+import android.content.Context;
+import android.media.AudioDeviceCallback;
+import android.media.AudioDeviceInfo;
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioRecord;
@@ -8,34 +11,67 @@ import android.media.MediaRecorder;
 import android.os.Build;
 import android.util.Log;

-public class SDLAudioManager
-{
+import java.util.Arrays;
+
+public class SDLAudioManager {
    protected static final String TAG = "SDLAudio";

    protected static AudioTrack mAudioTrack;
    protected static AudioRecord mAudioRecord;
+    protected static Context mContext;
+
+    private static final int[] NO_DEVICES = {};
+
+    private static AudioDeviceCallback mAudioDeviceCallback;

    public static void initialize() {
        mAudioTrack = null;
        mAudioRecord = null;
+        mAudioDeviceCallback = null;
+
+        if(Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */)
+        {
+            mAudioDeviceCallback = new AudioDeviceCallback() {
+                @Override
+                public void onAudioDevicesAdded(AudioDeviceInfo[] addedDevices) {
+                    Arrays.stream(addedDevices).forEach(deviceInfo -> addAudioDevice(deviceInfo.isSink(), deviceInfo.getId()));
+                }
+
+                @Override
+                public void onAudioDevicesRemoved(AudioDeviceInfo[] removedDevices) {
+                    Arrays.stream(removedDevices).forEach(deviceInfo -> removeAudioDevice(deviceInfo.isSink(), deviceInfo.getId()));
+                }
+            };
+        }
+    }
+
+    public static void setContext(Context context) {
+        mContext = context;
+        if (context != null) {
+            registerAudioDeviceCallback();
+        }
+    }
+
+    public static void release(Context context) {
+        unregisterAudioDeviceCallback(context);
    }

    // Audio

    protected static String getAudioFormatString(int audioFormat) {
        switch (audioFormat) {
-        case AudioFormat.ENCODING_PCM_8BIT:
-            return "8-bit";
-        case AudioFormat.ENCODING_PCM_16BIT:
-            return "16-bit";
-        case AudioFormat.ENCODING_PCM_FLOAT:
-            return "float";
-        default:
-            return Integer.toString(audioFormat);
+            case AudioFormat.ENCODING_PCM_8BIT:
+                return "8-bit";
+            case AudioFormat.ENCODING_PCM_16BIT:
+                return "16-bit";
+            case AudioFormat.ENCODING_PCM_FLOAT:
+                return "float";
+            default:
+                return Integer.toString(audioFormat);
        }
    }

-    protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, int desiredChannels, int desiredFrames) {
+    protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
        int channelConfig;
        int sampleSize;
        int frameSize;
@@ -43,14 +79,14 @@ public class SDLAudioManager
        Log.v(TAG, "Opening " + (isCapture ? "capture" : "playback") + ", requested " + desiredFrames + " frames of " + desiredChannels + " channel " + getAudioFormatString(audioFormat) + " audio at " + sampleRate + " Hz");

        /* On older devices let's use known good settings */
-        if (Build.VERSION.SDK_INT < 21) {
+        if (Build.VERSION.SDK_INT < 21 /* Android 5.0 (LOLLIPOP) */) {
            if (desiredChannels > 2) {
                desiredChannels = 2;
            }
        }

        /* AudioTrack has sample rate limitation of 48000 (fixed in 5.0.2) */
-        if (Build.VERSION.SDK_INT < 22) {
+        if (Build.VERSION.SDK_INT < 22 /* Android 5.1 (LOLLIPOP_MR1) */) {
            if (sampleRate < 8000) {
                sampleRate = 8000;
            } else if (sampleRate > 48000) {
@@ -59,7 +95,7 @@ public class SDLAudioManager
        }

        if (audioFormat == AudioFormat.ENCODING_PCM_FLOAT) {
-            int minSDKVersion = (isCapture ? 23 : 21);
+            int minSDKVersion = (isCapture ? 23 /* Android 6.0 (M) */ : 21 /* Android 5.0 (LOLLIPOP) */);
            if (Build.VERSION.SDK_INT < minSDKVersion) {
                audioFormat = AudioFormat.ENCODING_PCM_16BIT;
            }
@@ -120,7 +156,7 @@ public class SDLAudioManager
                channelConfig = AudioFormat.CHANNEL_OUT_5POINT1 | AudioFormat.CHANNEL_OUT_BACK_CENTER;
                break;
            case 8:
-                if (Build.VERSION.SDK_INT >= 23) {
+                if (Build.VERSION.SDK_INT >= 23 /* Android 6.0 (M) */) {
                    channelConfig = AudioFormat.CHANNEL_OUT_7POINT1_SURROUND;
                } else {
                    Log.v(TAG, "Requested " + desiredChannels + " channels, getting 5.1 surround");
@@ -201,6 +237,10 @@ public class SDLAudioManager
                    return null;
                }

+                if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */ && deviceId != 0) {
+                    mAudioRecord.setPreferredDevice(getOutputAudioDeviceInfo(deviceId));
+                }
+
                mAudioRecord.startRecording();
            }

@@ -224,6 +264,10 @@ public class SDLAudioManager
                    return null;
                }

+                if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */ && deviceId != 0) {
+                    mAudioTrack.setPreferredDevice(getInputAudioDeviceInfo(deviceId));
+                }
+
                mAudioTrack.play();
            }

@@ -238,11 +282,73 @@ public class SDLAudioManager
        return results;
    }

+    private static AudioDeviceInfo getInputAudioDeviceInfo(int deviceId) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS))
+                    .filter(deviceInfo -> deviceInfo.getId() == deviceId)
+                    .findFirst()
+                    .orElse(null);
+        } else {
+            return null;
+        }
+    }
+
+    private static AudioDeviceInfo getOutputAudioDeviceInfo(int deviceId) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS))
+                    .filter(deviceInfo -> deviceInfo.getId() == deviceId)
+                    .findFirst()
+                    .orElse(null);
+        } else {
+            return null;
+        }
+    }
+
+    private static void registerAudioDeviceCallback() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.registerAudioDeviceCallback(mAudioDeviceCallback, null);
+        }
+    }
+
+    private static void unregisterAudioDeviceCallback(Context context) {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+            audioManager.unregisterAudioDeviceCallback(mAudioDeviceCallback);
+        }
+    }
+
    /**
     * This method is called by SDL using JNI.
     */
-    public static int[] audioOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames) {
-        return open(false, sampleRate, audioFormat, desiredChannels, desiredFrames);
+    public static int[] getAudioOutputDevices() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)).mapToInt(AudioDeviceInfo::getId).toArray();
+        } else {
+            return NO_DEVICES;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int[] getAudioInputDevices() {
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
+            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+            return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS)).mapToInt(AudioDeviceInfo::getId).toArray();
+        } else {
+            return NO_DEVICES;
+        }
+    }
+
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static int[] audioOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
+        return open(false, sampleRate, audioFormat, desiredChannels, desiredFrames, deviceId);
    }

    /**
@@ -254,6 +360,11 @@ public class SDLAudioManager
            return;
        }

+        if (android.os.Build.VERSION.SDK_INT < 21 /* Android 5.0 (LOLLIPOP) */) {
+            Log.e(TAG, "Attempted to make an incompatible audio call with uninitialized audio! (floating-point output is supported since Android 5.0 Lollipop)");
+            return;
+        }
+
        for (int i = 0; i < buffer.length;) {
            int result = mAudioTrack.write(buffer, i, buffer.length - i, AudioTrack.WRITE_BLOCKING);
            if (result > 0) {
@@ -326,18 +437,22 @@ public class SDLAudioManager
    /**
     * This method is called by SDL using JNI.
     */
-    public static int[] captureOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames) {
-        return open(true, sampleRate, audioFormat, desiredChannels, desiredFrames);
+    public static int[] captureOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) {
+        return open(true, sampleRate, audioFormat, desiredChannels, desiredFrames, deviceId);
    }

    /** This method is called by SDL using JNI. */
    public static int captureReadFloatBuffer(float[] buffer, boolean blocking) {
-        return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
+            return 0;
+        } else {
+            return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
+        }
    }

    /** This method is called by SDL using JNI. */
    public static int captureReadShortBuffer(short[] buffer, boolean blocking) {
-        if (Build.VERSION.SDK_INT < 23) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
            return mAudioRecord.read(buffer, 0, buffer.length);
        } else {
            return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
@@ -346,7 +461,7 @@ public class SDLAudioManager

    /** This method is called by SDL using JNI. */
    public static int captureReadByteBuffer(byte[] buffer, boolean blocking) {
-        if (Build.VERSION.SDK_INT < 23) {
+        if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) {
            return mAudioRecord.read(buffer, 0, buffer.length);
        } else {
            return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
@@ -391,4 +506,9 @@ public class SDLAudioManager
    }

    public static native int nativeSetupJNI();
+
+    public static native void removeAudioDevice(boolean isCapture, int deviceId);
+
+    public static native void addAudioDevice(boolean isCapture, int deviceId);
+
 }
@@ -24,7 +24,7 @@ public class SDLControllerManager
    public static native int nativeAddJoystick(int device_id, String name, String desc,
                                               int vendor_id, int product_id,
                                               boolean is_accelerometer, int button_mask,
-                                               int naxes, int nhats, int nballs);
+                                               int naxes, int axis_mask, int nhats, int nballs);
    public static native int nativeRemoveJoystick(int device_id);
    public static native int nativeAddHaptic(int device_id, String name);
    public static native int nativeRemoveHaptic(int device_id);
@@ -42,7 +42,7 @@ public class SDLControllerManager

    public static void initialize() {
        if (mJoystickHandler == null) {
-            if (Build.VERSION.SDK_INT >= 19) {
+            if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
                mJoystickHandler = new SDLJoystickHandler_API19();
            } else {
                mJoystickHandler = new SDLJoystickHandler_API16();
@@ -50,7 +50,7 @@ public class SDLControllerManager
        }

        if (mHapticHandler == null) {
-            if (Build.VERSION.SDK_INT >= 26) {
+            if (Build.VERSION.SDK_INT >= 26 /* Android 8.0 (O) */) {
                mHapticHandler = new SDLHapticHandler_API26();
            } else {
                mHapticHandler = new SDLHapticHandler();
@@ -168,6 +168,32 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler {
                arg1Axis = MotionEvent.AXIS_GAS;
            }

+            // Make sure the AXIS_Z is sorted between AXIS_RY and AXIS_RZ.
+            // This is because the usual pairing are:
+            // - AXIS_X + AXIS_Y (left stick).
+            // - AXIS_RX, AXIS_RY (sometimes the right stick, sometimes triggers).
+            // - AXIS_Z, AXIS_RZ (sometimes the right stick, sometimes triggers).
+            // This sorts the axes in the above order, which tends to be correct
+            // for Xbox-ish game pads that have the right stick on RX/RY and the
+            // triggers on Z/RZ.
+            //
+            // Gamepads that don't have AXIS_Z/AXIS_RZ but use
+            // AXIS_LTRIGGER/AXIS_RTRIGGER are unaffected by this.
+            //
+            // References:
+            // - https://developer.android.com/develop/ui/views/touch-and-input/game-controllers/controller-input
+            // - https://www.kernel.org/doc/html/latest/input/gamepad.html
+            if (arg0Axis == MotionEvent.AXIS_Z) {
+                arg0Axis = MotionEvent.AXIS_RZ - 1;
+            } else if (arg0Axis > MotionEvent.AXIS_Z && arg0Axis < MotionEvent.AXIS_RZ) {
+                --arg0Axis;
+            }
+            if (arg1Axis == MotionEvent.AXIS_Z) {
+                arg1Axis = MotionEvent.AXIS_RZ - 1;
+            } else if (arg1Axis > MotionEvent.AXIS_Z && arg1Axis < MotionEvent.AXIS_RZ) {
+                --arg1Axis;
+            }
+
            return arg0Axis - arg1Axis;
        }
    }
@@ -210,7 +236,7 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler {
                    mJoysticks.add(joystick);
                    SDLControllerManager.nativeAddJoystick(joystick.device_id, joystick.name, joystick.desc,
                            getVendorId(joystickDevice), getProductId(joystickDevice), false,
-                            getButtonMask(joystickDevice), joystick.axes.size(), joystick.hats.size()/2, 0);
+                            getButtonMask(joystickDevice), joystick.axes.size(), getAxisMask(joystick.axes), joystick.hats.size()/2, 0);
                }
            }
        }
@@ -291,6 +317,9 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler {
    public int getVendorId(InputDevice joystickDevice) {
        return 0;
    }
+    public int getAxisMask(List<InputDevice.MotionRange> ranges) {
+        return -1;
+    }
    public int getButtonMask(InputDevice joystickDevice) {
        return -1;
    }
@@ -308,6 +337,43 @@ class SDLJoystickHandler_API19 extends SDLJoystickHandler_API16 {
        return joystickDevice.getVendorId();
    }

+    @Override
+    public int getAxisMask(List<InputDevice.MotionRange> ranges) {
+        // For compatibility, keep computing the axis mask like before,
+        // only really distinguishing 2, 4 and 6 axes.
+        int axis_mask = 0;
+        if (ranges.size() >= 2) {
+            // ((1 << SDL_GAMEPAD_AXIS_LEFTX) | (1 << SDL_GAMEPAD_AXIS_LEFTY))
+            axis_mask |= 0x0003;
+        }
+        if (ranges.size() >= 4) {
+            // ((1 << SDL_GAMEPAD_AXIS_RIGHTX) | (1 << SDL_GAMEPAD_AXIS_RIGHTY))
+            axis_mask |= 0x000c;
+        }
+        if (ranges.size() >= 6) {
+            // ((1 << SDL_GAMEPAD_AXIS_LEFT_TRIGGER) | (1 << SDL_GAMEPAD_AXIS_RIGHT_TRIGGER))
+            axis_mask |= 0x0030;
+        }
+        // Also add an indicator bit for whether the sorting order has changed.
+        // This serves to disable outdated gamecontrollerdb.txt mappings.
+        boolean have_z = false;
+        boolean have_past_z_before_rz = false;
+        for (InputDevice.MotionRange range : ranges) {
+            int axis = range.getAxis();
+            if (axis == MotionEvent.AXIS_Z) {
+                have_z = true;
+            } else if (axis > MotionEvent.AXIS_Z && axis < MotionEvent.AXIS_RZ) {
+                have_past_z_before_rz = true;
+            }
+        }
+        if (have_z && have_past_z_before_rz) {
+            // If both these exist, the compare() function changed sorting order.
+            // Set a bit to indicate this fact.
+            axis_mask |= 0x8000;
+        }
+        return axis_mask;
+    }
+
    @Override
    public int getButtonMask(InputDevice joystickDevice) {
        int button_mask = 0;
@@ -743,7 +809,7 @@ class SDLGenericMotionListener_API26 extends SDLGenericMotionListener_API24 {

    @Override
    public boolean supportsRelativeMouse() {
-        return (!SDLActivity.isDeXMode() || (Build.VERSION.SDK_INT >= 27));
+        return (!SDLActivity.isDeXMode() || Build.VERSION.SDK_INT >= 27 /* Android 8.1 (O_MR1) */);
    }

    @Override
@@ -753,7 +819,7 @@ class SDLGenericMotionListener_API26 extends SDLGenericMotionListener_API24 {

    @Override
    public boolean setRelativeMouseEnabled(boolean enabled) {
-        if (!SDLActivity.isDeXMode() || (Build.VERSION.SDK_INT >= 27)) {
+        if (!SDLActivity.isDeXMode() || Build.VERSION.SDK_INT >= 27 /* Android 8.1 (O_MR1) */) {
            if (enabled) {
                SDLActivity.getContentView().requestPointerCapture();
            } else {
@@ -116,7 +116,7 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
        int nDeviceHeight = height;
        try
        {
-            if (Build.VERSION.SDK_INT >= 17) {
+            if (Build.VERSION.SDK_INT >= 17 /* Android 4.2 (JELLY_BEAN_MR1) */) {
                DisplayMetrics realMetrics = new DisplayMetrics();
                mDisplay.getRealMetrics( realMetrics );
                nDeviceWidth = realMetrics.widthPixels;
@@ -163,7 +163,7 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,

        // Don't skip in MultiWindow.
        if (skip) {
-            if (Build.VERSION.SDK_INT >= 24) {
+            if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
                if (SDLActivity.mSingleton.isInMultiWindowMode()) {
                    Log.v("SDL", "Don't skip in Multi-Window");
                    skip = false;
@@ -7,7 +7,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.1.1'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

        // NOTE: Do not place your application dependencies here; they belong
@@ -1,6 +1,6 @@
 #Thu Nov 11 18:20:34 PST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
@@ -126,8 +126,8 @@ if $cygwin ; then
    # Now convert the arguments - kludge to limit ourselves to /bin/sh
    i=0
    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+        CHECK=`echo "$arg"|grep -E -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|grep -E -c "^-"`                                 ### Determine if an option

        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
@@ -1,5 +1,5 @@
 #cmakedefine PACKAGE "@PACKAGE@"
-#define VERSION "2.9.0"
+#define VERSION "2.10.0"

 #cmakedefine CMAKE_SYSTEM_NAME "@CMAKE_SYSTEM_NAME@"

@@ -22,7 +22,7 @@ Game Compatibility
 | DALK                                        | Supported   | From ALICEの館４・５・６ |
 | 闘神都市                                    | Supported   | From ALICEの館４・５・６ |
 | Dr.STOP                                     | Supported   | From ALICEの館４・５・６ |
-| 人間狩り                                    | Unsupported | From ALICEの館４・５・６ / アリスCD |
+| 人間狩り                                    | Supported   | From ALICEの館４・５・６ / アリスCD |
 | 女の子図鑑                                  | Unknown     | From ALICEの館４・５・６ |
 | 恋のおわり                                  | Unknown     |       |
 | 王道勇者                                    | Supported   |       |
@@ -71,13 +71,13 @@ Game Compatibility
 | ［扉］                                      | Supported   | From アリスCD |
 | 叩き殺し太郎                                | Supported   | From アリスCD |
 | バルーンぽっぷ                              | Supported   | From アリスCD |
-| 高速ひよこ２                                | Unsupported | From アリスCD |
+| 高速ひよこ２                                | Supported   | From アリスCD |
 | おせろっと                                  | Supported   | From アリスCD |
 | マスカレイド                                | Supported   | From アリスCD |
 | キャロル ～聖なる鐘が響く夜～               | Supported   | From アリスCD, Online match is not supported |
 | できるかなー？                              | Supported   | From アリスCD |
 | Child Assassin                              | Supported   | From アリスCD |
 | Klavier                                     | Supported   | From アリスCD |
-| 弱肉狂食                                    | Unsupported | From アリスCD |
+| 弱肉狂食                                    | Supported   | From アリスCD |
 | 眼鏡大戦２                                  | Supported   | From アリスCD |
 | 妄想くん                                    | Supported   | From アリスCD |
@@ -7,7 +7,6 @@
 #include "menu.h"
 #include "input.h"
 #include "nact.h"
-#include "key.h"
 #include "night.h"
 #include "sprite.h"

@@ -33,7 +33,6 @@
 #include "menu.h"
 #include "input.h"
 #include "nact.h"
-#include "key.h"
 #include "sact.h"
 #include "sprite.h"
 #include "ngraph.h"
@@ -34,7 +34,6 @@
 #include "menu.h"
 #include "input.h"
 #include "nact.h"
-#include "key.h"
 #include "sact.h"
 #include "sprite.h"
 #include "sactsound.h"
@@ -389,7 +388,7 @@ static void cb_waitkey_backlog(agsevent_t *e) {
 	switch (e->type) {
 	case AGSEVENT_KEY_RELEASE:
 		switch (e->code) {
-		case KEY_ESC:
+		case KEY_ESCAPE:
 			sblog_end();
 			sact.waittype = KEYWAIT_MESSAGE;
 			break;
@@ -31,7 +31,6 @@
 #include "nact.h"
 #include "ags.h"
 #include "input.h"
-#include "key.h"
 #include "sact.h"
 #include "sprite.h"
 #include "ngraph.h"
@@ -198,8 +197,10 @@ static void setup_selwindow() {
 	
 	// デフォルトで選択される選択肢がある場合、そこへカーソルを移動
 	if (sact.sel.movecursor) {
-		ags_setCursorLocation(sp->cur.x + sact.sel.frame_dot + 2,
-				      sp->cur.y + sact.sel.frame_dot + 2 + (sact.sel.font_size + sact.sel.linespace)*(sact.sel.movecursor -1), TRUE);
+		int x = sp->cur.x + sact.sel.frame_dot + 2;
+		int y = sp->cur.y + sact.sel.frame_dot + 2 +
+			(sact.sel.font_size + sact.sel.linespace) * (sact.sel.movecursor - 1);
+		ags_setCursorLocation(x, y, true, true);
 		selected_item = (sact.sel.movecursor -1);
 		oldstate = TRUE;
 		oldindex = selected_item -1;
@@ -1306,7 +1306,7 @@ static void ChangeSecretArray(void) { /* 53 */
 				(*vAry) ^= ax; ax = (key[i&3] ^ *vAry);
 				j ^= ax;
 				if (i & 2) {
-					ax = !ax ^ (i*3);
+					ax = ~ax ^ (i*3);
 				}
 				if (i & 4) {
 					ax = (ax >> 4) | (ax << 12);
@@ -1328,13 +1328,12 @@ static void ChangeSecretArray(void) { /* 53 */
 				*vAry ^= ax; ax = (key[i&3] ^ k);
 				j ^= ax;
 				if (i & 2) {
-					ax = !ax ^ (i*3);
+					ax = ~ax ^ (i*3);
 				}
 				if (i & 4) {
 					ax = (ax >> 4) | (ax << 12);
 				}
 				vAry++;
-				
 			}
 			*vResult = j;
 		}
@@ -37,6 +37,7 @@
 #include "ags.h"
 #include "music.h"
 #include "sdl_core.h"
+#include "hacks.h"

 #define SLOT 40

@@ -166,14 +167,14 @@ static void ChangeNotColor() {
 	case 24:
 	case 32:
 	{
-		uint32_t pic24s = PIX24(*src, *(src+1), *(src+2)) & 0xf0f0f0;
-		uint32_t pic24d = PIX24(*dst, *(dst+1), *(dst+2)) & 0xf0f0f0;
+		uint32_t pic24s = PIX24(*src, *(src+1), *(src+2));
+		uint32_t pic24d = PIX24(*dst, *(dst+1), *(dst+2));
 		uint32_t *yl;
 		
 		for (y = 0; y < height; y++) {
 			yl = (uint32_t *)(dp + y * dib->bytes_per_line);
 			for (x = 0; x < width; x++) {
-				if ((*yl & 0xf0f0f0) != pic24s) {
+				if (*yl != pic24s) {
 					*yl = pic24d;
 				}
 				yl++;
@@ -182,6 +183,9 @@ static void ChangeNotColor() {
 		break;
 	}
 	}
+	// The CX command after ChangeNotColor (in FIGHT.ADV) must use a precise
+	// calculation.
+	daiakuji_cx_hack = true;
 }

 /*
@@ -585,14 +589,14 @@ static void copy_sprite(int sx, int sy, int width, int height, int dx, int dy, i
 	case 24:
 	case 32:
 	{
-		uint32_t pic24 = PIX24(r, g, b) & 0xf0f0f0;
+		uint32_t pic24 = PIX24(r, g, b);
 		uint32_t *yls, *yld;
 		
 		for (y = 0; y < height; y++) {
 			yls = (uint32_t *)(sp + y * dib->bytes_per_line);
 			yld = (uint32_t *)(dp + y * dib->bytes_per_line);
 			for (x = 0; x < width; x++) {
-				if ((*yls & 0xf0f0f0) != pic24) {
+				if (*yls != pic24) {
 					*yld = *yls;
 				}
 				yls++; yld++;
@@ -37,6 +37,7 @@
 #include "modules.h"
 #include "sdl_core.h"
 #include "sdl_private.h"
+#include "input.h"
 #include "menu.h"

 // キー変換テーブル
@@ -162,7 +163,7 @@ static void GetKeyStatus(void) {
 	}
 	
 	*var = 0;
-	for (i = 0; i < 256; i++) {
+	for (i = 0; i < NUM_KEYCODES; i++) {
 		*var |= (keymap[no -1][i] * RawKeyInfo[i]);
 	}
 	
@@ -140,7 +140,7 @@ void gr_drawimage16(surface_t *ds, cgdata *cg, int x, int y) {
 			yl = (uint32_t *)(dp + y * ds->bytes_per_line);
 			for (x = 0; x < dw; x++) {
 				pic16 = *sp;
-				*yl = PIX24(PIXR16(pic16), PIXG16(pic16), PIXB16(pic16));
+				*yl = rgb565_to_rgb888(pic16);
 				yl++; sp++;
 			}
 			sp += (cg->width - dw);
@@ -142,10 +142,3 @@ else()  # non-emscripten, non-android
  add_test(NAME src_tests COMMAND src_tests)
  configure_file(testdata/test.gr ${CMAKE_CURRENT_BINARY_DIR}/testdata/test.gr COPYONLY)
 endif()
-
-# FIXME: set up dependency for xsystem35 on this
-if (NOT EMSCRIPTEN AND NOT ANDROID)
-  add_custom_target(sdl_keytable.h
-    COMMAND perl ../tools/xsyskey.pl ${SDL2_INCLUDE_DIRS} > sdl_keytable.h
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-endif()
@@ -42,12 +42,18 @@
 #include "font.h"
 #include "cursor.h"
 #include "image.h"
+#include "debugger.h"

 static Palette256 pal_256;
 static boolean need_update = TRUE;
 static boolean fade_outed = FALSE;
 static int cursor_move_time = 50; /* カーソル移動にかかる時間(ms) */

+static void palette_changed(void) {
+	nact->ags.pal_changed = TRUE;
+	dbg_on_palette_change();
+}
+
 static void initPal(Palette256 *pal) {
 	int i;
 	for (i = 0; i < 256; i++) {
@@ -58,7 +64,7 @@ static void initPal(Palette256 *pal) {
 	pal->red[15]  = 255; pal->green[15]  = 255; pal->blue[15]  = 255;
 	pal->red[255] = 255; pal->green[255] = 255; pal->blue[255] = 255;
 	sdl_setPalette(pal, 0, 256);
-	nact->ags.pal_changed = TRUE;
+	palette_changed();
 }

 boolean ags_check_param(int *x, int *y, int *w, int *h) {
@@ -100,7 +106,7 @@ boolean ags_check_param_xy(int *x, int *y) {
 }

 void ags_init(const char *render_driver) {
-	nact->ags.mouse_movesw = MOUSE_WARP_SMOOTH;
+	nact->ags.mouse_warp_enabled = true;
 	nact->ags.pal = &pal_256;
 	nact->ags.world_size.width  =  SYS35_DEFAULT_WIDTH;
 	nact->ags.world_size.height =  SYS35_DEFAULT_HEIGHT;
@@ -123,7 +129,7 @@ void ags_remove(void) {
 }

 void ags_reset(void) {
-	nact->ags.mouse_movesw = MOUSE_WARP_SMOOTH;
+	nact->ags.mouse_warp_enabled = true;
 	nact->ags.eventcb = NULL;
 	initPal(&pal_256);
 	cg_reset();
@@ -151,7 +157,7 @@ void ags_setWorldSize(int width, int height, int depth) {
 	
 	fade_outed = FALSE;  /* thanx tajiri@wizard */
 	
-	nact->ags.pal_changed = TRUE;
+	palette_changed();
 }

 void ags_setViewArea(int x, int y, int width, int height) {
@@ -223,14 +229,14 @@ void ags_setPalettes(Palette256 *src_pal, int src, int dst, int cnt) {
 		nact->ags.pal->green[dst + i] = src_pal->green[src + i];
 		nact->ags.pal->blue [dst + i] = src_pal->blue [src + i];
 	}
-	nact->ags.pal_changed = TRUE;
+	palette_changed();
 }

 void ags_setPalette(int no, int red, int green, int blue) {
 	nact->ags.pal->red[no]   = red;
 	nact->ags.pal->green[no] = green;
 	nact->ags.pal->blue[no]  = blue;
-	nact->ags.pal_changed = TRUE;
+	palette_changed();
 }

 void ags_setPaletteToSystem(int src, int cnt) {
@@ -627,42 +633,42 @@ void ags_loadCursor(int p1,int p2) {
 	}
 }

-void ags_setCursorLocation(int x, int y, boolean is_dibgeo) {
-	int dx[8], dy[8];
-	int i, delx, dely;
-	MyPoint p;
+void ags_setCursorLocation(int x, int y, bool is_dibgeo, bool for_selection) {
 	if (!ags_check_param_xy(&x, &y)) return;

-	/* DIB 座表系か Window 座表系か */
 	if (is_dibgeo) {
+		// DIB coordinates -> Window coordinates
 		x -= nact->ags.view_area.x;
 		y -= nact->ags.view_area.y;
 	}
-	
-	switch(nact->ags.mouse_movesw) {
-	case MOUSE_WARP_DISABLED:
-		return;
-	case MOUSE_WARP_DIRECT:
-		sdl_setCursorLocation(x, y); break;
-	case MOUSE_WARP_SMOOTH:
-		sys_getMouseInfo(&p, is_dibgeo);
-		delx = x - p.x;
-		dely = y - p.y;
-		
-		for (i = 1; i < 8; i++) {
-			dx[i-1] = ((delx*i*i*i) >> 9) - ((3*delx*i*i)>> 6) + ((3*delx*i) >> 3) + p.x;
-			dy[i-1] = ((dely*i*i*i) >> 9) - ((3*dely*i*i)>> 6) + ((3*dely*i) >> 3) + p.y;
-		}
-		dx[7] = x; dy[7] = y;
-		
-		for (i = 0; i < 8; i++) {
-			sdl_setCursorLocation(dx[i], dy[i]);
-			usleep(cursor_move_time * 1000 / 8);
-		}
-		break;
-	default:
-		return;
+
+#ifdef __EMSCRIPTEN__
+	if (!for_selection) {
+		// We can't move the actual cursor in the browser, but can change the
+		// internal mouse coordinates. This can help with keyboard/gamepad
+		// navigation.
+		sdl_setCursorInternalLocation(x, y);
+		EM_ASM({ xsystem35.shell.showMouseMoveEffect($0, $1); }, x, y);
+		sdl_sleep(cursor_move_time);
 	}
+#else
+	if (nact->ags.mouse_warp_enabled) {
+		MyPoint p;
+		sys_getMouseInfo(&p, is_dibgeo);
+		int dx = x - p.x;
+		int dy = y - p.y;
+		for (int i = 1; i < 8; i++) {
+			int xi = ((dx*i*i*i) >> 9) - ((3*dx*i*i)>> 6) + ((3*dx*i) >> 3) + p.x;
+			int yi = ((dy*i*i*i) >> 9) - ((3*dy*i*i)>> 6) + ((3*dy*i) >> 3) + p.y;
+			sdl_setCursorLocation(xi, yi);
+			sdl_sleep(cursor_move_time / 7);
+		}
+		sdl_setCursorLocation(x, y);
+	} else if (!for_selection) {
+		sdl_setCursorInternalLocation(x, y);
+		sdl_sleep(cursor_move_time);
+	}
+#endif
 }

 EMSCRIPTEN_KEEPALIVE
@@ -100,12 +100,6 @@ enum agsevent_button {
 	AGSEVENT_BUTTON_RIGHT,
 };

-enum mouse_warp_mode {
-	MOUSE_WARP_DISABLED,
-	MOUSE_WARP_DIRECT,
-	MOUSE_WARP_SMOOTH,
-};
-
 struct _ags {
 	Palette256 *pal;             /* system palette */
 	boolean   pal_changed;      /* system palette has changed */
@@ -116,11 +110,10 @@ struct _ags {
 	
 	int world_depth;            /* depth of off-screen (bits per pixel) */

-	enum mouse_warp_mode mouse_movesw;
-
 	agsurface_t *dib;           /* main surface */
 	void (*eventcb)(agsevent_t *e); /* deliver event */

+	bool mouse_warp_enabled;
 	boolean noantialias; /* antialias を使用しない */
 	boolean noimagecursor; /* リソースファイルのカーソルを読みこまない */
 };
@@ -211,7 +204,7 @@ extern agsurface_t *ags_drawStringToSurface(const char *str);
 /* カーソル関係 */
 extern void ags_setCursorType(int type);
 extern void ags_loadCursor(int ,int);
-extern void ags_setCursorLocation(int x, int y, boolean dibgeo);
+extern void ags_setCursorLocation(int x, int y, bool is_dibgeo, bool for_selection);
 extern void ags_setCursorMoveTime(int msec);
 extern int  ags_getCursorMoveTime();

@@ -108,5 +108,5 @@ void ald_init(int type, const char **file, int cnt, boolean use_mmap) {
 int ald_get_maxno(DRIFILETYPE type) {
 	if (type >= DRIFILETYPEMAX || !dri[type])
 		return 0;
-	return dri[type]->nr_files;
+	return dri[type]->maxno;
 }
@@ -22,11 +22,14 @@
 #include <stdio.h>

 #include "cdrom.h"
+#include "ald_manager.h"
 #include "music.h"
+#include "music_private.h"

 static int current_track;

 static int cdrom_bgm_init(char *dev) {
+	prv.cd_maxtrk = ald_get_maxno(DRIFILE_BGM) + 1;
 	return OK;
 }

@@ -72,7 +72,9 @@ static int cdrom_init(char *playlist_path) {
 		fp = fopen("_inmm.ini", "r");
 	}
 	if (!fp) {
-		NOTICE("cdrom: Cannot open playlist %s", playlist_path);
+		// If the game has MIDI music, lack of the playlist is not a problem.
+		if (ald_get_maxno(DRIFILE_MIDI) == 0)
+			NOTICE("cdrom: Cannot open playlist %s", playlist_path);
 		return NG;
 	}

@@ -87,4 +87,11 @@ extern int cg_fflg;
 extern int *cg_loadCountVar;
 extern int cg_brightness;

+static inline uint32_t rgb565_to_rgb888(uint16_t rgb) {
+	uint32_t r = rgb >> 11;
+	uint32_t g = (rgb >> 5) & 0x3f;
+	uint32_t b = rgb & 0x1f;
+	return (r << 19) | (r >> 2 << 16) | (g << 10) | (g >> 4 << 8) | (b << 3) | (b >> 2);
+}
+
 #endif /* !__CG__ */
@@ -27,6 +27,7 @@
 #include "xsystem35.h"
 #include "scenario.h"
 #include "ags.h"
+#include "hacks.h"

 void commandCC() {
 	int src_x  = getCaliValue();
@@ -69,7 +70,16 @@ void commandCX() {
 	
 	switch(mode) {
 	case 0:
-		ags_copyArea_shadow(src_x, src_y, width, height, dst_x, dst_y);
+		// In Daiakuji, the image after the blending is used as a source image
+		// for sprite copy (CX 1). SDL's SIMD blending implementation has some
+		// error (blending #ff00ff and #ff00ff results in #fd00fd), so the
+		// resulting color may not match the colorkey of CX 1. To workaround
+		// this, specify a small alpha mod so that SDL will use a "slow path"
+		// that does accurate calculation.
+		if (daiakuji_cx_hack)
+			ags_copyArea_shadow_withrate(src_x, src_y, width, height, dst_x, dst_y, 254);
+		else
+			ags_copyArea_shadow(src_x, src_y, width, height, dst_x, dst_y);
 		ags_updateArea(dst_x, dst_y, width, height);
 		break;
 	case 1:
@@ -94,6 +104,7 @@ void commandCX() {
 		DEBUG_COMMAND_YET("CX %d,%d,%d,%d,%d,%d,%d,%d:", mode, src_x, src_y, width, height, dst_x, dst_y, col);
 		break;
 	}
+	daiakuji_cx_hack = false;

 	DEBUG_COMMAND("CX %d,%d,%d,%d,%d,%d,%d,%d:", mode, src_x, src_y, width, height, dst_x, dst_y, col);
 }
@@ -127,7 +127,7 @@ void commandIZ() {
 	int x = getCaliValue();
 	int y = getCaliValue();
 	
-	ags_setCursorLocation(x, y, TRUE);
+	ags_setCursorLocation(x, y, true, false);
 	DEBUG_COMMAND("IZ %d,%d:", x, y);
 }

@@ -326,7 +326,7 @@ void commandMJ() {
 	mj_param.h = h;
 	mj_param.oldstring = t1;
 	
-	ags_setCursorLocation(x, y, FALSE); /* XXX */
+	ags_setCursorLocation(x, y, false, false);
 	menu_inputstring2(&mj_param);
 	if (mj_param.newstring == NULL) return;
 	
@@ -360,21 +360,23 @@ void dbg_delete_breakpoints_in_page(int page) {
 }

 uint8_t dbg_handle_breakpoint(int page, int addr) {
+	uint8_t restore_op = BREAKPOINT;
 	for (Breakpoint *bp = breakpoints; bp; bp = bp->next) {
 		if (bp->phys->page != page || bp->phys->addr != addr)
 			continue;
+		restore_op = bp->phys->restore_op;
 		if (bp->condition && !eval_condition(bp->condition))
 			continue;

 		dbg_state = bp->no == INTERNAL_BREAKPOINT_NO ?
 			DBG_STOPPED_NEXT : DBG_STOPPED_BREAKPOINT;

-		uint8_t restore_op = bp->phys->restore_op;
 		dbg_main(bp->no);  // this may destroy bp
 		return restore_op;
 	}
-	SYSERROR("Illegal BREAKPOINT instruction");
-	return BREAKPOINT;
+	if (restore_op == BREAKPOINT)
+		SYSERROR("Illegal BREAKPOINT instruction");
+	return restore_op;
 }

 static void set_stack_frame(StackFrame *frame, int page, int addr, boolean is_return_addr) {
@@ -528,6 +530,11 @@ void dbg_onsleep(void) {
 		dbg_impl->onsleep();
 }

+void dbg_on_palette_change(void) {
+	if (dbg_impl)
+		dbg_impl->on_palette_change();
+}
+
 boolean dbg_console_vprintf(int lv, const char *format, va_list ap) {
 	if (!dbg_impl || !dbg_impl->console_output)
 		return false;
@@ -45,8 +45,10 @@ void dbg_init(const char *symbols_path, boolean use_dap);
 void dbg_quit(void);
 void dbg_main(int bp_no);
 void dbg_onsleep(void);
+void dbg_on_palette_change(void);
 uint8_t dbg_handle_breakpoint(int page, int addr);
 boolean dbg_console_vprintf(int lv, const char *format, va_list ap);
+void dbg_post_command(void *data);

 #else // ENABLE_DEBUGGER

@@ -55,8 +57,10 @@ boolean dbg_console_vprintf(int lv, const char *format, va_list ap);
 #define dbg_quit()
 #define dbg_main(bp_no)
 #define dbg_onsleep()
+#define dbg_on_palette_change()
 #define dbg_handle_breakpoint(page, addr) BREAKPOINT
 #define dbg_console_vprintf(lv, format, ap) false
+#define dbg_post_command(data)

 #endif // ENABLE_DEBUGGER

@@ -51,6 +51,7 @@ static char *symbols_path;
 static char *src_dir;
 static struct msgq *queue;
 static bool break_on_warnings;
+static uint32_t palette_version;

 cJSON *create_source(const char *name) {
 	cJSON *source = cJSON_CreateObject();
@@ -67,7 +68,7 @@ cJSON *create_source(const char *name) {
 static void send_json(cJSON *json) {
 	static int seq = 0;

-	cJSON_AddNumberToObject(json, "seq", seq);
+	cJSON_AddNumberToObject(json, "seq", ++seq);
 	char *str = cJSON_PrintUnformatted(json);
 	printf("Content-Length: %zu\r\n\r\n%s", strlen(str), str);
 	fflush(stdout);
@@ -480,6 +481,20 @@ static void cmd_disconnect(cJSON *args, cJSON *resp) {
 	sys_exit(0);
 }

+static void cmd_palette(cJSON *args, cJSON *resp) {
+	cJSON *body, *palette;
+	cJSON_AddBoolToObject(resp, "success", true);
+	cJSON_AddItemToObjectCS(resp, "body", body = cJSON_CreateObject());
+	cJSON_AddNumberToObject(body, "version", palette_version);
+	cJSON_AddItemToObjectCS(body, "palette", palette = cJSON_CreateArray());
+	for (int i = 0; i < 256; i++) {
+		int val = nact->ags.pal->red[i] << 16 |
+			nact->ags.pal->green[i] << 8 |
+			nact->ags.pal->blue[i];
+		cJSON_AddItemToArray(palette, cJSON_CreateNumber(val));
+	}
+}
+
 static boolean handle_request(cJSON *request) {
 	boolean continue_repl = true;

@@ -536,8 +551,15 @@ static boolean handle_request(cJSON *request) {
 		cmd_setVariable(args, resp);
 	} else if (!strcmp(command->valuestring, "disconnect")) {
 		cmd_disconnect(args, resp);
+	} else if (!strcmp(command->valuestring, "xsystem35.palette")) {
+		cmd_palette(args, resp);
 	} else {
-		fprintf(stderr, "unknown command \"%s\"\n", command->valuestring);
+		cJSON_AddBoolToObject(resp, "success", false);
+		char *buf = malloc(strlen(command->valuestring) + 30);
+		sprintf(buf, "unknown request \"%s\"", command->valuestring);
+		cJSON_AddStringToObject(resp, "message", buf);
+		fprintf(stderr, "%s\n", buf);
+		free(buf);
 	}
 	send_json(resp);
 	return continue_repl;
@@ -567,13 +589,13 @@ static int read_command_thread(void *data) {
 			}
 			char *buf = malloc(content_length);
 			fread(buf, content_length, 1, stdin);
-			msgq_enqueue(queue, buf);
+			sdl_post_debugger_command(buf);
 			content_length = -1;
 		} else {
 			fprintf(stderr, "Unknown Debug Adapter Protocol header: %s", header);
 		}
 	}
-	msgq_enqueue(queue, NULL);  // EOF
+	sdl_post_debugger_command(NULL);  // end of messages
 	return 0;
 }

@@ -588,11 +610,16 @@ static void dbg_dap_init(const char *path) {

 	SDL_CreateThread(read_command_thread, "Debugger", NULL);

-	while (!initialized) {
-		char *msg = msgq_dequeue(queue);
-		if (!msg)
-			break;
-		handle_message(msg);
+	while (!initialized && !nact->is_quit) {
+		SDL_Event e;
+		SDL_WaitEvent(&e);
+		sdl_handle_event(&e);
+		while (!msgq_isempty(queue)) {
+			char *msg = msgq_dequeue(queue);
+			if (!msg)
+				return;
+			handle_message(msg);
+		}
 	}
 }

@@ -605,11 +632,16 @@ static void dbg_dap_repl(int bp_no) {
 	dbg_state = DBG_RUNNING;

 	boolean continue_repl = true;
-	while (continue_repl) {
-		char *msg = msgq_dequeue(queue);
-		if (!msg)
-			break;
-		continue_repl = handle_message(msg);
+	while (continue_repl && !nact->is_quit) {
+		SDL_Event e;
+		SDL_WaitEvent(&e);
+		sdl_handle_event(&e);
+		while (!msgq_isempty(queue)) {
+			char *msg = msgq_dequeue(queue);
+			if (!msg)
+				return;
+			continue_repl = handle_message(msg);
+		}
 	}
 }

@@ -624,10 +656,24 @@ static void dbg_dap_onsleep(void) {
 		dbg_main(0);
 }

+static void dbg_dap_on_palette_change(void) {
+	cJSON *event = cJSON_CreateObject(), *body;
+	cJSON_AddStringToObject(event, "type", "event");
+	cJSON_AddStringToObject(event, "event", "xsystem35.paletteChanged");
+	cJSON_AddItemToObjectCS(event, "body", body = cJSON_CreateObject());
+	cJSON_AddNumberToObject(body, "version", ++palette_version);
+	send_json(event);
+}
+
+void dbg_post_command(void *data) {
+	msgq_enqueue(queue, data);
+}
+
 DebuggerImpl dbg_dap_impl = {
 	.init = dbg_dap_init,
 	.quit = dbg_dap_quit,
 	.repl = dbg_dap_repl,
 	.onsleep = dbg_dap_onsleep,
+	.on_palette_change = dbg_dap_on_palette_change,
 	.console_output = emit_output_event,
 };
@@ -58,6 +58,7 @@ typedef struct {
 	void (*quit)(void);
 	void (*repl)(int bp_no);
 	void (*onsleep)(void);
+	void (*on_palette_change)(void);
 	void (*console_output)(int lv, const char *output);
 } DebuggerImpl;

@@ -67,6 +67,8 @@ static bool read_index(int disk, drifiles *d, FILE *fp) {
 	for (int i = 0; i < nr_files; i++) {
 		if (disk != ltbl[i * 3] - 1)
 			continue;
+		if (d->maxno < i)
+			d->maxno = i;
 		d->disk[i] = ltbl[i * 3];
 		int ptr = LittleEndian_getW(ltbl, i * 3 + 1);
 		d->offset[i] = LittleEndian_get3B(ptbl, ptr * 3) << 8;
@@ -34,6 +34,7 @@ struct _drifiles {
 	mmap_t   *mmap[DRIFILEMAX];
 	char     *fnames[DRIFILEMAX];
 	int      nr_files; // upper limit on how many files could be referenced by this archive
+	int      maxno;
 	uint8_t  *disk;    // file numbers
 	uint32_t *offset;  // offsets in file
 };
@@ -33,6 +33,8 @@
 /* defined by cmdy.c */
 extern boolean Y3waitFlags;

+bool daiakuji_cx_hack;
+
 void enable_hack_by_gameid(const char *gameid) {
 	if (!strcmp(gameid, "toushin2"))
 		nact->game = GAME_TT2;
@@ -20,6 +20,8 @@
 #ifndef __HACKS_H_
 #define __HACKS_H_

+#include <stdbool.h>
+
 enum gameId {
 	GAME_UNKNOWN = 0,
 	GAME_TT2,
@@ -31,4 +33,6 @@ enum gameId {
 void enable_hack_by_gameid(const char *gameid);
 void enable_hack_by_title(const char *game_title_utf8);

+extern bool daiakuji_cx_hack;
+
 #endif // __HACKS_H_
@@ -41,6 +41,123 @@
 #define KEYWAIT_CANCELABLE    1
 #define KEYWAIT_SKIPPABLE     2

+// System3.x key codes (IG command, etc.)
+// These are originated from Windows virtual key codes (VK_*).
+#define NUM_KEYCODES 256
+enum keycode {
+	KEY_MOUSE_LEFT   = 0x01,  // マウスの左ボタン
+	KEY_MOUSE_RIGHT  = 0x02,  // マウスの右ボタン
+	KEY_CONTROL      = 0x03,  // コントロール ブレーク処理に使用
+	KEY_MOUSE_MIDDLE = 0x04,  // マウスの中央ボタン (3つボタンのマウス)
+	KEY_BACKSPACE    = 0x08,  // BackSpaceキー
+	KEY_TAB          = 0x09,  // Tabキー
+	KEY_CLEAR        = 0x0c,  // Clearキー
+	KEY_RETURN       = 0x0d,  // Enterキー
+	KEY_SHIFT        = 0x10,  // Shiftキー
+	KEY_CTRL         = 0x11,  // Ctrlキー
+	KEY_ALT          = 0x12,  // Altキー
+	KEY_PAUSE        = 0x13,  // Pauseキー
+	KEY_CAPSLOCK     = 0x14,  // Caps Lockキー
+	KEY_KANAKAN      = 0x15,  // 英数カナキー
+	KEY_ESCAPE       = 0x1b,  // Escキー
+	KEY_SPACE        = 0x20,  // Spaceキー
+	KEY_PAGEUP       = 0x21,  // Page Upキー
+	KEY_PAGEDOWN     = 0x22,  // Page Downキー
+	KEY_END          = 0x23,  // Endキー
+	KEY_HOME         = 0x24,  // Homeキー
+	KEY_LEFT         = 0x25,  // ←キー
+	KEY_UP           = 0x26,  // ↑キー
+	KEY_RIGHT        = 0x27,  // →キー
+	KEY_DOWN         = 0x28,  // ↓キー
+	KEY_SELECT       = 0x29,  // Selectキー
+	KEY_EXECUTE      = 0x2b,  // Executeキー
+	KEY_PRINTSCREEN  = 0x2c,  // Print Screenキー (Windows 3.0以降用)
+	KEY_INSERT       = 0x2d,  // Insキー
+	KEY_DELETE       = 0x2e,  // Delキー
+	KEY_HELP         = 0x2f,  // Helpキー
+	KEY_0            = 0x30,  // 0キー
+	KEY_1            = 0x31,  // 1キー
+	KEY_2            = 0x32,  // 2キー
+	KEY_3            = 0x33,  // 3キー
+	KEY_4            = 0x34,  // 4キー
+	KEY_5            = 0x35,  // 5キー
+	KEY_6            = 0x36,  // 6キー
+	KEY_7            = 0x37,  // 7キー
+	KEY_8            = 0x38,  // 8キー
+	KEY_9            = 0x39,  // 9キー
+	KEY_PAD_EQUALS   = 0x3d,
+	KEY_A            = 0x41,  // Aキー
+	KEY_B            = 0x42,  // Bキー
+	KEY_C            = 0x43,  // Cキー
+	KEY_D            = 0x44,  // Dキー
+	KEY_E            = 0x45,  // Eキー
+	KEY_F            = 0x46,  // Fキー
+	KEY_G            = 0x47,  // Gキー
+	KEY_H            = 0x48,  // Hキー
+	KEY_I            = 0x49,  // Iキー
+	KEY_J            = 0x4a,  // Jキー
+	KEY_K            = 0x4b,  // Kキー
+	KEY_L            = 0x4c,  // Lキー
+	KEY_M            = 0x4d,  // Mキー
+	KEY_N            = 0x4e,  // Nキー
+	KEY_O            = 0x4f,  // Oキー
+	KEY_P            = 0x50,  // Pキー
+	KEY_Q            = 0x51,  // Qキー
+	KEY_R            = 0x52,  // Rキー
+	KEY_S            = 0x53,  // Sキー
+	KEY_T            = 0x54,  // Tキー
+	KEY_U            = 0x55,  // Uキー
+	KEY_V            = 0x56,  // Vキー
+	KEY_W            = 0x57,  // Wキー
+	KEY_X            = 0x58,  // Xキー
+	KEY_Y            = 0x59,  // Yキー
+	KEY_Z            = 0x5a,  // Zキー
+	KEY_PAD_0        = 0x60,  // テンキーの0キー
+	KEY_PAD_1        = 0x61,  // テンキーの1キー
+	KEY_PAD_2        = 0x62,  // テンキーの2キー
+	KEY_PAD_3        = 0x63,  // テンキーの3キー
+	KEY_PAD_4        = 0x64,  // テンキーの4キー
+	KEY_PAD_5        = 0x65,  // テンキーの5キー
+	KEY_PAD_6        = 0x66,  // テンキーの6キー
+	KEY_PAD_7        = 0x67,  // テンキーの7キー
+	KEY_PAD_8        = 0x68,  // テンキーの8キー
+	KEY_PAD_9        = 0x69,  // テンキーの9キー
+	KEY_PAD_MULTIPLY = 0x6a,  // テンキーの*キー
+	KEY_PAD_PLUS     = 0x6b,  // テンキーの+キー
+	KEY_SEPARATOR    = 0x6c,  // Separatorキー
+	KEY_PAD_MINUS    = 0x6d,  // テンキーの－キー
+	KEY_PAD_PERIOD   = 0x6e,  // テンキーの.キー
+	KEY_PAD_DIVIDE   = 0x6f,  // テンキーの/キー
+	KEY_F1           = 0x70,  // F1キー
+	KEY_F2           = 0x71,  // F2キー
+	KEY_F3           = 0x72,  // F3キー
+	KEY_F4           = 0x73,  // F4キー
+	KEY_F5           = 0x74,  // F5キー
+	KEY_F6           = 0x75,  // F6キー
+	KEY_F7           = 0x76,  // F7キー
+	KEY_F8           = 0x77,  // F8キー
+	KEY_F9           = 0x78,  // F9キー
+	KEY_F10          = 0x79,  // F10キー
+	KEY_F11          = 0x7a,  // F11キー
+	KEY_F12          = 0x7b,  // F12キー
+	KEY_F13          = 0x7c,  // F13キー
+	KEY_F14          = 0x7d,  // F14キー
+	KEY_F15          = 0x7e,  // F15キー
+	KEY_F16          = 0x7f,  // F16キー
+	KEY_F17          = 0x80,  // F17キー
+	KEY_F18          = 0x81,  // F18キー
+	KEY_F19          = 0x82,  // F19キー
+	KEY_F20          = 0x83,  // F20キー
+	KEY_F21          = 0x84,  // F21キー
+	KEY_F22          = 0x85,  // F22キー
+	KEY_F23          = 0x86,  // F23キー
+	KEY_F24          = 0x87,  // F24キー
+	KEY_NUMLOCK      = 0x90,  // Num Lockキー
+	KEY_SCROLLLOCK   = 0x91,  // Scroll Lockキー
+};
+
+extern boolean RawKeyInfo[NUM_KEYCODES];
+
 extern int sys_keywait(int msec, unsigned flags);
 extern int sys_getMouseInfo(MyPoint *p, boolean is_dibgeo);
 extern int sys_getInputInfo(void);
@@ -1,153 +0,0 @@
-/*
- * key.h  keycode definition
- *
- * Copyright (C) 2000-    Masaki Chikama (Wren) <masaki-c@is.aist-nara.ac.jp>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
-*/
-/* $Id: key.h,v 1.2 2000/08/11 18:55:51 chikama Exp $ */
-
-#ifndef __KEYCODE__
-#define __KEYCODE__
-
-#define KEY_UNDEFINED    (0x00)
-#define KEY_MOUSE_LEFT   (0x01)
-#define KEY_MOUSE_RIGHT  (0x02)
-#define KEY_CONTROL      (0x03)
-#define KEY_MOUSE_MIDDLE (0x04)
-#define KEY_BS           (0x08)
-#define KEY_BACKSPACE    (0x08)
-#define KEY_TAB          (0x09)
-#define KEY_CLEAR        (0x0c)
-#define KEY_ENTER        (0x0d)
-#define KEY_PAD_ENTER    (0x0d)
-#define KEY_RETURN       (0x0d)
-#define KEY_SHIFT        (0x10)
-#define KEY_LSHIFT       (0x10)
-#define KEY_RSHIFT       (0x10)
-#define KEY_CTRL         (0x11)
-#define KEY_LCTRL        (0x11)
-#define KEY_RCTRL        (0x11)
-#define KEY_ALT          (0x12)
-#define KEY_LALT         (0x12)
-#define KEY_RALT         (0x12)
-#define KEY_PAUSE        (0x13)
-#define KEY_CAPSLOCK     (0x14)
-#define KEY_KANAKAN      (0x15)
-#define KEY_ESC          (0x1b)
-#define KEY_ESCAPE       (0x1b)
-#define KEY_SPACE        (0x20)
-#define KEY_PAGEUP       (0x21)
-#define KEY_PAGEDOWN     (0x22)
-#define KEY_END          (0x23)
-#define KEY_HOME         (0x24)
-#define KEY_LEFT         (0x25)
-#define KEY_UP           (0x26)
-#define KEY_RIGHT        (0x27)
-#define KEY_DOWN         (0x28)
-#define KEY_SELECT       (0x29)
-#define KEY_EXECUTE      (0x2b)
-#define KEY_PRINTSCREEN  (0x2c)
-#define KEY_INS          (0x2d)
-#define KEY_INSERT       (0x2d)
-#define KEY_DEL          (0x2e)
-#define KEY_DELETE       (0x2e)
-#define KEY_HELP         (0x2f)
-#define KEY_0            (0x30)
-#define KEY_1            (0x31)
-#define KEY_2            (0x32)
-#define KEY_3            (0x33)
-#define KEY_4            (0x34)
-#define KEY_5            (0x35)
-#define KEY_6            (0x36)
-#define KEY_7            (0x37)
-#define KEY_8            (0x38)
-#define KEY_9            (0x39)
-#define KEY_PAD_EQUALS   (0x3d)
-#define KEY_A            (0x41)
-#define KEY_B            (0x42)
-#define KEY_C            (0x43)
-#define KEY_D            (0x44)
-#define KEY_E            (0x45)
-#define KEY_F            (0x46)
-#define KEY_G            (0x47)
-#define KEY_H            (0x48)
-#define KEY_I            (0x49)
-#define KEY_J            (0x4a)
-#define KEY_K            (0x4b)
-#define KEY_L            (0x4c)
-#define KEY_M            (0x4d)
-#define KEY_N            (0x4e)
-#define KEY_O            (0x4f)
-#define KEY_P            (0x50)
-#define KEY_Q            (0x51)
-#define KEY_R            (0x52)
-#define KEY_S            (0x53)
-#define KEY_T            (0x54)
-#define KEY_U            (0x55)
-#define KEY_V            (0x56)
-#define KEY_W            (0x57)
-#define KEY_X            (0x58)
-#define KEY_Y            (0x59)
-#define KEY_Z            (0x5a)
-#define KEY_PAD_0        (0x60)
-#define KEY_PAD_1        (0x61)
-#define KEY_PAD_2        (0x62)
-#define KEY_PAD_3        (0x63)
-#define KEY_PAD_4        (0x64)
-#define KEY_PAD_5        (0x65)
-#define KEY_PAD_6        (0x66)
-#define KEY_PAD_7        (0x67)
-#define KEY_PAD_8        (0x68)
-#define KEY_PAD_9        (0x69)
-#define KEY_PAD_STAR     (0x6a)
-#define KEY_PAD_MULTIPLY (0x6a)
-#define KEY_PAD_PLUS     (0x6b)
-#define KEY_PAD_SEP      (0x6c)
-#define KEY_PAD_MINUS    (0x6d)
-#define KEY_PAD_DOT      (0x6e)
-#define KEY_PAD_PERIOD   (0x6e)
-#define KEY_PAD_SLASH    (0x6f)
-#define KEY_PAD_DIVIDE   (0x6f)
-#define KEY_F1           (0x70)
-#define KEY_F2           (0x71)
-#define KEY_F3           (0x72)
-#define KEY_F4           (0x73)
-#define KEY_F5           (0x74)
-#define KEY_F6           (0x75)
-#define KEY_F7           (0x76)
-#define KEY_F8           (0x77)
-#define KEY_F9           (0x78)
-#define KEY_F10          (0x79)
-#define KEY_F11          (0x7a)
-#define KEY_F12          (0x7b)
-#define KEY_F13          (0x7c)
-#define KEY_F14          (0x7d)
-#define KEY_F15          (0x7e)
-#define KEY_F16          (0x7f)
-#define KEY_F17          (0x80)
-#define KEY_F18          (0x81)
-#define KEY_F19          (0x82)
-#define KEY_F20          (0x83)
-#define KEY_F21          (0x84)
-#define KEY_F22          (0x85)
-#define KEY_F23          (0x86)
-#define KEY_F24          (0x87)
-#define KEY_NUMLOCK      (0x90)
-#define KEY_SCROLL_LOCK  (0x91)
-#define KEY_SCROLLOCK    (0x91)
-
-#endif /* __KEYCODE__ */
@@ -87,7 +87,7 @@ void
 on_item5_activate                      (GtkMenuItem     *menuitem,
                                        gpointer         user_data)
 {
-	nact->ags.mouse_movesw = MOUSE_WARP_SMOOTH;
+	nact->ags.mouse_warp_enabled = true;
 	gtk_menu_popdown(GTK_MENU(menu_window_popup));
 }

@@ -97,7 +97,7 @@ void
 on_item6_activate                      (GtkMenuItem     *menuitem,
                                        gpointer         user_data)
 {
-	nact->ags.mouse_movesw = MOUSE_WARP_DISABLED;
+	nact->ags.mouse_warp_enabled = false;
 	gtk_menu_popdown(GTK_MENU(menu_window_popup));
 }

@@ -89,10 +89,13 @@ static int midi_start(int no, int loop, char *data, int datalen) {

 	SDL_RWops *rwops = SDL_RWFromConstMem(data, datalen);
 	mix_music = Mix_LoadMUSType_RW(rwops, MUS_MID, SDL_TRUE /* freesrc */);
-	if (!mix_music)
+	if (!mix_music) {
+		WARNING("Cannot load MIDI: %s", SDL_GetError());
 		return NG;
+	}

 	if (Mix_PlayMusic(mix_music, loop ? loop : -1) != 0) {
+		WARNING("Cannot play MIDI: %s", SDL_GetError());
 		Mix_FreeMusic(mix_music);
 		mix_music = NULL;
 		return NG;
@@ -25,6 +25,7 @@

 #include "config.h"
 #include <sys/types.h>
+#include <SDL_events.h>
 #include <SDL_surface.h>
 #include "portab.h"
 #include "ags.h"
@@ -94,6 +95,7 @@ void sdl_effect_finish(struct sdl_effect *eff);
 /* key/pointer 関係 */
 extern void sdl_setJoyDeviceIndex(int index);
 extern void sdl_setCursorLocation(int x, int y);
+extern void sdl_setCursorInternalLocation(int x, int y);
 extern void sdl_setCursorType(int type);
 extern boolean sdl_cursorNew(uint8_t* data, int no, CursorImage *cursorImage,  TCursorDirEntry *cursordirentry);
 extern int  sdl_getKeyInfo();
@@ -106,10 +108,11 @@ extern MyPoint sdl_translateMouseCoords(int x, int y);

 /* misc */
 extern void sdl_mainIteration();
-extern boolean RawKeyInfo[];
 extern uint32_t sdl_getTicks(void);
 extern void sdl_sleep(int msec);
 extern void sdl_wait_vsync();
 extern boolean sdl_inputString(struct inputstring_param *);
+extern void sdl_post_debugger_command(void *data);
+extern void sdl_handle_event(SDL_Event *e);

 #endif /* !__SDL_CORE__ */
@@ -207,14 +207,7 @@ void sdl_copyArea(int sx, int sy, int w, int h, int dx, int dy) {
 void sdl_copyAreaSP(int sx, int sy, int w, int h, int dx, int dy, uint8_t sp) {
 	sdl_pal_check();

-	Uint32 col = sp;
-	if (sdl_dib->format->BitsPerPixel > 8) {
-		col = SDL_MapRGB(sdl_dib->format,
-				sdl_col[sp].r & 0xf8,
-				sdl_col[sp].g & 0xfc,
-				sdl_col[sp].b & 0xf8);
-	}
-	
+	Uint32 col = palette_color(sp);
 	SDL_SetColorKey(sdl_dib, SDL_TRUE, col);
 	
 	SDL_Rect r_src = {sx, sy, w, h};
@@ -321,7 +314,7 @@ SDL_Rect sdl_drawString(int x, int y, const char *str_utf8, uint8_t col) {
 * 指定範囲にパレット col を rate の割合で重ねる CK1
 */
 void sdl_wrapColor(int sx, int sy, int w, int h, uint8_t c, int rate) {
-	SDL_Surface *s = SDL_CreateRGBSurface(0, w, h, sdl_dib->format->BitsPerPixel, 0, 0, 0, 0);
+	SDL_Surface *s = SDL_CreateRGBSurfaceWithFormat(0, w, h, sdl_dib->format->BitsPerPixel, sdl_dib->format->format);
 	assert(s->format->BitsPerPixel > 8);

 	SDL_Rect r_src = {0, 0, w, h};
@@ -33,14 +33,13 @@

 #include "portab.h"
 #include "system.h"
+#include "debugger.h"
 #include "nact.h"
 #include "sdl_core.h"
 #include "sdl_private.h"
-#include "key.h"
 #include "menu.h"
 #include "input.h"
 #include "msgskip.h"
-#include "sdl_keytable.h"

 static void sdl_getEvent(void);
 static void keyEventProsess(SDL_KeyboardEvent *e, boolean pressed);
@@ -49,6 +48,7 @@ static uint32_t custom_event_type = (uint32_t)-1;

 enum CustomEventCode {
 	SIMULATE_RIGHT_BUTTON,
+	DEBUGGER_COMMAND,
 };

 /* pointer の状態 */
@@ -59,6 +59,128 @@ boolean RawKeyInfo[256];
 /* SDL Joystick */
 static int joyinfo=0;

+static int sdl_keytable[SDL_NUM_SCANCODES] = {
+	[SDL_SCANCODE_A] = KEY_A,
+	[SDL_SCANCODE_B] = KEY_B,
+	[SDL_SCANCODE_C] = KEY_C,
+	[SDL_SCANCODE_D] = KEY_D,
+	[SDL_SCANCODE_E] = KEY_E,
+	[SDL_SCANCODE_F] = KEY_F,
+	[SDL_SCANCODE_G] = KEY_G,
+	[SDL_SCANCODE_H] = KEY_H,
+	[SDL_SCANCODE_I] = KEY_I,
+	[SDL_SCANCODE_J] = KEY_J,
+	[SDL_SCANCODE_K] = KEY_K,
+	[SDL_SCANCODE_L] = KEY_L,
+	[SDL_SCANCODE_M] = KEY_M,
+	[SDL_SCANCODE_N] = KEY_N,
+	[SDL_SCANCODE_O] = KEY_O,
+	[SDL_SCANCODE_P] = KEY_P,
+	[SDL_SCANCODE_Q] = KEY_Q,
+	[SDL_SCANCODE_R] = KEY_R,
+	[SDL_SCANCODE_S] = KEY_S,
+	[SDL_SCANCODE_T] = KEY_T,
+	[SDL_SCANCODE_U] = KEY_U,
+	[SDL_SCANCODE_V] = KEY_V,
+	[SDL_SCANCODE_W] = KEY_W,
+	[SDL_SCANCODE_X] = KEY_X,
+	[SDL_SCANCODE_Y] = KEY_Y,
+	[SDL_SCANCODE_Z] = KEY_Z,
+	[SDL_SCANCODE_1] = KEY_1,
+	[SDL_SCANCODE_2] = KEY_2,
+	[SDL_SCANCODE_3] = KEY_3,
+	[SDL_SCANCODE_4] = KEY_4,
+	[SDL_SCANCODE_5] = KEY_5,
+	[SDL_SCANCODE_6] = KEY_6,
+	[SDL_SCANCODE_7] = KEY_7,
+	[SDL_SCANCODE_8] = KEY_8,
+	[SDL_SCANCODE_9] = KEY_9,
+	[SDL_SCANCODE_0] = KEY_0,
+	[SDL_SCANCODE_RETURN] = KEY_RETURN,
+	[SDL_SCANCODE_ESCAPE] = KEY_ESCAPE,
+	[SDL_SCANCODE_BACKSPACE] = KEY_BACKSPACE,
+	[SDL_SCANCODE_TAB] = KEY_TAB,
+	[SDL_SCANCODE_SPACE] = KEY_SPACE,
+	// SDL_SCANCODE_MINUS
+	// SDL_SCANCODE_EQUALS
+	// SDL_SCANCODE_LEFTBRACKET
+	// SDL_SCANCODE_RIGHTBRACKET
+	// SDL_SCANCODE_BACKSLASH
+	// SDL_SCANCODE_NONUSHASH
+	// SDL_SCANCODE_SEMICOLON
+	// SDL_SCANCODE_APOSTROPHE
+	// SDL_SCANCODE_GRAVE
+	// SDL_SCANCODE_COMMA
+	// SDL_SCANCODE_PERIOD
+	// SDL_SCANCODE_SLASH
+	[SDL_SCANCODE_CAPSLOCK] = KEY_CAPSLOCK,
+	[SDL_SCANCODE_F1] = KEY_F1,
+	[SDL_SCANCODE_F2] = KEY_F2,
+	[SDL_SCANCODE_F3] = KEY_F3,
+	[SDL_SCANCODE_F4] = KEY_F4,
+	[SDL_SCANCODE_F5] = KEY_F5,
+	[SDL_SCANCODE_F6] = KEY_F6,
+	[SDL_SCANCODE_F7] = KEY_F7,
+	[SDL_SCANCODE_F8] = KEY_F8,
+	[SDL_SCANCODE_F9] = KEY_F9,
+	[SDL_SCANCODE_F10] = KEY_F10,
+	[SDL_SCANCODE_F11] = KEY_F11,
+	[SDL_SCANCODE_F12] = KEY_F12,
+	[SDL_SCANCODE_PRINTSCREEN] = KEY_PRINTSCREEN,
+	[SDL_SCANCODE_SCROLLLOCK] = KEY_SCROLLLOCK,
+	[SDL_SCANCODE_PAUSE] = KEY_PAUSE,
+	[SDL_SCANCODE_INSERT] = KEY_INSERT,
+	[SDL_SCANCODE_HOME] = KEY_HOME,
+	[SDL_SCANCODE_PAGEUP] = KEY_PAGEUP,
+	[SDL_SCANCODE_DELETE] = KEY_DELETE,
+	[SDL_SCANCODE_END] = KEY_END,
+	[SDL_SCANCODE_PAGEDOWN] = KEY_PAGEDOWN,
+	[SDL_SCANCODE_RIGHT] = KEY_RIGHT,
+	[SDL_SCANCODE_LEFT] = KEY_LEFT,
+	[SDL_SCANCODE_DOWN] = KEY_DOWN,
+	[SDL_SCANCODE_UP] = KEY_UP,
+	[SDL_SCANCODE_KP_DIVIDE] = KEY_PAD_DIVIDE,
+	[SDL_SCANCODE_KP_MULTIPLY] = KEY_PAD_MULTIPLY,
+	[SDL_SCANCODE_KP_MINUS] = KEY_PAD_MINUS,
+	[SDL_SCANCODE_KP_PLUS] = KEY_PAD_PLUS,
+	[SDL_SCANCODE_KP_ENTER] = KEY_RETURN,
+	[SDL_SCANCODE_KP_1] = KEY_PAD_1,
+	[SDL_SCANCODE_KP_2] = KEY_PAD_2,
+	[SDL_SCANCODE_KP_3] = KEY_PAD_3,
+	[SDL_SCANCODE_KP_4] = KEY_PAD_4,
+	[SDL_SCANCODE_KP_5] = KEY_PAD_5,
+	[SDL_SCANCODE_KP_6] = KEY_PAD_6,
+	[SDL_SCANCODE_KP_7] = KEY_PAD_7,
+	[SDL_SCANCODE_KP_8] = KEY_PAD_8,
+	[SDL_SCANCODE_KP_9] = KEY_PAD_9,
+	[SDL_SCANCODE_KP_0] = KEY_PAD_0,
+	[SDL_SCANCODE_KP_PERIOD] = KEY_PAD_PERIOD,
+	[SDL_SCANCODE_KP_EQUALS] = KEY_PAD_EQUALS,
+	[SDL_SCANCODE_F13] = KEY_F13,
+	[SDL_SCANCODE_F14] = KEY_F14,
+	[SDL_SCANCODE_F15] = KEY_F15,
+	[SDL_SCANCODE_F16] = KEY_F16,
+	[SDL_SCANCODE_F17] = KEY_F17,
+	[SDL_SCANCODE_F18] = KEY_F18,
+	[SDL_SCANCODE_F19] = KEY_F19,
+	[SDL_SCANCODE_F20] = KEY_F20,
+	[SDL_SCANCODE_F21] = KEY_F21,
+	[SDL_SCANCODE_F22] = KEY_F22,
+	[SDL_SCANCODE_F23] = KEY_F23,
+	[SDL_SCANCODE_F24] = KEY_F24,
+	[SDL_SCANCODE_EXECUTE] = KEY_EXECUTE,
+	[SDL_SCANCODE_HELP] = KEY_HELP,
+	[SDL_SCANCODE_SELECT] = KEY_SELECT,
+	[SDL_SCANCODE_CLEAR] = KEY_CLEAR,
+	[SDL_SCANCODE_SEPARATOR] = KEY_SEPARATOR,
+	[SDL_SCANCODE_LCTRL] = KEY_CTRL,
+	[SDL_SCANCODE_LSHIFT] = KEY_SHIFT,
+	[SDL_SCANCODE_LALT] = KEY_ALT,
+	[SDL_SCANCODE_RCTRL] = KEY_CTRL,
+	[SDL_SCANCODE_RSHIFT] = KEY_SHIFT,
+	[SDL_SCANCODE_RALT] = KEY_ALT,
+};
+
 void sdl_event_init(void) {
 	if (custom_event_type == (uint32_t)-1)
 		custom_event_type = SDL_RegisterEvents(1);
@@ -101,6 +223,12 @@ void send_agsevent(enum agsevent_type type, int code) {
 	nact->ags.eventcb(&agse);  // Async in emscripten
 }

+void sdl_setCursorInternalLocation(int x, int y) {
+	mousex = x;
+	mousey = y;
+	send_agsevent(AGSEVENT_MOUSE_MOTION, 0);
+}
+
 // Improves map navigation of Rance4 v2. See also the function comment of
 // rance4_Y3_IM_hack() in cmdy.c.
 static void rance4v2_hack(void) {
@@ -113,190 +241,205 @@ static void rance4v2_hack(void) {
 		nact->wait_vsync = FALSE;
 }

+void sdl_handle_event(SDL_Event *e) {
+	if (sdl_custom_event_handler && sdl_custom_event_handler(e))
+		return;
+
+	switch (e->type) {
+	case SDL_QUIT:
+		menu_quitmenu_open();
+		break;
+
+	case SDL_WINDOWEVENT:
+		switch (e->window.event) {
+		case SDL_WINDOWEVENT_EXPOSED:
+			sdl_dirty = TRUE;
+			break;
+		}
+		break;
+#ifdef _WIN32
+	case SDL_SYSWMEVENT:
+		win_menu_onsyswmevent(e->syswm.msg);
+		break;
+#endif
+	case SDL_APP_DIDENTERFOREGROUND:
+		sdl_dirty = TRUE;
+		break;
+	case SDL_KEYDOWN:
+		keyEventProsess(&e->key, TRUE);
+		break;
+	case SDL_KEYUP:
+		keyEventProsess(&e->key, FALSE);
+		switch (e->key.keysym.sym) {
+		case SDLK_F1:
+			msgskip_activate(!msgskip_isActivated());
+			break;
+		case SDLK_F4:
+			sdl_setFullscreen(!sdl_fs_on);
+			break;
+		}
+		break;
+	case SDL_MOUSEMOTION:
+		sdl_setCursorInternalLocation(e->motion.x, e->motion.y);
+		break;
+
+	case SDL_MOUSEWHEEL:
+		{
+			int y = e->wheel.y * (e->wheel.direction == SDL_MOUSEWHEEL_FLIPPED ? -1 : 1);
+			if (y > 0)
+				mouse_wheel_up += y;
+			else if (y < 0)
+				mouse_wheel_down -= y;
+			send_agsevent(AGSEVENT_MOUSE_WHEEL, y);
+			break;
+		}
+
+	case SDL_MOUSEBUTTONDOWN:
+		mouseb |= (1 << e->button.button);
+		RawKeyInfo[mouse_to_rawkey(e->button.button)] = TRUE;
+		send_agsevent(AGSEVENT_BUTTON_PRESS, mouse_to_agsevent(e->button.button));
+		break;
+
+	case SDL_MOUSEBUTTONUP:
+		mouseb &= (0xffffffff ^ (1 << e->button.button));
+		RawKeyInfo[mouse_to_rawkey(e->button.button)] = FALSE;
+		send_agsevent(AGSEVENT_BUTTON_RELEASE, mouse_to_agsevent(e->button.button));
+		if (e->button.button == 2) {
+			menu_open();
+		}
+		break;
+
+	case SDL_FINGERDOWN:
+		if (SDL_GetNumTouchFingers(e->tfinger.touchId) >= 2) {
+			mouseb &= ~(1 << SDL_BUTTON_LEFT);
+			mouseb |= 1 << SDL_BUTTON_RIGHT;
+			RawKeyInfo[mouse_to_rawkey(SDL_BUTTON_LEFT)] = FALSE;
+			RawKeyInfo[mouse_to_rawkey(SDL_BUTTON_RIGHT)] = TRUE;
+			send_agsevent(AGSEVENT_BUTTON_PRESS, AGSEVENT_BUTTON_RIGHT);
+		} else {
+			// SDL_RendererEventWatch clamps touch locations outside of the
+			// viewport to 0.0-1.0. Treat such events as right-clicks.
+			int button;
+			if  (e->tfinger.x == 0.0f || e->tfinger.x == 1.0f || e->tfinger.y == 0.0f || e->tfinger.y == 1.0f) {
+				button = SDL_BUTTON_RIGHT;
+			} else {
+				button = SDL_BUTTON_LEFT;
+				mousex = e->tfinger.x * view_w;
+				mousey = e->tfinger.y * view_h;
+				send_agsevent(AGSEVENT_MOUSE_MOTION, 0);
+			}
+			mouseb |= 1 << button;
+			RawKeyInfo[mouse_to_rawkey(button)] = TRUE;
+			send_agsevent(AGSEVENT_BUTTON_PRESS, mouse_to_agsevent(button));
+		}
+		break;
+
+	case SDL_FINGERUP:
+		if (SDL_GetNumTouchFingers(e->tfinger.touchId) == 0) {
+			int ags_button = (mouseb & 1 << SDL_BUTTON_LEFT) ? AGSEVENT_BUTTON_LEFT : AGSEVENT_BUTTON_RIGHT;
+			mouseb &= ~(1 << SDL_BUTTON_LEFT | 1 << SDL_BUTTON_RIGHT);
+			RawKeyInfo[mouse_to_rawkey(SDL_BUTTON_LEFT)] = FALSE;
+			RawKeyInfo[mouse_to_rawkey(SDL_BUTTON_RIGHT)] = FALSE;
+			mousex = e->tfinger.x * view_w;
+			mousey = e->tfinger.y * view_h;
+			send_agsevent(AGSEVENT_BUTTON_RELEASE, ags_button);
+		}
+		break;
+
+	case SDL_FINGERMOTION:
+		mousex = e->tfinger.x * view_w;
+		mousey = e->tfinger.y * view_h;
+		send_agsevent(AGSEVENT_MOUSE_MOTION, 0);
+		break;
+
+	case SDL_JOYDEVICEADDED:
+		sdl_joy_open(e->jdevice.which);
+		break;
+
+	case SDL_JOYAXISMOTION:
+		if (abs(e->jaxis.value) < 0x4000) {
+			joyinfo &= e->jaxis.axis == 0 ? ~0xc : ~3;
+		} else {
+			int i = (e->jaxis.axis == 0 ? 2 : 0) +
+				(e->jaxis.value > 0 ? 1 : 0);
+			joyinfo |= 1 << i;
+		}
+		break;
+
+	case SDL_JOYBALLMOTION:
+		break;
+
+	case SDL_JOYHATMOTION:
+		joyinfo &= ~(SYS35KEY_UP | SYS35KEY_DOWN | SYS35KEY_LEFT | SYS35KEY_RIGHT);
+		switch (e->jhat.value) {
+		case SDL_HAT_UP:        joyinfo |= SYS35KEY_UP;    break;
+		case SDL_HAT_DOWN:      joyinfo |= SYS35KEY_DOWN;  break;
+		case SDL_HAT_LEFT:      joyinfo |= SYS35KEY_LEFT;  break;
+		case SDL_HAT_RIGHT:     joyinfo |= SYS35KEY_RIGHT; break;
+		case SDL_HAT_LEFTUP:    joyinfo |= SYS35KEY_LEFT  | SYS35KEY_UP;   break;
+		case SDL_HAT_RIGHTUP:   joyinfo |= SYS35KEY_RIGHT | SYS35KEY_UP;   break;
+		case SDL_HAT_LEFTDOWN:  joyinfo |= SYS35KEY_LEFT  | SYS35KEY_DOWN; break;
+		case SDL_HAT_RIGHTDOWN: joyinfo |= SYS35KEY_RIGHT | SYS35KEY_DOWN; break;
+		}
+		break;
+
+	case SDL_JOYBUTTONDOWN:
+	case SDL_JOYBUTTONUP:
+		{
+			int mask = 0;
+			switch (e->jbutton.button) {
+			case 0: case 1: case 2: case 3:
+				mask = 1 << (e->jbutton.button + 4);
+				break;
+#ifdef __EMSCRIPTEN__
+			// Gamepads known to browsers get a "standard" mapping where D-pad
+			// keys are mapped to buttons 12-15.
+			case 12: mask = SYS35KEY_UP;    break;
+			case 13: mask = SYS35KEY_DOWN;  break;
+			case 14: mask = SYS35KEY_LEFT;  break;
+			case 15: mask = SYS35KEY_RIGHT; break;
+#endif
+			}
+			if (mask) {
+				if (e->jbutton.state == SDL_PRESSED)
+					joyinfo |= mask;
+				else
+					joyinfo &= ~mask;
+			}
+		}
+		break;
+	default:
+		if (e->type == custom_event_type) {
+			switch (e->user.code) {
+			case SIMULATE_RIGHT_BUTTON:
+				if ((intptr_t)e->user.data1) {
+					mouseb |= 1 << SDL_BUTTON_RIGHT;
+					RawKeyInfo[KEY_MOUSE_RIGHT] = TRUE;
+					send_agsevent(AGSEVENT_BUTTON_PRESS, AGSEVENT_BUTTON_RIGHT);
+				} else {
+					mouseb &= ~(1 << SDL_BUTTON_RIGHT);
+					RawKeyInfo[KEY_MOUSE_RIGHT] = FALSE;
+					send_agsevent(AGSEVENT_BUTTON_RELEASE, AGSEVENT_BUTTON_RIGHT);
+				}
+				break;
+			case DEBUGGER_COMMAND:
+				dbg_post_command(e->user.data1);
+				break;
+			}
+		}
+		break;
+	}
+}
+
 /* Event処理 */
 static void sdl_getEvent(void) {
 	static int cmd_count_of_prev_input = -1;
-	SDL_Event e;
-	boolean m2b = FALSE, msg_skip = FALSE;
 	boolean had_input = false;

+	SDL_Event e;
 	while (SDL_PollEvent(&e)) {
 		had_input = true;
-
-		if (sdl_custom_event_handler && sdl_custom_event_handler(&e))
-			continue;
-
-		switch (e.type) {
-		case SDL_QUIT:
-			menu_quitmenu_open();
-			break;
-
-		case SDL_WINDOWEVENT:
-			switch (e.window.event) {
-			case SDL_WINDOWEVENT_EXPOSED:
-				sdl_dirty = TRUE;
-				break;
-			}
-			break;
-#ifdef _WIN32
-		case SDL_SYSWMEVENT:
-			win_menu_onsyswmevent(e.syswm.msg);
-			break;
-#endif
-		case SDL_APP_DIDENTERFOREGROUND:
-			sdl_dirty = TRUE;
-			break;
-		case SDL_KEYDOWN:
-			keyEventProsess(&e.key, TRUE);
-			break;
-		case SDL_KEYUP:
-			keyEventProsess(&e.key, FALSE);
-			switch (e.key.keysym.sym) {
-			case SDLK_F1:
-				msg_skip = TRUE;
-				break;
-			case SDLK_F4:
-				sdl_setFullscreen(!sdl_fs_on);
-				break;
-			}
-			break;
-		case SDL_MOUSEMOTION:
-			mousex = e.motion.x;
-			mousey = e.motion.y;
-			send_agsevent(AGSEVENT_MOUSE_MOTION, 0);
-			break;
-
-		case SDL_MOUSEWHEEL:
-			{
-				int y = e.wheel.y * (e.wheel.direction == SDL_MOUSEWHEEL_FLIPPED ? -1 : 1);
-				if (y > 0)
-					mouse_wheel_up += y;
-				else if (y < 0)
-					mouse_wheel_down -= y;
-				send_agsevent(AGSEVENT_MOUSE_WHEEL, y);
-				break;
-			}
-
-		case SDL_MOUSEBUTTONDOWN:
-			mouseb |= (1 << e.button.button);
-			RawKeyInfo[mouse_to_rawkey(e.button.button)] = TRUE;
-			send_agsevent(AGSEVENT_BUTTON_PRESS, mouse_to_agsevent(e.button.button));
-			break;
-
-		case SDL_MOUSEBUTTONUP:
-			mouseb &= (0xffffffff ^ (1 << e.button.button));
-			RawKeyInfo[mouse_to_rawkey(e.button.button)] = FALSE;
-			send_agsevent(AGSEVENT_BUTTON_RELEASE, mouse_to_agsevent(e.button.button));
-			if (e.button.button == 2) {
-				m2b = TRUE;
-			}
-			break;
-
-		case SDL_FINGERDOWN:
-			if (SDL_GetNumTouchFingers(e.tfinger.touchId) >= 2) {
-				mouseb &= ~(1 << SDL_BUTTON_LEFT);
-				mouseb |= 1 << SDL_BUTTON_RIGHT;
-				RawKeyInfo[mouse_to_rawkey(SDL_BUTTON_LEFT)] = FALSE;
-				RawKeyInfo[mouse_to_rawkey(SDL_BUTTON_RIGHT)] = TRUE;
-				send_agsevent(AGSEVENT_BUTTON_PRESS, AGSEVENT_BUTTON_RIGHT);
-			} else {
-				// SDL_RendererEventWatch clamps touch locations outside of the
-				// viewport to 0.0-1.0. Treat such events as right-clicks.
-				int button;
-				if  (e.tfinger.x == 0.0f || e.tfinger.x == 1.0f || e.tfinger.y == 0.0f || e.tfinger.y == 1.0f) {
-					button = SDL_BUTTON_RIGHT;
-				} else {
-					button = SDL_BUTTON_LEFT;
-					mousex = e.tfinger.x * view_w;
-					mousey = e.tfinger.y * view_h;
-					send_agsevent(AGSEVENT_MOUSE_MOTION, 0);
-				}
-				mouseb |= 1 << button;
-				RawKeyInfo[mouse_to_rawkey(button)] = TRUE;
-				send_agsevent(AGSEVENT_BUTTON_PRESS, mouse_to_agsevent(button));
-			}
-			break;
-
-		case SDL_FINGERUP:
-			if (SDL_GetNumTouchFingers(e.tfinger.touchId) == 0) {
-				int ags_button = (mouseb & 1 << SDL_BUTTON_LEFT) ? AGSEVENT_BUTTON_LEFT : AGSEVENT_BUTTON_RIGHT;
-				mouseb &= ~(1 << SDL_BUTTON_LEFT | 1 << SDL_BUTTON_RIGHT);
-				RawKeyInfo[mouse_to_rawkey(SDL_BUTTON_LEFT)] = FALSE;
-				RawKeyInfo[mouse_to_rawkey(SDL_BUTTON_RIGHT)] = FALSE;
-				mousex = e.tfinger.x * view_w;
-				mousey = e.tfinger.y * view_h;
-				send_agsevent(AGSEVENT_BUTTON_RELEASE, ags_button);
-			}
-			break;
-
-		case SDL_FINGERMOTION:
-			mousex = e.tfinger.x * view_w;
-			mousey = e.tfinger.y * view_h;
-			send_agsevent(AGSEVENT_MOUSE_MOTION, 0);
-			break;
-
-		case SDL_JOYDEVICEADDED:
-			sdl_joy_open(e.jdevice.which);
-			break;
-
-		case SDL_JOYAXISMOTION:
-			if (abs(e.jaxis.value) < 0x4000) {
-				joyinfo &= e.jaxis.axis == 0 ? ~0xc : ~3;
-			} else {
-				int i = (e.jaxis.axis == 0 ? 2 : 0) +
-						(e.jaxis.value > 0 ? 1 : 0);
-				joyinfo |= 1 << i;
-			}
-			break;
-
-		case SDL_JOYBALLMOTION:
-			break;
-
-		case SDL_JOYHATMOTION:
-			joyinfo &= ~(SYS35KEY_UP | SYS35KEY_DOWN | SYS35KEY_LEFT | SYS35KEY_RIGHT);
-			switch (e.jhat.value) {
-			case SDL_HAT_UP:        joyinfo |= SYS35KEY_UP;    break;
-			case SDL_HAT_DOWN:      joyinfo |= SYS35KEY_DOWN;  break;
-			case SDL_HAT_LEFT:      joyinfo |= SYS35KEY_LEFT;  break;
-			case SDL_HAT_RIGHT:     joyinfo |= SYS35KEY_RIGHT; break;
-			case SDL_HAT_LEFTUP:    joyinfo |= SYS35KEY_LEFT  | SYS35KEY_UP;   break;
-			case SDL_HAT_RIGHTUP:   joyinfo |= SYS35KEY_RIGHT | SYS35KEY_UP;   break;
-			case SDL_HAT_LEFTDOWN:  joyinfo |= SYS35KEY_LEFT  | SYS35KEY_DOWN; break;
-			case SDL_HAT_RIGHTDOWN: joyinfo |= SYS35KEY_RIGHT | SYS35KEY_DOWN; break;
-			}
-			break;
-
-		case SDL_JOYBUTTONDOWN:
-		case SDL_JOYBUTTONUP:
-			if (e.jbutton.button < 4) {
-				int i = 1 << (e.jbutton.button+4);
-				if (e.jbutton.state == SDL_PRESSED)
-					joyinfo |= i;
-				else
-					joyinfo &= ~i;
-			} else {
-				if (e.jbutton.state == SDL_RELEASED) {
-				}
-			}
-			break;
-		default:
-			if (e.type == custom_event_type) {
-				switch (e.user.code) {
-				case SIMULATE_RIGHT_BUTTON:
-					if ((intptr_t)e.user.data1) {
-						mouseb |= 1 << SDL_BUTTON_RIGHT;
-						RawKeyInfo[KEY_MOUSE_RIGHT] = TRUE;
-						send_agsevent(AGSEVENT_BUTTON_PRESS, AGSEVENT_BUTTON_RIGHT);
-					} else {
-						mouseb &= ~(1 << SDL_BUTTON_RIGHT);
-						RawKeyInfo[KEY_MOUSE_RIGHT] = FALSE;
-						send_agsevent(AGSEVENT_BUTTON_RELEASE, AGSEVENT_BUTTON_RIGHT);
-					}
-					break;
-				}
-			}
-			break;
-		}
+		sdl_handle_event(&e);
 	}
 	if (had_input) {
 		cmd_count_of_prev_input = nact->cmd_count;
@@ -305,12 +448,6 @@ static void sdl_getEvent(void) {
 		if (nact->game == GAME_RANCE4_V2)
 			rance4v2_hack();
 	}
-	
-	if (m2b) {
-		menu_open();
-	}
-	
-	if (msg_skip) msgskip_activate(!msgskip_isActivated());
 }

 /* キー情報の取得 */
@@ -331,7 +468,7 @@ int sdl_getKeyInfo() {
 	      ((RawKeyInfo[KEY_RIGHT] || RawKeyInfo[KEY_PAD_6]) << 3) |
 	      (RawKeyInfo[KEY_RETURN] << 4) |
 	      (RawKeyInfo[KEY_SPACE ] << 5) |
-	      (RawKeyInfo[KEY_ESC]    << 6) |
+	      (RawKeyInfo[KEY_ESCAPE] << 6) |
 	      (RawKeyInfo[KEY_TAB]    << 7));
 	
 	return rt;
@@ -368,6 +505,17 @@ int sdl_getJoyInfo(void) {
 	return joyinfo;
 }

+void sdl_post_debugger_command(void *data) {
+	SDL_Event event = {
+		.user = {
+			.type = custom_event_type,
+			.code = DEBUGGER_COMMAND,
+			.data1 = data
+		}
+	};
+	SDL_PushEvent(&event);
+}
+
 #ifdef __EMSCRIPTEN__
 EMSCRIPTEN_KEEPALIVE
 void simulate_right_button(int pressed) {
@@ -34,8 +34,6 @@
 #include "alpha_plane.h"
 #include "image.h"

-static unsigned char shlv_tbl[256*256];
-
 /*
 * dib内での拡大・縮小コピー
 */
@@ -47,7 +45,7 @@ void sdl_scaledCopyArea(int sx, int sy, int sw, int sh, int dx, int dy, int dw,
 	SDL_Surface *src = sdl_dib;
 	SDL_Surface *dst = sdl_dib;
 	
-	ss = SDL_CreateRGBSurface(0, dw, dh, dst->format->BitsPerPixel, 0, 0, 0, 0);
+	ss = SDL_CreateRGBSurfaceWithFormat(0, dw, dh, dst->format->BitsPerPixel, dst->format->format);
 	
 	if (dst->format->BitsPerPixel == 8) {
 		memcpy(ss->format->palette->colors, dst->format->palette->colors,
@@ -142,40 +140,43 @@ void sdl_drawImage16_fromData(cgdata *cg, int dx, int dy, int brightness, bool a
 	int w = cg->width;
 	int h = cg->height;

-	SDL_Surface *s;
-	if (cg->alpha && alpha_blend) {
-		unsigned short *p_src = (uint16_t *)cg->pic;
-		uint32_t *p_ds, *p_dst;
+	if (cg->alpha) {
 		uint8_t *a_src = cg->alpha;
 		uint8_t *adata = GETOFFSET_ALPHA(sdl_dibinfo, dx, dy);
-		int x, y, l;
-		
-		s = SDL_CreateRGBSurfaceWithFormat(0, w, h, 32, SDL_PIXELFORMAT_ARGB8888);
-		p_ds = s->pixels;
-		l = s->pitch/4;
-		for (y = 0; y < h; y++) {
-			p_dst = p_ds;
+
+		for (int i = 0; i < h; i++) {
 			memcpy(adata, a_src, w);
-			for (x = 0; x < w; x++) {
-				*p_dst++ = *a_src++ << 24 | PIX24(PIXR16(*p_src), PIXG16(*p_src), PIXB16(*p_src));
-				p_src++;
-			}
-			p_ds  += l;
 			adata += sdl_dibinfo->width;
+			a_src += cg->width;
+		}
+	}
+
+	SDL_Surface *s;
+	if (cg->alpha && alpha_blend) {
+		uint16_t *p_src = (uint16_t *)cg->pic;
+		uint8_t *a_src = cg->alpha;
+		s = SDL_CreateRGBSurfaceWithFormat(0, w, h, 32, SDL_PIXELFORMAT_ARGB8888);
+		for (int y = 0; y < h; y++) {
+			uint32_t *dst = (uint32_t *)(((uint8_t *)s->pixels) + y * s->pitch);
+			for (int x = 0; x < w; x++) {
+				*dst++ = rgb565_to_rgb888(*p_src++) | *a_src++ << 24;
+			}
+		}
+	} else if (sdl_dibinfo->depth > 16) {
+		// Convert to RGB888 by ourselves. SDL blit functions use a slightly
+		// different mapping, so the color expanded by SDL may not match the
+		// color key specified in the CX command.
+		uint16_t *src = (uint16_t *)cg->pic;
+		s = SDL_CreateRGBSurfaceWithFormat(0, w, h, 32, SDL_PIXELFORMAT_RGB888);
+		for (int y = 0; y < h; y++) {
+			uint32_t *dst = (uint32_t *)(((uint8_t *)s->pixels) + y * s->pitch);
+			for (int x = 0; x < w; x++) {
+				*dst++ = rgb565_to_rgb888(*src++);
+			}
 		}
 	} else {
 		s = SDL_CreateRGBSurfaceWithFormatFrom(
 			cg->pic, cg->width, cg->height, 16, cg->width * 2, SDL_PIXELFORMAT_RGB565);
-		if (cg->alpha) {
-			uint8_t *a_src = cg->alpha;
-			uint8_t *adata = GETOFFSET_ALPHA(sdl_dibinfo, dx, dy);
-			
-			for (int i = 0; i < h; i++) {
-				memcpy(adata, a_src, w);
-				adata += sdl_dibinfo->width;
-				a_src += cg->width;
-			}
-		}
 	}

 	if (brightness != 255)
@@ -203,65 +204,31 @@ void sdl_drawImage24_fromData(cgdata *cg, int x, int y, int brightness) {
 	SDL_FreeSurface(s);
 }

-/*
- * 16bit専用の dib の指定領域コピー alphaつき
- */
-void sdl_shadow_init(void) {
-	int i, j;
-	unsigned char *c = shlv_tbl;
-
-	for (i = 0; i < 255; i++) {
-		for (j = 0; j < 256; j++) {
-			*(c++) = (unsigned char)(i * j / 255);
-		}
-	}
-}
-
 void sdl_copyAreaSP16_shadow(int sx, int sy, int w, int h, int dx, int dy, int lv) {
-	uint8_t *adata = GETOFFSET_ALPHA(sdl_dibinfo, sx, sy);
-	uint8_t *p_src, *p_dst, *p_ds;
-	
 	SDL_Surface *s = SDL_CreateRGBSurfaceWithFormat(0, w, h, 32, SDL_PIXELFORMAT_ARGB8888);
-	int x, y;

 	SDL_Rect r_src = {sx, sy, w, h};
 	SDL_Rect r_tmp = { 0,  0, w, h};
 	SDL_BlitSurface(sdl_dib, &r_src, s, &r_tmp);

 #if SDL_BYTEORDER == SDL_LIL_ENDIAN
-	p_ds = s->pixels + 3;
+	uint8_t *p_ds = s->pixels + 3;
 #else
-	p_ds = s->pixels;
+	uint8_t *p_ds = s->pixels;
 #endif
-	switch(lv) {
-	case 255:
-		for (y = 0; y < h; y++) {
-			p_src = adata;
-			p_dst = p_ds;
-			for (x = 0; x < w; x++) {
-				*p_dst = *(p_src++);
-				p_dst += 4;
-			}
-			adata += sdl_dibinfo->width;
-			p_ds  += s->pitch;
+	uint8_t *adata = GETOFFSET_ALPHA(sdl_dibinfo, sx, sy);
+	for (int y = 0; y < h; y++) {
+		uint8_t *p_src = adata;
+		uint8_t *p_dst = p_ds;
+		for (int x = 0; x < w; x++) {
+			*p_dst = *(p_src++);
+			p_dst += 4;
 		}
-		break;
-	default:
-		{
-			unsigned char *lvtbl = shlv_tbl + lv * 256;
-			for (y = 0; y < h; y++) {
-				p_src = adata;
-				p_dst = p_ds;
-				for (x = 0; x < w; x++) {
-					*p_dst = lvtbl[(int)(*(p_src++))];
-					p_dst += 4;
-				}
-				adata += sdl_dibinfo->width;
-				p_ds += s->pitch;
-			}
-		}
-		break;
+		adata += sdl_dibinfo->width;
+		p_ds  += s->pitch;
 	}
+	if (lv < 255)
+		SDL_SetSurfaceAlphaMod(s, lv);

 	SDL_Rect r_dst = {dx, dy, w, h};
 	SDL_BlitSurface(s, &r_tmp, sdl_dib, &r_dst);
@@ -334,9 +301,7 @@ void sdl_getPixel(int x, int y, Palette *cell) {
 * dib から領域の切り出し
 */
 void* sdl_saveRegion(int x, int y, int w, int h) {
-	SDL_Surface *s = SDL_CreateRGBSurface(0, w, h, sdl_dib->format->BitsPerPixel,
-			     sdl_dib->format->Rmask, sdl_dib->format->Gmask,
-			     sdl_dib->format->Bmask, sdl_dib->format->Amask);
+	SDL_Surface *s = SDL_CreateRGBSurfaceWithFormat(0, w, h, sdl_dib->format->BitsPerPixel, sdl_dib->format->format);
 	if (sdl_dib->format->BitsPerPixel == 8)
 		memcpy(s->format->palette->colors, sdl_dib->format->palette->colors,
 		       sizeof(SDL_Color) * sdl_dib->format->palette->ncolors);
@@ -1,73 +0,0 @@
-static int sdl_keytable[SDL_NUM_SCANCODES] = {
-	0, KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, 
-	KEY_A, KEY_B, KEY_C, KEY_D, 
-	KEY_E, KEY_F, KEY_G, KEY_H, 
-	KEY_I, KEY_J, KEY_K, KEY_L, 
-	KEY_M, KEY_N, KEY_O, KEY_P, 
-	KEY_Q, KEY_R, KEY_S, KEY_T, 
-	KEY_U, KEY_V, KEY_W, KEY_X, 
-	KEY_Y, KEY_Z, KEY_1, KEY_2, 
-	KEY_3, KEY_4, KEY_5, KEY_6, 
-	KEY_7, KEY_8, KEY_9, KEY_0, 
-	KEY_RETURN, KEY_ESCAPE, KEY_BACKSPACE, KEY_TAB, 
-	KEY_SPACE, 45, 46, 47, 
-	48, 49, 50, 51, 
-	52, 53, 54, 55, 
-	56, KEY_CAPSLOCK, KEY_F1, KEY_F2, 
-	KEY_F3, KEY_F4, KEY_F5, KEY_F6, 
-	KEY_F7, KEY_F8, KEY_F9, KEY_F10, 
-	KEY_F11, KEY_F12, KEY_PRINTSCREEN, 71, 
-	KEY_PAUSE, KEY_INSERT, KEY_HOME, KEY_PAGEUP, 
-	KEY_DELETE, KEY_END, KEY_PAGEDOWN, KEY_RIGHT, 
-	KEY_LEFT, KEY_DOWN, KEY_UP, 83, 
-	KEY_PAD_DIVIDE, KEY_PAD_MULTIPLY, KEY_PAD_MINUS, KEY_PAD_PLUS, 
-	KEY_PAD_ENTER, KEY_PAD_1, KEY_PAD_2, KEY_PAD_3, 
-	KEY_PAD_4, KEY_PAD_5, KEY_PAD_6, KEY_PAD_7, 
-	KEY_PAD_8, KEY_PAD_9, KEY_PAD_0, KEY_PAD_PERIOD, 
-	0 /* SDL_NONUSBACKSLASH */, 0 /* SDL_APPLICATION */, 0 /* SDL_POWER */, KEY_PAD_EQUALS, 
-	KEY_F13, KEY_F14, KEY_F15, KEY_F16, 
-	KEY_F17, KEY_F18, KEY_F19, KEY_F20, 
-	KEY_F21, KEY_F22, KEY_F23, KEY_F24, 
-	KEY_EXECUTE, KEY_HELP, 0 /* SDL_MENU */, KEY_SELECT, 
-	0 /* SDL_STOP */, 0 /* SDL_AGAIN */, 0 /* SDL_UNDO */, 0 /* SDL_CUT */, 
-	0 /* SDL_COPY */, 0 /* SDL_PASTE */, 0 /* SDL_FIND */, 0 /* SDL_MUTE */, 
-	0 /* SDL_VOLUMEUP */, 0 /* SDL_VOLUMEDOWN */, 0 /* SDL_LOCKINGCAPSLOCK */, 0 /* SDL_LOCKINGNUMLOCK */, 
-	0 /* SDL_LOCKINGSCROLLLOCK */, 0 /* SDL_PAD_COMMA */, 0 /* SDL_PAD_EQUALSAS400 */, 0 /* SDL_INTERNATIONAL1 */, 
-	0 /* SDL_INTERNATIONAL2 */, 0 /* SDL_INTERNATIONAL3 */, 0 /* SDL_INTERNATIONAL4 */, 0 /* SDL_INTERNATIONAL5 */, 
-	0 /* SDL_INTERNATIONAL6 */, 0 /* SDL_INTERNATIONAL7 */, 0 /* SDL_INTERNATIONAL8 */, 0 /* SDL_INTERNATIONAL9 */, 
-	0 /* SDL_LANG1 */, 0 /* SDL_LANG2 */, 0 /* SDL_LANG3 */, 0 /* SDL_LANG4 */, 
-	0 /* SDL_LANG5 */, 0 /* SDL_LANG6 */, 0 /* SDL_LANG7 */, 0 /* SDL_LANG8 */, 
-	0 /* SDL_LANG9 */, 0 /* SDL_ALTERASE */, 0 /* SDL_SYSREQ */, 0 /* SDL_CANCEL */, 
-	KEY_CLEAR, 0 /* SDL_PRIOR */, 0 /* SDL_RETURN2 */, 0 /* SDL_SEPARATOR */, 
-	0 /* SDL_OUT */, 0 /* SDL_OPER */, 0 /* SDL_CLEARAGAIN */, 0 /* SDL_CRSEL */, 
-	0 /* SDL_EXSEL */, KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, 
-	KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, 
-	KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, 
-	0 /* SDL_PAD_00 */, 0 /* SDL_PAD_000 */, 0 /* SDL_THOUSANDSSEPARATOR */, 0 /* SDL_DECIMALSEPARATOR */, 
-	0 /* SDL_CURRENCYUNIT */, 0 /* SDL_CURRENCYSUBUNIT */, 0 /* SDL_PAD_LEFTPAREN */, 0 /* SDL_PAD_RIGHTPAREN */, 
-	0 /* SDL_PAD_LEFTBRACE */, 0 /* SDL_PAD_RIGHTBRACE */, 0 /* SDL_PAD_TAB */, 0 /* SDL_PAD_BACKSPACE */, 
-	0 /* SDL_PAD_A */, 0 /* SDL_PAD_B */, 0 /* SDL_PAD_C */, 0 /* SDL_PAD_D */, 
-	0 /* SDL_PAD_E */, 0 /* SDL_PAD_F */, 0 /* SDL_PAD_XOR */, 0 /* SDL_PAD_POWER */, 
-	0 /* SDL_PAD_PERCENT */, 0 /* SDL_PAD_LESS */, 0 /* SDL_PAD_GREATER */, 0 /* SDL_PAD_AMPERSAND */, 
-	0 /* SDL_PAD_DBLAMPERSAND */, 0 /* SDL_PAD_VERTICALBAR */, 0 /* SDL_PAD_DBLVERTICALBAR */, 0 /* SDL_PAD_COLON */, 
-	0 /* SDL_PAD_HASH */, 0 /* SDL_PAD_SPACE */, 0 /* SDL_PAD_AT */, 0 /* SDL_PAD_EXCLAM */, 
-	0 /* SDL_PAD_MEMSTORE */, 0 /* SDL_PAD_MEMRECALL */, 0 /* SDL_PAD_MEMCLEAR */, 0 /* SDL_PAD_MEMADD */, 
-	0 /* SDL_PAD_MEMSUBTRACT */, 0 /* SDL_PAD_MEMMULTIPLY */, 0 /* SDL_PAD_MEMDIVIDE */, 0 /* SDL_PAD_PLUSMINUS */, 
-	0 /* SDL_PAD_CLEAR */, 0 /* SDL_PAD_CLEARENTRY */, 0 /* SDL_PAD_BINARY */, 0 /* SDL_PAD_OCTAL */, 
-	0 /* SDL_PAD_DECIMAL */, 0 /* SDL_PAD_HEXADECIMAL */, KEY_UNDEFINED, KEY_UNDEFINED, 
-	KEY_RCTRL, KEY_RSHIFT, KEY_RALT, 0 /* SDL_LGUI */, 
-	KEY_RCTRL, KEY_RSHIFT, KEY_RALT, 0 /* SDL_RGUI */, 
-	KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, 
-	KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, 
-	KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, 
-	KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, 
-	KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, 
-	KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, KEY_UNDEFINED, 
-	KEY_UNDEFINED, 0 /* SDL_MODE */, 0 /* SDL_AUDIONEXT */, 0 /* SDL_AUDIOPREV */, 
-	0 /* SDL_AUDIOSTOP */, 0 /* SDL_AUDIOPLAY */, 0 /* SDL_AUDIOMUTE */, 0 /* SDL_MEDIASELECT */, 
-	0 /* SDL_WWW */, 0 /* SDL_MAIL */, 0 /* SDL_CALCULATOR */, 0 /* SDL_COMPUTER */, 
-	0 /* SDL_AC_SEARCH */, 0 /* SDL_AC_HOME */, 0 /* SDL_AC_BACK */, 0 /* SDL_AC_FORWARD */, 
-	0 /* SDL_AC_STOP */, 0 /* SDL_AC_REFRESH */, 0 /* SDL_AC_BOOKMARKS */, 0 /* SDL_BRIGHTNESSDOWN */, 
-	0 /* SDL_BRIGHTNESSUP */, 0 /* SDL_DISPLAYSWITCH */, 0 /* SDL_KBDILLUMTOGGLE */, 0 /* SDL_KBDILLUMDOWN */, 
-	0 /* SDL_KBDILLUMUP */, 0 /* SDL_EJECT */, 0 /* SDL_SLEEP */, 0 /* SDL_APP1 */, 
-	0 /* SDL_APP2 */, };
@@ -54,7 +54,6 @@ struct sdl_private_data {

 void sdl_event_init(void);
 void sdl_cursor_init(void);
-void sdl_shadow_init(void);
 int sdl_nearest_color(int r, int g, int b);
 boolean sdl_joy_open(int index);

@@ -86,8 +86,6 @@ int sdl_Initialize(const char *render_driver) {
 	
 	sdl_setWindowSize(SYS35_DEFAULT_WIDTH, SYS35_DEFAULT_HEIGHT);

-	sdl_shadow_init();
-	
 #ifdef __EMSCRIPTEN__
 	// Prevent SDL from calling emscripten_exit_fullscreen on visibilitychange
 	emscripten_set_visibilitychange_callback(NULL, 0, NULL);
@@ -162,12 +160,25 @@ static void makeDIB(int width, int height, int depth) {
 	if (sdl_dib) {
 		SDL_FreeSurface(sdl_dib);
 	}
-	
-	// Graphic routines in modules/ assume 4 bytes/pixel mode for 24-bit surfaces.
-	if (depth == 24)
-		depth = 32;

-	sdl_dib = SDL_CreateRGBSurface(0, width, height, depth, 0, 0, 0, 0);
+	uint32_t format;
+	switch (depth) {
+	case 8:
+		format = SDL_PIXELFORMAT_INDEX8;
+		break;
+	case 16:
+		format = SDL_PIXELFORMAT_RGB565;
+		break;
+	case 24:
+		format = SDL_PIXELFORMAT_RGB888;
+		// Graphic routines in modules/ assume 4 bytes/pixel mode for 24-bit surfaces.
+		depth = 32;
+		break;
+	default:
+		SYSERROR("invalid pixel depth %d", depth);
+	}
+
+	sdl_dib = SDL_CreateRGBSurfaceWithFormat(0, width, height, depth, format);
 	
 	if (sdl_dib->format->BitsPerPixel == 8) {
 		memset(sdl_dib->format->palette->colors, 0, sizeof(SDL_Color)*256);
@@ -309,28 +309,26 @@ static void init_selwindow() {
 	ags_updateArea(saveArea.x, saveArea.y, saveArea.w, saveArea.h);
 	
 	/* マウスカーソルの自動移動 */
+	int x = r.x + r.w * MOUSE_INIT_X_RATIO/100;
 	if (default_element == 0) {
 		MyPoint p;
 		sys_getMouseInfo(&p, TRUE);
 		if (p.y < r.y) {
-			ags_setCursorLocation(r.x + r.w * MOUSE_INIT_X_RATIO/100,
-					      r.y + (sel.MsgFontSize +2) * MOUSE_INIT_Y_RATIO/100,
-					      TRUE);
+			int y = r.y + (sel.MsgFontSize +2) * MOUSE_INIT_Y_RATIO/100;
+			ags_setCursorLocation(x, y, true, true);
 		} else if (p.y > (r.y + r.h)) {
-			ags_setCursorLocation(r.x + r.w * MOUSE_INIT_X_RATIO/100,
-					      r.y + (sel.MsgFontSize +2) * regnum * MOUSE_INIT_Y_RATIO/100,
-					      TRUE);
+			int y = r.y + (sel.MsgFontSize +2) * regnum * MOUSE_INIT_Y_RATIO/100;
+			ags_setCursorLocation(x, y, true, true);
 		} else {
-			ags_setCursorLocation(r.x + r.w * MOUSE_INIT_X_RATIO/100,
-					      p.y * MOUSE_INIT_Y_RATIO/100, 
-					      TRUE);
+			int y = p.y * MOUSE_INIT_Y_RATIO/100;
+			ags_setCursorLocation(x, y, true, true);
 		}
 	} else if (default_element < regnum) {
-		ags_setCursorLocation(r.x + r.w * MOUSE_INIT_X_RATIO/100,
-				      r.y + (sel.MsgFontSize +2) * default_element * MOUSE_INIT_Y_RATIO/100, TRUE);
+		int y = r.y + (sel.MsgFontSize +2) * default_element * MOUSE_INIT_Y_RATIO/100;
+		ags_setCursorLocation(x, y, true, true);
 	} else if (default_element < 1000) {
-		ags_setCursorLocation(r.x + r.w * MOUSE_INIT_X_RATIO/100,
-				      r.y + (sel.MsgFontSize +2) * regnum * MOUSE_INIT_Y_RATIO/100, TRUE);
+		int y = r.y + (sel.MsgFontSize +2) * regnum * MOUSE_INIT_Y_RATIO/100;
+		ags_setCursorLocation(x, y, true, true);
 	}
 }

@@ -71,10 +71,10 @@ static void toggle_mouse_warp_mode(void) {
 		return;

 	if (menuitem.fState & MFS_CHECKED) {
-		nact->ags.mouse_movesw = MOUSE_WARP_DISABLED;
+		nact->ags.mouse_warp_enabled = false;
 		CheckMenuItem(hmenu, ID_OPTION_MOUSE_MOVE, MF_BYCOMMAND | MFS_UNCHECKED);
 	} else {
-		nact->ags.mouse_movesw = MOUSE_WARP_SMOOTH;
+		nact->ags.mouse_warp_enabled = true;
 		CheckMenuItem(hmenu, ID_OPTION_MOUSE_MOVE, MF_BYCOMMAND | MFS_CHECKED);
 	}
 }
@@ -1,6 +1,6 @@
 #!/bin/sh
-# To use this script in MSYS2 shell, install mingw-w64-x86_64-nsis and
-# mingw-w64-x86_64-ntldd-git packages.
+# To use this script in MSYS2 shell, install mingw-w64-ucrt-x86_64-nsis and
+# mingw-w64-ucrt-x86_64-ntldd packages.

 if [ $# -ne 2 ]; then
    echo 'Usage: make-installer.sh <build-dir> <nsi>'
@@ -11,7 +11,7 @@ builddir=$1
 nsi=$2

 echo 'dlls.nsi:'
-ntldd -R $builddir/src/xsystem35.exe |perl -ne 'print "File \"$1\"\n" if /=> (.*) \(/' |grep mingw |tee $builddir/dlls.nsi
+ntldd -R $builddir/src/xsystem35.exe |perl -ne 'print "File \"$1\"\n" if /=> (.*) \(/' |grep 'mingw32\|ucrt64' |tee $builddir/dlls.nsi
 echo

 echo 'dlls-uninstall.nsi:'
@@ -1,50 +0,0 @@
-#! /usr/bin/perl
-
-@key_list=();
-%keyh_list=();
-open(FX,"<key.h") || exit;
-while(<FX>) {
-    if( /^#define KEY_([^\s]*)\s+[(]([^)]*)[)]/ ) {
-	$key_list[eval($2)]="$1";
-	$keyh_list{$1}=eval($2);
-   }
-}
-close(fp);
-
-@sdlk_list=();
-open(FS,"<$ARGV[0]/SDL_scancode.h") || exit;
-while(<FS>) {
-    if( /SDL_SCANCODE_([^\s]+)\s+=\s*([^,]*),/ ) {
-	$sdlk_list[eval($2)]="$1";
-    }
-}
-close(FS);
-
-
-print "static int sdl_keytable[SDL_NUM_SCANCODES] = {\n\t";
-for( $i = 0 ; $i < scalar(@sdlk_list) ; $i ++ ) {
-    #print "$i @sdlk_list[$i] $keyh_list{@sdlk_list[$i]}\n";
-    $x = @sdlk_list[$i];
-    if( length($x) == 0 ) {
-	print "KEY_UNDEFINED, ";
-    } elsif ( $keyh_list{$x} ) {
-	print "KEY_@key_list[$keyh_list{$x}], ";
-    } elsif ( $x =~ /[a-z]/ ) {
-	print "KEY_".uc($x).", ";
-    } elsif ( $x =~ /KP_/ ) {
-	$x =~ s/^KP_/PAD_/;
-	if ( $keyh_list{$x} ) {
-	    print "KEY_$x, ";
-	} else {
-	    print "0 /* SDL_$x */, ";
-	}
-    } elsif ( $i < 0x61) {
-	print "$i, ";
-    } else {
-	print "0 /* SDL_$x */, ";
-    }
-    if(($i % 4) == 3 ) {
-	print "\n\t";
-    }
-}
-print "};\n";
Author	SHA1	Message	Date
kichikuou	3314f00bf8	Fix cdGetMaxTrack for download edition of Daiakuji It should return the maximum index of the BGM archive. Fixes #43.	2023-12-09 14:57:01 +09:00
kichikuou	a2d79f045c	Version 2.10.0	2023-12-09 13:08:30 +09:00
kichikuou	f247495578	Breaking change: Fix ShArray.ChangeSecretArray This breaks save file compatibility for Daiakuji and Kaeru nyo Kuni nyo Alice. Due to an incorrect encryption code in ShArray.ChangeSecretArray, save files were not interoperable with system3.9. (Even worse, this bug did not affect the checksum calculation and did not cause a "corrupt save file" error when a file saved with system3.9 was loaded with xsystem35 or vice versa.) Fixes #41.	2023-12-09 11:35:40 +09:00
kichikuou	f6583330de	debugger_dap: Fix a bug that seq of outgoing messages was not increasing	2023-12-08 08:57:56 +09:00
kichikuou	4b15f45897	debugger: Add custom DAP messages for communicating palette changes This implements "xsystem35.palette" custom request and "xsystem35.paletteChanged" custom event. The "xsystem35.palette" request retrieves the color values of the AGS palette. interface PaletteRequest extends Request { command: 'xsystem35.palette'; } interface PaletteResponse extends Response { body: { /** * A number that increases each time the palette changes. / version: number; /* * 256 element array containing color values in 0xRRGGBB format. / palette: number[]; }; } The "xsystem35.paletteChanged" event indicates that the AGS palette has changed. interface PaletteChangedEvent extends Event { event: 'xsystem35.paletteChanged'; body: { /* * A number that increases each time the palette changes. */ version: number; }; } DAP clients can know if the received value is up to date by comparing the `version` values of paletteChanged and PaletteResponse.	2023-12-08 08:35:45 +09:00
kichikuou	7bc433731f	CI: Fix Android build AGP 8.0 requires JDK 17.	2023-11-17 13:00:56 +09:00
kichikuou	4c21570eb1	Android: Upgrade SDL to 2.28.5	2023-11-17 12:15:17 +09:00
kichikuou	a3e7feffc2	Switch Windows 64-bit build from mingw64 to ucrt64	2023-11-17 09:08:24 +09:00
kichikuou	a4c1dd1acf	Remove unused MOUSE_WARP_DIRECT mode	2023-09-04 17:14:17 +09:00
kichikuou	09086ccc85	IZ command: add delay even if mouse movement is disabled Without it, it's hard to exit camp mode in TT2.	2023-09-04 17:03:06 +09:00
kichikuou	53e39b7c11	emscripten: Call xsystem35.shell.showMouseMoveEffect() See kichikuou/web@07a6118 for details.	2023-09-04 13:32:04 +09:00
kichikuou	f0ccfee40f	Update internal mouse coordinates even if cursor movement is disabled In TT2, keyboard/gamepad navigation is implemented by moving the mouse cursor using IZ command. It did not work in browsers where mouse cursor could not be moved or when mouse movement was disabled from the menu. Now IZ command updates the internal mouse coordinates even when the cursor cannot be moved.	2023-09-04 13:32:00 +09:00
kichikuou	10cdec98e6	emscripten: Improve gamepads support In the W3C gamepad API, many gamepads are mapped to the "standard layout", where D-pad keys are mapped to buttons 12-15.	2023-09-03 22:41:12 +09:00
kichikuou	c61afb4308	Improve README.md With the help of ChatGPT.	2023-08-29 12:09:30 +09:00
kichikuou	f6cf881e61	Android: Sign apk only when keystore file exists	2023-08-28 11:01:33 +09:00
kichikuou	a8277e71a7	Android: Update command line build instructions	2023-08-28 10:26:17 +09:00
kichikuou	3482fb6440	Android: Upgrade SDL to 2.28.2	2023-08-13 12:42:54 +09:00
kichikuou	3c81c8fec2	Improve error messages for when MIDI cannot be played * Show warnings on failure of Mix_LoadMUS / Mix_PlayMusic * Display "Cannot open playlist" warning only when the game does not have MIDI	2023-07-29 07:50:55 +09:00
fcolecumberri	e090485b37	Update README.md https://github.com/kichikuou/xsystem35-sdl2/issues/39	2023-07-28 21:42:59 +09:00
kichikuou	d7deaec972	Version 2.9.1	2023-06-22 08:52:49 +09:00
kichikuou	30467371f4	debugger_dap: Handle SDL messages while paused in the debugger So that you can move around the window while the game is paused. Now DAP messages read from stdin are once posted to the SDL message queue, and then inserted into the debugger command queue in the main thread.	2023-06-20 11:07:28 +09:00
kichikuou	e9a30f7493	Debugger: Fix crash when breakpoint condition was not met	2023-06-19 21:33:51 +09:00
kichikuou	d9e42dd4bb	Add a hack to fix Daiakuji's magenta battle background issue	2023-06-19 17:23:03 +09:00
kichikuou	0e06cc1e22	Simplify sdl_copyAreaSP16_shadow	2023-06-19 17:18:31 +09:00
kichikuou	89423c94f1	ShGraph: Use exact color match in PlayAnimeData and ChangeNotColor	2023-06-19 17:18:31 +09:00
kichikuou	c694d2282c	Fix CX (sprite copy) in 24-bit color games with 16-bit CGs System3.x uses the following bit expansion when converting RGB565 to RGB888: RRRRR GGGGGG BBBBB => RRRRRRRR GGGGGGGG BBBBBBBB 12345 123456 12345 12345123 12345612 12345123 However, SDL's blit functions use a slightly different mapping, so sometimes expanded color did not match the color key specified in the CX command. To avoid this, convert to RGB888 by ourselves when drawing 16-bit CGs.	2023-06-19 17:18:17 +09:00
kichikuou	39e94afc44	Specify pixel format explicitly when creating SDL surfaces	2023-06-18 14:47:50 +09:00
kichikuou	e37a491908	Refactor keycode definitions	2023-05-21 10:46:22 +09:00