Fix scrcpy-console.desktop

The argument passed to scrcpy was not applied, the full command must be
passed as a single argument.

app/data/scrcpy-console.desktop

@@ -5,7 +5,7 @@ Comment=Display and control your Android device
 # For some users, the PATH or ADB environment variables are set from the shell
 # startup file, like .bashrc or .zshrc… Run an interactive shell to get
 # environment correctly initialized.
-Exec=/bin/sh -c "\"\\$SHELL\" -i -c scrcpy --pause-on-exit=if-error"
+Exec=/bin/sh -c "\\$SHELL -i -c 'scrcpy --pause-on-exit=if-error'"
 Icon=scrcpy
 Terminal=true
 Type=Application

app/data/scrcpy.desktop

@@ -5,7 +5,7 @@ Comment=Display and control your Android device
 # For some users, the PATH or ADB environment variables are set from the shell
 # startup file, like .bashrc or .zshrc… Run an interactive shell to get
 # environment correctly initialized.
-Exec=/bin/sh -c "\"\\$SHELL\" -i -c scrcpy"
+Exec=/bin/sh -c "\\$SHELL -i -c scrcpy"
 Icon=scrcpy
 Terminal=false
 Type=Application

cross_win32.txt

@@ -6,7 +6,7 @@ c = 'i686-w64-mingw32-gcc'
 cpp = 'i686-w64-mingw32-g++'
 ar = 'i686-w64-mingw32-ar'
 strip = 'i686-w64-mingw32-strip'
-pkgconfig = 'i686-w64-mingw32-pkg-config'
+pkg-config = 'i686-w64-mingw32-pkg-config'
 windres = 'i686-w64-mingw32-windres'
 
 [host_machine]

cross_win64.txt

@@ -6,7 +6,7 @@ c = 'x86_64-w64-mingw32-gcc'
 cpp = 'x86_64-w64-mingw32-g++'
 ar = 'x86_64-w64-mingw32-ar'
 strip = 'x86_64-w64-mingw32-strip'
-pkgconfig = 'x86_64-w64-mingw32-pkg-config'
+pkg-config = 'x86_64-w64-mingw32-pkg-config'
 windres = 'x86_64-w64-mingw32-windres'
 
 [host_machine]

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

@@ -11,6 +11,8 @@ public interface AsyncProcessor {
     }
 
     void start(TerminationListener listener);
+
     void stop();
+
     void join() throws InterruptedException;
 }

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

@@ -289,18 +289,17 @@ public class CameraCapture extends SurfaceCapture {
         List<OutputConfiguration> outputs = Arrays.asList(outputConfig);
 
         int sessionType = highSpeed ? SessionConfiguration.SESSION_HIGH_SPEED : SessionConfiguration.SESSION_REGULAR;
-        SessionConfiguration sessionConfig = new SessionConfiguration(sessionType, outputs, cameraExecutor,
-                new CameraCaptureSession.StateCallback() {
-                    @Override
-                    public void onConfigured(CameraCaptureSession session) {
-                        future.complete(session);
-                    }
+        SessionConfiguration sessionConfig = new SessionConfiguration(sessionType, outputs, cameraExecutor, new CameraCaptureSession.StateCallback() {
+            @Override
+            public void onConfigured(CameraCaptureSession session) {
+                future.complete(session);
+            }
 
-                    @Override
-                    public void onConfigureFailed(CameraCaptureSession session) {
-                        future.completeExceptionally(new CameraAccessException(CameraAccessException.CAMERA_ERROR));
-                    }
-                });
+            @Override
+            public void onConfigureFailed(CameraCaptureSession session) {
+                future.completeExceptionally(new CameraAccessException(CameraAccessException.CAMERA_ERROR));
+            }
+        });
 
         camera.createCaptureSession(sessionConfig);
 

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

@@ -14,8 +14,6 @@ import java.io.IOException;
  */
 public final class CleanUp {
 
-    public static final String SERVER_PATH = "/data/local/tmp/scrcpy-server.jar";
-
     // A simple struct to be passed from the main process to the cleanup process
     public static class Config implements Parcelable {
 
@@ -135,13 +133,13 @@ public final class CleanUp {
         String[] cmd = {"app_process", "/", CleanUp.class.getName(), config.toBase64()};
 
         ProcessBuilder builder = new ProcessBuilder(cmd);
-        builder.environment().put("CLASSPATH", SERVER_PATH);
+        builder.environment().put("CLASSPATH", Server.SERVER_PATH);
         builder.start();
     }
 
     public static void unlinkSelf() {
         try {
-            new File(SERVER_PATH).delete();
+            new File(Server.SERVER_PATH).delete();
         } catch (Exception e) {
             Ln.e("Could not unlink server", e);
         }

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

@@ -318,9 +318,8 @@ public class Controller implements AsyncProcessor {
             }
         }
 
-        MotionEvent event = MotionEvent
-                .obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0, source,
-                        0);
+        MotionEvent event = MotionEvent.obtain(lastTouchDown, now, action, pointerCount, pointerProperties, pointerCoords, 0, buttons, 1f, 1f,
+                DEFAULT_DEVICE_ID, 0, source, 0);
         return device.injectEvent(event, Device.INJECT_MODE_ASYNC);
     }
 
@@ -341,9 +340,8 @@ public class Controller implements AsyncProcessor {
         coords.setAxisValue(MotionEvent.AXIS_HSCROLL, hScroll);
         coords.setAxisValue(MotionEvent.AXIS_VSCROLL, vScroll);
 
-        MotionEvent event = MotionEvent
-                .obtain(lastTouchDown, now, MotionEvent.ACTION_SCROLL, 1, pointerProperties, pointerCoords, 0, buttons, 1f, 1f, DEFAULT_DEVICE_ID, 0,
-                        InputDevice.SOURCE_MOUSE, 0);
+        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, Device.INJECT_MODE_ASYNC);
     }
 

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

