Mercurial > emacs
view lisp/calc/calc-incom.el @ 83004:7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
lib-src/emacsclient.c (window_change_signal): Renamed to pass_signal_to_emacs.
(init_signal): Pass SIGINT and SIGQUIT to the emacs process.
lisp/faces.el (face-valid-attribute-values): Use the window-system
function, not the variable.
(read-face-attribute, face-spec-set-match-display, frame-set-background-mode)
(face-set-after-frame-default): Ditto.
lisp/frame.el (make-frame-on-tty): Added interactive declaration
(suggested by Robert J. Chassell). Use tty-create-frame-with-faces,
not make-terminal-frame.
src/termhooks.h (struct display_method): Renamed to display for brevity.
(struct display): Added all display hook variables as members of this structure.
Added next_display, reference_count, type and display_info components.
(FRAME_MUST_WRITE_SPACES, FRAME_FAST_CLEAR_END_OF_LINE, FRAME_LINE_INS_DEL_OK)
(FRAME_CHAR_INS_DEL_OK, FRAME_SCROLL_REGION_OK, FRAME_SCROLL_REGION_COST)
(FRAME_MEMORY_BELOW_FRAME, FRAME_RIF): Updated for struct display.
(FRAME_DISPLAY): New macro.
(create_display, delete_display): New prototypes.
src/frame.h (struct frame): Added `display' member, removed display_method.
(FRAME_LIVE_P): Look at f->display, not f->output_data.
src/termchar.h (struct tty_display_info): Removed display_method component.
(FRAME_TTY): Use the display structure, not output_data.
src/term.c (display_list): New variable.
(cursor_to_hook, raw_cursor_to_hook, clear_to_end_hook, clear_frame_hook)
(clear_end_of_line_hook, ins_del_lines_hook, delete_glyphs_hook)
(ring_bell_hook, reset_terminal_modes_hook, set_terminal_modes_hook)
(update_begin_hook, update_end_hook, set_terminal_window_hook)
(insert_glyphs_hook, write_glyphs_hook, delete_glyphs_hoo, read_socket_hook)
(frame_up_to_date_hook, mouse_position_hook, frame_rehighlight_hook)
(frame_raise_lower_hook, set_vertical_scroll_bar_hook, condemn_scroll_bars_hook)
(redeem_scroll_bar_hook, judge_scroll_bars_hook): Moved to struct display.
(tty_display_method_template): Removed.
(syms_of_term): Don't initialize tty_display_method_template.
(ring_bell, set_terminal_modes, reset_terminal_modes, update_begin)
(update_end, set_terminal_window, cursor_to, raw_cursor_to, clear_to_end)
(clear_frame, clear_end_of_line, write_glyphs, insert_glyphs)
(delete_glyphs, ins_del_lines): Access display hooks through the frame pointer.
(Ftty_display_color_p): Use the frame given as a parameter, or else return nil.
(Ftty_display_color_cells): Ditto.
(get_named_tty): Renamed to get_named_tty_display, changed return type to struct display.
(term_dummy_init): Renamed to initial_term_init. Create and return an initial display.
(term_init): Initialize a new struct display and return a pointer to
it instead of tty_display_info. Removed frame initialization kludge.
(Fdelete_tty): Updated for struct display.
(delete_tty): The parameter type is now struct display, not tty_display_info.
Delete the display, too.
(create_tty_output): New function for creating tty_output structures.
(delete_tty_output): New function for deleting tty_output structures.
(create_display): New function for creating and registering display structures.
(delete_display): New function for deleting and unregistering display structures.
src/dispextern.h: Updated prototypes.
src/dispnew.c: Include frame.h before termhooks.h.
(init_display): Updated term_init call to new signature.
src/emacs.c: Include frame.h (for termhooks.h).
src/keymap.c: Ditto.
src/lread.c: Ditto.
src/xsmfns.c: Ditto.
src/process.c: Include frame.h before termhooks.h.
src/frame.c (Fwindow_system): New function.
(syms_of_frame): Initialize it.
(make_terminal_frame): Open the terminal device before creating the new frame.
Disable scrollbars here, term_init cannot do that anymore.
(Fdelete_frame): Use the new delete_frame_hook, don't do display-specific
frame deletion here. Ditto for delete_display_hook.
(Fmouse_position, Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus): Access display hooks through the frame pointer.
src/keyboard.c: Include frame.h before termhooks.h.
(start_polling, input_polling_used, stop_polling, gobble_input): Ignore read_socket_hook.
(kbd_buffer_get_event, Fset_input_mode): Access display hooks through the frame pointer.
(read_avail_input): Loop through all display devices for and call all read_socket_hook functions. Check ttys even if read_socket_hook returned an error.
src/sysdep.c (discard_tty_input): Ignore read_socket_hook.
(stuff_char): Don't do anything if the current frame is not on a termcap display.
(request_sigio, unrequest_sigio): Ignore read_socket_hook.
(init_sys_modes): Always call narrow_foreground_group. Set up terminal modes and sigio even under X.
src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window): Access display hooks through the frame pointer.
(echo_area_display): Don't be afraid of termcap frames during an X+tty combo session.
src/xfaces.c: Include termhooks.h.
(Ftty_supports_face_attributes_p): Use the given frame, not selected_frame.
src/xfns.c (x_set_scroll_bar_foreground, x_set_scroll_bar_background): Access display hooks through the frame pointer.
(Fx_create_frame, x_create_tip_frame): Initialize the frame's display structure.
src/xmenu.c: Include termhooks.h after frame.h.
src/xselect.c (x_own_selection, some_frame_on_display, x_get_foreign_selection)
(Fx_disown_selection_internal, Fx_get_cut_buffer_internal)
(Fx_store_cut_buffer_internal, Fx_rotate_cut_buffers_internal): Don't do anything
if the selected frame is not an X frame.
src/xterm.c (x_display_method): Removed.
(x_create_frame_display, x_delete_frame_display): New functions for handling struct display objects.
(x_term_init): Set up a new struct display object, too.
(x_delete_display): Delete the struct display corresponding to the X display.
(x_initialize): Moved hook initialization to x_create_frame_display.
src/xterm.h (x_display_method): Removed.
(struct x_display_info): Added frame_display component.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-44
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 05 Jan 2004 05:54:35 +0000 |
parents | 695cf19ef79e |
children | 8dc3dd828d67 375f2633d815 |
line wrap: on
line source
;;; calc-incom.el --- complex data type input functions for Calc ;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> ;; Maintainers: D. Goel <deego@gnufans.org> ;; Colin Walters <walters@debian.org> ;; This file is part of GNU Emacs. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY. No author or distributor ;; accepts responsibility to anyone for the consequences of using it ;; or for whether it serves any particular purpose or works at all, ;; unless he says so in writing. Refer to the GNU Emacs General Public ;; License for full details. ;; Everyone is granted permission to copy, modify and redistribute ;; GNU Emacs, but only under the conditions described in the ;; GNU Emacs General Public License. A copy of this license is ;; supposed to have been given to you along with GNU Emacs so you ;; can know your rights and responsibilities. It should be in a ;; file named COPYING. Among other things, the copyright notice ;; and this notice must be preserved on all copies. ;;; Commentary: ;;; Code: ;; This file is autoloaded from calc-ext.el. (require 'calc-ext) (require 'calc-macs) (defun calc-Need-calc-incom () nil) ;;; Incomplete forms. (defun calc-begin-complex () (interactive) (calc-wrapper (if (or calc-algebraic-mode calc-incomplete-algebraic-mode) (calc-alg-entry "(") (calc-push (list 'incomplete calc-complex-mode))))) (defun calc-end-complex () (interactive) (calc-comma t) (calc-wrapper (let ((top (calc-top 1))) (if (and (eq (car-safe top) 'incomplete) (eq (nth 1 top) 'intv)) (progn (if (< (length top) 4) (setq top (append top '((neg (var inf var-inf)))))) (if (< (length top) 5) (setq top (append top '((var inf var-inf))))) (calc-enter-result 1 "..)" (cdr top))) (if (not (and (eq (car-safe top) 'incomplete) (memq (nth 1 top) '(cplx polar)))) (error "Not entering a complex number")) (while (< (length top) 4) (setq top (append top '(0)))) (if (not (and (math-realp (nth 2 top)) (math-anglep (nth 3 top)))) (error "Components must be real")) (calc-enter-result 1 "()" (cdr top)))))) (defun calc-begin-vector () (interactive) (calc-wrapper (if (or calc-algebraic-mode calc-incomplete-algebraic-mode) (calc-alg-entry "[") (calc-push '(incomplete vec))))) (defun calc-end-vector () (interactive) (calc-comma t) (calc-wrapper (let ((top (calc-top 1))) (if (and (eq (car-safe top) 'incomplete) (eq (nth 1 top) 'intv)) (progn (if (< (length top) 4) (setq top (append top '((neg (var inf var-inf)))))) (if (< (length top) 5) (setq top (append top '((var inf var-inf))))) (setcar (cdr (cdr top)) (1+ (nth 2 top))) (calc-enter-result 1 "..]" (cdr top))) (if (not (and (eq (car-safe top) 'incomplete) (eq (nth 1 top) 'vec))) (error "Not entering a vector")) (calc-pop-push-record 1 "[]" (cdr top)))))) (defun calc-comma (&optional allow-polar) (interactive) (calc-wrapper (let ((num (calc-find-first-incomplete (nthcdr calc-stack-top calc-stack) 1))) (if (= num 0) (error "Not entering a vector or complex number")) (let* ((inc (calc-top num)) (stuff (calc-top-list (1- num))) (new (append inc stuff))) (if (and (null stuff) (not allow-polar) (or (eq (nth 1 inc) 'vec) (< (length new) 4))) (setq new (append new (if (= (length new) 2) '(0) (nthcdr (1- (length new)) new))))) (or allow-polar (if (eq (nth 1 new) 'polar) (setq new (append '(incomplete cplx) (cdr (cdr new)))) (if (eq (nth 1 new) 'intv) (setq new (append '(incomplete cplx) (cdr (cdr (cdr new)))))))) (if (and (memq (nth 1 new) '(cplx polar)) (> (length new) 4)) (error "Too many components in complex number")) (if (and (eq (nth 1 new) 'intv) (> (length new) 5)) (error "Too many components in interval form")) (calc-pop-push num new))))) (defun calc-semi () (interactive) (calc-wrapper (let ((num (calc-find-first-incomplete (nthcdr calc-stack-top calc-stack) 1))) (if (= num 0) (error "Not entering a vector or complex number")) (let ((inc (calc-top num)) (stuff (calc-top-list (1- num)))) (if (eq (nth 1 inc) 'cplx) (setq inc (append '(incomplete polar) (cdr (cdr inc)))) (if (eq (nth 1 inc) 'intv) (setq inc (append '(incomplete polar) (cdr (cdr (cdr inc))))))) (cond ((eq (nth 1 inc) 'polar) (let ((new (append inc stuff))) (if (> (length new) 4) (error "Too many components in complex number") (if (= (length new) 2) (setq new (append new '(1))))) (calc-pop-push num new))) ((null stuff) (if (> (length inc) 2) (if (math-vectorp (nth 2 inc)) (calc-comma) (calc-pop-push 1 (list 'incomplete 'vec (cdr (cdr inc))) (list 'incomplete 'vec))))) ((math-vectorp (car stuff)) (calc-comma)) ((eq (car-safe (car-safe (nth (+ num calc-stack-top) calc-stack))) 'incomplete) (calc-end-vector) (calc-comma) (let ((calc-algebraic-mode nil) (calc-incomplete-algebraic-mode nil)) (calc-begin-vector))) ((or (= (length inc) 2) (math-vectorp (nth 2 inc))) (calc-pop-push num (append inc (list (cons 'vec stuff))) (list 'incomplete 'vec))) (t (calc-pop-push num (list 'incomplete 'vec (cons 'vec (append (cdr (cdr inc)) stuff))) (list 'incomplete 'vec)))))))) (defun calc-digit-dots () (if (eq calc-prev-char ?.) (progn (delete-backward-char 1) (if (calc-minibuffer-contains ".*\\.\\'") (delete-backward-char 1)) (setq calc-prev-char 'dots last-command-char 32) (if calc-prev-prev-char (calcDigit-nondigit) (setq calc-digit-value nil) (erase-buffer) (exit-minibuffer))) ;; just ignore extra decimal point, anticipating ".." (delete-backward-char 1))) (defun calc-dots () (interactive) (calc-wrapper (let ((num (calc-find-first-incomplete (nthcdr calc-stack-top calc-stack) 1))) (if (= num 0) (error "Not entering an interval form")) (let* ((inc (calc-top num)) (stuff (calc-top-list (1- num))) (new (append inc stuff))) (if (not (eq (nth 1 new) 'intv)) (setq new (append '(incomplete intv) (if (eq (nth 1 new) 'vec) '(2) '(0)) (cdr (cdr new))))) (if (and (null stuff) (= (length new) 3)) (setq new (append new '((neg (var inf var-inf)))))) (if (> (length new) 5) (error "Too many components in interval form")) (calc-pop-push num new))))) (defun calc-find-first-incomplete (stack n) (cond ((null stack) 0) ((eq (car-safe (car-safe (car stack))) 'incomplete) n) (t (calc-find-first-incomplete (cdr stack) (1+ n))))) (defun calc-incomplete-error (a) (cond ((memq (nth 1 a) '(cplx polar)) (error "Complex number is incomplete")) ((eq (nth 1 a) 'vec) (error "Vector is incomplete")) ((eq (nth 1 a) 'intv) (error "Interval form is incomplete")) (t (error "Object is incomplete")))) ;;; arch-tag: b8001270-4dc7-481b-a3e3-a952e19b390d ;;; calc-incom.el ends here