vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #433 from i509VCB/x11/invert-window-inner 

x11: fix window drop not destroying
This commit is contained in:
Victoria Brekenfeld 2021-12-16 13:41:57 +01:00 committed by GitHub
parent e6ed93beb1 b80281dcc8
commit 82f2e2def6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 108 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/x11/buffer.rs
View File

@ -109,10 +109,8 @@ where
window: &Window, window: &Window,
dmabuf: &Dmabuf, dmabuf: &Dmabuf,
) -> Result<PixmapWrapper<'c, C>, CreatePixmapError> { ) -> Result<PixmapWrapper<'c, C>, CreatePixmapError> {
let window_inner = window.0.upgrade().unwrap(); if dmabuf.format().code != window.format() {
return Err(CreatePixmapError::IncorrectFormat(window.format()));
if dmabuf.format().code != window_inner.format {
return Err(CreatePixmapError::IncorrectFormat(window_inner.format));
} }
let mut fds = Vec::new(); let mut fds = Vec::new();
@ -129,7 +127,7 @@ where
} }
// We need dri3 >= 1.2 in order to use the enhanced dri3_pixmap_from_buffers function. // We need dri3 >= 1.2 in order to use the enhanced dri3_pixmap_from_buffers function.
let xid = if window_inner.extensions.dri3 >= Some((1, 2)) { let xid = if window.0.extensions.dri3 >= Some((1, 2)) {
if dmabuf.num_planes() > 4 { if dmabuf.num_planes() > 4 {
return Err(CreatePixmapError::TooManyPlanes); return Err(CreatePixmapError::TooManyPlanes);
} }
@ -154,7 +152,7 @@ where
offsets.next().unwrap_or(x11rb::NONE), offsets.next().unwrap_or(x11rb::NONE),
window.depth(), window.depth(),
// In the future this could be made nicer. // In the future this could be made nicer.
match window.format().unwrap() { match window.format() {
DrmFourcc::Argb8888 => 32, DrmFourcc::Argb8888 => 32,
DrmFourcc::Xrgb8888 => 24, DrmFourcc::Xrgb8888 => 24,
_ => unreachable!(), _ => unreachable!(),
@ -183,7 +181,7 @@ where
stride as u16, stride as u16,
window.depth(), window.depth(),
// In the future this could be made nicer. // In the future this could be made nicer.
match window.format().unwrap() { match window.format() {
DrmFourcc::Argb8888 => 32, DrmFourcc::Argb8888 => 32,
DrmFourcc::Xrgb8888 => 24, DrmFourcc::Xrgb8888 => 24,
_ => unreachable!(), _ => unreachable!(),
@ -198,10 +196,9 @@ where
} }
fn present(self, connection: &C, window: &Window) -> Result<u32, X11Error> { fn present(self, connection: &C, window: &Window) -> Result<u32, X11Error> {
let window_inner = window.0.upgrade().unwrap(); // We have the connection and window alive. let next_serial = window.0.next_serial.fetch_add(1, Ordering::SeqCst);
let next_serial = window_inner.next_serial.fetch_add(1, Ordering::SeqCst);
// We want to present as soon as possible, so wait 1ms so the X server will present when next convenient. // We want to present as soon as possible, so wait 1ms so the X server will present when next convenient.
let msc = window_inner.last_msc.load(Ordering::SeqCst) + 1; let msc = window.0.last_msc.load(Ordering::SeqCst) + 1;
// options parameter does not take the enum but a u32. // options parameter does not take the enum but a u32.
const OPTIONS: present::Option = present::Option::NONE; const OPTIONS: present::Option = present::Option::NONE;

4
src/backend/x11/error.rs
View File

@ -145,6 +145,10 @@ pub enum AllocateBuffersError {
/// No free slots /// No free slots
#[error("No free slots in the swapchain")] #[error("No free slots in the swapchain")]
NoFreeSlots, NoFreeSlots,
/// The window has been destroyed
#[error("The window has been destroyed")]
WindowDestroyed,
} }
impl From<Errno> for AllocateBuffersError { impl From<Errno> for AllocateBuffersError {

117
src/backend/x11/mod.rs
View File

@ -259,7 +259,7 @@ impl X11Backend {
#[derive(Debug)] #[derive(Debug)]
pub struct X11Surface { pub struct X11Surface {
connection: Weak<RustConnection>, connection: Weak<RustConnection>,
window: Window, window: Weak<WindowInner>,
resize: Receiver<Size<u16, Logical>>, resize: Receiver<Size<u16, Logical>>,
swapchain: Swapchain<Arc<Mutex<gbm::Device<DrmNode>>>, BufferObject<()>>, swapchain: Swapchain<Arc<Mutex<gbm::Device<DrmNode>>>, BufferObject<()>>,
format: DrmFourcc, format: DrmFourcc,
@ -420,9 +420,7 @@ impl X11Handle {
device: Arc<Mutex<gbm::Device<DrmNode>>>, device: Arc<Mutex<gbm::Device<DrmNode>>>,
modifiers: impl Iterator<Item = DrmModifier>, modifiers: impl Iterator<Item = DrmModifier>,
) -> Result<X11Surface, X11Error> { ) -> Result<X11Surface, X11Error> {
match window.0.upgrade() { let has_resize = { window.0.resize.lock().unwrap().is_some() };
Some(window) => {
let has_resize = { window.resize.lock().unwrap().is_some() };
if has_resize { if has_resize {
return Err(X11Error::SurfaceExists); return Err(X11Error::SurfaceExists);
@ -432,26 +430,26 @@ impl X11Handle {
let inner_guard = inner.lock().unwrap(); let inner_guard = inner.lock().unwrap();
// Fail if the window is not managed by this backend or is destroyed // Fail if the window is not managed by this backend or is destroyed
if !inner_guard.windows.contains_key(&window.id) { if !inner_guard.windows.contains_key(&window.id()) {
return Err(X11Error::InvalidWindow); return Err(X11Error::InvalidWindow);
} }
let modifiers = modifiers.collect::<Vec<_>>(); let modifiers = modifiers.collect::<Vec<_>>();
let format = window.format; let format = window.0.format;
let size = window.size(); let size = window.size();
let swapchain = Swapchain::new(device, size.w as u32, size.h as u32, format, modifiers); let swapchain = Swapchain::new(device, size.w as u32, size.h as u32, format, modifiers);
let (sender, recv) = mpsc::channel(); let (sender, recv) = mpsc::channel();
{ {
let mut resize = window.resize.lock().unwrap(); let mut resize = window.0.resize.lock().unwrap();
*resize = Some(sender); *resize = Some(sender);
} }
Ok(X11Surface { Ok(X11Surface {
connection: Arc::downgrade(&inner_guard.connection), connection: Arc::downgrade(&inner_guard.connection),
window: window.into(), window: Arc::downgrade(&window.0),
swapchain, swapchain,
format, format,
width: size.w, width: size.w,
@ -460,16 +458,24 @@ impl X11Handle {
resize: recv, resize: recv,
}) })
} }
None => Err(X11Error::InvalidWindow),
}
}
} }
impl X11Surface { impl X11Surface {
/// Returns the window the surface presents to. /// Returns the window the surface presents to.
pub fn window(&self) -> &Window { ///
&self.window /// This will return [`None`] if the window has been destroyed.
pub fn window(&self) -> Option<impl AsRef<Window> + '_> {
let window = self.window.upgrade().map(Window).map(WindowTemporary);
struct WindowTemporary(Window);
impl AsRef<Window> for WindowTemporary {
fn as_ref(&self) -> &Window {
&self.0
}
}
window
} }
/// Returns a handle to the GBM device used to allocate buffers. /// Returns a handle to the GBM device used to allocate buffers.
@ -528,13 +534,15 @@ impl X11Surface {
mem::swap(&mut next, current); mem::swap(&mut next, current);
} }
let window = self.window().ok_or(AllocateBuffersError::WindowDestroyed)?;
if let Ok(pixmap) = PixmapWrapper::with_dmabuf( if let Ok(pixmap) = PixmapWrapper::with_dmabuf(
&*connection, &*connection,
&self.window, window.as_ref(),
next.userdata().get::<Dmabuf>().unwrap(), next.userdata().get::<Dmabuf>().unwrap(),
) { ) {
// Now present the current buffer // Now present the current buffer
let _ = pixmap.present(&*connection, &self.window); let _ = pixmap.present(&*connection, window.as_ref());
} }
self.swapchain.submitted(next); self.swapchain.submitted(next);
@ -617,79 +625,67 @@ impl<'a> WindowBuilder<'a> {
)?); )?);
let downgrade = Arc::downgrade(&window); let downgrade = Arc::downgrade(&window);
inner.windows.insert(window.id, window); inner.windows.insert(window.id, downgrade);
Ok(Window(downgrade)) Ok(Window(window))
} }
} }
/// An X11 window. /// An X11 window.
///
/// Dropping an instance of the window will destroy it.
#[derive(Debug)] #[derive(Debug)]
pub struct Window(Weak<WindowInner>); pub struct Window(Arc<WindowInner>);
impl Window { impl Window {
/// Sets the title of the window. /// Sets the title of the window.
pub fn set_title(&self, title: &str) { pub fn set_title(&self, title: &str) {
if let Some(inner) = self.0.upgrade() { self.0.set_title(title);
inner.set_title(title);
}
} }
/// Maps the window, making it visible. /// Maps the window, making it visible.
pub fn map(&self) { pub fn map(&self) {
if let Some(inner) = self.0.upgrade() { self.0.map();
inner.map();
}
} }
/// Unmaps the window, making it invisible. /// Unmaps the window, making it invisible.
pub fn unmap(&self) { pub fn unmap(&self) {
if let Some(inner) = self.0.upgrade() { self.0.unmap();
inner.unmap();
}
} }
/// Returns the size of this window. /// Returns the size of this window.
/// ///
/// If the window has been destroyed, the size is `0 x 0`. /// If the window has been destroyed, the size is `0 x 0`.
pub fn size(&self) -> Size<u16, Logical> { pub fn size(&self) -> Size<u16, Logical> {
self.0 self.0.size()
.upgrade()
.map(|inner| inner.size())
.unwrap_or_else(|| (0, 0).into())
} }
/// Changes the visibility of the cursor within the confines of the window. /// Changes the visibility of the cursor within the confines of the window.
/// ///
/// If `false`, this will hide the cursor. If `true`, this will show the cursor. /// If `false`, this will hide the cursor. If `true`, this will show the cursor.
pub fn set_cursor_visible(&self, visible: bool) { pub fn set_cursor_visible(&self, visible: bool) {
if let Some(inner) = self.0.upgrade() { self.0.set_cursor_visible(visible);
inner.set_cursor_visible(visible);
}
} }
/// Returns the XID of the window. /// Returns the XID of the window.
pub fn id(&self) -> u32 { pub fn id(&self) -> u32 {
self.0.upgrade().map(|inner| inner.id).unwrap_or(0) self.0.id
} }
/// Returns the depth id of this window. /// Returns the depth id of this window.
pub fn depth(&self) -> u8 { pub fn depth(&self) -> u8 {
self.0.upgrade().map(|inner| inner.depth.depth).unwrap_or(0) self.0.depth.depth
} }
/// Returns the format expected by the window. /// Returns the format expected by the window.
pub fn format(&self) -> Option<DrmFourcc> { pub fn format(&self) -> DrmFourcc {
self.0.upgrade().map(|inner| inner.format) self.0.format
} }
} }
impl PartialEq for Window { impl PartialEq for Window {
fn eq(&self, other: &Self) -> bool { fn eq(&self, other: &Self) -> bool {
match (self.0.upgrade(), other.0.upgrade()) { self.0 == other.0
(Some(self_), Some(other)) => self_ == other,
_ => false,
}
} }
} }
@ -742,7 +738,7 @@ pub(crate) struct X11Inner {
log: Logger, log: Logger,
connection: Arc<RustConnection>, connection: Arc<RustConnection>,
screen_number: usize, screen_number: usize,
windows: HashMap<u32, Arc<WindowInner>>, windows: HashMap<u32, Weak<WindowInner>>,
key_counter: Arc<AtomicU32>, key_counter: Arc<AtomicU32>,
window_format: DrmFourcc, window_format: DrmFourcc,
extensions: Extensions, extensions: Extensions,
@ -760,7 +756,13 @@ impl X11Inner {
use self::X11Event::Input; use self::X11Event::Input;
fn window_from_id(inner: &Arc<Mutex<X11Inner>>, id: &u32) -> Option<Arc<WindowInner>> { fn window_from_id(inner: &Arc<Mutex<X11Inner>>, id: &u32) -> Option<Arc<WindowInner>> {
inner.lock().unwrap().windows.get(id).cloned() inner
.lock()
.unwrap()
.windows
.get(id)
.cloned()
.and_then(|weak| weak.upgrade())
} }
// If X11 is deadlocking somewhere here, make sure you drop your mutex guards. // If X11 is deadlocking somewhere here, make sure you drop your mutex guards.
@ -812,7 +814,7 @@ impl X11Inner {
}, },
}, },
}), }),
&mut Window(Arc::downgrade(&window)), &mut Window(window),
) )
} else { } else {
callback( callback(
@ -823,7 +825,7 @@ impl X11Inner {
state: ButtonState::Pressed, state: ButtonState::Pressed,
}, },
}), }),
&mut Window(Arc::downgrade(&window)), &mut Window(window),
) )
} }
} }
@ -846,7 +848,7 @@ impl X11Inner {
state: ButtonState::Released, state: ButtonState::Released,
}, },
}), }),
&mut Window(Arc::downgrade(&window)), &mut Window(window),
); );
} }
} }
@ -870,7 +872,7 @@ impl X11Inner {
state: KeyState::Pressed, state: KeyState::Pressed,
}, },
}), }),
&mut Window(Arc::downgrade(&window)), &mut Window(window),
) )
} }
} }
@ -902,7 +904,7 @@ impl X11Inner {
state: KeyState::Released, state: KeyState::Released,
}, },
}), }),
&mut Window(Arc::downgrade(&window)), &mut Window(window),
); );
} }
} }
@ -924,7 +926,7 @@ impl X11Inner {
size: window_size, size: window_size,
}, },
}), }),
&mut Window(Arc::downgrade(&window)), &mut Window(window),
) )
} }
} }
@ -942,15 +944,16 @@ impl X11Inner {
// requests a resize or does something which causes a resize // requests a resize or does something which causes a resize
// inside the callback. // inside the callback.
{ {
*window.size.lock().unwrap() = configure_notify_size; let mut resize_guard = window.size.lock().unwrap();
*resize_guard = configure_notify_size;
} }
(callback)( (callback)(
X11Event::Resized(configure_notify_size), X11Event::Resized(configure_notify_size),
&mut Window(Arc::downgrade(&window)), &mut Window(window.clone()),
); );
if let Some(resize_sender) = &*window.resize.lock().unwrap() { if let Some(resize_sender) = window.resize.lock().unwrap().as_ref() {
let _ = resize_sender.send(configure_notify_size); let _ = resize_sender.send(configure_notify_size);
} }
} }
@ -974,7 +977,7 @@ impl X11Inner {
if client_message.data.as_data32()[0] == window.atoms.WM_DELETE_WINDOW if client_message.data.as_data32()[0] == window.atoms.WM_DELETE_WINDOW
// Destroy the window? // Destroy the window?
{ {
(callback)(X11Event::CloseRequested, &mut Window(Arc::downgrade(&window))); (callback)(X11Event::CloseRequested, &mut Window(window));
} }
} }
} }
@ -982,7 +985,7 @@ impl X11Inner {
x11::Event::Expose(expose) => { x11::Event::Expose(expose) => {
if let Some(window) = window_from_id(inner, &expose.window) { if let Some(window) = window_from_id(inner, &expose.window) {
if expose.count == 0 { if expose.count == 0 {
(callback)(X11Event::Refresh, &mut Window(Arc::downgrade(&window))); (callback)(X11Event::Refresh, &mut Window(window));
} }
} }
} }
@ -991,7 +994,7 @@ impl X11Inner {
if let Some(window) = window_from_id(inner, &complete_notify.window) { if let Some(window) = window_from_id(inner, &complete_notify.window) {
window.last_msc.store(complete_notify.msc, Ordering::SeqCst); window.last_msc.store(complete_notify.msc, Ordering::SeqCst);
(callback)(X11Event::PresentCompleted, &mut Window(Arc::downgrade(&window))); (callback)(X11Event::PresentCompleted, &mut Window(window));
} }
} }

9
src/backend/x11/window_inner.rs
View File

@ -34,7 +34,7 @@ use x11rb::{
impl From<Arc<WindowInner>> for Window { impl From<Arc<WindowInner>> for Window {
fn from(inner: Arc<WindowInner>) -> Self { fn from(inner: Arc<WindowInner>) -> Self {
Window(Arc::downgrade(&inner)) Window(inner)
} }
} }
@ -287,7 +287,12 @@ impl WindowInner {
impl PartialEq for WindowInner { impl PartialEq for WindowInner {
fn eq(&self, other: &Self) -> bool { fn eq(&self, other: &Self) -> bool {
self.id == other.id match (self.connection.upgrade(), other.connection.upgrade()) {
(Some(conn1), Some(conn2)) => Arc::ptr_eq(&conn1, &conn2) && self.id == other.id,
// A window with no connection to the X server cannot be validated.
_ => false,
}
} }
} }