Enable close-on-interrupt for macOS

This behavior is also necessary on macOS. TODO ref 5536
Split network macro conditions
2024-11-27 10:19:34 +01:00 · 2024-11-27 10:19:26 +01:00
9 changed files with 148 additions and 263 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -42,10 +42,10 @@ jobs:
          distribution: 'zulu'
          java-version: '17'

-      - name: Build
+      - name: Build scrcpy-server
        run: release/build_server.sh

-      - name: Upload artifact
+      - name: Upload scrcpy-server artifact
        uses: actions/upload-artifact@v4
        with:
          name: scrcpy-server
@ -63,7 +63,7 @@ jobs:
          distribution: 'zulu'
          java-version: '17'

-      - name: Build without gradle
+      - name: Build scrcpy-server without gradle
        run: server/build_without_gradle.sh

  test-client:
@ -74,6 +74,7 @@ jobs:

      - name: Install dependencies
        run: |
+          sudo apt update
          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
@ -82,44 +83,36 @@ jobs:
      - name: Test
        run: release/test_client.sh

-  build-linux-x86_64:
+  build-linux:
    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

      - name: Install dependencies
        run: |
+          sudo apt update
          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
             libv4l-dev

-      - name: Build
-        run: release/build_linux.sh x86_64
+      - name: Build linux
+        run: release/build_linux.sh

      # upload-artifact does not preserve permissions
      - name: Tar
        run: |
-            cd release/work/build-linux-x86_64
+            cd release/work/build-linux
            mkdir dist-tar
            cd dist-tar
            tar -C .. -cvf dist.tar.gz dist/

-      - name: Upload artifact
+      - name: Upload build-linux artifact
        uses: actions/upload-artifact@v4
        with:
-          name: build-linux-x86_64-intermediate
-          path: release/work/build-linux-x86_64/dist-tar/
+          name: build-linux-intermediate
+          path: release/work/build-linux/dist-tar/

  build-win32:
    runs-on: ubuntu-latest
@ -129,6 +122,7 @@ jobs:

      - name: Install dependencies
        run: |
+          sudo apt update
          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
@ -137,7 +131,7 @@ jobs:
      - name: Workaround for old meson version run by Github Actions
        run: sed -i 's/^pkg-config/pkgconfig/' cross_win32.txt

-      - name: Build
+      - name: Build win32
        run: release/build_windows.sh 32

      # upload-artifact does not preserve permissions
@ -148,7 +142,7 @@ jobs:
            cd dist-tar
            tar -C .. -cvf dist.tar.gz dist/

-      - name: Upload artifact
+      - name: Upload build-win32 artifact
        uses: actions/upload-artifact@v4
        with:
          name: build-win32-intermediate
@ -162,6 +156,7 @@ jobs:

      - name: Install dependencies
        run: |
+          sudo apt update
          sudo apt install -y meson ninja-build nasm ffmpeg libsdl2-2.0-0 \
             libsdl2-dev libavcodec-dev libavdevice-dev libavformat-dev \
             libavutil-dev libswresample-dev libusb-1.0-0 libusb-1.0-0-dev \
@ -170,7 +165,7 @@ jobs:
      - name: Workaround for old meson version run by Github Actions
        run: sed -i 's/^pkg-config/pkgconfig/' cross_win64.txt

-      - name: Build
+      - name: Build win64
        run: release/build_windows.sh 64

      # upload-artifact does not preserve permissions
@ -181,24 +176,15 @@ jobs:
            cd dist-tar
            tar -C .. -cvf dist.tar.gz dist/

-      - name: Upload artifact
+      - name: Upload build-win64 artifact
        uses: actions/upload-artifact@v4
        with:
          name: build-win64-intermediate
          path: release/work/build-win64/dist-tar/

-  build-macos-aarch64:
+  build-macos:
    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

@ -207,63 +193,27 @@ jobs:
            brew install meson ninja nasm libiconv zlib automake autoconf \
                libtool

-      - name: Build
-        run: release/build_macos.sh aarch64
+      - name: Build macOS
+        run: release/build_macos.sh

      # upload-artifact does not preserve permissions
      - name: Tar
        run: |
-            cd release/work/build-macos-aarch64
+            cd release/work/build-macos
            mkdir dist-tar
            cd dist-tar
            tar -C .. -cvf dist.tar.gz dist/

-      - name: Upload artifact
+      - name: Upload build-macos artifact
        uses: actions/upload-artifact@v4
        with:
-          name: build-macos-aarch64-intermediate
-          path: release/work/build-macos-aarch64/dist-tar/
+          name: build-macos-intermediate
+          path: release/work/build-macos/dist-tar/

