fix: quit in ::unlocked instead of after unlock() (v0.6.17)
The real cause of the unlock SIGSEGV: gtk4-session-lock destroys the lock windows itself when the lock ends (per its header), so unlock_callback's `unlock(); app.quit();` destroyed them a second time — surface already gone → gdk_surface_get_display NULL → crash in gtk_window_destroy. Reproduces on a plain single-monitor lock/unlock, no suspend needed. unlock_callback now calls only unlock(); a new connect_unlocked handler quits the app after the library finishes teardown. Mirrors the upstream examples/simple.rs exactly. Reverts the v0.6.15/v0.6.16 monitor-pruning + LockscreenHandles.monitor: it was a misdiagnosis (the crash is monitor-independent) and manually manipulated library-managed lock windows, which the upstream example explicitly warns against. Monitor removal is left to the library.
This commit is contained in:
@@ -27,9 +27,6 @@ pub struct LockscreenHandles {
|
||||
pub password_entry: gtk::PasswordEntry,
|
||||
pub unlock_callback: Rc<dyn Fn()>,
|
||||
pub username: String,
|
||||
/// The monitor this window was assigned to (session-lock path only).
|
||||
/// Used to prune the window when its monitor is removed on suspend/resume.
|
||||
pub monitor: Option<gdk::Monitor>,
|
||||
state: Rc<RefCell<LockscreenState>>,
|
||||
}
|
||||
|
||||
@@ -73,7 +70,6 @@ pub fn create_lockscreen_window(
|
||||
password_entry: gtk::PasswordEntry::new(),
|
||||
unlock_callback,
|
||||
username: String::new(),
|
||||
monitor: None,
|
||||
state: Rc::new(RefCell::new(LockscreenState {
|
||||
failed_attempts: 0,
|
||||
fp_listener_rc: None,
|
||||
@@ -364,7 +360,6 @@ pub fn create_lockscreen_window(
|
||||
password_entry: password_entry.clone(),
|
||||
unlock_callback,
|
||||
username: user.username,
|
||||
monitor: None,
|
||||
state: state.clone(),
|
||||
}
|
||||
}
|
||||
|
||||
+12
-26
@@ -59,7 +59,7 @@ fn activate(app: >k::Application) {
|
||||
|
||||
fn activate_with_session_lock(
|
||||
app: >k::Application,
|
||||
display: &gdk::Display,
|
||||
_display: &gdk::Display,
|
||||
config: &config::Config,
|
||||
) {
|
||||
let lock = gtk4_session_lock::Instance::new();
|
||||
@@ -75,9 +75,12 @@ fn activate_with_session_lock(
|
||||
// Shared unlock callback — unlocks session and quits.
|
||||
// Guard prevents double-unlock if PAM and fingerprint succeed simultaneously.
|
||||
let lock_clone = lock.clone();
|
||||
let app_clone = app.clone();
|
||||
let already_unlocked = Rc::new(Cell::new(false));
|
||||
let au = already_unlocked.clone();
|
||||
// unlock() only. The library destroys the lock windows itself when the lock ends,
|
||||
// and the ::unlocked handler quits the app afterwards. Calling app.quit() here too
|
||||
// double-destroyed the windows (their surface was already gone) and segfaulted
|
||||
// gtk_window_destroy. Matches the upstream gtk4-session-lock example.
|
||||
let unlock_callback: Rc<dyn Fn()> = Rc::new(move || {
|
||||
if au.get() {
|
||||
log::debug!("Unlock already triggered, ignoring duplicate");
|
||||
@@ -85,7 +88,6 @@ fn activate_with_session_lock(
|
||||
}
|
||||
au.set(true);
|
||||
lock_clone.unlock();
|
||||
app_clone.quit();
|
||||
});
|
||||
|
||||
// Shared caches for multi-monitor — first monitor renders, rest reuse
|
||||
@@ -127,7 +129,7 @@ fn activate_with_session_lock(
|
||||
shared_fp,
|
||||
move |_instance, monitor| {
|
||||
log::debug!("Monitor signal: creating lockscreen window");
|
||||
let mut handles = lockscreen::create_lockscreen_window(
|
||||
let handles = lockscreen::create_lockscreen_window(
|
||||
bg_texture.as_ref().as_ref(),
|
||||
&config,
|
||||
&app,
|
||||
@@ -137,7 +139,6 @@ fn activate_with_session_lock(
|
||||
);
|
||||
lock_for_signal.assign_window_to_monitor(&handles.window, monitor);
|
||||
handles.window.present();
|
||||
handles.monitor = Some(monitor.clone());
|
||||
|
||||
// If fingerprint is already initialized, wire up the label
|
||||
if let Some(ref fp_rc) = *shared_fp.borrow() {
|
||||
@@ -148,29 +149,14 @@ fn activate_with_session_lock(
|
||||
}
|
||||
));
|
||||
|
||||
// connect_monitor only ADDS — it never tells us when a monitor powers off on
|
||||
// suspend. gtk4-session-lock then unmaps and drops its own ref to that monitor's
|
||||
// window, but the GtkApplication and all_handles still hold refs, so the orphaned
|
||||
// window survives until unlock — where gtk_window_destroy dereferences its now-NULL
|
||||
// monitor association and segfaults. Watch the display's monitor list and prune any
|
||||
// window whose monitor is no longer valid, releasing our refs (the lib doc points to
|
||||
// "GTK APIs" for exactly this). We release refs, not destroy — the lib already
|
||||
// unmapped+dereffed the window.
|
||||
display.monitors().connect_items_changed(glib::clone!(
|
||||
// Quit only after the library finishes unlocking (::unlocked fires after the lock
|
||||
// ends). gtk4-session-lock destroys the lock windows itself at lock-end; quitting
|
||||
// earlier — or destroying windows ourselves — races that teardown and segfaults
|
||||
// gtk_window_destroy on an already-gone surface. Mirrors the upstream example.
|
||||
lock.connect_unlocked(glib::clone!(
|
||||
#[weak]
|
||||
app,
|
||||
#[strong]
|
||||
all_handles,
|
||||
move |_, _, _, _| {
|
||||
all_handles.borrow_mut().retain(|h| {
|
||||
let alive = h.monitor.as_ref().is_none_or(gdk::Monitor::is_valid);
|
||||
if !alive {
|
||||
log::info!("Monitor removed — pruning its lockscreen window");
|
||||
app.remove_window(&h.window);
|
||||
}
|
||||
alive
|
||||
});
|
||||
}
|
||||
move |_| app.quit()
|
||||
));
|
||||
|
||||
lock.lock();
|
||||
|
||||
Reference in New Issue
Block a user