Index: emacs/lisp/term/tvi970.el
diff -c emacs/lisp/term/tvi970.el:1.11 emacs/lisp/term/tvi970.el:1.12
*** emacs/lisp/term/tvi970.el:1.11 Mon Jul 4 16:49:23 2005
--- emacs/lisp/term/tvi970.el Wed Jul 27 18:02:07 2005
***************
*** 3,9 ****
;; Author: Jim Blandy <[EMAIL PROTECTED]>, January 1992
;; Keywords: terminals
! ;; Copyright (C) 1992 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
--- 3,9 ----
;; Author: Jim Blandy <[EMAIL PROTECTED]>, January 1992
;; Keywords: terminals
! ;; Copyright (C) 1992, 2005 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
***************
*** 28,104 ****
;;; Code:
! (or (lookup-key function-key-map "\e[")
! (define-key function-key-map "\e[" (make-keymap)))
! ;; (or (lookup-key function-key-map "\eO")
! ;; (define-key function-key-map "\eO" (make-keymap)))
!
! ;; Miscellaneous keys
! (mapcar (function (lambda (key-binding)
! (define-key function-key-map
! (car key-binding) (nth 1 key-binding))))
! '(
! ;; These are set up by termcap or terminfo
! ;; ("\eOP" [kp-f1])
! ;; ("\eOQ" [kp-f2])
! ;; ("\eOR" [kp-f3])
! ;; ("\eOS" [kp-f4])
!
! ;; These might br set by terminfo
! ("\e[H" [home])
! ("\e[Z" [backtab])
! ("\e[i" [print])
! ("\e[@" [insert])
! ("\e[L" [insertline])
! ("\e[M" [deleteline])
! ("\e[U" [next]) ;; actually the `page' key
!
! ;; These won't be set up by either
! ("\eOm" [kp-subtract])
! ("\eOl" [kp-separator])
! ("\eOn" [kp-decimal])
! ("\eOM" [kp-enter])
!
! ;; These won't be set up by either either
! ("\e[K" [key_eol]) ;; Not an X keysym
! ("\e[J" [key_eos]) ;; Not an X keysym
! ("\e[2J" [key_clear]) ;; Not an X keysym
! ("\e[P" [key_dc]) ;; Not an X keysym
! ("\e[g" [S-tab]) ;; Not an X keysym
! ("\e[2N" [clearentry]) ;; Not an X keysym
! ("\e[2K" [S-clearentry]) ;; Not an X keysym
! ("\e[E" [?\C-j]) ;; Not an X keysym
! ("\e[g" [S-backtab]) ;; Not an X keysym
! ("\e[?1i" [key_sprint]) ;; Not an X keysym
! ("\e[4h" [key_sic]) ;; Not an X keysym
! ("\e[4l" [S-delete]) ;; Not an X keysym
! ("\e[Q" [S-insertline]) ;; Not an X keysym
! ("\e[1Q" [key_sdl]) ;; Not an X keysym
! ("\e[19l" [key_seol]) ;; Not an X keysym
! ("\e[19h" [S-erasepage]) ;; Not an X keysym
! ("\e[V" [S-page]) ;; Not an X keysym
! ("\eS" [send]) ;; Not an X keysym
! ("\e5" [S-send]) ;; Not an X keysym
! ))
!
! ;; The numeric keypad keys.
! (let ((i 0))
! (while (< i 10)
! (define-key function-key-map
! (format "\eO%c" (+ i ?p))
! (vector (intern (format "kp-%d" i))))
! (setq i (1+ i))))
! ;; The numbered function keys.
! (let ((i 0))
! (while (< i 16)
! (define-key function-key-map
! (format "\e?%c" (+ i ?a))
! (vector (intern (format "f%d" (1+ i)))))
! (define-key function-key-map
! (format "\e?%c" (+ i ?A))
! (vector (intern (format "S-f%d" (1+ i)))))
! (setq i (1+ i))))
;;; Should keypad numbers send ordinary digits or distinct escape sequences?
(defvar tvi970-keypad-numeric nil
--- 28,107 ----
;;; Code:
! (defun terminal-init-tvi970 ()
! "Terminal initialization function for tvi970."
! (or (lookup-key function-key-map "\e[")
! (define-key function-key-map "\e[" (make-keymap)))
! ;; (or (lookup-key function-key-map "\eO")
! ;; (define-key function-key-map "\eO" (make-keymap)))
!
! ;; Miscellaneous keys
! (mapcar (function (lambda (key-binding)
! (define-key function-key-map
! (car key-binding) (nth 1 key-binding))))
! '(
! ;; These are set up by termcap or terminfo
! ;; ("\eOP" [kp-f1])
! ;; ("\eOQ" [kp-f2])
! ;; ("\eOR" [kp-f3])
! ;; ("\eOS" [kp-f4])
!
! ;; These might br set by terminfo
! ("\e[H" [home])
! ("\e[Z" [backtab])
! ("\e[i" [print])
! ("\e[@" [insert])
! ("\e[L" [insertline])
! ("\e[M" [deleteline])
! ("\e[U" [next]) ;; actually the `page' key
!
! ;; These won't be set up by either
! ("\eOm" [kp-subtract])
! ("\eOl" [kp-separator])
! ("\eOn" [kp-decimal])
! ("\eOM" [kp-enter])
!
! ;; These won't be set up by either either
! ("\e[K" [key_eol]) ;; Not an X keysym
! ("\e[J" [key_eos]) ;; Not an X keysym
! ("\e[2J" [key_clear]) ;; Not an X keysym
! ("\e[P" [key_dc]) ;; Not an X keysym
! ("\e[g" [S-tab]) ;; Not an X keysym
! ("\e[2N" [clearentry]) ;; Not an X keysym
! ("\e[2K" [S-clearentry]) ;; Not an X keysym
! ("\e[E" [?\C-j]) ;; Not an X keysym
! ("\e[g" [S-backtab]) ;; Not an X keysym
! ("\e[?1i" [key_sprint]) ;; Not an X keysym
! ("\e[4h" [key_sic]) ;; Not an X keysym
! ("\e[4l" [S-delete]) ;; Not an X keysym
! ("\e[Q" [S-insertline]) ;; Not an X keysym
! ("\e[1Q" [key_sdl]) ;; Not an X keysym
! ("\e[19l" [key_seol]) ;; Not an X keysym
! ("\e[19h" [S-erasepage]) ;; Not an X keysym
! ("\e[V" [S-page]) ;; Not an X keysym
! ("\eS" [send]) ;; Not an X keysym
! ("\e5" [S-send]) ;; Not an X keysym
! ))
!
! ;; The numeric keypad keys.
! (let ((i 0))
! (while (< i 10)
! (define-key function-key-map
! (format "\eO%c" (+ i ?p))
! (vector (intern (format "kp-%d" i))))
! (setq i (1+ i))))
! ;; The numbered function keys.
! (let ((i 0))
! (while (< i 16)
! (define-key function-key-map
! (format "\e?%c" (+ i ?a))
! (vector (intern (format "f%d" (1+ i)))))
! (define-key function-key-map
! (format "\e?%c" (+ i ?A))
! (vector (intern (format "S-f%d" (1+ i)))))
! (setq i (1+ i))))
+ (tvi970-set-keypad-mode 1))
;;; Should keypad numbers send ordinary digits or distinct escape sequences?
(defvar tvi970-keypad-numeric nil
***************
*** 120,127 ****
(not tvi970-keypad-numeric)
(> (prefix-numeric-value arg) 0)))
(send-string-to-terminal (if tvi970-keypad-numeric "\e=" "\e>")))
-
- (tvi970-set-keypad-mode 1)
;;; arch-tag: c1334cf0-1462-41c3-a963-c077d175f8f0
;;; tvi970.el ends here
--- 123,128 ----
_______________________________________________
Emacs-diffs mailing list
Emacs-diffs@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-diffs
