;;; terminal.el --- terminal emulator for GNU Emacs
-;; Copyright (C) 1986,87,88,89,93,94 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1987, 1988, 1989, 1993, 1994, 2001, 2002, 2003,
+;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
;; Author: Richard Mlynarik <mly@eddie.mit.edu>
;; Maintainer: FSF
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; 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.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
(use-local-map terminal-escape-map)
(setq s (read-key-sequence
(if current-prefix-arg
- (format "Emacs Terminal escape> %d "
+ (format "Emacs Terminal escape[%s for help]> %d "
+ (substitute-command-keys
+ "\\<terminal-escape-map>\\[te-escape-help]")
(prefix-numeric-value current-prefix-arg))
- "Emacs Terminal escape> "))))
+ (format "Emacs Terminal escape[%s for help]> "
+ (substitute-command-keys
+ "\\<terminal-escape-map>\\[te-escape-help]"))))))
(use-global-map global)
(use-local-map local))
(progn
(and terminal-more-processing (null (cdr te-pending-output))
(te-set-more-count nil))
- (send-string te-process (make-string 1 last-input-char))
+ (process-send-string te-process (make-string 1 last-input-char))
(te-process-output t))
(message "Function key `%s' ignored"
(single-key-description last-input-char))))))
(setq mode-name "Terminal Edit")
(setq mode-line-modified (default-value 'mode-line-modified))
(setq mode-line-process nil)
- (run-hooks 'terminal-edit-mode-hook))
+ (run-mode-hooks 'terminal-edit-mode-hook))
(defun te-edit ()
"Start editing the terminal emulator buffer with ordinary Emacs commands."
(let ((p (point)))
(cond ((search-forward "\n" (+ p width) 'move)
(forward-char -1)
- (insert-char ?\ (- width (- (point) p)))
+ (insert-char ?\s (- width (- (point) p)))
(forward-char 1))
((eobp)
- (insert-char ?\ (- width (- (point) p))))
+ (insert-char ?\s (- width (- (point) p))))
((= (following-char) ?\n)
(forward-char 1))
(t
(forward-char 1)
(delete-region (point)
(+ (point) (length terminal-more-break-insertion)))
- (insert-char ?\ te-width)
+ (insert-char ?\s te-width)
(goto-char te-more-old-point)))
(setq te-more-old-point nil)
(let ((te-more-count 259259))
(insert ?\n))))
(forward-char 1)
(delete-region (point) (+ (point) te-width)))
- (insert-char ?\ te-width)
+ (insert-char ?\s te-width)
(beginning-of-line)
(te-set-window-start))
(save-excursion
(let ((n (- (point) (progn (end-of-line) (point)))))
(delete-region (point) (+ (point) n))
- (insert-char ?\ (- n)))))
+ (insert-char ?\s (- n)))))
;; ^p C
(while (progn (end-of-line) (not (eobp)))
(forward-char 1) (end-of-line)
(delete-region (- (point) te-width) (point))
- (insert-char ?\ te-width))))
+ (insert-char ?\s te-width))))
;; ^p ^l
(let ((i 0))
(while (< i te-height)
(setq i (1+ i))
- (insert-char ?\ te-width)
+ (insert-char ?\s te-width)
(insert ?\n)))
(delete-region (1- (point-max)) (point-max))
(goto-char (point-min))
();(error "fooI")
(save-excursion
(let* ((line (- te-height (/ (- (point) (point-min)) (1+ te-width)) -1))
- (n (min (- (te-get-char) ?\ ) line))
+ (n (min (- (te-get-char) ?\s) line))
(i 0))
(delete-region (- (point-max) (* n (1+ te-width))) (point-max))
(if (eq (point) (point-max)) (insert ?\n))
(while (< i n)
(setq i (1+ i))
- (insert-char ?\ te-width)
+ (insert-char ?\s te-width)
(or (eq i line) (insert ?\n))))))
(setq te-more-count -1))
(if (not (bolp))
();(error "fooD")
(let* ((line (- te-height (/ (- (point) (point-min)) (1+ te-width)) -1))
- (n (min (- (te-get-char) ?\ ) line))
+ (n (min (- (te-get-char) ?\s) line))
(i 0))
(delete-region (point)
(min (+ (point) (* n (1+ te-width))) (point-max)))
(goto-char (point-max))
(while (< i n)
(setq i (1+ i))
- (insert-char ?\ te-width)
+ (insert-char ?\s te-width)
(or (eq i line) (insert ?\n))))))
(setq te-more-count -1))
(if (bolp)
()
(delete-region (1- (point)) (point))
- (insert ?\ )
+ (insert ?\s)
(forward-char -1)))
;; ^p ^g
nil
(delete-char (- n))
(goto-char p)
- (insert-char ?\ n))
+ (insert-char ?\s n))
(goto-char p)))
;; ^p d count+32 (should be ^p ^d but cretinous un*x won't send ^d chars!!!)
(- (progn (end-of-line) (point)) p))))
(if (<= n 0)
nil
- (insert-char ?\ n)
+ (insert-char ?\s n)
(goto-char p)
(delete-char n))
(goto-char p)))
(delete-char 1)
(goto-char (point-max))
(insert ?\n)
- (insert-char ?\ te-width)
+ (insert-char ?\s te-width)
(beginning-of-line))
(forward-line 1))
(move-to-column column))
`Meta' characters may not currently be sent through the terminal emulator.
-Here is a list of some of the variables which control the behaviour
+Here is a list of some of the variables which control the behavior
of the emulator -- see their documentation for more information:
terminal-escape-char, terminal-scrolling, terminal-more-processing,
terminal-redisplay-interval.
(getenv "SHELL")
"/bin/sh"))
(s (read-string
- (format "Run program in emulator: (default %s) "
+ (format "Run program in emulator (default %s): "
default-s))))
(if (equal s "")
(list default-s '())
(setq inhibit-quit t) ;sport death
(use-local-map terminal-map)
(run-hooks 'terminal-mode-hook)
- (message "Entering emacs terminal-emulator... Type %s %s for help"
+ (message "Entering Emacs terminal-emulator... Type %s %s for help"
(single-key-description terminal-escape-char)
(mapconcat 'single-key-description
(where-is-internal 'te-escape-help terminal-escape-map t)
(defun te-create-terminfo ()
"Create and compile a terminfo entry for the virtual terminal. This is kept
in the directory specified by `te-terminfo-directory'."
- (if (and system-uses-terminfo
- (not (file-exists-p (concat te-terminfo-directory
- (substring te-terminal-name-prefix 0 1)
- "/" te-terminal-name))))
+ (when (and system-uses-terminfo
+ (not (file-exists-p (concat te-terminfo-directory
+ (substring te-terminal-name-prefix 0 1)
+ "/" te-terminal-name))))
(let ( (terminfo
(concat
;; The first newline avoids trouble with ncurses.
"dch=^Pd%p1%'\\s'%+%c, dch1=^Pd!, dl=^P^K%p1%'\\s'%+%c,"
"dl1=^P^K!, ed=^PC, el=^Pc, home=^P=\\s\\s,"
"ich=^P_%p1%'\\s'%+%c, ich1=^P_!, il=^P^O%p1%'\\s'%+%c,"
+ ;; The last newline avoids trouble with ncurses.
"il1=^P^O!, ind=^P\\n, nel=\\n,\n"))
- ;; The last newline avoids trouble with ncurses.
+ ;; This is the desired name for the source file.
(file-name (concat te-terminfo-directory te-terminal-name ".tif")) )
(make-directory te-terminfo-directory t)
- (save-excursion
- (set-buffer (create-file-buffer file-name))
- (insert terminfo)
- (write-file file-name)
- (kill-buffer nil)
- )
- (let ( (process-environment
- (cons (concat "TERMINFO="
- (directory-file-name te-terminfo-directory))
- process-environment)) )
+ (let ((temp-file
+ (make-temp-file (expand-file-name "tif" te-terminfo-directory))))
+ ;; Store the source file under a random temp name.
+ (with-temp-file temp-file
+ (insert terminfo))
+ ;; Rename it to the desired name.
+ ;; We use this roundabout approach
+ ;; to avoid any risk of writing a name that
+ ;; was michievouslyt set up as a symlink.
+ (rename-file temp-file file-name))
+ ;; Now compile that source to make the binary that the
+ ;; programs actually use.
+ (let ((process-environment
+ (cons (concat "TERMINFO="
+ (directory-file-name te-terminfo-directory))
+ process-environment)))
(set-process-sentinel (start-process "tic" nil "tic" file-name)
'te-tic-sentinel))))
- (directory-file-name te-terminfo-directory)
-)
+ (directory-file-name te-terminfo-directory))
(defun te-create-termcap ()
"Create a termcap entry for the virtual terminal"
(provide 'terminal)
+;; arch-tag: 0ae1d7d7-90ef-4566-a531-6e7ff8c79b2f
;;; terminal.el ends here