diff --git a/wlx-common/src/config.rs b/wlx-common/src/config.rs index d9426aa..8b6e6f6 100644 --- a/wlx-common/src/config.rs +++ b/wlx-common/src/config.rs @@ -142,9 +142,6 @@ pub struct GeneralConfig { #[serde(default = "def_point7")] pub watch_view_angle_max: f32, - #[serde(default = "def_one")] - pub long_press_duration: f32, - #[serde(default = "def_osc_port")] pub osc_out_port: u16, @@ -166,30 +163,15 @@ pub struct GeneralConfig { #[serde(default = "def_auto")] pub capture_method: Arc, - #[serde(default = "def_point7")] - pub xr_grab_sensitivity: f32, - #[serde(default = "def_point7")] pub xr_click_sensitivity: f32, - #[serde(default = "def_point7")] - pub xr_alt_click_sensitivity: f32, - - #[serde(default = "def_half")] - pub xr_grab_sensitivity_release: f32, - #[serde(default = "def_half")] pub xr_click_sensitivity_release: f32, - #[serde(default = "def_half")] - pub xr_alt_click_sensitivity_release: f32, - #[serde(default = "def_true")] pub allow_sliding: bool, - #[serde(default = "def_true")] - pub realign_on_showhide: bool, - #[serde(default = "def_false")] pub focus_follows_mouse_mode: bool, diff --git a/wlx-overlay-s/src/config.rs b/wlx-overlay-s/src/config.rs index 62cbd6b..00a9848 100644 --- a/wlx-overlay-s/src/config.rs +++ b/wlx-overlay-s/src/config.rs @@ -109,7 +109,6 @@ pub struct AutoSettings { pub watch_view_angle_max: f32, pub notifications_enabled: bool, pub notifications_sound_enabled: bool, - pub realign_on_showhide: bool, pub allow_sliding: bool, pub space_drag_multiplier: f32, } @@ -126,7 +125,6 @@ pub fn save_settings(config: &GeneralConfig) -> anyhow::Result<()> { watch_view_angle_max: config.watch_view_angle_max, notifications_enabled: config.notifications_enabled, notifications_sound_enabled: config.notifications_sound_enabled, - realign_on_showhide: config.realign_on_showhide, allow_sliding: config.allow_sliding, space_drag_multiplier: config.space_drag_multiplier, }; diff --git a/wlx-overlay-s/src/res/config.yaml b/wlx-overlay-s/src/res/config.yaml index fee9dcb..8dc9270 100644 --- a/wlx-overlay-s/src/res/config.yaml +++ b/wlx-overlay-s/src/res/config.yaml @@ -1,38 +1,192 @@ -# For how much time mouse motion events should be stopped after clicking? -# Prevents accidental dragging various GUI elements or links, making it easier to click -# Default: 300 -click_freeze_time_ms: 300 +# This is the main config for WlxOverlay-S +# Place this file in ~/.config/wlxoverlay/conf.d and tweak the values. +# Default values are shown unless noted otherwise. -# Make scroll events inverted in X/Y axis -# Default: false -invert_scroll_direction_x: false -invert_scroll_direction_y: false +# In case you're not getting the expected result, +# check the logs at /tmp/wlx.log for parsing errors. -# Change speed of scrolling -# Default: 1.0 -# 0.5: half the speed -# 2.0: twice the speed -scroll_speed: 1.0 +################ EXPERIENCE ################ -# Default: true -keyboard_sound_enabled: true +## When enabled, sets functionality will be disabled and +## the bottom of the watch will list overlays instead of sets. +#single_set_mode: false -# Alter default scale of various overlays -# Default: 1.0 -keyboard_scale: 1.0 -desktop_view_scale: 1.0 -watch_scale: 1.0 +## Force an alternative method for Wayland desktop capture. +## `auto`: default +## `pw_fallback`: Pipewire-based software capture +## `screencopy`: Software capture that works on some Wayland compositors +## Other values that were previously here are no longer supported. +#capture_method: auto -# Enable / disable sliding windows back and forth with the scroll action -# Default: true -allow_sliding: true +## Monado/WiVRn only. Do not send controller input to other VR apps +## while WlxOverlay-S is being hovered. Either hand will block both hand inputs! +#block_game_input: false -# Enable / disable realigning the working set windows when they are shown/hidden -# Default: true -realign_on_showhide: true +## Do not block input when the watch is hovered. +#block_game_input_ignore_watch: true -# When enabled, the mouse pointer will not be moved on the screen, unless the trigger is touched -# allowing for moving both pointers off the screens to the keyboard, while keeping the cursor position -# unchanged, for when the desktop is configured to move the focus with the mouse cursor -# Default: false -focus_follows_mouse_mode: false +## How fast to drag when the space drag feature is activated +#space_drag_multiplier: 1.0 + +## When enabled, the space_rotate binding can be used +## to rotate in any axis. Imagine horizon mode². +#space_rotate_unlocked: false + +## Monado/WiVRn only. Use passthrough camera if the headset supports it. +## If disabled, the skybox will be shown. +#use_passthrough: true + +## Monado/WiVRn only. Display a skybox when no scene application is running. +## If disabled, there will be no background rendered (solid black). +#use_skybox: true + +## Hide the help popup that appears on your hand while grabbing an overlay +#hide_grab_help: false + +## Smoothing applied to the pointer. +## 1.0 → no smoothing +## 0.1 → too much smoothing +#pointer_lerp_factor: 0.3 + +## Only if built with `osc` feature. What port to send OSC messages to. +#osc_out_port: 9000 + +## If your upright screen is not displaying correctly, try enabling this. +#upright_screen_fix: false + +## If you're seeing the cursor twice, try enabling this. +#double_cursor_fix: false + +################ TIME ################ + +## Set your preferred watch timezones here. +#timezones: +# - "Europe/Oslo" +# - "America/New_York" + +## Use 12h instead of 24h watch. +#clock_12h: false + +################ KEYBOARD ################ + +## On most desktops, WlxOverlay-S is able to pick up your keymap via wayland. (Especially when using Fcitx5!) +## However, if this does not happen, you might want to set your keymap by hand. + +## When using a simple layout: +#default_keymap: us + +## When defining a layout-variant pair, separate using a dash: +#default_keymap: us-colemak_dh + +## Toggle keyboard click sound +#keyboard_sound_enabled: true + +################ THEMING & CUSTOMIZATION ################ + +## Path to read the custom theme from, relative to `~/.config/wlxoverlay` +#theme_path: "theme" + +## These can be used to control the color theme of WlxOverlay-S. +#color_accent: "#008cff" +#color_danger: "#ff3300" +#color_faded: "#668299" + +## Path to custom skybox texture, relative to `~/.config/wlxoverlay` +#skybox_texture: "" + +## User-defined list of custom overlays that should be created. +## Each entry must correspond to an XML file at: {theme_path}/gui/{entry}.xml +#custom_panels: +# - "test" + +## Alter default scale of various overlays +#keyboard_scale: 1.0 +#desktop_view_scale: 1.0 +#watch_scale: 1.0 + +## Control the fade & visibility of the watch +#watch_view_angle_min: 0.5 +#watch_view_angle_max: 0.7 + +## The alt_click binding can be used to execute a program of choice +## These are not default, but example values. +#alt_click_down: ["bash", "-c", "echo x"] +#alt_click_up: ["bash", "-c", "echo y"] + +## Example for quick-calibration with `motoc`: +#alt_click_down: +# [ +# "motoc", +# "calibrate", +# "--src", +# "WiVRn HMD", +# "--dst", +# "LHR-AABBCCDD", +# "--samples", +# "200", +# ] + +################ NOTIFICATIONS ################ + +## Set whether notifications should be shown at all +#notifications_enabled: true + +## Set whether notfications should make a sound +#notifications_sound_enabled: true + +## Set what kind of notifications to show and what to hide +#notification_topics: +# System: Center +# DesktopNotification: Center +# XSNotification: Center +# IpdChange: Hide + +## Path to a custom notification sound, relative to `~/.config/wlxoverlay` +#notification_sound: "" + +################ CONTROL TWEAKS ################ + +## For how much time mouse motion events should be stopped after clicking? +## Prevents accidental dragging various GUI elements or links, making it easier to click +#click_freeze_time_ms: 300 + +## Fixes behavior when the desktop environment +## expects the mouse buttons to be swapped +#left_handed_mouse: false + +## Make scroll events inverted in X/Y axis +#invert_scroll_direction_x: false +#invert_scroll_direction_y: false + +## Press and release thresholds for grip & trigger +## when using OpenXR (WiVRn, Monado) +#xr_click_sensitivity: 0.7 +#xr_click_sensitivity_release: 0.5 + +## Change speed of scrolling +# 0.5 → half the speed +# 2.0 → twice the speed +#scroll_speed: 1.0 + +## Enable / disable sliding windows back and forth with the scroll action +#allow_sliding: true + +## When enabled, the mouse pointer will not be moved on the screen, unless the trigger is touched +## allowing for moving both pointers off the screens to the keyboard, while keeping the cursor position +## unchanged, for when the desktop is configured to move the focus with the mouse cursor +#focus_follows_mouse_mode: false + +################ PERFORMANCE TWEAKS ################ + +## Render screens & mirrors at a lower resolution. +## Avoids aliasing on 4K+ screens, and also saves VRAM +#screen_render_down: false + +## If `screen_render_down` is enabled, +## controls the maximum height of the screen +#screen_max_height: 1440 + +## Don't move the mouse more often than this value +## helps to avoid unnecessary load when pairing +## a high-refresh screen with a lower-refresh hmd +#mouse_move_interval_ms: 10