jory/rustlock
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add diagnostic logging to troubleshoot screenshot display issue

Browse Source
This commit is contained in:
JorySeverijnse
2026-03-06 22:08:38 +01:00
parent 3637accaa6
commit 7cdcf19415
3 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lock.rs
+6 -5
View File
@@ -124,14 +124,15 @@ impl LockedSurface {
// Set background if available // Set background if available
if let Some(ref background) = self.background { if let Some(ref background) = self.background {
log::debug!( let size = (background.width(), background.height());
"Applying background from self.background (size: {}x{})", log::info!(
background.width(), "✓ Applying background from self.background: {}x{}",
background.height() size.0,
size.1
); );
self.renderer.set_background(background.clone()); self.renderer.set_background(background.clone());
} else { } else {
log::debug!("No background in self.background"); log::warn!("✗ No background in self.background - will render solid color!");
} }
self.renderer self.renderer
src/main.rs
+7 -6
View File
@@ -865,12 +865,14 @@ fn lock_wayland_session(
match state.screenshot_manager.as_ref().unwrap().buffer_to_surface(handle, &mut state.pool) { match state.screenshot_manager.as_ref().unwrap().buffer_to_surface(handle, &mut state.pool) {
Ok(surface) => { Ok(surface) => {
log::info!("✓ Converted screenshot for output {}: {}x{}", output_idx, surface.width(), surface.height());
// Apply effects if configured // Apply effects if configured
let mut screenshot = Screenshot::new(surface); let mut screenshot = Screenshot::new(surface);
if let Err(e) = screenshot.apply_effects(&state.config) { if let Err(e) = screenshot.apply_effects(&state.config) {
log::error!("Failed to apply effects: {}", e); log::error!("Failed to apply effects: {}", e);
} }
let surface = screenshot.into_inner(); let surface = screenshot.into_inner();
log::info!("✓ Screenshot ready for output {}", output_idx);
// Save screenshot to file for debugging if debug mode enabled // Save screenshot to file for debugging if debug mode enabled
if state.config.debug { if state.config.debug {
@@ -880,7 +882,7 @@ fn lock_wayland_session(
if let Err(e) = surface.write_to_png(&mut file) { if let Err(e) = surface.write_to_png(&mut file) {
log::error!("Failed to write PNG to {}: {}", path, e); log::error!("Failed to write PNG to {}: {}", path, e);
} else { } else {
log::info!("Saved screenshot to {}", path); log::info!("✓ Saved screenshot to {}", path);
} }
} }
Err(e) => { Err(e) => {
@@ -893,15 +895,14 @@ fn lock_wayland_session(
let output = &state.outputs[output_idx]; let output = &state.outputs[output_idx];
if let Ok(mut lock_manager) = state.lock_manager.lock() { if let Ok(mut lock_manager) = state.lock_manager.lock() {
if let Some(locked_surface) = lock_manager.find_surface_by_output(output) { if let Some(locked_surface) = lock_manager.find_surface_by_output(output) {
log::debug!("Setting background directly on lock surface for output {}", output_idx); log::info!("✓ Setting background on locked surface for output {}", output_idx);
locked_surface.set_background(surface); locked_surface.set_background(surface);
log::debug!("Background set on surface");
} else { } else {
log::debug!("Storing background in captured_backgrounds for output {}", output_idx); log::warn!("⚠ No locked surface found for output {}, storing in captured_backgrounds", output_idx);
state.captured_backgrounds[output_idx] = Some(surface); state.captured_backgrounds[output_idx] = Some(surface);
} }
} else { } else {
log::debug!("Failed to lock manager, storing background"); log::warn!("⚠ Lock manager poisoned, storing in captured_backgrounds for output {}", output_idx);
state.captured_backgrounds[output_idx] = Some(surface); state.captured_backgrounds[output_idx] = Some(surface);
} }
} else { } else {
@@ -909,7 +910,7 @@ fn lock_wayland_session(
} }
} }
Err(e) => { Err(e) => {
log::error!("Failed to convert buffer to surface: {}", e); log::error!("✗ Failed to convert buffer to surface: {}", e);
} }
} }
} else { } else {
src/render.rs
+10 -4
View File
@@ -92,7 +92,7 @@ impl Renderer {
/// Render the current frame /// Render the current frame
pub fn render(&mut self) { pub fn render(&mut self) {
log::debug!( log::info!(
"Renderer::render() called, background: {}", "Renderer::render() called, background: {}",
self.background.is_some() self.background.is_some()
); );
@@ -103,17 +103,23 @@ impl Renderer {
// Draw background if available // Draw background if available
if let Some(ref background) = self.background { if let Some(ref background) = self.background {
log::debug!("Drawing background (fade_alpha: {})", self.fade_alpha); let size = (background.width(), background.height());
log::info!(
"✓ Drawing background ({}x{}, fade_alpha: {})",
size.0,
size.1,
self.fade_alpha
);
self.context self.context
.set_source_surface(background, 0.0, 0.0) .set_source_surface(background, 0.0, 0.0)
.expect("Failed to set background source"); .expect("Failed to set background source");
self.context self.context
.paint_with_alpha(self.fade_alpha) .paint_with_alpha(self.fade_alpha)
.expect("Failed to draw background"); .expect("Failed to draw background");
log::debug!("Background drawn"); log::info!("✓ Background drawn successfully");
} else { } else {
// Draw solid color background (dark gray visible color) // Draw solid color background (dark gray visible color)
log::debug!("No background, drawing solid color"); log::warn!("✗ No background available - rendering solid gray!");
self.context.set_source_rgba(0.15, 0.15, 0.15, 1.0); self.context.set_source_rgba(0.15, 0.15, 0.15, 1.0);
self.context self.context
.paint() .paint()