less refcells; haptics

wlx-overlay-s/src/backend/common.rs

@@ -248,11 +248,10 @@ where
         if extent_dirty && !create_ran {
             let extent = wl.get_desktop_extent();
             let origin = wl.get_desktop_origin();
-            let mut hid_provider = app.hid_provider.borrow_mut();
-            hid_provider
+            app.hid_provider
                 .inner
                 .set_desktop_extent(vec2(extent.0 as f32, extent.1 as f32));
-            hid_provider
+            app.hid_provider
                 .inner
                 .set_desktop_origin(vec2(origin.0 as f32, origin.1 as f32));
         }

wlx-overlay-s/src/backend/input.rs

@@ -249,7 +249,7 @@ pub struct PointerHit {
     pub dist: f32,
 }
 
-#[derive(Clone)]
+#[derive(Clone, Copy)]
 pub struct Haptics {
     pub intensity: f32,
     pub duration: f32,
@@ -403,10 +403,7 @@ where
     log::trace!("Hit: {} {:?}", hovered.state.name, hit);
 
     if pointer.now.grab && !pointer.before.grab && hovered.state.grabbable {
-        {
-            let mut hid_provider = app.hid_provider.borrow_mut();
-            update_focus(&mut hid_provider.keyboard_focus, &hovered.state);
-        }
+        update_focus(&mut app.hid_provider.keyboard_focus, &hovered.state);
         pointer.start_grab(hovered, &mut app.tasks);
         return (
             hit.dist,
@@ -455,10 +452,7 @@ where
 
     if pointer.now.click && !pointer.before.click {
         pointer.interaction.clicked_id = Some(hit.overlay);
-        {
-            let mut hid_provider = app.hid_provider.borrow_mut();
-            update_focus(&mut hid_provider.keyboard_focus, &hovered.state);
-        }
+        update_focus(&mut app.hid_provider.keyboard_focus, &hovered.state);
         hovered.backend.on_pointer(app, &hit, true);
     } else if !pointer.now.click && pointer.before.click {
         if let Some(clicked_id) = pointer.interaction.clicked_id.take() {

wlx-overlay-s/src/backend/openvr/mod.rs

@@ -315,7 +315,7 @@ pub fn openvr_run(
             }
         }
 
-        state.hid_provider.borrow_mut().inner.commit();
+        state.hid_provider.inner.commit();
         let mut buffers = CommandBuffers::default();
 
         lines.update(universe.clone(), &mut overlay_mgr, &mut state)?;

wlx-overlay-s/src/backend/openxr/mod.rs

@@ -352,7 +352,7 @@ pub fn openxr_run(
             }
         }
 
-        app.hid_provider.borrow_mut().inner.commit();
+        app.hid_provider.inner.commit();
 
         let watch = overlays.mut_by_id(watch_id).unwrap(); // want panic
         let watch_transform = watch.state.transform;