Display and control your Android device
Synchronize device clipboard to computer
Romain Vimontacc4ef31df8d
diff --git a/README.md b/README.mdindex 8a1f5523..ab66827f 100644--- a/README.md+++ b/README.md@@ -482,6 +482,9 @@ both directions:- `Ctrl`+`v` _pastes_ the computer clipboard as a sequence of text events (butbreaks non-ASCII characters).+Moreover, any time the Android clipboard changes, it is automatically+synchronized to the computer clipboard.+#### Text injection preferenceThere are two kinds of [events][textevents] generated when typing text:diff --git a/server/src/main/aidl/android/content/IOnPrimaryClipChangedListener.aidl b/server/src/main/aidl/android/content/IOnPrimaryClipChangedListener.aidlnew file mode 100644index 00000000..46d7f7ca--- /dev/null+++ b/server/src/main/aidl/android/content/IOnPrimaryClipChangedListener.aidl@@ -0,0 +1,24 @@+/**+ * Copyright (c) 2008, The Android Open Source Project+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package android.content;++/**+ * {@hide}+ */+oneway interface IOnPrimaryClipChangedListener {+ void dispatchPrimaryClipChanged();+}diff --git a/server/src/main/java/com/genymobile/scrcpy/Device.java b/server/src/main/java/com/genymobile/scrcpy/Device.javaindex 91705359..6e788928 100644--- a/server/src/main/java/com/genymobile/scrcpy/Device.java+++ b/server/src/main/java/com/genymobile/scrcpy/Device.java@@ -6,10 +6,10 @@ import com.genymobile.scrcpy.wrappers.ServiceManager;import com.genymobile.scrcpy.wrappers.SurfaceControl;import com.genymobile.scrcpy.wrappers.WindowManager;+import android.content.IOnPrimaryClipChangedListener;import android.graphics.Rect;import android.os.Build;import android.os.IBinder;-import android.os.RemoteException;import android.view.IRotationWatcher;import android.view.InputEvent;@@ -22,10 +22,15 @@ public final class Device {void onRotationChanged(int rotation);}+ public interface ClipboardListener {+ void onClipboardTextChanged(String text);+ }+private final ServiceManager serviceManager = new ServiceManager();private ScreenInfo screenInfo;private RotationListener rotationListener;+ private ClipboardListener clipboardListener;/*** Logical display identifier@@ -66,6 +71,23 @@ public final class Device {}}, displayId);+ if (options.getControl()) {+ // If control is enabled, synchronize Android clipboard to the computer automatically+ serviceManager.getClipboardManager().addPrimaryClipChangedListener(new IOnPrimaryClipChangedListener.Stub() {+ @Override+ public void dispatchPrimaryClipChanged() {+ synchronized (Device.this) {+ if (clipboardListener != null) {+ String text = getClipboardText();+ if (text != null) {+ clipboardListener.onClipboardTextChanged(text);+ }+ }+ }+ }+ });+ }+if ((displayInfoFlags & DisplayInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS) == 0) {Ln.w("Display doesn't have FLAG_SUPPORTS_PROTECTED_BUFFERS flag, mirroring can be restricted");}@@ -138,6 +160,10 @@ public final class Device {this.rotationListener = rotationListener;}+ public synchronized void setClipboardListener(ClipboardListener clipboardListener) {+ this.clipboardListener = clipboardListener;+ }+public void expandNotificationPanel() {serviceManager.getStatusBarManager().expandNotificationsPanel();}diff --git a/server/src/main/java/com/genymobile/scrcpy/Server.java b/server/src/main/java/com/genymobile/scrcpy/Server.javaindex 73776c3e..e2c702ba 100644--- a/server/src/main/java/com/genymobile/scrcpy/Server.java+++ b/server/src/main/java/com/genymobile/scrcpy/Server.java@@ -53,11 +53,18 @@ public final class Server {ScreenEncoder screenEncoder = new ScreenEncoder(options.getSendFrameMeta(), options.getBitRate(), options.getMaxFps());if (options.getControl()) {- Controller controller = new Controller(device, connection);+ final Controller controller = new Controller(device, connection);// asynchronousstartController(controller);startDeviceMessageSender(controller.getSender());++ device.setClipboardListener(new Device.ClipboardListener() {+ @Override+ public void onClipboardTextChanged(String text) {+ controller.getSender().pushClipboardText(text);+ }+ });}try {diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.javaindex 7a3bfafb..e25b6e99 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java@@ -3,6 +3,7 @@ package com.genymobile.scrcpy.wrappers;import com.genymobile.scrcpy.Ln;import android.content.ClipData;+import android.content.IOnPrimaryClipChangedListener;import android.os.Build;import android.os.IInterface;@@ -13,6 +14,7 @@ public class ClipboardManager {private final IInterface manager;private Method getPrimaryClipMethod;private Method setPrimaryClipMethod;+ private Method addPrimaryClipChangedListener;public ClipboardManager(IInterface manager) {this.manager = manager;@@ -81,4 +83,37 @@ public class ClipboardManager {return false;}}++ private static void addPrimaryClipChangedListener(Method method, IInterface manager, IOnPrimaryClipChangedListener listener)+ throws InvocationTargetException, IllegalAccessException {+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {+ method.invoke(manager, listener, ServiceManager.PACKAGE_NAME);+ } else {+ method.invoke(manager, listener, ServiceManager.PACKAGE_NAME, ServiceManager.USER_ID);+ }+ }++ private Method getAddPrimaryClipChangedListener() throws NoSuchMethodException {+ if (addPrimaryClipChangedListener == null) {+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {+ addPrimaryClipChangedListener = manager.getClass()+ .getMethod("addPrimaryClipChangedListener", IOnPrimaryClipChangedListener.class, String.class);+ } else {+ addPrimaryClipChangedListener = manager.getClass()+ .getMethod("addPrimaryClipChangedListener", IOnPrimaryClipChangedListener.class, String.class, int.class);+ }+ }+ return addPrimaryClipChangedListener;+ }++ public boolean addPrimaryClipChangedListener(IOnPrimaryClipChangedListener listener) {+ try {+ Method method = getAddPrimaryClipChangedListener();+ addPrimaryClipChangedListener(method, manager, listener);+ return true;+ } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {+ Ln.e("Could not invoke method", e);+ return false;+ }+ }}