chore: Minor code style improvements to Wayland code

fix(input-capture/layer_shell): Call read() on guard only once
With `wayland-backend/client_system` enabled, this was causing an infinite loop since `read` never returned `WouldBlock`. This seems to be an inconsistency in wayland-rs: https://github.com/Smithay/wayland-rs/pull/959 In any case, it isn't necessary to call `read` more than once.
2026-09-15 17:01:12 +03:00 · 2026-08-31 12:59:27 +02:00 · 2026-08-31 12:59:27 +02:00 · 2026-08-31 10:51:17 +02:00 · 2026-08-31 10:44:58 +02:00 · 2026-08-31 10:34:02 +02:00
11 changed files with 86 additions and 84 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,11 +30,19 @@ jobs:
      run: |
        cargo build --release
        cp target/release/lan-mouse lan-mouse-linux-x86_64
+    - name: Install cargo bundle
+      run: cargo install cargo-bundle
+    - name: Bundle
+      run: |
+        cargo bundle --release
    - name: Upload build artifact
      uses: actions/upload-artifact@v6
      with:
        name: lan-mouse-linux-x86_64
-        path: lan-mouse-linux-x86_64
+        path: |
+          lan-mouse-linux-x86_64
+          target/release/bundle/deb/lan-mouse_*.deb
+          target/release/bundle/appimage/lan-mouse_*.AppImage

  linux-arm64-release-build:
    runs-on: ubuntu-22.04-arm
@@ -49,11 +57,19 @@ jobs:
      run: |
        cargo build --release
        cp target/release/lan-mouse lan-mouse-linux-arm64
+    - name: Install cargo bundle
+      run: cargo install cargo-bundle
+    - name: Bundle
+      run: |
+        cargo bundle --release
    - name: Upload build artifact
      uses: actions/upload-artifact@v6
      with:
        name: lan-mouse-linux-arm64
-        path: lan-mouse-linux-arm64
+        path: |
+          lan-mouse-linux-arm64
+          target/release/bundle/deb/lan-mouse_*.deb
+          target/release/bundle/appimage/lan-mouse_*.AppImage

  windows-release-build:
    runs-on: windows-latest
@@ -89,7 +105,7 @@ jobs:
        # see https://github.com/wingtk/gvsbuild/pull/1004
        Move-Item "C:\Program Files\Git\usr\bin" "C:\Program Files\Git\usr\notbin"
        Move-Item "C:\Program Files\Git\bin" "C:\Program Files\Git\notbin"
-        gvsbuild build --msys-dir=C:\msys64 gtk4 libadwaita librsvg
+        gvsbuild build --vs-ver=vs2026 --msys-dir=C:\msys64 gtk4 libadwaita librsvg
        Move-Item "C:\Program Files\Git\usr\notbin" "C:\Program Files\Git\usr\bin"
        Move-Item "C:\Program Files\Git\notbin" "C:\Program Files\Git\bin"
    - uses: actions/checkout@v6
@@ -188,7 +204,11 @@ jobs:
        generate_release_notes: true
        files: |
          lan-mouse-linux-x86_64/lan-mouse-linux-x86_64
+          lan-mouse-linux-x86_64/target/release/bundle/deb/lan-mouse_*.deb
+          lan-mouse-linux-x86_64/target/release/bundle/appimage/lan-mouse_*.AppImage
          lan-mouse-linux-arm64/lan-mouse-linux-arm64
+          lan-mouse-linux-arm64/target/release/bundle/deb/lan-mouse_*.deb
+          lan-mouse-linux-arm64/target/release/bundle/appimage/lan-mouse_*.AppImage
          lan-mouse-macos-intel/lan-mouse-macos-intel.zip
          lan-mouse-macos-arm64/lan-mouse-macos-arm64.zip
          lan-mouse-windows-x86_64/lan-mouse-windows-x86_64.zip
@@ -201,7 +221,11 @@ jobs:
        generate_release_notes: true
        files: |
          lan-mouse-linux-x86_64/lan-mouse-linux-x86_64
+          lan-mouse-linux-x86_64/target/release/bundle/deb/lan-mouse_*.deb
+          lan-mouse-linux-x86_64/target/release/bundle/appimage/lan-mouse_*.AppImage
          lan-mouse-linux-arm64/lan-mouse-linux-arm64
