summaryrefslogtreecommitdiff
path: root/src/nsterm.m
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2022-06-04 15:41:39 +0800
committerPo Lu <luangruo@yahoo.com>2022-06-04 15:41:39 +0800
commit1289d0c3dd964a501ea0b039c0ce9bc39ec47caa (patch)
treeeca35cb94402750ce9527c409ff8520a6fcfb8bd /src/nsterm.m
parent937a011352e4bc24c40a1eab1c4b4d7f8aba7c7b (diff)
downloademacs-1289d0c3dd964a501ea0b039c0ce9bc39ec47caa.tar.gz
emacs-1289d0c3dd964a501ea0b039c0ce9bc39ec47caa.tar.bz2
emacs-1289d0c3dd964a501ea0b039c0ce9bc39ec47caa.zip
Fix splurious drag-mouse-1 events after NS drag-and-drop
* src/nsterm.m ([EmacsWindow beginDrag:...]): Clear dpyinfo->grabbed.
Diffstat (limited to 'src/nsterm.m')
-rw-r--r--src/nsterm.m6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/nsterm.m b/src/nsterm.m
index ecaca5b87fa..04475bbba05 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -9662,7 +9662,6 @@ nswindow_orderedIndex_sort (id w1, id w2, void *c)
NSInteger window_number;
NSWindow *w;
#endif
-
drag_op = op;
selected_op = NSDragOperationNone;
image = [[NSImage alloc] initWithSize: NSMakeSize (1.0, 1.0)];
@@ -9716,6 +9715,11 @@ nswindow_orderedIndex_sort (id w1, id w2, void *c)
#endif
unblock_input ();
+ /* Assume all buttons have been released since the drag-and-drop
+ operation is now over. */
+ if (!dnd_return_frame)
+ x_display_list->grabbed = 0;
+
[image release];
*frame_return = dnd_return_frame;