Mercurial > hg > xemacs-beta
view src/insdel.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 | 804517e16990 |
children | 304aebb79cd3 |
line wrap: on
line source
/* Buffer insertion/deletion and gap motion for XEmacs. Copyright (C) 1985-1994 Free Software Foundation, Inc. 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. */ /* Mostly rewritten by Ben Wing. */ #ifndef INCLUDED_insdel_h_ #define INCLUDED_insdel_h_ /************************************************************************/ /* changing a buffer's text */ /************************************************************************/ int begin_multiple_change (struct buffer *buf, Charbpos start, Charbpos end); void end_multiple_change (struct buffer *buf, int count); /* flags for functions below */ #define INSDEL_BEFORE_MARKERS 1 #define INSDEL_NO_LOCKING 2 Charcount buffer_insert_string_1 (struct buffer *buf, Charbpos pos, const Ibyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount length, int flags); Charcount buffer_insert_raw_string_1 (struct buffer *buf, Charbpos pos, const Ibyte *nonreloc, Bytecount length, int flags); Charcount buffer_insert_lisp_string_1 (struct buffer *buf, Charbpos pos, Lisp_Object str, int flags); Charcount buffer_insert_c_string_1 (struct buffer *buf, Charbpos pos, const char *s, int flags); Charcount buffer_insert_emacs_char_1 (struct buffer *buf, Charbpos pos, Ichar ch, int flags); Charcount buffer_insert_c_char_1 (struct buffer *buf, Charbpos pos, char c, int flags); Charcount buffer_insert_from_buffer_1 (struct buffer *buf, Charbpos pos, struct buffer *buf2, Charbpos pos2, Charcount length, int flags); /* Macros for insertion functions that insert at point after markers. All of these can GC. */ #define buffer_insert_string(buf, nonreloc, reloc, offset, length) \ buffer_insert_string_1 (buf, -1, nonreloc, reloc, offset, length, 0) #define buffer_insert_raw_string(buf, string, length) \ buffer_insert_raw_string_1 (buf, -1, string, length, 0) #define buffer_insert_c_string(buf, s) \ buffer_insert_c_string_1 (buf, -1, s, 0) #define buffer_insert_lisp_string(buf, str) \ buffer_insert_lisp_string_1 (buf, -1, str, 0) #define buffer_insert_c_char(buf, c) \ buffer_insert_c_char_1 (buf, -1, c, 0) #define buffer_insert_emacs_char(buf, ch) \ buffer_insert_emacs_char_1 (buf, -1, ch, 0) #define buffer_insert_from_buffer(buf, b, index, length) \ buffer_insert_from_buffer_1 (buf, -1, b, index, length, 0) void buffer_delete_range (struct buffer *buf, Charbpos from, Charbpos to, int flags); void buffer_replace_char (struct buffer *b, Charbpos pos, Ichar ch, int not_real_change, int force_lock_check); /************************************************************************/ /* tracking buffer changes */ /************************************************************************/ /* Split into two parts. One part goes with a buffer's text (possibly shared), the other with the buffer itself. */ struct buffer_text_change_data { /* multiple change stuff */ int in_multiple_change; Charbpos mc_begin, mc_orig_end, mc_new_end; int mc_begin_signaled; }; struct each_buffer_change_data { Charcount begin_unchanged, end_unchanged; /* redisplay needs to know if a newline was deleted so its incremental-redisplay algorithm will fail */ int newline_was_deleted; Charcount begin_extent_unchanged, end_extent_unchanged; }; /* Number of characters at the beginning and end of the buffer that have not changed since the last call to buffer_reset_changes(). If no changes have occurred since then, both values will be -1. "Changed" means that the text has changed. */ #define BUF_BEGIN_UNCHANGED(buf) ((buf)->changes->begin_unchanged) #define BUF_END_UNCHANGED(buf) ((buf)->changes->end_unchanged) /* Number of characters at the beginning and end of the buffer that have not had a covering extent change since the last call to buffer_reset_changes (). If no changes have occurred since then, both values will be -1. "Changed" means that the extents covering the text have changed. */ #define BUF_EXTENT_BEGIN_UNCHANGED(buf) \ ((buf)->changes->begin_extent_unchanged) #define BUF_EXTENT_END_UNCHANGED(buf) \ ((buf)->changes->end_extent_unchanged) #define BUF_NEWLINE_WAS_DELETED(buf) \ ((buf)->changes->newline_was_deleted) void buffer_extent_signal_changed_region (struct buffer *buf, Charbpos start, Charbpos end); void buffer_reset_changes (struct buffer *buf); /************************************************************************/ /* other related functions */ /************************************************************************/ Membpos do_marker_adjustment (Membpos mpos, Membpos from, Membpos to, Bytecount amount); void fixup_internal_substring (const Ibyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount *len); /* In font-lock.c */ void font_lock_maybe_update_syntactic_caches (struct buffer *buf, Charbpos start, Charbpos orig_end, Charbpos new_end); void font_lock_buffer_was_killed (struct buffer *buf); void barf_if_buffer_read_only (struct buffer *buf, Charbpos from, Charbpos to); void init_buffer_text (struct buffer *b); void uninit_buffer_text (struct buffer *b); #endif /* INCLUDED_insdel_h_ */