wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-24 22:01:47 +03:00
Code Issues Projects Releases Wiki Activity

x11: query focus prior to painting if we don't know focus state

Browse Source 
We don't assume that we start up focused, and some WM don't tell
us our focus state, so prior to painting, if we don't know the
focus state, explicitly query it and synthesize a focus change event.

refs: https://github.com/wez/wezterm/issues/1757
This commit is contained in:
Wez Furlong 2022-03-27 07:10:47 -07:00
parent 4cd893335b
commit 045698e6ca
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
window/src/os/x11/window.rs
View File

@ -65,7 +65,7 @@ pub(crate) struct XWindowInner {
config: ConfigHandle, config: ConfigHandle,
appearance: Appearance, appearance: Appearance,
title: String, title: String,
has_focus: bool, has_focus: Option<bool>,
last_cursor_position: Rect, last_cursor_position: Rect,
invalidated: bool, invalidated: bool,
paint_throttled: bool, paint_throttled: bool,
@ -209,6 +209,19 @@ impl XWindowInner {
} else { } else {
self.invalidated = false; self.invalidated = false;
if self.has_focus.is_none() {
log::trace!(
"About to paint, but we've never received a FOCUS_IN/FOCUS_OUT \
event; querying WM to determine focus state"
);
let focus = xcb::xproto::get_input_focus(&self.conn()).get_reply()?;
let focused = focus.focus() == self.window_id;
log::trace!("Do I have focus? {}", focused);
self.has_focus.replace(focused);
self.events.dispatch(WindowEvent::FocusChanged(focused));
}
if !self.dispatched_any_resize { if !self.dispatched_any_resize {
self.dispatched_any_resize = true; self.dispatched_any_resize = true;
@ -450,13 +463,13 @@ impl XWindowInner {
} }
} }
xcb::FOCUS_IN => { xcb::FOCUS_IN => {
self.has_focus = true; self.has_focus.replace(true);
self.update_ime_position(); self.update_ime_position();
log::trace!("Calling focus_change(true)"); log::trace!("Calling focus_change(true)");
self.events.dispatch(WindowEvent::FocusChanged(true)); self.events.dispatch(WindowEvent::FocusChanged(true));
} }
xcb::FOCUS_OUT => { xcb::FOCUS_OUT => {
self.has_focus = false; self.has_focus.replace(false);
log::trace!("Calling focus_change(false)"); log::trace!("Calling focus_change(false)");
self.events.dispatch(WindowEvent::FocusChanged(false)); self.events.dispatch(WindowEvent::FocusChanged(false));
} }
@ -906,7 +919,7 @@ impl XWindow {
copy_and_paste: CopyAndPaste::default(), copy_and_paste: CopyAndPaste::default(),
cursors: CursorInfo::new(&config, &conn), cursors: CursorInfo::new(&config, &conn),
config: config.clone(), config: config.clone(),
has_focus: false, has_focus: None,
last_cursor_position: Rect::default(), last_cursor_position: Rect::default(),
paint_throttled: false, paint_throttled: false,
invalidated: false, invalidated: false,
@ -1037,7 +1050,7 @@ impl XWindowInner {
} }
fn update_ime_position(&mut self) { fn update_ime_position(&mut self) {
if !self.has_focus { if !self.has_focus.unwrap_or(false) {
return; return;
} }
self.conn().ime.borrow_mut().update_pos( self.conn().ime.borrow_mut().update_pos(