Mercurial > emacs
view lisp/autoarg.el @ 53226:dd3018b4785b
Implemented multiple tty support.
README.multi-tty: New file.
src/termchar.h (struct terminal): Renamed to struct tty_output. Added name, type,
input, output, termscript, old_tty, term_initted, old_tty_valid,
background_pixel, foreground_pixel, next fields.
(TERMINAL_*): Renamed to TTY_* for brevity.
(CURRENT_TERMINAL): Renamed to CURTTY for brevity.
(tty_list): New variable.
(TERMINAL_PTR): Removed.
(FRAME_TTY): New function.
(TTY_NAME, TTY_TYPE): New macros.
src/term.c (current_terminal): Removed. (_current_terminal): Removed. (tty_list):
New variable. (OUTPUT, OUTPUT1, OUTPUTL, OUTPUT_IF, OUTPUT1_IF): Added tty
parameter. (set_terminal_modes): Added tty parameter. (reset_terminal_modes):
Added tty parameter. (cursor_to, raw_cursor_to): Updated cmgoto() calls.
(clear_end_of_line, write_glyphs): Add indirection to terminal output, updated
cmcheckmagic() calls. (get_named_tty): New function. (term_dummy_init): New
function. (term_init): Added name parameter, added tty_output return value.
Changed algorithm to update tty_list. Call init_sys_modes() to set up tty
mode on the newly opened terminal device.
(get_current_tty): New function, intended for debugging.
src/termhooks.h (termscript): Removed.
src/w32term.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL): Removed redundant
definition.
src/macterm.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL): Ditto.
src/window.c (init_window_once): Call make_terminal_frame with two zero parameters.
src/cm.h (emacs_tputs): New macro to set current_tty, and then call tputs().
(current_tty): New variable, for cmputc().
(cmcheckmagic, cmputc, cmgoto): Added prototypes.
src/cm.c (current_tty): New variable, for cmputc().
(cmputc): Use it.
(cmcheckmagic): Added tty parameter, look up terminal streams there.
(calccost): Added tty parameter. Use emacs_tputs() instead of tputs().
(cmgoto): Added tty parameter. Pass it on to calccost(). Use emacs_tputs()
instead of tputs().
src/dispextern.h (set_terminal_modes, reset_terminal_modes): Added tty parameter.
(term_init): Added name parameter (the filename of the terminal device). Added
return value (struct tty_output).
src/dispnew.c: Replace CURTTY() with local variables throughout the file (where applicable).
(termscript): Moved to struct tty_output.
(terminal_type): Removed.
src/emacs.c (main): Don't call init_sys_modes(), the new term_init() already does that
during init_display().
(shut_down_emacs): Call reset_all_sys_modes() instead of reset_sys_modes().
src/frame.c (Qtty, Qtty_type): New variables.
(syms_of_frame): Initialize them.
(tty_display): Removed.
(make_terminal_frame): New parameters (tty filename and type).
Initialize output_data.tty field instead of output_data.x. Use term_init() to
find the right tty_output. (Use term_dummy_init() during bootstrap.)
(Fmake_terminal_frame): Get device filename and type from frame parameters.
src/frame.h (FRAME_FOREGROUND_PIXEL, FRAME_BACKGROUND_PIXEL): Do the right thing
if the frame is a tty.
(struct frame): New member in output_data: tty.
(make_terminal_frame): Updated of prototype.
src/keyboard.c (Fset_input_mode): Call reset_all_sys_modes(), not
reset_sys_modes(). Ditto with init_sys_modes().
src/lisp.h (tty_output): Added forward declaration.
(init_sys_modes, reset_sys_modes): Updated prototype.
(init_all_sys_modes, reset_all_sys_modes): New prototypes.
src/scroll.c: Replace CURTTY() with local variables throughout the file (where applicable).
src/sysdep.c (old_tty, term_initted, old_tty_valid): Moved to struct tty_output.(
(init_all_sys_modes): New function.
(init_sys_modes): Added tty_output parameter. Use it.
(reset_all_sys_modes): New function.
(reset_sys_modes): Added tty_output parameter. Use it.
src/Makefile.in: Update dependencies.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-2
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Thu, 25 Dec 2003 06:59:31 +0000 |
parents | 695cf19ef79e |
children | 6fb026ad601f 375f2633d815 |
line wrap: on
line source
;;; autoarg.el --- make digit keys supply prefix args ;; Copyright (C) 1998, 2000 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Created: 1998-09-04 ;; Keywords: abbrev, emulations ;; 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: ;; This provides `autoarg-mode', a global minor mode meant to emulate ;; a facility reported from Twenex Emacs whereby digit keys supplied ;; prefix args rather than self inserting, with a digit sequence ;; terminated by space acting to insert the digits. ;; The bindings of DIGIT and C-DIGIT are swapped and a command bound ;; to SPC deals with a numeric prefix arg or acts normally without ;; such an arg. (In the absence of a suitable terminal, you'd ;; probably want to swap DIGIT and M-DIGIT.) See the mode doc. ;; You probably don't really want to use this. ;; Also provides `autoarg-kp-mode' which is similar, but leaves the ;; digit keys alone and redefines the `keypad' keys, `kp-1' &c as ;; digit arguments. (Use `NumLock' if necessary to generate kp-N.) ;; You're more likely to want to use this. ;;; Code: (defvar autoarg-mode-map (let ((map (make-sparse-keymap))) ;; Loop over digit characters to set up keymap. (dotimes (i 10) (define-key map `[,(+ ?0 i)] 'digit-argument) (define-key map `[(control ,(+ ?0 i))] 'self-insert-command)) (define-key map " " 'autoarg-terminate) map) "Keymap for Autoarg mode.") ;; Logical additions: ;; (define-key autoarg-mode-map [?-] 'negative-argument) ;; (define-key autoarg-mode-map [(control ?-)] 'self-insert-command) ;; A sensible/addition? ;; (define-key autoarg-mode-map [?\r] 'autoarg-terminate) (defvar autoarg-kp-digits (let (alist) (dotimes (i 10 alist) (push (cons (intern (format "kp-%d" i)) i) alist)))) (defun autoarg-kp-digit-argument (arg) "Part of the numeric argument for the next command, like `digit-argument'." (interactive "P") (let ((digit (cdr (assq last-command-char autoarg-kp-digits)))) (cond ((integerp arg) (setq prefix-arg (+ (* arg 10) (if (< arg 0) (- digit) digit)))) ((eq arg '-) ;; Treat -0 as just -, so that -01 will work. (setq prefix-arg (if (zerop digit) '- (- digit)))) (t (setq prefix-arg digit)))) (setq universal-argument-num-events (length (this-command-keys))) (setq overriding-terminal-local-map universal-argument-map)) (defvar autoarg-kp-mode-map (let ((map (make-sparse-keymap))) ;; Loop over digit characters to set up keymap. (dotimes (i 10) (let ((sym (intern (format "kp-%d" i)))) (define-key map (vector sym) 'autoarg-kp-digit-argument))) (define-key map [kp-subtract] 'negative-argument) map) "Keymap for Autoarg-KP mode.") ;;;###autoload (define-minor-mode autoarg-mode "Toggle Autoarg minor mode globally. With ARG, turn Autoarg mode on if ARG is positive, off otherwise. \\<autoarg-mode-map> In Autoarg mode digits are bound to `digit-argument' -- i.e. they supply prefix arguments as C-DIGIT and M-DIGIT normally do -- and C-DIGIT inserts DIGIT. \\[autoarg-terminate] terminates the prefix sequence and inserts the digits of the autoarg sequence into the buffer. Without a numeric prefix arg the normal binding of \\[autoarg-terminate] is invoked, i.e. what it would be with Autoarg mode off. For example: `6 9 \\[autoarg-terminate]' inserts `69' into the buffer, as does `C-6 C-9'. `6 9 a' inserts 69 `a's into the buffer. `6 9 \\[autoarg-terminate] \\[autoarg-terminate]' inserts `69' into the buffer and then invokes the normal binding of \\[autoarg-terminate]. `C-u \\[autoarg-terminate]' invokes the normal binding of \\[autoarg-terminate] four times. \\{autoarg-mode-map}" nil " Aarg" autoarg-mode-map :global t :group 'keyboard) ;;;###autoload (define-minor-mode autoarg-kp-mode "Toggle Autoarg-KP minor mode globally. With ARG, turn Autoarg mode on if ARG is positive, off otherwise. \\<autoarg-kp-mode-map> This is similar to \\[autoarg-mode] but rebinds the keypad keys `kp-1' &c to supply digit arguments. \\{autoarg-kp-mode-map}" nil " Aakp" autoarg-kp-mode-map :global t :group 'keyboard (if autoarg-kp-mode (dotimes (i 10) (let ((sym (intern (format "kp-%d" i)))) (define-key universal-argument-map (vector sym) 'autoarg-kp-digit-argument))) (dotimes (i 10) (let ((sym (intern (format "kp-%d" i)))) (define-key universal-argument-map (vector sym) nil))))) (defun autoarg-terminate (n) "Maybe terminate a digit prefix sequence. With a non-negative numeric prefix arg, insert the digits comprising the arg into the current buffer. Otherwise use the binding of the key which invoked this function, excluding the Autoarg keymap." (interactive "P") (if (numberp n) (insert (number-to-string n)) (let* ((autoarg-mode nil) ; hide the bindings (binding (key-binding (this-single-command-keys)))) (if binding (call-interactively binding))))) (provide 'autoarg) ;;; arch-tag: 2ba2ab4f-d60e-402a-ae4d-37e29af723c2 ;;; autoarg.el ends here