-;;; picture.el --- "Picture mode" -- editing using quarter-plane screen model.
+;;; picture.el --- "Picture mode" -- editing using quarter-plane screen model
-;; Copyright (C) 1985, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1994, 2002, 2003, 2004,
+;; 2005 Free Software Foundation, Inc.
;; Author: K. Shane Hartman
;; Maintainer: FSF
+;; Keywords: convenience wp
;; This file is part of GNU Emacs.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
-;; This code provides the picture-mode commands documented in the Emacs
+;; This code provides the picture-mode commands documented in the Emacs
;; manual. The screen is treated as a semi-infinite quarter-plane with
;; support for rectangle operations and `etch-a-sketch' character
;; insertion in any of eight directions.
;;; Code:
-(defvar picture-rectangle-ctl ?+
- "*Character picture-draw-rectangle uses for top left corners.")
-(defvar picture-rectangle-ctr ?+
- "*Character picture-draw-rectangle uses for top right corners.")
-(defvar picture-rectangle-cbr ?+
- "*Character picture-draw-rectangle uses for bottom right corners.")
-(defvar picture-rectangle-cbl ?+
- "*Character picture-draw-rectangle uses for bottom left corners.")
-(defvar picture-rectangle-v ?|
- "*Character picture-draw-rectangle uses for vertical lines.")
-(defvar picture-rectangle-h ?-
- "*Character picture-draw-rectangle uses for horizontal lines.")
+(defgroup picture nil
+ "Picture mode --- editing using quarter-plane screen model."
+ :prefix "picture-"
+ :group 'editing)
+
+(defcustom picture-rectangle-ctl ?+
+ "*Character `picture-draw-rectangle' uses for top left corners."
+ :type 'character
+ :group 'picture)
+(defcustom picture-rectangle-ctr ?+
+ "*Character `picture-draw-rectangle' uses for top right corners."
+ :type 'character
+ :group 'picture)
+(defcustom picture-rectangle-cbr ?+
+ "*Character `picture-draw-rectangle' uses for bottom right corners."
+ :type 'character
+ :group 'picture)
+(defcustom picture-rectangle-cbl ?+
+ "*Character `picture-draw-rectangle' uses for bottom left corners."
+ :type 'character
+ :group 'picture)
+(defcustom picture-rectangle-v ?|
+ "*Character `picture-draw-rectangle' uses for vertical lines."
+ :type 'character
+ :group 'picture)
+(defcustom picture-rectangle-h ?-
+ "*Character `picture-draw-rectangle' uses for horizontal lines."
+ :type 'character
+ :group 'picture)
+
;; Picture Movement Commands
+;; When a cursor is on a wide-column character (e.g. Chinese,
+;; Japanese, Korean), this variable tells the desired current column
+;; which may be different from (current-column).
+(defvar picture-desired-column 0)
+
+;; If the value of picture-desired-column is far from the current
+;; column, or if the arg ADJUST-TO-CURRENT is non-nil, set it to the
+;; current column. Return the current column.
+(defun picture-update-desired-column (adjust-to-current)
+ (let ((current-column (current-column)))
+ (if (or adjust-to-current
+ (< picture-desired-column (1- current-column))
+ (> picture-desired-column (1+ current-column)))
+ (setq picture-desired-column current-column))
+ current-column))
+
(defun picture-beginning-of-line (&optional arg)
"Position point at the beginning of the line.
With ARG not nil, move forward ARG - 1 lines first.
(interactive "P")
(if arg (forward-line (1- (prefix-numeric-value arg))))
(beginning-of-line)
- ;; This call will go away when Emacs gets real horizontal autoscrolling
- (hscroll-point-visible))
+ (setq picture-desired-column 0))
(defun picture-end-of-line (&optional arg)
"Position point after last non-blank character on current line.
(if arg (forward-line (1- (prefix-numeric-value arg))))
(beginning-of-line)
(skip-chars-backward " \t" (prog1 (point) (end-of-line)))
- ;; This call will go away when Emacs gets real horizontal autoscrolling
- (hscroll-point-visible))
+ (setq picture-desired-column (current-column)))
-(defun picture-forward-column (arg)
+(defun picture-forward-column (arg &optional interactive)
"Move cursor right, making whitespace if necessary.
With argument, move that many columns."
- (interactive "p")
- (let ((target-column (+ (current-column) arg)))
- (move-to-column target-column t)
- ;; Picture mode isn't really suited to multi-column characters,
- ;; but we might as well let the user move across them.
- (and (< arg 0)
- (> (current-column) target-column)
- (forward-char -1))))
-
-(defun picture-backward-column (arg)
+ (interactive "p\nd")
+ (let (deactivate-mark)
+ (picture-update-desired-column interactive)
+ (setq picture-desired-column (max 0 (+ picture-desired-column arg)))
+ (let ((current-column (move-to-column picture-desired-column t)))
+ (if (and (> current-column picture-desired-column)
+ (< arg 0))
+ ;; It seems that we have just tried to move to the right
+ ;; column of a multi-column character.
+ (forward-char -1)))))
+
+(defun picture-backward-column (arg &optional interactive)
"Move cursor left, making whitespace if necessary.
With argument, move that many columns."
- (interactive "p")
+ (interactive "p\nd")
+ (picture-update-desired-column interactive)
(picture-forward-column (- arg)))
(defun picture-move-down (arg)
"Move vertically down, making whitespace if necessary.
With argument, move that many lines."
(interactive "p")
- (let ((col (current-column)))
+ (let (deactivate-mark)
+ (picture-update-desired-column nil)
(picture-newline arg)
- (move-to-column col t)))
+ (let ((current-column (move-to-column picture-desired-column t)))
+ (if (> current-column picture-desired-column)
+ (forward-char -1)))))
-(defconst picture-vertical-step 0
+(defvar picture-vertical-step 0
"Amount to move vertically after text character in Picture mode.")
-(defconst picture-horizontal-step 1
+(defvar picture-horizontal-step 1
"Amount to move horizontally after text character in Picture mode.")
(defun picture-move-up (arg)
"Move vertically up, making whitespace if necessary.
With argument, move that many lines."
(interactive "p")
+ (picture-update-desired-column nil)
(picture-move-down (- arg)))
(defun picture-movement-right ()
(interactive)
(picture-set-motion 1 0))
-(defun picture-movement-nw ()
- "Move up and left after self-inserting character in Picture mode."
- (interactive)
- (picture-set-motion -1 -1))
+(defun picture-movement-nw (&optional arg)
+ "Move up and left after self-inserting character in Picture mode.
+With prefix argument, move up and two-column left."
+ (interactive "P")
+ (picture-set-motion -1 (if arg -2 -1)))
-(defun picture-movement-ne ()
- "Move up and right after self-inserting character in Picture mode."
- (interactive)
- (picture-set-motion -1 1))
+(defun picture-movement-ne (&optional arg)
+ "Move up and right after self-inserting character in Picture mode.
+With prefix argument, move up and two-column right."
+ (interactive "P")
+ (picture-set-motion -1 (if arg 2 1)))
-(defun picture-movement-sw ()
- "Move down and left after self-inserting character in Picture mode."
- (interactive)
- (picture-set-motion 1 -1))
+(defun picture-movement-sw (&optional arg)
+ "Move down and left after self-inserting character in Picture mode.
+With prefix argument, move down and two-column left."
+ (interactive "P")
+ (picture-set-motion 1 (if arg -2 -1)))
-(defun picture-movement-se ()
- "Move down and right after self-inserting character in Picture mode."
- (interactive)
- (picture-set-motion 1 1))
+(defun picture-movement-se (&optional arg)
+ "Move down and right after self-inserting character in Picture mode.
+With prefix argument, move down and two-column right."
+ (interactive "P")
+ (picture-set-motion 1 (if arg 2 1)))
(defun picture-set-motion (vert horiz)
"Set VERTICAL and HORIZONTAL increments for movement in Picture mode.
picture-horizontal-step horiz)
(setq mode-name
(format "Picture:%s"
- (car (nthcdr (+ 1 (% horiz 2) (* 3 (1+ (% vert 2))))
- '(nw up ne left none right sw down se)))))
+ (nth (+ 2 (% horiz 3) (* 5 (1+ (% vert 2))))
+ '(wnw nw up ne ene Left left none right Right
+ wsw sw down se ese))))
(force-mode-line-update)
(message ""))
(defun picture-move ()
"Move in direction of `picture-vertical-step' and `picture-horizontal-step'."
- (picture-move-down picture-vertical-step)
- (picture-forward-column picture-horizontal-step))
+ (if (/= picture-vertical-step 0)
+ (picture-move-down picture-vertical-step))
+ (if (/= picture-horizontal-step 0)
+ (picture-forward-column picture-horizontal-step)))
(defun picture-motion (arg)
"Move point in direction of current picture motion in Picture mode.
"Move point in direction opposite of current picture motion in Picture mode.
With ARG do it that many times. Useful for delineating rectangles in
conjunction with diagonal picture motion.
-Do \\[command-apropos] `picture-movement' to see commands which control motion."
+Do \\[command-apropos] picture-movement to see commands which control motion."
(interactive "p")
(picture-motion (- arg)))
+(defun picture-mouse-set-point (event)
+ "Move point to the position clicked on, making whitespace if necessary."
+ (interactive "e")
+ (let* ((pos (posn-col-row (event-start event)))
+ (x (car pos))
+ (y (cdr pos))
+ (current-row (count-lines (window-start) (line-beginning-position))))
+ (unless (equal x (current-column))
+ (picture-forward-column (- x (current-column))))
+ (unless (equal y current-row)
+ (picture-move-down (- y current-row)))))
+
\f
;; Picture insertion and deletion.
(defun picture-insert (ch arg)
- (while (> arg 0)
- (setq arg (1- arg))
- (move-to-column (1+ (current-column)) t)
- (delete-char -1)
- (insert ch)
- (forward-char -1)
- (picture-move)))
+ (let* ((width (char-width ch))
+ ;; We must be sure that the succeeding insertion won't delete
+ ;; the just inserted character.
+ (picture-horizontal-step
+ (if (and (= picture-vertical-step 0)
+ (> width 1)
+ (< (abs picture-horizontal-step) 2))
+ (* picture-horizontal-step 2)
+ picture-horizontal-step)))
+ (while (> arg 0)
+ (setq arg (1- arg))
+ (if (/= picture-desired-column (current-column))
+ (move-to-column picture-desired-column t))
+ (let ((col (+ picture-desired-column width)))
+ (or (eolp)
+ (let ((pos (point)))
+ (move-to-column col t)
+ (delete-region pos (point)))))
+ (insert ch)
+ (forward-char -1)
+ (picture-move))))
(defun picture-self-insert (arg)
"Insert this character in place of character previously at the cursor.
with the commands `picture-movement-right', `picture-movement-up', etc.
Do \\[command-apropos] `picture-movement' to see those commands."
(interactive "p")
+ (picture-update-desired-column (not (eq this-command last-command)))
(picture-insert last-command-event arg)) ; Always a character in this case.
(defun picture-clear-column (arg)
"Clear out ARG columns after point without moving."
(interactive "p")
- (let* ((opoint (point))
- (original-col (current-column))
- (target-col (+ original-col arg)))
+ (let* ((original-col (current-column))
+ (target-col (max 0 (+ original-col arg)))
+ pos)
(move-to-column target-col t)
- (delete-region opoint (point))
+ (setq pos (point))
+ (move-to-column original-col)
+ (delete-region pos (point))
(save-excursion
- (indent-to (max target-col original-col)))))
+ (indent-to (max target-col original-col))))
+ (setq picture-desired-column (current-column)))
(defun picture-backward-clear-column (arg)
"Clear out ARG columns before point, moving back over them."
(while (> arg 0)
(end-of-line)
(if (eobp) (newline) (forward-char 1))
- (setq arg (1- arg))))
- ;; This call will go away when Emacs gets real horizontal autoscrolling
- (hscroll-point-visible))
+ (setq arg (1- arg)))))
(defun picture-open-line (arg)
"Insert an empty line after the current line.
(interactive "p")
(save-excursion
(end-of-line)
- (open-line arg))
- ;; This call will go away when Emacs gets real horizontal autoscrolling
- (hscroll-point-visible))
+ (open-line arg)))
(defun picture-duplicate-line ()
"Insert a duplicate of the current line, below it."
(point))))
(replace-match newtext fixedcase literal)
(if (< change 0)
- (insert-char ?\ (- change)))))
+ (insert-char ?\s (- change)))))
\f
;; Picture Tabs
-(defvar picture-tab-chars "!-~"
- "*A character set which controls behavior of commands
+(defcustom picture-tab-chars "!-~"
+ "*A character set which controls behavior of commands.
\\[picture-set-tab-stops] and \\[picture-tab-search]. It is NOT a
regular expression, any regexp special characters will be quoted.
It defines a set of \"interesting characters\" to look for when setting
character `\\' in the set it must be preceded by itself: \"\\\\\".
The command \\[picture-tab-search] is defined to move beneath (or to) a
-character belonging to this set independent of the tab stops list.")
+character belonging to this set independent of the tab stops list."
+ :type 'string
+ :group 'picture)
(defun picture-set-tab-stops (&optional arg)
"Set value of `tab-stop-list' according to context of this line.
(skip-chars-forward " \t")
(setq tabs (cons (current-column) tabs)))
(if (null tabs)
- (error "No characters in set %s on this line."
+ (error "No characters in set %s on this line"
(regexp-quote picture-tab-chars))))))
(setq tab-stop-list tabs)
(let ((blurb (make-string (1+ (nth (1- (length tabs)) tabs)) ?\ )))
\f
;; Picture Rectangles
-(defconst picture-killed-rectangle nil
+(defvar picture-killed-rectangle nil
"Rectangle killed or copied by \\[picture-clear-rectangle] in Picture mode.
The contents can be retrieved by \\[picture-yank-rectangle]")
point at the other (diagonally opposed) corner."
(interactive "P")
(if (not (consp picture-killed-rectangle))
- (error "No rectangle saved.")
+ (error "No rectangle saved")
(picture-insert-rectangle picture-killed-rectangle insertp)))
(defun picture-yank-at-click (click arg)
(interactive "cRectangle from register: \nP")
(let ((rectangle (get-register register)))
(if (not (consp rectangle))
- (error "Register %c does not contain a rectangle." register)
+ (error "Register %c does not contain a rectangle" register)
(picture-insert-rectangle rectangle insertp))))
(defun picture-insert-rectangle (rectangle &optional insertp)
(top (min r1 r2))
(bottom (max r1 r2)))
(goto-line top)
- (move-to-column left)
+ (move-to-column left t)
+ (picture-update-desired-column t)
(picture-movement-right)
(picture-insert picture-rectangle-ctl 1)
- (picture-insert picture-rectangle-h (- right (current-column)))
+ (picture-insert picture-rectangle-h (- right picture-desired-column))
(picture-movement-down)
(picture-insert picture-rectangle-ctr 1)
(picture-movement-left)
(picture-insert picture-rectangle-cbr 1)
- (picture-insert picture-rectangle-h (- (current-column) left))
+ (picture-insert picture-rectangle-h (- picture-desired-column left))
(picture-movement-up)
(picture-insert picture-rectangle-cbl 1)
\f
;; Picture Keymap, entry and exit points.
-(defconst picture-mode-map nil)
+(defvar picture-mode-map nil)
(defun picture-substitute (oldfun newfun)
- (substitute-key-definition oldfun newfun picture-mode-map global-map))
+ (define-key picture-mode-map (vector 'remap oldfun) newfun))
(if (not picture-mode-map)
(progn
- (setq picture-mode-map (list 'keymap (make-vector 256 nil)))
+ (setq picture-mode-map (make-keymap))
(picture-substitute 'self-insert-command 'picture-self-insert)
(picture-substitute 'completion-separator-self-insert-command
'picture-self-insert)
(picture-substitute 'previous-line 'picture-move-up)
(picture-substitute 'beginning-of-line 'picture-beginning-of-line)
(picture-substitute 'end-of-line 'picture-end-of-line)
+ (picture-substitute 'mouse-set-point 'picture-mouse-set-point)
(define-key picture-mode-map "\C-c\C-d" 'delete-char)
(define-key picture-mode-map "\e\t" 'picture-toggle-tab-state)
(define-key picture-mode-map "\C-c`" 'picture-movement-nw)
(define-key picture-mode-map "\C-c'" 'picture-movement-ne)
(define-key picture-mode-map "\C-c/" 'picture-movement-sw)
- (define-key picture-mode-map "\C-c\\" 'picture-movement-se)))
-
-(defvar picture-mode-hook nil
+ (define-key picture-mode-map "\C-c\\" 'picture-movement-se)
+ (define-key picture-mode-map [(control ?c) left] 'picture-movement-left)
+ (define-key picture-mode-map [(control ?c) right] 'picture-movement-right)
+ (define-key picture-mode-map [(control ?c) up] 'picture-movement-up)
+ (define-key picture-mode-map [(control ?c) down] 'picture-movement-down)
+ (define-key picture-mode-map [(control ?c) home] 'picture-movement-nw)
+ (define-key picture-mode-map [(control ?c) prior] 'picture-movement-ne)
+ (define-key picture-mode-map [(control ?c) end] 'picture-movement-sw)
+ (define-key picture-mode-map [(control ?c) next] 'picture-movement-se)))
+
+(defcustom picture-mode-hook nil
"If non-nil, its value is called on entry to Picture mode.
-Picture mode is invoked by the command \\[picture-mode].")
+Picture mode is invoked by the command \\[picture-mode]."
+ :type 'hook
+ :group 'picture)
(defvar picture-mode-old-local-map)
(defvar picture-mode-old-mode-name)
C-c ' Move northeast (ne) after insertion.
C-c / Move southwest (sw) after insertion.
C-c \\ Move southeast (se) after insertion.
+ C-u C-c ` Move westnorthwest (wnw) after insertion.
+ C-u C-c ' Move eastnortheast (ene) after insertion.
+ C-u C-c / Move westsouthwest (wsw) after insertion.
+ C-u C-c \\ Move eastsoutheast (ese) after insertion.
The current direction is displayed in the mode line. The initial
direction is right. Whitespace is inserted and tabs are changed to
spaces when required by movement. You can move around in the buffer
C-c C-r Draw a rectangular box around mark and point.
\\[copy-rectangle-to-register] Copies a rectangle to a register.
\\[advertised-undo] Can undo effects of rectangle overlay commands
- commands if invoked soon enough.
+ if invoked soon enough.
You can return to the previous mode with:
C-c C-c Which also strips trailing whitespace from every line.
Stripping is suppressed by supplying an argument.
-Entry to this mode calls the value of picture-mode-hook if non-nil.
+Entry to this mode calls the value of `picture-mode-hook' if non-nil.
Note that Picture mode commands will work outside of Picture mode, but
they are not defaultly assigned to keys."
(interactive)
(if (eq major-mode 'picture-mode)
- (error "You are already editing a picture.")
- (make-local-variable 'picture-mode-old-local-map)
- (setq picture-mode-old-local-map (current-local-map))
+ (error "You are already editing a picture")
+ (set (make-local-variable 'picture-mode-old-local-map) (current-local-map))
(use-local-map picture-mode-map)
- (make-local-variable 'picture-mode-old-mode-name)
- (setq picture-mode-old-mode-name mode-name)
- (make-local-variable 'picture-mode-old-major-mode)
- (setq picture-mode-old-major-mode major-mode)
+ (set (make-local-variable 'picture-mode-old-mode-name) mode-name)
+ (set (make-local-variable 'picture-mode-old-major-mode) major-mode)
(setq major-mode 'picture-mode)
- (make-local-variable 'picture-killed-rectangle)
- (setq picture-killed-rectangle nil)
- (make-local-variable 'tab-stop-list)
- (setq tab-stop-list (default-value 'tab-stop-list))
- (make-local-variable 'picture-tab-chars)
- (setq picture-tab-chars (default-value 'picture-tab-chars))
+ (set (make-local-variable 'picture-killed-rectangle) nil)
+ (set (make-local-variable 'tab-stop-list) (default-value 'tab-stop-list))
+ (set (make-local-variable 'picture-tab-chars)
+ (default-value 'picture-tab-chars))
(make-local-variable 'picture-vertical-step)
(make-local-variable 'picture-horizontal-step)
- (make-local-variable 'picture-mode-old-truncate-lines)
- (setq picture-mode-old-truncate-lines truncate-lines)
+ (set (make-local-variable 'picture-mode-old-truncate-lines) truncate-lines)
(setq truncate-lines t)
(picture-set-motion 0 1)
(defalias 'edit-picture 'picture-mode)
(defun picture-mode-exit (&optional nostrip)
- "Undo picture-mode and return to previous major mode.
+ "Undo `picture-mode' and return to previous major mode.
With no argument strips whitespace from end of every line in Picture buffer
otherwise just return to previous mode."
(interactive "P")
(if (not (eq major-mode 'picture-mode))
- (error "You aren't editing a Picture.")
- (if (not nostrip) (picture-clean))
+ (error "You aren't editing a Picture")
+ (if (not nostrip) (delete-trailing-whitespace))
(setq mode-name picture-mode-old-mode-name)
(use-local-map picture-mode-old-local-map)
(setq major-mode picture-mode-old-major-mode)
(setq truncate-lines picture-mode-old-truncate-lines)
(force-mode-line-update)))
-(defun picture-clean ()
- "Eliminate whitespace at ends of lines."
- (save-excursion
- (goto-char (point-min))
- (while (re-search-forward "[ \t][ \t]*$" nil t)
- (delete-region (match-beginning 0) (point)))))
-
(provide 'picture)
+;;; arch-tag: e452d08d-a470-4fbf-896e-ea276698d1ca
;;; picture.el ends here
HCoop / bpt / emacs.git / blobdiff