Use DisplayManagerGlobal instance

Use the client instance to communicate with the DisplayManager server.

Fixes #3446 <https://github.com/Genymobile/scrcpy/issues/3446>

app/src/util/net.c

@@ -159,8 +159,8 @@ net_connect(sc_socket socket, uint32_t addr, uint16_t port) {
 }
 
 bool
-net_listen(sc_socket server_socket, uint32_t addr, uint16_t port, int backlog) {
-    sc_raw_socket raw_sock = unwrap(server_socket);
+net_listen(sc_socket socket, uint32_t addr, uint16_t port, int backlog) {
+    sc_raw_socket raw_sock = unwrap(socket);
 
     int reuse = 1;
     if (setsockopt(raw_sock, SOL_SOCKET, SO_REUSEADDR, (const void *) &reuse,

app/src/util/net.h

@@ -39,7 +39,7 @@ bool
 net_connect(sc_socket socket, uint32_t addr, uint16_t port);
 
 bool
-net_listen(sc_socket server_socket, uint32_t addr, uint16_t port, int backlog);
+net_listen(sc_socket socket, uint32_t addr, uint16_t port, int backlog);
 
 sc_socket
 net_accept(sc_socket server_socket);

app/src/util/net_intr.c

@@ -15,14 +15,14 @@ net_connect_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,
 }
 
 bool
-net_listen_intr(struct sc_intr *intr, sc_socket server_socket, uint32_t addr,
+net_listen_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,
                 uint16_t port, int backlog) {
-    if (!sc_intr_set_socket(intr, server_socket)) {
+    if (!sc_intr_set_socket(intr, socket)) {
         // Already interrupted
         return false;
     }
 
-    bool ret = net_listen(server_socket, addr, port, backlog);
+    bool ret = net_listen(socket, addr, port, backlog);
 
     sc_intr_set_socket(intr, SC_SOCKET_NONE);
     return ret;

app/src/util/net_intr.h

@@ -11,7 +11,7 @@ net_connect_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,
                  uint16_t port);
 
 bool
-net_listen_intr(struct sc_intr *intr, sc_socket server_socket, uint32_t addr,
+net_listen_intr(struct sc_intr *intr, sc_socket socket, uint32_t addr,
                 uint16_t port, int backlog);
 
 sc_socket

server/meson.build

@@ -13,8 +13,8 @@ if prebuilt_server == ''
                   install_dir: 'share/scrcpy')
 else
     if not prebuilt_server.startswith('/')
-        # prebuilt server path is relative to the root scrcpy directory
-        prebuilt_server = '../' + prebuilt_server
+        # relative path needs some trick
+        prebuilt_server = meson.source_root() + '/' + prebuilt_server
     endif
     custom_target('scrcpy-server-prebuilt',
                   input: prebuilt_server,

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

@@ -58,6 +58,7 @@ public final class ServiceManager {
             } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
                 throw new AssertionError(e);
             }
+            displayManager = new DisplayManager(getService("display", "android.hardware.display.IDisplayManager"));
         }
         return displayManager;
     }