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

Set input focus on windows without WM_HINTS input flag

Browse source 
Also miscellaneous formatting things.
Part of #8
This commit is contained in:
Shawn Wallace 2024-05-20 01:26:06 -04:00
parent 38e58bd11d
commit 2317ebb842
4 changed files with 99 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/clientside.rs
View file

@ -4,9 +4,9 @@ use std::os::unix::net::UnixStream;
use std::sync::mpsc;
use wayland_client::protocol::{
wl_buffer::WlBuffer, wl_callback::WlCallback, wl_compositor::WlCompositor,
wl_keyboard::WlKeyboard, wl_output::WlOutput, wl_pointer::WlPointer, wl_registry::WlRegistry,
wl_seat::WlSeat, wl_shm::WlShm, wl_shm_pool::WlShmPool, wl_surface::WlSurface,
wl_touch::WlTouch, wl_region::WlRegion
wl_keyboard::WlKeyboard, wl_output::WlOutput, wl_pointer::WlPointer, wl_region::WlRegion,
wl_registry::WlRegistry, wl_seat::WlSeat, wl_shm::WlShm, wl_shm_pool::WlShmPool,
wl_surface::WlSurface, wl_touch::WlTouch,
};
use wayland_client::{delegate_noop, Connection, Dispatch, EventQueue, Proxy, QueueHandle};
use wayland_protocols::wp::relative_pointer::zv1::client::{

22
src/xstate.rs
View file

@ -336,7 +336,7 @@ impl XState {
},
title,
class,
group: wm_hints.map(|h| h.window_group).flatten(),
group: wm_hints.and_then(|h| h.window_group),
size_hints,
}
}
@ -640,6 +640,9 @@ 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);
@ -713,20 +716,17 @@ impl super::XConnection for Arc<xcb::Connection> {
property: x::ATOM_WM_HINTS,
r#type: x::ATOM_WM_HINTS,
long_offset: 0,
long_length: 8,
long_length: 9,
}))
.unwrap();
let fields: &[u32] = prop.value();
let mut input = false;
if !fields.is_empty() {
let flags = fields[0];
if (flags & 0x1) > 0 {
input = fields[1] > 0;
}
}
let set_focus = if prop.r#type() == x::ATOM_NONE {
true
} else {
WmHints::from(prop.value()).input.unwrap_or(true)
};
if input {
if set_focus {
// might fail if window is not visible but who cares
let _ = self.send_and_check_request(&x::SetInputFocus {
focus: window,