mirrors/scrcpy
0
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-08-03 14:49:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Formatting cleanup

Browse source 
Change function order so its consistent throughout the program -> action,keycode,metastate,repeat
This commit is contained in:
xeropresence 2020-06-17 15:42:59 -04:00
commit 11104f91ed
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/src/main/java/com/genymobile/scrcpy/ControlMessage.java
View file

@ -36,7 +36,7 @@ public final class ControlMessage {
private ControlMessage() { private ControlMessage() {
} }
public static ControlMessage createInjectKeycode(int action, int keycode, int metaState,int repeat) { public static ControlMessage createInjectKeycode(int action, int keycode, int metaState, int repeat) {
ControlMessage msg = new ControlMessage(); ControlMessage msg = new ControlMessage();
msg.type = TYPE_INJECT_KEYCODE; msg.type = TYPE_INJECT_KEYCODE;
msg.action = action; msg.action = action;

2
server/src/main/java/com/genymobile/scrcpy/ControlMessageReader.java
View file

@ -100,7 +100,7 @@ public class ControlMessageReader {
int keycode = buffer.getInt(); int keycode = buffer.getInt();
int metaState = buffer.getInt(); int metaState = buffer.getInt();
int repeat = buffer.getInt(); int repeat = buffer.getInt();
return ControlMessage.createInjectKeycode(action, keycode, metaState,repeat); return ControlMessage.createInjectKeycode(action, keycode, metaState, repeat);
} }
private String parseString() { private String parseString() {

7
server/src/main/java/com/genymobile/scrcpy/Controller.java
View file

@ -74,8 +74,7 @@ public class Controller {
switch (msg.getType()) { switch (msg.getType()) {
case ControlMessage.TYPE_INJECT_KEYCODE: case ControlMessage.TYPE_INJECT_KEYCODE:
if (device.supportsInputEvents()) { if (device.supportsInputEvents()) {
//Ln.w("Unknown event type: " + msg.getRepeat()); injectKeycode(msg.getAction(), msg.getKeycode(), msg.getMetaState(), msg.getRepeat());
injectKeycode(msg.getAction(), msg.getKeycode(), msg.getMetaState(),msg.getRepeat());
} }
break; break;
case ControlMessage.TYPE_INJECT_TEXT: case ControlMessage.TYPE_INJECT_TEXT:
@ -131,8 +130,8 @@ public class Controller {
} }
} }
private boolean injectKeycode(int action, int keycode, int metaState,int repeat) { private boolean injectKeycode(int action, int keycode, int metaState, int repeat) {
return device.injectKeyEvent(action, keycode, repeat, metaState); return device.injectKeyEvent(action, keycode, metaState, repeat);
} }
private boolean injectChar(char c) { private boolean injectChar(char c) {

2
server/src/main/java/com/genymobile/scrcpy/Device.java
View file

@ -167,7 +167,7 @@ public final class Device {
return injectEvent(event, InputManager.INJECT_INPUT_EVENT_MODE_ASYNC); return injectEvent(event, InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);
} }
public boolean injectKeyEvent(int action, int keyCode, int repeat, int metaState) { public boolean injectKeyEvent(int action, int keyCode, int metaState, int repeat) {
long now = SystemClock.uptimeMillis(); long now = SystemClock.uptimeMillis();
KeyEvent event = new KeyEvent(now, now, action, keyCode, repeat, metaState, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0, KeyEvent event = new KeyEvent(now, now, action, keyCode, repeat, metaState, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0,
InputDevice.SOURCE_KEYBOARD); InputDevice.SOURCE_KEYBOARD);