;;; xterm.el --- define function key sequences and standard colors for xterm
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
+;; 2006 Free Software Foundation, Inc.
;; Author: FSF
;; Keywords: terminals
;;; Code:
-(require 'server)
-
(defvar xterm-function-map nil
"Function key map overrides for xterm.")
;; rxvt terminals sometimes set the TERM variable to "xterm", but
;; rxvt's keybindings that are incompatible with xterm's. It is
;; better in that case to use rxvt's initializion function.
- (if (and (server-getenv "COLORTERM")
- (string-match "\\`rxvt" (server-getenv "COLORTERM")))
+ (if (and (getenv "COLORTERM" (terminal-id))
+ (string-match "\\`rxvt" (getenv "COLORTERM" (terminal-id))))
(progn
- (eval-when-compile (load "term/rxvt"))
+ (eval-and-compile (load "term/rxvt"))
(terminal-init-rxvt))
;; The terminal-local stuff only need to be set up on the first
;; function-key-map. This substitution is needed because if a key
;; definition if found in function-key-map, there are no further
;; lookups in other keymaps.
- (let ((m (terminal-local-value 'local-function-key-map nil)))
- (substitute-key-definition [f13] [S-f1] m)
- (substitute-key-definition [f14] [S-f2] m)
- (substitute-key-definition [f15] [S-f3] m)
- (substitute-key-definition [f16] [S-f4] m)
- (substitute-key-definition [f17] [S-f5] m)
- (substitute-key-definition [f18] [S-f6] m)
- (substitute-key-definition [f19] [S-f7] m)
- (substitute-key-definition [f20] [S-f8] m)
- (substitute-key-definition [f21] [S-f9] m)
- (substitute-key-definition [f22] [S-f10] m)
- (substitute-key-definition [f23] [S-f11] m)
- (substitute-key-definition [f24] [S-f12] m)
-
- (substitute-key-definition [f25] [C-f1] m)
- (substitute-key-definition [f26] [C-f2] m)
- (substitute-key-definition [f27] [C-f3] m)
- (substitute-key-definition [f28] [C-f4] m)
- (substitute-key-definition [f29] [C-f5] m)
- (substitute-key-definition [f30] [C-f6] m)
- (substitute-key-definition [f31] [C-f7] m)
- (substitute-key-definition [f32] [C-f8] m)
- (substitute-key-definition [f33] [C-f9] m)
- (substitute-key-definition [f34] [C-f10] m)
- (substitute-key-definition [f35] [C-f11] m)
- (substitute-key-definition [f36] [C-f12] m)
-
- (substitute-key-definition [f37] [C-S-f1] m)
- (substitute-key-definition [f38] [C-S-f2] m)
- (substitute-key-definition [f39] [C-S-f3] m)
- (substitute-key-definition [f40] [C-S-f4] m)
- (substitute-key-definition [f41] [C-S-f5] m)
- (substitute-key-definition [f42] [C-S-f6] m)
- (substitute-key-definition [f43] [C-S-f7] m)
- (substitute-key-definition [f44] [C-S-f8] m)
- (substitute-key-definition [f45] [C-S-f9] m)
- (substitute-key-definition [f46] [C-S-f10] m)
- (substitute-key-definition [f47] [C-S-f11] m)
- (substitute-key-definition [f48] [C-S-f12] m)
-
- (substitute-key-definition [f49] [A-f1] m)
- (substitute-key-definition [f50] [A-f2] m)
- (substitute-key-definition [f51] [A-f3] m)
- (substitute-key-definition [f52] [A-f4] m)
- (substitute-key-definition [f53] [A-f5] m)
- (substitute-key-definition [f54] [A-f6] m)
- (substitute-key-definition [f55] [A-f7] m)
- (substitute-key-definition [f56] [A-f8] m)
- (substitute-key-definition [f57] [A-f9] m)
- (substitute-key-definition [f58] [A-f10] m)
- (substitute-key-definition [f59] [A-f11] m)
- (substitute-key-definition [f60] [A-f12] m))
+ (substitute-key-definition [f13] [S-f1] local-function-key-map)
+ (substitute-key-definition [f14] [S-f2] local-function-key-map)
+ (substitute-key-definition [f15] [S-f3] local-function-key-map)
+ (substitute-key-definition [f16] [S-f4] local-function-key-map)
+ (substitute-key-definition [f17] [S-f5] local-function-key-map)
+ (substitute-key-definition [f18] [S-f6] local-function-key-map)
+ (substitute-key-definition [f19] [S-f7] local-function-key-map)
+ (substitute-key-definition [f20] [S-f8] local-function-key-map)
+ (substitute-key-definition [f21] [S-f9] local-function-key-map)
+ (substitute-key-definition [f22] [S-f10] local-function-key-map)
+ (substitute-key-definition [f23] [S-f11] local-function-key-map)
+ (substitute-key-definition [f24] [S-f12] local-function-key-map)
+
+ (substitute-key-definition [f25] [C-f1] local-function-key-map)
+ (substitute-key-definition [f26] [C-f2] local-function-key-map)
+ (substitute-key-definition [f27] [C-f3] local-function-key-map)
+ (substitute-key-definition [f28] [C-f4] local-function-key-map)
+ (substitute-key-definition [f29] [C-f5] local-function-key-map)
+ (substitute-key-definition [f30] [C-f6] local-function-key-map)
+ (substitute-key-definition [f31] [C-f7] local-function-key-map)
+ (substitute-key-definition [f32] [C-f8] local-function-key-map)
+ (substitute-key-definition [f33] [C-f9] local-function-key-map)
+ (substitute-key-definition [f34] [C-f10] local-function-key-map)
+ (substitute-key-definition [f35] [C-f11] local-function-key-map)
+ (substitute-key-definition [f36] [C-f12] local-function-key-map)
+
+ (substitute-key-definition [f37] [C-S-f1] local-function-key-map)
+ (substitute-key-definition [f38] [C-S-f2] local-function-key-map)
+ (substitute-key-definition [f39] [C-S-f3] local-function-key-map)
+ (substitute-key-definition [f40] [C-S-f4] local-function-key-map)
+ (substitute-key-definition [f41] [C-S-f5] local-function-key-map)
+ (substitute-key-definition [f42] [C-S-f6] local-function-key-map)
+ (substitute-key-definition [f43] [C-S-f7] local-function-key-map)
+ (substitute-key-definition [f44] [C-S-f8] local-function-key-map)
+ (substitute-key-definition [f45] [C-S-f9] local-function-key-map)
+ (substitute-key-definition [f46] [C-S-f10] local-function-key-map)
+ (substitute-key-definition [f47] [C-S-f11] local-function-key-map)
+ (substitute-key-definition [f48] [C-S-f12] local-function-key-map)
+
+ (substitute-key-definition [f49] [A-f1] local-function-key-map)
+ (substitute-key-definition [f50] [A-f2] local-function-key-map)
+ (substitute-key-definition [f51] [A-f3] local-function-key-map)
+ (substitute-key-definition [f52] [A-f4] local-function-key-map)
+ (substitute-key-definition [f53] [A-f5] local-function-key-map)
+ (substitute-key-definition [f54] [A-f6] local-function-key-map)
+ (substitute-key-definition [f55] [A-f7] local-function-key-map)
+ (substitute-key-definition [f56] [A-f8] local-function-key-map)
+ (substitute-key-definition [f57] [A-f9] local-function-key-map)
+ (substitute-key-definition [f58] [A-f10] local-function-key-map)
+ (substitute-key-definition [f59] [A-f11] local-function-key-map)
+ (substitute-key-definition [f60] [A-f12] local-function-key-map))
;; Use inheritance to let the main keymap override those defaults.
;; This way we don't override terminfo-derived settings or settings
;; made in the .emacs file.
(let ((m (copy-keymap xterm-function-map)))
- (set-keymap-parent m (keymap-parent (terminal-local-value 'local-function-key-map nil)))
- (set-keymap-parent (terminal-local-value 'local-function-key-map nil) m)))
+ (set-keymap-parent m (keymap-parent local-function-key-map))
+ (set-keymap-parent local-function-key-map m)))
;; Do it!
(xterm-register-default-colors)
;; This recomputes all the default faces given the colors we've just set up.
- (tty-set-up-initial-frame-faces)))
+ (tty-set-up-initial-frame-faces))
;; Set up colors, for those versions of xterm that support it.
(defvar xterm-standard-colors