Mercurial > emacs
view lisp/emulation/keypad.el @ 82988:f82e3a6f5ccb
A few more bugfixes and new features.
(Sigh.) I obviously need to remember to separate individual changes
to multiple commits.
src/emacsclient.c: Improved error handling.
(decode_options): Changed frame option (again) from -f to -t.
(print_help_and_exit): Ditto.
(copy_from_to): Check EINTR after write, not EAGAIN. Removed SIGIO hack.
(pty_conversation): Handle errors transmitted through the socket.
Handle pty errors by not reading from it anymore.
(main): Restore correct errno after socket_status failed. Send -tty
on -t, not -pty.
lisp/server.el (server-process-filter): Watch -tty, not -pty.
Use make-frame-on-tty instead of make-terminal-frame.
Don't set newframe to t if make-frame-on-tty failed.
Don't delete frames here. Print correct message when there are no
files to edit, but a new frame was requested.
(server-sentinel): Delete the frame after the process.
(server-handle-delete-frame): New function for delete-frame-functions.
(server-start): Add server-handle-delete-frame to delete-frame-functions.
(server-buffer-done): Don't delete frames here.
src/alloc.c (mark_ttys): Add prototype.
(Fgarbage_collect): Call mark_ttys.
src/emacs.c: (shut_down_emacs): Don't flush stdout before
reset_sys_modes().
src/process.c (add_keyboard_wait_descriptor_called_flag): Removed.
(add_keyboard_wait_descriptor): Removed stdin hack.
src/sysdep.c: Unconditionally include sysselect.h.
(old_fcntl_flags): Changed to an array.
(init_sigio, reset_sigio): Use it.
(narrow_foreground_group, widen_foreground_group): Use setpgid, not
setpgrp.
(old_fcntl_owner): Changed to an array.
(init_sys_modes, reset_sys_modes): Use it. Fix fsync() and reset_sigio() calls.
src/term.c (Qframe_tty_name, Qframe_tty_type): New variables.
(syms_of_term): Initialize them.
(Fframe_tty_name, Fframe_tty_type): New functions.
(term_init): Call add_keyboard_wait_descriptor().
(Fdelete_tty): New function.
(delete_tty): Call delete_keyboard_wait_descriptor().
(get_current_tty): Removed.
(mark_ttys): New function.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-28
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Wed, 31 Dec 2003 05:09:29 +0000 |
parents | 695cf19ef79e |
children | aac0a33f5772 375f2633d815 |
line wrap: on
line source
;;; keypad.el --- simplified keypad bindings ;; Copyright (C) 2002 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Keywords: keyboard convenience ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; The keypad package allows easy binding of the keypad keys to ;; various commonly used sets of commands. ;; ;; With the following setup, the keypad can be used for numeric data ;; entry when NumLock is off, and to give numeric prefix arguments to ;; emacs commands, when NumLock on on. ;; ;; keypad-setup => Plain Numeric Keypad ;; keypad-numlock-setup => Prefix numeric args ;; ;; +--------+--------+--------+ ;; | M-7 | M-8 | M-9 | <- numlock on ;; | 7 | 8 | 9 | <- numlock off ;; +--------+--------+--------+ ;; | M-4 | M-5 | M-6 | ;; | 4 | 5 | 6 | ;; +--------+--------+--------+ ;; | M-1 | M-2 | M-3 | ;; | 1 | 2 | 3 | ;; +--------+--------+--------+ ;; | M-0 | M-- | ;; | 0 | . | ;; +-----------------+--------+ ;; The following keypad setup is used for navigation together with ;; modes like cua-mode which uses shifted movement keys to extend the ;; region. ;; ;; keypad-setup => Cursor keys ;; keypad-shifted-setup => Shifted cursor keys ;; ;; +--------+--------+--------+ ;; | S-home | S-up | S-PgUp | <- shifted, numlock off ;; | Home | up | PgUp | <- unshifted, numlock off ;; +--------+--------+--------+ ;; | S-left |S-space |S-right | ;; | left | space | right | ;; +--------+--------+--------+ ;; | S-end | S-down | S-PgDn | ;; | end | down | PgDn | ;; +--------+--------+--------+ ;; | S-insert |S-delete| ;; | insert | delete | ;; +-----------------+--------+ ;; The following setup binds the unshifted keypad keys to plain ;; numeric keys when NumLock is either on or off, but the decimal key ;; produces either a . (NumLock off) or a , (NumLock on). This is ;; useful for e.g. Danish users where the decimal separator is a ;; comma. ;; ;; keypad-setup => Plain Numeric Keypad ;; keypad-numlock-setup => Numeric Keypad with Decimal key: , ;; ;; +--------+--------+--------+ ;; | 7 | 8 | 9 | <- numlock on ;; | 7 | 8 | 9 | <- numlock off ;; +--------+--------+--------+ ;; | 4 | 5 | 6 | ;; | 4 | 5 | 6 | ;; +--------+--------+--------+ ;; | 1 | 2 | 3 | ;; | 1 | 2 | 3 | ;; +--------+--------+--------+ ;; | 0 | , | ;; | 0 | . | ;; +-----------------+--------+ ;;; Code: (provide 'keypad) ;;; Customization ;;;###autoload (defcustom keypad-setup nil "Specifies the keypad setup for unshifted keypad keys when NumLock is off. When selecting the plain numeric keypad setup, the character returned by the decimal key must be specified." :set (lambda (symbol value) (if value (keypad-setup value nil nil value))) :initialize 'custom-initialize-default :link '(emacs-commentary-link "keypad.el") :version "21.4" :type '(choice (const :tag "Plain numeric keypad" numeric) (character :tag "Numeric Keypad with Decimal Key" :match (lambda (widget value) (integerp value)) :value ?.) (const :tag "Numeric prefix arguments" prefix) (const :tag "Cursor keys" cursor) (const :tag "Shifted cursor keys" S-cursor) (const :tag "Unspecified/User-defined" none) (other :tag "Keep existing bindings" nil)) :require 'keypad :group 'keyboard) ;;;###autoload (defcustom keypad-numlock-setup nil "Specifies the keypad setup for unshifted keypad keys when NumLock is on. When selecting the plain numeric keypad setup, the character returned by the decimal key must be specified." :set (lambda (symbol value) (if value (keypad-setup value t nil value))) :initialize 'custom-initialize-default :link '(emacs-commentary-link "keypad.el") :version "21.4" :type '(choice (const :tag "Plain numeric keypad" numeric) (character :tag "Numeric Keypad with Decimal Key" :match (lambda (widget value) (integerp value)) :value ?.) (const :tag "Numeric prefix arguments" prefix) (const :tag "Cursor keys" cursor) (const :tag "Shifted cursor keys" S-cursor) (const :tag "Unspecified/User-defined" none) (other :tag "Keep existing bindings" nil)) :require 'keypad :group 'keyboard) ;;;###autoload (defcustom keypad-shifted-setup nil "Specifies the keypad setup for shifted keypad keys when NumLock is off. When selecting the plain numeric keypad setup, the character returned by the decimal key must be specified." :set (lambda (symbol value) (if value (keypad-setup value nil t value))) :initialize 'custom-initialize-default :link '(emacs-commentary-link "keypad.el") :version "21.4" :type '(choice (const :tag "Plain numeric keypad" numeric) (character :tag "Numeric Keypad with Decimal Key" :match (lambda (widget value) (integerp value)) :value ?.) (const :tag "Numeric prefix arguments" prefix) (const :tag "Cursor keys" cursor) (const :tag "Shifted cursor keys" S-cursor) (const :tag "Unspecified/User-defined" none) (other :tag "Keep existing bindings" nil)) :require 'keypad :group 'keyboard) ;;;###autoload (defcustom keypad-numlock-shifted-setup nil "Specifies the keypad setup for shifted keypad keys when NumLock is off. When selecting the plain numeric keypad setup, the character returned by the decimal key must be specified." :set (lambda (symbol value) (if value (keypad-setup value t t value))) :initialize 'custom-initialize-default :link '(emacs-commentary-link "keypad.el") :version "21.4" :type '(choice (const :tag "Plain numeric keypad" numeric) (character :tag "Numeric Keypad with Decimal Key" :match (lambda (widget value) (integerp value)) :value ?.) (const :tag "Numeric prefix arguments" prefix) (const :tag "Cursor keys" cursor) (const :tag "Shifted cursor keys" S-cursor) (const :tag "Unspecified/User-defined" none) (other :tag "Keep existing bindings" nil)) :require 'keypad :group 'keyboard) ;;;###autoload (defun keypad-setup (setup &optional numlock shift decimal) "Set keypad bindings in function-key-map according to SETUP. If optional second argument NUMLOCK is non-nil, the NumLock On bindings are changed. Otherwise, the NumLock Off bindings are changed. If optional third argument SHIFT is non-nil, the shifted keypad keys are bound. Setup Binding ------------------------------------------------------------- 'prefix Command prefix argument, i.e. M-0 .. M-9 and M-- 'S-cursor Bind shifted keypad keys to the shifted cursor movement keys. 'cursor Bind keypad keys to the cursor movement keys. 'numeric Plain numeric keypad, i.e. 0 .. 9 and . (or DECIMAL arg) 'none Removes all bindings for keypad keys in function-key-map; this enables any user-defined bindings for the keypad keys in the global and local keymaps. If SETUP is 'numeric and the optional fourth argument DECIMAL is non-nil, the decimal key on the keypad is mapped to DECIMAL instead of `.'" (let* ((i 0) (var (cond ((and (not numlock) (not shift)) 'keypad-setup) ((and (not numlock) shift) 'keypad-shifted-setup) ((and numlock (not shift)) 'keypad-numlock-setup) ((and numlock shift) 'keypad-numlock-shifted-setup))) (kp (cond ((eq var 'keypad-setup) [kp-delete kp-insert kp-end kp-down kp-next kp-left kp-space kp-right kp-home kp-up kp-prior]) ((eq var 'keypad-shifted-setup) [S-kp-decimal S-kp-0 S-kp-1 S-kp-2 S-kp-3 S-kp-4 S-kp-5 S-kp-6 S-kp-7 S-kp-8 S-kp-9]) ((eq var 'keypad-numlock-setup) [kp-decimal kp-0 kp-1 kp-2 kp-3 kp-4 kp-5 kp-6 kp-7 kp-8 kp-9]) ((eq var 'keypad-numlock-shifted-setup) [S-kp-delete S-kp-insert S-kp-end S-kp-down S-kp-next S-kp-left S-kp-space S-kp-right S-kp-home S-kp-up S-kp-prior]))) (bind (cond ((or (eq setup 'numeric) (char-valid-p setup)) (if (eq decimal 'numeric) (setq decimal nil)) (vector (or decimal ?.) ?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9)) ((eq setup 'prefix) [?\M-- ?\M-0 ?\M-1 ?\M-2 ?\M-3 ?\M-4 ?\M-5 ?\M-6 ?\M-7 ?\M-8 ?\M-9]) ((eq setup 'cursor) [delete insert end down next left space right home up prior]) ((eq setup 'S-cursor) [S-delete S-insert S-end S-down S-next S-left S-space S-right S-home S-up S-prior]) ((eq setup 'none) nil) (t (signal 'error (list "Unknown keypad setup: " setup)))))) (set var setup) ;; Bind the keys in KP list to BIND list in function-key-map. ;; If BIND is nil, all bindings for the keys are removed. (if (not (boundp 'function-key-map)) (setq function-key-map (make-sparse-keymap))) (while (< i 11) (define-key function-key-map (vector (aref kp i)) (if bind (vector (aref bind i)))) (if (= i 6) (cond ((eq (aref kp i) 'kp-space) (define-key function-key-map [kp-begin] (if bind (vector (aref bind i))))) ((eq (aref kp i) 'S-kp-space) (define-key function-key-map [S-kp-begin] (if bind (vector (aref bind i))))))) (setq i (1+ i))))) ;;; arch-tag: 0899d2bd-9e12-4b4e-9aef-d0014d3b6414 ;;; keypad.el ends here