]> git.eshelyaron.com Git - emacs.git/commitdiff
More fixes for XDND proxy support
authorPo Lu <luangruo@yahoo.com>
Thu, 15 Sep 2022 07:30:32 +0000 (15:30 +0800)
committerPo Lu <luangruo@yahoo.com>
Thu, 15 Sep 2022 07:30:47 +0000 (15:30 +0800)
* src/xterm.c (handle_one_xevent): Check replies against
toplevel, not proxy.

src/xterm.c

index 96d25b2643451767dbb9ee5855d938dff773829c..4c3b8128175aecb1d2fb178f2130a3d018e4466a 100644 (file)
@@ -17676,7 +17676,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 
            if (x_dnd_last_protocol_version != -1
                && x_dnd_in_progress
-               && target == x_dnd_last_seen_window
+               && target == x_dnd_last_seen_toplevel
                /* The XDND documentation is not very clearly worded.
                   But this should be the correct behavior, since
                   "kDNDStatusSendHereFlag" in the reference
@@ -20377,7 +20377,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                    else if (x_dnd_last_seen_window != None
                        && x_dnd_last_protocol_version != -1)
                      {
-                       x_dnd_pending_finish_target = x_dnd_last_seen_window;
+                       x_dnd_pending_finish_target = x_dnd_last_seen_toplevel;
                        x_dnd_waiting_for_finish_proto = x_dnd_last_protocol_version;
 
                        x_dnd_waiting_for_finish
@@ -21914,7 +21914,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                          else if (x_dnd_last_seen_window != None
                                   && x_dnd_last_protocol_version != -1)
                            {
-                             x_dnd_pending_finish_target = x_dnd_last_seen_window;
+                             x_dnd_pending_finish_target = x_dnd_last_seen_toplevel;
                              x_dnd_waiting_for_finish_proto = x_dnd_last_protocol_version;
 
                              x_dnd_waiting_for_finish