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

1805 commits

This branch
This branch
All branches
Author SHA1 Message Date
Romain Vimont
9a0bd545d5 Rename SC_INVALID_SOCKET to SC_SOCKET_NONE 
For consistency with SC_PROCESS_NONE.
 2021-11-14 01:22:22 +01:00
Romain Vimont
c4d008b96a Extract adb tunnel to a separate component 
This simplifies the server code.
 2021-11-14 01:22:22 +01:00
Romain Vimont
0d45c29d13 Move IPV4_LOCALHOST to net.h 
This constant will be used from several files.
 2021-11-14 01:22:22 +01:00
Romain Vimont
37c840a4c8 Interrupt on process terminated 
Interrupt any blocking call on process terminated, like on
server_stop().

This allows to interrupt any blocking accept() with correct
synchronization without additional complexity.
 2021-11-14 01:22:22 +01:00
Romain Vimont
f488cbd7e7 Make server interruptible 
Use an interruptor to immediately wake up blocking calls on
server_stop().
 2021-11-14 01:22:20 +01:00
Romain Vimont
40340509d9 Add interruptor utilities 
Expose wrapper functions for interrupting blocking calls, for process
and sockets.
 2021-11-13 22:54:18 +01:00
Romain Vimont
e0896142db Introduce interruptor tool 
An interruptor instance will help to wake up a blocking call from
another thread (typically to terminate immediately on Ctrl+C).
 2021-11-13 22:53:07 +01:00
Romain Vimont
0426708544 Run the server from a dedicated thread 
Define server callbacks, start the server asynchronously and listen to
connection events to initialize scrcpy properly.

It will help to simplify the server code, and allows to run the UI event
loop while the server is connecting. In particular, this will allow to
receive SIGINT/Ctrl+C events during connection to interrupt immediately.
 2021-11-13 10:19:52 +01:00
Romain Vimont
5b9c88693e Wait using a condition variable in server 
Currently, server_stop() is called from the same thread as
server_connect_to(), so interruption may never happen.

This is a step to prepare executing the server from a dedicated thread.
 2021-11-13 10:17:51 +01:00
Romain Vimont
a54dc8212f Reorder server functions 
This will avoid forward declarations in future commits.
 2021-11-13 10:16:35 +01:00
Romain Vimont
882e4cff5f Copy server params 
This is a preliminary step necessary to move the server to a separate
thread.
 2021-11-13 10:05:20 +01:00
Romain Vimont
9fa4d1cd4a Reorder server and server_params 
This will allow to define a server_params field in server.
 2021-11-13 10:05:20 +01:00
Romain Vimont
0bfa75a48b Split socket creation and connect/listen 
This will allow to assign the socket to a variable before connecting or
listening, so that it can be interrupted from another thread.
 2021-11-13 10:05:20 +01:00
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