StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

refactor(cargo.toml): upgrade and refine

Browse Source
This commit is contained in:
Nova
2024-09-05 08:52:10 -04:00
parent 4683710f09
commit c12300e756
3 changed files with 614 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

797
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

26
Cargo.toml
View File

@@ -18,7 +18,7 @@ path = "src/main.rs"
[features] [features]
default = ["wayland"] default = ["wayland"]
wayland = ["dep:smithay"] wayland = ["dep:smithay", "dep:wayland-scanner", "dep:wayland-backend"]
profile_tokio = ["dep:console-subscriber", "tokio/tracing"] profile_tokio = ["dep:console-subscriber", "tokio/tracing"]
profile_app = ["dep:tracing-tracy"] profile_app = ["dep:tracing-tracy"]
local_deps = ["stereokit-rust/force-local-deps"] local_deps = ["stereokit-rust/force-local-deps"]
@@ -36,16 +36,17 @@ auto_link_exclude_list = [
[profile.dev.package."*"] [profile.dev.package."*"]
opt-level = 3 opt-level = 3
debug = true
strip = "none"
debug-assertions = true
overflow-checks = true
[profile.release] [profile.release]
opt-level = 3 opt-level = 3
debug = "line-tables-only" debug = "line-tables-only"
strip = "symbols" strip = "none"
debug-assertions = true debug-assertions = true
overflow-checks = false overflow-checks = false
lto = true
panic = 'unwind'
[dependencies] [dependencies]
# small utility thingys # small utility thingys
@@ -85,11 +86,11 @@ nix = "0.29.0"
input-event-codes = "6.2.0" input-event-codes = "6.2.0"
zbus = { version = "4.4.0", default-features = false, features = ["tokio"] } zbus = { version = "4.4.0", default-features = false, features = ["tokio"] }
directories = "5.0.1" directories = "5.0.1"
xkbcommon = { version = "0.8.0", default-features = false } xkbcommon-rs = "0.1.0"
# wayland # wayland
wayland-scanner = "0.31.4" wayland-backend = { version = "0.3.7", optional = true, default-features = false }
wayland-backend = "0.3.6" wayland-scanner = { version = "0.31.4", optional = true }
[dependencies.smithay] [dependencies.smithay]
# git = "https://github.com/technobaboo/smithay.git" # git = "https://github.com/technobaboo/smithay.git"
@@ -97,15 +98,10 @@ wayland-backend = "0.3.6"
git = "https://github.com/smithay/smithay.git" git = "https://github.com/smithay/smithay.git"
# path = "../smithay" # path = "../smithay"
default-features = false default-features = false
features = [ features = ["desktop", "backend_drm", "renderer_gl", "wayland_frontend"]
"desktop",
"backend_drm",
"backend_egl",
"renderer_gl",
"wayland_frontend",
]
optional = true optional = true
[dependencies.stereokit-rust] [dependencies.stereokit-rust]
# path = "../StereoKit-rust" # path = "../StereoKit-rust"
# git = "https://github.com/mvvvv/StereoKit-rust.git" # git = "https://github.com/mvvvv/StereoKit-rust.git"

8
src/objects/input/mouse_pointer.rs
View File

@@ -18,7 +18,7 @@ use slotmap::{DefaultKey, Key as SlotKey};
use stardust_xr::values::Datamap; use stardust_xr::values::Datamap;
use std::sync::Arc; use std::sync::Arc;
use stereokit_rust::system::{Input, Key}; use stereokit_rust::system::{Input, Key};
use xkbcommon::xkb::{Context, Keymap, FORMAT_TEXT_V1}; use xkbcommon_rs::{xkb_keymap::CompileFlags, Context, Keymap, KeymapFormat};
use super::{get_sorted_handlers, CaptureManager, DistanceCalculator}; use super::{get_sorted_handlers, CaptureManager, DistanceCalculator};
@@ -75,10 +75,12 @@ impl MousePointer {
Datamap::from_typed(MouseEvent::default())?, Datamap::from_typed(MouseEvent::default())?,
)?; )?;
let context = Context::new(0).unwrap();
let keymap = KEYMAPS.lock().insert( let keymap = KEYMAPS.lock().insert(
Keymap::new_from_names(&Context::new(0), "evdev", "", "", "", None, 0) Keymap::new_from_names(context, None, CompileFlags::NO_FLAGS)
.unwrap() .unwrap()
.get_as_string(FORMAT_TEXT_V1), .get_as_string(KeymapFormat::TextV1)
.unwrap(),
); );
let keyboard_sender = PulseSender::add_to( let keyboard_sender = PulseSender::add_to(