Mercurial > emacs
comparison src/xfns.c @ 2439:b6c62e4abf59
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.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Wed, 31 Mar 1993 10:55:33 +0000 |
parents | cec8c9490d8a |
children | a84b9a78ab08 |
comparison
equal
deleted
inserted
replaced
2438:b513de4de386 | 2439:b6c62e4abf59 |
---|---|
31 #include "frame.h" | 31 #include "frame.h" |
32 #include "window.h" | 32 #include "window.h" |
33 #include "buffer.h" | 33 #include "buffer.h" |
34 #include "dispextern.h" | 34 #include "dispextern.h" |
35 #include "keyboard.h" | 35 #include "keyboard.h" |
36 #include "blockinput.h" | |
36 | 37 |
37 #ifdef HAVE_X_WINDOWS | 38 #ifdef HAVE_X_WINDOWS |
38 extern void abort (); | 39 extern void abort (); |
39 | 40 |
40 #ifndef VMS | 41 #ifndef VMS |
2036 FRAME_X_WINDOW (f) = (Window) XINT (tem); | 2037 FRAME_X_WINDOW (f) = (Window) XINT (tem); |
2037 | 2038 |
2038 BLOCK_INPUT; | 2039 BLOCK_INPUT; |
2039 XGetWindowInfo (FRAME_X_WINDOW (f), &wininfo); | 2040 XGetWindowInfo (FRAME_X_WINDOW (f), &wininfo); |
2040 XQueryTree (FRAME_X_WINDOW (f), &parent, &nchildren, &children); | 2041 XQueryTree (FRAME_X_WINDOW (f), &parent, &nchildren, &children); |
2041 free (children); | 2042 xfree (children); |
2042 UNBLOCK_INPUT; | 2043 UNBLOCK_INPUT; |
2043 | 2044 |
2044 height = PIXEL_TO_CHAR_HEIGHT (f, wininfo.height); | 2045 height = PIXEL_TO_CHAR_HEIGHT (f, wininfo.height); |
2045 width = PIXEL_TO_CHAR_WIDTH (f, wininfo.width); | 2046 width = PIXEL_TO_CHAR_WIDTH (f, wininfo.width); |
2046 f->display.x->left_pos = wininfo.x; | 2047 f->display.x->left_pos = wininfo.x; |
2285 Window *children; | 2286 Window *children; |
2286 XQueryWindow (tempwindow, &wininfo); | 2287 XQueryWindow (tempwindow, &wininfo); |
2287 *x -= wininfo.x; | 2288 *x -= wininfo.x; |
2288 *y -= wininfo.y; | 2289 *y -= wininfo.y; |
2289 XQueryTree (tempwindow, &tempwindow, &nchildren, &children); | 2290 XQueryTree (tempwindow, &tempwindow, &nchildren, &children); |
2290 free (children); | 2291 xfree (children); |
2291 } | 2292 } |
2292 | 2293 |
2293 UNBLOCK_INPUT; | 2294 UNBLOCK_INPUT; |
2294 return tempwindow != 0; | 2295 return tempwindow != 0; |
2295 } | 2296 } |