Mercurial > emacs
annotate 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 |
rev | line source |
---|---|
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
1 ;;; calc-incom.el --- complex data type input functions for Calc |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
2 |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
3 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc. |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
4 |
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
5 ;; Author: David Gillespie <daveg@synaptics.com> |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49263
diff
changeset
|
6 ;; Maintainers: D. Goel <deego@gnufans.org> |
49263
f4d68f97221e
Add new maintainer (deego).
Deepak Goel <deego@gnufans.org>
parents:
41271
diff
changeset
|
7 ;; Colin Walters <walters@debian.org> |
40785 | 8 |
9 ;; This file is part of GNU Emacs. | |
10 | |
11 ;; GNU Emacs is distributed in the hope that it will be useful, | |
12 ;; but WITHOUT ANY WARRANTY. No author or distributor | |
13 ;; accepts responsibility to anyone for the consequences of using it | |
14 ;; or for whether it serves any particular purpose or works at all, | |
15 ;; unless he says so in writing. Refer to the GNU Emacs General Public | |
16 ;; License for full details. | |
17 | |
18 ;; Everyone is granted permission to copy, modify and redistribute | |
19 ;; GNU Emacs, but only under the conditions described in the | |
20 ;; GNU Emacs General Public License. A copy of this license is | |
21 ;; supposed to have been given to you along with GNU Emacs so you | |
22 ;; can know your rights and responsibilities. It should be in a | |
23 ;; file named COPYING. Among other things, the copyright notice | |
24 ;; and this notice must be preserved on all copies. | |
25 | |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
26 ;;; Commentary: |
40785 | 27 |
41271
fcd507927105
Change all toplevel `setq' forms to `defvar' forms, and move them
Colin Walters <walters@gnu.org>
parents:
41047
diff
changeset
|
28 ;;; Code: |
40785 | 29 |
30 ;; This file is autoloaded from calc-ext.el. | |
31 (require 'calc-ext) | |
32 | |
33 (require 'calc-macs) | |
34 | |
35 (defun calc-Need-calc-incom () nil) | |
36 | |
37 | |
38 ;;; Incomplete forms. | |
39 | |
40 (defun calc-begin-complex () | |
41 (interactive) | |
42 (calc-wrapper | |
43 (if (or calc-algebraic-mode calc-incomplete-algebraic-mode) | |
44 (calc-alg-entry "(") | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
45 (calc-push (list 'incomplete calc-complex-mode))))) |
40785 | 46 |
47 (defun calc-end-complex () | |
48 (interactive) | |
49 (calc-comma t) | |
50 (calc-wrapper | |
51 (let ((top (calc-top 1))) | |
52 (if (and (eq (car-safe top) 'incomplete) | |
53 (eq (nth 1 top) 'intv)) | |
54 (progn | |
55 (if (< (length top) 4) | |
56 (setq top (append top '((neg (var inf var-inf)))))) | |
57 (if (< (length top) 5) | |
58 (setq top (append top '((var inf var-inf))))) | |
59 (calc-enter-result 1 "..)" (cdr top))) | |
60 (if (not (and (eq (car-safe top) 'incomplete) | |
61 (memq (nth 1 top) '(cplx polar)))) | |
62 (error "Not entering a complex number")) | |
63 (while (< (length top) 4) | |
64 (setq top (append top '(0)))) | |
65 (if (not (and (math-realp (nth 2 top)) | |
66 (math-anglep (nth 3 top)))) | |
67 (error "Components must be real")) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
68 (calc-enter-result 1 "()" (cdr top)))))) |
40785 | 69 |
70 (defun calc-begin-vector () | |
71 (interactive) | |
72 (calc-wrapper | |
73 (if (or calc-algebraic-mode calc-incomplete-algebraic-mode) | |
74 (calc-alg-entry "[") | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
75 (calc-push '(incomplete vec))))) |
40785 | 76 |
77 (defun calc-end-vector () | |
78 (interactive) | |
79 (calc-comma t) | |
80 (calc-wrapper | |
81 (let ((top (calc-top 1))) | |
82 (if (and (eq (car-safe top) 'incomplete) | |
83 (eq (nth 1 top) 'intv)) | |
84 (progn | |
85 (if (< (length top) 4) | |
86 (setq top (append top '((neg (var inf var-inf)))))) | |
87 (if (< (length top) 5) | |
88 (setq top (append top '((var inf var-inf))))) | |
89 (setcar (cdr (cdr top)) (1+ (nth 2 top))) | |
90 (calc-enter-result 1 "..]" (cdr top))) | |
91 (if (not (and (eq (car-safe top) 'incomplete) | |
92 (eq (nth 1 top) 'vec))) | |
93 (error "Not entering a vector")) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
94 (calc-pop-push-record 1 "[]" (cdr top)))))) |
40785 | 95 |
96 (defun calc-comma (&optional allow-polar) | |
97 (interactive) | |
98 (calc-wrapper | |
99 (let ((num (calc-find-first-incomplete | |
100 (nthcdr calc-stack-top calc-stack) 1))) | |
101 (if (= num 0) | |
102 (error "Not entering a vector or complex number")) | |
103 (let* ((inc (calc-top num)) | |
104 (stuff (calc-top-list (1- num))) | |
105 (new (append inc stuff))) | |
106 (if (and (null stuff) | |
107 (not allow-polar) | |
108 (or (eq (nth 1 inc) 'vec) | |
109 (< (length new) 4))) | |
110 (setq new (append new | |
111 (if (= (length new) 2) | |
112 '(0) | |
113 (nthcdr (1- (length new)) new))))) | |
114 (or allow-polar | |
115 (if (eq (nth 1 new) 'polar) | |
116 (setq new (append '(incomplete cplx) (cdr (cdr new)))) | |
117 (if (eq (nth 1 new) 'intv) | |
118 (setq new (append '(incomplete cplx) | |
119 (cdr (cdr (cdr new)))))))) | |
120 (if (and (memq (nth 1 new) '(cplx polar)) | |
121 (> (length new) 4)) | |
122 (error "Too many components in complex number")) | |
123 (if (and (eq (nth 1 new) 'intv) | |
124 (> (length new) 5)) | |
125 (error "Too many components in interval form")) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
126 (calc-pop-push num new))))) |
40785 | 127 |
128 (defun calc-semi () | |
129 (interactive) | |
130 (calc-wrapper | |
131 (let ((num (calc-find-first-incomplete | |
132 (nthcdr calc-stack-top calc-stack) 1))) | |
133 (if (= num 0) | |
134 (error "Not entering a vector or complex number")) | |
135 (let ((inc (calc-top num)) | |
136 (stuff (calc-top-list (1- num)))) | |
137 (if (eq (nth 1 inc) 'cplx) | |
138 (setq inc (append '(incomplete polar) (cdr (cdr inc)))) | |
139 (if (eq (nth 1 inc) 'intv) | |
140 (setq inc (append '(incomplete polar) (cdr (cdr (cdr inc))))))) | |
141 (cond ((eq (nth 1 inc) 'polar) | |
142 (let ((new (append inc stuff))) | |
143 (if (> (length new) 4) | |
144 (error "Too many components in complex number") | |
145 (if (= (length new) 2) | |
146 (setq new (append new '(1))))) | |
147 (calc-pop-push num new))) | |
148 ((null stuff) | |
149 (if (> (length inc) 2) | |
150 (if (math-vectorp (nth 2 inc)) | |
151 (calc-comma) | |
152 (calc-pop-push 1 | |
153 (list 'incomplete 'vec (cdr (cdr inc))) | |
154 (list 'incomplete 'vec))))) | |
155 ((math-vectorp (car stuff)) | |
156 (calc-comma)) | |
157 ((eq (car-safe (car-safe (nth (+ num calc-stack-top) | |
158 calc-stack))) 'incomplete) | |
159 (calc-end-vector) | |
160 (calc-comma) | |
161 (let ((calc-algebraic-mode nil) | |
162 (calc-incomplete-algebraic-mode nil)) | |
163 (calc-begin-vector))) | |
164 ((or (= (length inc) 2) | |
165 (math-vectorp (nth 2 inc))) | |
166 (calc-pop-push num | |
167 (append inc (list (cons 'vec stuff))) | |
168 (list 'incomplete 'vec))) | |
169 (t | |
170 (calc-pop-push num | |
171 (list 'incomplete 'vec | |
172 (cons 'vec (append (cdr (cdr inc)) stuff))) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
173 (list 'incomplete 'vec)))))))) |
40785 | 174 |
175 (defun calc-digit-dots () | |
176 (if (eq calc-prev-char ?.) | |
177 (progn | |
178 (delete-backward-char 1) | |
179 (if (calc-minibuffer-contains ".*\\.\\'") | |
180 (delete-backward-char 1)) | |
181 (setq calc-prev-char 'dots | |
182 last-command-char 32) | |
183 (if calc-prev-prev-char | |
184 (calcDigit-nondigit) | |
185 (setq calc-digit-value nil) | |
186 (erase-buffer) | |
187 (exit-minibuffer))) | |
188 ;; just ignore extra decimal point, anticipating ".." | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
189 (delete-backward-char 1))) |
40785 | 190 |
191 (defun calc-dots () | |
192 (interactive) | |
193 (calc-wrapper | |
194 (let ((num (calc-find-first-incomplete | |
195 (nthcdr calc-stack-top calc-stack) 1))) | |
196 (if (= num 0) | |
197 (error "Not entering an interval form")) | |
198 (let* ((inc (calc-top num)) | |
199 (stuff (calc-top-list (1- num))) | |
200 (new (append inc stuff))) | |
201 (if (not (eq (nth 1 new) 'intv)) | |
202 (setq new (append '(incomplete intv) | |
203 (if (eq (nth 1 new) 'vec) '(2) '(0)) | |
204 (cdr (cdr new))))) | |
205 (if (and (null stuff) | |
206 (= (length new) 3)) | |
207 (setq new (append new '((neg (var inf var-inf)))))) | |
208 (if (> (length new) 5) | |
209 (error "Too many components in interval form")) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
210 (calc-pop-push num new))))) |
40785 | 211 |
212 (defun calc-find-first-incomplete (stack n) | |
213 (cond ((null stack) | |
214 0) | |
215 ((eq (car-safe (car-safe (car stack))) 'incomplete) | |
216 n) | |
217 (t | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
218 (calc-find-first-incomplete (cdr stack) (1+ n))))) |
40785 | 219 |
220 (defun calc-incomplete-error (a) | |
221 (cond ((memq (nth 1 a) '(cplx polar)) | |
222 (error "Complex number is incomplete")) | |
223 ((eq (nth 1 a) 'vec) | |
224 (error "Vector is incomplete")) | |
225 ((eq (nth 1 a) 'intv) | |
226 (error "Interval form is incomplete")) | |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
227 (t (error "Object is incomplete")))) |
40785 | 228 |
52401 | 229 ;;; arch-tag: b8001270-4dc7-481b-a3e3-a952e19b390d |
41047
73f364fd8aaa
Style cleanup; don't put closing parens on their
Colin Walters <walters@gnu.org>
parents:
40785
diff
changeset
|
230 ;;; calc-incom.el ends here |