-  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
-
-      - name: Install dependencies
-        run: brew install meson ninja nasm libiconv zlib automake
-             # autoconf and libtool are already installed on macos-13
-
-      - name: Build
-        run: release/build_macos.sh x86_64
-
-      # upload-artifact does not preserve permissions
-      - name: Tar
-        run: |
-            cd release/work/build-macos-x86_64
-            mkdir dist-tar
-            cd dist-tar
-            tar -C .. -cvf dist.tar.gz dist/
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-macos-x86_64-intermediate
-          path: release/work/build-macos-x86_64/dist-tar/
-
-  package-linux-x86_64:
+  package-linux:
    needs:
      - build-scrcpy-server
-      - build-linux-x86_64
+      - build-linux
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
@ -275,25 +225,25 @@ jobs:
          name: scrcpy-server
          path: release/work/build-server/server/

-      - name: Download build-linux-x86_64
+      - name: Download build-linux
        uses: actions/download-artifact@v4
        with:
-          name: build-linux-x86_64-intermediate
-          path: release/work/build-linux-x86_64/dist-tar/
+          name: build-linux-intermediate
+          path: release/work/build-linux/dist-tar/

      # upload-artifact does not preserve permissions
      - name: Detar
        run: |
-            cd release/work/build-linux-x86_64
+            cd release/work/build-linux
            tar xf dist-tar/dist.tar.gz

-      - name: Package
-        run: release/package_client.sh linux-x86_64 tar.gz
+      - name: Package linux
+        run: release/package_client.sh linux tar.gz

-      - name: Upload release
+      - name: Upload linux release
        uses: actions/upload-artifact@v4
        with:
-          name: release-linux-x86_64
+          name: release-linux
          path: release/output/

  package-win32:
@ -323,10 +273,10 @@ jobs:
            cd release/work/build-win32
            tar xf dist-tar/dist.tar.gz

-      - name: Package
+      - name: Package win32
        run: release/package_client.sh win32 zip

-      - name: Upload release
+      - name: Upload win32 release
        uses: actions/upload-artifact@v4
        with:
          name: release-win32
@ -359,55 +309,19 @@ jobs:
            cd release/work/build-win64
            tar xf dist-tar/dist.tar.gz

-      - name: Package
+      - name: Package win64
        run: release/package_client.sh win64 zip

-      - name: Upload release
+      - name: Upload win64 release
        uses: actions/upload-artifact@v4
        with:
          name: release-win64
          path: release/output

-  package-macos-aarch64:
+  package-macos:
    needs:
      - build-scrcpy-server
-      - build-macos-aarch64
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Download scrcpy-server
-        uses: actions/download-artifact@v4
-        with:
-          name: scrcpy-server
-          path: release/work/build-server/server/
-
-      - name: Download build-macos-aarch64
-        uses: actions/download-artifact@v4
-        with:
-          name: build-macos-aarch64-intermediate
-          path: release/work/build-macos-aarch64/dist-tar/
-
-      # upload-artifact does not preserve permissions
-      - name: Detar
-        run: |
-            cd release/work/build-macos-aarch64
-            tar xf dist-tar/dist.tar.gz
-
-      - name: Package
-        run: release/package_client.sh macos-aarch64 tar.gz
-
-      - name: Upload release
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-macos-aarch64
-          path: release/output/
-
-  package-macos-x86_64:
-    needs:
-      - build-scrcpy-server
-      - build-macos-x86_64
+      - build-macos
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
@ -422,32 +336,31 @@ jobs:
      - name: Download build-macos
        uses: actions/download-artifact@v4
        with:
-          name: build-macos-x86_64-intermediate
-          path: release/work/build-macos-x86_64/dist-tar/
+          name: build-macos-intermediate
+          path: release/work/build-macos/dist-tar/

      # upload-artifact does not preserve permissions
      - name: Detar
        run: |
-            cd release/work/build-macos-x86_64
+            cd release/work/build-macos
            tar xf dist-tar/dist.tar.gz

-      - name: Package
-        run: release/package_client.sh macos-x86_64 tar.gz
+      - name: Package macos
+        run: release/package_client.sh macos tar.gz

-      - name: Upload release
+      - name: Upload macos release
        uses: actions/upload-artifact@v4
        with:
-          name: release-macos-x86_64
+          name: release-macos
          path: release/output/

  release:
    needs:
      - build-scrcpy-server
-      - package-linux-x86_64
+      - package-linux
      - package-win32
      - package-win64
-      - package-macos-aarch64
-      - package-macos-x86_64
+      - package-macos
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
@ -459,10 +372,10 @@ jobs:
          name: scrcpy-server
          path: release/work/build-server/server/

-      - name: Download release-linux-x86_64
+      - name: Download release-linux
        uses: actions/download-artifact@v4
        with:
