procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only rely on EWMH window activation if possible

Browse source 
* xterm.c (x_ewmh_activate_frame): Remove unnecessary
x_wm_supports check.
(x_focus_frame): When the window manager supports
_NET_ACTIVE_WINDOW, just use it; anything else may confuse the
window manager.
This commit is contained in:
Po Lu 2022-10-02 08:28:56 +08:00
parent 8a2bc86039
commit 3924fbd025
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/xterm.c
View file

@ -26842,8 +26842,7 @@ x_ewmh_activate_frame (struct frame *f)
dpyinfo = FRAME_DISPLAY_INFO (f);
if (FRAME_VISIBLE_P (f)
&& x_wm_supports (f, dpyinfo->Xatom_net_active_window))
if (FRAME_VISIBLE_P (f))
{
/* See the documentation at
https://specifications.freedesktop.org/wm-spec/wm-spec-latest.html
@ -26903,14 +26902,23 @@ x_focus_frame (struct frame *f, bool noactivate)
xembed_request_focus (f);
else
{
if (!noactivate
&& x_wm_supports (f, dpyinfo->Xatom_net_active_window))
{
/* When window manager activation is possible, use it
instead. The window manager is expected to perform any
necessary actions such as raising the frame, moving it to
the current workspace, and mapping it, etc, before moving
input focus to the frame. */
x_ewmh_activate_frame (f);
return;
}
/* Ignore any BadMatch error this request might result in. */
x_ignore_errors_for_next_request (dpyinfo);
XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
RevertToParent, CurrentTime);
x_stop_ignoring_errors (dpyinfo);
if (!noactivate)
x_ewmh_activate_frame (f);
}
}