drgreen/scrcpy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using ADBKeyboard for injecting text.

Browse Source
This commit is contained in:
Vladimir Chebotarev 2020-09-10 03:09:19 +03:00 committed by Romain Vimont
parent 576814bcec
commit e970b4bda3
8 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/cli.c
View File

@ -668,6 +668,7 @@ guess_record_format(const char *filename) {
#define OPT_FORWARD_ALL_CLICKS 1023
#define OPT_LEGACY_PASTE 1024
#define OPT_ENCODER_NAME 1025
#define OPT_USE_ADB_KEYBOARD 1026
bool
scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
@ -709,6 +710,7 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
{"show-touches", no_argument, NULL, 't'},
{"stay-awake", no_argument, NULL, 'w'},
{"turn-screen-off", no_argument, NULL, 'S'},
{"use-adb-keyboard", no_argument, NULL, OPT_USE_ADB_KEYBOARD},
{"verbosity", required_argument, NULL, 'V'},
{"version", no_argument, NULL, 'v'},
{"window-title", required_argument, NULL, OPT_WINDOW_TITLE},
@ -794,6 +796,9 @@ scrcpy_parse_args(struct scrcpy_cli_args *args, int argc, char *argv[]) {
case 'S':
opts->turn_screen_off = true;
break;
case OPT_USE_ADB_KEYBOARD:
opts->use_adb_keyboard = true;
break;
case 't':
opts->show_touches = true;
break;

1
app/src/scrcpy.c
View File

@ -320,6 +320,7 @@ scrcpy(const struct scrcpy_options *options) {
.codec_options = options->codec_options,
.encoder_name = options->encoder_name,
.force_adb_forward = options->force_adb_forward,
.use_adb_keyboard = options->use_adb_keyboard,
};
if (!server_start(&server, options->serial, &params)) {
return false;

2
app/src/scrcpy.h
View File

@ -82,6 +82,7 @@ struct scrcpy_options {
bool forward_key_repeat;
bool forward_all_clicks;
bool legacy_paste;
bool use_adb_keyboard;
};
#define SCRCPY_OPTIONS_DEFAULT { \
@ -129,6 +130,7 @@ struct scrcpy_options {
.forward_key_repeat = true, \
.forward_all_clicks = false, \
.legacy_paste = false, \
.use_adb_keyboard = false, \
}
bool

1
app/src/server.c
View File

@ -295,6 +295,7 @@ execute_server(struct server *server, const struct server_params *params) {
params->stay_awake ? "true" : "false",
params->codec_options ? params->codec_options : "-",
params->encoder_name ? params->encoder_name : "-",
params->use_adb_keyboard ? "true" : "false",
};
#ifdef SERVER_DEBUGGER
LOGI("Server debugger waiting for a client on device port "

1
app/src/server.h
View File

@ -59,6 +59,7 @@ struct server_params {
bool show_touches;
bool stay_awake;
bool force_adb_forward;
bool use_adb_keyboard;
};
// init default values

32
server/src/main/java/com/genymobile/scrcpy/Controller.java
View File

@ -20,6 +20,7 @@ public class Controller {
private final Device device;
private final DesktopConnection connection;
private final Options options;
private final DeviceMessageSender sender;
private final KeyCharacterMap charMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
@ -31,9 +32,10 @@ public class Controller {
private boolean keepPowerModeOff;
public Controller(Device device, DesktopConnection connection) {
public Controller(Device device, DesktopConnection connection, Options options) {
this.device = device;
this.connection = connection;
this.options = options;
initPointers();
sender = new DeviceMessageSender(connection);
}
@ -145,18 +147,28 @@ public class Controller {
}
private boolean injectChar(char c) {
String decomposed = KeyComposition.decompose(c);
char[] chars = decomposed != null ? decomposed.toCharArray() : new char[]{c};
KeyEvent[] events = charMap.getEvents(chars);
if (events == null) {
return false;
}
for (KeyEvent event : events) {
if (!device.injectEvent(event)) {
if (options.useADBKeyboard()) {
// Process latin keys the same way in order to provide same reaction speed.
try {
Process process = Runtime.getRuntime().exec("am broadcast -a ADB_INPUT_CHARS --eia chars " + String.valueOf((int) c));
return process.waitFor() == 0;
} catch (Throwable throwable) {
return false;
}
} else {
String decomposed = KeyComposition.decompose(c);
char[] chars = decomposed != null ? decomposed.toCharArray() : new char[]{c};
KeyEvent[] events = charMap.getEvents(chars);
if (events == null) {
return false;
}
for (KeyEvent event : events) {
if (!device.injectEvent(event)) {
return false;
}
}
return true;
}
return true;
}
private int injectText(String text) {

9
server/src/main/java/com/genymobile/scrcpy/Options.java
View File

@ -17,6 +17,7 @@ public class Options {
private boolean stayAwake;
private String codecOptions;
private String encoderName;
private boolean useADBKeyboard;
public Ln.Level getLogLevel() {
return logLevel;
@ -129,4 +130,12 @@ public class Options {
public void setEncoderName(String encoderName) {
this.encoderName = encoderName;
}
public boolean useADBKeyboard() {
return useADBKeyboard;
}
public void setUseADBKeyboard(boolean useADBKeyboard) {
this.useADBKeyboard = useADBKeyboard;
}
}

7
server/src/main/java/com/genymobile/scrcpy/Server.java
View File

@ -59,7 +59,7 @@ public final class Server {
options.getEncoderName());
if (options.getControl()) {
final Controller controller = new Controller(device, connection);
final Controller controller = new Controller(device, connection, options);
// asynchronous
startController(controller);
@ -122,7 +122,7 @@ public final class Server {
"The server version (" + BuildConfig.VERSION_NAME + ") does not match the client " + "(" + clientVersion + ")");
}
final int expectedParameters = 15;
final int expectedParameters = 16;
if (args.length != expectedParameters) {
throw new IllegalArgumentException("Expecting " + expectedParameters + " parameters");
}
@ -172,6 +172,9 @@ public final class Server {
String encoderName = "-".equals(args[14]) ? null : args[14];
options.setEncoderName(encoderName);
boolean useADBKeyboard = Boolean.parseBoolean(args[15]);
options.setUseADBKeyboard(useADBKeyboard);
return options;
}