Use _MOTIF_WM_HINTS to determine if window should be popup
Surely this won't go horribly wrong... Fixes #155
This commit is contained in:
Shawn Wallace
parent
51300780f8
commit
4671f27282
3 changed files with 201 additions and 59 deletions
|
|
@ -657,13 +657,13 @@ impl<C: XConnection> ServerState<C> {
|
|||
);
|
||||
}
|
||||
|
||||
pub fn set_popup(&mut self, window: x::Window) {
|
||||
pub fn set_popup(&mut self, window: x::Window, is_popup: bool) {
|
||||
let Some(win) = self.windows.get_mut(&window) else {
|
||||
debug!("not setting popup for unknown window {window:?}");
|
||||
return;
|
||||
};
|
||||
|
||||
win.attrs.is_popup = true;
|
||||
win.attrs.is_popup = is_popup;
|
||||
}
|
||||
|
||||
pub fn set_win_title(&mut self, window: x::Window, name: WmName) {
|
||||
|
|
|
|||
|
|
@ -107,6 +107,7 @@ impl WmName {
|
|||
pub struct XState {
|
||||
connection: Rc<xcb::Connection>,
|
||||
atoms: Atoms,
|
||||
window_atoms: WindowTypes,
|
||||
root: x::Window,
|
||||
wm_window: x::Window,
|
||||
selection_data: SelectionData,
|
||||
|
|
@ -198,12 +199,14 @@ impl XState {
|
|||
|
||||
let wm_window = connection.generate_id();
|
||||
let selection_data = SelectionData::new(&connection, root);
|
||||
let window_atoms = WindowTypes::intern_all(&connection).unwrap();
|
||||
|
||||
let mut r = Self {
|
||||
connection,
|
||||
wm_window,
|
||||
root,
|
||||
atoms,
|
||||
window_atoms,
|
||||
selection_data,
|
||||
};
|
||||
r.create_ewmh_window();
|
||||
|
|
@ -502,12 +505,6 @@ impl XState {
|
|||
let class = self.get_wm_class(window);
|
||||
let size_hints = self.get_wm_size_hints(window);
|
||||
let motif_wm_hints = self.get_motif_wm_hints(window);
|
||||
let window_state = PropertyCookieWrapper {
|
||||
connection: &self.connection,
|
||||
cookie: self.get_property_cookie(window, self.atoms.net_wm_state, x::ATOM_ATOM, 10),
|
||||
resolver: |reply: x::GetPropertyReply| reply.value::<x::Atom>().to_vec(),
|
||||
};
|
||||
|
||||
let mut title = name.resolve()?;
|
||||
if title.is_none() {
|
||||
title = self.get_wm_name(window).resolve()?;
|
||||
|
|
@ -522,20 +519,105 @@ impl XState {
|
|||
if let Some(hints) = size_hints.resolve()? {
|
||||
server_state.set_size_hints(window, hints);
|
||||
}
|
||||
if let Some(decorations) = motif_wm_hints.resolve()?.and_then(|m| m.decorations) {
|
||||
|
||||
let motif_hints = motif_wm_hints.resolve()?;
|
||||
if let Some(decorations) = motif_hints.as_ref().and_then(|m| m.decorations) {
|
||||
server_state.set_win_decorations(window, decorations);
|
||||
}
|
||||
|
||||
let mut is_popup = false;
|
||||
let transient_for = self
|
||||
.property_cookie_wrapper(
|
||||
window,
|
||||
self.atoms.wm_transient_for,
|
||||
x::ATOM_WINDOW,
|
||||
1,
|
||||
|reply: x::GetPropertyReply| reply.value::<x::Window>().first().copied(),
|
||||
)
|
||||
.resolve()?;
|
||||
|
||||
let is_popup = self.guess_is_popup(window, motif_hints, transient_for.is_some())?;
|
||||
server_state.set_popup(window, is_popup);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn property_cookie_wrapper<F: PropertyResolver>(
|
||||
&self,
|
||||
window: x::Window,
|
||||
property: x::Atom,
|
||||
ty: x::Atom,
|
||||
len: u32,
|
||||
resolver: F,
|
||||
) -> PropertyCookieWrapper<F> {
|
||||
PropertyCookieWrapper {
|
||||
connection: &self.connection,
|
||||
cookie: self.get_property_cookie(window, property, ty, len),
|
||||
resolver,
|
||||
}
|
||||
}
|
||||
|
||||
fn guess_is_popup(
|
||||
&self,
|
||||
window: x::Window,
|
||||
motif_hints: Option<motif::Hints>,
|
||||
has_transient_for: bool,
|
||||
) -> XResult<bool> {
|
||||
if let Some(hints) = motif_hints {
|
||||
// If the motif hints indicate the user shouldn't be able to do anything
|
||||
// to the window at all, it stands to reason it's probably a popup.
|
||||
if hints.functions.is_some_and(|f| f.is_empty()) {
|
||||
return Ok(true);
|
||||
}
|
||||
}
|
||||
|
||||
let attrs = self
|
||||
.connection
|
||||
.send_request(&x::GetWindowAttributes { window });
|
||||
|
||||
let atoms_vec = |reply: x::GetPropertyReply| reply.value::<x::Atom>().to_vec();
|
||||
let window_types =
|
||||
self.property_cookie_wrapper(window, self.window_atoms.ty, x::ATOM_ATOM, 10, atoms_vec);
|
||||
let window_state = self.property_cookie_wrapper(
|
||||
window,
|
||||
self.atoms.net_wm_state,
|
||||
x::ATOM_ATOM,
|
||||
10,
|
||||
atoms_vec,
|
||||
);
|
||||
|
||||
let override_redirect = self.connection.wait_for_reply(attrs)?.override_redirect();
|
||||
let mut is_popup = override_redirect;
|
||||
|
||||
let window_types = window_types.resolve()?.unwrap_or_else(|| {
|
||||
if !override_redirect && has_transient_for {
|
||||
vec![self.window_atoms.dialog]
|
||||
} else {
|
||||
vec![self.window_atoms.normal]
|
||||
}
|
||||
});
|
||||
|
||||
let mut known_window_type = false;
|
||||
for ty in window_types {
|
||||
match ty {
|
||||
x if x == self.window_atoms.normal || x == self.window_atoms.dialog => {
|
||||
is_popup = override_redirect;
|
||||
}
|
||||
_ => {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
known_window_type = true;
|
||||
break;
|
||||
}
|
||||
|
||||
if !known_window_type {
|
||||
if let Some(states) = window_state.resolve()? {
|
||||
is_popup = states.contains(&self.atoms.skip_taskbar);
|
||||
}
|
||||
|
||||
if is_popup {
|
||||
server_state.set_popup(window);
|
||||
}
|
||||
|
||||
Ok(())
|
||||
Ok(is_popup)
|
||||
}
|
||||
|
||||
fn get_property_cookie(
|
||||
|
|
@ -664,7 +746,7 @@ impl XState {
|
|||
fn get_motif_wm_hints(
|
||||
&self,
|
||||
window: x::Window,
|
||||
) -> PropertyCookieWrapper<impl PropertyResolver<Output = MotifWmHints>> {
|
||||
) -> PropertyCookieWrapper<impl PropertyResolver<Output = motif::Hints>> {
|
||||
let cookie = self.get_property_cookie(
|
||||
window,
|
||||
self.atoms.motif_wm_hints,
|
||||
|
|
@ -673,7 +755,7 @@ impl XState {
|
|||
);
|
||||
let resolver = |reply: x::GetPropertyReply| {
|
||||
let data: &[u32] = reply.value();
|
||||
MotifWmHints::from(data)
|
||||
motif::Hints::from(data)
|
||||
};
|
||||
|
||||
PropertyCookieWrapper {
|
||||
|
|
@ -828,12 +910,6 @@ bitflags! {
|
|||
}
|
||||
}
|
||||
|
||||
bitflags! {
|
||||
pub struct MotifWmHintsFlags: u32 {
|
||||
const Decorations = 2;
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
|
||||
pub struct WinSize {
|
||||
pub width: i32,
|
||||
|
|
@ -888,6 +964,55 @@ impl From<&[u32]> for WmHints {
|
|||
}
|
||||
}
|
||||
|
||||
pub use motif::Decorations;
|
||||
mod motif {
|
||||
use super::*;
|
||||
// Motif WM hints are incredibly poorly documented, I could only find this header:
|
||||
// https://www.opengroup.org/infosrv/openmotif/R2.1.30/motif/lib/Xm/MwmUtil.h
|
||||
// and these random Perl docs:
|
||||
// https://metacpan.org/pod/X11::Protocol::WM#_MOTIF_WM_HINTS
|
||||
|
||||
bitflags! {
|
||||
struct HintsFlags: u32 {
|
||||
const Functions = 1;
|
||||
const Decorations = 2;
|
||||
}
|
||||
}
|
||||
|
||||
bitflags! {
|
||||
pub(super) struct Functions: u32 {
|
||||
const All = 1;
|
||||
const Resize = 2;
|
||||
const Move = 4;
|
||||
const Minimize = 8;
|
||||
const Maximize = 16;
|
||||
const Close = 32;
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
pub(super) struct Hints {
|
||||
pub(super) functions: Option<Functions>,
|
||||
pub(super) decorations: Option<Decorations>,
|
||||
}
|
||||
|
||||
impl From<&[u32]> for Hints {
|
||||
fn from(value: &[u32]) -> Self {
|
||||
let mut ret = Self::default();
|
||||
|
||||
let flags = HintsFlags::from_bits_truncate(value[0]);
|
||||
|
||||
if flags.contains(HintsFlags::Functions) {
|
||||
ret.functions = Some(Functions::from_bits_truncate(value[1]));
|
||||
}
|
||||
if flags.contains(HintsFlags::Decorations) {
|
||||
ret.decorations = value[2].try_into().ok();
|
||||
}
|
||||
|
||||
ret
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
|
||||
pub enum Decorations {
|
||||
Client = 0,
|
||||
|
|
@ -914,24 +1039,6 @@ impl From<Decorations> for zxdg_toplevel_decoration_v1::Mode {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Default, Debug, PartialEq, Eq)]
|
||||
pub struct MotifWmHints {
|
||||
pub decorations: Option<Decorations>,
|
||||
}
|
||||
|
||||
impl From<&[u32]> for MotifWmHints {
|
||||
fn from(value: &[u32]) -> Self {
|
||||
let mut ret = Self::default();
|
||||
|
||||
let flags = MotifWmHintsFlags::from_bits_truncate(value[0]);
|
||||
|
||||
if flags.contains(MotifWmHintsFlags::Decorations) {
|
||||
ret.decorations = value[2].try_into().ok();
|
||||
}
|
||||
|
||||
ret
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
|
|
|
|||
|
|
@ -309,6 +309,8 @@ xcb::atoms_struct! {
|
|||
multiple => b"MULTIPLE",
|
||||
wm_state => b"WM_STATE",
|
||||
wm_check => b"_NET_SUPPORTING_WM_CHECK",
|
||||
win_type => b"_NET_WM_WINDOW_TYPE",
|
||||
win_type_normal => b"_NET_WM_WINDOW_TYPE_NORMAL",
|
||||
motif_wm_hints => b"_MOTIF_WM_HINTS" only_if_exists = false,
|
||||
mime1 => b"text/plain" only_if_exists = false,
|
||||
mime2 => b"blah/blah" only_if_exists = false,
|
||||
|
|
@ -1647,19 +1649,52 @@ fn forced_1x_scale_consistent_x11_size() {
|
|||
}
|
||||
|
||||
#[test]
|
||||
fn popup_properties() {
|
||||
fn popup_heuristics() {
|
||||
let mut f = Fixture::new();
|
||||
let mut connection = Connection::new(&f.display);
|
||||
|
||||
let win_toplevel = connection.new_window(connection.root, 0, 0, 20, 20, false);
|
||||
f.map_as_toplevel(&mut connection, win_toplevel);
|
||||
|
||||
let win_popup_dialog = connection.new_window(connection.root, 10, 10, 50, 50, false);
|
||||
let ghidra_popup = connection.new_window(connection.root, 10, 10, 50, 50, false);
|
||||
connection.set_property(
|
||||
win_popup_dialog,
|
||||
ghidra_popup,
|
||||
x::ATOM_ATOM,
|
||||
connection.atoms.win_type,
|
||||
&[connection.atoms.win_type_normal],
|
||||
);
|
||||
connection.set_property(
|
||||
ghidra_popup,
|
||||
x::ATOM_ATOM,
|
||||
connection.atoms.net_wm_state,
|
||||
&[connection.atoms.skip_taskbar],
|
||||
);
|
||||
f.map_as_popup(&mut connection, win_popup_dialog);
|
||||
connection.set_property(
|
||||
ghidra_popup,
|
||||
connection.atoms.motif_wm_hints,
|
||||
connection.atoms.motif_wm_hints,
|
||||
&[0b11_u32, 0, 0, 0, 0],
|
||||
);
|
||||
f.map_as_popup(&mut connection, ghidra_popup);
|
||||
|
||||
let reaper_dialog = connection.new_window(connection.root, 10, 10, 50, 50, false);
|
||||
connection.set_property(
|
||||
ghidra_popup,
|
||||
x::ATOM_ATOM,
|
||||
connection.atoms.win_type,
|
||||
&[connection.atoms.win_type_normal],
|
||||
);
|
||||
connection.set_property(
|
||||
ghidra_popup,
|
||||
x::ATOM_ATOM,
|
||||
connection.atoms.net_wm_state,
|
||||
&[connection.atoms.skip_taskbar],
|
||||
);
|
||||
connection.set_property(
|
||||
ghidra_popup,
|
||||
connection.atoms.motif_wm_hints,
|
||||
connection.atoms.motif_wm_hints,
|
||||
&[0x2_u32, 0, 0x2a, 0, 0],
|
||||
);
|
||||
f.map_as_toplevel(&mut connection, reaper_dialog);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue