Mercurial > emacs
diff lisp/term/rxvt.el @ 83353:532e0a9335a9
Merged in changes from CVS trunk. Plus added lisp/term tweaks.
Patches applied:
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--base-0
tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-474
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-1
Add CVS metadata files.
* lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-2
Update from CVS.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-393
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sun, 04 Sep 2005 03:48:17 +0000 |
parents | 7372c2f9daac 34bd8e434dd7 |
children | 3d2bc61f2da0 |
line wrap: on
line diff
--- a/lisp/term/rxvt.el Thu Aug 25 12:03:34 2005 +0000 +++ b/lisp/term/rxvt.el Sun Sep 04 03:48:17 2005 +0000 @@ -1,6 +1,6 @@ ;;; rxvt.el --- define function key sequences and standard colors for rxvt -;; Copyright (C) 2002 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ;; Author: Eli Zaretskii ;; Keywords: terminals @@ -56,8 +56,10 @@ (define-key rxvt-function-map "\e[19~" [f8]) (define-key rxvt-function-map "\e[20~" [f9]) (define-key rxvt-function-map "\e[21~" [f10]) - (define-key rxvt-function-map "\e[23~" [f11]) - (define-key rxvt-function-map "\e[24~" [f12]) + ;; The strings emitted by f11 and f12 are the same as the strings + ;; emitted by S-f1 and S-f2, so don't define f11 and f12. + ;; (define-key rxvt-function-map "\e[23~" [f11]) + ;; (define-key rxvt-function-map "\e[24~" [f12]) (define-key rxvt-function-map "\e[29~" [print]) (define-key rxvt-function-map "\e[11^" [C-f1]) @@ -70,23 +72,42 @@ (define-key rxvt-function-map "\e[19^" [C-f8]) (define-key rxvt-function-map "\e[20^" [C-f9]) (define-key rxvt-function-map "\e[21^" [C-f10]) - (define-key rxvt-function-map "\e[23^" [C-f11]) - (define-key rxvt-function-map "\e[24^" [C-f12]) - (define-key rxvt-function-map "\e[29~" [print]) + (define-key rxvt-function-map "\e[23~" [S-f1]) + (define-key rxvt-function-map "\e[24~" [S-f2]) + (define-key rxvt-function-map "\e[25~" [S-f3]) + (define-key rxvt-function-map "\e[26~" [S-f4]) + (define-key rxvt-function-map "\e[28~" [S-f5]) + (define-key rxvt-function-map "\e[29~" [S-f6]) + (define-key rxvt-function-map "\e[31~" [S-f7]) + (define-key rxvt-function-map "\e[32~" [S-f8]) + (define-key rxvt-function-map "\e[33~" [S-f9]) + (define-key rxvt-function-map "\e[34~" [S-f10]) - (define-key rxvt-function-map "\e[2;2~" [S-insert]) - (define-key rxvt-function-map "\e[3$" [S-delete]) + (define-key rxvt-function-map "\e[23^" [C-S-f1]) + (define-key rxvt-function-map "\e[24^" [C-S-f2]) + (define-key rxvt-function-map "\e[25^" [C-S-f3]) + (define-key rxvt-function-map "\e[26^" [C-S-f4]) + (define-key rxvt-function-map "\e[28^" [C-S-f5]) + (define-key rxvt-function-map "\e[29^" [C-S-f6]) + (define-key rxvt-function-map "\e[31^" [C-S-f7]) + (define-key rxvt-function-map "\e[32^" [C-S-f8]) + (define-key rxvt-function-map "\e[33^" [C-S-f9]) + (define-key rxvt-function-map "\e[34^" [C-S-f10]) (define-key rxvt-function-map "\e[2^" [C-insert]) (define-key rxvt-function-map "\e[3^" [C-delete]) (define-key rxvt-function-map "\e[5^" [C-prior]) (define-key rxvt-function-map "\e[6^" [C-next]) + (define-key rxvt-function-map "\e[7^" [C-home]) + (define-key rxvt-function-map "\e[8^" [C-end]) (define-key rxvt-function-map "\eOd" [C-left]) (define-key rxvt-function-map "\eOc" [C-right]) (define-key rxvt-function-map "\eOa" [C-up]) (define-key rxvt-function-map "\eOb" [C-down]) + (define-key rxvt-function-map "\e[2;2~" [S-insert]) + (define-key rxvt-function-map "\e[3$" [S-delete]) (define-key rxvt-function-map "\e[5$" [S-prior]) (define-key rxvt-function-map "\e[6$" [S-next]) (define-key rxvt-function-map "\e[8$" [S-end]) @@ -96,13 +117,61 @@ (define-key rxvt-function-map "\e[a" [S-up]) (define-key rxvt-function-map "\e[b" [S-down])) -;; 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 rxvt-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)) +(defun terminal-init-rxvt () + "Terminal initialization function for rxvt." + ;; The terminal intialization C code file might have initialized + ;; function keys F11->F42 from the termcap/terminfo information. On + ;; a PC-style keyboard these keys correspond to + ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-. The + ;; code here subsitutes the corresponding defintions in + ;; 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. + (substitute-key-definition [f11] [S-f1] function-key-map) + (substitute-key-definition [f12] [S-f2] function-key-map) + (substitute-key-definition [f13] [S-f3] function-key-map) + (substitute-key-definition [f14] [S-f4] function-key-map) + (substitute-key-definition [f15] [S-f5] function-key-map) + (substitute-key-definition [f16] [S-f6] function-key-map) + (substitute-key-definition [f17] [S-f7] function-key-map) + (substitute-key-definition [f18] [S-f8] function-key-map) + (substitute-key-definition [f19] [S-f9] function-key-map) + (substitute-key-definition [f20] [S-f10] function-key-map) + (substitute-key-definition [f23] [C-f1] function-key-map) + (substitute-key-definition [f24] [C-f2] function-key-map) + (substitute-key-definition [f25] [C-f3] function-key-map) + (substitute-key-definition [f26] [C-f4] function-key-map) + (substitute-key-definition [f27] [C-f5] function-key-map) + (substitute-key-definition [f28] [C-f6] function-key-map) + (substitute-key-definition [f29] [C-f7] function-key-map) + (substitute-key-definition [f30] [C-f8] function-key-map) + (substitute-key-definition [f31] [C-f9] function-key-map) + (substitute-key-definition [f32] [C-f10] function-key-map) + + (substitute-key-definition [f33] [C-S-f1] function-key-map) + (substitute-key-definition [f34] [C-S-f2] function-key-map) + (substitute-key-definition [f35] [C-S-f3] function-key-map) + (substitute-key-definition [f36] [C-S-f4] function-key-map) + (substitute-key-definition [f37] [C-S-f5] function-key-map) + (substitute-key-definition [f38] [C-S-f6] function-key-map) + (substitute-key-definition [f39] [C-S-f7] function-key-map) + (substitute-key-definition [f40] [C-S-f8] function-key-map) + (substitute-key-definition [f41] [C-S-f9] function-key-map) + (substitute-key-definition [f42] [C-S-f10] 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 rxvt-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)) + + ;; Initialize colors and background mode. + (rxvt-register-default-colors) + (rxvt-set-background-mode) + ;; This recomputes all the default faces given the colors we've just set up. + (tty-set-up-initial-frame-faces)) ;; Set up colors, for those versions of rxvt that support it. (defvar rxvt-standard-colors @@ -176,11 +245,5 @@ (setq default-frame-background-mode 'dark))) (frame-set-background-mode (selected-frame)))) -;; Do it! -(rxvt-register-default-colors) -(rxvt-set-background-mode) -;; This recomputes all the default faces given the colors we've just set up. -(tty-set-up-initial-frame-faces) - ;;; arch-tag: 20cf2fb6-6318-4bab-9dbf-1d15048f2257 ;;; rxvt.el ends here