Version 9.8.4

Setting the shift modifier flag alone is sufficient for current GFE versions

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,48 @@
+---
+name: Bug report
+about: Follow the troubleshooting guide before reporting a bug
+
+---
+**READ ME FIRST!**
+If you're here because something basic is not working (like gamepad input, video, or similar), it's probably something specific to your setup, so make sure you've gone through the Troubleshooting Guide first: https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting
+
+If you still have trouble with basic functionality after following the guide, join our Discord server where there are many other volunteers who can help (or direct you back here if it looks like a Moonlight bug after all). https://moonlight-stream.org/discord
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Steps to reproduce**
+Any special steps that are required for the bug to appear.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem. If the issue is related to video glitching or poor quality, please include screenshots.
+
+**Affected games**
+List the games you've tried that exhibit the issue. To see if the issue is game-specific, try streaming Steam Big Picture with Moonlight and see if the issue persists there.
+
+**Other Moonlight clients**
+- Does the issue occur when using Moonlight on PC or iOS?
+
+**Moonlight settings (please complete the following information)**
+- Have any settings been adjusted from defaults?
+- If so, which settings have been changed?
+- Does the problem still occur after reverting settings back to default?
+
+**Gamepad-related issues (please complete if problem is gamepad-related)**
+- Do you have any gamepads connected to your host PC directly?
+- If gamepad input is not working, does it work if you use Moonlight's on-screen controls?
+- Does the problem still remain if you stream the desktop and use https://html5gamepad.com to test your gamepad?
+  - Instructions for streaming the desktop can be found here: https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide
+
+**Device details (please complete the following information)**
+ - Android version: [e.g. Android 10]
+ - Device model: [e.g. Samsung Galaxy S21]
+
+**Server PC details (please complete the following information)**
+ - OS: [e.g. Windows 10 1809]
+ - GeForce Experience version: [e.g. 3.16.0.140]
+ - Nvidia GPU driver: [e.g. 417.35]
+ - Antivirus and firewall software: [e.g. Windows Defender and Windows Firewall]
+
+**Additional context**
+Anything else you think may be relevant to the issue or special about your specific setup.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.travis.yml

@@ -1,18 +0,0 @@
-language: android
-dist: trusty
-
-git:
-  depth: 1
-
-android:
-  components:
-    - tools
-    - platform-tools
-    - build-tools-30.0.0
-    - android-30
-
-before_install:
-  - sdkmanager --list
-
-install:
-  - yes | sdkmanager "ndk;21.0.6113669"

README.md

@@ -1,6 +1,7 @@
 # Moonlight Android
 