@@ -11,8 +11,8 @@ import android.graphics.Rect;
 import android.os.Build;
 import android.os.IBinder;
 import android.os.SystemClock;
-import android.view.IRotationWatcher;
 import android.view.IDisplayFoldListener;
+import android.view.IRotationWatcher;
 import android.view.InputDevice;
 import android.view.InputEvent;
 import android.view.KeyCharacterMap;

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

@@ -51,6 +51,7 @@ public final class DeviceMessageSender {
             }
         }
     }
+
     public void start() {
         thread = new Thread(() -> {
             try {

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

@@ -3,12 +3,21 @@ package com.genymobile.scrcpy;
 import android.os.BatteryManager;
 import android.os.Build;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 public final class Server {
 
+    public static final String SERVER_PATH;
+
+    static {
+        String[] classPaths = System.getProperty("java.class.path").split(File.pathSeparator);
+        // By convention, scrcpy is always executed with the absolute path of scrcpy-server.jar as the first item in the classpath
+        SERVER_PATH = classPaths[0];
+    }
+
     private static class Completion {
         private int running;
         private boolean fatalError;

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

@@ -75,7 +75,7 @@ public final class Settings {
 
         String oldValue = getValue(table, key);
         if (!value.equals(oldValue)) {
-             putValue(table, key, value);
+            putValue(table, key, value);
         }
         return oldValue;
     }

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

@@ -138,8 +138,8 @@ public final class ClipboardManager {
         }
     }
 
-    private static void addPrimaryClipChangedListener(Method method, int methodVersion, IInterface manager,
-            IOnPrimaryClipChangedListener listener) throws InvocationTargetException, IllegalAccessException {
+    private static void addPrimaryClipChangedListener(Method method, int methodVersion, IInterface manager, IOnPrimaryClipChangedListener listener)
+            throws InvocationTargetException, IllegalAccessException {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
             method.invoke(manager, listener, FakeContext.PACKAGE_NAME);
             return;

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

@@ -20,7 +20,7 @@ public final class PowerManager {
     private Method getIsScreenOnMethod() throws NoSuchMethodException {
         if (isScreenOnMethod == null) {
             @SuppressLint("ObsoleteSdkInt") // we may lower minSdkVersion in the future
-                    String methodName = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH ? "isInteractive" : "isScreenOn";
+            String methodName = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH ? "isInteractive" : "isScreenOn";
             isScreenOnMethod = manager.getClass().getMethod(methodName);
         }
         return isScreenOnMethod;

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

@@ -16,6 +16,7 @@ import java.lang.reflect.Method;
 public final class ServiceManager {
 
     private static final Method GET_SERVICE_METHOD;
+
     static {
         try {
             GET_SERVICE_METHOD = Class.forName("android.os.ServiceManager").getDeclaredMethod("getService", String.class);

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

@@ -4,8 +4,8 @@ import com.genymobile.scrcpy.Ln;
 
 import android.annotation.TargetApi;
 import android.os.IInterface;
-import android.view.IRotationWatcher;
 import android.view.IDisplayFoldListener;
+import android.view.IRotationWatcher;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;