From: Po Lu <luangruo@yahoo.com>
Date: Sun, 3 Apr 2022 00:42:52 +0000 (+0800)
Subject: Fix incorrect usage of XM_DRAG_SIDE_EFFECT
X-Git-Tag: emacs-29.0.90~1931^2~810
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6904fcb11d76c2ccd8663a81a07bce212e042e95;p=emacs.git

Fix incorrect usage of XM_DRAG_SIDE_EFFECT

* src/xterm.c (xm_send_top_level_leave_message)
(handle_one_xevent): Pass corret alt side effects and flags to
XM_DRAG_SIDE_EFFECT.
---

diff --git a/src/xterm.c b/src/xterm.c
index 08e3a956336..68b96c13d87 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1610,7 +1610,8 @@ xm_send_top_level_leave_message (struct x_display_info *dpyinfo, Window source,
       mmsg.byteorder = XM_TARGETS_TABLE_CUR;
       mmsg.side_effects = XM_DRAG_SIDE_EFFECT (xm_side_effect_from_action (dpyinfo,
 									   x_dnd_wanted_action),
-					       XM_DROP_SITE_NONE, 0, 0);
+					       XM_DROP_SITE_NONE, XM_DRAG_NOOP,
+					       XM_DROP_ACTION_DROP_CANCEL);
       mmsg.timestamp = dmsg->timestamp;
       mmsg.x = 65535;
       mmsg.y = 65535;
@@ -14414,7 +14415,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 		    dmsg.byteorder = XM_TARGETS_TABLE_CUR;
 		    dmsg.side_effects = XM_DRAG_SIDE_EFFECT (xm_side_effect_from_action (dpyinfo,
 											 x_dnd_wanted_action),
-							     XM_DROP_SITE_NONE, 0, 0);
+							     XM_DROP_SITE_NONE, XM_DRAG_NOOP,
+							     XM_DROP_ACTION_DROP_CANCEL);
 		    dmsg.timestamp = event->xmotion.time;
 		    dmsg.x = event->xmotion.x_root;
 		    dmsg.y = event->xmotion.y_root;
@@ -15865,7 +15867,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 			  dmsg.side_effects
 			    = XM_DRAG_SIDE_EFFECT (xm_side_effect_from_action (dpyinfo,
 									       x_dnd_wanted_action),
-						   XM_DROP_SITE_NONE, 0, 0);
+						   XM_DROP_SITE_NONE, XM_DRAG_NOOP,
+						   XM_DROP_ACTION_DROP_CANCEL);
 			  dmsg.timestamp = xev->time;
 			  dmsg.x = lrint (xev->root_x);
 			  dmsg.y = lrint (xev->root_y);