diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cursor.rs | 120 | ||||
| -rw-r--r-- | src/state.rs | 52 |
2 files changed, 106 insertions, 66 deletions
diff --git a/src/cursor.rs b/src/cursor.rs index 3a827d0..1ca63ac 100644 --- a/src/cursor.rs +++ b/src/cursor.rs @@ -1,11 +1,8 @@ +use std::collections::HashMap; use std::io; use wayrs_client::connection::Connection; -use wayrs_client::protocol::wl_compositor::WlCompositor; -use wayrs_client::protocol::wl_pointer::WlPointer; -use wayrs_client::protocol::wl_shm::Format; -use wayrs_client::protocol::wl_surface::WlSurface; - +use wayrs_client::protocol::*; use wayrs_shm_alloc::ShmAlloc; use xcursor::parser::Image; @@ -14,65 +11,67 @@ use crate::state::State; #[derive(Debug, thiserror::Error)] pub enum CursorError { - #[error("theme not found")] - ThemeNotFound, + #[error("cursor '{0}' not found")] + CursorNotFound(String), #[error("theme could not be parsed")] ThemeParseError, #[error(transparent)] ReadError(#[from] io::Error), } -pub struct Cursor { - pub surface: WlSurface, - pub images: Vec<Image>, +pub struct CursorTheme { + xcursor_size: u32, + theme: xcursor::CursorTheme, + cursors: HashMap<String, Vec<Image>>, } -impl Cursor { - pub fn new( - conn: &mut Connection<State>, - compositor: WlCompositor, - ) -> Result<Self, CursorError> { +impl CursorTheme { + pub fn new() -> Self { let theme_name = std::env::var("XCURSOR_THEME").ok(); let theme_name = theme_name.as_deref().unwrap_or("default"); - let theme_path = xcursor::CursorTheme::load(theme_name) - .load_icon("default") - .ok_or(CursorError::ThemeNotFound)?; - let raw_theme = std::fs::read(theme_path)?; + let xcursor_size = std::env::var("XCURSOR_SIZE") + .ok() + .and_then(|x| x.parse().ok()) + .unwrap_or(24); - let mut images = - xcursor::parser::parse_xcursor(&raw_theme).ok_or(CursorError::ThemeParseError)?; - images.sort_unstable_by_key(|img| img.size); + let theme = xcursor::CursorTheme::load(theme_name); - let surface = compositor.create_surface(conn); + CursorTheme { + xcursor_size, + theme, + cursors: HashMap::new(), + } + } - Ok(Cursor { surface, images }) + /// Use this to handle errors ahead of time. + pub fn ensure_cursor_is_loaded(&mut self, cursor: &str) -> Result<(), CursorError> { + let _ = self.get_images(cursor)?; + Ok(()) } - pub fn set( - &self, + #[allow(clippy::too_many_arguments)] + pub fn set_cursor( + &mut self, conn: &mut Connection<State>, - serial: u32, - pointer: WlPointer, + cursor: &str, scale: u32, + serial: u32, shm: &mut ShmAlloc, - ) { - let target_size = std::env::var("XCURSOR_SIZE") - .ok() - .and_then(|x| x.parse().ok()) - .unwrap_or(24) - * scale; + surface: WlSurface, + pointer: WlPointer, + ) -> Result<(), CursorError> { + let target_size = self.xcursor_size * scale; + + let images = self.get_images(cursor)?; - let image = match self - .images - .binary_search_by_key(&target_size, |img| img.size) - { - Ok(indx) => &self.images[indx], - Err(indx) if indx == 0 => self.images.first().unwrap(), - Err(indx) if indx >= self.images.len() => self.images.last().unwrap(), + let image = match images.binary_search_by_key(&target_size, |img| img.size) { + Ok(indx) => &images[indx], + Err(indx) if indx == 0 => images.first().unwrap(), + Err(indx) if indx >= images.len() => images.last().unwrap(), Err(indx) => { - let a = &self.images[indx - 1]; - let b = &self.images[indx]; + let a = &images[indx - 1]; + let b = &images[indx]; if target_size - a.size < b.size - target_size { a } else { @@ -86,24 +85,45 @@ impl Cursor { image.width as i32, image.height as i32, (image.width * 4) as i32, - Format::Argb8888, + wl_shm::Format::Argb8888, ); assert_eq!(image.pixels_argb.len(), canvas.len(),); canvas.copy_from_slice(&image.pixels_rgba); - self.surface.attach(conn, buffer.wl, 0, 0); - self.surface - .damage_buffer(conn, 0, 0, image.width as i32, image.height as i32); - self.surface.set_buffer_scale(conn, scale as i32); - self.surface.commit(conn); + surface.attach(conn, buffer.wl, 0, 0); + surface.damage(conn, 0, 0, i32::MAX, i32::MAX); + surface.set_buffer_scale(conn, scale as i32); + surface.commit(conn); pointer.set_cursor( conn, serial, - self.surface, + surface, (image.xhot / scale) as i32, (image.yhot / scale) as i32, ); + + Ok(()) + } + + fn get_images(&mut self, cursor: &'_ str) -> Result<&[Image], CursorError> { + // Borrow checker does't allow `if let Some(...) = ...` here for some reason :( + if self.cursors.get(cursor).is_some() { + return Ok(self.cursors.get(cursor).unwrap()); + } + + let theme_path = self + .theme + .load_icon(cursor) + .ok_or_else(|| CursorError::CursorNotFound(cursor.to_owned()))?; + + let raw_theme = std::fs::read(theme_path)?; + + let mut images = + xcursor::parser::parse_xcursor(&raw_theme).ok_or(CursorError::ThemeParseError)?; + images.sort_unstable_by_key(|img| img.size); + + Ok(self.cursors.entry(cursor.to_owned()).or_insert(images)) } } diff --git a/src/state.rs b/src/state.rs index dfc2a2a..3c1ab89 100644 --- a/src/state.rs +++ b/src/state.rs @@ -1,4 +1,4 @@ -use crate::cursor::Cursor; +use crate::cursor::CursorTheme; use crate::protocol::*; use std::future::pending; @@ -24,14 +24,16 @@ pub struct State { pub bars: Vec<Bar>, pub shared_state: SharedState, + + cursor_theme: Option<CursorTheme>, } pub struct Seat { seat: WlSeat, reg_name: u32, pointer: Option<WlPointer>, - cursor: Cursor, - cur_surface: Option<WlSurface>, + cursor_surface: WlSurface, + current_surface: Option<WlSurface>, x: f64, y: f64, pending_button: Option<PointerBtn>, @@ -53,8 +55,15 @@ impl State { .and_then(|cmd| StatusCmd::new(cmd).map_err(|e| error = Err(e)).ok()); conn.set_callback_for(conn.registry(), wl_registry_cb); + let shm = globals.bind(conn, 1..=1).expect("could not bind wl_shm"); + let mut cursor_theme = CursorTheme::new(); + let cursor_theme_ok = cursor_theme + .ensure_cursor_is_loaded("default") + .map_err(|e| error = Err(e.into())) + .is_ok(); + let mut this = Self { wl_compositor: globals .bind(conn, 4..=5) @@ -76,6 +85,8 @@ impl State { blocks: Vec::new(), blocks_cache: Vec::new(), }, + + cursor_theme: cursor_theme_ok.then_some(cursor_theme), }; globals @@ -188,13 +199,12 @@ impl State { fn bind_seat(&mut self, conn: &mut Connection<Self>, global: &Global) { let seat: WlSeat = global.bind_with_cb(conn, 5..=8, wl_seat_cb).unwrap(); - let cursor = Cursor::new(conn, self.wl_compositor).unwrap(); self.seats.push(Seat { seat, reg_name: global.name, pointer: None, - cursor, - cur_surface: None, + cursor_surface: self.wl_compositor.create_surface(conn), + current_surface: None, x: 0.0, y: 0.0, pending_button: None, @@ -217,14 +227,18 @@ impl State { fn drop_seat(&mut self, conn: &mut Connection<Self>, seat_index: usize) { let seat = self.seats.swap_remove(seat_index); + if let Some(pointer) = seat.pointer { if pointer.version() >= 3 { pointer.release(conn); } } + if seat.seat.version() >= 5 { seat.seat.release(conn); } + + seat.cursor_surface.destroy(conn); } } @@ -360,7 +374,7 @@ fn wl_pointer_cb( Event::Frame => { let btn = seat.pending_button.take(); let scroll = seat.scroll_frame.finalize(); - if let Some(surface) = seat.cur_surface { + if let Some(surface) = seat.current_surface { let bar = state .bars .iter_mut() @@ -418,18 +432,24 @@ fn wl_pointer_cb( .iter() .find(|bar| bar.surface.id() == args.surface) .unwrap(); - seat.cur_surface = Some(bar.surface); + seat.current_surface = Some(bar.surface); seat.x = args.surface_x.as_f64(); seat.y = args.surface_y.as_f64(); - seat.cursor.set( - conn, - args.serial, - pointer, - bar.scale as u32, - &mut state.shared_state.shm, - ); + if let Some(cursor_theme) = &mut state.cursor_theme { + cursor_theme + .set_cursor( + conn, + "default", + bar.scale as u32, + args.serial, + &mut state.shared_state.shm, + seat.cursor_surface, + pointer, + ) + .unwrap(); + } } - Event::Leave(_) => seat.cur_surface = None, + Event::Leave(_) => seat.current_surface = None, Event::Motion(args) => { seat.x = args.surface_x.as_f64(); seat.y = args.surface_y.as_f64(); |