fix OSC toggle, add mouse toggle

Author: andres-asm

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

@@ -1073,6 +1073,7 @@ private void initQam() {
 
         qamPerfSwitch = qamView.findViewById(R.id.qam_perf_overlay_switch);
         qamOscSwitch = qamView.findViewById(R.id.qam_osc_switch);
+        qamMouseSwitch = qamView.findViewById(R.id.qam_mouse_switch);
         final View oscRow = qamView.findViewById(R.id.qam_osc_row);
 
         if (virtualController == null) {
@@ -1092,19 +1093,33 @@ public void onClick(View v) {
         oscRow.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (virtualController == null) {
-                    return;
-                }
                 oscVisible = !oscVisible;
                 if (oscVisible) {
+                    if (virtualController == null) {
+                        virtualController = new VirtualController(controllerHandler,
+                                (FrameLayout)streamView.getParent(), Game.this);
+                        virtualController.refreshLayout();
+                        oscRow.setAlpha(1.0f);
+                    }
                     virtualController.show();
-                } else {
-                    virtualController.hide();
+                }
+                else {
+                    if (virtualController != null) {
+                        virtualController.hide();
+                    }
                 }
                 qamOscSwitch.setChecked(oscVisible);
             }
         });
 
+        qamView.findViewById(R.id.qam_mouse_row).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setInputGrabState(!grabbedInput);
+                qamMouseSwitch.setChecked(grabbedInput);
+            }
+        });
+
         qamView.findViewById(R.id.qam_disconnect).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -1140,13 +1155,20 @@ public void run() {
     private void showQam() {
         qamPerfSwitch.setChecked(perfOverlayVisible);
         qamOscSwitch.setChecked(oscVisible);
+        qamMouseSwitch.setChecked(grabbedInput);
+        if (oscVisible && virtualController != null) {
+            virtualController.hide();
+        }
         qamView.setVisibility(View.VISIBLE);
         qamView.findViewById(R.id.qam_perf_row).requestFocus();
         qamVisible = true;
     }
 
     private void hideQam() {
         qamView.setVisibility(View.GONE);
+        if (oscVisible && virtualController != null) {
+            virtualController.show();
+        }
         streamView.requestFocus();
         qamVisible = false;
     }

app/src/main/res/layout/overlay_qam.xml

@@ -80,6 +80,34 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/qam_mouse_row"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/qam_row_bg"
+        android:clickable="true"
+        android:focusable="true"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:padding="12dp">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/qam_mouse"
+            android:textAppearance="?android:textAppearanceLarge"
+            android:textColor="#FFFFFFFF" />
+
+        <Switch
+            android:id="@+id/qam_mouse_switch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:clickable="false"
+            android:focusable="false" />
+
+    </LinearLayout>
+
     <View
         android:layout_width="match_parent"
         android:layout_height="0dp"

app/src/main/res/values/strings.xml

@@ -128,6 +128,7 @@
     <string name="qam_title">Quick Menu</string>
     <string name="qam_perf_overlay">Performance Overlay</string>
     <string name="qam_osc">On-Screen Controller</string>
+    <string name="qam_mouse">Mouse Capture</string>
     <string name="qam_disconnect">Pause Session</string>
     <string name="qam_quit">Quit Session</string>
     <string name="per_app_settings_title">Application Settings</string>