+          lan-mouse-linux-arm64/target/release/bundle/deb/lan-mouse_*.deb
+          lan-mouse-linux-arm64/target/release/bundle/appimage/lan-mouse_*.AppImage
          lan-mouse-macos-intel/lan-mouse-macos-intel.zip
          lan-mouse-macos-arm64/lan-mouse-macos-arm64.zip
          lan-mouse-windows-x86_64/lan-mouse-windows-x86_64.zip
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -40,7 +40,6 @@ jobs:
          - test
    steps:
      - uses: actions/checkout@v6
-      - uses: Swatinem/rust-cache@v2
      - name: Install Linux deps
        if: runner.os == 'Linux'
        run: |
@@ -49,6 +48,13 @@ jobs:
      - name: Install macOS dependencies
        if: runner.os == 'macOS'
        run: brew install gtk4 libadwaita imagemagick
+      - name: Record macOS native lib versions for cache key
+        if: runner.os == 'macOS'
+        run: |
+          echo "MACOS_LIB_VER=$(brew list --versions glib gtk4 libadwaita | tr '\n' '_')" >> "$GITHUB_ENV"
+      - uses: Swatinem/rust-cache@v2
+        with:
+          prefix-key: ${{ env.MACOS_LIB_VER }}
      - name: Install Windows Dependencies - create gtk dir
        if: runner.os == 'Windows'
        run: mkdir C:\gtk-build\gtk\x64\release
@@ -77,7 +83,7 @@ jobs:
          py -m venv .venv
          .venv\Scripts\activate.ps1
          py -m pip install gvsbuild
-          gvsbuild build --msys-dir=C:\msys64 gtk4 libadwaita librsvg
+          gvsbuild build --vs-ver=vs2026 --msys-dir=C:\msys64 gtk4 libadwaita librsvg
      - name: cargo build
        if: matrix.job == 'build'
        run: cargo build
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1898,12 +1898,6 @@ dependencies = [
 "vcpkg",
 ]

-[[package]]
-name = "linux-raw-sys"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.12.1"
@@ -2489,12 +2483,14 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"

 [[package]]
 name = "reis"
-version = "0.5.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00939c5c526a1b4054ef8d9d96b3f92227f08ca355965e986741b556eda6d289"
+checksum = "81f3fedd2777cde52c1be5e572efbec485eac7b801c47820eda388d4f13b9c4b"
 dependencies = [
- "futures",
- "rustix 0.38.44",
+ "enumflags2",
+ "futures-util",
+ "log",
+ "rustix",
 "tokio",
 ]

@@ -2540,19 +2536,6 @@ dependencies = [
 "nom",
 ]

