diff options
| author | Karoly Lorentey | 2005-05-03 01:38:40 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-05-03 01:38:40 +0000 |
| commit | 941d4811d5b6660e2cdb5f668d52792c7e5920e8 (patch) | |
| tree | fdc7828b0b482e4c21f41eb0fcc6ee95431d534f | |
| parent | 09a1444abb2494d0db3d71e4c942f5210786b619 (diff) | |
| download | emacs-941d4811d5b6660e2cdb5f668d52792c7e5920e8.tar.gz emacs-941d4811d5b6660e2cdb5f668d52792c7e5920e8.zip | |
Fix exponential slowdowns on repeated tty frame creation.
* lisp/term/xterm.el: Protect extended function-key-map from being added
to the real function-key-map each time the file is loaded.
(xterm-function-map): New variable.
* lisp/term/rxvt.el: Ditto.
(rxvt-function-map): New variable.
* lisp/term/lk201.el: Add note on buggy globalness of define-key.
* lisp/term/iris-ansi.el: Ditto.
* lisp/term/news.el: Ditto.
* lisp/term/sun.el: Ditto.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-337
| -rw-r--r-- | lisp/term/iris-ansi.el | 2 | ||||
| -rw-r--r-- | lisp/term/news.el | 2 | ||||
| -rw-r--r-- | lisp/term/rxvt.el | 142 | ||||
| -rw-r--r-- | lisp/term/sun.el | 2 | ||||
| -rw-r--r-- | lisp/term/xterm.el | 321 |
5 files changed, 247 insertions, 222 deletions
diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el index e73c3e19968..05c7e9a5955 100644 --- a/lisp/term/iris-ansi.el +++ b/lisp/term/iris-ansi.el | |||
| @@ -25,6 +25,8 @@ | |||
| 25 | 25 | ||
| 26 | ;;; Code: | 26 | ;;; Code: |
| 27 | 27 | ||
| 28 | ;; XXX We need to find a way to have these define-keys be display-local. -- Lorentey | ||
| 29 | |||
| 28 | (define-key function-key-map "\e[120q" [S-escape]) | 30 | (define-key function-key-map "\e[120q" [S-escape]) |
| 29 | (define-key function-key-map "\e[121q" [C-escape]) | 31 | (define-key function-key-map "\e[121q" [C-escape]) |
| 30 | 32 | ||
diff --git a/lisp/term/news.el b/lisp/term/news.el index a6f7481c422..1b251dae58e 100644 --- a/lisp/term/news.el +++ b/lisp/term/news.el | |||
| @@ -35,6 +35,8 @@ | |||
| 35 | (if (not (keymapp news-fkey-prefix)) | 35 | (if (not (keymapp news-fkey-prefix)) |
| 36 | (error "What? Your news termcap/terminfo has no keycaps in it")) | 36 | (error "What? Your news termcap/terminfo has no keycaps in it")) |
| 37 | 37 | ||
| 38 | ;; XXX We need to find a way to have these define-keys be display-local. -- Lorentey | ||
| 39 | |||
| 38 | ;; Termcap or terminfo will set these | 40 | ;; Termcap or terminfo will set these |
| 39 | ;; (define-key news-fkey-prefix "P" [f1]) | 41 | ;; (define-key news-fkey-prefix "P" [f1]) |
| 40 | ;; (define-key news-fkey-prefix "Q" [f2]) | 42 | ;; (define-key news-fkey-prefix "Q" [f2]) |
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el index 32f7900ed75..7b53f098e82 100644 --- a/lisp/term/rxvt.el +++ b/lisp/term/rxvt.el | |||
| @@ -28,73 +28,83 @@ | |||
| 28 | 28 | ||
| 29 | (require 'server) | 29 | (require 'server) |
| 30 | 30 | ||
| 31 | (defvar rxvt-function-map (make-sparse-keymap) | ||
| 32 | "Function key rxvt-function-mapoverrides for rxvt.") | ||
| 33 | |||
| 31 | ;; Set up function-key-map entries that termcap and terminfo don't know. | 34 | ;; Set up function-key-map entries that termcap and terminfo don't know. |
| 32 | (let ((map (make-sparse-keymap))) | 35 | ;; XXX We need to find a way to have these define-keys be display-local. -- Lorentey |
| 33 | (define-key map "\e[A" [up]) | 36 | (define-key rxvt-function-map "\e[A" [up]) |
| 34 | (define-key map "\e[B" [down]) | 37 | (define-key rxvt-function-map "\e[B" [down]) |
| 35 | (define-key map "\e[C" [right]) | 38 | (define-key rxvt-function-map "\e[C" [right]) |
| 36 | (define-key map "\e[D" [left]) | 39 | (define-key rxvt-function-map "\e[D" [left]) |
| 37 | (define-key map "\e[7~" [home]) | 40 | (define-key rxvt-function-map "\e[7~" [home]) |
| 38 | (define-key map "\e[2~" [insert]) | 41 | (define-key rxvt-function-map "\e[2~" [insert]) |
| 39 | (define-key map "\e[3~" [delete]) | 42 | (define-key rxvt-function-map "\e[3~" [delete]) |
| 40 | (define-key map "\e[4~" [select]) | 43 | (define-key rxvt-function-map "\e[4~" [select]) |
| 41 | (define-key map "\e[5~" [prior]) | 44 | (define-key rxvt-function-map "\e[5~" [prior]) |
| 42 | (define-key map "\e[6~" [next]) | 45 | (define-key rxvt-function-map "\e[6~" [next]) |
| 43 | (define-key map "\e[11~" [f1]) | 46 | (define-key rxvt-function-map "\e[11~" [f1]) |
| 44 | (define-key map "\e[12~" [f2]) | 47 | (define-key rxvt-function-map "\e[12~" [f2]) |
| 45 | (define-key map "\e[13~" [f3]) | 48 | (define-key rxvt-function-map "\e[13~" [f3]) |
| 46 | (define-key map "\e[14~" [f4]) | 49 | (define-key rxvt-function-map "\e[14~" [f4]) |
| 47 | (define-key map "\e[15~" [f5]) | 50 | (define-key rxvt-function-map "\e[15~" [f5]) |
| 48 | (define-key map "\e[17~" [f6]) | 51 | (define-key rxvt-function-map "\e[17~" [f6]) |
| 49 | (define-key map "\e[18~" [f7]) | 52 | (define-key rxvt-function-map "\e[18~" [f7]) |
| 50 | (define-key map "\e[19~" [f8]) | 53 | (define-key rxvt-function-map "\e[19~" [f8]) |
| 51 | (define-key map "\e[20~" [f9]) | 54 | (define-key rxvt-function-map "\e[20~" [f9]) |
| 52 | (define-key map "\e[21~" [f10]) | 55 | (define-key rxvt-function-map "\e[21~" [f10]) |
| 53 | (define-key map "\e[23~" [f11]) | 56 | (define-key rxvt-function-map "\e[23~" [f11]) |
| 54 | (define-key map "\e[24~" [f12]) | 57 | (define-key rxvt-function-map "\e[24~" [f12]) |
| 55 | (define-key map "\e[29~" [print]) | 58 | (define-key rxvt-function-map "\e[29~" [print]) |
| 56 | 59 | ||
| 57 | (define-key map "\e[11^" [C-f1]) | 60 | (define-key rxvt-function-map "\e[11^" [C-f1]) |
| 58 | (define-key map "\e[12^" [C-f2]) | 61 | (define-key rxvt-function-map "\e[12^" [C-f2]) |
| 59 | (define-key map "\e[13^" [C-f3]) | 62 | (define-key rxvt-function-map "\e[13^" [C-f3]) |
| 60 | (define-key map "\e[14^" [C-f4]) | 63 | (define-key rxvt-function-map "\e[14^" [C-f4]) |
| 61 | (define-key map "\e[15^" [C-f5]) | 64 | (define-key rxvt-function-map "\e[15^" [C-f5]) |
| 62 | (define-key map "\e[17^" [C-f6]) | 65 | (define-key rxvt-function-map "\e[17^" [C-f6]) |
| 63 | (define-key map "\e[18^" [C-f7]) | 66 | (define-key rxvt-function-map "\e[18^" [C-f7]) |
| 64 | (define-key map "\e[19^" [C-f8]) | 67 | (define-key rxvt-function-map "\e[19^" [C-f8]) |
| 65 | (define-key map "\e[20^" [C-f9]) | 68 | (define-key rxvt-function-map "\e[20^" [C-f9]) |
| 66 | (define-key map "\e[21^" [C-f10]) | 69 | (define-key rxvt-function-map "\e[21^" [C-f10]) |
| 67 | (define-key map "\e[23^" [C-f11]) | 70 | (define-key rxvt-function-map "\e[23^" [C-f11]) |
| 68 | (define-key map "\e[24^" [C-f12]) | 71 | (define-key rxvt-function-map "\e[24^" [C-f12]) |
| 69 | 72 | ||
| 70 | (define-key map "\e[29~" [print]) | 73 | (define-key rxvt-function-map "\e[29~" [print]) |
| 71 | 74 | ||
| 72 | (define-key map "\e[2;2~" [S-insert]) | 75 | (define-key rxvt-function-map "\e[2;2~" [S-insert]) |
| 73 | (define-key map "\e[3$" [S-delete]) | 76 | (define-key rxvt-function-map "\e[3$" [S-delete]) |
| 74 | 77 | ||
| 75 | (define-key map "\e[2^" [C-insert]) | 78 | (define-key rxvt-function-map "\e[2^" [C-insert]) |
| 76 | (define-key map "\e[3^" [C-delete]) | 79 | (define-key rxvt-function-map "\e[3^" [C-delete]) |
| 77 | (define-key map "\e[5^" [C-prior]) | 80 | (define-key rxvt-function-map "\e[5^" [C-prior]) |
| 78 | (define-key map "\e[6^" [C-next]) | 81 | (define-key rxvt-function-map "\e[6^" [C-next]) |
| 79 | (define-key map "\eOd" [C-left]) | 82 | (define-key rxvt-function-map "\eOd" [C-left]) |
| 80 | (define-key map "\eOc" [C-right]) | 83 | (define-key rxvt-function-map "\eOc" [C-right]) |
| 81 | (define-key map "\eOa" [C-up]) | 84 | (define-key rxvt-function-map "\eOa" [C-up]) |
| 82 | (define-key map "\eOb" [C-down]) | 85 | (define-key rxvt-function-map "\eOb" [C-down]) |
| 83 | 86 | ||
| 84 | (define-key map "\e[5$" [S-prior]) | 87 | (define-key rxvt-function-map "\e[5$" [S-prior]) |
| 85 | (define-key map "\e[6$" [S-next]) | 88 | (define-key rxvt-function-map "\e[6$" [S-next]) |
| 86 | (define-key map "\e[8$" [S-end]) | 89 | (define-key rxvt-function-map "\e[8$" [S-end]) |
| 87 | (define-key map "\e[7$" [S-home]) | 90 | (define-key rxvt-function-map "\e[7$" [S-home]) |
| 88 | (define-key map "\e[d" [S-left]) | 91 | (define-key rxvt-function-map "\e[d" [S-left]) |
| 89 | (define-key map "\e[c" [S-right]) | 92 | (define-key rxvt-function-map "\e[c" [S-right]) |
| 90 | (define-key map "\e[a" [S-up]) | 93 | (define-key rxvt-function-map "\e[a" [S-up]) |
| 91 | (define-key map "\e[b" [S-down]) | 94 | (define-key rxvt-function-map "\e[b" [S-down]) |
| 92 | 95 | ||
| 93 | ;; Use inheritance to let the main keymap override those defaults. | 96 | ;; Use inheritance to let the main keymap override those defaults. |
| 94 | ;; This way we don't override terminfo-derived settings or settings | 97 | ;; This way we don't override terminfo-derived settings or settings |
| 95 | ;; made in the .emacs file. | 98 | ;; made in the .emacs file. |
| 96 | (set-keymap-parent map (keymap-parent function-key-map)) | 99 | (unless (let ((map (keymap-parent function-key-map)) |
| 97 | (set-keymap-parent function-key-map map)) | 100 | found) |
| 101 | (while (and (not found) map) | ||
| 102 | (setq found (eq rxvt-function-map map) | ||
| 103 | map (keymap-parent map))) | ||
| 104 | found) | ||
| 105 | (set-keymap-parent rxvt-function-map (keymap-parent function-key-map)) | ||
| 106 | (set-keymap-parent function-key-map rxvt-function-map)) | ||
| 107 | |||
| 98 | 108 | ||
| 99 | ;; Set up colors, for those versions of rxvt that support it. | 109 | ;; Set up colors, for those versions of rxvt that support it. |
| 100 | (defvar rxvt-standard-colors | 110 | (defvar rxvt-standard-colors |
diff --git a/lisp/term/sun.el b/lisp/term/sun.el index e0564d44ecb..2d4a71c1f5d 100644 --- a/lisp/term/sun.el +++ b/lisp/term/sun.el | |||
| @@ -92,6 +92,8 @@ | |||
| 92 | ;; so we ignore them on the way down | 92 | ;; so we ignore them on the way down |
| 93 | ;; | 93 | ;; |
| 94 | 94 | ||
| 95 | ;; XXX We need to find a way to have these define-keys be display-local. -- Lorentey | ||
| 96 | |||
| 95 | (defvar sun-raw-prefix (make-sparse-keymap)) | 97 | (defvar sun-raw-prefix (make-sparse-keymap)) |
| 96 | (define-key function-key-map "\e[" sun-raw-prefix) | 98 | (define-key function-key-map "\e[" sun-raw-prefix) |
| 97 | 99 | ||
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index c30ee7ab34a..037f32191c3 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el | |||
| @@ -28,162 +28,171 @@ | |||
| 28 | 28 | ||
| 29 | (require 'server) | 29 | (require 'server) |
| 30 | 30 | ||
| 31 | (let ((map (make-sparse-keymap))) | 31 | (defvar xterm-function-map (make-sparse-keymap) |
| 32 | (define-key map "\e[A" [up]) | 32 | "Function key map overrides for xterm.") |
| 33 | (define-key map "\e[B" [down]) | 33 | |
| 34 | (define-key map "\e[C" [right]) | 34 | ;; XXX We need to find a way to have these define-keys be display-local. -- Lorentey |
| 35 | (define-key map "\e[D" [left]) | 35 | (define-key xterm-function-map "\e[A" [up]) |
| 36 | (define-key map "\e[1~" [home]) | 36 | (define-key xterm-function-map "\e[B" [down]) |
| 37 | (define-key map "\e[2~" [insert]) | 37 | (define-key xterm-function-map "\e[C" [right]) |
| 38 | (define-key map "\e[3~" [delete]) | 38 | (define-key xterm-function-map "\e[D" [left]) |
| 39 | (define-key map "\e[4~" [select]) | 39 | (define-key xterm-function-map "\e[1~" [home]) |
| 40 | (define-key map "\e[5~" [prior]) | 40 | (define-key xterm-function-map "\e[2~" [insert]) |
| 41 | (define-key map "\e[6~" [next]) | 41 | (define-key xterm-function-map "\e[3~" [delete]) |
| 42 | (define-key map "\e[11~" [f1]) | 42 | (define-key xterm-function-map "\e[4~" [select]) |
| 43 | (define-key map "\e[12~" [f2]) | 43 | (define-key xterm-function-map "\e[5~" [prior]) |
| 44 | (define-key map "\e[13~" [f3]) | 44 | (define-key xterm-function-map "\e[6~" [next]) |
| 45 | (define-key map "\e[14~" [f4]) | 45 | (define-key xterm-function-map "\e[11~" [f1]) |
| 46 | (define-key map "\e[15~" [f5]) | 46 | (define-key xterm-function-map "\e[12~" [f2]) |
| 47 | (define-key map "\e[17~" [f6]) | 47 | (define-key xterm-function-map "\e[13~" [f3]) |
| 48 | (define-key map "\e[18~" [f7]) | 48 | (define-key xterm-function-map "\e[14~" [f4]) |
| 49 | (define-key map "\e[19~" [f8]) | 49 | (define-key xterm-function-map "\e[15~" [f5]) |
| 50 | (define-key map "\e[20~" [f9]) | 50 | (define-key xterm-function-map "\e[17~" [f6]) |
| 51 | (define-key map "\e[21~" [f10]) | 51 | (define-key xterm-function-map "\e[18~" [f7]) |
| 52 | (define-key map "\e[23~" [f11]) | 52 | (define-key xterm-function-map "\e[19~" [f8]) |
| 53 | (define-key map "\e[24~" [f12]) | 53 | (define-key xterm-function-map "\e[20~" [f9]) |
| 54 | (define-key map "\e[29~" [print]) | 54 | (define-key xterm-function-map "\e[21~" [f10]) |
| 55 | 55 | (define-key xterm-function-map "\e[23~" [f11]) | |
| 56 | (define-key map "\eOP" [f1]) | 56 | (define-key xterm-function-map "\e[24~" [f12]) |
| 57 | (define-key map "\eOQ" [f2]) | 57 | (define-key xterm-function-map "\e[29~" [print]) |
| 58 | (define-key map "\eOR" [f3]) | 58 | |
| 59 | (define-key map "\eOS" [f4]) | 59 | (define-key xterm-function-map "\eOP" [f1]) |
| 60 | 60 | (define-key xterm-function-map "\eOQ" [f2]) | |
| 61 | (define-key map "\eO2P" [S-f1]) | 61 | (define-key xterm-function-map "\eOR" [f3]) |
| 62 | (define-key map "\eO2Q" [S-f2]) | 62 | (define-key xterm-function-map "\eOS" [f4]) |
| 63 | (define-key map "\eO2R" [S-f3]) | 63 | |
| 64 | (define-key map "\eO2S" [S-f4]) | 64 | (define-key xterm-function-map "\eO2P" [S-f1]) |
| 65 | (define-key map "\e[15;2~" [S-f5]) | 65 | (define-key xterm-function-map "\eO2Q" [S-f2]) |
| 66 | (define-key map "\e[17;2~" [S-f6]) | 66 | (define-key xterm-function-map "\eO2R" [S-f3]) |
| 67 | (define-key map "\e[18;2~" [S-f7]) | 67 | (define-key xterm-function-map "\eO2S" [S-f4]) |
| 68 | (define-key map "\e[19;2~" [S-f8]) | 68 | (define-key xterm-function-map "\e[15;2~" [S-f5]) |
| 69 | (define-key map "\e[20;2~" [S-f9]) | 69 | (define-key xterm-function-map "\e[17;2~" [S-f6]) |
| 70 | (define-key map "\e[21;2~" [S-f10]) | 70 | (define-key xterm-function-map "\e[18;2~" [S-f7]) |
| 71 | (define-key map "\e[23;2~" [S-f11]) | 71 | (define-key xterm-function-map "\e[19;2~" [S-f8]) |
| 72 | (define-key map "\e[24;2~" [S-f12]) | 72 | (define-key xterm-function-map "\e[20;2~" [S-f9]) |
| 73 | 73 | (define-key xterm-function-map "\e[21;2~" [S-f10]) | |
| 74 | (define-key map "\eO5P" [C-f1]) | 74 | (define-key xterm-function-map "\e[23;2~" [S-f11]) |
| 75 | (define-key map "\eO5Q" [C-f2]) | 75 | (define-key xterm-function-map "\e[24;2~" [S-f12]) |
| 76 | (define-key map "\eO5R" [C-f3]) | 76 | |
| 77 | (define-key map "\eO5S" [C-f4]) | 77 | (define-key xterm-function-map "\eO5P" [C-f1]) |
| 78 | (define-key map "\e[15;5~" [C-f5]) | 78 | (define-key xterm-function-map "\eO5Q" [C-f2]) |
| 79 | (define-key map "\e[17;5~" [C-f6]) | 79 | (define-key xterm-function-map "\eO5R" [C-f3]) |
| 80 | (define-key map "\e[18;5~" [C-f7]) | 80 | (define-key xterm-function-map "\eO5S" [C-f4]) |
| 81 | (define-key map "\e[19;5~" [C-f8]) | 81 | (define-key xterm-function-map "\e[15;5~" [C-f5]) |
| 82 | (define-key map "\e[20;5~" [C-f9]) | 82 | (define-key xterm-function-map "\e[17;5~" [C-f6]) |
| 83 | (define-key map "\e[21;5~" [C-f10]) | 83 | (define-key xterm-function-map "\e[18;5~" [C-f7]) |
| 84 | (define-key map "\e[23;5~" [C-f11]) | 84 | (define-key xterm-function-map "\e[19;5~" [C-f8]) |
| 85 | (define-key map "\e[24;5~" [C-f12]) | 85 | (define-key xterm-function-map "\e[20;5~" [C-f9]) |
| 86 | 86 | (define-key xterm-function-map "\e[21;5~" [C-f10]) | |
| 87 | (define-key map "\eO6P" [C-S-f1]) | 87 | (define-key xterm-function-map "\e[23;5~" [C-f11]) |
| 88 | (define-key map "\eO6Q" [C-S-f2]) | 88 | (define-key xterm-function-map "\e[24;5~" [C-f12]) |
| 89 | (define-key map "\eO6R" [C-S-f3]) | 89 | |
| 90 | (define-key map "\eO6S" [C-S-f4]) | 90 | (define-key xterm-function-map "\eO6P" [C-S-f1]) |
| 91 | (define-key map "\e[15;6~" [C-S-f5]) | 91 | (define-key xterm-function-map "\eO6Q" [C-S-f2]) |
| 92 | (define-key map "\e[17;6~" [C-S-f6]) | 92 | (define-key xterm-function-map "\eO6R" [C-S-f3]) |
| 93 | (define-key map "\e[18;6~" [C-S-f7]) | 93 | (define-key xterm-function-map "\eO6S" [C-S-f4]) |
| 94 | (define-key map "\e[19;6~" [C-S-f8]) | 94 | (define-key xterm-function-map "\e[15;6~" [C-S-f5]) |
| 95 | (define-key map "\e[20;6~" [C-S-f9]) | 95 | (define-key xterm-function-map "\e[17;6~" [C-S-f6]) |
| 96 | (define-key map "\e[21;6~" [C-S-f10]) | 96 | (define-key xterm-function-map "\e[18;6~" [C-S-f7]) |
| 97 | (define-key map "\e[23;6~" [C-S-f11]) | 97 | (define-key xterm-function-map "\e[19;6~" [C-S-f8]) |
| 98 | (define-key map "\e[24;6~" [C-S-f12]) | 98 | (define-key xterm-function-map "\e[20;6~" [C-S-f9]) |
| 99 | 99 | (define-key xterm-function-map "\e[21;6~" [C-S-f10]) | |
| 100 | (define-key map "\eO3P" [A-f1]) | 100 | (define-key xterm-function-map "\e[23;6~" [C-S-f11]) |
| 101 | (define-key map "\eO3Q" [A-f2]) | 101 | (define-key xterm-function-map "\e[24;6~" [C-S-f12]) |
| 102 | (define-key map "\eO3R" [A-f3]) | 102 | |
| 103 | (define-key map "\eO3S" [A-f4]) | 103 | (define-key xterm-function-map "\eO3P" [A-f1]) |
| 104 | (define-key map "\e[15;3~" [A-f5]) | 104 | (define-key xterm-function-map "\eO3Q" [A-f2]) |
| 105 | (define-key map "\e[17;3~" [A-f6]) | 105 | (define-key xterm-function-map "\eO3R" [A-f3]) |
| 106 | (define-key map "\e[18;3~" [A-f7]) | 106 | (define-key xterm-function-map "\eO3S" [A-f4]) |
| 107 | (define-key map "\e[19;3~" [A-f8]) | 107 | (define-key xterm-function-map "\e[15;3~" [A-f5]) |
| 108 | (define-key map "\e[20;3~" [A-f9]) | 108 | (define-key xterm-function-map "\e[17;3~" [A-f6]) |
| 109 | (define-key map "\e[21;3~" [A-f10]) | 109 | (define-key xterm-function-map "\e[18;3~" [A-f7]) |
| 110 | (define-key map "\e[23;3~" [A-f11]) | 110 | (define-key xterm-function-map "\e[19;3~" [A-f8]) |
| 111 | (define-key map "\e[24;3~" [A-f12]) | 111 | (define-key xterm-function-map "\e[20;3~" [A-f9]) |
| 112 | 112 | (define-key xterm-function-map "\e[21;3~" [A-f10]) | |
| 113 | (define-key map "\e[1;2A" [S-up]) | 113 | (define-key xterm-function-map "\e[23;3~" [A-f11]) |
| 114 | (define-key map "\e[1;2B" [S-down]) | 114 | (define-key xterm-function-map "\e[24;3~" [A-f12]) |
| 115 | (define-key map "\e[1;2C" [S-right]) | 115 | |
| 116 | (define-key map "\e[1;2D" [S-left]) | 116 | (define-key xterm-function-map "\e[1;2A" [S-up]) |
| 117 | (define-key map "\e[1;2F" [S-end]) | 117 | (define-key xterm-function-map "\e[1;2B" [S-down]) |
| 118 | (define-key map "\e[1;2H" [S-home]) | 118 | (define-key xterm-function-map "\e[1;2C" [S-right]) |
| 119 | 119 | (define-key xterm-function-map "\e[1;2D" [S-left]) | |
| 120 | (define-key map "\e[1;5A" [C-up]) | 120 | (define-key xterm-function-map "\e[1;2F" [S-end]) |
| 121 | (define-key map "\e[1;5B" [C-down]) | 121 | (define-key xterm-function-map "\e[1;2H" [S-home]) |
| 122 | (define-key map "\e[1;5C" [C-right]) | 122 | |
| 123 | (define-key map "\e[1;5D" [C-left]) | 123 | (define-key xterm-function-map "\e[1;5A" [C-up]) |
| 124 | (define-key map "\e[1;5F" [C-end]) | 124 | (define-key xterm-function-map "\e[1;5B" [C-down]) |
| 125 | (define-key map "\e[1;5H" [C-home]) | 125 | (define-key xterm-function-map "\e[1;5C" [C-right]) |
| 126 | 126 | (define-key xterm-function-map "\e[1;5D" [C-left]) | |
| 127 | (define-key map "\e[1;6A" [C-S-up]) | 127 | (define-key xterm-function-map "\e[1;5F" [C-end]) |
| 128 | (define-key map "\e[1;6B" [C-S-down]) | 128 | (define-key xterm-function-map "\e[1;5H" [C-home]) |
| 129 | (define-key map "\e[1;6C" [C-S-right]) | 129 | |
| 130 | (define-key map "\e[1;6D" [C-S-left]) | 130 | (define-key xterm-function-map "\e[1;6A" [C-S-up]) |
| 131 | (define-key map "\e[1;6F" [C-S-end]) | 131 | (define-key xterm-function-map "\e[1;6B" [C-S-down]) |
| 132 | (define-key map "\e[1;6H" [C-S-home]) | 132 | (define-key xterm-function-map "\e[1;6C" [C-S-right]) |
| 133 | 133 | (define-key xterm-function-map "\e[1;6D" [C-S-left]) | |
| 134 | (define-key map "\e[1;3A" [A-up]) | 134 | (define-key xterm-function-map "\e[1;6F" [C-S-end]) |
| 135 | (define-key map "\e[1;3B" [A-down]) | 135 | (define-key xterm-function-map "\e[1;6H" [C-S-home]) |
| 136 | (define-key map "\e[1;3C" [A-right]) | 136 | |
| 137 | (define-key map "\e[1;3D" [A-left]) | 137 | (define-key xterm-function-map "\e[1;3A" [A-up]) |
| 138 | (define-key map "\e[1;3F" [A-end]) | 138 | (define-key xterm-function-map "\e[1;3B" [A-down]) |
| 139 | (define-key map "\e[1;3H" [A-home]) | 139 | (define-key xterm-function-map "\e[1;3C" [A-right]) |
| 140 | 140 | (define-key xterm-function-map "\e[1;3D" [A-left]) | |
| 141 | (define-key map "\e[2;2~" [S-insert]) | 141 | (define-key xterm-function-map "\e[1;3F" [A-end]) |
| 142 | (define-key map "\e[3;2~" [S-delete]) | 142 | (define-key xterm-function-map "\e[1;3H" [A-home]) |
| 143 | (define-key map "\e[5;2~" [S-prior]) | 143 | |
| 144 | (define-key map "\e[6;2~" [S-next]) | 144 | (define-key xterm-function-map "\e[2;2~" [S-insert]) |
| 145 | 145 | (define-key xterm-function-map "\e[3;2~" [S-delete]) | |
| 146 | (define-key map "\e[2;5~" [C-insert]) | 146 | (define-key xterm-function-map "\e[5;2~" [S-prior]) |
| 147 | (define-key map "\e[3;5~" [C-delete]) | 147 | (define-key xterm-function-map "\e[6;2~" [S-next]) |
| 148 | (define-key map "\e[5;5~" [C-prior]) | 148 | |
| 149 | (define-key map "\e[6;5~" [C-next]) | 149 | (define-key xterm-function-map "\e[2;5~" [C-insert]) |
| 150 | 150 | (define-key xterm-function-map "\e[3;5~" [C-delete]) | |
| 151 | (define-key map "\e[2;6~" [C-S-insert]) | 151 | (define-key xterm-function-map "\e[5;5~" [C-prior]) |
| 152 | (define-key map "\e[3;6~" [C-S-delete]) | 152 | (define-key xterm-function-map "\e[6;5~" [C-next]) |
| 153 | (define-key map "\e[5;6~" [C-S-prior]) | 153 | |
| 154 | (define-key map "\e[6;6~" [C-S-next]) | 154 | (define-key xterm-function-map "\e[2;6~" [C-S-insert]) |
| 155 | 155 | (define-key xterm-function-map "\e[3;6~" [C-S-delete]) | |
| 156 | (define-key map "\e[2;3~" [A-insert]) | 156 | (define-key xterm-function-map "\e[5;6~" [C-S-prior]) |
| 157 | (define-key map "\e[3;3~" [A-delete]) | 157 | (define-key xterm-function-map "\e[6;6~" [C-S-next]) |
| 158 | (define-key map "\e[5;3~" [A-prior]) | 158 | |
| 159 | (define-key map "\e[6;3~" [A-next]) | 159 | (define-key xterm-function-map "\e[2;3~" [A-insert]) |
| 160 | 160 | (define-key xterm-function-map "\e[3;3~" [A-delete]) | |
| 161 | (define-key map "\eOA" [up]) | 161 | (define-key xterm-function-map "\e[5;3~" [A-prior]) |
| 162 | (define-key map "\eOB" [down]) | 162 | (define-key xterm-function-map "\e[6;3~" [A-next]) |
| 163 | (define-key map "\eOC" [right]) | 163 | |
| 164 | (define-key map "\eOD" [left]) | 164 | (define-key xterm-function-map "\eOA" [up]) |
| 165 | (define-key map "\eOF" [end]) | 165 | (define-key xterm-function-map "\eOB" [down]) |
| 166 | (define-key map "\eOH" [home]) | 166 | (define-key xterm-function-map "\eOC" [right]) |
| 167 | 167 | (define-key xterm-function-map "\eOD" [left]) | |
| 168 | (define-key map "\eO2A" [S-up]) | 168 | (define-key xterm-function-map "\eOF" [end]) |
| 169 | (define-key map "\eO2B" [S-down]) | 169 | (define-key xterm-function-map "\eOH" [home]) |
| 170 | (define-key map "\eO2C" [S-right]) | 170 | |
| 171 | (define-key map "\eO2D" [S-left]) | 171 | (define-key xterm-function-map "\eO2A" [S-up]) |
| 172 | (define-key map "\eO2F" [S-end]) | 172 | (define-key xterm-function-map "\eO2B" [S-down]) |
| 173 | (define-key map "\eO2H" [S-home]) | 173 | (define-key xterm-function-map "\eO2C" [S-right]) |
| 174 | 174 | (define-key xterm-function-map "\eO2D" [S-left]) | |
| 175 | (define-key map "\eO5A" [C-up]) | 175 | (define-key xterm-function-map "\eO2F" [S-end]) |
| 176 | (define-key map "\eO5B" [C-down]) | 176 | (define-key xterm-function-map "\eO2H" [S-home]) |
| 177 | (define-key map "\eO5C" [C-right]) | 177 | |
| 178 | (define-key map "\eO5D" [C-left]) | 178 | (define-key xterm-function-map "\eO5A" [C-up]) |
| 179 | (define-key map "\eO5F" [C-end]) | 179 | (define-key xterm-function-map "\eO5B" [C-down]) |
| 180 | (define-key map "\eO5H" [C-home]) | 180 | (define-key xterm-function-map "\eO5C" [C-right]) |
| 181 | 181 | (define-key xterm-function-map "\eO5D" [C-left]) | |
| 182 | ;; Use inheritance to let the main keymap override those defaults. | 182 | (define-key xterm-function-map "\eO5F" [C-end]) |
| 183 | ;; This way we don't override terminfo-derived settings or settings | 183 | (define-key xterm-function-map "\eO5H" [C-home]) |
| 184 | ;; made in the .emacs file. | 184 | |
| 185 | (set-keymap-parent map (keymap-parent function-key-map)) | 185 | ;; Use inheritance to let the main keymap override those defaults. |
| 186 | (set-keymap-parent function-key-map map)) | 186 | ;; This way we don't override terminfo-derived settings or settings |
| 187 | ;; made in the .emacs file. | ||
| 188 | (unless (let ((map (keymap-parent function-key-map)) | ||
| 189 | found) | ||
| 190 | (while (and (not found) map) | ||
| 191 | (setq found (eq xterm-function-map map) | ||
| 192 | map (keymap-parent map))) | ||
| 193 | found) | ||
| 194 | (set-keymap-parent xterm-function-map (keymap-parent function-key-map)) | ||
| 195 | (set-keymap-parent function-key-map xterm-function-map)) | ||
| 187 | 196 | ||
| 188 | ;;; The terminal intialization C code file might have initialized | 197 | ;;; The terminal intialization C code file might have initialized |
| 189 | ;;; function keys F13->F60 from the termcap/terminfo information. On | 198 | ;;; function keys F13->F60 from the termcap/terminfo information. On |