Skip to content

Preserve cross-edge cursor position when switching machines #494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
salvarecuero wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Preserve cross-edge cursor position when switching machines #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f280aa
feat(protocol): add positioned peer transitions
salvarecuero Sep 2, 2026
21297b0
feat(cursor-sync): preserve cross-axis positions across displays
salvarecuero Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion input-capture/src/dummy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ impl Stream for DummyInputCapture {
let event = match self.start {
None => {
self.start.replace(current);
CaptureEvent::Begin
CaptureEvent::Begin { cross_axis: None }
}
Some(start) => {
let elapsed = start.elapsed();
Expand Down
220 changes: 169 additions & 51 deletions input-capture/src/layer_shell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ use wayland_client::{
},
};

use input_event::{Event, KeyboardEvent, PointerEvent};
use input_event::{
Event, KeyboardEvent, PointerEvent,
screen::{Edge, EdgeSegment, EdgeSegments, Rect},
};

use crate::{CaptureError, CaptureEvent};

Expand Down Expand Up @@ -148,6 +151,7 @@ struct Window {
surface: WlSurface,
layer_surface: ZwlrLayerSurfaceV1,
pos: Position,
rect: Rect,
}

impl Window {
Expand All @@ -156,14 +160,15 @@ impl Window {
qh: &QueueHandle<State>,
output: &WlOutput,
pos: Position,
size: (i32, i32),
output_rect: Rect,
rect: Rect,
) -> Window {
log::debug!("creating window output: {output:?}, size: {size:?}");
log::debug!("creating window output: {output:?}, rect: {rect:?}");
let g = &state.globals;

let (width, height) = match pos {
Position::Left | Position::Right => (1, size.1 as u32),
Position::Top | Position::Bottom => (size.0 as u32, 1),
Position::Left | Position::Right => (1, rect.height as u32),
Position::Top | Position::Bottom => (rect.width as u32, 1),
};
let mut file = tempfile::tempfile().unwrap();
draw(&mut file, (width, height));
Expand All @@ -189,24 +194,37 @@ impl Window {
qh,
(),
);
let anchor = match pos {
Position::Left => Anchor::Left,
Position::Right => Anchor::Right,
Position::Top => Anchor::Top,
Position::Bottom => Anchor::Bottom,
let (anchor, margin) = match pos {
Position::Left => (
Anchor::Left | Anchor::Top,
(rect.y - output_rect.y, 0, 0, 0),
),
Position::Right => (
Anchor::Right | Anchor::Top,
(rect.y - output_rect.y, 0, 0, 0),
),
Position::Top => (
Anchor::Top | Anchor::Left,
(0, 0, 0, rect.x - output_rect.x),
),
Position::Bottom => (
Anchor::Bottom | Anchor::Left,
(0, 0, 0, rect.x - output_rect.x),
),
};

layer_surface.set_anchor(anchor);
layer_surface.set_size(width, height);
layer_surface.set_exclusive_zone(-1);
layer_surface.set_margin(0, 0, 0, 0);
layer_surface.set_margin(margin.0, margin.1, margin.2, margin.3);
surface.set_input_region(None);
surface.commit();
Window {
pos,
buffer,
surface,
layer_surface,
rect,
}
}
}
Expand All @@ -220,36 +238,124 @@ impl Drop for Window {
}
}

fn get_edges(outputs: &[Output], pos: Position) -> Vec<(Output, i32)> {
outputs
.iter()
.filter_map(|output| {
output.info.as_ref().map(|info| {
(
output.clone(),
match pos {
Position::Left => info.position.0,
Position::Right => info.position.0 + info.size.0,
Position::Top => info.position.1,
Position::Bottom => info.position.1 + info.size.1,
},
)
})
})
.collect()
fn edge(pos: Position) -> Edge {
match pos {
Position::Left => Edge::Left,
Position::Right => Edge::Right,
Position::Top => Edge::Top,
Position::Bottom => Edge::Bottom,
}
}

fn cursor_cross_axis(
window: &Window,
rectangles: &[Rect],
surface_x: f64,
surface_y: f64,
) -> Option<f32> {
let edge = edge(window.pos);
let (edge_coordinate, cross_coordinate) = match edge {
Edge::Left => (window.rect.x, window.rect.y + surface_y.floor() as i32),
Edge::Right => (
window.rect.x + window.rect.width - 1,
window.rect.y + surface_y.floor() as i32,
),
Edge::Top => (window.rect.y, window.rect.x + surface_x.floor() as i32),
Edge::Bottom => (
window.rect.y + window.rect.height - 1,
window.rect.x + surface_x.floor() as i32,
),
};
EdgeSegments::from_rectangles(edge, rectangles.iter().copied())
.normalize(edge_coordinate, cross_coordinate)
}

fn segment_rect(edge: Edge, segment: EdgeSegment) -> Rect {
match edge {
Edge::Left | Edge::Right => Rect {
x: segment.edge_coordinate,
y: segment.cross_start,
width: 1,
height: segment.cross_end - segment.cross_start,
},
Edge::Top | Edge::Bottom => Rect {
x: segment.cross_start,
y: segment.edge_coordinate,
width: segment.cross_end - segment.cross_start,
height: 1,
},
}
}

fn get_output_configuration(state: &State, pos: Position) -> Vec<Output> {
// get all output edges corresponding to the position
let edges = get_edges(&state.outputs, pos);
let opposite_edges = get_edges(&state.outputs, pos.opposite());

// remove those edges that are at the same position
// as an opposite edge of a different output
edges
.iter()
.filter(|(_, edge)| !opposite_edges.iter().map(|(_, e)| *e).any(|e| &e == edge))
.map(|(o, _)| o.clone())
fn get_output_configuration(state: &State, pos: Position) -> Vec<(Output, Rect, Rect)> {
let edge = edge(pos);
let rectangles = state.outputs.iter().filter_map(|output| {
output.info.as_ref().map(|info| Rect {
x: info.position.0,
y: info.position.1,
width: info.size.0,
height: info.size.1,
})
});
let segments = EdgeSegments::from_rectangles(edge, rectangles)
.segments()
.collect::<Vec<_>>();

segments
.into_iter()
.flat_map(|segment| {
state.outputs.iter().filter_map(move |output| {
output.info.as_ref().and_then(|info| {
let output_rect = Rect {
x: info.position.0,
y: info.position.1,
width: info.size.0,
height: info.size.1,
};
let (edge_coordinate, cross_start, cross_end) = match edge {
Edge::Left => (
info.position.0,
info.position.1,
info.position.1 + info.size.1,
),
Edge::Right => (
info.position.0 + info.size.0 - 1,
info.position.1,
info.position.1 + info.size.1,
),
Edge::Top => (
info.position.1,
info.position.0,
info.position.0 + info.size.0,
),
Edge::Bottom => (
info.position.1 + info.size.1 - 1,
info.position.0,
info.position.0 + info.size.0,
),
};
if segment.edge_coordinate != edge_coordinate {
return None;
}
let cross_start = segment.cross_start.max(cross_start);
let cross_end = segment.cross_end.min(cross_end);
(cross_start < cross_end).then(|| {
(
output.clone(),
output_rect,
segment_rect(
edge,
EdgeSegment {
edge_coordinate,
cross_start,
cross_end,
},
),
)
})
})
})
})
.collect()
}

Expand Down Expand Up @@ -514,19 +620,17 @@ impl State {
"adding capture for position {pos} - using outputs: {:?}",
outputs
.iter()
.map(|o| o
.map(|(o, _, _)| o
.info
.as_ref()
.map(|i| i.name.to_owned())
.unwrap_or("unknown output".to_owned()))
.collect::<Vec<_>>()
);
outputs.iter().for_each(|o| {
if let Some(info) = o.info.as_ref() {
let window = Window::new(self, &self.qh, &o.wl_output, pos, info.size);
let window = Arc::new(window);
self.active_windows.push(window);
}
outputs.iter().for_each(|(output, output_rect, rect)| {
let window = Window::new(self, &self.qh, &output.wl_output, pos, *output_rect, *rect);
let window = Arc::new(window);
self.active_windows.push(window);
});
}

Expand Down Expand Up @@ -721,8 +825,8 @@ impl Dispatch<WlPointer, ()> for State {
wl_pointer::Event::Enter {
serial,
surface,
surface_x: _,
surface_y: _,
surface_x,
surface_y,
} => {
// get client corresponding to the focused surface
{
Expand All @@ -733,13 +837,27 @@ impl Dispatch<WlPointer, ()> for State {
return;
}
}
let pos = app
let window = app
.active_windows
.iter()
.find(|w| w.surface == surface)
.map(|w| w.pos)
.cloned()
.unwrap();
app.pending_events.push_back((pos, CaptureEvent::Begin));
let rectangles = app
.outputs
.iter()
.filter_map(|output| {
output.info.as_ref().map(|info| Rect {
x: info.position.0,
y: info.position.1,
width: info.size.0,
height: info.size.1,
})
})
.collect::<Vec<_>>();
let cross_axis = cursor_cross_axis(&window, &rectangles, surface_x, surface_y);
app.pending_events
.push_back((window.pos, CaptureEvent::Begin { cross_axis }));
}
wl_pointer::Event::Leave { .. } => {
/* There are rare cases, where when a window is opened in
Expand Down
6 changes: 4 additions & 2 deletions input-capture/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,17 @@ pub type CaptureHandle = u64;
#[derive(Copy, Clone, Debug, PartialEq)]
pub enum CaptureEvent {
/// capture on this capture handle is now active
Begin,
Begin { cross_axis: Option<f32> },
/// input event coming from capture handle
Input(Event),
}

impl Display for CaptureEvent {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
CaptureEvent::Begin => write!(f, "begin capture"),
CaptureEvent::Begin { cross_axis } => {
write!(f, "begin capture ({cross_axis:?})")
}
CaptureEvent::Input(e) => write!(f, "{e}"),
}
}
Expand Down
Loading