;;; Author: Per Bothner <bothner@cygnus.com>
;;; Based on comint mode written by: Olin Shivers <shivers@cs.cmu.edu>
-;;; Keyword: processes
+;;; Keywords: processes
+
+;; This file is part of GNU Emacs.
+
+;; 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.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; 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.
;;; Dir/Hostname tracking and ANSI colorization by
;;; Marco Melgazzi <marco@techie.com>.
;; so it is important to increase it if there are protocol-relevant changes.
(defconst term-protocol-version "0.95")
+(eval-when-compile
+ (require 'ange-ftp))
(require 'ring)
(require 'ehelp)
whitespace). See `term-arguments'.
Defaults to the empty list.
-For shells, a good value is (?\\| ?& ?< ?> ?\\( ?\\) ?;).
+For shells, a good value is (?\\| ?& ?< ?> ?\\( ?\\) ?\\;).
This is a good thing to set in mode hooks.")
(put 'term-scroll-show-maximum-output 'permanent-local t)
(put 'term-ptyp 'permanent-local t)
-;; Do FORMS if running under Emacs-19.
+;; Do FORMS if running under Emacs 19 or later.
(defmacro term-if-emacs19 (&rest forms)
- (if (string-match "^19" emacs-version) (cons 'progn forms)))
+ (if (string-match "^\\(19\\|[2-9][0-9]\\)" emacs-version)
+ (cons 'progn forms)))
;; True if running under XEmacs (previously Lucid Emacs).
(defmacro term-is-xemacs () '(string-match "Lucid" emacs-version))
;; Do FORM if running under XEmacs (previously Lucid Emacs).
;;; faces -mm
+(defmacro term-ignore-error (&rest body)
+ `(condition-case nil
+ (progn ,@body)
+ (error nil)))
-(defvar term-default-fg-color "azure3")
-(defvar term-default-bg-color "SkyBlue4")
+(defvar term-default-fg-color nil)
+(defvar term-default-bg-color nil)
+(when (fboundp 'make-face)
;;; --- Simple faces ---
-(make-face 'term-default-fg)
-(make-face 'term-default-bg)
-(make-face 'term-default-fg-inv)
-(make-face 'term-default-bg-inv)
-(make-face 'term-bold)
-(make-face 'term-underline)
-(make-face 'term-invisible)
-(make-face 'term-invisible-inv)
-
-(copy-face 'default 'term-default-fg)
-(copy-face 'default 'term-default-bg)
-(set-face-foreground 'term-default-fg term-default-fg-color)
-(set-face-background 'term-default-bg term-default-bg-color)
-
-(copy-face 'default 'term-default-fg-inv)
-(copy-face 'default 'term-default-bg-inv)
-(set-face-foreground 'term-default-fg-inv term-default-bg-color)
-(set-face-background 'term-default-bg-inv term-default-fg-color)
-
-(copy-face 'default 'term-invisible)
-(set-face-background 'term-invisible term-default-bg-color)
-(set-face-background 'term-invisible term-default-bg-color)
-
-(copy-face 'default 'term-invisible-inv)
-(set-face-background 'term-invisible-inv term-default-fg-color)
-(set-face-background 'term-invisible-inv term-default-fg-color)
-
-(copy-face 'default 'term-bold)
-(make-face-bold 'term-bold)
-
-(copy-face 'default 'term-underline)
-(set-face-underline-p 'term-underline t)
+ (copy-face 'default 'term-default)
+ (make-face 'term-default-fg)
+ (make-face 'term-default-bg)
+ (make-face 'term-default-fg-inv)
+ (make-face 'term-default-bg-inv)
+ (make-face 'term-bold)
+ (make-face 'term-underline)
+ (make-face 'term-invisible)
+ (make-face 'term-invisible-inv)
+
+ (copy-face 'default 'term-default-fg)
+ (copy-face 'default 'term-default-bg)
+ (term-ignore-error
+ (set-face-foreground 'term-default-fg term-default-fg-color))
+ (term-ignore-error
+ (set-face-background 'term-default-bg term-default-bg-color))
+
+ (copy-face 'default 'term-default-fg-inv)
+ (copy-face 'default 'term-default-bg-inv)
+ (term-ignore-error
+ (set-face-foreground 'term-default-fg-inv term-default-bg-color))
+ (term-ignore-error
+ (set-face-background 'term-default-bg-inv term-default-fg-color))
+
+ (copy-face 'default 'term-invisible)
+ (term-ignore-error
+ (set-face-background 'term-invisible term-default-bg-color))
+
+ (copy-face 'default 'term-invisible-inv)
+ (term-ignore-error
+ (set-face-background 'term-invisible-inv term-default-fg-color))
+
+ (copy-face 'default 'term-bold)
+ (copy-face 'default 'term-underline)
+
+ ;; Set the colors of the new faces.
+ (term-ignore-error
+ (make-face-bold 'term-bold))
+
+ (term-ignore-error
+ (set-face-underline-p 'term-underline t))
;;; --- Fg faces ---
-(make-face 'term-black)
-(make-face 'term-red)
-(make-face 'term-green)
-(make-face 'term-yellow)
-(make-face 'term-blue)
-(make-face 'term-magenta)
-(make-face 'term-cyan)
-(make-face 'term-white)
-
-(copy-face 'default 'term-black)
-(set-face-foreground 'term-black "black")
-(copy-face 'default 'term-red)
-(set-face-foreground 'term-red "red")
-(copy-face 'default 'term-green)
-(set-face-foreground 'term-green "green")
-(copy-face 'default 'term-yellow)
-(set-face-foreground 'term-yellow "yellow")
-(copy-face 'default 'term-blue)
-(set-face-foreground 'term-blue "blue")
-(copy-face 'default 'term-magenta)
-(set-face-foreground 'term-magenta "magenta")
-(copy-face 'default 'term-cyan)
-(set-face-foreground 'term-cyan "cyan")
-(copy-face 'default 'term-white)
-(set-face-foreground 'term-white "white")
+ (make-face 'term-black)
+ (make-face 'term-red)
+ (make-face 'term-green)
+ (make-face 'term-yellow)
+ (make-face 'term-blue)
+ (make-face 'term-magenta)
+ (make-face 'term-cyan)
+ (make-face 'term-white)
+
+ (copy-face 'default 'term-black)
+ (term-ignore-error
+ (set-face-foreground 'term-black "black"))
+ (copy-face 'default 'term-red)
+ (term-ignore-error
+ (set-face-foreground 'term-red "red"))
+ (copy-face 'default 'term-green)
+ (term-ignore-error
+ (set-face-foreground 'term-green "green"))
+ (copy-face 'default 'term-yellow)
+ (term-ignore-error
+ (set-face-foreground 'term-yellow "yellow"))
+ (copy-face 'default 'term-blue)
+ (term-ignore-error
+ (set-face-foreground 'term-blue "blue"))
+ (copy-face 'default 'term-magenta)
+ (term-ignore-error
+ (set-face-foreground 'term-magenta "magenta"))
+ (copy-face 'default 'term-cyan)
+ (term-ignore-error
+ (set-face-foreground 'term-cyan "cyan"))
+ (copy-face 'default 'term-white)
+ (term-ignore-error
+ (set-face-foreground 'term-white "white"))
;;; --- Bg faces ---
-(make-face 'term-blackbg)
-(make-face 'term-redbg)
-(make-face 'term-greenbg)
-(make-face 'term-yellowbg)
-(make-face 'term-bluebg)
-(make-face 'term-magentabg)
-(make-face 'term-cyanbg)
-(make-face 'term-whitebg)
-
-(copy-face 'default 'term-blackbg)
-(set-face-background 'term-blackbg "black")
-(copy-face 'default 'term-redbg)
-(set-face-background 'term-redbg "red")
-(copy-face 'default 'term-greenbg)
-(set-face-background 'term-greenbg "green")
-(copy-face 'default 'term-yellowbg)
-(set-face-background 'term-yellowbg "yellow")
-(copy-face 'default 'term-bluebg)
-(set-face-background 'term-bluebg "blue")
-(copy-face 'default 'term-magentabg)
-(set-face-background 'term-magentabg "magenta")
-(copy-face 'default 'term-cyanbg)
-(set-face-background 'term-cyanbg "cyan")
-(copy-face 'default 'term-whitebg)
-(set-face-background 'term-whitebg "white")
-
-(setq ansi-term-fg-faces-vector
+ (make-face 'term-blackbg)
+ (make-face 'term-redbg)
+ (make-face 'term-greenbg)
+ (make-face 'term-yellowbg)
+ (make-face 'term-bluebg)
+ (make-face 'term-magentabg)
+ (make-face 'term-cyanbg)
+ (make-face 'term-whitebg)
+
+ (copy-face 'default 'term-blackbg)
+ (term-ignore-error
+ (set-face-background 'term-blackbg "black"))
+ (copy-face 'default 'term-redbg)
+ (term-ignore-error
+ (set-face-background 'term-redbg "red"))
+ (copy-face 'default 'term-greenbg)
+ (term-ignore-error
+ (set-face-background 'term-greenbg "green"))
+ (copy-face 'default 'term-yellowbg)
+ (term-ignore-error
+ (set-face-background 'term-yellowbg "yellow"))
+ (copy-face 'default 'term-bluebg)
+ (term-ignore-error
+ (set-face-background 'term-bluebg "blue"))
+ (copy-face 'default 'term-magentabg)
+ (term-ignore-error
+ (set-face-background 'term-magentabg "magenta"))
+ (copy-face 'default 'term-cyanbg)
+ (term-ignore-error
+ (set-face-background 'term-cyanbg "cyan"))
+ (copy-face 'default 'term-whitebg)
+ (term-ignore-error
+ (set-face-background 'term-whitebg "white")))
+
+(defvar ansi-term-fg-faces-vector
[term-default-fg term-black term-red term-green term-yellow term-blue
term-magenta term-cyan term-white])
-(setq ansi-term-bg-faces-vector
+(defvar ansi-term-bg-faces-vector
[term-default-bg term-blackbg term-redbg term-greenbg term-yellowbg
term-bluebg term-magentabg term-cyanbg term-whitebg])
-(setq ansi-term-inv-bg-faces-vector
+(defvar ansi-term-inv-bg-faces-vector
[term-default-fg-inv term-black term-red term-green term-yellow term-blue
term-magenta term-cyan term-white])
-(setq ansi-term-inv-fg-faces-vector
+(defvar ansi-term-inv-fg-faces-vector
[term-default-bg-inv term-blackbg term-redbg term-greenbg term-yellowbg
term-bluebg term-magentabg term-cyanbg term-whitebg])
[ "Enable paging" term-pager-toggle (not term-pager-count)]
[ "Disable paging" term-pager-toggle term-pager-count])))
+(put 'term-mode 'mode-class 'special)
+
(defun term-mode ()
"Major mode for interacting with an inferior interpreter.
Interpreter name is same as buffer name, sans the asterisks.
(defun term-send-raw-meta ()
(interactive)
- (if (symbolp last-input-char)
+ (let ((char last-input-char))
+ (when (symbolp last-input-char)
;; Convert `return' to C-m, etc.
- (let ((tmp (get last-input-char 'event-symbol-elements)))
- (if tmp
- (setq last-input-char (car tmp)))
- (if (symbolp last-input-char)
- (progn
- (setq tmp (get last-input-char 'ascii-character))
- (if tmp (setq last-input-char tmp))))))
- (term-send-raw-string (if (and (numberp last-input-char)
- (> last-input-char 127)
- (< last-input-char 256))
- (make-string 1 last-input-char)
- (format "\e%c" last-input-char))))
+ (let ((tmp (get char 'event-symbol-elements)))
+ (when tmp
+ (setq char (car tmp)))
+ (when (symbolp char)
+ (setq tmp (get char 'ascii-character))
+ (when tmp
+ (setq char tmp)))))
+ (setq char (event-basic-type char))
+ (term-send-raw-string (if (and (numberp char)
+ (> char 127)
+ (< char 256))
+ (make-string 1 char)
+ (format "\e%c" char)))))
(defun term-mouse-paste (click arg)
"Insert the last stretch of killed text at the position clicked on."
(defun term-send-down () (interactive) (term-send-raw-string "\eOB"))
(defun term-send-right () (interactive) (term-send-raw-string "\eOC"))
(defun term-send-left () (interactive) (term-send-raw-string "\eOD"))
-(defun term-send-home () (interactive) (term-send-raw-string "\e[H"))
-(defun term-send-end () (interactive) (term-send-raw-string "\eOw"))
+(defun term-send-home () (interactive) (term-send-raw-string "\e[1~"))
+(defun term-send-end () (interactive) (term-send-raw-string "\e[4~"))
(defun term-send-prior () (interactive) (term-send-raw-string "\e[5~"))
(defun term-send-next () (interactive) (term-send-raw-string "\e[6~"))
(defun term-send-del () (interactive) (term-send-raw-string "\C-?"))
(format "LINES=%d" term-height)
(format "COLUMNS=%d" term-width))
process-environment))
- (process-connection-type t))
+ (process-connection-type t)
+ ;; We should suppress conversion of end-of-line format.
+ (inhibit-eol-conversion t)
+ )
(apply 'start-process name buffer
"/bin/sh" "-c"
(format "stty -nl echo rows %d columns %d sane 2>/dev/null;\
(defun term-regexp-arg (prompt)
;; Return list of regexp and prefix arg using PROMPT.
- (let* ((minibuffer-history-sexp-flag nil)
- ;; Don't clobber this.
+ (let* (;; Don't clobber this.
(last-command last-command)
(regexp (read-from-minibuffer prompt nil nil nil
'minibuffer-history-search-history)))
(let* ((previous-buffer (current-buffer))
(i 0) char funny count save-point save-marker old-point temp win
(selected (selected-window))
+ last-win
(str-length (length str)))
(unwind-protect
(progn
(cond ((and (>= char ?0) (<= char ?9))
(setq term-terminal-parameter
(+ (* 10 term-terminal-parameter) (- char ?0))))
- ((eq char ?\073 ) ; ?;
+ ((eq char ?\;)
;;; Some modifications to cope with multiple settings like ^[[01;32;43m -mm
(setq term-terminal-more-parameters 1)
(setq term-terminal-previous-parameter-4
;; Scroll each window displaying the buffer but (by default)
;; only if the point matches the process-mark we started with.
(setq win selected)
+ ;; Avoid infinite loop in strange case where minibuffer window
+ ;; is selected but not active.
+ (while (window-minibuffer-p win)
+ (setq win (next-window win nil t)))
+ (setq last-win win)
(while (progn
(setq win (next-window win nil t))
(if (eq (window-buffer win) (process-buffer proc))
(save-excursion
(goto-char (point-max))
(recenter -1)))))
- (not (eq win selected))))
+ (not (eq win last-win))))
;;; Stolen from comint.el and adapted -mm
(if (> term-buffer-maximum-size 0)
;;; have any bold/underline/fg/bg/reverse combination. -mm
(defun term-handle-colors-array (parameter)
- (cond
+ (cond
;;; Bold
- ((eq parameter 1)
- (setq term-ansi-current-bold 1))
+ ((eq parameter 1)
+ (setq term-ansi-current-bold 1))
;;; Underline
- ((eq parameter 4)
- (setq term-ansi-current-underline 1))
+ ((eq parameter 4)
+ (setq term-ansi-current-underline 1))
;;; Blink (unsupported by Emacs), will be translated to bold.
;;; This may change in the future though.
- ((eq parameter 5)
- (setq term-ansi-current-bold 1))
+ ((eq parameter 5)
+ (setq term-ansi-current-bold 1))
;;; Reverse
- ((eq parameter 7)
- (setq term-ansi-current-reverse 1))
+ ((eq parameter 7)
+ (setq term-ansi-current-reverse 1))
;;; Invisible
- ((eq parameter 8)
- (setq term-ansi-current-invisible 1))
+ ((eq parameter 8)
+ (setq term-ansi-current-invisible 1))
- ((and (>= parameter 30) (<= parameter 37))
- (setq term-ansi-current-color (- parameter 29)))
+;;; Foreground
+ ((and (>= parameter 30) (<= parameter 37))
+ (setq term-ansi-current-color (- parameter 29)))
- ((and (>= parameter 40) (<= parameter 47))
- (setq term-ansi-current-bg-color (- parameter 39)))
+;;; Reset foreground
+ ((eq parameter 39)
+ (setq term-ansi-current-color 0))
+
+;;; Background
+ ((and (>= parameter 40) (<= parameter 47))
+ (setq term-ansi-current-bg-color (- parameter 39)))
+
+;;; Reset background
+ ((eq parameter 49)
+ (setq term-ansi-current-bg-color 0))
;;; 0 (Reset) or unknown (reset anyway)
- (t
- (setq term-current-face
- (list 'term-default-fg 'term-default-bg))
- (setq term-ansi-current-underline 0)
- (setq term-ansi-current-bold 0)
- (setq term-ansi-current-reverse 0)
- (setq term-ansi-current-color 0)
- (setq term-ansi-current-invisible 0)
- (setq term-ansi-face-alredy-done 1)
- (setq term-ansi-current-bg-color 0)))
+ (t
+ (setq term-current-face
+ (list 'term-default-fg 'term-default-bg))
+ (setq term-ansi-current-underline 0)
+ (setq term-ansi-current-bold 0)
+ (setq term-ansi-current-reverse 0)
+ (setq term-ansi-current-color 0)
+ (setq term-ansi-current-invisible 0)
+ (setq term-ansi-face-alredy-done 1)
+ (setq term-ansi-current-bg-color 0)))
; (message "Debug: U-%d R-%d B-%d I-%d D-%d F-%d B-%d"
; term-ansi-current-underline
; term-ansi-current-bg-color)
- (if (= term-ansi-face-alredy-done 0)
- (if (= term-ansi-current-reverse 1)
- (progn
- (if (= term-ansi-current-invisible 1)
- (if (= term-ansi-current-color 0)
- (setq term-current-face
- '(term-default-bg-inv term-default-fg))
- (setq term-current-face
- (list (elt ansi-term-inv-fg-faces-vector term-ansi-current-color)
- (elt ansi-term-inv-bg-faces-vector term-ansi-current-color))))
- ;; No need to bother with anything else if it's invisible
- (progn
- (setq term-current-face
- (list (elt ansi-term-inv-fg-faces-vector term-ansi-current-color)
- (elt ansi-term-inv-bg-faces-vector term-ansi-current-bg-color)))
- (if (= term-ansi-current-bold 1)
- (setq term-current-face
- (append '(term-bold) term-current-face)))
- (if (= term-ansi-current-underline 1)
- (setq term-current-face
- (append '(term-underline) term-current-face))))))
- (progn
- (if (= term-ansi-current-invisible 1)
- (if (= term-ansi-current-bg-color 0)
- (setq term-current-face
- '(term-default-fg-inv term-default-bg))
- (setq term-current-face
- (list (elt ansi-term-fg-faces-vector term-ansi-current-bg-color)
- (elt ansi-term-bg-faces-vector term-ansi-current-bg-color))))
- ;; No need to bother with anything else if it's invisible
- (progn
- (setq term-current-face
- (list (elt ansi-term-fg-faces-vector term-ansi-current-color)
- (elt ansi-term-bg-faces-vector term-ansi-current-bg-color)))
- (if (= term-ansi-current-bold 1)
- (setq term-current-face
- (append '(term-bold) term-current-face)))
- (if (= term-ansi-current-underline 1)
- (setq term-current-face
- (append '(term-underline) term-current-face))))))))
+ (if (= term-ansi-face-alredy-done 0)
+ (if (= term-ansi-current-reverse 1)
+ (progn
+ (if (= term-ansi-current-invisible 1)
+ (if (= term-ansi-current-color 0)
+ (setq term-current-face
+ '(term-default-bg-inv term-default-fg))
+ (setq term-current-face
+ (list (elt ansi-term-inv-fg-faces-vector term-ansi-current-color)
+ (elt ansi-term-inv-bg-faces-vector term-ansi-current-color))))
+ ;; No need to bother with anything else if it's invisible
+ (progn
+ (setq term-current-face
+ (list (elt ansi-term-inv-fg-faces-vector term-ansi-current-color)
+ (elt ansi-term-inv-bg-faces-vector term-ansi-current-bg-color)))
+ (if (= term-ansi-current-bold 1)
+ (setq term-current-face
+ (append '(term-bold) term-current-face)))
+ (if (= term-ansi-current-underline 1)
+ (setq term-current-face
+ (append '(term-underline) term-current-face))))))
+ (if (= term-ansi-current-invisible 1)
+ (if (= term-ansi-current-bg-color 0)
+ (setq term-current-face
+ '(term-default-fg-inv term-default-bg))
+ (setq term-current-face
+ (list (elt ansi-term-fg-faces-vector term-ansi-current-bg-color)
+ (elt ansi-term-bg-faces-vector term-ansi-current-bg-color))))
+ ;; No need to bother with anything else if it's invisible
+ (setq term-current-face
+ (list (elt ansi-term-fg-faces-vector term-ansi-current-color)
+ (elt ansi-term-bg-faces-vector term-ansi-current-bg-color)))
+ (if (= term-ansi-current-bold 1)
+ (setq term-current-face
+ (append '(term-bold) term-current-face)))
+ (if (= term-ansi-current-underline 1)
+ (setq term-current-face
+ (append '(term-underline) term-current-face))))))
; (message "Debug %S" term-current-face)
- (setq term-ansi-face-alredy-done 0))
+ (setq term-ansi-face-alredy-done 0))
;;; Handle a character assuming (eq terminal-state 2) -
;;; Modified to allow ansi coloring -mm
;; \E[m - Set/reset standard mode
((eq char ?m)
- (progn
-; (message "Debug: Current param stack 4)%d 3)%d 2)%d 1)%d 0)%d"
-; term-terminal-previous-parameter-4
-; term-terminal-previous-parameter-3
-; term-terminal-previous-parameter-2
-; term-terminal-previous-parameter
-; term-terminal-parameter)
-
- (if (= term-terminal-more-parameters 1)
- (progn (if (>= term-terminal-previous-parameter-4 0)
- (term-handle-colors-array term-terminal-previous-parameter-4))
- (if (>= term-terminal-previous-parameter-3 0)
- (term-handle-colors-array term-terminal-previous-parameter-3))
- (if (>= term-terminal-previous-parameter-2 0)
- (term-handle-colors-array term-terminal-previous-parameter-2))
- (term-handle-colors-array term-terminal-previous-parameter)))
- (term-handle-colors-array term-terminal-parameter)))
-
-
+ (when (= term-terminal-more-parameters 1)
+ (if (>= term-terminal-previous-parameter-4 0)
+ (term-handle-colors-array term-terminal-previous-parameter-4))
+ (if (>= term-terminal-previous-parameter-3 0)
+ (term-handle-colors-array term-terminal-previous-parameter-3))
+ (if (>= term-terminal-previous-parameter-2 0)
+ (term-handle-colors-array term-terminal-previous-parameter-2))
+ (term-handle-colors-array term-terminal-previous-parameter))
+ (term-handle-colors-array term-terminal-parameter))
;; \E[6n - Report cursor position
((eq char ?n)
HCoop / bpt / emacs.git / blobdiff