andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-23 02:05:33 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Move cursor surface alive check to refresh()

Browse Source
This commit is contained in:
Ivan Molodetskikh
2023-10-26 17:29:28 +04:00
parent 0e0764ef37
commit 5e543b8dc6
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/niri.rs
+19 -15
View File
@@ -263,6 +263,7 @@ impl State {
// These should be called periodically, before flushing the clients.
self.niri.layout.refresh();
self.niri.check_cursor_image_surface_alive();
self.niri.refresh_pointer_outputs();
self.niri.popups.cleanup();
self.update_focus();
@@ -1082,21 +1083,16 @@ impl Niri {
let (default_buffer, default_hotspot) = self.default_cursor.get(renderer, output_scale_int);
let default_hotspot = default_hotspot.to_logical(output_scale_int);
let hotspot = if let CursorImageStatus::Surface(surface) = &mut self.cursor_image {
if surface.alive() {
with_states(surface, |states| {
states
.data_map
.get::<Mutex<CursorImageAttributes>>()
.unwrap()
.lock()
.unwrap()
.hotspot
})
} else {
self.cursor_image = CursorImageStatus::default_named();
default_hotspot
}
let hotspot = if let CursorImageStatus::Surface(surface) = &self.cursor_image {
with_states(surface, |states| {
states
.data_map
.get::<Mutex<CursorImageAttributes>>()
.unwrap()
.lock()
.unwrap()
.hotspot
})
} else {
default_hotspot
};
@@ -1139,6 +1135,14 @@ impl Niri {
pointer_elements
}
pub fn check_cursor_image_surface_alive(&mut self) {
if let CursorImageStatus::Surface(surface) = &self.cursor_image {
if !surface.alive() {
self.cursor_image = CursorImageStatus::default_named();
}
}
}
pub fn refresh_pointer_outputs(&self) {
let _span = tracy_client::span!("Niri::refresh_pointer_outputs");