Skip to content

Commit

Permalink
Revert "Fix blurry cursor on Wayland at a scale other than 100% (zed-…
Browse files Browse the repository at this point in the history
…industries#17496)"

This reverts commit c119387.
  • Loading branch information
apricotbucket28 authored Sep 19, 2024
1 parent 27c1106 commit fb87d4a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 28 deletions.
3 changes: 1 addition & 2 deletions crates/gpui/src/platform/linux/wayland/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,7 @@ impl WaylandClient {
.as_ref()
.map(|primary_selection_manager| primary_selection_manager.get_device(&seat, &qh, ()));

// FIXME: Determine the scaling factor dynamically by the compositor
let mut cursor = Cursor::new(&conn, &globals, 24, 2);
let mut cursor = Cursor::new(&conn, &globals, 24);

handle
.insert_source(XDPEventSource::new(&common.background_executor), {
Expand Down
33 changes: 7 additions & 26 deletions crates/gpui/src/platform/linux/wayland/cursor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ pub(crate) struct Cursor {
theme_name: Option<String>,
surface: WlSurface,
size: u32,
scale: u32,
shm: WlShm,
connection: Connection,
}
Expand All @@ -24,34 +23,29 @@ impl Drop for Cursor {
}

impl Cursor {
pub fn new(connection: &Connection, globals: &Globals, size: u32, scale: u32) -> Self {
pub fn new(connection: &Connection, globals: &Globals, size: u32) -> Self {
Self {
theme: CursorTheme::load(&connection, globals.shm.clone(), size).log_err(),
theme_name: None,
surface: globals.compositor.create_surface(&globals.qh, ()),
shm: globals.shm.clone(),
connection: connection.clone(),
size,
scale,
}
}

pub fn set_theme(&mut self, theme_name: &str, size: Option<u32>) {
if let Some(size) = size {
self.size = size;
}
if let Some(theme) = CursorTheme::load_from_name(
&self.connection,
self.shm.clone(),
theme_name,
self.size * self.scale,
)
.log_err()
if let Some(theme) =
CursorTheme::load_from_name(&self.connection, self.shm.clone(), theme_name, self.size)
.log_err()
{
self.theme = Some(theme);
self.theme_name = Some(theme_name.to_string());
} else if let Some(theme) =
CursorTheme::load(&self.connection, self.shm.clone(), self.size * self.scale).log_err()
CursorTheme::load(&self.connection, self.shm.clone(), self.size).log_err()
{
self.theme = Some(theme);
self.theme_name = None;
Expand Down Expand Up @@ -97,22 +91,9 @@ impl Cursor {
let (width, height) = buffer.dimensions();
let (hot_x, hot_y) = buffer.hotspot();

let scaled_width = width / self.scale;
let scaled_height = height / self.scale;
let scaled_hot_x = hot_x / self.scale;
let scaled_hot_y = hot_y / self.scale;

self.surface.set_buffer_scale(self.scale as i32);

wl_pointer.set_cursor(
serial_id,
Some(&self.surface),
scaled_hot_x as i32,
scaled_hot_y as i32,
);
wl_pointer.set_cursor(serial_id, Some(&self.surface), hot_x as i32, hot_y as i32);
self.surface.attach(Some(&buffer), 0, 0);
self.surface
.damage(0, 0, scaled_width as i32, scaled_height as i32);
self.surface.damage(0, 0, width as i32, height as i32);
self.surface.commit();
}
} else {
Expand Down

0 comments on commit fb87d4a

Please sign in to comment.