-[![Travis CI Status](https://travis-ci.org/moonlight-stream/moonlight-android.svg?branch=master)](https://travis-ci.org/moonlight-stream/moonlight-android)
+[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/232a8tadrrn8jv0k/branch/master?svg=true)](https://ci.appveyor.com/project/cgutman/moonlight-android/branch/master)
+[![Translation Status](https://hosted.weblate.org/widgets/moonlight/-/moonlight-android/svg-badge.svg)](https://hosted.weblate.org/projects/moonlight/moonlight-android/)
 
 [Moonlight for Android](https://moonlight-stream.org) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.
 
@@ -9,7 +10,7 @@ whether in your own home or over the internet.
 
 Moonlight also has a [PC client](https://github.com/moonlight-stream/moonlight-qt) and [iOS/tvOS client](https://github.com/moonlight-stream/moonlight-ios).
 
-Check out [the Moonlight wiki](https://github.com/moonlight-stream/moonlight-docs/wiki) for more detailed project information, setup guide, or troubleshooting steps.
+You can follow development on our [Discord server](https://moonlight-stream.org/discord) and help translate Moonlight into your language on [Weblate](https://hosted.weblate.org/projects/moonlight/moonlight-android/).
 
 ## Downloads
 * [Google Play Store](https://play.google.com/store/apps/details?id=com.limelight)

app/build.gradle

@@ -1,14 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
+    ndkVersion "22.0.7026061"
+
     compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 30
 
-        versionName "9.8.2"
-        versionCode = 253
+        versionName "9.8.4"
+        versionCode = 255
     }
 
     flavorDimensions "root"

app/src/main/AndroidManifest.xml

@@ -64,6 +64,7 @@
 
         <activity
             android:name=".PcView"
+            android:exported="true"
             android:resizeableActivity="true"
             android:configChanges="mcc|mnc|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
             <intent-filter>

app/src/main/java/com/limelight/Game.java

@@ -598,6 +598,10 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     public void onWindowFocusChanged(boolean hasFocus) {
         super.onWindowFocusChanged(hasFocus);
 
+        // We can't guarantee the state of modifiers keys which may have
+        // lifted while focus was not on us. Clear the modifier state.
+        this.modifierFlags = 0;
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             // Capture is lost when focus is lost, so it must be requested again
             // when focus is regained.
@@ -996,8 +1000,14 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         return false;
     }
 
-    private static byte getModifierState(KeyEvent event) {
-        byte modifier = 0;
+    // We cannot simply use modifierFlags for all key event processing, because
+    // some IMEs will not generate real key events for pressing Shift. Instead
+    // they will simply send key events with isShiftPressed() returning true,
+    // and we will need to send the modifier flag ourselves.
+    private byte getModifierState(KeyEvent event) {
+        // Start with the global modifier state to ensure we cover the case
+        // detailed in https://github.com/moonlight-stream/moonlight-android/issues/840
+        byte modifier = getModifierState();
         if (event.isShiftPressed()) {
             modifier |= KeyboardPacket.MODIFIER_SHIFT;
         }
@@ -1078,7 +1088,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             byte modifiers = getModifierState(event);
             if (KeyboardTranslator.needsShift(event.getKeyCode())) {
                 modifiers |= KeyboardPacket.MODIFIER_SHIFT;
-                conn.sendKeyboardInput((short) 0x8010, KeyboardPacket.KEY_DOWN, modifiers);
             }
             conn.sendKeyboardInput(translated, KeyboardPacket.KEY_DOWN, modifiers);
         }
@@ -1144,9 +1153,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 modifiers |= KeyboardPacket.MODIFIER_SHIFT;
             }
             conn.sendKeyboardInput(translated, KeyboardPacket.KEY_UP, modifiers);
-            if (KeyboardTranslator.needsShift(event.getKeyCode())) {
-                conn.sendKeyboardInput((short) 0x8010, KeyboardPacket.KEY_UP, getModifierState(event));
-            }
         }
 
         return true;
@@ -1187,6 +1193,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         {
             // This case is for mice and non-finger touch devices
             if (event.getSource() == InputDevice.SOURCE_MOUSE ||
+                    event.getSource() == InputDevice.SOURCE_TOUCHPAD ||
                     event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE ||
                     (event.getPointerCount() >= 1 &&
                             (event.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE ||

app/src/main/java/com/limelight/binding/input/ControllerHandler.java

@@ -895,7 +895,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             return KeyEvent.KEYCODE_BUTTON_MODE;
         }
 
-        if ((context.vendorId == 0x057e && context.productId == 0x2009) || // Switch Pro controller
+        // This mapping was adding in Android 10, then changed based on
+        // kernel changes (adding hid-nintendo) in Android 11. If we're
+        // on anything newer than Pie, just use the built-in mapping.
+        if ((context.vendorId == 0x057e && context.productId == 0x2009 && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) || // Switch Pro controller
                 (context.vendorId == 0x0f0d && context.productId == 0x00c1)) { // HORIPAD for Switch
             switch (event.getScanCode()) {
                 case 0x130:

app/src/main/java/com/limelight/binding/input/capture/AndroidNativePointerCaptureProvider.java

@@ -38,23 +38,31 @@ public class AndroidNativePointerCaptureProvider extends AndroidPointerIconCaptu
 
     @Override
     public boolean eventHasRelativeMouseAxes(MotionEvent event) {
-        return event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE;
+        // SOURCE_MOUSE_RELATIVE is how SOURCE_MOUSE appears when our view has pointer capture.
+        // SOURCE_TOUCHPAD will have relative axes populated iff our view has pointer capture.
+        // See https://developer.android.com/reference/android/view/View#requestPointerCapture()
+        return event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE ||
+                (event.getSource() == InputDevice.SOURCE_TOUCHPAD && targetView.hasPointerCapture());
     }
 
     @Override
     public float getRelativeAxisX(MotionEvent event) {
-        float x = event.getX();
+        int axis = (event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE) ?
+                MotionEvent.AXIS_X : MotionEvent.AXIS_RELATIVE_X;
+        float x = event.getAxisValue(axis);
         for (int i = 0; i < event.getHistorySize(); i++) {
-            x += event.getHistoricalX(i);
+            x += event.getHistoricalAxisValue(axis, i);
         }
         return x;
     }
 
     @Override
     public float getRelativeAxisY(MotionEvent event) {
-        float y = event.getY();
+        int axis = (event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE) ?
+                MotionEvent.AXIS_Y : MotionEvent.AXIS_RELATIVE_Y;
+        float y = event.getAxisValue(axis);
         for (int i = 0; i < event.getHistorySize(); i++) {
-            y += event.getHistoricalY(i);
+            y += event.getHistoricalAxisValue(axis, i);
         }
         return y;
     }

app/src/main/java/com/limelight/binding/input/driver/Xbox360Controller.java

@@ -26,6 +26,7 @@ public class Xbox360Controller extends AbstractXboxController {
             0x0f0d, // Hori
             0x1038, // SteelSeries
             0x11c9, // Nacon
+            0x1209, // Ardwiino
             0x12ab, // Unknown
             0x1430, // RedOctane
             0x146b, // BigBen
@@ -34,7 +35,9 @@ public class Xbox360Controller extends AbstractXboxController {
             0x162e, // Joytech
             0x1689, // Razer Onza
             0x1bad, // Harmonix
+            0x20d6, // PowerA
             0x24c6, // PowerA
+            0x2f24, // GameSir
     };
 
     public static boolean canClaimDevice(UsbDevice device) {

app/src/main/java/com/limelight/binding/input/driver/XboxOneController.java

@@ -21,7 +21,9 @@ public class XboxOneController extends AbstractXboxController {
             0x0e6f, // Unknown
             0x0f0d, // Hori
             0x1532, // Razer Wildcat
+            0x20d6, // PowerA
             0x24c6, // PowerA
+            0x2e24, // Hyperkin
     };
 
     private static final byte[] FW2015_INIT = {0x05, 0x20, 0x00, 0x01, 0x00};

app/src/main/java/com/limelight/binding/input/touch/RelativeTouchContext.java

@@ -147,6 +147,9 @@ public class RelativeTouchContext implements TouchContext {
     }
 
     private synchronized void startDragTimer() {
+        // Cancel any existing drag timers
+        cancelDragTimer();
+
         dragTimer = new Timer(true);
         dragTimer.schedule(new TimerTask() {
             @Override

app/src/main/java/com/limelight/binding/input/virtual_controller/DigitalButton.java

@@ -177,6 +177,15 @@ public class DigitalButton extends VirtualControllerElement {
             listener.onClick();
         }
 
+        if (timerLongClick != null) {
+            timerLongClick.cancel();
+            timerLongClick = null;
+        }
+        if (longClickTimerTask != null) {
+            longClickTimerTask.cancel();
+            longClickTimerTask = null;
+        }
+
         timerLongClick = new Timer();
         longClickTimerTask = new TimerLongClickTimerTask();
         timerLongClick.schedule(longClickTimerTask, timerLongClickTimeout);
@@ -200,9 +209,11 @@ public class DigitalButton extends VirtualControllerElement {
         // We may be called for a release without a prior click
         if (timerLongClick != null) {
             timerLongClick.cancel();
+            timerLongClick = null;
         }
         if (longClickTimerTask != null) {
             longClickTimerTask.cancel();
+            longClickTimerTask = null;
         }
     }
 

app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java

@@ -40,6 +40,8 @@ public class MediaCodecHelper {
     private static final List<String> blacklisted59FpsDecoderPrefixes;
     private static final List<String> qualcommDecoderPrefixes;
 
+    public static final boolean IS_EMULATOR = Build.HARDWARE.equals("ranchu") || Build.HARDWARE.equals("cheets");
+
     private static boolean isLowEndSnapdragon = false;
     private static boolean isAdreno620 = false;
     private static boolean initialized = false;
@@ -78,7 +80,7 @@ public class MediaCodecHelper {
 
         // Blacklist software decoders that don't support H264 high profile,
         // but exclude the official AOSP and CrOS emulator from this restriction.
-        if (!Build.HARDWARE.equals("ranchu") && !Build.HARDWARE.equals("cheets")) {
+        if (!IS_EMULATOR) {
             blacklistedDecoderPrefixes.add("omx.google");
             blacklistedDecoderPrefixes.add("AVCDecoder");
         }
@@ -586,7 +588,7 @@ public class MediaCodecHelper {
     private static boolean isCodecBlacklisted(MediaCodecInfo codecInfo) {
         // Use the new isSoftwareOnly() function on Android Q
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            if (codecInfo.isSoftwareOnly()) {
+            if (!IS_EMULATOR && codecInfo.isSoftwareOnly()) {
                 LimeLog.info("Skipping software-only decoder: "+codecInfo.getName());
                 return true;
             }

appveyor.yml

@@ -0,0 +1,18 @@
+version: 0.0.0.{build}
+
+clone_depth: 1
+
+image: Visual Studio 2019
+
+before_build:
+  - 'git submodule update --init --recursive'
+  - 'mklink /D C:\android-sdk "C:\Program Files (x86)\Android\android-sdk"'
+  - 'set ANDROID_HOME=C:\android-sdk'
+
+build_script:
+  - gradlew.bat build connectedCheck
+
+after_build:
+  - 'appveyor PushArtifact app\build\reports\lint-results.html'
+
+deploy: off

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.1.3'
     }
 }
 

fastlane/metadata/android/en-US/changelogs/254.txt

@@ -0,0 +1,2 @@
+- Fixed mapping of Nintendo Switch Pro controller on Android 11
+- Fixed handling of multiple input devices with different modifier states

fastlane/metadata/android/en-US/changelogs/255.txt

@@ -0,0 +1,2 @@
+- Fixed typing upper-case letters with the software keyboard
+- Improved device compatibility with the built-in USB Xbox gamepad driver