From 6f79c52fc553e02c8749513b8a9be2e284d63d5f Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 17 Apr 2020 22:37:09 -0700 Subject: [PATCH] Plumb sendMousePosition() through to moonlight-common-c --- app/src/main/java/com/limelight/nvstream/NvConnection.java | 7 +++++++ .../main/java/com/limelight/nvstream/jni/MoonBridge.java | 2 ++ app/src/main/jni/moonlight-core/simplejni.c | 6 ++++++ 3 files changed, 15 insertions(+) diff --git a/app/src/main/java/com/limelight/nvstream/NvConnection.java b/app/src/main/java/com/limelight/nvstream/NvConnection.java index 95220aa1..55cbe26b 100644 --- a/app/src/main/java/com/limelight/nvstream/NvConnection.java +++ b/app/src/main/java/com/limelight/nvstream/NvConnection.java @@ -287,6 +287,13 @@ public class NvConnection { MoonBridge.sendMouseMove(deltaX, deltaY); } } + + public void sendMousePosition(short x, short y, short referenceWidth, short referenceHeight) + { + if (!isMonkey) { + MoonBridge.sendMousePosition(x, y, referenceWidth, referenceHeight); + } + } public void sendMouseButtonDown(final byte mouseButton) { diff --git a/app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java b/app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java index 847668b7..9b0c9a7e 100644 --- a/app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java +++ b/app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java @@ -239,6 +239,8 @@ public class MoonBridge { public static native void sendMouseMove(short deltaX, short deltaY); + public static native void sendMousePosition(short x, short y, short referenceWidth, short referenceHeight); + public static native void sendMouseButton(byte buttonEvent, byte mouseButton); public static native void sendMultiControllerInput(short controllerNumber, diff --git a/app/src/main/jni/moonlight-core/simplejni.c b/app/src/main/jni/moonlight-core/simplejni.c index e9ff2fe6..f427e341 100644 --- a/app/src/main/jni/moonlight-core/simplejni.c +++ b/app/src/main/jni/moonlight-core/simplejni.c @@ -10,6 +10,12 @@ Java_com_limelight_nvstream_jni_MoonBridge_sendMouseMove(JNIEnv *env, jclass cla LiSendMouseMoveEvent(deltaX, deltaY); } +JNIEXPORT void JNICALL +Java_com_limelight_nvstream_jni_MoonBridge_sendMousePosition(JNIEnv *env, jclass clazz, + jshort x, jshort y, jshort referenceWidth, jshort referenceHeight) { + LiSendMousePositionEvent(x, y, referenceWidth, referenceHeight); +} + JNIEXPORT void JNICALL Java_com_limelight_nvstream_jni_MoonBridge_sendMouseButton(JNIEnv *env, jclass clazz, jbyte buttonEvent, jbyte mouseButton) { LiSendMouseButtonEvent(buttonEvent, mouseButton);