diff --git a/.github/workflows/build-all-features.yml b/.github/workflows/build-all-features.yml index da46711..ea748df 100644 --- a/.github/workflows/build-all-features.yml +++ b/.github/workflows/build-all-features.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 defaults: run: - working-directory: ./wlx-overlay-s + working-directory: ./wayvr steps: - uses: actions/checkout@v4 - name: Setup sccache diff --git a/.github/workflows/build-appimage.yml b/.github/workflows/build-appimage.yml index 4395558..9eb37b2 100644 --- a/.github/workflows/build-appimage.yml +++ b/.github/workflows/build-appimage.yml @@ -8,7 +8,7 @@ on: - 'test-*' env: - APPDIR: WlxOverlay-S.AppDir + APPDIR: WayVR.AppDir CARGO_TERM_COLOR: always SCCACHE_GHA_ENABLED: "true" RUSTC_WRAPPER: "sccache" @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-22.04 defaults: run: - working-directory: ./wlx-overlay-s + working-directory: ./wayvr steps: - uses: actions/checkout@v3 - name: Setup sccache @@ -35,5 +35,5 @@ jobs: - name: Upload AppImage uses: actions/upload-artifact@v4 with: - name: WlxOverlay-S-${{ github.ref_name }}-x86_64.AppImage - path: ./wlx-overlay-s/WlxOverlay-S-x86_64.AppImage + name: WayVR-${{ github.ref_name }}-x86_64.AppImage + path: ./wayvr/WayVR-x86_64.AppImage diff --git a/.github/workflows/build-default.yml b/.github/workflows/build-default.yml index 85665da..a20e5df 100644 --- a/.github/workflows/build-default.yml +++ b/.github/workflows/build-default.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 defaults: run: - working-directory: ./wlx-overlay-s + working-directory: ./wayvr steps: - uses: actions/checkout@v4 - name: Setup sccache diff --git a/.github/workflows/build-wayland-openvr.yml b/.github/workflows/build-wayland-openvr.yml index 07289dc..9b540dc 100644 --- a/.github/workflows/build-wayland-openvr.yml +++ b/.github/workflows/build-wayland-openvr.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 defaults: run: - working-directory: ./wlx-overlay-s + working-directory: ./wayvr steps: - uses: actions/checkout@v4 - name: Setup sccache diff --git a/.github/workflows/build-wayland-openxr.yml b/.github/workflows/build-wayland-openxr.yml index 4b433f0..42a5c33 100644 --- a/.github/workflows/build-wayland-openxr.yml +++ b/.github/workflows/build-wayland-openxr.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 defaults: run: - working-directory: ./wlx-overlay-s + working-directory: ./wayvr steps: - uses: actions/checkout@v4 - name: Setup sccache diff --git a/.github/workflows/build-x11-openvr.yml b/.github/workflows/build-x11-openvr.yml index 8b3ece3..cacd5e5 100644 --- a/.github/workflows/build-x11-openvr.yml +++ b/.github/workflows/build-x11-openvr.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 defaults: run: - working-directory: ./wlx-overlay-s + working-directory: ./wayvr steps: - uses: actions/checkout@v4 - name: Setup sccache diff --git a/.github/workflows/build-x11-openxr.yml b/.github/workflows/build-x11-openxr.yml index 30082ab..7e045de 100644 --- a/.github/workflows/build-x11-openxr.yml +++ b/.github/workflows/build-x11-openxr.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 defaults: run: - working-directory: ./wlx-overlay-s + working-directory: ./wayvr steps: - uses: actions/checkout@v4 - name: Setup sccache diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml index 8fd1fd2..1e21f05 100644 --- a/.github/workflows/make-release.yml +++ b/.github/workflows/make-release.yml @@ -6,7 +6,7 @@ on: - 'v**' env: - APPDIR: WlxOverlay-S.AppDir + APPDIR: WayVR.AppDir CARGO_TERM_COLOR: always SCCACHE_GHA_ENABLED: "true" RUSTC_WRAPPER: "sccache" @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-22.04 defaults: run: - working-directory: ./wlx-overlay-s + working-directory: ./wayvr steps: - uses: actions/checkout@v3 - name: Setup sccache @@ -39,7 +39,7 @@ jobs: pip install portage pycargoebuild wget https://github.com/gentoo/gentoo/raw/refs/heads/master/metadata/license-mapping.conf mkdir dist - pycargoebuild --distdir dist --license-mapping license-mapping.conf --crate-tarball --crate-tarball-path wlx-overlay-s-crates.tar.xz + pycargoebuild --distdir dist --license-mapping license-mapping.conf --crate-tarball --crate-tarball-path wayvr-crates.tar.xz - name: Create Release id: create_release uses: actions/create-release@v1 @@ -47,7 +47,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.RELEASE_KEY }} with: tag_name: ${{ github.ref_name }} - release_name: WlxOverlay-S ${{ github.ref_name }} + release_name: WayVR ${{ github.ref_name }} draft: true prerelease: false @@ -57,8 +57,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.RELEASE_KEY }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./target/release/wlx-overlay-s - asset_name: wlx-overlay-s + asset_path: ./target/release/wayvr + asset_name: wayvr asset_content_type: application/octet-stream - name: Upload WayVRCtl @@ -77,8 +77,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.RELEASE_KEY }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./wlx-overlay-s/WlxOverlay-S-x86_64.AppImage - asset_name: WlxOverlay-S-${{ github.ref_name }}-x86_64.AppImage + asset_path: ./wayvr/WayVR-x86_64.AppImage + asset_name: WayVR-${{ github.ref_name }}-x86_64.AppImage asset_content_type: application/octet-stream - name: Upload crates tarball @@ -87,6 +87,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.RELEASE_KEY }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./wlx-overlay-s/wlx-overlay-s-crates.tar.xz - asset_name: WlxOverlay-S-${{ github.ref_name }}-crates.tar.xz + asset_path: ./wayvr/wayvr-crates.tar.xz + asset_name: WayVR-${{ github.ref_name }}-crates.tar.xz asset_content_type: application/x-gtar diff --git a/.github/workflows/scripts/appimage_build_wlx.sh b/.github/workflows/scripts/appimage_build_wlx.sh index 9d30685..5a98865 100755 --- a/.github/workflows/scripts/appimage_build_wlx.sh +++ b/.github/workflows/scripts/appimage_build_wlx.sh @@ -1,4 +1,4 @@ #!/bin/sh cargo build --release -chmod +x ../target/release/wlx-overlay-s -cp ../target/release/wlx-overlay-s ${APPDIR}/usr/bin +chmod +x ../target/release/wayvr +cp ../target/release/wayvr ${APPDIR}/usr/bin diff --git a/.github/workflows/scripts/appimage_package.sh b/.github/workflows/scripts/appimage_package.sh index aed60cd..98fb3ff 100755 --- a/.github/workflows/scripts/appimage_package.sh +++ b/.github/workflows/scripts/appimage_package.sh @@ -1,4 +1,4 @@ #!/bin/sh export VERSION=$GITHUB_REF_NAME -./linuxdeploy-x86_64.AppImage -dwlx-overlay-s.desktop -iwlx-overlay-s.png --appdir=${APPDIR} --output appimage --exclude-library '*libpipewire*' -mv WlxOverlay-S-$VERSION-x86_64.AppImage WlxOverlay-S-x86_64.AppImage \ No newline at end of file +./linuxdeploy-x86_64.AppImage -dwayvr.desktop -iwayvr.png --appdir=${APPDIR} --output appimage --exclude-library '*libpipewire*' +mv WayVR-$VERSION-x86_64.AppImage WayVR-x86_64.AppImage diff --git a/Cargo.lock b/Cargo.lock index 75e661e..423e1da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6289,6 +6289,65 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "wayvr" +version = "26.1.0" +dependencies = [ + "anyhow", + "ash", + "bytes", + "chrono", + "chrono-tz", + "clap", + "config", + "dash-frontend", + "dbus", + "futures", + "glam", + "idmap", + "idmap-derive", + "image_dds", + "input-linux", + "interprocess", + "json", + "json5 1.3.0", + "libc", + "libmonado", + "log", + "log-panics", + "mint", + "openxr", + "ovr_overlay", + "regex", + "rosc", + "rust-embed", + "serde", + "serde_json", + "serde_json5", + "serde_yaml", + "signal-hook", + "slotmap", + "smallvec", + "smithay", + "strum", + "sysinfo", + "thiserror 2.0.17", + "tracing", + "tracing-subscriber", + "uuid", + "vulkano", + "vulkano-shaders", + "wayland-client", + "wayvr-ipc", + "wgui", + "winit", + "wlx-capture", + "wlx-common", + "xcb", + "xdg 3.0.0", + "xkbcommon", +] + [[package]] name = "wayvr-ipc" version = "0.1.0" @@ -6306,7 +6365,7 @@ dependencies = [ [[package]] name = "wayvrctl" -version = "0.1.0" +version = "26.1.0" dependencies = [ "anyhow", "clap", @@ -6898,7 +6957,7 @@ checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "wlx-capture" -version = "0.5.3" +version = "0.6.0" dependencies = [ "ashpd", "drm-fourcc", @@ -6936,65 +6995,6 @@ dependencies = [ "xdg 3.0.0", ] -[[package]] -name = "wlx-overlay-s" -version = "25.4.2" -dependencies = [ - "anyhow", - "ash", - "bytes", - "chrono", - "chrono-tz", - "clap", - "config", - "dash-frontend", - "dbus", - "futures", - "glam", - "idmap", - "idmap-derive", - "image_dds", - "input-linux", - "interprocess", - "json", - "json5 1.3.0", - "libc", - "libmonado", - "log", - "log-panics", - "mint", - "openxr", - "ovr_overlay", - "regex", - "rosc", - "rust-embed", - "serde", - "serde_json", - "serde_json5", - "serde_yaml", - "signal-hook", - "slotmap", - "smallvec", - "smithay", - "strum", - "sysinfo", - "thiserror 2.0.17", - "tracing", - "tracing-subscriber", - "uuid", - "vulkano", - "vulkano-shaders", - "wayland-client", - "wayvr-ipc", - "wgui", - "winit", - "wlx-capture", - "wlx-common", - "xcb", - "xdg 3.0.0", - "xkbcommon", -] - [[package]] name = "writeable" version = "0.6.2" diff --git a/Cargo.toml b/Cargo.toml index 6e6172a..7654ac6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ members = [ "uidev", "wgui", "wlx-common", - "wlx-overlay-s", + "wayvr", "wlx-capture", "dash-frontend", "wayvr-ipc", diff --git a/README.md b/README.md index 98a908c..2c5c10e 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# WlxOverlay-S +# WayVR A lightweight OpenXR/OpenVR overlay for Wayland and X11 desktops, inspired by XSOverlay. -WlxOverlay-S lets you to access your desktop screens while in VR. +WayVR lets you to access your desktop screens while in VR. -In comparison to similar overlays, WlxOverlay-S aims to run alongside VR games and experiences while having as little performance impact as possible. The UI appearance and rendering techniques are kept as simple and efficient as possible, while still allowing a high degree of customizability. +In comparison to similar overlays, WayVR aims to run alongside VR games and experiences while having as little performance impact as possible. The UI appearance and rendering techniques are kept as simple and efficient as possible, while still allowing a high degree of customizability. -![Screenshot of WlxOverlay-S being used as an OpenXR home environment](https://github.com/galister/wlx-overlay-s/blob/guide/wlx-s.png?raw=true) +![Screenshot of WayVR being used as an OpenXR home environment](https://github.com/galister/wlx-overlay-s/blob/guide/wlx-s.png?raw=true) ## Join the Linux VR Community @@ -14,20 +14,20 @@ We are available on either **Discord** or **Matrix space**: [![LVRA Discord](https://img.shields.io/discord/1065291958328758352?style=for-the-badge&logo=discord)](https://discord.gg/EHAYe3tTYa) [![LVRA Matrix](https://img.shields.io/matrix/linux-vr-adventures:matrix.org?logo=matrix&style=for-the-badge)](https://matrix.to/#/#linux-vr-adventures:matrix.org) -Questions/issues specific to WlxOverlay-S will be handled in the `wlxoverlay` chat room. Feel free to ask anything. +Questions/issues specific to WayVR will be handled in the `wayvr` chat room. Feel free to ask anything. ## Setup ### Installation -There are multiple ways to install WlxOverlay-S: +There are multiple ways to install WayVR: 1. AppImage: Download from [Releases](https://github.com/galister/wlx-overlay-s/releases) 1. AUR package: [wlx-overlay-s-git](https://aur.archlinux.org/packages/wlx-overlay-s-git) 1. Homebrew: - Add AtomicXR tap: `brew tap matrixfurry.com/atomicxr https://tangled.sh/@matrixfurry.com/homebrew-atomicxr` -- Install WlxOverlay-S: `brew install wlx-overlay-s` +- Install WayVR: `brew install wlx-overlay-s` 1. [Building from source](https://github.com/galister/wlx-overlay-s/wiki/Building-from-Source). @@ -36,14 +36,14 @@ There are multiple ways to install WlxOverlay-S: 1. Start Monado, WiVRn or SteamVR. 1. Run the overlay -**Note:** If you are using Monado or WiVRn, no additional setup steps are required for Flatpak Steam compatibility—most people use WlxOverlay-S seamlessly with Monado/WiVRn. +**Note:** If you are using Monado or WiVRn, no additional setup steps are required for Flatpak Steam compatibility—most people use WayVR seamlessly with Monado/WiVRn. ### SteamVR via Steam Flatpak For users specifically running **SteamVR via Steam Flatpak**, follow these steps: 1. Grab the latest AppImage from [Releases](https://github.com/galister/wlx-overlay-s/releases). -1. `WlxOverlay-S-*.AppImage --appimage-extract` +1. `WayVR-*.AppImage --appimage-extract` 1. `chmod +x squashfs-root/AppRun` 1. Move the newly created `squashfs-root` folder to a location accessible by the Steam Flatpak. 1. `flatpak override com.valvesoftware.Steam --user --filesystem=xdg-run/pipewire-0/:rw` @@ -58,16 +58,16 @@ For users specifically running **SteamVR via Steam Flatpak**, follow these steps In case screens were selected in the wrong order: - Go to Settings and press `Clear PipeWire tokens` and then `Restart software` - Pay attention to your notifications, it tells you in which order to pick the screens. -- If notifications don't show, try start Wlx from the terminal and look for instructions in there. +- If notifications don't show, try start WayVR from the terminal and look for instructions in there. -**WiVRn users**: Select WlxOverlay-S from the `Application` drop-down. If there's no such entry, select `Custom` and browse to your WlxOverlay-S executable or AppImage. +**WiVRn users**: Select WayVR from the `Application` drop-down. If there's no such entry, select `Custom` and browse to your WayVR executable or AppImage. -**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 set this bash script as a custom Envision plugin. +**Envision users**: Go to the Plugins menu and select the WayVR 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 `wayvr --openxr --show` and then set 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)! -**SteamVR users**: WlxOverlay-S will register itself for auto-start, so there is no need to start it every time. Disclaimer: SteamVR will sometimes disregard this and not start Wlx anyway. +**SteamVR users**: WayVR will register itself for auto-start, so there is no need to start it every time. Disclaimer: SteamVR will sometimes disregard this and not start WayVR anyway. **Please continue reading the guide below.** @@ -88,7 +88,7 @@ See the [bindings](#default-bindings) section on how to grab, move and resize ov ### Pointer Modes AKA Laser Colors -Much of the functionality in WlxOverlay-S depends on what color of laser is used to interact with a UI element. \ +Much of the functionality in WayVR depends on what color of laser is used to interact with a UI element. \ Using the default settings, there are 3 modes: - Regular Mode: Blue laser @@ -128,14 +128,11 @@ The click type depends on the laser color: ### The keyboard -The keyboard is fully customizable via the [keyboard.yaml](https://raw.githubusercontent.com/galister/wlx-overlay-s/main/wlx-overlay-s/src/res/keyboard.yaml) file. \ -Download it into the `~/.config/wlxoverlay/` folder and edit it to your liking. - Typing - Use the BLUE laser when typing regularly. - While using ORANGE laser, all keystrokes will have SHIFT applied. -- Purple laser is customizable via the `keyboard.yaml`'s `alt_modifier` settings. +- Purple laser is customizable via the settings, no modifier by default. **Modifier Keys** are sticky. They will remain pressed until a non-modifier key is pressed, the modifier gets toggled off, or the keyboard gets hidden. @@ -154,7 +151,7 @@ We would like to work with you and include additional bindings. When an error is detected, we often print tips for fixing into the log file. -Logs will be at `/tmp/wlx.log` for most distros. +Logs will be at `/tmp/wayvr.log` for most distros. Check [here](https://github.com/galister/wlx-overlay-s/wiki/Troubleshooting) for tips. @@ -165,7 +162,7 @@ Check [here](https://github.com/galister/wlx-overlay-s/wiki/Troubleshooting) for If the mouse is moving on a completely different screen, the screens were likely selected in the wrong order: - Go to Settings and press `Clear PipeWire tokens` and then `Restart software` - Pay attention to your notifications, it tells you in which order to pick the screens. -- If notifications don't show, try start Wlx from the terminal and look for instructions in there. +- If notifications don't show, try start WayVR from the terminal and look for instructions in there. COSMIC destkop: - Due to limitations with COSMIC, the mouse can only move on a single display. diff --git a/scripts/translator/description.txt b/scripts/translator/description.txt index 7b489a4..9e61907 100644 --- a/scripts/translator/description.txt +++ b/scripts/translator/description.txt @@ -2,9 +2,9 @@ You are a translator for the VR application which translates strings from Englis Info: This program is intended to be used as an utility to easily access your desktop display from within VR. Glossary: -- wlx-overlay-s: The name of this software (also called WlxOverlay-S) -- WayVR: A Wayland compositor intended to be used in VR -- WayVR Dashboard: An application (and game) launcher which is displayed in front of the user +- WayVR: The name of this software +- WayVR Server: A Wayland compositor intended to be used in VR +- WayVR Dashboard: An control panel and app launcher which is displayed in front of the user - Monado: A VR compositor - OpenVR: API made by Valve - OpenXR: API made by Khronos diff --git a/scripts/translator/main.ts b/scripts/translator/main.ts index 7e04e9c..442fae3 100644 --- a/scripts/translator/main.ts +++ b/scripts/translator/main.ts @@ -24,7 +24,7 @@ if (lang_path === undefined) { Try one of these: LANG_PATH=../../uidev/assets/lang/ ./run.sh LANG_PATH=../../dash-frontend/assets/lang/ ./run.sh -LANG_PATH=../../wlx-overlay-s/src/assets/lang/ ./run.sh`); +LANG_PATH=../../wayvr/src/assets/lang/ ./run.sh`); exit(-1); } @@ -191,4 +191,4 @@ async function run() { run().catch((e) => { console.log("Fatal error:", e); exit(-1); -}); \ No newline at end of file +}); diff --git a/wayvr-ipc/README.md b/wayvr-ipc/README.md index 1b26803..30d33c7 100644 --- a/wayvr-ipc/README.md +++ b/wayvr-ipc/README.md @@ -1,9 +1,9 @@ # WayVR Protocol Specification & Client Implementation -This repository contains the IPC specification and client implementation for the WayVR Server protocol (which is used in wlx-overlay-s). The primary purpose is to enable communication between applications and the WayVR server, offering a range of API functions. +This repository contains the IPC specification and client implementation for the WayVR protocol. The primary purpose is to enable communication between applications and the WayVR server, offering a range of API functions. [WayVR Server README](https://github.com/galister/wlx-overlay-s/tree/main/contrib/wayvr) ## Usage -[Example WayVR IPC Client usage in WayVR Dashboard](https://github.com/olekolek1000/wayvr-dashboard/blob/master/src-tauri/src/frontend_ipc.rs) +[Example WayVR IPC Client usage in WayVR Dashboard (Legacy)](https://github.com/olekolek1000/wayvr-dashboard/blob/master/src-tauri/src/frontend_ipc.rs) diff --git a/wayvr-ipc/src/packet_client.rs b/wayvr-ipc/src/packet_client.rs index b6e3655..4f01f47 100644 --- a/wayvr-ipc/src/packet_client.rs +++ b/wayvr-ipc/src/packet_client.rs @@ -1,4 +1,4 @@ -// Contents of this file should be the same as on wlx-overlay-s. +// Contents of this file should be the same as on wayvr. use std::collections::HashMap; diff --git a/wayvr-ipc/src/packet_server.rs b/wayvr-ipc/src/packet_server.rs index a2e1a87..12ed8fe 100644 --- a/wayvr-ipc/src/packet_server.rs +++ b/wayvr-ipc/src/packet_server.rs @@ -1,4 +1,4 @@ -// Contents of this file should be the same as on wlx-overlay-s. +// Contents of this file should be the same as on wayvr. use std::collections::HashMap; @@ -11,7 +11,7 @@ pub struct ServerInfo {} #[derive(Debug, Clone, Serialize, Deserialize)] pub struct HandshakeSuccess { - pub runtime: String, // Runtime name, for example "wlx-overlay-s" + pub runtime: String, // Runtime name, for example "wayvr" } #[derive(Debug, Clone, Serialize, Deserialize)] diff --git a/wlx-overlay-s/.gitignore b/wayvr/.gitignore similarity index 100% rename from wlx-overlay-s/.gitignore rename to wayvr/.gitignore diff --git a/wlx-overlay-s/Cargo.toml b/wayvr/Cargo.toml similarity index 93% rename from wlx-overlay-s/Cargo.toml rename to wayvr/Cargo.toml index 1d5cd04..fe4ee41 100644 --- a/wlx-overlay-s/Cargo.toml +++ b/wayvr/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "wlx-overlay-s" -version = "25.4.2" +name = "wayvr" +version = "26.1.0" edition = "2024" license = "GPL-3.0-only" -authors = ["galister"] -description = "Access your Wayland/X11 desktop from Monado/WiVRn/SteamVR. Now with Vulkan!" -repository = "https://github.com/galister/wlx-overlay-s" +authors = ["galister", "oo8dev"] +description = "Your way to enjoy VR on Linux! Access your Wayland/X11 desktop from Monado/WiVRn/SteamVR." +repository = "https://github.com/wlx-team/wayvr" keywords = [ "linux", "openvr", diff --git a/wlx-overlay-s/LICENSE b/wayvr/LICENSE similarity index 100% rename from wlx-overlay-s/LICENSE rename to wayvr/LICENSE diff --git a/wlx-overlay-s/README.md b/wayvr/README.md similarity index 100% rename from wlx-overlay-s/README.md rename to wayvr/README.md diff --git a/wlx-overlay-s/build.rs b/wayvr/build.rs similarity index 100% rename from wlx-overlay-s/build.rs rename to wayvr/build.rs diff --git a/wlx-overlay-s/contrib/wlx-overlay-s.service b/wayvr/contrib/wayvr.service similarity index 54% rename from wlx-overlay-s/contrib/wlx-overlay-s.service rename to wayvr/contrib/wayvr.service index db93d03..678d4e0 100644 --- a/wlx-overlay-s/contrib/wlx-overlay-s.service +++ b/wayvr/contrib/wayvr.service @@ -1,12 +1,12 @@ [Unit] -Description=wlx-overlay-s - Lightweight OpenXR/OpenVR overlay for Wayland and X11 desktops +Description=WayVR After=monado.service BindsTo=monado.service Requires=monado.socket Requires=graphical-session.target [Service] -ExecStart=@prefix@/bin/wlx-overlay-s +ExecStart=@prefix@/bin/wayvr [Install] WantedBy=monado.service diff --git a/wlx-overlay-s/contrib/wayvr/README.md b/wayvr/contrib/wayvr/README.md similarity index 100% rename from wlx-overlay-s/contrib/wayvr/README.md rename to wayvr/contrib/wayvr/README.md diff --git a/wlx-overlay-s/flatpak/com.github.galister.wlx-overlay-s.yml b/wayvr/flatpak/com.github.galister.wayvr.yml similarity index 87% rename from wlx-overlay-s/flatpak/com.github.galister.wlx-overlay-s.yml rename to wayvr/flatpak/com.github.galister.wayvr.yml index cd70e43..9546b47 100644 --- a/wlx-overlay-s/flatpak/com.github.galister.wlx-overlay-s.yml +++ b/wayvr/flatpak/com.github.galister.wayvr.yml @@ -1,11 +1,11 @@ -id: io.github.galister.wlx-overlay-s +id: io.github.wlx-team.wayvr runtime: org.freedesktop.Platform runtime-version: '24.08' sdk: org.freedesktop.Sdk sdk-extensions: - org.freedesktop.Sdk.Extension.rust-stable - org.freedesktop.Sdk.Extension.llvm19 -command: wlx-overlay-s +command: wayvr build-options: append-path: /usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm19/bin @@ -49,17 +49,17 @@ cleanup: modules: # wayvr goes here - - name: wlx-overlay-s + - name: wayvr buildsystem: simple build-options: env: - CARGO_HOME: /run/build/wlx-overlay-s/cargo + CARGO_HOME: /run/build/wayvr/cargo build-commands: - cargo --offline fetch --manifest-path Cargo.toml --verbose - cargo --offline build --release --no-default-features --features=openxr,x11,wayland --verbose - - install -Dm755 ../target/release/wlx-overlay-s -t /app/bin/ + - install -Dm755 ../target/release/wayvr -t /app/bin/ sources: - type: dir path: .. - - sources-wlx-overlay-s.json + - sources-wayvr.json diff --git a/wlx-overlay-s/flatpak/sources-wlx-overlay-s.json b/wayvr/flatpak/sources-wayvr.json similarity index 100% rename from wlx-overlay-s/flatpak/sources-wlx-overlay-s.json rename to wayvr/flatpak/sources-wayvr.json diff --git a/wlx-overlay-s/src/app_misc.rs b/wayvr/src/app_misc.rs similarity index 100% rename from wlx-overlay-s/src/app_misc.rs rename to wayvr/src/app_misc.rs diff --git a/wlx-overlay-s/src/assets/edit/3d.svg b/wayvr/src/assets/edit/3d.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/3d.svg rename to wayvr/src/assets/edit/3d.svg diff --git a/wlx-overlay-s/src/assets/edit/3d_bottomtop.svg b/wayvr/src/assets/edit/3d_bottomtop.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/3d_bottomtop.svg rename to wayvr/src/assets/edit/3d_bottomtop.svg diff --git a/wlx-overlay-s/src/assets/edit/3d_leftright.svg b/wayvr/src/assets/edit/3d_leftright.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/3d_leftright.svg rename to wayvr/src/assets/edit/3d_leftright.svg diff --git a/wlx-overlay-s/src/assets/edit/3d_rightleft.svg b/wayvr/src/assets/edit/3d_rightleft.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/3d_rightleft.svg rename to wayvr/src/assets/edit/3d_rightleft.svg diff --git a/wlx-overlay-s/src/assets/edit/3d_topbottom.svg b/wayvr/src/assets/edit/3d_topbottom.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/3d_topbottom.svg rename to wayvr/src/assets/edit/3d_topbottom.svg diff --git a/wlx-overlay-s/src/assets/edit/add.svg b/wayvr/src/assets/edit/add.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/add.svg rename to wayvr/src/assets/edit/add.svg diff --git a/wlx-overlay-s/src/assets/edit/anchor.svg b/wayvr/src/assets/edit/anchor.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/anchor.svg rename to wayvr/src/assets/edit/anchor.svg diff --git a/wlx-overlay-s/src/assets/edit/background-off.svg b/wayvr/src/assets/edit/background-off.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/background-off.svg rename to wayvr/src/assets/edit/background-off.svg diff --git a/wlx-overlay-s/src/assets/edit/background.svg b/wayvr/src/assets/edit/background.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/background.svg rename to wayvr/src/assets/edit/background.svg diff --git a/wlx-overlay-s/src/assets/edit/cancel.svg b/wayvr/src/assets/edit/cancel.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/cancel.svg rename to wayvr/src/assets/edit/cancel.svg diff --git a/wlx-overlay-s/src/assets/edit/checkbox-checked.svg b/wayvr/src/assets/edit/checkbox-checked.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/checkbox-checked.svg rename to wayvr/src/assets/edit/checkbox-checked.svg diff --git a/wlx-overlay-s/src/assets/edit/checkbox.svg b/wayvr/src/assets/edit/checkbox.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/checkbox.svg rename to wayvr/src/assets/edit/checkbox.svg diff --git a/wlx-overlay-s/src/assets/edit/close.svg b/wayvr/src/assets/edit/close.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/close.svg rename to wayvr/src/assets/edit/close.svg diff --git a/wlx-overlay-s/src/assets/edit/curve.svg b/wayvr/src/assets/edit/curve.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/curve.svg rename to wayvr/src/assets/edit/curve.svg diff --git a/wlx-overlay-s/src/assets/edit/delete.svg b/wayvr/src/assets/edit/delete.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/delete.svg rename to wayvr/src/assets/edit/delete.svg diff --git a/wlx-overlay-s/src/assets/edit/disable-grab.svg b/wayvr/src/assets/edit/disable-grab.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/disable-grab.svg rename to wayvr/src/assets/edit/disable-grab.svg diff --git a/wlx-overlay-s/src/assets/edit/fade.svg b/wayvr/src/assets/edit/fade.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/fade.svg rename to wayvr/src/assets/edit/fade.svg diff --git a/wlx-overlay-s/src/assets/edit/flip180.svg b/wayvr/src/assets/edit/flip180.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/flip180.svg rename to wayvr/src/assets/edit/flip180.svg diff --git a/wlx-overlay-s/src/assets/edit/flip270.svg b/wayvr/src/assets/edit/flip270.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/flip270.svg rename to wayvr/src/assets/edit/flip270.svg diff --git a/wlx-overlay-s/src/assets/edit/flip90.svg b/wayvr/src/assets/edit/flip90.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/flip90.svg rename to wayvr/src/assets/edit/flip90.svg diff --git a/wlx-overlay-s/src/assets/edit/flipped.svg b/wayvr/src/assets/edit/flipped.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/flipped.svg rename to wayvr/src/assets/edit/flipped.svg diff --git a/wlx-overlay-s/src/assets/edit/float.svg b/wayvr/src/assets/edit/float.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/float.svg rename to wayvr/src/assets/edit/float.svg diff --git a/wlx-overlay-s/src/assets/edit/grabbable.svg b/wayvr/src/assets/edit/grabbable.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/grabbable.svg rename to wayvr/src/assets/edit/grabbable.svg diff --git a/wlx-overlay-s/src/assets/edit/grid.svg b/wayvr/src/assets/edit/grid.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/grid.svg rename to wayvr/src/assets/edit/grid.svg diff --git a/wlx-overlay-s/src/assets/edit/inout.svg b/wayvr/src/assets/edit/inout.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/inout.svg rename to wayvr/src/assets/edit/inout.svg diff --git a/wlx-overlay-s/src/assets/edit/lock.svg b/wayvr/src/assets/edit/lock.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/lock.svg rename to wayvr/src/assets/edit/lock.svg diff --git a/wlx-overlay-s/src/assets/edit/lock_open.svg b/wayvr/src/assets/edit/lock_open.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/lock_open.svg rename to wayvr/src/assets/edit/lock_open.svg diff --git a/wlx-overlay-s/src/assets/edit/mirror.svg b/wayvr/src/assets/edit/mirror.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/mirror.svg rename to wayvr/src/assets/edit/mirror.svg diff --git a/wlx-overlay-s/src/assets/edit/mouse.svg b/wayvr/src/assets/edit/mouse.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/mouse.svg rename to wayvr/src/assets/edit/mouse.svg diff --git a/wlx-overlay-s/src/assets/edit/mouse_lock.svg b/wayvr/src/assets/edit/mouse_lock.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/mouse_lock.svg rename to wayvr/src/assets/edit/mouse_lock.svg diff --git a/wlx-overlay-s/src/assets/edit/move-all.svg b/wayvr/src/assets/edit/move-all.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/move-all.svg rename to wayvr/src/assets/edit/move-all.svg diff --git a/wlx-overlay-s/src/assets/edit/move-horizontal.svg b/wayvr/src/assets/edit/move-horizontal.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/move-horizontal.svg rename to wayvr/src/assets/edit/move-horizontal.svg diff --git a/wlx-overlay-s/src/assets/edit/normal.svg b/wayvr/src/assets/edit/normal.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/normal.svg rename to wayvr/src/assets/edit/normal.svg diff --git a/wlx-overlay-s/src/assets/edit/panel.svg b/wayvr/src/assets/edit/panel.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/panel.svg rename to wayvr/src/assets/edit/panel.svg diff --git a/wlx-overlay-s/src/assets/edit/pin.svg b/wayvr/src/assets/edit/pin.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/pin.svg rename to wayvr/src/assets/edit/pin.svg diff --git a/wlx-overlay-s/src/assets/edit/resize.svg b/wayvr/src/assets/edit/resize.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/resize.svg rename to wayvr/src/assets/edit/resize.svg diff --git a/wlx-overlay-s/src/assets/edit/rotate180.svg b/wayvr/src/assets/edit/rotate180.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/rotate180.svg rename to wayvr/src/assets/edit/rotate180.svg diff --git a/wlx-overlay-s/src/assets/edit/rotate270.svg b/wayvr/src/assets/edit/rotate270.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/rotate270.svg rename to wayvr/src/assets/edit/rotate270.svg diff --git a/wlx-overlay-s/src/assets/edit/rotate90.svg b/wayvr/src/assets/edit/rotate90.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/rotate90.svg rename to wayvr/src/assets/edit/rotate90.svg diff --git a/wlx-overlay-s/src/assets/edit/screen-add.svg b/wayvr/src/assets/edit/screen-add.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/screen-add.svg rename to wayvr/src/assets/edit/screen-add.svg diff --git a/wlx-overlay-s/src/assets/edit/screen-options.svg b/wayvr/src/assets/edit/screen-options.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/screen-options.svg rename to wayvr/src/assets/edit/screen-options.svg diff --git a/wlx-overlay-s/src/assets/edit/screen-remove.svg b/wayvr/src/assets/edit/screen-remove.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/screen-remove.svg rename to wayvr/src/assets/edit/screen-remove.svg diff --git a/wlx-overlay-s/src/assets/edit/screen.svg b/wayvr/src/assets/edit/screen.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/screen.svg rename to wayvr/src/assets/edit/screen.svg diff --git a/wlx-overlay-s/src/assets/edit/wayvr.svg b/wayvr/src/assets/edit/wayvr.svg similarity index 100% rename from wlx-overlay-s/src/assets/edit/wayvr.svg rename to wayvr/src/assets/edit/wayvr.svg diff --git a/wlx-overlay-s/src/assets/grab-help/controller-grip-b.svg b/wayvr/src/assets/grab-help/controller-grip-b.svg similarity index 100% rename from wlx-overlay-s/src/assets/grab-help/controller-grip-b.svg rename to wayvr/src/assets/grab-help/controller-grip-b.svg diff --git a/wlx-overlay-s/src/assets/grab-help/controller-grip-joy.svg b/wayvr/src/assets/grab-help/controller-grip-joy.svg similarity index 100% rename from wlx-overlay-s/src/assets/grab-help/controller-grip-joy.svg rename to wayvr/src/assets/grab-help/controller-grip-joy.svg diff --git a/wlx-overlay-s/src/assets/grab-help/controller-grip-trigger-joy.svg b/wayvr/src/assets/grab-help/controller-grip-trigger-joy.svg similarity index 100% rename from wlx-overlay-s/src/assets/grab-help/controller-grip-trigger-joy.svg rename to wayvr/src/assets/grab-help/controller-grip-trigger-joy.svg diff --git a/wlx-overlay-s/src/assets/grab-help/controller.svg b/wayvr/src/assets/grab-help/controller.svg similarity index 100% rename from wlx-overlay-s/src/assets/grab-help/controller.svg rename to wayvr/src/assets/grab-help/controller.svg diff --git a/wlx-overlay-s/src/assets/gui/anchor.xml b/wayvr/src/assets/gui/anchor.xml similarity index 100% rename from wlx-overlay-s/src/assets/gui/anchor.xml rename to wayvr/src/assets/gui/anchor.xml diff --git a/wlx-overlay-s/src/assets/gui/decor.xml b/wayvr/src/assets/gui/decor.xml similarity index 100% rename from wlx-overlay-s/src/assets/gui/decor.xml rename to wayvr/src/assets/gui/decor.xml diff --git a/wlx-overlay-s/src/assets/gui/edit.xml b/wayvr/src/assets/gui/edit.xml similarity index 100% rename from wlx-overlay-s/src/assets/gui/edit.xml rename to wayvr/src/assets/gui/edit.xml diff --git a/wlx-overlay-s/src/assets/gui/grab-help.xml b/wayvr/src/assets/gui/grab-help.xml similarity index 100% rename from wlx-overlay-s/src/assets/gui/grab-help.xml rename to wayvr/src/assets/gui/grab-help.xml diff --git a/wlx-overlay-s/src/assets/gui/keyboard.xml b/wayvr/src/assets/gui/keyboard.xml similarity index 100% rename from wlx-overlay-s/src/assets/gui/keyboard.xml rename to wayvr/src/assets/gui/keyboard.xml diff --git a/wlx-overlay-s/src/assets/gui/toast.xml b/wayvr/src/assets/gui/toast.xml similarity index 100% rename from wlx-overlay-s/src/assets/gui/toast.xml rename to wayvr/src/assets/gui/toast.xml diff --git a/wlx-overlay-s/src/assets/gui/watch.xml b/wayvr/src/assets/gui/watch.xml similarity index 99% rename from wlx-overlay-s/src/assets/gui/watch.xml rename to wayvr/src/assets/gui/watch.xml index e766a4b..b9dd9e0 100644 --- a/wlx-overlay-s/src/assets/gui/watch.xml +++ b/wayvr/src/assets/gui/watch.xml @@ -84,7 +84,7 @@
- +