-[[package]]
-name = "rustix"
-version = "0.38.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
-dependencies = [
- "bitflags 2.11.0",
- "errno",
- "libc",
- "linux-raw-sys 0.4.15",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "rustix"
 version = "1.1.4"
@@ -2562,7 +2545,7 @@ dependencies = [
 "bitflags 2.11.0",
 "errno",
 "libc",
- "linux-raw-sys 0.12.1",
+ "linux-raw-sys",
 "windows-sys 0.61.2",
 ]

@@ -2880,7 +2863,7 @@ dependencies = [
 "fastrand",
 "getrandom 0.4.2",
 "once_cell",
- "rustix 1.1.4",
+ "rustix",
 "windows-sys 0.61.2",
 ]

@@ -3388,7 +3371,7 @@ checksum = "2857dd20b54e916ec7253b3d6b4d5c4d7d4ca2c33c2e11c6c76a99bd8744755d"
 dependencies = [
 "cc",
 "downcast-rs",
- "rustix 1.1.4",
+ "rustix",
 "smallvec",
 "wayland-sys",
 ]
@@ -3400,7 +3383,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
 dependencies = [
 "bitflags 2.11.0",
- "rustix 1.1.4",
+ "rustix",
 "wayland-backend",
 "wayland-scanner",
 ]
@@ -4065,7 +4048,7 @@ dependencies = [
 "hex",
 "libc",
 "ordered-stream",
- "rustix 1.1.4",
+ "rustix",
 "serde",
 "serde_repr",
 "tokio",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -93,7 +93,8 @@ rdp_emulation = ["input-emulation/remote_desktop_portal"]

 [package.metadata.bundle]
 name = "Lan Mouse"
-icon = ["target/icon.icns"]
+icon = ["target/icon.icns", "lan-mouse-gtk/resources/de.feschber.LanMouse.svg"]
 identifier = "de.feschber.LanMouse"
+deb_depends = [ "libadwaita-1-0" ]
 osx_info_plist_exts = ["build-aux/macos-lsui-element.plist"]
 resources = ["target/menubar-template.png"]
--- a/input-capture/Cargo.toml
+++ b/input-capture/Cargo.toml
@@ -45,7 +45,7 @@ ashpd = { version = "0.13.9", default-features = false, features = [
    "input_capture",
    "tokio",
 ], optional = true }
-reis = { version = "0.5.0", features = ["tokio"], optional = true }
+reis = { version = "0.7.0", features = ["tokio"], optional = true }

 [target.'cfg(target_os="macos")'.dependencies]
 core-graphics = { version = "0.25.0", features = ["highsierra"] }
--- a/input-capture/src/layer_shell.rs
+++ b/input-capture/src/layer_shell.rs
@@ -123,7 +123,6 @@ struct State {
    focused: Option<Arc<Window>>,
    global_list: GlobalList,
    globals: Globals,
-    wayland_fd: RawFd,
    read_guard: Option<ReadEventsGuard>,
    qh: QueueHandle<Self>,
    pending_events: VecDeque<(Position, CaptureEvent)>,
@@ -138,7 +137,7 @@ struct Inner {

 impl AsRawFd for Inner {
    fn as_raw_fd(&self) -> RawFd {
-        self.state.wayland_fd
+        self.queue.as_fd().as_raw_fd()
    }
 }

@@ -332,7 +331,6 @@ impl LayerShellInputCapture {
            active_windows: Vec::new(),
            focused: None,
            qh,
-            wayland_fd: queue.as_fd().as_raw_fd(),
            read_guard: None,
            pending_events: VecDeque::new(),
            outputs: vec![],
@@ -548,13 +546,12 @@ impl State {
 }

 impl Inner {
-    fn read(&mut self) -> bool {
+    fn read(&mut self) {
        match self.state.read_guard.take().unwrap().read() {
-            Ok(_) => true,
-            Err(WaylandError::Io(e)) if e.kind() == ErrorKind::WouldBlock => false,
+            Ok(_) => {}
+            Err(WaylandError::Io(e)) if e.kind() == ErrorKind::WouldBlock => {}
            Err(WaylandError::Io(e)) => {
                log::error!("error reading from wayland socket: {e}");
-                false
            }
            Err(WaylandError::Protocol(e)) => {
                panic!("wayland protocol violation: {e}")
@@ -564,16 +561,11 @@ impl Inner {

    fn prepare_read(&mut self) -> io::Result<()> {
        loop {
-            match self.queue.prepare_read() {
-                None => match self.queue.dispatch_pending(&mut self.state) {
-                    Ok(_) => continue,
-                    Err(DispatchError::Backend(WaylandError::Io(e))) => return Err(e),
-                    Err(e) => panic!("failed to dispatch wayland events: {e}"),
-                },
-                Some(r) => {
-                    self.state.read_guard = Some(r);
-                    break Ok(());
-                }
+            if let Some(guard) = self.queue.prepare_read() {
+                self.state.read_guard = Some(guard);
+                break Ok(());
+            } else {
+                self.dispatch_events();
            }
        }
    }
@@ -655,13 +647,7 @@ impl Stream for LayerShellInputCapture {
                let inner = guard.get_inner_mut();

                // read events
-                while inner.read() {
-                    // prepare next read
-                    match inner.prepare_read() {
-                        Ok(_) => {}
-                        Err(e) => return Poll::Ready(Some(Err(e.into()))),
-                    }
-                }
+                inner.read();

                // dispatch the events
                inner.dispatch_events();
--- a/input-capture/src/libei.rs
+++ b/input-capture/src/libei.rs
@@ -413,7 +413,15 @@ async fn do_capture_session(
                    };

                    // find client corresponding to barrier
-                    let pos = *pos_for_barrier_id.get(&barrier_id).expect("invalid barrier id");
+                    let pos = match pos_for_barrier_id.get(&barrier_id) {
+                        Some(id) => *id,
+                        None => {
+                            log::warn!("INVALID BARRIER ID: Id {barrier_id} does not exist!");
+                            let id = find_corresponding_client(&barriers, activated.cursor_position().expect("no cursor position reported by compositor"));
+                            let pos = *pos_for_barrier_id.get(&id).expect("invalid barrier id");
+                            pos
+                        },
+                    };
                    current_pos.replace(Some(pos));

                    // client entered => send event
@@ -529,15 +537,6 @@ fn distance_to_line(line: ((f32, f32), (f32, f32)), p: (f32, f32)) -> f32 {
    distance
 }

-static ALL_CAPABILITIES: &[DeviceCapability] = &[
-    DeviceCapability::Pointer,
-    DeviceCapability::PointerAbsolute,
-    DeviceCapability::Keyboard,
-    DeviceCapability::Touch,
-    DeviceCapability::Scroll,
-    DeviceCapability::Button,
-];
-
 async fn handle_ei_event(
    ei_event: EiEvent,
    current_client: Option<Position>,
@@ -545,9 +544,15 @@ async fn handle_ei_event(
    event_tx: &Sender<(Position, CaptureEvent)>,
    release_session: &Notify,
 ) -> Result<(), CaptureError> {
+    let all_capabilities = DeviceCapability::Pointer
+        | DeviceCapability::PointerAbsolute
+        | DeviceCapability::Keyboard
+        | DeviceCapability::Touch
+        | DeviceCapability::Scroll
+        | DeviceCapability::Button;
    match ei_event {
        EiEvent::SeatAdded(s) => {
-            s.seat.bind_capabilities(ALL_CAPABILITIES);
+            s.seat.bind_capabilities(all_capabilities);
            context.flush().map_err(|e| io::Error::new(e.kind(), e))?;
        }
        EiEvent::SeatRemoved(_) | /* EiEvent::DeviceAdded(_) | */ EiEvent::DeviceRemoved(_) => {
--- a/input-emulation/Cargo.toml
+++ b/input-emulation/Cargo.toml
@@ -45,7 +45,7 @@ ashpd = { version = "0.13.9", default-features = false, features = [
    "screencast",
    "tokio",
 ], optional = true }
-reis = { version = "0.5.0", features = ["tokio"], optional = true }
+reis = { version = "0.7.0", features = ["tokio"], optional = true }

 [target.'cfg(target_os="macos")'.dependencies]
 bitflags = "2.6.0"
--- a/input-emulation/src/libei.rs
+++ b/input-emulation/src/libei.rs
@@ -291,14 +291,12 @@ async fn ei_event_handler(
 ) -> Result<(), EmulationError> {
    loop {
        let event = events.next().await.ok_or(EmulationError::EndOfStream)??;
-        const CAPABILITIES: &[DeviceCapability] = &[
-            DeviceCapability::Pointer,
-            DeviceCapability::PointerAbsolute,
-            DeviceCapability::Keyboard,
-            DeviceCapability::Touch,
-            DeviceCapability::Scroll,
-            DeviceCapability::Button,
-        ];
+        let capabilities = DeviceCapability::Pointer
+            | DeviceCapability::PointerAbsolute
+            | DeviceCapability::Keyboard
+            | DeviceCapability::Touch
+            | DeviceCapability::Scroll
+            | DeviceCapability::Button;
        log::debug!("{event:?}");
        match event {
            EiEvent::Disconnected(e) => {
@@ -306,7 +304,7 @@ async fn ei_event_handler(
                return Err(EmulationError::EndOfStream);
            }
            EiEvent::SeatAdded(e) => {
-                e.seat().bind_capabilities(CAPABILITIES);
+                e.seat().bind_capabilities(capabilities);
            }
            EiEvent::SeatRemoved(e) => {
                log::debug!("seat removed: {:?}", e.seat());
@@ -314,7 +312,6 @@ async fn ei_event_handler(
            EiEvent::DeviceAdded(e) => {
                let device_type = e.device().device_type();
                log::debug!("device added: {device_type:?}");
-                e.device().device();
                let device = e.device();
                if let Some(pointer) = e.device().interface::<Pointer>() {
                    devices
--- a/input-event/Cargo.toml
+++ b/input-event/Cargo.toml
@@ -14,7 +14,7 @@ serde = { version = "1.0", features = ["derive"] }
 thiserror = "2.0.0"

 [target.'cfg(all(unix, not(target_os="macos")))'.dependencies]
-reis = { version = "0.5.0", optional = true }
+reis = { version = "0.7.0", optional = true }

 [features]
 default = ["libei"]
--- a/src/config.rs
+++ b/src/config.rs
@@ -518,7 +518,7 @@ impl Config {
    }

    pub fn read_from_disk(&mut self) -> Result<bool, io::Error> {
-        log::info!("reading config from {:?}", &self.config_path);
+        log::info!("reading config from {:?}", self.config_path);

        let current_config = fs::read_to_string(&self.config_path)?;
        let current_config = match current_config.parse::<DocumentMut>() {
@@ -548,7 +548,7 @@ impl Config {
    }

    pub fn write_back(&mut self) -> Result<(), io::Error> {
-        log::info!("writing config to {:?}", &self.config_path);
+        log::info!("writing config to {:?}", self.config_path);
        /* the new config */
        let new_config = self.config_toml.clone().unwrap_or_default();
        let new_config = toml_edit::ser::to_string_pretty(&new_config).expect("config");
Author	SHA1	Message	Date
Ian Douglas Scott	09889cd839	chore: Minor code style improvements to Wayland code	2026-08-31 12:59:27 +02:00
Ian Douglas Scott	c194df791d	fix(input-capture/layer_shell): Call `read()` on guard only once With `wayland-backend/client_system` enabled, this was causing an infinite loop since `read` never returned `WouldBlock`. This seems to be an inconsistency in wayland-rs: https://github.com/Smithay/wayland-rs/pull/959 In any case, it isn't necessary to call `read` more than once.	2026-08-31 12:59:27 +02:00
Ferdinand Schober	b316af6a8f	fix vs-version	2026-08-31 10:51:17 +02:00
Ferdinand Schober	d09a574380	tell gvsbuild to target newer VisualStudio version	2026-08-31 10:44:58 +02:00
Ferdinand Schober	b115208aad	fix clippy lint	2026-08-31 10:34:02 +02:00
Ty Smith	392af44cbe	fix(ci): bust stale Homebrew glib cache on macOS runners The Swatinem/rust-cache action was restored before brew installed the native dependencies. When Homebrew updated glib (2.88.0 → newer) the cached Rust build artifacts still referenced the old versioned Cellar path (/opt/homebrew/Cellar/glib/2.88.0/lib), causing a linker failure: ld: library 'gio-2.0' not found Fix by: 1. Moving `brew install` before the rust-cache step so libs are current before the cache is consulted. 2. Capturing `brew list --versions glib gtk4 libadwaita` into a prefix-key so the cache key changes whenever those packages update, forcing a clean Rust build with fresh pkg-config paths. Linux and Windows cache behaviour is unchanged (MACOS_LIB_VER unset → empty prefix-key → same default v0- prefix). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-06-28 16:22:39 +02:00
Ferdinand Schober	133e1ae81d	hotfix: plasma 6.7 reporting Barrier ID 1 Still not 100% sure of the root cause, but it looks like plasma is reporting 1 as the barrier id in all cases...	2026-06-21 19:06:25 +02:00
Ian Douglas Scott	6fb7e24746	Update reis to 0.7.0	2026-06-20 01:17:02 +02:00
Ferdinand Schober	d1f41180e3	include .deb and .AppImage in pre-release as well	2026-06-15 12:00:40 +02:00
Ferdinand Schober	497a1a081a	adjust paths to deb / appimage	2026-06-15 01:01:38 +02:00
Ferdinand Schober	5342b475ae	add deb and AppImage to release workflow	2026-06-15 00:41:43 +02:00