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

1892 commits

This branch
This branch
All branches
Author SHA1 Message Date
Romain Vimont
ed19901db1 Set video and control sockets only on success 
Store the video and control sockets only if server_connect_to() returns
successfully.
 2021-11-13 10:05:01 +01:00
Romain Vimont
e69356c550 Initialize tunnel_enabled flag internally 
Set the flag from the inner methods, to avoid bypassing the assignment
by mistake (on error for example).
 2021-11-13 10:03:03 +01:00
Romain Vimont
03de9224fc Introduce process observer 
Add a tool to easily observe process termination.

This allows to move this complexity out of the server code.
 2021-11-13 10:02:23 +01:00
Romain Vimont
aa011832c1 Improve process API 
Prefix symbols and constants names and improve documentation.
 2021-11-12 22:44:37 +01:00
Romain Vimont
7e93abcf6d Factorize common impl of process_execute() 
Both implementations are the same. Move them to the common process.c.
 2021-11-12 22:44:37 +01:00
Romain Vimont
e80e6631e4 Remove duplicate function declaration 
The function process_terminate() was declared twice.
 2021-11-12 22:44:37 +01:00
Romain Vimont
fcc04f967b Improve file API 
Prefix symbols and constants names and improve documentation.
 2021-11-12 22:44:37 +01:00
Romain Vimont
d4c262301f Move functions from process to file 
Move filesystem-related functions from process.[ch] to file.[ch].
 2021-11-12 22:44:37 +01:00
Romain Vimont
be55e250ca Make screen_render() static 
It is only used from screen.c.
 2021-11-12 22:44:22 +01:00
Romain Vimont
c548f017bf Upgrade junit to 4.13.1 2021-11-12 22:44:18 +01:00
Romain Vimont
7a733328bc Adapt help to terminal size 
If the error stream is a terminal, and we can retrieve the terminal
size, wrap the help content according to the terminal width.
 2021-11-11 15:22:39 +01:00
Romain Vimont
38332f683c Add util function to get terminal size 2021-11-11 15:22:39 +01:00
Romain Vimont
3f51a2ab43 Generate getopt params from option structures 
Use the option descriptions to generate the optstring and longopts
parameters for the getopt_long() command.

That way, the options are completely described in a single place.
 2021-11-11 14:59:34 +01:00
Romain Vimont
74ab0a4df8 Structure shortcuts help 2021-11-11 14:59:34 +01:00
Romain Vimont
f59e9e3cb0 Structure command line options help 
It will allow to correctly print the help for the current terminal size
(even if for now it is hardcoded to 80 columns).
 2021-11-11 14:59:34 +01:00
Romain Vimont
9ec3406568 Add line wrapper 
Add a tool to wrap lines at words boundaries (spaces) to fit in a
specified number of columns, left-indented by a specified number of
spaces.
 2021-11-11 14:55:53 +01:00
Romain Vimont
6dba1922c1 Add string buffer util 
This will help to build strings incrementally.
 2021-11-11 14:55:52 +01:00
Romain Vimont
570a003c39 Remove deprecated -T option 
The short option -T is deprecated since v1.11. Only the long version
(--always-on-top) remains.
 2021-11-07 21:35:57 +01:00
Romain Vimont
b62df7ee91 Remove deprecated -c option 
The short option -c is deprecated since v1.11. Only the long version
(--crop) remains.
 2021-11-07 21:35:53 +01:00
Romain Vimont
30d40f4e78 Document --power-off-on-close 
The option was not documented.

Refs #824 <https://github.com/Genymobile/scrcpy/pull/824>
 2021-11-07 19:27:53 +01:00
Romain Vimont
f489f7fcad Mention drag & drop for non-APK files in help 2021-11-07 18:51:22 +01:00
Romain Vimont
d72c7076f7 Mention drag & drop APK in README 
For consistency with --help and manpage.
 2021-11-07 18:50:29 +01:00
Romain Vimont
fc64445555 Remove extra space in README 2021-11-07 18:50:24 +01:00
Romain Vimont
f65c3fde69 Fix typos in help 2021-11-07 18:50:24 +01:00
Romain Vimont
48fcfa96ab Add missing include "common.h" 2021-11-06 19:26:29 +01:00
Romain Vimont
676fa73d2c Wrap device name and size in a struct 
As a benefit, this avoids to take care of the device name length on the
caller side.
 2021-11-02 11:08:58 +01:00
Kaleidot725
790f04e91f Update README.jp.md to v1.19 
PR #2740 <https://github.com/Genymobile/scrcpy/pull/2740>

Signed-off-by: Romain Vimont <rom@rom1v.com>
 2021-10-31 13:03:27 +01:00
Romain Vimont
58ea238fb2 Remove unnecessary variable 
Test directly if a record filename is provided, without an intermediate
boolean variable.
 2021-10-31 12:45:59 +01:00
Romain Vimont
13c4aa1a3b Disable synthetic mouse events from touch events 
Touch events with id SDL_TOUCH_MOUSEID are ignored anyway, but it is
better not to generate them in the first place.
 2021-10-31 12:45:59 +01:00
Romain Vimont
caf594c90e Split SDL initialization 
Initialize SDL_INIT_EVENTS first (very quick) and SDL_INIT_VIDEO after
the server (quite long).
 2021-10-31 12:45:59 +01:00
Romain Vimont
688477ff65 Move SDL initialization 
Inline SDL initialization in scrcpy(). This will allow to split
minimal initialization and video initialization.
 2021-10-31 12:45:59 +01:00
