Mercurial > hg > xemacs-beta
view src/libinterface.h @ 1268:fffe735e63ee
[xemacs-hg @ 2003-02-07 11:50:50 by ben]
fixes for menu crashes + better preemption behavior
This contains two related changes:
(1) Fix problems with reentrant calling of lwlib and associated
crashes when selecting menu items.
(2) Improve redisplay handling of preemption. Turn on lazy lock
and hold down page-down or page-up and you'll see what I mean.
They are related because they both touch on the code that retrieves
events and handles the internal queues.
console-msw.h, event-msw.c, event-stream.c, events.h, menubar-msw.c, menubar-x.c, menubar.h: mswindows_protect_modal_loop() has been generalized to
event_stream_protect_modal_loop(), and moved to event-stream.c.
mswindows_in_modal_loop ->in_modal_loop likewise. Changes in
event-msw.c and menubar-msw.c for the new names and calling format
(use structures instead of static variables in menubar-msw.c).
Delete former in_menu_callback and use in_modal_loop in its place.
Remove emacs_mswindows_quit_check_disallowed_p(), superseded by
in_modal_loop. Use event_stream_protect_modal_loop() in
pre_activate_callback() so that we get no lwlib reentrancy.
Rearrange some of the code in event-msw.c to be grouped better.
Make mswindows_drain_windows_queue() respect in_modal_loop and
do nothing if so.
cmdloop.c, event-stream.c: Don't conditionalize on LWLIB_MENUBARS_LUCID when giving error when
in_modal_loop, and give better error.
event-Xt.c, event-gtk.c: If in_modal_loop, only retrieve process and timeout events.
Don't retrieve any X events because processing them can lead
to reentrancy in lwlib -> death.
event-stream.c: Remove unused parameter to check_event_stream_ok() and change
all callers.
lisp.h, event-stream.c: Rearrange some functions for increased clarity -- in particular,
group all the input-pending/QUIT-related stuff together, and
put right next to next-event stuff, to which it's related.
Add the concept of "HOW_MANY" -- when asking whether user input
is pending, you can ask if at least HOW_MANY events are pending,
not just if any are. Add parameter to detect_input_pending()
for this. Change recursive_sit_for from a Lisp_Object (which
could only be Qt or Qnil) to an int, like it should be.
event-Xt.c, event-gtk.c, event-xlike-inc.c: New file.
Abstract out similar code in event_{Xt/gtk}_pending_p() and write
only once, using include-file tricks. Rewrite this function to
implement HOW_MANY and only process events when not in_modal_loop.
event-msw.c: Implement HOW_MANY and only process events when not in_modal_loop.
event-tty.c: Implement HOW_MANY.
redisplay.c: Add var `max-preempts' to control maximum number of preempts.
(#### perhaps not useful) Rewrite preemption check so that,
rather than preempting when any user events are available, only
preempt when a certain number (currently 4) of them are backed up.
This effectively allows redisplay to proceed to completion in the
presence of a fast auto-repeat (usually the auto-repeating is
generated dynamically as necessary), and you get much better
display behavior with lazy-lock active.
event-unixoid.c: Comment changes.
event-stream.c: Rewrite discard-input much more simply and safely using the
drain-queue functions. I think the old version might loop
forever if called when in_modal_loop.
SEMI-UNRELATED CHANGES:
-----------------------
event-stream.c: Turn QUIT-checking back on when running the pre-idle hook so it
can be quit out of.
indent.c: Document exact functioning of `vertical-motion' better, and its
differences from GNU Emacs.
author | ben |
---|---|
date | Fri, 07 Feb 2003 11:50:54 +0000 |
parents | 26a2f3423141 |
children | 543769b89fed |
line wrap: on
line source
/* Define prototypes for graphics library interface functions. Copyright (C) 2002 Ben Wing. This file is part of XEmacs. XEmacs 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. XEmacs 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 XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ #ifndef INCLUDED_libinterface_h_ #define INCLUDED_libinterface_h_ #ifdef HAVE_GIF #include "gifrlib.h" #endif /* HAVE_GIF */ #ifdef HAVE_PNG #ifdef __cplusplus extern "C" { #endif #define message message_ /* Yuck */ /* See comment in libinterface.c for the following */ #define PNG_EXPORT(type, symbol) type XCDECL symbol #define ZEXPORT XCDECL #define ZEXPORTVA XCDECL #include <png.h> #undef message #ifdef __cplusplus } #endif #endif /* HAVE_PNG */ /* #### WARNING: Utterly random magic here to prevent namespace conflicts when no one bothers to be the least bit namespace-clean. Potential problems: INT32, FAR. DONT_NEED_JPEG avoids the problem with FAR in glyphs-msw.c. For some reason, putting the XPM code after this fixes other problems; don't move it before. --ben */ #if defined (HAVE_JPEG) && !defined (DONT_NEED_JPEG) #ifdef __cplusplus extern "C" { #endif #ifdef _MSC_VER # ifndef XMD_H /* Yuck! This tricks jpeglib.h into not defining INT32, which is defined in VC98/INCLUDE/basetsd.h */ # define UNDEF_XMD_H_ME_HARDER # define XMD_H # endif #endif /* _MSC_VER */ #include <jpeglib.h> #ifdef UNDEF_XMD_H_ME_HARDER # undef XMD_H #endif #include <jerror.h> #ifdef __cplusplus } #endif boolean XCDECL qxe_jpeg_finish_decompress (j_decompress_ptr cinfo); boolean XCDECL qxe_jpeg_start_decompress (j_decompress_ptr cinfo); JDIMENSION XCDECL qxe_jpeg_read_scanlines (j_decompress_ptr cinfo, JSAMPARRAY scanlines, JDIMENSION max_lines); int XCDECL qxe_jpeg_read_header (j_decompress_ptr cinfo, boolean require_image); #define qxe_jpeg_create_decompress(cinfo) \ qxe_jpeg_CreateDecompress((cinfo), JPEG_LIB_VERSION, \ (size_t) sizeof(struct jpeg_decompress_struct)) void XCDECL qxe_jpeg_CreateDecompress (j_decompress_ptr cinfo, int version, size_t structsize); struct jpeg_error_mgr * XCDECL qxe_jpeg_std_error (struct jpeg_error_mgr *err); void XCDECL qxe_jpeg_destroy_decompress (j_decompress_ptr cinfo); boolean XCDECL qxe_jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired); #endif /* defined (HAVE_JPEG) && !defined (DONT_NEED_JPEG) */ #ifdef HAVE_XPM #ifndef HAVE_GTK /* #### ????????????????????? No comprendo ni un poco. This was here before, in a different file. --ben */ #include <X11/xpm.h> #endif void XCDECL qxe_XpmFreeXpmImage (XpmImage *image); void XCDECL qxe_XpmFreeXpmInfo (XpmInfo *info); int XCDECL qxe_XpmCreateXpmImageFromBuffer (char *buffer, XpmImage *image, XpmInfo *info); void XCDECL qxe_XpmFree (void *ptr); int XCDECL qxe_XpmReadFileToData (char *filename, char ***data_return); #endif /* HAVE_XPM */ #ifdef HAVE_TIFF #include "tiffio.h" tdata_t XCDECL qxe_TIFFmalloc (tsize_t x1); void XCDECL qxe_TIFFfree (tdata_t x1); void XCDECL qxe_TIFFClose (TIFF *x1); int XCDECL qxe_TIFFGetField (TIFF *x1, ttag_t x2, uint32 *x3); TIFF * XCDECL qxe_TIFFClientOpen (const char *x1, const char *x2, thandle_t x3, TIFFReadWriteProc x4, TIFFReadWriteProc x5, TIFFSeekProc x6, TIFFCloseProc x7, TIFFSizeProc x8, TIFFMapFileProc x9, TIFFUnmapFileProc x10); TIFFErrorHandler XCDECL qxe_TIFFSetErrorHandler (TIFFErrorHandler x1); TIFFErrorHandler XCDECL qxe_TIFFSetWarningHandler (TIFFErrorHandler x1); int XCDECL qxe_TIFFReadRGBAImage (TIFF *x1, uint32 x2, uint32 x3, uint32 *x4, int x5); #endif /* HAVE_TIFF */ #endif /* INCLUDED_libinterface_h_ */