@code{dired-undo} restores the original names in the Dired buffer,
which gets the Dired buffer out of sync with the actual contents of
the directory.
+
+@item touchscreen-hold
+@kindex touchscreen-hold @r{(Dired)}
+@findex dired-click-to-select-mode
+@findex dired-enable-click-to-select-mode
+Enter a ``click to select'' mode, where using the mouse button
+@kbd{mouse-2} on a file name will cause its mark to be toggled. This
+mode is useful when performing file management using a touch screen
+device.
+
+It is enabled when a ``hold'' gesture (@pxref{Touchscreens}) is
+detected over a file name, and is automatically disabled once a Dired
+command operates on the marked files.
@end table
@node Operating on Files
@cindex handling touch screen events
@cindex tap and drag, touch screen gestures
-Emacs provides two functions to handle touch screen events independent
-of gesture recognition or mouse event translation. They are intended
-to be used by commands bound to @code{touchscreen-begin}, to recognize
-and handle common gestures.
+Several functions are provided for Lisp programs that handle touch
+screen events. The intended use of the first two functions described
+below is from commands bound directly to @code{touchscreen-begin}
+events; they allow responding to commonly used touch screen gestures
+separately from mouse event translation.
@defun touch-screen-track-tap event &optional update data
This function is used to track a single ``tap'' gesture originating
drag.
@end defun
+In addition to those two functions, a function is provided for
+commands bound to some types of events generated through mouse event
+translation to prevent unwanted events from being generated after it
+is called.
+
+@defun touch-screen-inhibit-drag
+This function inhibits the generation of @code{touchscreen-drag}
+events during mouse event translation for the duration of the touch
+sequence being translated after it is called. It must be called from
+a command which is bound to a @code{touchscreen-hold} or
+@code{touchscreen-drag} event, and signals an error otherwise.
+
+Since this function can only be called after a gesture is already
+recognized during mouse event translation, no mouse events will be
+generated from touch events constituting the previously mentioned
+touch sequence after it is called.
+@end defun
+
@node Focus Events
@subsection Focus Events
@cindex focus event
* Editing Changes in Emacs 30.1
+++
-** Emacs now has better support for touchscreen events.
-Many touch screen gestures are now implemented, as is support for
-tapping buttons and opening menus.
+** Emacs now has better support for touchscreen devices.
+Many touch screen gestures are now implemented and translated into
+mouse or gesture events, and support for tapping tool bar buttons and
+opening menus has been written. Countless packages, such as Dired and
+Custom have been adjusted to better understand touch screen input.
---
** On X, Emacs now supports input methods which perform "string conversion".
(if failures
(dired-log-summary
(format "%s: error" operation)
- nil))))
+ nil)))
+ (dired-post-do-command))
;;;###autoload
(defun dired-do-chmod (&optional arg)
(if num-modes num-modes
(file-modes-symbolic-to-number modes (file-modes file 'nofollow)))
'nofollow))
- (dired-do-redisplay arg)))
+ (dired-do-redisplay arg))
+ (dired-post-do-command))
;;;###autoload
(defun dired-do-chgrp (&optional arg)
lpr-switches))
" ")
'print arg file-list)))
- (dired-run-shell-command (dired-shell-stuff-it command file-list nil))))
+ (dired-run-shell-command (dired-shell-stuff-it command file-list nil)))
+ (dired-post-do-command))
(defun dired-mark-read-string (prompt initial op-symbol arg files
&optional default-value collection)
nil file-list)
;; execute the shell command
(dired-run-shell-command
- (dired-shell-stuff-it command file-list nil arg)))))))
+ (dired-shell-stuff-it command file-list nil arg))))))
+ (dired-post-do-command))
;; Might use {,} for bash or csh:
(defvar dired-mark-prefix ""
"Compressed %d files to %s"
(length in-files))
(length in-files)
- (file-name-nondirectory out-file)))))))
+ (file-name-nondirectory out-file))))))
+ (dired-post-do-command))
;;;###autoload
(defun dired-compress-file (file)
(and (functionp dired-do-revert-buffer)
(funcall dired-do-revert-buffer target)))
(dired-fun-in-all-buffers (file-name-directory target) nil
- #'revert-buffer))))))
+ #'revert-buffer)))))
+ (dired-post-do-command))
;; Read arguments for a marked-files command that wants a file name,
;; perhaps popping up the list of marked files.
(dired-get-marked-files nil arg))
(user-error "Can't rename \".\" or \"..\" files"))
(dired-do-create-files 'move #'dired-rename-file
- "Move" arg dired-keep-marker-rename "Rename"))
+ "Move" arg dired-keep-marker-rename "Rename")
+ (dired-post-do-command))
\f
;;; Operate on files matched by regexp
"Search for a string through all marked files using Isearch."
(interactive)
(multi-isearch-files
- (dired-get-marked-files nil nil #'dired-nondirectory-p nil t)))
+ (prog1 (dired-get-marked-files nil nil
+ #'dired-nondirectory-p nil t)
+ (dired-post-do-command))))
;;;###autoload
(defun dired-do-isearch-regexp ()
"Search for a regexp through all marked files using Isearch."
(interactive)
- (multi-isearch-files-regexp
- (dired-get-marked-files nil nil 'dired-nondirectory-p nil t)))
+ (prog1 (multi-isearch-files-regexp
+ (dired-get-marked-files nil nil
+ 'dired-nondirectory-p nil t))
+ (dired-post-do-command)))
(declare-function fileloop-continue "fileloop" ())
regexp
(dired-get-marked-files nil nil #'dired-nondirectory-p)
'default)
+ (dired-post-do-command)
(fileloop-continue))
;;;###autoload
(if (and buffer (with-current-buffer buffer
buffer-read-only))
(error "File `%s' is visited read-only" file))))
+ (dired-post-do-command)
(fileloop-initialize-replace
from to (dired-get-marked-files nil nil #'dired-nondirectory-p)
(if (equal from (downcase from)) nil 'default)
(user-error "No matches for: %s" regexp))
(message "Searching...done")
xrefs))))
+ (dired-post-do-command)
(xref-show-xrefs fetcher nil)))
;;;###autoload
(file-name-as-directory file)
file))
marked-files))))
+ (dired-post-do-command)
(if mark-files
(let ((transient-hook (make-symbol "vc-dir-mark-files")))
(fset transient-hook
keymap)
"Keymap applied to file names when `dired-mouse-drag-files' is enabled.")
+(defvar dired-click-to-select-mode)
+(defvar dired-click-to-select-map)
+
(defun dired-insert-set-properties (beg end)
"Add various text properties to the lines in the region, from BEG to END."
(save-excursion
(when (member (cl-incf i) dired-hide-details-preserved-columns)
(put-text-property opoint (point) 'invisible nil))
(setq opoint (point)))))
- (when (and dired-mouse-drag-files (fboundp 'x-begin-drag))
- (put-text-property (point)
- (save-excursion
- (dired-move-to-end-of-filename)
- (backward-char)
- (point))
- 'keymap
- dired-mouse-drag-files-map))
- (add-text-properties
- (point)
- (progn
- (dired-move-to-end-of-filename)
- (point))
- `(mouse-face
- highlight
- dired-filename t
- help-echo ,(if (and dired-mouse-drag-files
- (fboundp 'x-begin-drag))
- "down-mouse-1: drag this file to another program
+ (let ((beg (point)) (end (save-excursion
+ (dired-move-to-end-of-filename)
+ (1- (point)))))
+ (if dired-click-to-select-mode
+ (put-text-property beg end 'keymap
+ dired-click-to-select-map)
+ (when (and dired-mouse-drag-files (fboundp 'x-begin-drag))
+ (put-text-property beg end 'keymap
+ dired-mouse-drag-files-map)))
+ (add-text-properties
+ beg (1+ end)
+ `(mouse-face
+ highlight
+ dired-filename t
+ help-echo ,(if dired-click-to-select-mode
+ "mouse-2: mark or unmark this file"
+ (if (and dired-mouse-drag-files
+ (fboundp 'x-begin-drag))
+ "down-mouse-1: drag this file to another program
mouse-2: visit this file in other window"
- "mouse-2: visit this file in other window")))
+ "mouse-2: visit this file in other window")))))
(when (< (+ (point) 4) (line-end-position))
(put-text-property (+ (point) 4) (line-end-position)
'invisible 'dired-hide-details-link))))
": d" #'epa-dired-do-decrypt
": v" #'epa-dired-do-verify
": s" #'epa-dired-do-sign
- ": e" #'epa-dired-do-encrypt)
+ ": e" #'epa-dired-do-encrypt
+ ;; Click-to-select.
+ "<touchscreen-hold>" #'dired-enable-click-to-select-mode)
(put 'dired-find-file :advertised-binding (kbd "RET"))
(or nomessage
(message "(No deletions requested)")))))
+(defun dired-post-do-command ()
+ "Disable `dired-click-to-select-mode' after an operation."
+ (when dired-click-to-select-mode
+ (dired-click-to-select-mode -1)))
+
(defun dired-do-delete (&optional arg)
"Delete all marked (or next ARG) files.
`dired-recursive-deletes' controls whether deletion of
m))
arg))
arg t)
- (dolist (m markers) (set-marker m nil))))
+ (dolist (m markers) (set-marker m nil)))
+ (dired-post-do-command))
(defvar dired-deletion-confirmer 'yes-or-no-p) ; or y-or-n-p?
(interactive nil dired-mode)
(eww-open-file (dired-get-file-for-visit)))
+\f
+;;; Click-To-Select mode
+
+(defvar dired-click-to-select-map (make-sparse-keymap)
+ "Keymap placed on files under `dired-click-to-select' mode.")
+
+(define-key dired-click-to-select-map [mouse-2]
+ #'dired-mark-for-click)
+
+(defun dired-mark-for-click (event)
+ "Mark or unmark the file underneath the mouse click at EVENT.
+See `dired-click-to-select-mode' for more details."
+ (interactive "e")
+ (let ((posn (event-start event))
+ (inhibit-read-only t))
+ (with-selected-window (posn-window posn)
+ (goto-char (posn-point posn))
+ (save-excursion
+ (dired-repeat-over-lines
+ 1 (lambda ()
+ (let ((char (char-after)))
+ (when (or (not (looking-at-p dired-re-dot))
+ (not (equal dired-marker-char dired-del-marker)))
+ (delete-char 1)
+ (insert (if (eq char dired-marker-char)
+ ;; Insert a space to unmark the file if
+ ;; it's already marked.
+ ?\s
+ ;; Otherwise mark the file.
+ dired-marker-char))))))))))
+
+(defun dired-enable-click-to-select-mode (event)
+ "Enable `dired-click-to-select-mode' and mark the file under EVENT.
+If there is no file under EVENT, call `touch-screen-hold' with
+EVENT instead."
+ (interactive "e")
+ (let* ((posn (event-start event))
+ (window (posn-window posn))
+ (point (posn-point posn)))
+ (if (and window point
+ (get-text-property point 'dired-filename
+ (window-buffer window)))
+ (progn (beep)
+ (touch-screen-inhibit-drag)
+ (with-selected-window window
+ (goto-char point)
+ (save-excursion (dired-mark 1))
+ (dired-click-to-select-mode 1)))
+ (touch-screen-hold event))))
+
+(define-minor-mode dired-click-to-select-mode
+ "Toggle click-to-select inside this Dired buffer.
+When this minor mode is enabled, using `mouse-2' on a file name
+within a Dired buffer will toggle its mark instead of going to it
+within another window.
+
+Disabling this minor mode will unmark all files within the Dired
+buffer.
+
+`dired-click-to-select-mode' is automatically disabled after any
+Dired operation (command whose name starts with `dired-do')
+completes."
+ :group 'dired
+ :lighter " Click-To-Select"
+ (unless (derived-mode-p 'dired-mode 'wdired-mode)
+ (error "Not a Dired buffer"))
+ (if dired-click-to-select-mode
+ (setq-local tool-bar-map
+ `(keymap (exit-click-to-select menu-item
+ "Exit Click To Select Mode"
+ dired-click-to-select-mode
+ :help "Exit `dired-click-to-select-mode'."
+ :image ,(tool-bar--image-expression "close")
+ :enable t)))
+ ;; Reset the default tool bar.
+ (kill-local-variable 'tool-bar-map)
+ (dired-unmark-all-marks))
+ ;; Repropertize this Dired buffer.
+ (let ((inhibit-read-only t))
+ (remove-text-properties (point-min) (point-max)
+ '(invisible nil
+ keymap nil
+ dired-filename nil
+ help-echo nil
+ mouse-face nil))
+ (when dired-make-directory-clickable
+ (dired--make-directory-clickable))
+ (dired-insert-set-properties (point-min) (point-max)))
+ ;; Redisplay the tool bar.
+ (force-mode-line-update))
+
(provide 'dired)
(run-hooks 'dired-load-hook) ; for your customizations
;;; Commentary:
;; This file provides code to recognize simple touch screen gestures.
-;; It is used on X and Android, where the platform cannot recognize
-;; them for us.
+;; It is used on X and Android, currently the only systems where Emacs
+;; supports touch input.
;;
-;; See (elisp)Touchscreen Events for a description of the details of touch
-;; events.
+;; See (elisp)Touchscreen Events for a description of the details of
+;; touch events.
;;; Code:
to that window, a field used to store data while tracking the
touch point, the initial position of the touchpoint, and another
four fields to used store data while tracking the touch point.
-See `touch-screen-handle-point-update' for the meanings of the
-fourth element.")
+See `touch-screen-handle-point-update' and
+`touch-screen-handle-point-up' for the meanings of the fifth
+element.")
(defvar touch-screen-set-point-commands '(mouse-set-point)
"List of commands known to set the point.
\f
+;;; Event handling exports. These functions are intended for use by
+;;; Lisp commands bound to touch screen gesture events.
+
+(defun touch-screen-inhibit-drag ()
+ "Inhibit subsequent `touchscreen-drag' events from being sent.
+Prevent `touchscreen-drag' and translated mouse events from being
+sent until the touch sequence currently being translated ends.
+Must be called from a command bound to a `touchscreen-hold' or
+`touchscreen-drag' event."
+ (let* ((tool touch-screen-current-tool)
+ (current-what (nth 4 tool)))
+ ;; Signal an error if no hold or drag is in progress.
+ (when (and (not (eq current-what 'hold)
+ (eq current-what 'drag)))
+ (error "Calling `touch-screen-inhibit-drag' outside hold or drag"))
+ ;; Now set the fourth element of tool to `command-inhibit'.
+ (setcar (nthcdr 3 tool) 'command-inhibit)))
+
+\f
+
(provide 'touch-screen)
;;; touch-screen ends here
projects / emacs.git / commitdiff