From 418e9fdc54f1ae0809fcc0ff3d7aad7004e30796 Mon Sep 17 00:00:00 2001
From: Nova <technobaboo@gmail.com>
Date: Mon, 14 Nov 2022 11:53:08 -0500
Subject: [PATCH] fix(wayland): cursor material queue higher

---
 src/core/delta.rs      | 43 ++++++++++++++++++++++++++++++++++++++++++
 src/core/mod.rs        |  1 +
 src/wayland/seat.rs    |  8 +++++++-
 src/wayland/surface.rs | 21 +++++++++++++++++++--
 4 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 src/core/delta.rs

diff --git a/src/core/delta.rs b/src/core/delta.rs
new file mode 100644
index 0000000..d209203
--- /dev/null
+++ b/src/core/delta.rs
@@ -0,0 +1,43 @@
+use std::ops::{Deref, DerefMut};
+
+pub struct Delta<T> {
+	value: T,
+	changed: bool,
+}
+#[allow(dead_code)]
+impl<T> Delta<T> {
+	pub fn new(value: T) -> Self {
+		Delta {
+			value,
+			changed: false,
+		}
+	}
+	pub fn peek_delta(&self) -> Option<&T> {
+		self.changed.then_some(&self.value)
+	}
+	pub fn delta(&mut self) -> Option<&mut T> {
+		let delta = self.changed.then_some(&mut self.value);
+		self.changed = false;
+		delta
+	}
+	pub fn value(&self) -> &T {
+		&self.value
+	}
+	pub fn value_mut(&mut self) -> &mut T {
+		self.changed = true;
+		&mut self.value
+	}
+}
+impl<T> Deref for Delta<T> {
+	type Target = T;
+
+	fn deref(&self) -> &Self::Target {
+		&self.value
+	}
+}
+impl<T> DerefMut for Delta<T> {
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		self.changed = true;
+		&mut self.value
+	}
+}
diff --git a/src/core/mod.rs b/src/core/mod.rs
index b7cfb28..a68531c 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -1,4 +1,5 @@
 pub mod client;
+pub mod delta;
 pub mod destroy_queue;
 pub mod eventloop;
 pub mod node_collections;
diff --git a/src/wayland/seat.rs b/src/wayland/seat.rs
index da698ec..7f4698b 100644
--- a/src/wayland/seat.rs
+++ b/src/wayland/seat.rs
@@ -239,7 +239,13 @@ impl Dispatch<WlPointer, SeatData, WaylandState> for SeatDelegate {
 				}
 				*seat_data.cursor.lock() = surface.and_then(|surf| {
 					compositor::with_states(&surf, |data| {
-						data.data_map.get::<Arc<Mutex<Cursor>>>().cloned()
+						let cursor = data.data_map.get::<Arc<Mutex<Cursor>>>();
+						if let Some(cursor) = cursor {
+							if let Some(core_surface) = cursor.lock().core_surface.upgrade() {
+								core_surface.set_material_offset(1);
+							}
+						}
+						cursor.cloned()
 					})
 				});
 			}
diff --git a/src/wayland/surface.rs b/src/wayland/surface.rs
index aa060df..814c4c8 100644
--- a/src/wayland/surface.rs
+++ b/src/wayland/surface.rs
@@ -1,6 +1,6 @@
 use super::{shaders::PANEL_SHADER_BYTES, state::WaylandState};
 use crate::{
-	core::{destroy_queue, registry::Registry},
+	core::{delta::Delta, destroy_queue, registry::Registry},
 	nodes::drawable::model::Model,
 };
 use mint::Vector2;
@@ -58,7 +58,12 @@ impl CoreSurfaceData {
 			size: Vector2::from([0, 0]),
 		}
 	}
-	fn update_tex(&mut self, data: &RendererSurfaceStateUserData, renderer: &Gles2Renderer) {
+	fn update_tex(
+		&mut self,
+		surface: &CoreSurface,
+		data: &RendererSurfaceStateUserData,
+		renderer: &Gles2Renderer,
+	) {
 		if let Some(surface_size) = data.borrow().surface_size() {
 			self.size = Vector2::from([surface_size.w as u32, surface_size.h as u32]);
 		}
@@ -82,6 +87,11 @@ impl CoreSurfaceData {
 				sk_tex.set_address_mode(TextureAddress::Clamp);
 			}
 		}
+		if let Some(sk_mat) = &self.sk_mat {
+			if let Some(material_offset) = surface.material_offset.lock().delta() {
+				sk_mat.set_queue_offset(*material_offset as i32);
+			}
+		}
 	}
 }
 impl Drop for CoreSurfaceData {
@@ -98,6 +108,7 @@ pub struct CoreSurface {
 	pub dh: DisplayHandle,
 	pub weak_surface: wayland_server::Weak<WlSurface>,
 	mapped_data: Mutex<Option<CoreSurfaceData>>,
+	material_offset: Mutex<Delta<u32>>,
 	pub pending_material_applications: Mutex<Vec<(Arc<Model>, u32)>>,
 }
 
@@ -114,6 +125,7 @@ impl CoreSurface {
 			dh,
 			weak_surface: surface.downgrade(),
 			mapped_data: Mutex::new(None),
+			material_offset: Mutex::new(Delta::new(0)),
 			pending_material_applications: Mutex::new(Vec::new()),
 		})
 	}
@@ -157,6 +169,7 @@ impl CoreSurface {
 		self.with_states(|data| {
 			self.with_data(|mapped_data| {
 				mapped_data.update_tex(
+					self,
 					data.data_map.get::<RendererSurfaceStateUserData>().unwrap(),
 					renderer,
 				);
@@ -174,6 +187,10 @@ impl CoreSurface {
 		});
 	}
 
+	pub fn set_material_offset(&self, material_offset: u32) {
+		*self.material_offset.lock().value_mut() = material_offset;
+	}
+
 	pub fn apply_material(&self, model: Arc<Model>, material_idx: u32) {
 		self.pending_material_applications
 			.lock()