-          name: release-linux-x86_64
+          name: release-linux
          path: release/output/

      - name: Download release-win32
@ -477,16 +390,10 @@ jobs:
          name: release-win64
          path: release/output/

-      - name: Download release-macos-aarch64
+      - name: Download release-macos
        uses: actions/download-artifact@v4
        with:
-          name: release-macos-aarch64
-          path: release/output/
-
-      - name: Download release-macos-x86_64
-        uses: actions/download-artifact@v4
-        with:
-          name: release-macos-x86_64
+          name: release-macos
          path: release/output/

      - name: Package server
--- a/app/src/util/net.c
+++ b/app/src/util/net.c
@ -9,8 +9,6 @@
 #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>
@ -23,8 +21,6 @@
  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
@ -47,17 +43,26 @@ 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 _WIN32
-    if (sock == INVALID_SOCKET) {
+#ifdef SC_SOCKET_CLOSE_ON_INTERRUPT
+    if (sock == SC_RAW_SOCKET_NONE) {
        return SC_SOCKET_NONE;
    }

-    struct sc_socket_windows *socket = malloc(sizeof(*socket));
+    struct sc_socket_wrapper *socket = malloc(sizeof(*socket));
    if (!socket) {
        LOG_OOM();
-        closesocket(sock);
+        sc_raw_socket_close(sock);
        return SC_SOCKET_NONE;
    }

@ -72,9 +77,9 @@ wrap(sc_raw_socket sock) {

 static inline sc_raw_socket
 unwrap(sc_socket socket) {
-#ifdef _WIN32
+#ifdef SC_SOCKET_CLOSE_ON_INTERRUPT
    if (socket == SC_SOCKET_NONE) {
-        return INVALID_SOCKET;
+        return SC_RAW_SOCKET_NONE;
    }

    return socket->socket;
@ -83,17 +88,6 @@ 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
@ -248,9 +242,9 @@ net_interrupt(sc_socket socket) {

    sc_raw_socket raw_sock = unwrap(socket);

-#ifdef _WIN32
+#ifdef SC_SOCKET_CLOSE_ON_INTERRUPT
    if (!atomic_flag_test_and_set(&socket->closed)) {
-        return !closesocket(raw_sock);
+        return sc_raw_socket_close(raw_sock);
    }
    return true;
 #else
@ -262,15 +256,15 @@ bool
 net_close(sc_socket socket) {
    sc_raw_socket raw_sock = unwrap(socket);

-#ifdef _WIN32
+#ifdef SC_SOCKET_CLOSE_ON_INTERRUPT
    bool ret = true;
    if (!atomic_flag_test_and_set(&socket->closed)) {
-        ret = !closesocket(raw_sock);
+        ret = sc_raw_socket_close(raw_sock);
    }
    free(socket);
    return ret;
 #else
-    return !close(raw_sock);
+    return sc_raw_socket_close(raw_sock);
 #endif
 }

--- a/app/src/util/net.h
+++ b/app/src/util/net.h
@ -7,21 +7,37 @@
 #include <stdint.h>

 #ifdef _WIN32
-
 # include <winsock2.h>
-# include <stdatomic.h>
-# define SC_SOCKET_NONE NULL
-  typedef struct sc_socket_windows {
-      SOCKET socket;
-      atomic_flag closed;
-  } *sc_socket;
-
+  typedef SOCKET sc_raw_socket;
+# define SC_RAW_SOCKET_NONE INVALID_SOCKET
 #else // not _WIN32
-
 # include <sys/socket.h>
 # define SC_SOCKET_NONE -1
-  typedef int sc_socket;
+  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;
+      atomic_flag closed;
+  } *sc_socket;
+#else
+# define SC_SOCKET_NONE -1
+  typedef sc_raw_socket sc_socket;
 #endif

 #define IPV4_LOCALHOST 0x7F000001
--- a/release/build_linux.sh
+++ b/release/build_linux.sh
@ -4,14 +4,7 @@ cd "$(dirname ${BASH_SOURCE[0]})"
 . build_common
 cd .. # root project dir

-if [[ $# != 1 ]]
-then
-    echo "Syntax: $0 <arch>" >&2
-    exit 1
-fi
-
-ARCH="$1"
-LINUX_BUILD_DIR="$WORK_DIR/build-linux-$ARCH"
+LINUX_BUILD_DIR="$WORK_DIR/build-linux"

 app/deps/adb_linux.sh
 app/deps/sdl.sh linux native static
--- a/release/build_macos.sh
+++ b/release/build_macos.sh
@ -4,14 +4,7 @@ cd "$(dirname ${BASH_SOURCE[0]})"
 . build_common
 cd .. # root project dir

-if [[ $# != 1 ]]
-then
-    echo "Syntax: $0 <arch>" >&2
-    exit 1
-fi
-
-ARCH="$1"
-MACOS_BUILD_DIR="$WORK_DIR/build-macos-$ARCH"
+MACOS_BUILD_DIR="$WORK_DIR/build-macos"

 app/deps/adb_macos.sh
 app/deps/sdl.sh macos native static
--- a/release/generate_checksums.sh
+++ b/release/generate_checksums.sh
@ -5,10 +5,9 @@ cd "$(dirname ${BASH_SOURCE[0]})"

 cd "$OUTPUT_DIR"
 sha256sum "scrcpy-server-$VERSION" \
-    "scrcpy-linux-x86_64-$VERSION.tar.gz" \
+    "scrcpy-linux-$VERSION.tar.gz" \
    "scrcpy-win32-$VERSION.zip" \
    "scrcpy-win64-$VERSION.zip" \
-    "scrcpy-macos-aarch64-$VERSION.tar.gz" \
-    "scrcpy-macos-x86_64-$VERSION.tar.gz" \
+    "scrcpy-macos-$VERSION.tar.gz" \
        | tee SHA256SUMS.txt
 echo "Release checksums generated in $PWD/SHA256SUMS.txt"
--- a/release/package_client.sh
+++ b/release/package_client.sh
@ -14,39 +14,39 @@ fi

 FORMAT=$2

-if [[ "$FORMAT" != zip && "$FORMAT" != tar.gz ]]
+if [[ "$2" != zip && "$2" != tar.gz ]]
 then
-    echo "Invalid format (expected zip or tar.gz): $FORMAT" >&2
+    echo "Invalid format (expected zip or tar.gz): $2" >&2
    exit 1
 fi

 BUILD_DIR="$WORK_DIR/build-$1"
 ARCHIVE_DIR="$BUILD_DIR/release-archive"
-TARGET_DIRNAME="scrcpy-$1-$VERSION"
+TARGET="scrcpy-$1-$VERSION"

-rm -rf "$ARCHIVE_DIR/$TARGET_DIRNAME"
-mkdir -p "$ARCHIVE_DIR/$TARGET_DIRNAME"
+rm -rf "$ARCHIVE_DIR/$TARGET"
+mkdir -p "$ARCHIVE_DIR/$TARGET"

-cp -r "$BUILD_DIR/dist/." "$ARCHIVE_DIR/$TARGET_DIRNAME/"
-cp "$WORK_DIR/build-server/server/scrcpy-server" "$ARCHIVE_DIR/$TARGET_DIRNAME/"
+cp -r "$BUILD_DIR/dist/." "$ARCHIVE_DIR/$TARGET/"
+cp "$WORK_DIR/build-server/server/scrcpy-server" "$ARCHIVE_DIR/$TARGET/"

 mkdir -p "$OUTPUT_DIR"

 cd "$ARCHIVE_DIR"
-rm -f "$OUTPUT_DIR/$TARGET_DIRNAME.$FORMAT"
+rm -f "$OUTPUT_DIR/$TARGET.$FORMAT"

 case "$FORMAT" in
    zip)
-        zip -r "$OUTPUT_DIR/$TARGET_DIRNAME.zip" "$TARGET_DIRNAME"
+        zip -r "$OUTPUT_DIR/$TARGET.zip" "$TARGET"
        ;;
    tar.gz)
-        tar cvf "$OUTPUT_DIR/$TARGET_DIRNAME.tar.gz" "$TARGET_DIRNAME"
+        tar cvf "$OUTPUT_DIR/$TARGET.tar.gz" "$TARGET"
        ;;
    *)
        echo "Invalid format (expected zip or tar.gz): $FORMAT" >&2
        exit 1
 esac

-rm -rf "$TARGET_DIRNAME"
+rm -rf "$TARGET"
 cd -
-echo "Generated '$OUTPUT_DIR/$TARGET_DIRNAME.$FORMAT'"
+echo "Generated '$OUTPUT_DIR/$TARGET.$FORMAT'"
--- a/release/release.sh
+++ b/release/release.sh
@ -12,12 +12,12 @@ rm -rf output
 ./build_server.sh
 ./build_windows.sh 32
 ./build_windows.sh 64
-./build_linux.sh x86_64
+./build_linux.sh

 ./package_server.sh
 ./package_client.sh win32 zip
 ./package_client.sh win64 zip
-./package_client.sh linux-x86_64 tar.gz
+./package_client.sh linux tar.gz

 ./generate_checksums.sh

--- a/server/src/main/java/com/genymobile/scrcpy/control/Controller.java
+++ b/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;
@ -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 touch 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 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);
    }

    /**