aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPo Lu2022-06-04 15:41:39 +0800
committerPo Lu2022-06-04 15:41:39 +0800
commit1289d0c3dd964a501ea0b039c0ce9bc39ec47caa (patch)
treeeca35cb94402750ce9527c409ff8520a6fcfb8bd /src
parent937a011352e4bc24c40a1eab1c4b4d7f8aba7c7b (diff)
downloademacs-1289d0c3dd964a501ea0b039c0ce9bc39ec47caa.tar.gz
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')
-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)
9662 NSInteger window_number; 9662 NSInteger window_number;
9663 NSWindow *w; 9663 NSWindow *w;
9664#endif 9664#endif
9665
9666 drag_op = op; 9665 drag_op = op;
9667 selected_op = NSDragOperationNone; 9666 selected_op = NSDragOperationNone;
9668 image = [[NSImage alloc] initWithSize: NSMakeSize (1.0, 1.0)]; 9667 image = [[NSImage alloc] initWithSize: NSMakeSize (1.0, 1.0)];
@@ -9716,6 +9715,11 @@ nswindow_orderedIndex_sort (id w1, id w2, void *c)
9716#endif 9715#endif
9717 unblock_input (); 9716 unblock_input ();
9718 9717
9718 /* Assume all buttons have been released since the drag-and-drop
9719 operation is now over. */
9720 if (!dnd_return_frame)
9721 x_display_list->grabbed = 0;
9722
9719 [image release]; 9723 [image release];
9720 9724
9721 *frame_return = dnd_return_frame; 9725 *frame_return = dnd_return_frame;