aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/term
diff options
context:
space:
mode:
authorKaroly Lorentey2005-04-26 12:17:42 +0000
committerKaroly Lorentey2005-04-26 12:17:42 +0000
commit030cd69ff13d95f439ca0d13a03215fc45959789 (patch)
tree4554735b53848a05f107b8b421a898e0e9fe7ee6 /lisp/term
parent3379bbb24d58ecd8dca0c96b976b7031167e76a5 (diff)
parent35b1b8abe3d3833ecb4b4cee75b7340ffb707d65 (diff)
downloademacs-030cd69ff13d95f439ca0d13a03215fc45959789.tar.gz
emacs-030cd69ff13d95f439ca0d13a03215fc45959789.zip
Merged from miles@gnu.org--gnu-2005 (patch 279-280)
Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-279 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-280 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-335
Diffstat (limited to 'lisp/term')
-rw-r--r--lisp/term/xterm.el97
1 files changed, 81 insertions, 16 deletions
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 96f79f6c864..c30ee7ab34a 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -53,10 +53,15 @@
53 (define-key map "\e[24~" [f12]) 53 (define-key map "\e[24~" [f12])
54 (define-key map "\e[29~" [print]) 54 (define-key map "\e[29~" [print])
55 55
56 (define-key map "\e[11;2~" [S-f1]) 56 (define-key map "\eOP" [f1])
57 (define-key map "\e[12;2~" [S-f2]) 57 (define-key map "\eOQ" [f2])
58 (define-key map "\e[13;2~" [S-f3]) 58 (define-key map "\eOR" [f3])
59 (define-key map "\e[14;2~" [S-f4]) 59 (define-key map "\eOS" [f4])
60
61 (define-key map "\eO2P" [S-f1])
62 (define-key map "\eO2Q" [S-f2])
63 (define-key map "\eO2R" [S-f3])
64 (define-key map "\eO2S" [S-f4])
60 (define-key map "\e[15;2~" [S-f5]) 65 (define-key map "\e[15;2~" [S-f5])
61 (define-key map "\e[17;2~" [S-f6]) 66 (define-key map "\e[17;2~" [S-f6])
62 (define-key map "\e[18;2~" [S-f7]) 67 (define-key map "\e[18;2~" [S-f7])
@@ -66,10 +71,10 @@
66 (define-key map "\e[23;2~" [S-f11]) 71 (define-key map "\e[23;2~" [S-f11])
67 (define-key map "\e[24;2~" [S-f12]) 72 (define-key map "\e[24;2~" [S-f12])
68 73
69 (define-key map "\e[11;5~" [C-f1]) 74 (define-key map "\eO5P" [C-f1])
70 (define-key map "\e[12;5~" [C-f2]) 75 (define-key map "\eO5Q" [C-f2])
71 (define-key map "\e[13;5~" [C-f3]) 76 (define-key map "\eO5R" [C-f3])
72 (define-key map "\e[14;5~" [C-f4]) 77 (define-key map "\eO5S" [C-f4])
73 (define-key map "\e[15;5~" [C-f5]) 78 (define-key map "\e[15;5~" [C-f5])
74 (define-key map "\e[17;5~" [C-f6]) 79 (define-key map "\e[17;5~" [C-f6])
75 (define-key map "\e[18;5~" [C-f7]) 80 (define-key map "\e[18;5~" [C-f7])
@@ -79,10 +84,10 @@
79 (define-key map "\e[23;5~" [C-f11]) 84 (define-key map "\e[23;5~" [C-f11])
80 (define-key map "\e[24;5~" [C-f12]) 85 (define-key map "\e[24;5~" [C-f12])
81 86
82 (define-key map "\e[11;6~" [C-S-f1]) 87 (define-key map "\eO6P" [C-S-f1])
83 (define-key map "\e[12;6~" [C-S-f2]) 88 (define-key map "\eO6Q" [C-S-f2])
84 (define-key map "\e[13;6~" [C-S-f3]) 89 (define-key map "\eO6R" [C-S-f3])
85 (define-key map "\e[14;6~" [C-S-f4]) 90 (define-key map "\eO6S" [C-S-f4])
86 (define-key map "\e[15;6~" [C-S-f5]) 91 (define-key map "\e[15;6~" [C-S-f5])
87 (define-key map "\e[17;6~" [C-S-f6]) 92 (define-key map "\e[17;6~" [C-S-f6])
88 (define-key map "\e[18;6~" [C-S-f7]) 93 (define-key map "\e[18;6~" [C-S-f7])
@@ -92,10 +97,10 @@
92 (define-key map "\e[23;6~" [C-S-f11]) 97 (define-key map "\e[23;6~" [C-S-f11])
93 (define-key map "\e[24;6~" [C-S-f12]) 98 (define-key map "\e[24;6~" [C-S-f12])
94 99
95 (define-key map "\e[11;3~" [A-f1]) 100 (define-key map "\eO3P" [A-f1])
96 (define-key map "\e[12;3~" [A-f2]) 101 (define-key map "\eO3Q" [A-f2])
97 (define-key map "\e[13;3~" [A-f3]) 102 (define-key map "\eO3R" [A-f3])
98 (define-key map "\e[14;3~" [A-f4]) 103 (define-key map "\eO3S" [A-f4])
99 (define-key map "\e[15;3~" [A-f5]) 104 (define-key map "\e[15;3~" [A-f5])
100 (define-key map "\e[17;3~" [A-f6]) 105 (define-key map "\e[17;3~" [A-f6])
101 (define-key map "\e[18;3~" [A-f7]) 106 (define-key map "\e[18;3~" [A-f7])
@@ -180,6 +185,66 @@
180 (set-keymap-parent map (keymap-parent function-key-map)) 185 (set-keymap-parent map (keymap-parent function-key-map))
181 (set-keymap-parent function-key-map map)) 186 (set-keymap-parent function-key-map map))
182 187
188;;; The terminal intialization C code file might have initialized
189;;; function keys F13->F60 from the termcap/terminfo information. On
190;;; a PC-style keyboard these keys correspond to
191;;; MODIFIER-FUNCTION_KEY, where modifier is S-, C, A-, C-S-. The
192;;; code here subsitutes the corresponding defintions in
193;;; function-key-map. This substitution is needed because if a key
194;;; definition if found in function-key-map, there are no further
195;;; lookups in other keymaps.
196(substitute-key-definition [f13] [S-f1] function-key-map)
197(substitute-key-definition [f14] [S-f2] function-key-map)
198(substitute-key-definition [f15] [S-f3] function-key-map)
199(substitute-key-definition [f16] [S-f4] function-key-map)
200(substitute-key-definition [f17] [S-f5] function-key-map)
201(substitute-key-definition [f18] [S-f6] function-key-map)
202(substitute-key-definition [f19] [S-f7] function-key-map)
203(substitute-key-definition [f20] [S-f8] function-key-map)
204(substitute-key-definition [f21] [S-f9] function-key-map)
205(substitute-key-definition [f22] [S-f10] function-key-map)
206(substitute-key-definition [f23] [S-f11] function-key-map)
207(substitute-key-definition [f24] [S-f12] function-key-map)
208
209(substitute-key-definition [f25] [C-f1] function-key-map)
210(substitute-key-definition [f26] [C-f2] function-key-map)
211(substitute-key-definition [f27] [C-f3] function-key-map)
212(substitute-key-definition [f28] [C-f4] function-key-map)
213(substitute-key-definition [f29] [C-f5] function-key-map)
214(substitute-key-definition [f30] [C-f6] function-key-map)
215(substitute-key-definition [f31] [C-f7] function-key-map)
216(substitute-key-definition [f32] [C-f8] function-key-map)
217(substitute-key-definition [f33] [C-f9] function-key-map)
218(substitute-key-definition [f34] [C-f10] function-key-map)
219(substitute-key-definition [f35] [C-f11] function-key-map)
220(substitute-key-definition [f36] [C-f12] function-key-map)
221
222(substitute-key-definition [f37] [C-S-f1] function-key-map)
223(substitute-key-definition [f38] [C-S-f2] function-key-map)
224(substitute-key-definition [f39] [C-S-f3] function-key-map)
225(substitute-key-definition [f40] [C-S-f4] function-key-map)
226(substitute-key-definition [f41] [C-S-f5] function-key-map)
227(substitute-key-definition [f42] [C-S-f6] function-key-map)
228(substitute-key-definition [f43] [C-S-f7] function-key-map)
229(substitute-key-definition [f44] [C-S-f8] function-key-map)
230(substitute-key-definition [f45] [C-S-f9] function-key-map)
231(substitute-key-definition [f46] [C-S-f10] function-key-map)
232(substitute-key-definition [f47] [C-S-f11] function-key-map)
233(substitute-key-definition [f48] [C-S-f12] function-key-map)
234
235(substitute-key-definition [f49] [A-f1] function-key-map)
236(substitute-key-definition [f50] [A-f2] function-key-map)
237(substitute-key-definition [f51] [A-f3] function-key-map)
238(substitute-key-definition [f52] [A-f4] function-key-map)
239(substitute-key-definition [f53] [A-f5] function-key-map)
240(substitute-key-definition [f54] [A-f6] function-key-map)
241(substitute-key-definition [f55] [A-f7] function-key-map)
242(substitute-key-definition [f56] [A-f8] function-key-map)
243(substitute-key-definition [f57] [A-f9] function-key-map)
244(substitute-key-definition [f58] [A-f10] function-key-map)
245(substitute-key-definition [f59] [A-f11] function-key-map)
246(substitute-key-definition [f60] [A-f12] function-key-map)
247
183;; Set up colors, for those versions of xterm that support it. 248;; Set up colors, for those versions of xterm that support it.
184(defvar xterm-standard-colors 249(defvar xterm-standard-colors
185 ;; The names in the comments taken from XTerm-col.ad in the xterm 250 ;; The names in the comments taken from XTerm-col.ad in the xterm