aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPo Lu2022-09-15 15:30:32 +0800
committerPo Lu2022-09-15 15:30:47 +0800
commit429e61b130232e69531f7d44b2bc610d43c8217d (patch)
treecc6432b4da957e9b23cfe0371d541293b9b9c047 /src
parent1ccfd3bae2dffe5cf33202eb4479f4daf722b265 (diff)
downloademacs-429e61b130232e69531f7d44b2bc610d43c8217d.tar.gz
emacs-429e61b130232e69531f7d44b2bc610d43c8217d.zip
More fixes for XDND proxy support
* src/xterm.c (handle_one_xevent): Check replies against toplevel, not proxy.
Diffstat (limited to 'src')
-rw-r--r--src/xterm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 96d25b26434..4c3b8128175 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -17676,7 +17676,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
17676 17676
17677 if (x_dnd_last_protocol_version != -1 17677 if (x_dnd_last_protocol_version != -1
17678 && x_dnd_in_progress 17678 && x_dnd_in_progress
17679 && target == x_dnd_last_seen_window 17679 && target == x_dnd_last_seen_toplevel
17680 /* The XDND documentation is not very clearly worded. 17680 /* The XDND documentation is not very clearly worded.
17681 But this should be the correct behavior, since 17681 But this should be the correct behavior, since
17682 "kDNDStatusSendHereFlag" in the reference 17682 "kDNDStatusSendHereFlag" in the reference
@@ -20377,7 +20377,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
20377 else if (x_dnd_last_seen_window != None 20377 else if (x_dnd_last_seen_window != None
20378 && x_dnd_last_protocol_version != -1) 20378 && x_dnd_last_protocol_version != -1)
20379 { 20379 {
20380 x_dnd_pending_finish_target = x_dnd_last_seen_window; 20380 x_dnd_pending_finish_target = x_dnd_last_seen_toplevel;
20381 x_dnd_waiting_for_finish_proto = x_dnd_last_protocol_version; 20381 x_dnd_waiting_for_finish_proto = x_dnd_last_protocol_version;
20382 20382
20383 x_dnd_waiting_for_finish 20383 x_dnd_waiting_for_finish
@@ -21914,7 +21914,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
21914 else if (x_dnd_last_seen_window != None 21914 else if (x_dnd_last_seen_window != None
21915 && x_dnd_last_protocol_version != -1) 21915 && x_dnd_last_protocol_version != -1)
21916 { 21916 {
21917 x_dnd_pending_finish_target = x_dnd_last_seen_window; 21917 x_dnd_pending_finish_target = x_dnd_last_seen_toplevel;
21918 x_dnd_waiting_for_finish_proto = x_dnd_last_protocol_version; 21918 x_dnd_waiting_for_finish_proto = x_dnd_last_protocol_version;
21919 21919
21920 x_dnd_waiting_for_finish 21920 x_dnd_waiting_for_finish