Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity
923 commits 2 branches 1 tag 4.1 MiB
Commit graph

173 commits

Author SHA1 Message Date
Romain Vimont
eabaf6f7bd Simplify PASTE option for "set clipboard" 
When the client requests to set the clipboard, it may request to press
the PASTE key in addition. To be a bit generic, it was stored as a flag
in ControlMessage.java.

But flags suggest that it represents a bitwise union. Use a simple
boolean instead.
 2020-07-17 00:00:42 +02:00
Romain Vimont
322f1512ea Inject WAKEUP instead of POWER 
To power the device on, inject KEYCODE_WAKEUP to avoid a possible
race condition (the device might become off between the test
isScreenOn() and the POWER keycode injection).
 2020-07-15 12:03:44 +02:00
brunoais
30714aba34 Restore power mode to normal on cleanup 
This avoids to let the device screen turned off (as enabled by Ctrl+o or
--turn-screen-off).

PR #1576 <https://github.com/Genymobile/scrcpy/pull/1576>
Fixes #1572 <https://github.com/Genymobile/scrcpy/issues/1572>
 2020-07-09 22:33:11 +02:00
Romain Vimont
a973757fd1 Warn on ignored touch event 
In theory, this was expected to only happen when a touch event is sent
just before the device is rotated, but some devices do not respect the
encoding size, causing an unexpected mismatch.

Refs #1518 <https://github.com/Genymobile/scrcpy/issues/1518>
 2020-07-09 22:32:14 +02:00
Romain Vimont
5fa46ad0c7 Fix constants name in comment 2020-07-07 15:47:25 +02:00
Romain Vimont
334964c380 Make setScreenPowerMode() method static 
Its implementation does not use the instance at all.
 2020-07-07 15:34:34 +02:00
Romain Vimont
f7d4b6d0db Do not crash on missing clipboard manager 
Some devices have no clipboard manager.

In that case, do not try to enable clipboard synchronization to avoid
a crash.

Fixes #1440 <https://github.com/Genymobile/scrcpy/issues/1440>
Fixes #1556 <https://github.com/Genymobile/scrcpy/issues/1556>
 2020-07-03 08:53:51 +02:00
xeropresence
3c1ed5d86c Handle repeating keycodes 
Initialize "repeat" count on key events.

PR #1519 <https://github.com/Genymobile/scrcpy/pull/1519>
Refs #1013 <https://github.com/Genymobile/scrcpy/pull/1013>

Signed-off-by: Romain Vimont <rom@rom1v.com>
 2020-06-19 22:30:17 +02:00
Romain Vimont
488d22d4e2 Increase clipboard size from 4k to 256k 
Beyond 256k, SDL_GetClipboardText() returns an empty string on my
computer.

Fixes #1117 <https://github.com/Genymobile/scrcpy/issues/1117>
 2020-06-11 23:11:20 +02:00
Romain Vimont
245999aec4 Serialize text size on 4 bytes 
This will allow to send text having a size greater than 65535 bytes.
 2020-06-11 23:11:17 +02:00
Romain Vimont
a00a8763d6 Avoid additional copy on Java text parsing 
Directly pass the buffer range to the String constructor.
 2020-06-11 23:06:02 +02:00
Romain Vimont
8f314c74b0 Reorganize message size constants 
Make the max clipboard text length depend on the max message size.
 2020-06-11 22:58:54 +02:00
Romain Vimont
93a5c5149d Push clipboard text only if not null 
In practice, it does not change anything (it just avoids a spurious
wake-up), but semantically, it makes no sense to call
pushClipboardText() with a null value.
 2020-05-27 18:26:39 +02:00
Romain Vimont
d499ee53c9 Initialize a default log level 
Clean up has been broken by 3df63c579d.

The verbosity was correctly initialized for the Server process, but not
for the CleanUp process.

To avoid the problem, initialize a default log level.
 2020-05-27 12:05:29 +02:00
Romain Vimont
fc1dec0270 Paste on "set clipboard" if possible 
Ctrl+Shift+v synchronizes the computer clipboard to the Android device
clipboard. This feature had been added to provide a way to copy UTF-8
text from the computer to the device.

To make such a paste more straightforward, if the device runs at least
Android 7, also send a PASTE keycode to paste immediately.

<https://developer.android.com/reference/android/view/KeyEvent.html#KEYCODE_PASTE>

Fixes #786 <https://github.com/Genymobile/scrcpy/issues/786>
 2020-05-25 20:59:21 +02:00
Romain Vimont
4bbabfb4ef Move injection methods to Device 
Only the main injection method was exposed on Device, the convenience
methods were implemented in Controller.

