diff options
| author | Jim Blandy | 1993-03-31 10:55:33 +0000 |
|---|---|---|
| committer | Jim Blandy | 1993-03-31 10:55:33 +0000 |
| commit | 9ac0d9e04198806161ea21e49b0be04e5253fa57 (patch) | |
| tree | 66bd402e5ebbb6f362446a2baee28245cd953c8f /src/term.c | |
| parent | 357f32fcd0e00337a3c1359a4919e716ed81fe52 (diff) | |
| download | emacs-9ac0d9e04198806161ea21e49b0be04e5253fa57.tar.gz emacs-9ac0d9e04198806161ea21e49b0be04e5253fa57.zip | |
Put interrupt input blocking in a separate file from xterm.h.
This isn't specific to X, and it allows us to avoid #including
xterm.h in files that don't really have anything to do with X.
* blockinput.h: New file.
* xterm.h (BLOCK_INPUT, UNBLOCK_INPUT, TOTALLY_UNBLOCK_INPUT,
UNBLOCK_INPUT_RESIGNAL): These are now in blockinput.h.
(x_input_blocked, x_pending_input): Deleted; there are analogs
in blockinput.h called interrupt_input_blocked and
interrupt_input_pending.
* keyboard.c (interrupt_input_blocked, interrupt_input_pending):
New variables, used by the macros in blockinput.h.
* xterm.c: #include blockinput.h.
(x_input_blocked, x_pending_input): Deleted.
(XTread_socket): Test and set interrupt_input_blocked and
interrupt_input_pending instead of the old variables.
* alloc.c, xfaces.c, xfns.c, xmenu.c, xselect.c, keymap.c:
#include blockinput.h.
* eval.c: #include blockinput.h instead of xterm.h.
* keyboard.c: #include blockinput.h.
(input_poll_signal): Just test
interrupt_input_blocked, instead of testing HAVE_X_WINDOWS and
x_input_blocked.
Block the processing of interrupt input while we're manipulating the
malloc heap.
* alloc.c: (xfree): New function, to make it easy to free things
safely.
(xmalloc, xrealloc): Block X input while doing the deed.
(VALIDATE_LISP_STORAGE, gc_sweep, compact_strings): Use xfree
instead of free.
(uninterrupt_malloc): New function, to install input-blocking
hooks into the GNU malloc routines.
* emacs.c [not SYSTEM_MALLOC] (main): Call uninterrupt_malloc
on startup.
* alloc.c: (make_interval, make_float, Fcons, Fmake_vector,
Fmake_symbol, Fmake_marker, make_uninit_string, Fgarbage_collect):
Use xmalloc instead of malloc; don't bother to check if out of
memory here.
(Fgarbage_collect): Call xrealloc instead of realloc.
* buffer.c: Use xmalloc and xfree instead of malloc and free;
don't bother to check if out of memory here.
(Fget_buffer_create): Put BLOCK_INPUT/UNBLOCK_INPUT pair around
calls to ralloc routines.
* insdel.c: Same.
* lisp.h (xfree): New extern declaration.
* xfaces.c (xfree): Don't #define this to be free; use the
definition in alloc.c.
* dispnew.c, doc.c, doprnt.c, fileio.c, lread.c, term.c, xfns.c,
xmenu.c, xterm.c: Use xfree instead of free.
* hftctl.c: Use xfree and xmalloc instead of free and malloc.
* keymap.c (current_minor_maps): BLOCK_INPUT while calling realloc
and malloc.
* search.c: Since the regexp routines can malloc, BLOCK_INPUT
while runing them. #include blockinput.h.
* sysdep.c: #include blockinput.h. Call xfree and xmalloc instead
of free and malloc. BLOCK_INPUT around routines which we know
will call malloc.
ymakefile (keyboard.o, keymap.o, search.o, sysdep.o, xfaces.o,
xfns.o, xmenu.o, xterm.o, xselect.o, alloc.o, eval.o): Note that
these depend on blockinput.h.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/term.c b/src/term.c index ffc8f83c886..0b59e13b9fc 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -382,7 +382,7 @@ set_scroll_region (start, stop) | |||
| 382 | buf = tparam (TS_set_window, 0, 0, start, 0, stop, FRAME_WIDTH (selected_frame)); | 382 | buf = tparam (TS_set_window, 0, 0, start, 0, stop, FRAME_WIDTH (selected_frame)); |
| 383 | } | 383 | } |
| 384 | OUTPUT (buf); | 384 | OUTPUT (buf); |
| 385 | free (buf); | 385 | xfree (buf); |
| 386 | losecursor (); | 386 | losecursor (); |
| 387 | } | 387 | } |
| 388 | 388 | ||
| @@ -787,7 +787,7 @@ insert_glyphs (start, len) | |||
| 787 | { | 787 | { |
| 788 | buf = tparam (TS_ins_multi_chars, 0, 0, len); | 788 | buf = tparam (TS_ins_multi_chars, 0, 0, len); |
| 789 | OUTPUT1 (buf); | 789 | OUTPUT1 (buf); |
| 790 | free (buf); | 790 | xfree (buf); |
| 791 | if (start) | 791 | if (start) |
| 792 | write_glyphs (start, len); | 792 | write_glyphs (start, len); |
| 793 | return; | 793 | return; |
| @@ -851,7 +851,7 @@ delete_glyphs (n) | |||
| 851 | { | 851 | { |
| 852 | buf = tparam (TS_del_multi_chars, 0, 0, n); | 852 | buf = tparam (TS_del_multi_chars, 0, 0, n); |
| 853 | OUTPUT1 (buf); | 853 | OUTPUT1 (buf); |
| 854 | free (buf); | 854 | xfree (buf); |
| 855 | } | 855 | } |
| 856 | else | 856 | else |
| 857 | for (i = 0; i < n; i++) | 857 | for (i = 0; i < n; i++) |
| @@ -896,7 +896,7 @@ ins_del_lines (vpos, n) | |||
| 896 | background_highlight (); | 896 | background_highlight (); |
| 897 | buf = tparam (multi, 0, 0, i); | 897 | buf = tparam (multi, 0, 0, i); |
| 898 | OUTPUT (buf); | 898 | OUTPUT (buf); |
| 899 | free (buf); | 899 | xfree (buf); |
| 900 | } | 900 | } |
| 901 | else if (single) | 901 | else if (single) |
| 902 | { | 902 | { |