WayVR: Convert target_display to lowercase at runtime (Closes #158)
[skip ci]
This commit is contained in:
@@ -787,8 +787,11 @@ where
|
|||||||
if let Some(app_entry) = catalog.get_app(app_name) {
|
if let Some(app_entry) = catalog.get_app(app_name) {
|
||||||
let mut wayvr = wayvr.borrow_mut();
|
let mut wayvr = wayvr.borrow_mut();
|
||||||
|
|
||||||
let disp_handle =
|
let disp_handle = get_or_create_display_by_name(
|
||||||
get_or_create_display_by_name(app, &mut wayvr, &app_entry.target_display)?;
|
app,
|
||||||
|
&mut wayvr,
|
||||||
|
&app_entry.target_display.to_lowercase(),
|
||||||
|
)?;
|
||||||
|
|
||||||
let args_vec = match &app_entry.args {
|
let args_vec = match &app_entry.args {
|
||||||
Some(args) => gen_args_vec(args),
|
Some(args) => gen_args_vec(args),
|
||||||
|
|||||||
@@ -41,18 +41,18 @@ dashboard:
|
|||||||
env: ["GDK_BACKEND=wayland"]
|
env: ["GDK_BACKEND=wayland"]
|
||||||
|
|
||||||
displays:
|
displays:
|
||||||
Watch:
|
watch:
|
||||||
width: 400
|
width: 400
|
||||||
height: 600
|
height: 600
|
||||||
scale: 0.4
|
scale: 0.4
|
||||||
attach_to: "HandRight" # HandLeft, HandRight
|
attach_to: "HandRight" # HandLeft, HandRight
|
||||||
pos: [0.0, 0.0, 0.125]
|
pos: [0.0, 0.0, 0.125]
|
||||||
rotation: {axis: [1.0, 0.0, 0.0], angle: -45.0}
|
rotation: {axis: [1.0, 0.0, 0.0], angle: -45.0}
|
||||||
Disp1:
|
disp1:
|
||||||
width: 640
|
width: 640
|
||||||
height: 480
|
height: 480
|
||||||
primary: true # Required if you want to attach external processes (not spawned by WayVR itself) without WAYVR_DISPLAY_NAME set
|
primary: true # Required if you want to attach external processes (not spawned by WayVR itself) without WAYVR_DISPLAY_NAME set
|
||||||
Disp2:
|
disp2:
|
||||||
width: 1280
|
width: 1280
|
||||||
height: 720
|
height: 720
|
||||||
scale: 2.0
|
scale: 2.0
|
||||||
@@ -61,18 +61,18 @@ catalogs:
|
|||||||
default_catalog:
|
default_catalog:
|
||||||
apps:
|
apps:
|
||||||
- name: "Calc"
|
- name: "Calc"
|
||||||
target_display: "Disp1"
|
target_display: "disp1"
|
||||||
exec: "kcalc"
|
exec: "kcalc"
|
||||||
env: ["FOO=bar"]
|
env: ["FOO=bar"]
|
||||||
shown_at_start: false
|
shown_at_start: false
|
||||||
|
|
||||||
- name: "htop"
|
- name: "htop"
|
||||||
target_display: "Watch"
|
target_display: "watch"
|
||||||
exec: "konsole"
|
exec: "konsole"
|
||||||
args: "-e htop"
|
args: "-e htop"
|
||||||
|
|
||||||
- name: "Browser"
|
- name: "Browser"
|
||||||
target_display: "Disp2"
|
target_display: "disp2"
|
||||||
exec: "cage"
|
exec: "cage"
|
||||||
args: "chromium -- --incognito"
|
args: "chromium -- --incognito"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user