For consistency, move them all to the Device class.
 2020-05-25 03:28:33 +02:00
Romain Vimont
ffc57512b3 Avoid clipboard synchronization loop 
The Android device listens for clipboard changes to synchronize with the
computer clipboard.

However, if the change comes from scrcpy (for example via Ctrl+Shift+v),
do not notify the change.
 2020-05-25 03:28:33 +02:00
Romain Vimont
c7a33fac36 Log actions on the caller side 
Some actions are exposed by the Device class, but logging success should
be done by the caller.
 2020-05-25 03:28:33 +02:00
Romain Vimont
81573d81a0 Pass a Locale to toUpperCase() 
Make lint happy.
 2020-05-25 03:28:15 +02:00
Romain Vimont
5c2cf88a1d Rename THRESHOLD to threshold 
Since the field is not final anymore, lint expects the name not to be
capitalized.
 2020-05-25 03:22:07 +02:00
Romain Vimont
3df63c579d Configure server verbosity from the client 
Send the requested log level from the client.

This paves the way to configure it via a command-line argument.
 2020-05-24 21:14:25 +02:00
Tzah Mazuz
080a4ee365 Add --codec-options 
Add a command-line parameter to pass custom options to the device
encoder (as a comma-separated list of "key[:type]=value").

The list of possible codec options is available in the Android
documentation:
<https://d.android.com/reference/android/media/MediaFormat>

PR #1325 <https://github.com/Genymobile/scrcpy/pull/1325>
Refs #1226 <https://github.com/Genymobile/scrcpy/pull/1226>

Co-authored-by: Romain Vimont <rom@rom1v.com>
 2020-05-24 14:54:34 +02:00
Romain Vimont
517dbd9c85 Increase buffer size to fix "set clipboard" event 
The buffer size must be greater than any event message.

Clipboard events may take up to 4096 bytes, so increase the buffer size.

Fixes #1425 <https://github.com/Genymobile/scrcpy/issues/1425>
 2020-05-24 14:33:23 +02:00
Romain Vimont
acc4ef31df Synchronize device clipboard to computer 
Automatically synchronize the device clipboard to the computer any time
it changes.

This allows seamless copy-paste from Android to the computer.

Fixes #1056 <https://github.com/Genymobile/scrcpy/issues/1056#issuecomment-631363684>
PR #1423 <https://github.com/Genymobile/scrcpy/pull/1423>
 2020-05-24 14:31:49 +02:00
Romain Vimont
73e722784d Remove useless exception declaration 
The interface declares it can throw a RemoteException, but the
implementation never throws such exception.
 2020-05-23 18:21:54 +02:00
Romain Vimont
e1cd75792c Simplify rotation watcher call 
Remove unnecessary private method (which was wrongly public).
 2020-05-23 14:39:09 +02:00
Romain Vimont
e2d5f0e7fc Send scroll events as a touchscreen 
Scroll events were sent with a mouse input device. When scrolling on a
list, this could cause the whole list to be focused, and drawn with the
focus color as background.

Send scroll events with a touchscreen input device instead (like motion
events).

Fixes #1362 <https://github.com/Genymobile/scrcpy/issues/1362>
 2020-05-07 15:08:11 +02:00
Romain Vimont
74ece9b45b Simplify ScreenEncoder more 
Commit 927d655ff6 removed the
iFrameInternal field and constructor argument.

Also remove it from createFormat() arguments.
 2020-05-05 19:01:44 +02:00
Romain Vimont
c77024314d Add an option to keep the device awake 
Add an option to prevent the device to sleep:

    scrcpy --stay-awake
    scrcpy -w

The initial state is restored on exit.

Fixes #631 <https://github.com/Genymobile/scrcpy/issues/631>
 2020-05-02 02:14:25 +02:00
Romain Vimont
4668638ee1 Handle "show touches" on the device-side 
Now that the server can access the Android settings and clean up
properly, handle the "show touches" option from the server.

The initial state is now correctly restored, even on device
disconnection.
 2020-05-02 01:55:30 +02:00
Romain Vimont
dbb0df607c Move constants to ServiceManager 
PACKAGE_NAME and USER_ID could be use by several "managers", so move
them to the service manager.
 2020-05-02 01:22:18 +02:00
Romain Vimont
2f74ec2518 Add a clean up process on the device 
In order to clean up on close, use a separate process which is not
killed when the device is disconnected (even if the main process itself
is killed).
 2020-05-02 01:22:18 +02:00
