handle role specific buffer offset

Cargo.toml

@@ -22,12 +22,14 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 tracy-client = { version = "0.17.3", default-features = false }
 
 [workspace.dependencies.smithay]
-git = "https://github.com/Smithay/smithay.git"
+git = "https://github.com/cmeissl/smithay.git"
+branch = "fix/buffer_offset"
 # path = "../smithay"
 default-features = false
 
 [workspace.dependencies.smithay-drm-extras]
-git = "https://github.com/Smithay/smithay.git"
+git = "https://github.com/cmeissl/smithay.git"
+branch = "fix/buffer_offset"
 # path = "../smithay/smithay-drm-extras"
 
 [package]

src/handlers/compositor.rs

@@ -1,7 +1,7 @@
 use std::collections::hash_map::Entry;
 
 use smithay::backend::renderer::utils::{on_commit_buffer_handler, with_renderer_surface_state};
-use smithay::input::pointer::CursorImageStatus;
+use smithay::input::pointer::{CursorImageStatus, CursorImageSurfaceData};
 use smithay::reexports::calloop::Interest;
 use smithay::reexports::wayland_server::protocol::wl_buffer;
 use smithay::reexports::wayland_server::protocol::wl_surface::WlSurface;
@@ -297,13 +297,42 @@ impl CompositorHandler for State {
  &self.niri.cursor_manager.cursor_image(),
  CursorImageStatus::Surface(s) if s == &root_surface
  ) {
+ with_states(surface, |states| {
+ let cursor_image_attributes = states.data_map.get::<CursorImageSurfaceData>();
+
+ if let Some(mut cursor_image_attributes) =
+ cursor_image_attributes.map(|attrs| attrs.lock().unwrap())
+ {
+ let buffer_delta = states
+ .cached_state
+ .get::<SurfaceAttributes>()
+ .current()
+ .buffer_delta
+ .take();
+ if let Some(buffer_delta) = buffer_delta {
+ cursor_image_attributes.hotspot -= buffer_delta;
+ }
+ }
+ });
+
  // FIXME: granular redraws for cursors.
  self.niri.queue_redraw_all();
  return;
  }
 
  // This might be a DnD icon surface.
