bhrebec/xwayland-satellite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unconditionally set input focus on activation

Browse source 
Wine windows had WM_HINTS.input set to False, and expected use of the
WM_TAKE_FOCUS protocol, but Wayland input is much more absolute, so this
protocol is useless to us. Always focusing windows seems to be fine, so
just do that.
Should fix #35.
This commit is contained in:
Shawn Wallace 2024-07-07 16:41:34 -04:00
parent 891d056497
commit 03a0e1754d
3 changed files with 22 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/server/event.rs
View file

@ -255,6 +255,9 @@ impl SurfaceData {
let activated = states.contains(&(u32::from(xdg_toplevel::State::Activated) as u8));
if activated {
// Technically this is wrong - activated doesn't necessarily mean focused
// - but it works and no one's complained yet.
// TODO: base focus on keyboard enter instead.
state.to_focus = Some(self.window.unwrap());
}

34
src/xstate/mod.rs
View file

@ -697,7 +697,6 @@ bitflags! {
bitflags! {
/// https://tronche.com/gui/x/icccm/sec-4.html#s-4.1.2.4
pub struct WmHintsFlags: u32 {
const Input = 1;
const WindowGroup = 64;
}
}
@ -739,7 +738,6 @@ impl From<&[u32]> for WmNormalHints {
#[derive(Default, Debug, PartialEq, Eq)]
pub struct WmHints {
pub input: Option<bool>,
pub window_group: Option<x::Window>,
}
@ -748,9 +746,6 @@ impl From<&[u32]> for WmHints {
let mut ret = Self::default();
let flags = WmHintsFlags::from_bits_truncate(value[0]);
if flags.contains(WmHintsFlags::Input) {
ret.input = Some(value[1] == 1);
}
if flags.contains(WmHintsFlags::WindowGroup) {
let window = unsafe { x::Window::new(value[8]) };
ret.window_group = Some(window);
@ -817,30 +812,11 @@ impl super::XConnection for Arc<xcb::Connection> {
}
fn focus_window(&mut self, window: x::Window, atoms: Self::ExtraData) {
let prop =
unwrap_or_skip_bad_window!(self.wait_for_reply(self.send_request(&x::GetProperty {
delete: false,
window,
property: x::ATOM_WM_HINTS,
r#type: x::ATOM_WM_HINTS,
long_offset: 0,
long_length: 9,
})));
let set_focus = if prop.r#type() == x::ATOM_NONE {
true
} else {
WmHints::from(prop.value()).input.unwrap_or(true)
};
if set_focus {
// might fail if window is not visible but who cares
let _ = self.send_and_check_request(&x::SetInputFocus {
focus: window,
revert_to: x::InputFocus::None,
time: x::CURRENT_TIME,
});
}
unwrap_or_skip_bad_window!(self.send_and_check_request(&x::SetInputFocus {
focus: window,
revert_to: x::InputFocus::None,
time: x::CURRENT_TIME,
}));
unwrap_or_skip_bad_window!(self.send_and_check_request(&x::ChangeProperty {
mode: x::PropMode::Replace,