Mercurial > hg > xemacs-beta
view src/bufslots.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 | e22b0213b713 |
children | 0b4d355771bd |
line wrap: on
line source
/* Definitions of marked slots in buffers Copyright (C) 1990, 1992, 1993 Free Software Foundation, Inc. Copyright (C) 2001, 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: Mule 2.0, FSF 19.30. Split out of buffer.h. */ /* Authorship: FSF: long ago (part of buffer.h). JWZ: separated out from buffer.h, early in Lemacs. XEmacs: a few other changes. */ /* We define the Lisp_Objects in the buffer structure in a separate file because there are numerous places we want to iterate over them, such as when defining them in the structure, initializing them, or marking them. To use, define MARKED_SLOT before including this file. No need to undefine; that happens automatically. */ #ifndef BUFFER_SLOTS_FIRST_NAME #define BUFFER_SLOTS_FIRST_NAME name #endif /* The name of this buffer. */ MARKED_SLOT (name) /* The name of the file visited in this buffer, or nil. */ MARKED_SLOT (filename) /* Dir for expanding relative file names. */ MARKED_SLOT (directory) /* True iff this buffer has been backed up (if you write to the visited file and it hasn't been backed up, then a backup will be made). */ /* #### This isn't really used by the C code, so could be deleted. */ MARKED_SLOT (backed_up) /* Length of file when last read or saved. This is not in the struct buffer_text because it's not used in indirect buffers at all. */ MARKED_SLOT (saved_size) /* File name used for auto-saving this buffer. This is not in the struct buffer_text because it's not used in indirect buffers at all. */ MARKED_SLOT (auto_save_file_name) /* Non-nil if buffer read-only. */ MARKED_SLOT (read_only) /* "The mark". This is a marker which may point into this buffer or may point nowhere. */ MARKED_SLOT (mark) /* Alist of elements (SYMBOL . VALUE-IN-THIS-BUFFER) for all per-buffer variables of this buffer. Specifically, this lists those variables that have a buffer-local value in this buffer: i.e. those whose value does not shadow the default value. (Remember that for any particular variable created with `make-local-variable' or `make-variable-buffer-local', it will have a per-buffer value in some buffers and a default value in others.) Variables declared in C with DEFVAR_BUFFER_LOCAL() (i.e. those stored in the struct buffer) are not listed here. */ MARKED_SLOT (local_var_alist) /* Symbol naming major mode (eg, lisp-mode). */ MARKED_SLOT (major_mode) /* Pretty name of major mode (eg, "Lisp"). */ MARKED_SLOT (mode_name) /* Modeline element that controls format of modeline. */ MARKED_SLOT (modeline_format) /* Keys that are bound local to this buffer. */ MARKED_SLOT (keymap) /* This buffer's local abbrev table. */ MARKED_SLOT (abbrev_table) /* This buffer's syntax table. */ MARKED_SLOT (syntax_table) /* Massaged values from the syntax table, for faster lookup. */ MARKED_SLOT (mirror_syntax_table) #ifdef MULE /* This buffer's category table. */ MARKED_SLOT (category_table) #endif /* MULE */ /* This buffer's coding system. */ MARKED_SLOT (buffer_file_coding_system) /* Values of several buffer-local variables. tab-width is buffer-local so that redisplay can find it in buffers that are not current */ MARKED_SLOT (case_fold_search) MARKED_SLOT (tab_width) MARKED_SLOT (fill_column) MARKED_SLOT (left_margin) /* Function to call when insert space past fill column. */ MARKED_SLOT (auto_fill_function) /* Case table for case-conversion in this buffer. */ MARKED_SLOT (case_table) /* It contanis following char-tables: */ /* Char-table maps each char into its lower-case version. */ /* Char-table mapping each char to its upper-case version. */ /* Char-table for conversion for case-folding search. */ /* Char-table of equivalences for case-folding search. */ /* #### This ought to be a specifier: */ /* Non-nil means do not display continuation lines. */ MARKED_SLOT (truncate_lines) /* #### This ought to be a specifier: */ /* #### Better yet, it ought to be junked. It really sucks. */ /* Non-nil means display ctl chars with uparrow. */ MARKED_SLOT (ctl_arrow) /* #### This ought to be a specifier: */ /* #### Better yet, it ought to be junked. It really sucks. */ /* Non-nil means do selective display; see doc string in syms_of_buffer (buffer.c) for details. */ MARKED_SLOT (selective_display) /* #### This ought to be a specifier: */ /* #### Better yet, it ought to be junked. It really sucks. */ /* Non-nil means show ... at end of line followed by invisible lines. */ MARKED_SLOT (selective_display_ellipses) /* Alist of (FUNCTION . STRING) for each minor mode enabled in buffer. */ /* Unused: MARKED_SLOT (minor_modes) */ /* t if "self-insertion" should overwrite */ MARKED_SLOT (overwrite_mode) /* non-nil means abbrev mode is on. Expand abbrevs automatically. */ MARKED_SLOT (abbrev_mode) /* No display table here. It's a specifier. */ #if 0 /* FSFmacs */ /* t means the mark and region are currently active. */ MARKED_SLOT (mark_active) #endif /* Changes in the buffer are recorded here for undo. t means don't record anything. This information belongs to the base buffer of an indirect buffer, But we can't store it in the struct buffer_text because local variables have to be right in the struct buffer. So we copy it around in set_buffer_internal. */ MARKED_SLOT (undo_list) /* FSFmacs has overlay stuff here. We have extent info elsewhere in the struct buffer. */ /* dedicated_frame in lisp */ /* Lisp of symbols naming the file format used for visited file. */ MARKED_SLOT (file_format) #ifdef REGION_CACHE_NEEDS_WORK /* True if the newline position cache and width run cache are enabled. See search.c and indent.c. */ MARKED_SLOT (cache_long_line_scans) /* If the width run cache is enabled, this table contains the character widths width_run_cache (see above) assumes. When we do a thorough redisplay, we compare this against the buffer's current display table to see whether the display table has affected the widths of any characters. If it has, we invalidate the width run cache, and re-initialize width_table. */ MARKED_SLOT (width_table) #endif /* REGION_CACHE_NEEDS_WORK */ /* A redundant copy of text.pt, in the form of a marker. Every time one is updated, so is the other. */ MARKED_SLOT (point_marker) /* FSFmacs has pt_marker, begv_marker, zv_marker here, used for indirect buffers. We don't need them because we handle these values directly instead of playing games with markers. */ /* This holds the point value before the last scroll operation. Explicitly setting point sets this to nil. */ MARKED_SLOT (point_before_scroll) /* Truename of the visited file (via qxe_realpath()), or nil. */ MARKED_SLOT (file_truename) /* Invisibility spec of this buffer. t => any non-nil `invisible' property means invisible. A list => `invisible' property means invisible if it is memq in that list. */ MARKED_SLOT (invisibility_spec) /* The string generated by formatting the modeline in this buffer. */ MARKED_SLOT (generated_modeline_string) /* A hash table that maps from a "generic extent" (an extent in `modeline-format') into a buffer-specific extent. */ MARKED_SLOT (modeline_extent_table) #ifndef BUFFER_SLOTS_LAST_NAME #define BUFFER_SLOTS_LAST_NAME modeline_extent_table #endif #undef MARKED_SLOT