[Emacs-diffs] master c0f2c29: Support drag and drop of region by mouse (Bug#26725)

[Eli Zaretskii]

branch: master
commit c0f2c298772fbb1dcaa1da3e9c2760e09147e115
Author: Tak Kunihiro <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Support drag and drop of region by mouse (Bug#26725)
    
    * doc/emacs/frames.texi (Drag and Drop): Document support of drag
    and drop region by mouse.
    * lisp/mouse.el (mouse-drag-region): Call mouse-drag-and-drop-region
    when start-event is on region.
    (mouse-drag-and-drop-region): New function, moves the region by
    (mouse-drag-and-drop-region): New defcustom.
    * etc/NEWS: Mention mouse-drag-and-drop-region.
---
 doc/emacs/frames.texi | 12 +++++++
 etc/NEWS              |  4 +++
 lisp/mouse.el         | 95 ++++++++++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 106 insertions(+), 5 deletions(-)

diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 68c12d2..8984555 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -1074,6 +1074,18 @@ file on a Dired buffer moves or copies the file 
(according to the
 conventions of the application it came from) into the directory
 displayed in that buffer.
 
address@hidden mouse-drag-and-drop-region
+  Emacs can also optionally drag the region of text by mouse into
+another portion of this or another buffer.  To enable that, customize
+the variable @code{mouse-drag-and-drop-region} to a non-nil value.
+Normally, the text is moved, i.e. cut and pasted, when the destination
+is the same buffer as the origin; dropping the region on another
+buffer copies the text instead.  If the value of this variable names a
+modifier key, such as @samp{shift} or @samp{control} or @samp{alt},
+then pressing that modifier key when dropping the text will copy it
+instead of cutting it, even if you drop on the same buffer as the one
+from which the text came.
+
 @vindex dnd-open-file-other-window
   Dropping a file normally visits it in the window you drop it on.  If
 you prefer to visit the file in a new window in such cases, customize
diff --git a/etc/NEWS b/etc/NEWS
index 2a7c48d..60066b7 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -169,6 +169,10 @@ keeps point at the end of the region, setting it to 
non-nil moves
 point to the beginning of the region.
 
 +++
+** The new user option 'mouse-drag-and-drop-region' allows to drag the
+entire region of text to another place or another buffer.
+
++++
 ** The new user option 'confirm-kill-processes' allows the user to
 skip a confirmation prompt for killing subprocesses when exiting
 Emacs.  When set to t (the default), Emacs will prompt for
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 0520fd1..9b6b169 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -714,12 +714,19 @@ Upon exit, point is at the far edge of the newly visible 
text."
 Highlight the drag area as you move the mouse.
 This must be bound to a button-down mouse event.
 In Transient Mark mode, the highlighting remains as long as the mark
-remains active.  Otherwise, it remains until the next input event."
-  (interactive "e")
-  ;; Give temporary modes such as isearch a chance to turn off.
-  (run-hooks 'mouse-leave-buffer-hook)
-  (mouse-drag-track start-event))
+remains active.  Otherwise, it remains until the next input event.
 
+When the region already exists and `mouse-drag-and-drop-region'
+is non-nil, this moves the entire region of text to where mouse
+is dragged over to."
+  (interactive "e")
+  (if (and mouse-drag-and-drop-region
+           (not (member 'triple (event-modifiers start-event)))
+           (equal (mouse-posn-property (event-start start-event) 'face) 
'region))
+      (mouse-drag-and-drop-region start-event)
+    ;; Give temporary modes such as isearch a chance to turn off.
+    (run-hooks 'mouse-leave-buffer-hook)
+    (mouse-drag-track start-event)))
 
 (defun mouse-posn-property (pos property)
   "Look for a property at click position.
@@ -1937,6 +1944,84 @@ choose a font."
                  t (called-interactively-p 'interactive)))))))))
 
 
+;; Drag and drop support.
+(defcustom mouse-drag-and-drop-region nil
+  "If non-nil, dragging the mouse drags the region, if that exists.
+If the value is a modifier, such as `control' or `shift' or `meta',
+then if that modifier key is pressed when dropping the region, region
+text is copied instead of being cut."
+  :type 'symbol
+  :version "26.1"
+  :group 'mouse)
+
+(defun mouse-drag-and-drop-region (event)
+  "Move text in the region to point where mouse is dragged to.
+The transportation of text is also referred as `drag and drop'.
+When text is dragged over to a different buffer, or if a
+modifier key was pressed when dropping, and the value of the
+variable `mouse-drag-and-drop-region' is that modifier, the text
+is copied instead of being cut."
+  (interactive "e")
+  (require 'tooltip)
+  (let ((start (region-beginning))
+        (end (region-end))
+        (point (point))
+        (buffer (current-buffer))
+        (window (selected-window))
+        value-selection)
+    (track-mouse
+      ;; When event was click instead of drag, skip loop
+      (while (progn
+               (setq event (read-event))
+               (mouse-movement-p event))
+        (unless value-selection ; initialization
+          (delete-overlay mouse-secondary-overlay)
+          (setq value-selection (buffer-substring start end))
+          (move-overlay mouse-secondary-overlay start end)) ; (deactivate-mark)
+        (ignore-errors (deactivate-mark) ; care existing region in other window
+                       (mouse-set-point event)
+                       (tooltip-show value-selection)))
+      (tooltip-hide))
+    ;; Do not modify buffer under mouse when "event was click",
+    ;;                                       "drag negligible", or
+    ;;                                       "drag to read-only".
+    (if (or (equal (mouse-posn-property (event-end event) 'face) 'region) ; 
"event was click"
+            (member 'secondary-selection ; "drag negligible"
+                    (mapcar (lambda (xxx) (overlay-get xxx 'face))
+                            (overlays-at (posn-point (event-end event)))))
+            buffer-read-only)
+        ;; Do not modify buffer under mouse.
+        (cond
+         ;; "drag negligible" or "drag to read-only", restore region.
+         (value-selection
+          (select-window window) ; In case miss drag to other window
+          (goto-char point)
+          (setq deactivate-mark nil)
+          (activate-mark))
+         ;; "event was click"
+         (t
+          (deactivate-mark)
+          (mouse-set-point event)))
+      ;; Modify buffer under mouse by inserting text.
+      (push-mark)
+      (insert value-selection)
+      (when (not (equal (mark) (point))) ; on success insert
+        (setq deactivate-mark nil)
+        (activate-mark)) ; have region on destination
+      ;; Take care of initial region on source.
+      (if (equal (current-buffer) buffer) ; when same buffer
+          (let (deactivate-mark) ; remove text
+            (unless (member mouse-drag-and-drop-region (event-modifiers event))
+              (kill-region (overlay-start mouse-secondary-overlay)
+                           (overlay-end mouse-secondary-overlay))))
+        (let ((window1 (selected-window))) ; when beyond buffer
+          (select-window window)
+          (goto-char point) ; restore point on source window
+          (activate-mark) ; restore region
+          (select-window window1))))
+    (delete-overlay mouse-secondary-overlay)))
+
+
 ;;; Bindings for mouse commands.
 
 (global-set-key [down-mouse-1] 'mouse-drag-region)