diff options
| author | Po Lu | 2022-04-03 08:42:52 +0800 |
|---|---|---|
| committer | Po Lu | 2022-04-03 08:42:52 +0800 |
| commit | 6904fcb11d76c2ccd8663a81a07bce212e042e95 (patch) | |
| tree | ea0b51609a3e548e0c08f3be305a342adf5466ea /src | |
| parent | 98775e6cf6ca600c6c8e2ef1fdd1d1bc65c65098 (diff) | |
| download | emacs-6904fcb11d76c2ccd8663a81a07bce212e042e95.tar.gz emacs-6904fcb11d76c2ccd8663a81a07bce212e042e95.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 9 |
1 files changed, 6 insertions, 3 deletions
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, | |||
| 1610 | mmsg.byteorder = XM_TARGETS_TABLE_CUR; | 1610 | mmsg.byteorder = XM_TARGETS_TABLE_CUR; |
| 1611 | mmsg.side_effects = XM_DRAG_SIDE_EFFECT (xm_side_effect_from_action (dpyinfo, | 1611 | mmsg.side_effects = XM_DRAG_SIDE_EFFECT (xm_side_effect_from_action (dpyinfo, |
| 1612 | x_dnd_wanted_action), | 1612 | x_dnd_wanted_action), |
| 1613 | XM_DROP_SITE_NONE, 0, 0); | 1613 | XM_DROP_SITE_NONE, XM_DRAG_NOOP, |
| 1614 | XM_DROP_ACTION_DROP_CANCEL); | ||
| 1614 | mmsg.timestamp = dmsg->timestamp; | 1615 | mmsg.timestamp = dmsg->timestamp; |
| 1615 | mmsg.x = 65535; | 1616 | mmsg.x = 65535; |
| 1616 | mmsg.y = 65535; | 1617 | mmsg.y = 65535; |
| @@ -14414,7 +14415,8 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 14414 | dmsg.byteorder = XM_TARGETS_TABLE_CUR; | 14415 | dmsg.byteorder = XM_TARGETS_TABLE_CUR; |
| 14415 | dmsg.side_effects = XM_DRAG_SIDE_EFFECT (xm_side_effect_from_action (dpyinfo, | 14416 | dmsg.side_effects = XM_DRAG_SIDE_EFFECT (xm_side_effect_from_action (dpyinfo, |
| 14416 | x_dnd_wanted_action), | 14417 | x_dnd_wanted_action), |
| 14417 | XM_DROP_SITE_NONE, 0, 0); | 14418 | XM_DROP_SITE_NONE, XM_DRAG_NOOP, |
| 14419 | XM_DROP_ACTION_DROP_CANCEL); | ||
| 14418 | dmsg.timestamp = event->xmotion.time; | 14420 | dmsg.timestamp = event->xmotion.time; |
| 14419 | dmsg.x = event->xmotion.x_root; | 14421 | dmsg.x = event->xmotion.x_root; |
| 14420 | dmsg.y = event->xmotion.y_root; | 14422 | dmsg.y = event->xmotion.y_root; |
| @@ -15865,7 +15867,8 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 15865 | dmsg.side_effects | 15867 | dmsg.side_effects |
| 15866 | = XM_DRAG_SIDE_EFFECT (xm_side_effect_from_action (dpyinfo, | 15868 | = XM_DRAG_SIDE_EFFECT (xm_side_effect_from_action (dpyinfo, |
| 15867 | x_dnd_wanted_action), | 15869 | x_dnd_wanted_action), |
| 15868 | XM_DROP_SITE_NONE, 0, 0); | 15870 | XM_DROP_SITE_NONE, XM_DRAG_NOOP, |
| 15871 | XM_DROP_ACTION_DROP_CANCEL); | ||
| 15869 | dmsg.timestamp = xev->time; | 15872 | dmsg.timestamp = xev->time; |
| 15870 | dmsg.x = lrint (xev->root_x); | 15873 | dmsg.x = lrint (xev->root_x); |
| 15871 | dmsg.y = lrint (xev->root_y); | 15874 | dmsg.y = lrint (xev->root_y); |