Commit 133fe4c8 authored by Karoly Lorentey's avatar Karoly Lorentey
Browse files

Speed up `emacsclient -t' on xterms. (by suggestion of Dan Nicolaescu)

* lisp/term/xterm.el: Speed up load time by protecting
  `substitute-key-definition' and `define-key' calls against multiple
  execution.

* lisp/term/rxvt.el: Ditto.
* lisp/term/lk201.el: Ditto.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-345
parent 892f9671
;; -*- no-byte-compile: t -*- ;; -*- no-byte-compile: t -*-
;; Define function key sequences for DEC terminals. ;; Define function key sequences for DEC terminals.
;; XXX We need to find a way to have these define-keys be display-local. -- Lorentey (defvar lk201-function-map nil
"Function key definitions for lk201.")
;; Termcap or terminfo should set these. ;; Protect against reloads.
;; (define-key function-key-map "\e[A" [up]) (unless lk201-function-map
;; (define-key function-key-map "\e[B" [down]) (setq lk201-function-map (make-sparse-keymap))
;; (define-key function-key-map "\e[C" [right])
;; (define-key function-key-map "\e[D" [left])
(define-key function-key-map "\e[1~" [find]) ;; XXX We need to find a way to have these define-keys be display-local. -- Lorentey
(define-key function-key-map "\e[2~" [insert])
(define-key function-key-map "\e[3~" [delete])
(define-key function-key-map "\e[4~" [select])
(define-key function-key-map "\e[5~" [prior])
(define-key function-key-map "\e[6~" [next])
(define-key function-key-map "\e[11~" [f1])
(define-key function-key-map "\e[12~" [f2])
(define-key function-key-map "\e[13~" [f3])
(define-key function-key-map "\e[14~" [f4])
(define-key function-key-map "\e[15~" [f5])
(define-key function-key-map "\e[17~" [f6])
(define-key function-key-map "\e[18~" [f7])
(define-key function-key-map "\e[19~" [f8])
(define-key function-key-map "\e[20~" [f9])
(define-key function-key-map "\e[21~" [f10])
;; Customarily F11 is used as the ESC key.
;; The file that includes this one, takes care of that.
(define-key function-key-map "\e[23~" [f11])
(define-key function-key-map "\e[24~" [f12])
(define-key function-key-map "\e[25~" [f13])
(define-key function-key-map "\e[26~" [f14])
(define-key function-key-map "\e[28~" [help])
(define-key function-key-map "\e[29~" [menu])
(define-key function-key-map "\e[31~" [f17])
(define-key function-key-map "\e[32~" [f18])
(define-key function-key-map "\e[33~" [f19])
(define-key function-key-map "\e[34~" [f20])
;; Termcap or terminfo should set these. ;; Termcap or terminfo should set these.
;; (define-key function-key-map "\eOA" [up]) ;; (define-key function-key-map "\e[A" [up])
;; (define-key function-key-map "\eOB" [down]) ;; (define-key function-key-map "\e[B" [down])
;; (define-key function-key-map "\eOC" [right]) ;; (define-key function-key-map "\e[C" [right])
;; (define-key function-key-map "\eOD" [left]) ;; (define-key function-key-map "\e[D" [left])
;; Termcap or terminfo should set these, but doesn't properly. (define-key function-key-map "\e[1~" [find])
;; Termcap sets these to k1-k4, which get mapped to f1-f4 in term.c (define-key function-key-map "\e[2~" [insert])
(define-key function-key-map "\eOP" [kp-f1]) (define-key function-key-map "\e[3~" [delete])
(define-key function-key-map "\eOQ" [kp-f2]) (define-key function-key-map "\e[4~" [select])
(define-key function-key-map "\eOR" [kp-f3]) (define-key function-key-map "\e[5~" [prior])
(define-key function-key-map "\eOS" [kp-f4]) (define-key function-key-map "\e[6~" [next])
(define-key function-key-map "\e[11~" [f1])
(define-key function-key-map "\e[12~" [f2])
(define-key function-key-map "\e[13~" [f3])
(define-key function-key-map "\e[14~" [f4])
(define-key function-key-map "\e[15~" [f5])
(define-key function-key-map "\e[17~" [f6])
(define-key function-key-map "\e[18~" [f7])
(define-key function-key-map "\e[19~" [f8])
(define-key function-key-map "\e[20~" [f9])
(define-key function-key-map "\e[21~" [f10])
;; Customarily F11 is used as the ESC key.
;; The file that includes this one, takes care of that.
(define-key function-key-map "\e[23~" [f11])
(define-key function-key-map "\e[24~" [f12])
(define-key function-key-map "\e[25~" [f13])
(define-key function-key-map "\e[26~" [f14])
(define-key function-key-map "\e[28~" [help])
(define-key function-key-map "\e[29~" [menu])
(define-key function-key-map "\e[31~" [f17])
(define-key function-key-map "\e[32~" [f18])
(define-key function-key-map "\e[33~" [f19])
(define-key function-key-map "\e[34~" [f20])
(define-key function-key-map "\eOI" [kp-tab]) ;; Termcap or terminfo should set these.
(define-key function-key-map "\eOj" [kp-multiply]) ;; (define-key function-key-map "\eOA" [up])
(define-key function-key-map "\eOk" [kp-add]) ;; (define-key function-key-map "\eOB" [down])
(define-key function-key-map "\eOl" [kp-separator]) ;; (define-key function-key-map "\eOC" [right])
(define-key function-key-map "\eOM" [kp-enter]) ;; (define-key function-key-map "\eOD" [left])
(define-key function-key-map "\eOm" [kp-subtract])
(define-key function-key-map "\eOn" [kp-decimal]) ;; Termcap or terminfo should set these, but doesn't properly.
(define-key function-key-map "\eOo" [kp-divide]) ;; Termcap sets these to k1-k4, which get mapped to f1-f4 in term.c
(define-key function-key-map "\eOp" [kp-0]) (define-key function-key-map "\eOP" [kp-f1])
(define-key function-key-map "\eOq" [kp-1]) (define-key function-key-map "\eOQ" [kp-f2])
(define-key function-key-map "\eOr" [kp-2]) (define-key function-key-map "\eOR" [kp-f3])
(define-key function-key-map "\eOs" [kp-3]) (define-key function-key-map "\eOS" [kp-f4])
(define-key function-key-map "\eOt" [kp-4])
(define-key function-key-map "\eOu" [kp-5]) (define-key function-key-map "\eOI" [kp-tab])
(define-key function-key-map "\eOv" [kp-6]) (define-key function-key-map "\eOj" [kp-multiply])
(define-key function-key-map "\eOw" [kp-7]) (define-key function-key-map "\eOk" [kp-add])
(define-key function-key-map "\eOx" [kp-8]) (define-key function-key-map "\eOl" [kp-separator])
(define-key function-key-map "\eOy" [kp-9]) (define-key function-key-map "\eOM" [kp-enter])
(define-key function-key-map "\eOm" [kp-subtract])
(define-key function-key-map "\eOn" [kp-decimal])
(define-key function-key-map "\eOo" [kp-divide])
(define-key function-key-map "\eOp" [kp-0])
(define-key function-key-map "\eOq" [kp-1])
(define-key function-key-map "\eOr" [kp-2])
(define-key function-key-map "\eOs" [kp-3])
(define-key function-key-map "\eOt" [kp-4])
(define-key function-key-map "\eOu" [kp-5])
(define-key function-key-map "\eOv" [kp-6])
(define-key function-key-map "\eOw" [kp-7])
(define-key function-key-map "\eOx" [kp-8])
(define-key function-key-map "\eOy" [kp-9])
;; Use inheritance to let the main keymap override these defaults.
;; This way we don't override terminfo-derived settings or settings
;; made in the .emacs file.
(set-keymap-parent lk201-function-map (keymap-parent function-key-map))
(set-keymap-parent function-key-map lk201-function-map))
;;; arch-tag: 7ffb4444-6a23-43e1-b457-43cf4f673c0d ;;; arch-tag: 7ffb4444-6a23-43e1-b457-43cf4f673c0d
;;; lk201.el ends here ;;; lk201.el ends here
...@@ -28,80 +28,78 @@ ...@@ -28,80 +28,78 @@
(require 'server) (require 'server)
(defvar rxvt-function-map (make-sparse-keymap) (defvar rxvt-function-map nil
"Function key rxvt-function-mapoverrides for rxvt.") "Function key overrides for rxvt.")
;; Set up function-key-map entries that termcap and terminfo don't know. ;; Protect against reloads.
;; XXX We need to find a way to have these define-keys be display-local. -- Lorentey (unless rxvt-function-map
(define-key rxvt-function-map "\e[A" [up]) (setq rxvt-function-map (make-sparse-keymap))
(define-key rxvt-function-map "\e[B" [down])
(define-key rxvt-function-map "\e[C" [right]) ;; Set up function-key-map entries that termcap and terminfo don't know.
(define-key rxvt-function-map "\e[D" [left]) ;; XXX We need to find a way to have these define-keys be display-local. -- Lorentey
(define-key rxvt-function-map "\e[7~" [home]) (define-key rxvt-function-map "\e[A" [up])
(define-key rxvt-function-map "\e[2~" [insert]) (define-key rxvt-function-map "\e[B" [down])
(define-key rxvt-function-map "\e[3~" [delete]) (define-key rxvt-function-map "\e[C" [right])
(define-key rxvt-function-map "\e[4~" [select]) (define-key rxvt-function-map "\e[D" [left])
(define-key rxvt-function-map "\e[5~" [prior]) (define-key rxvt-function-map "\e[7~" [home])
(define-key rxvt-function-map "\e[6~" [next]) (define-key rxvt-function-map "\e[2~" [insert])
(define-key rxvt-function-map "\e[11~" [f1]) (define-key rxvt-function-map "\e[3~" [delete])
(define-key rxvt-function-map "\e[12~" [f2]) (define-key rxvt-function-map "\e[4~" [select])
(define-key rxvt-function-map "\e[13~" [f3]) (define-key rxvt-function-map "\e[5~" [prior])
(define-key rxvt-function-map "\e[14~" [f4]) (define-key rxvt-function-map "\e[6~" [next])
(define-key rxvt-function-map "\e[15~" [f5]) (define-key rxvt-function-map "\e[11~" [f1])
(define-key rxvt-function-map "\e[17~" [f6]) (define-key rxvt-function-map "\e[12~" [f2])
(define-key rxvt-function-map "\e[18~" [f7]) (define-key rxvt-function-map "\e[13~" [f3])
(define-key rxvt-function-map "\e[19~" [f8]) (define-key rxvt-function-map "\e[14~" [f4])
(define-key rxvt-function-map "\e[20~" [f9]) (define-key rxvt-function-map "\e[15~" [f5])
(define-key rxvt-function-map "\e[21~" [f10]) (define-key rxvt-function-map "\e[17~" [f6])
(define-key rxvt-function-map "\e[23~" [f11]) (define-key rxvt-function-map "\e[18~" [f7])
(define-key rxvt-function-map "\e[24~" [f12]) (define-key rxvt-function-map "\e[19~" [f8])
(define-key rxvt-function-map "\e[29~" [print]) (define-key rxvt-function-map "\e[20~" [f9])
(define-key rxvt-function-map "\e[21~" [f10])
(define-key rxvt-function-map "\e[11^" [C-f1]) (define-key rxvt-function-map "\e[23~" [f11])
(define-key rxvt-function-map "\e[12^" [C-f2]) (define-key rxvt-function-map "\e[24~" [f12])
(define-key rxvt-function-map "\e[13^" [C-f3]) (define-key rxvt-function-map "\e[29~" [print])
(define-key rxvt-function-map "\e[14^" [C-f4])
(define-key rxvt-function-map "\e[15^" [C-f5]) (define-key rxvt-function-map "\e[11^" [C-f1])
(define-key rxvt-function-map "\e[17^" [C-f6]) (define-key rxvt-function-map "\e[12^" [C-f2])
(define-key rxvt-function-map "\e[18^" [C-f7]) (define-key rxvt-function-map "\e[13^" [C-f3])
(define-key rxvt-function-map "\e[19^" [C-f8]) (define-key rxvt-function-map "\e[14^" [C-f4])
(define-key rxvt-function-map "\e[20^" [C-f9]) (define-key rxvt-function-map "\e[15^" [C-f5])
(define-key rxvt-function-map "\e[21^" [C-f10]) (define-key rxvt-function-map "\e[17^" [C-f6])
(define-key rxvt-function-map "\e[23^" [C-f11]) (define-key rxvt-function-map "\e[18^" [C-f7])
(define-key rxvt-function-map "\e[24^" [C-f12]) (define-key rxvt-function-map "\e[19^" [C-f8])
(define-key rxvt-function-map "\e[20^" [C-f9])
(define-key rxvt-function-map "\e[29~" [print]) (define-key rxvt-function-map "\e[21^" [C-f10])
(define-key rxvt-function-map "\e[23^" [C-f11])
(define-key rxvt-function-map "\e[2;2~" [S-insert]) (define-key rxvt-function-map "\e[24^" [C-f12])
(define-key rxvt-function-map "\e[3$" [S-delete])
(define-key rxvt-function-map "\e[29~" [print])
(define-key rxvt-function-map "\e[2^" [C-insert])
(define-key rxvt-function-map "\e[3^" [C-delete]) (define-key rxvt-function-map "\e[2;2~" [S-insert])
(define-key rxvt-function-map "\e[5^" [C-prior]) (define-key rxvt-function-map "\e[3$" [S-delete])
(define-key rxvt-function-map "\e[6^" [C-next])
(define-key rxvt-function-map "\eOd" [C-left]) (define-key rxvt-function-map "\e[2^" [C-insert])
(define-key rxvt-function-map "\eOc" [C-right]) (define-key rxvt-function-map "\e[3^" [C-delete])
(define-key rxvt-function-map "\eOa" [C-up]) (define-key rxvt-function-map "\e[5^" [C-prior])
(define-key rxvt-function-map "\eOb" [C-down]) (define-key rxvt-function-map "\e[6^" [C-next])
(define-key rxvt-function-map "\eOd" [C-left])
(define-key rxvt-function-map "\e[5$" [S-prior]) (define-key rxvt-function-map "\eOc" [C-right])
(define-key rxvt-function-map "\e[6$" [S-next]) (define-key rxvt-function-map "\eOa" [C-up])
(define-key rxvt-function-map "\e[8$" [S-end]) (define-key rxvt-function-map "\eOb" [C-down])
(define-key rxvt-function-map "\e[7$" [S-home])
(define-key rxvt-function-map "\e[d" [S-left]) (define-key rxvt-function-map "\e[5$" [S-prior])
(define-key rxvt-function-map "\e[c" [S-right]) (define-key rxvt-function-map "\e[6$" [S-next])
(define-key rxvt-function-map "\e[a" [S-up]) (define-key rxvt-function-map "\e[8$" [S-end])
(define-key rxvt-function-map "\e[b" [S-down]) (define-key rxvt-function-map "\e[7$" [S-home])
(define-key rxvt-function-map "\e[d" [S-left])
;; Use inheritance to let the main keymap override those defaults. (define-key rxvt-function-map "\e[c" [S-right])
;; This way we don't override terminfo-derived settings or settings (define-key rxvt-function-map "\e[a" [S-up])
;; made in the .emacs file. (define-key rxvt-function-map "\e[b" [S-down])
(unless (let ((map (keymap-parent function-key-map))
found) ;; Use inheritance to let the main keymap override those defaults.
(while (and (not found) map) ;; This way we don't override terminfo-derived settings or settings
(setq found (eq rxvt-function-map map) ;; made in the .emacs file.
map (keymap-parent map)))
found)
(set-keymap-parent rxvt-function-map (keymap-parent function-key-map)) (set-keymap-parent rxvt-function-map (keymap-parent function-key-map))
(set-keymap-parent function-key-map rxvt-function-map)) (set-keymap-parent function-key-map rxvt-function-map))
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment