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, 4 insertions, 1 deletions

diff --git a/src/xterm.h b/src/xterm.h
index 6684d7839f3..92e88bb50fa 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -765,6 +765,10 @@ struct x_display_info
 
   /* Pointer to the next request in `failable_requests'.  */
   struct x_failable_request *next_failable_request;
+
+  /* The pending drag-and-drop time for middle-click based
+     drag-and-drop emulation.  */
+  Time pending_dnd_time;
 };
 
 #ifdef HAVE_X_I18N
@@ -1617,7 +1621,6 @@ extern void x_clipboard_manager_save_all (void);
 
 extern Lisp_Object x_timestamp_for_selection (struct x_display_info *,
                                               Lisp_Object);
-extern void x_set_pending_dnd_time (Time);
 extern void x_own_selection (Lisp_Object, Lisp_Object, Lisp_Object,
                              Lisp_Object, Time);
 extern Atom x_intern_cached_atom (struct x_display_info *, const char *,