Improve drag-and-drop emulation time handling

* src/xselect.c (x_handle_selection_request): Use
display-specific pending DND time.
(x_set_pending_dnd_time): Delete function.
* src/xterm.c (x_dnd_do_unsupported_drop, handle_one_xevent):
Set dpyinfo->pending_dnd_time instead.
* src/xterm.h (struct x_display_info): New field
`pending_dnd_time'.  Make handling pending drops
display-specific to avoid interference when there are multiple
displays.

1 files changed, 6 insertions, 11 deletions

diff --git a/src/xselect.c b/src/xselect.c
index d1b6d454abd..80db0d1fe2a 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -40,8 +40,6 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <X11/Xproto.h>
 
-static Time pending_dnd_time;
-
 struct prop_location;
 struct selection_data;
 
@@ -265,7 +263,7 @@ x_atom_to_symbol (struct x_display_info *dpyinfo, Atom atom)
    TIMESTAMP should be the timestamp where selection ownership will be
    assumed.
    DND_DATA is the local value that will be used for selection requests
-   with `pending_dnd_time'.
+   with `dpyinfo->pending_dnd_time'.
    Update the Vselection_alist so that we can reply to later requests for
    our selection.  */
 
@@ -855,8 +853,11 @@ x_handle_selection_request (struct selection_input_event *event)
 
   /* This is how the XDND protocol recommends dropping text onto a
      target that doesn't support XDND.  */
-  if (SELECTION_EVENT_TIME (event) == pending_dnd_time + 1
-      || SELECTION_EVENT_TIME (event) == pending_dnd_time + 2)
+  if (dpyinfo->pending_dnd_time
+      && ((SELECTION_EVENT_TIME (event)
+           == dpyinfo->pending_dnd_time + 1)
+          || (SELECTION_EVENT_TIME (event)
+              == dpyinfo->pending_dnd_time + 2)))
     use_alternate = true;
 
   block_input ();
@@ -2884,12 +2885,6 @@ x_timestamp_for_selection (struct x_display_info *dpyinfo,
   return value;
 }
 
-void
-x_set_pending_dnd_time (Time time)
-{
-  pending_dnd_time = time;
-}
-
 static void syms_of_xselect_for_pdumper (void);
 
 void