Skip to content

fix(surface): use synchronised surfaces to avoid Hyprland quirk #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OldUser101 merged 1 commit into from
Jan 10, 2026
Merged

fix(surface): use synchronised surfaces to avoid Hyprland quirk #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions src/surface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,6 @@ impl NLockSurface {
let ov_surface = compositor.create_surface(qh, ());
let subsurface = subcompositor.get_subsurface(&ov_surface, &bg_surface, qh, ());

// The overlay surface should be able to update independently
subsurface.set_desync();

// Pass all input to the main surface, this feels a bit hacky
let region = compositor.create_region(qh, ());
region.add(0, 0, 0, 0);
Expand Down Expand Up @@ -296,18 +293,14 @@ impl NLockSurface {
self.calculate_dpi();
}

// Render background if needed
if !self.bg_rendered
&& let Err(e) = self.render_background(config, bg_image, shm, qh)
{
warn!("Error while rendering background: {e}");
}

// Always render the overlay
if let Err(e) = self.render_overlay(config, auth_state, pwd_len, shm, qh) {
warn!("Error while rendering overlay: {e}");
}

if let Err(e) = self.render_background(config, bg_image, shm, qh) {
warn!("Error while rendering background: {e}");
}

// Update last width and height to allow for resizing
if let Err(e) = self.update_last_dimensions() {
warn!("Failed to update previous dimensions: {e}");
Expand All @@ -321,6 +314,15 @@ impl NLockSurface {
shm: &wl_shm::WlShm,
qh: &QueueHandle<NLockState>,
) -> Result<()> {
// Background rendered, but we need to commit again
// to allow overlay update (synchronised surfaces)
if self.bg_rendered
&& let Some(surface) = &self.bg_surface
{
surface.commit();
return Ok(());
}

let (buf_width, buf_height) = self.get_dimensions::<f64>()?;

let idx = match self.get_buffer_idx(shm, qh) {
Expand Down