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

Fix more issues with DND state on multiple displays

Browse source 
* src/xterm.c (handle_one_xevent): Don't update DND state on the
wrong display.
This commit is contained in:
Po Lu 2022-05-06 09:35:23 +08:00
parent d5c1fec6ab
commit e2fcbd8dbd
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/xterm.c
View file

@ -15002,7 +15002,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
popup_activated_flag = 1;
#endif
if (x_dnd_in_progress)
if (x_dnd_in_progress
&& dpyinfo == FRAME_DISPLAY_INFO (x_dnd_frame))
x_dnd_update_state (dpyinfo, dpyinfo->last_user_time);
if (x_dnd_in_progress && x_dnd_use_toplevels
@ -16267,7 +16268,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
}
if (x_dnd_in_progress)
if (x_dnd_in_progress
&& dpyinfo == FRAME_DISPLAY_INFO (x_dnd_frame))
x_dnd_update_state (dpyinfo, dpyinfo->last_user_time);
goto OTHER;
@ -16651,7 +16653,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
break;
case CirculateNotify:
if (x_dnd_in_progress)
if (x_dnd_in_progress
&& dpyinfo == FRAME_DISPLAY_INFO (x_dnd_frame))
x_dnd_update_state (dpyinfo, dpyinfo->last_user_time);
goto OTHER;