Romain Vimont
8c6799297b Implement access to settings without Context 
Expose methods to access the Android settings using private APIs.

This allows to read and write settings values immediately without
starting a new process to call "settings".
 2020-05-02 01:22:10 +02:00
Romain Vimont
62c0c1321f Apply workarounds only on error 
To avoid NullPointerException on some devices, workarounds have been
implemented. But these workaround produce (harmless) internal errors
causing exceptions to be printed in the console.

To avoid this problem, apply the workarounds only if it fails without
them.

Fixes #994 <https://github.com/Genymobile/scrcpy/issues/994>
Refs #365 <https://github.com/Genymobile/scrcpy/issues/365>
Refs #940 <https://github.com/Genymobile/scrcpy/issues/940>
 2020-05-01 19:42:31 +02:00
Tzah Mazuz
125c5561e8 Use MediaFormat constant for MIME type 
Replace "video/avc" by MIMETYPE_VIDEO_AVC.

Signed-off-by: Romain Vimont <rom@rom1v.com>
 2020-04-18 02:14:42 +02:00
Romain Vimont
94a7f1a0f8 Disable input events when necessary 
Disable input events on secondary displays before Android 10, even if
FLAG_PRESENTATION is not set.

Refs #1288 <https://github.com/Genymobile/scrcpy/issues/1288>
 2020-04-16 20:54:00 +02:00
Romain Vimont
270d0bf639 Rename max length constant for text injection 
To avoid confusion with the max text size for clipboard, rename the
constant limiting the text injection length.
 2020-04-13 19:38:43 +02:00
Romain Vimont
927d655ff6 Simplify ScreenEncoder 
Do not handle iFrameInterval field and parameter, it is never used
dynamically.
 2020-04-12 02:09:28 +02:00
Romain Vimont
ee2894779a Remove unused lockedVideoOrientation field 
During PR #1151, this field has been moved to ScreenInfo, but has not
been removed from ScreenEncoder.
 2020-04-12 02:08:16 +02:00
Kostiantyn Luzan
c1ebea26e6 Register rotation watcher on selected display 
PR #1275 <https://github.com/Genymobile/scrcpy/pull/1275>

Signed-off-by: Kostiantyn Luzan <vblack2006@gmail.com>
Signed-off-by: Romain Vimont <rom@rom1v.com>
 2020-04-08 12:09:24 +02:00
Romain Vimont
f07d21f050 Suppress DiscouragedPrivateApi lint warning 2020-04-08 12:09:24 +02:00
Romain Vimont
bea1c11f8e Do not log success on failure 
If calling the private API does not work, an exception is printed. In
that case, do not log that the action succeeded.
 2020-04-02 21:05:26 +02:00
e_vigurskiy
4150eedcdf Add display id parameter 
Add --display command line parameter to specify a display id.

PR #1238 <https://github.com/Genymobile/scrcpy/pull/1238>

Signed-off-by: Romain Vimont <rom@rom1v.com>
 2020-04-02 21:02:52 +02:00
Romain Vimont
5031b2c8ff Remove MagicNumber checkstyle 
There are a lot of "magic numbers" that we really don't want to extract
as a constant.

Until now, many @SuppressWarnings annotations were added, but it makes
no sense to check for magic number if we silent the warnings everywhere.
 2020-03-28 22:08:16 +01:00
Romain Vimont
4adf5fde6d Log device details on server start 2020-03-28 15:52:02 +01:00
Romain Vimont
3504c0016b Add tests for control message length 
This will avoid regressions for #1245.

<https://github.com/Genymobile/scrcpy/issues/1245>
 2020-03-26 22:48:01 +01:00
Romain Vimont
89d1602185 Fix expected message length for touch events 
The expected length for a touch event control message was incorrect. As
a consequence, a BufferUnderflowException could occur.

Fixes #1245 <https://github.com/Genymobile/scrcpy/issues/1245>
 2020-03-26 22:45:43 +01:00
Romain Vimont
566ba766af Remove unused constant 
It has not been removed when mouse and touch events have been merged.
 2020-03-26 22:43:53 +01:00
Tzah Mazuz
a0af402d96 Fix the printed versions (were opposite) 
PR #1224 <https://github.com/Genymobile/scrcpy/pull/1224>

Signed-off-by: Romain Vimont <rom@rom1v.com>
 2020-03-19 19:28:57 +01:00
Romain Vimont
ae2d094362 Handle locked video orientation from ScreenInfo 
Centralize video size management in ScreenInfo.

This allows to always send the correct initial video size to the client
if the video orientation is locked.
 2020-03-08 10:38:31 +01:00