Merge remote-tracking branch 'origin/main' into next

wlx-overlay-s/.github/ISSUE_TEMPLATE/bug-report.md

@@ -36,8 +36,11 @@ If this is a regression, please mention which version was working previously.
 If your issue is graphical or crash or freeze, also add:
   VK_INSTANCE_LAYERS=VK_LAYER_KHRONOS_validation
 
+Next, create the empty log file: echo > /tmp/wlx.log
+
 Be sure to go and reproduce the issue once more, after these have been set.
 
 Upload the log file from: /tmp/wlx.log
+
 -->
 

wlx-overlay-s/README.md

@@ -55,7 +55,10 @@ In case screens were selected in the wrong order:
 
 **SteamVR users**: WlxOverlay-S will register itself for auto-start, so there is no need to start it every time.
 
-**Envision users**: Set `wlx-overlay-s --openxr --show` as the _Autostart Command_ on your Envision profile! This will show a home environment with headset passthrough by default or a [customizable background](https://github.com/galister/wlx-overlay-s/wiki/OpenXR-Skybox)! If you are using the appimage instead, set the _Autostart Command_ to the location of tha appimage binary, e.g `/full/path/to/wlx-overlay-s.appimage --openxr --show`.
+**Envision users**: Go to the Plugins menu and select the WlxOverlay-S plugin. This will download and run the AppImage version of the overlay.
+In order to run a standalone installation (for instance from the AUR), create a bash script containing `wlx-overlay-s --openxr --show` and then select this bash script as a custom Envision plugin.
+
+This will show a home environment with headset passthrough by default or a [customizable background](https://github.com/galister/wlx-overlay-s/wiki/OpenXR-Skybox)!
 
 **Please continue reading the guide below.**
 

wlx-overlay-s/src/subsystem/osc.rs

@@ -86,10 +86,20 @@ impl OscSender {
                 "/avatar/parameters/isOverlayOpen".into(),
                 vec![OscType::Bool(num_overlays > 0)],
             )?;
+            self.send_message(
+                "/avatar/parameters/ToggleWindows".into(),
+                vec![OscType::Bool(num_overlays > 0)],
+            )?;
+
             self.send_message(
                 "/avatar/parameters/isKeyboardOpen".into(),
                 vec![OscType::Bool(has_keyboard)],
             )?;
+            self.send_message(
+                "/avatar/parameters/ToggleKeyboard".into(),
+                vec![OscType::Bool(has_keyboard)],
+            )?;
+
             self.send_message(
                 "/avatar/parameters/isWristVisible".into(),
                 vec![OscType::Bool(has_wrist)],
@@ -109,6 +119,8 @@ impl OscSender {
             let mut tracker_total_bat = 0.0;
             let mut controller_total_bat = 0.0;
 
+            let mut lowest_battery = 1f32;
+
             for device in devices {
                 let tracker_param;
 
@@ -145,6 +157,8 @@ impl OscSender {
                     }
                 };
 
+                lowest_battery = lowest_battery.min(level);
+
                 // send device battery parameters
                 self.send_message(
                     format!("/avatar/parameters/{parameter}Battery"),
@@ -167,6 +181,10 @@ impl OscSender {
                 String::from("/avatar/parameters/averageTrackerBattery"),
                 vec![OscType::Float(tracker_total_bat / f32::from(tracker_count))],
             )?;
+            self.send_message(
+                String::from("/avatar/parameters/LowestBattery"),
+                vec![OscType::Float(lowest_battery)],
+            )?;
         }
 
         Ok(())

wlx-overlay-s/wlx-overlay-s.desktop

@@ -4,4 +4,4 @@ Name=WlxOverlay-S
 Exec=wlx-overlay-s
 Icon=wlx-overlay-s
 Terminal=true
-Categories=Utility;
+Categories=Utility;X-WiVRn-VR;