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

Synchronize XI2 code with Core Input code

Browse source 
* src/xterm.c (handle_one_xevent): Apply recent changes for XI2
events as well.
This commit is contained in:
Po Lu 2022-01-21 15:32:45 +08:00
parent 03f4a2ff64
commit 6e8bafc996
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/xterm.c
View file

@ -10285,26 +10285,33 @@ handle_one_xevent (struct x_display_info *dpyinfo,
{
case XI_FocusIn:
any = x_any_window_to_frame (dpyinfo, focusin->event);
#ifndef USE_GTK
#ifdef USE_GTK
/* Some WMs (e.g. Mutter in Gnome Shell), don't unmap
minimized/iconified windows; thus, for those WMs we won't get
a MapNotify when unminimizing/deconifying. Check here if we
a MapNotify when unminimizing/deiconifying. Check here if we
are deiconizing a window (Bug42655).
But don't do that on GTK since it may cause a plain invisible
frame get reported as iconified, compare
But don't do that by default on GTK since it may cause a plain
invisible frame get reported as iconified, compare
https://lists.gnu.org/archive/html/emacs-devel/2017-02/msg00133.html.
That is fixed above but bites us here again. */
f = any;
if (f && FRAME_ICONIFIED_P (f))
{
SET_FRAME_VISIBLE (f, 1);
SET_FRAME_ICONIFIED (f, false);
f->output_data.x->has_been_visible = true;
inev.ie.kind = DEICONIFY_EVENT;
XSETFRAME (inev.ie.frame_or_window, f);
}
That is fixed above but bites us here again.
The option x_set_frame_visibility_more_laxly allows to override
the default behavior (Bug#49955, Bug#53298). */
if (EQ (x_set_frame_visibility_more_laxly, Qfocus_in)
|| EQ (x_set_frame_visibility_more_laxly, Qt))
#endif /* USE_GTK */
{
f = any;
if (f && FRAME_ICONIFIED_P (f))
{
SET_FRAME_VISIBLE (f, 1);
SET_FRAME_ICONIFIED (f, false);
f->output_data.x->has_been_visible = true;
inev.ie.kind = DEICONIFY_EVENT;
XSETFRAME (inev.ie.frame_or_window, f);
}
}
x_detect_focus_change (dpyinfo, any, event, &inev.ie);
goto XI_OTHER;
case XI_FocusOut: