Build macOS x86_64 release

Add actions to build a release for macOS x86_64 in addition to the
aarch64 version.

.github/workflows/release.yml

@@ -85,15 +85,6 @@ jobs:
   build-linux-x86_64:
     runs-on: ubuntu-latest
     steps:
-      - name: Check architecture
-        run: |
-            arch=$(uname -m)
-            if [[ "$arch" != x86_64 ]]
-            then
-                echo "Unexpected architecture: $arch" >&2
-                exit 1
-            fi
-
       - name: Checkout code
         uses: actions/checkout@v4
 
@@ -190,15 +181,6 @@ jobs:
   build-macos-aarch64:
     runs-on: macos-latest
     steps:
-      - name: Check architecture
-        run: |
-            arch=$(uname -m)
-            if [[ "$arch" != arm64 ]]
-            then
-                echo "Unexpected architecture: $arch" >&2
-                exit 1
-            fi
-
       - name: Checkout code
         uses: actions/checkout@v4
 
@@ -227,15 +209,6 @@ jobs:
   build-macos-x86_64:
     runs-on: macos-13
     steps:
-      - name: Check architecture
-        run: |
-            arch=$(uname -m)
-            if [[ "$arch" != x86_64 ]]
-            then
-                echo "Unexpected architecture: $arch" >&2
-                exit 1
-            fi
-
       - name: Checkout code
         uses: actions/checkout@v4
 
@@ -486,7 +459,7 @@ jobs:
       - name: Download release-macos-x86_64
         uses: actions/download-artifact@v4
         with:
-          name: release-macos-x86_64
+          name: release-macos-aarch64
           path: release/output/
 
       - name: Package server

app/data/scrcpy_static_wrapper.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+cd "$(dirname ${BASH_SOURCE[0]})"
+export ADB="${ADB:-./adb}"
+export SCRCPY_SERVER_PATH="${SCRCPY_SERVER_PATH:-./scrcpy-server}"
+export SCRCPY_ICON_PATH="${SCRCPY_ICON_PATH:-./icon.png}"
+./scrcpy_bin "$@"

app/meson.build