- if self.niri.dnd_icon.as_ref() == Some(&root_surface) {
+ if matches!(&self.niri.dnd_icon, Some(icon) if icon.surface == root_surface) {
+ let dnd_icon = self.niri.dnd_icon.as_mut().unwrap();
+ with_states(&dnd_icon.surface, |states| {
+ let buffer_delta = states
+ .cached_state
+ .get::<SurfaceAttributes>()
+ .current()
+ .buffer_delta
+ .take()
+ .unwrap_or_default();
+ dnd_icon.offset += buffer_delta;
+ });
  // FIXME: granular redraws for cursors.
  self.niri.queue_redraw_all();
  return;

src/handlers/mod.rs

@@ -12,7 +12,9 @@ use smithay::backend::allocator::dmabuf::Dmabuf;
 use smithay::backend::drm::DrmNode;
 use smithay::backend::input::TabletToolDescriptor;
 use smithay::desktop::{PopupKind, PopupManager};
-use smithay::input::pointer::{CursorIcon, CursorImageStatus, PointerHandle};
+use smithay::input::pointer::{
+ CursorIcon, CursorImageStatus, CursorImageSurfaceData, PointerHandle,
+};
 use smithay::input::{keyboard, Seat, SeatHandler, SeatState};
 use smithay::output::Output;
 use smithay::reexports::rustix::fs::{fcntl_setfl, OFlags};
@@ -22,7 +24,7 @@ use smithay::reexports::wayland_server::protocol::wl_data_source::WlDataSource;
 use smithay::reexports::wayland_server::protocol::wl_output::WlOutput;
 use smithay::reexports::wayland_server::protocol::wl_surface::WlSurface;
 use smithay::reexports::wayland_server::Resource;
-use smithay::utils::{Logical, Rectangle, Size};
+use smithay::utils::{Logical, Point, Rectangle, Size};
 use smithay::wayland::compositor::with_states;
 use smithay::wayland::dmabuf::{DmabufGlobal, DmabufHandler, DmabufState, ImportNotifier};
 use smithay::wayland::drm_lease::{
@@ -64,7 +66,7 @@ use smithay::{
 };
 
 pub use crate::handlers::xdg_shell::KdeDecorationsModeState;
-use crate::niri::{ClientState, State};
+use crate::niri::{ClientState, DndIcon, State};
 use crate::protocols::foreign_toplevel::{
  self, ForeignToplevelHandler, ForeignToplevelManagerState,
 };
@@ -225,7 +227,23 @@ impl ClientDndGrabHandler for State {
  icon: Option<WlSurface>,
  _seat: Seat<Self>,
  ) {
- self.niri.dnd_icon = icon;
+ let offset = if let CursorImageStatus::Surface(ref surface) =
+ self.niri.cursor_manager.cursor_image()
+ {
+ with_states(surface, |states| {
+ let hotspot = states
+ .data_map
+ .get::<CursorImageSurfaceData>()
+ .unwrap()
+ .lock()
+ .unwrap()
+ .hotspot;
+ Point::from((-hotspot.x, -hotspot.y))
+ })
+ } else {
+ (0, 0).into()
+ };
+ self.niri.dnd_icon = icon.map(|surface| DndIcon { surface, offset });
  // FIXME: more granular
  self.niri.queue_redraw_all();
  }

src/niri.rs

@@ -259,7 +259,7 @@ pub struct Niri {
  pub cursor_manager: CursorManager,
  pub cursor_texture_cache: CursorTextureCache,
  pub cursor_shape_manager_state: CursorShapeManagerState,
- pub dnd_icon: Option<WlSurface>,
+ pub dnd_icon: Option<DndIcon>,
  pub pointer_focus: PointerFocus,
  /// Whether the pointer is hidden, for example due to a previous touch input.
  ///
@@ -304,6 +304,12 @@ pub struct Niri {
  pub mapped_cast_output: HashMap<Window, Output>,
 }
 
+#[derive(Debug)]
+pub struct DndIcon {
+ pub surface: WlSurface,
+ pub offset: Point<i32, Logical>,
+}
+
 pub struct OutputState {
  pub global: GlobalId,
  pub frame_clock: FrameClock,
@@ -2589,8 +2595,8 @@ impl Niri {
 
  let output_scale = Scale::from(output.current_scale().fractional_scale());
 
- let (mut pointer_elements, pointer_pos) = match render_cursor {
- RenderCursor::Hidden => (vec![], pointer_pos.to_physical_precise_round(output_scale)),
+ let mut pointer_elements = match render_cursor {
+ RenderCursor::Hidden => vec![],
  RenderCursor::Surface { surface, hotspot } => {
  let pointer_pos =
  (pointer_pos - hotspot.to_f64()).to_physical_precise_round(output_scale);
@@ -2604,7 +2610,7 @@ impl Niri {
  Kind::Cursor,
  );
 
- (pointer_elements, pointer_pos)
+ pointer_elements
  }
  RenderCursor::Named {
  icon,
@@ -2620,7 +2626,7 @@ impl Niri {
  let mut pointer_elements = vec![];
  let pointer_element = match MemoryRenderBufferRenderElement::from_buffer(
  renderer,
- pointer_pos.to_f64(),
+ pointer_pos,
  &texture,
  None,
  None,
@@ -2637,14 +2643,16 @@ impl Niri {
  pointer_elements.push(OutputRenderElements::NamedPointer(element));
  }
 
- (pointer_elements, pointer_pos)
+ pointer_elements
  }
  };
 
- if let Some(dnd_icon) = &self.dnd_icon {
+ if let Some(dnd_icon) = self.dnd_icon.as_ref() {
+ let pointer_pos =
+ (pointer_pos + dnd_icon.offset.to_f64()).to_physical_precise_round(output_scale);
  pointer_elements.extend(render_elements_from_surface_tree(
  renderer,
- dnd_icon,
+ &dnd_icon.surface,
  pointer_pos,
  output_scale,
  1.,
@@ -2685,6 +2693,7 @@ impl Niri {
  let dnd = self
  .dnd_icon
  .as_ref()
+ .map(|icon| &icon.surface)
  .map(|surface| (surface, bbox_from_surface_tree(surface, surface_pos)));
 
  // FIXME we basically need to pick the largest scale factor across the overlapping
@@ -2746,7 +2755,7 @@ impl Niri {
  }
  cursor_image => {
  // There's no cursor surface, but there might be a DnD icon.
- let Some(surface) = &self.dnd_icon else {
+ let Some(surface) = self.dnd_icon.as_ref().map(|icon| &icon.surface) else {
  return;
  };
 
@@ -3268,7 +3277,7 @@ impl Niri {
  );
  }
 
- if let Some(surface) = &self.dnd_icon {
+ if let Some(surface) = self.dnd_icon.as_ref().map(|icon| &icon.surface) {
  with_surface_tree_downward(
  surface,
  (),
@@ -3406,7 +3415,7 @@ impl Niri {
  );
  }
 
- if let Some(surface) = &self.dnd_icon {
+ if let Some(surface) = self.dnd_icon.as_ref().map(|icon| &icon.surface) {
  send_dmabuf_feedback_surface_tree(
  surface,
  output,
@@ -3508,7 +3517,7 @@ impl Niri {
  );
  }
 
- if let Some(surface) = &self.dnd_icon {
+ if let Some(surface) = self.dnd_icon.as_ref().map(|icon| &icon.surface) {
  send_frames_surface_tree(
  surface,
  output,
@@ -3576,7 +3585,7 @@ impl Niri {
  }
  }
 
- if let Some(surface) = &self.dnd_icon {
+ if let Some(surface) = &self.dnd_icon.as_ref().map(|icon| &icon.surface) {
  send_frames_surface_tree(
  surface,
  output,
@@ -3615,7 +3624,7 @@ impl Niri {
  );
  }
 
- if let Some(surface) = &self.dnd_icon {
+ if let Some(surface) = self.dnd_icon.as_ref().map(|icon| &icon.surface) {
  take_presentation_feedback_surface_tree(
  surface,
  &mut feedback,