Romain Vimont
ac539e1312 Set SDL hints before initialization 
In theory, some SDL hints should be initialized before calling
SDL_Init().
 2021-10-31 12:45:59 +01:00
Romain Vimont
a57c7d3a2b Extract SDL hints 
Set all SDL hints in a separate function.
 2021-10-31 12:45:56 +01:00
Romain Vimont
d2d18466d4 Factorize SDL event push 
Add a macro and inline function to call SDL_PushEvent() and log on error
(without actually handling the error, because there is nothing we could
do).
 2021-10-30 22:36:56 +02:00
Romain Vimont
dae091e3ab Handle SDL_PushEvent() errors 
Pushing an event to the main thread may fail. If this happens, log an
error, and try to recover when possible.
 2021-10-30 20:25:20 +02:00
Romain Vimont
4c4381de4c Use sc_ prefix for size, position and point 2021-10-30 15:20:39 +02:00
Romain Vimont
db484d82db Upgrade gradle build tools to 7.0.2 2021-10-30 11:32:48 +02:00
Romain Vimont
0c9666b733 Upgrade Android checkstyle to 9.0.1 
Adapt checkstyle.xml to match the latest version, and remove a line
break between imports which trigger a checkstyle volation.
 2021-10-30 11:23:51 +02:00
Romain Vimont
8bf28e9f53 Upgrade Android SDK to 31 2021-10-30 11:23:51 +02:00
Romain Vimont
06131ef634 Fix typo in clock comments 2021-10-29 12:21:34 +02:00
Romain Vimont
34eb10ea0b Define v4l2 option field only if HAVE_V4L2 2021-10-27 18:43:47 +02:00
Romain Vimont
27fa23846d Define default options as const struct 
This is more readable than a macro, and we could ifdef some fields.
 2021-10-27 18:43:47 +02:00
Romain Vimont
e4d5c1ce36 Move scrcpy option structs to options.h 
This will allow to define symbols in options.c without all the
dependencies of scrcpy.c.
 2021-10-27 18:43:47 +02:00
Romain Vimont
ac23bec144 Expose socket interruption 
On Linux, socket functions are unblocked by shutdown(), but on Windows
they are unblocked by closesocket().

Expose net_interrupt() and net_close() to abstract these differences:
 - net_interrupt() calls shutdown() on Linux and closesocket() on
   Windows (if not already called);
 - net_close() calls close() on Linux and closesocket() on Windows (if
   not already called).

This simplifies the server code, and prevents a data race on close
(reported by TSAN) on Linux (but does not fix it on Windows):

    WARNING: ThreadSanitizer: data race (pid=836124)
      Write of size 8 at 0x7ba0000000d0 by main thread:
        #0 close ../../../../src/libsanitizer/tsan/tsan_interceptors_posix.cpp:1690 (libtsan.so.0+0x359d8)
        #1 net_close ../app/src/util/net.c:211 (scrcpy+0x1c76b)
        #2 close_socket ../app/src/server.c:330 (scrcpy+0x19442)
        #3 server_stop ../app/src/server.c:522 (scrcpy+0x19e33)
        #4 scrcpy ../app/src/scrcpy.c:532 (scrcpy+0x156fc)
        #5 main ../app/src/main.c:92 (scrcpy+0x622a)

      Previous read of size 8 at 0x7ba0000000d0 by thread T6:
        #0 recv ../../../../src/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:6603 (libtsan.so.0+0x4f4a6)
        #1 net_recv ../app/src/util/net.c:167 (scrcpy+0x1c5a7)
        #2 run_receiver ../app/src/receiver.c:76 (scrcpy+0x12819)
        #3 <null> <null> (libSDL2-2.0.so.0+0x84f40)
 2021-10-27 18:41:58 +02:00
Romain Vimont
e5ea13770b Add socket wrapper 
This paves the way to store an additional "closed" flag on Windows
to interrupt and close properly.
 2021-10-26 22:49:57 +02:00
Romain Vimont
3eac212af1 Use net_send() from net_send_all() 
This will make net_send_all() continue to work even if net_send()
behavior is changed.
 2021-10-26 22:49:45 +02:00
Romain Vimont
3adff37c2d Use sc_ prefix for sockets 
Rename:
 - socket_t to sc_socket
 - INVALID_SOCKET to SC_INVALID_SOCKET
 2021-10-26 22:49:45 +02:00
Romain Vimont
eb6afe7669 Move net_init() and net_cleanup() upwards 
These two functions are global, define them at the top of the
implementation file. This is consistent with the header file.
 2021-10-26 22:49:45 +02:00
Romain Vimont
5222f213f4 Update FAQ to mention HID keyboard 2021-10-26 21:30:04 +02:00
Romain Vimont
e4163321f0 Delay HID events on Ctrl+v 
When Ctrl+v is pressed, a control is sent to the device to set the
device clipboard before injecting Ctrl+v.

With the InputManager method, it is guaranteed that the device
synchronization is executed before handling Ctrl+v, since the commands
are executed on the device in sequence.

However, HID are injected from the computer, so there is no such
guarantee. As a consequence, on Android, Ctrl+v triggers a paste with
the old clipboard content.

To workaround the issue, wait a bit (2 milliseconds) from the AOA
thread before injecting the event, to leave enough time for the
clipboard to be set before injecting Ctrl+v.
 2021-10-26 21:30:04 +02:00