@@ -46,7 +46,6 @@ src = [
     'src/util/acksync.c',
     'src/util/audiobuf.c',
     'src/util/average.c',
-    'src/util/env.c',
     'src/util/file.c',
     'src/util/intmap.c',
     'src/util/intr.c',

app/src/adb/adb.c

@@ -7,7 +7,6 @@
 
 #include "adb_device.h"
 #include "adb_parser.h"
-#include "util/env.h"
 #include "util/file.h"
 #include "util/log.h"
 #include "util/process_intr.h"
@@ -25,45 +24,15 @@
  */
 #define SC_ADB_COMMAND(...) { sc_adb_get_executable(), __VA_ARGS__, NULL }
 
-static char *adb_executable;
-
-bool
-sc_adb_init(void) {
-    adb_executable = sc_get_env("ADB");
-    if (adb_executable) {
-        LOGD("Using adb: %s", adb_executable);
-        return true;
-    }
-
-#if !defined(PORTABLE) || defined(_WIN32)
-    adb_executable = strdup("adb");
-    if (!adb_executable) {
-        LOG_OOM();
-        return false;
-    }
-#else
-    // For portable builds, use the absolute path to the adb executable
-    // in the same directory as scrcpy (except on Windows, where "adb"
-    // is sufficient)
-    adb_executable = sc_file_get_local_path("adb");
-    if (!adb_executable) {
-        // Error already logged
-        return false;
-    }
-
-    LOGD("Using adb (portable): %s", adb_executable);
-#endif
-
-    return true;
-}
-
-void
-sc_adb_destroy(void) {
-    free(adb_executable);
-}
+static const char *adb_executable;
 
 const char *
 sc_adb_get_executable(void) {
+    if (!adb_executable) {
+        adb_executable = getenv("ADB");
+        if (!adb_executable)
+            adb_executable = "adb";
+    }
     return adb_executable;
 }
 

app/src/adb/adb.h

@@ -15,12 +15,6 @@
 
 #define SC_ADB_SILENT (SC_ADB_NO_STDOUT | SC_ADB_NO_STDERR | SC_ADB_NO_LOGERR)
 
-bool
-sc_adb_init(void);
-
-void
-sc_adb_destroy(void);
-
 const char *
 sc_adb_get_executable(void);
 

app/src/icon.c

@@ -9,7 +9,6 @@
 
 #include "config.h"
 #include "compat.h"
-#include "util/env.h"
 #include "util/file.h"
 #include "util/log.h"
 #include "util/str.h"
@@ -20,22 +19,35 @@
 
 static char *
 get_icon_path(void) {
-    char *icon_path = sc_get_env("SCRCPY_ICON_PATH");
-    if (icon_path) {
+#ifdef __WINDOWS__
+    const wchar_t *icon_path_env = _wgetenv(L"SCRCPY_ICON_PATH");
+#else
+    const char *icon_path_env = getenv("SCRCPY_ICON_PATH");
+#endif
+    if (icon_path_env) {
         // if the envvar is set, use it
+#ifdef __WINDOWS__
+        char *icon_path = sc_str_from_wchars(icon_path_env);
+#else
+        char *icon_path = strdup(icon_path_env);
+#endif
+        if (!icon_path) {
+            LOG_OOM();
+            return NULL;
+        }
         LOGD("Using SCRCPY_ICON_PATH: %s", icon_path);
         return icon_path;
     }
 
 #ifndef PORTABLE
     LOGD("Using icon: " SCRCPY_DEFAULT_ICON_PATH);
-    icon_path = strdup(SCRCPY_DEFAULT_ICON_PATH);
+    char *icon_path = strdup(SCRCPY_DEFAULT_ICON_PATH);
     if (!icon_path) {
         LOG_OOM();
         return NULL;
     }
 #else
-    icon_path = sc_file_get_local_path(SCRCPY_PORTABLE_ICON_FILENAME);
+    char *icon_path = sc_file_get_local_path(SCRCPY_PORTABLE_ICON_FILENAME);
     if (!icon_path) {
         LOGE("Could not get icon path");
         return NULL;

app/src/server.c

@@ -9,7 +9,6 @@
 
 #include "adb/adb.h"
 #include "util/binary.h"
-#include "util/env.h"
 #include "util/file.h"
 #include "util/log.h"
 #include "util/net_intr.h"
@@ -26,22 +25,35 @@
 
 static char *
 get_server_path(void) {
-    char *server_path = sc_get_env("SCRCPY_SERVER_PATH");
-    if (server_path) {
+#ifdef __WINDOWS__
+    const wchar_t *server_path_env = _wgetenv(L"SCRCPY_SERVER_PATH");
+#else
+    const char *server_path_env = getenv("SCRCPY_SERVER_PATH");
+#endif
+    if (server_path_env) {
         // if the envvar is set, use it
+#ifdef __WINDOWS__
+        char *server_path = sc_str_from_wchars(server_path_env);
+#else
+        char *server_path = strdup(server_path_env);
+#endif
+        if (!server_path) {
+            LOG_OOM();
+            return NULL;
+        }
         LOGD("Using SCRCPY_SERVER_PATH: %s", server_path);
         return server_path;
     }
 
 #ifndef PORTABLE
     LOGD("Using server: " SC_SERVER_PATH_DEFAULT);
-    server_path = strdup(SC_SERVER_PATH_DEFAULT);
+    char *server_path = strdup(SC_SERVER_PATH_DEFAULT);
     if (!server_path) {
         LOG_OOM();
         return NULL;
     }
 #else
-    server_path = sc_file_get_local_path(SC_SERVER_FILENAME);
+    char *server_path = sc_file_get_local_path(SC_SERVER_FILENAME);
     if (!server_path) {
         LOGE("Could not get local file path, "
              "using " SC_SERVER_FILENAME " from current directory");
@@ -485,21 +497,14 @@ sc_server_init(struct sc_server *server, const struct sc_server_params *params,
     // end of the program
     server->params = *params;
 
-    bool ok = sc_adb_init();
+    bool ok = sc_mutex_init(&server->mutex);
     if (!ok) {
         return false;
     }
 
-    ok = sc_mutex_init(&server->mutex);
-    if (!ok) {
-        sc_adb_destroy();
-        return false;
-    }
-
     ok = sc_cond_init(&server->cond_stopped);
     if (!ok) {
         sc_mutex_destroy(&server->mutex);
-        sc_adb_destroy();
         return false;
     }
 
@@ -507,7 +512,6 @@ sc_server_init(struct sc_server *server, const struct sc_server_params *params,
     if (!ok) {
         sc_cond_destroy(&server->cond_stopped);
         sc_mutex_destroy(&server->mutex);
-        sc_adb_destroy();
         return false;
     }
 
@@ -1149,6 +1153,4 @@ sc_server_destroy(struct sc_server *server) {
     sc_intr_destroy(&server->intr);
     sc_cond_destroy(&server->cond_stopped);
     sc_mutex_destroy(&server->mutex);
-
-    sc_adb_destroy();
 }

app/src/sys/unix/file.c

@@ -6,9 +6,6 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#ifdef __APPLE__
-# include <mach-o/dyld.h> // for _NSGetExecutablePath()
-#endif
 
 #include "util/log.h"
 
@@ -63,22 +60,11 @@ sc_file_get_executable_path(void) {
     }
     buf[len] = '\0';
     return strdup(buf);
-#elif defined(__APPLE__)
-    char buf[PATH_MAX];
-    uint32_t bufsize = PATH_MAX;
-    if (_NSGetExecutablePath(buf, &bufsize) != 0) {
-        LOGE("Executable path buffer too small; need %u bytes", bufsize);
-        return NULL;
-    }
-    return realpath(buf, NULL);
 #else
-    // "_" is often used to store the full path of the command being executed
-    char *path = getenv("_");
-    if (!path) {
-        LOGE("Could not determine executable path");
-        return NULL;
-    }
-    return strdup(path);
+    // in practice, we only need this feature for portable builds, only used on
+    // Windows, so we don't care implementing it for every platform
+    // (it's useful to have a working version on Linux for debugging though)
+    return NULL;
 #endif
 }
 

app/src/usb/scrcpy_otg.c

@@ -95,14 +95,9 @@ scrcpy_otg(struct scrcpy_options *options) {
     // On Windows, only one process could open a USB device
     // <https://github.com/Genymobile/scrcpy/issues/2773>
     LOGI("Killing adb server (if any)...");
-    if (sc_adb_init()) {
-        unsigned flags = SC_ADB_NO_STDOUT | SC_ADB_NO_STDERR | SC_ADB_NO_LOGERR;
-        // uninterruptible (intr == NULL), but in practice it's very quick
-        sc_adb_kill_server(NULL, flags);
-        sc_adb_destroy();
-    } else {
-        LOGW("Could not call adb executable, adb server not killed");
-    }
+    unsigned flags = SC_ADB_NO_STDOUT | SC_ADB_NO_STDERR | SC_ADB_NO_LOGERR;
+    // uninterruptible (intr == NULL), but in practice it's very quick
+    sc_adb_kill_server(NULL, flags);
 #endif
 
     static const struct sc_usb_callbacks cbs = {

app/src/util/env.c

@@ -1,29 +0,0 @@
-#include "env.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include "util/str.h"
-
-char *
-sc_get_env(const char *varname) {
-#ifdef _WIN32
-    wchar_t *w_varname = sc_str_to_wchars(varname);
-    if (!w_varname) {
-         return NULL;
-    }
-    const wchar_t *value = _wgetenv(w_varname);
-    free(w_varname);
-    if (!value) {
-        return NULL;
-    }
-
-    return sc_str_from_wchars(value);
-#else
-    const char *value = getenv(varname);
-    if (!value) {
-        return NULL;
-    }
-
-    return strdup(value);
-#endif
-}

app/src/util/env.h

@@ -1,12 +0,0 @@
-#ifndef SC_ENV_H
-#define SC_ENV_H
-
-#include "common.h"
-
-// Return the value of the environment variable (may be NULL).
-//
-// The returned value must be freed by the caller.
-char *
-sc_get_env(const char *varname);
-
-#endif

app/src/util/net.c

@@ -9,6 +9,8 @@
 #ifdef _WIN32
 # include <ws2tcpip.h>
   typedef int socklen_t;
+  typedef SOCKET sc_raw_socket;
+# define SC_RAW_SOCKET_NONE INVALID_SOCKET
 #else
 # include <sys/types.h>
 # include <sys/socket.h>
@@ -21,6 +23,8 @@
   typedef struct sockaddr_in SOCKADDR_IN;
   typedef struct sockaddr SOCKADDR;
   typedef struct in_addr IN_ADDR;
+  typedef int sc_raw_socket;
+# define SC_RAW_SOCKET_NONE -1
 #endif
 
 bool
@@ -43,26 +47,17 @@ net_cleanup(void) {
 #endif
 }
 
-static inline bool
-sc_raw_socket_close(sc_raw_socket raw_sock) {
-#ifndef _WIN32
-    return !close(raw_sock);
-#else
-    return !closesocket(raw_sock);
-#endif
-}
-
 static inline sc_socket
 wrap(sc_raw_socket sock) {
-#ifdef SC_SOCKET_CLOSE_ON_INTERRUPT
-    if (sock == SC_RAW_SOCKET_NONE) {
+#ifdef _WIN32
+    if (sock == INVALID_SOCKET) {
         return SC_SOCKET_NONE;
     }
 
-    struct sc_socket_wrapper *socket = malloc(sizeof(*socket));
+    struct sc_socket_windows *socket = malloc(sizeof(*socket));
     if (!socket) {
         LOG_OOM();
-        sc_raw_socket_close(sock);
+        closesocket(sock);
         return SC_SOCKET_NONE;
     }
 
@@ -77,9 +72,9 @@ wrap(sc_raw_socket sock) {
 
 static inline sc_raw_socket
 unwrap(sc_socket socket) {
-#ifdef SC_SOCKET_CLOSE_ON_INTERRUPT
+#ifdef _WIN32
     if (socket == SC_SOCKET_NONE) {
-        return SC_RAW_SOCKET_NONE;
+        return INVALID_SOCKET;
     }
 
     return socket->socket;
@@ -88,6 +83,17 @@ unwrap(sc_socket socket) {
 #endif
 }
 
+#ifndef HAVE_SOCK_CLOEXEC // avoid unused-function warning
+static inline bool
+sc_raw_socket_close(sc_raw_socket raw_sock) {
+#ifndef _WIN32
+    return !close(raw_sock);
+#else
+    return !closesocket(raw_sock);
+#endif
+}
+#endif
+
 #ifndef HAVE_SOCK_CLOEXEC
 // If SOCK_CLOEXEC does not exist, the flag must be set manually once the
 // socket is created
@@ -242,9 +248,9 @@ net_interrupt(sc_socket socket) {
 
     sc_raw_socket raw_sock = unwrap(socket);
 
-#ifdef SC_SOCKET_CLOSE_ON_INTERRUPT
+#ifdef _WIN32
     if (!atomic_flag_test_and_set(&socket->closed)) {
-        return sc_raw_socket_close(raw_sock);
+        return !closesocket(raw_sock);
     }
     return true;
 #else
@@ -256,15 +262,15 @@ bool
 net_close(sc_socket socket) {
     sc_raw_socket raw_sock = unwrap(socket);
 
-#ifdef SC_SOCKET_CLOSE_ON_INTERRUPT
+#ifdef _WIN32
     bool ret = true;
     if (!atomic_flag_test_and_set(&socket->closed)) {
-        ret = sc_raw_socket_close(raw_sock);
+        ret = !closesocket(raw_sock);
     }
     free(socket);
     return ret;
 #else
-    return sc_raw_socket_close(raw_sock);
+    return !close(raw_sock);
 #endif
 }
 

app/src/util/net.h

@@ -7,36 +7,21 @@
 #include <stdint.h>
 
 #ifdef _WIN32
+
 # include <winsock2.h>
-  typedef SOCKET sc_raw_socket;
-# define SC_RAW_SOCKET_NONE INVALID_SOCKET
-#else // not _WIN32
-# include <sys/socket.h>
-  typedef int sc_raw_socket;
-# define SC_RAW_SOCKET_NONE -1
-#endif
-
-#if defined(_WIN32) || defined(__APPLE__)
-// On Windows and macOS, shutdown() does not interrupt accept() or read()
-// calls, so net_interrupt() must call close() instead, and net_close() must
-// behave accordingly.
-// This causes a small race condition (once the socket is closed, its
-// handle becomes invalid and may in theory be reassigned before another
-// thread calls accept() or read()), but it is deemed acceptable as a
-// workaround.
-# define SC_SOCKET_CLOSE_ON_INTERRUPT
-#endif
-
-#ifdef SC_SOCKET_CLOSE_ON_INTERRUPT
 # include <stdatomic.h>
 # define SC_SOCKET_NONE NULL
-  typedef struct sc_socket_wrapper {
-      sc_raw_socket socket;
+  typedef struct sc_socket_windows {
+      SOCKET socket;
       atomic_flag closed;
   } *sc_socket;
-#else
+
+#else // not _WIN32
+
+# include <sys/socket.h>
 # define SC_SOCKET_NONE -1
-  typedef sc_raw_socket sc_socket;
+  typedef int sc_socket;
+
 #endif
 
 #define IPV4_LOCALHOST 0x7F000001

doc/control.md

@@ -23,20 +23,14 @@ To control the device without mirroring:
 scrcpy --no-video --no-audio
 ```
 
-By default, the mouse is disabled when video playback is turned off.
-
-To control the device using a relative mouse, enable UHID mouse mode:
-
-```bash
-scrcpy --no-video --no-audio --mouse=uhid
-scrcpy --no-video --no-audio -M  # short version
-```
+By default, mouse mode is switched to UHID if video mirroring is disabled (a
+relative mouse mode is required).
 
 To also use a UHID keyboard, set it explicitly:
 
 ```bash
-scrcpy --no-video --no-audio --mouse=uhid --keyboard=uhid
-scrcpy --no-video --no-audio -MK  # short version
+scrcpy --no-video --no-audio --keyboard=uhid
+scrcpy --no-video --no-audio -K  # short version
 ```
 
 To use AOA instead (over USB only):

release/build_linux.sh

@@ -4,13 +4,13 @@ cd "$(dirname ${BASH_SOURCE[0]})"
 . build_common
 cd .. # root project dir
 
+ARCH="$1"
 if [[ $# != 1 ]]
 then
     echo "Syntax: $0 <arch>" >&2
     exit 1
 fi
 
-ARCH="$1"
 LINUX_BUILD_DIR="$WORK_DIR/build-linux-$ARCH"
 
 app/deps/adb_linux.sh
@@ -36,7 +36,8 @@ ninja -C "$LINUX_BUILD_DIR"
 
 # Group intermediate outputs into a 'dist' directory
 mkdir -p "$LINUX_BUILD_DIR/dist"
-cp "$LINUX_BUILD_DIR"/app/scrcpy "$LINUX_BUILD_DIR/dist/"
+cp "$LINUX_BUILD_DIR"/app/scrcpy "$LINUX_BUILD_DIR/dist/scrcpy_bin"
 cp app/data/icon.png "$LINUX_BUILD_DIR/dist/"
+cp app/data/scrcpy_static_wrapper.sh "$LINUX_BUILD_DIR/dist/scrcpy"
 cp app/scrcpy.1 "$LINUX_BUILD_DIR/dist/"
 cp -r "$ADB_INSTALL_DIR"/. "$LINUX_BUILD_DIR/dist/"

release/build_macos.sh

@@ -4,13 +4,13 @@ cd "$(dirname ${BASH_SOURCE[0]})"
 . build_common
 cd .. # root project dir
 
+ARCH="$1"
 if [[ $# != 1 ]]
 then
     echo "Syntax: $0 <arch>" >&2
     exit 1
 fi
 
-ARCH="$1"
 MACOS_BUILD_DIR="$WORK_DIR/build-macos-$ARCH"
 
 app/deps/adb_macos.sh
@@ -36,7 +36,8 @@ ninja -C "$MACOS_BUILD_DIR"
 
 # Group intermediate outputs into a 'dist' directory
 mkdir -p "$MACOS_BUILD_DIR/dist"
-cp "$MACOS_BUILD_DIR"/app/scrcpy "$MACOS_BUILD_DIR/dist/"
+cp "$MACOS_BUILD_DIR"/app/scrcpy "$MACOS_BUILD_DIR/dist/scrcpy_bin"
 cp app/data/icon.png "$MACOS_BUILD_DIR/dist/"
+cp app/data/scrcpy_static_wrapper.sh "$MACOS_BUILD_DIR/dist/scrcpy"
 cp app/scrcpy.1 "$MACOS_BUILD_DIR/dist/"
 cp -r "$ADB_INSTALL_DIR"/. "$MACOS_BUILD_DIR/dist/"

release/package_client.sh

@@ -40,7 +40,7 @@ case "$FORMAT" in
         zip -r "$OUTPUT_DIR/$TARGET_DIRNAME.zip" "$TARGET_DIRNAME"
         ;;
     tar.gz)
-        tar cvzf "$OUTPUT_DIR/$TARGET_DIRNAME.tar.gz" "$TARGET_DIRNAME"
+        tar cvf "$OUTPUT_DIR/$TARGET_DIRNAME.tar.gz" "$TARGET_DIRNAME"
         ;;
     *)
         echo "Invalid format (expected zip or tar.gz): $FORMAT" >&2

server/src/main/java/com/genymobile/scrcpy/CleanUp.java

@@ -207,15 +207,13 @@ public final class CleanUp {
             }
         }
 
-        // Change the power of the main display when mirroring a virtual display
-        int targetDisplayId = displayId != Device.DISPLAY_ID_NONE ? displayId : 0;
-        if (Device.isScreenOn(targetDisplayId)) {
+        if (displayId != Device.DISPLAY_ID_NONE && Device.isScreenOn(displayId)) {
             if (powerOffScreen) {
                 Ln.i("Power off screen");
-                Device.powerOffScreen(targetDisplayId);
+                Device.powerOffScreen(displayId);
             } else if (restoreDisplayPower) {
                 Ln.i("Restoring display power");
-                Device.setDisplayPower(targetDisplayId, true);
+                Device.setDisplayPower(displayId, true);
             }
         }
 

server/src/main/java/com/genymobile/scrcpy/control/Controller.java

@@ -21,7 +21,6 @@ import android.content.IOnPrimaryClipChangedListener;
 import android.content.Intent;
 import android.os.Build;
 import android.os.SystemClock;
-import android.util.Pair;
 import android.view.InputDevice;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
@@ -282,7 +281,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                 setClipboard(msg.getText(), msg.getPaste(), msg.getSequence());
                 break;
             case ControlMessage.TYPE_SET_DISPLAY_POWER:
-                if (supportsInputEvents) {
+                if (supportsInputEvents && displayId != Device.DISPLAY_ID_NONE) {
                     setDisplayPower(msg.getOn());
                 }
                 break;
@@ -351,47 +350,24 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
         return successCount;
     }
 
-    private Pair<Point, Integer> getEventPointAndDisplayId(Position position) {
-        // it hides the field on purpose, to read it with atomic access
-        @SuppressWarnings("checkstyle:HiddenField")
-        DisplayData displayData = this.displayData.get();
-        // In scrcpy, displayData should never be null (a touch event can only be generated from the client when a video frame is present).
-        // However, it is possible to send events without video playback when using scrcpy-server alone (except for virtual displays).
-        assert displayData != null || displayId != Device.DISPLAY_ID_NONE : "Cannot receive a positional event without a display";
-
-        Point point;
-        int targetDisplayId;
-        if (displayData != null) {
-            point = displayData.positionMapper.map(position);
-            if (point == null) {
-                if (Ln.isEnabled(Ln.Level.VERBOSE)) {
-                    Size eventSize = position.getScreenSize();
-                    Size currentSize = displayData.positionMapper.getVideoSize();
-                    Ln.v("Ignore positional event generated for size " + eventSize + " (current size is " + currentSize + ")");
-                }
-                return null;
-            }
-            targetDisplayId = displayData.virtualDisplayId;
-        } else {
-            // No display, use the raw coordinates
-            point = position.getPoint();
-            targetDisplayId = displayId;
-        }
-
-        return Pair.create(point, targetDisplayId);
-    }
-
     private boolean injectTouch(int action, long pointerId, Position position, float pressure, int actionButton, int buttons) {
         long now = SystemClock.uptimeMillis();
 
-        Pair<Point, Integer> pair = getEventPointAndDisplayId(position);
-        if (pair == null) {
+        // it hides the field on purpose, to read it with atomic access
+        @SuppressWarnings("checkstyle:HiddenField")
+        DisplayData displayData = this.displayData.get();
+        assert displayData != null : "Cannot receive a touch event without a display";
+
+        Point point = displayData.positionMapper.map(position);
+        if (point == null) {
+            if (Ln.isEnabled(Ln.Level.VERBOSE)) {
+                Size eventSize = position.getScreenSize();
+                Size currentSize = displayData.positionMapper.getVideoSize();
+                Ln.v("Ignore touch event generated for size " + eventSize + " (current size is " + currentSize + ")");
+            }
             return false;
         }
 
-        Point point = pair.first;
-        int targetDisplayId = pair.second;
-
         int pointerIndex = pointersState.getPointerIndex(pointerId);
         if (pointerIndex == -1) {
             Ln.w("Too many pointers for touch event");
@@ -445,7 +421,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                     // First button pressed: ACTION_DOWN
                     MotionEvent downEvent = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_DOWN, pointerCount, pointerProperties,
                             pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0, source, 0);
-                    if (!Device.injectEvent(downEvent, targetDisplayId, Device.INJECT_MODE_ASYNC)) {
+                    if (!Device.injectEvent(downEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
                         return false;
                     }
                 }
@@ -456,7 +432,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                 if (!InputManager.setActionButton(pressEvent, actionButton)) {
                     return false;
                 }
-                if (!Device.injectEvent(pressEvent, targetDisplayId, Device.INJECT_MODE_ASYNC)) {
+                if (!Device.injectEvent(pressEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
                     return false;
                 }
 
@@ -470,7 +446,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                 if (!InputManager.setActionButton(releaseEvent, actionButton)) {
                     return false;
                 }
-                if (!Device.injectEvent(releaseEvent, targetDisplayId, Device.INJECT_MODE_ASYNC)) {
+                if (!Device.injectEvent(releaseEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
                     return false;
                 }
 
@@ -478,7 +454,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
                     // Last button released: ACTION_UP
                     MotionEvent upEvent = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_UP, pointerCount, pointerProperties,
                             pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0, source, 0);
-                    if (!Device.injectEvent(upEvent, targetDisplayId, Device.INJECT_MODE_ASYNC)) {
+                    if (!Device.injectEvent(upEvent, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC)) {
                         return false;
                     }
                 }
@@ -489,20 +465,27 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
 
         MotionEvent event = MotionEvent.obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f,
                 DEFAULT_DEVICE_ID, 0, source, 0);
-        return Device.injectEvent(event, targetDisplayId, Device.INJECT_MODE_ASYNC);
+        return Device.injectEvent(event, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC);
     }
 
     private boolean injectScroll(Position position, float hScroll, float vScroll, int buttons) {
         long now = SystemClock.uptimeMillis();
 
-        Pair<Point, Integer> pair = getEventPointAndDisplayId(position);
-        if (pair == null) {
+        // it hides the field on purpose, to read it with atomic access
+        @SuppressWarnings("checkstyle:HiddenField")
+        DisplayData displayData = this.displayData.get();
+        assert displayData != null : "Cannot receive a scroll event without a display";
+
+        Point point = displayData.positionMapper.map(position);
+        if (point == null) {
+            if (Ln.isEnabled(Ln.Level.VERBOSE)) {
+                Size eventSize = position.getScreenSize();
+                Size currentSize = displayData.positionMapper.getVideoSize();
+                Ln.v("Ignore scroll event generated for size " + eventSize + " (current size is " + currentSize + ")");
+            }
             return false;
         }
 
-        Point point = pair.first;
-        int targetDisplayId = pair.second;
-
         MotionEvent.PointerProperties props = pointerProperties[0];
         props.id = 0;
 
@@ -514,7 +497,7 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
 
         MotionEvent event = MotionEvent.obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, buttons, 1f, 1f,
                 DEFAULT_DEVICE_ID, 0, InputDevice.SOURCE_MOUSE, 0);
-        return Device.injectEvent(event, targetDisplayId, Device.INJECT_MODE_ASYNC);
+        return Device.injectEvent(event, displayData.virtualDisplayId, Device.INJECT_MODE_ASYNC);
     }
 
     /**
@@ -708,12 +691,9 @@ public class Controller implements AsyncProcessor, VirtualDisplayListener {
     }
 
     private void setDisplayPower(boolean on) {
-        // Change the power of the main display when mirroring a virtual display
-        int targetDisplayId = displayId != Device.DISPLAY_ID_NONE ? displayId : 0;
-        boolean setDisplayPowerOk = Device.setDisplayPower(targetDisplayId, on);
+        boolean setDisplayPowerOk = Device.setDisplayPower(displayId, on);
         if (setDisplayPowerOk) {
-            // Do not keep display power off for virtual displays: MOD+p must wake up the physical device
-            keepDisplayPowerOff = displayId != Device.DISPLAY_ID_NONE && !on;
+            keepDisplayPowerOff = !on;
             Ln.i("Device display turned " + (on ? "on" : "off"));
             if (cleanUp != null) {
                 boolean mustRestoreOnExit = !on;

server/src/main/java/com/genymobile/scrcpy/device/Device.java

@@ -40,10 +40,6 @@ public final class Device {
     public static final int INJECT_MODE_WAIT_FOR_RESULT = InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_RESULT;
     public static final int INJECT_MODE_WAIT_FOR_FINISH = InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH;
 
-    // The new display power method introduced in Android 15 does not work as expected:
-    // <https://github.com/Genymobile/scrcpy/issues/5530>
-    private static final boolean USE_ANDROID_15_DISPLAY_POWER = false;
-
     private Device() {
         // not instantiable
     }
@@ -131,7 +127,7 @@ public final class Device {
     public static boolean setDisplayPower(int displayId, boolean on) {
         assert displayId != Device.DISPLAY_ID_NONE;
 
-        if (USE_ANDROID_15_DISPLAY_POWER && Build.VERSION.SDK_INT >= AndroidVersions.API_35_ANDROID_15) {
+        if (Build.VERSION.SDK_INT >= AndroidVersions.API_35_ANDROID_15) {
             return ServiceManager.getDisplayManager().requestDisplayPower(displayId, on);
         }
 

server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayManager.java

@@ -192,9 +192,6 @@ public final class DisplayManager {
                         if ("onDisplayChanged".equals(method.getName())) {
                             listener.onDisplayChanged((int) args[0]);
                         }
-                        if ("toString".equals(method.getName())) {
-                            return "DisplayListener";
-                        }
                         return null;
                     });
             try {