mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-06 05:52:32 -08:00
Code Issues Projects Releases Wiki Activity

Fix focus stealing in the Emacs server for old window managers

Browse source 
* src/xterm.c (x_focus_frame): Apply focus stealing preference
to non-EWMH focus as well.  Otherwise frames get raised but not
focused.
This commit is contained in:
Po Lu 2022-10-24 19:18:17 +08:00
parent d083075b45
commit eb3f8d1b64
1 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/xterm.c
View file

@ -27348,6 +27348,7 @@ static void
x_focus_frame (struct frame *f, bool noactivate)
{
struct x_display_info *dpyinfo;
Time time;
dpyinfo = FRAME_DISPLAY_INFO (f);
@ -27373,16 +27374,25 @@ x_focus_frame (struct frame *f, bool noactivate)
/* Ignore any BadMatch error this request might result in. */
x_ignore_errors_for_next_request (dpyinfo);
if (NILP (Vx_no_window_manager))
XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
/* It is invalid to use CurrentTime according to
the ICCCM:
{
/* Use the last user time. It is invalid to use CurrentTime
according to the ICCCM:
Clients that use a SetInputFocus request must
set the time field to the timestamp of the
event that caused them to make the
attempt. [...] Note that clients must not use
CurrentTime in the time field. */
RevertToParent, dpyinfo->last_user_time);
Clients that use a SetInputFocus request must set the
time field to the timestamp of the event that caused
them to make the attempt. [...] Note that clients must
not use CurrentTime in the time field. */
time = dpyinfo->last_user_time;
/* Unless the focus doesn't belong to Emacs anymore and
`x-allow-focus-stealing' is set to Qnewer_time. */
if (EQ (Vx_allow_focus_stealing, Qnewer_time)
&& !dpyinfo->x_focus_frame)
time = x_get_server_time (f);
XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
RevertToParent, time);
}
else
XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
/* But when no window manager is in use, we
@ -31049,10 +31059,16 @@ connection setup. */);
Some window managers prevent `x-focus-frame' from activating the given
frame when Emacs is in the background, which is especially prone to
cause problems when the Emacs server wants to activate itself. This
variable specifies the strategy used to activate frames when that is
the case, and has several valid values (any other value means to not
bypass window manager focus stealing prevention):
cause problems when the Emacs server wants to activate itself.
In addition, when an old-fashioned (pre-EWMH) window manager is being
run and `x-no-window-manager' is nil, the X server will not let Emacs
focus itself if another program was focused after the last time Emacs
obtained the input focus.
This variable specifies the strategy used to activate frames when that
is the case, and has several valid values (any other value means to
not bypass window manager focus stealing prevention):
- The symbol `imitate-pager', which means to pretend that Emacs is a
pager.