Mercurial > hg > xemacs-beta
view lisp/buffer.el @ 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 | abe6d1db359e |
| children | 627e25731054 |
line wrap: on
line source
;;; buffer.el --- buffer routines taken from C ;; Copyright (C) 1985-1989, 1992-1995, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Sun Microsystems. ;; Copyright (C) 1995, 1996 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: internal, dumped ;; 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, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: FSF 19.30 buffer.c. ;;; Commentary: ;; This file is dumped with XEmacs. ;;; Code: (defun switch-to-buffer (bufname &optional norecord) "Select buffer BUFNAME in the current window. BUFNAME may be a buffer or a buffer name and is created if it did not exist. Optional second arg NORECORD non-nil means do not put this buffer at the front of the list of recently selected ones. WARNING: This is NOT the way to work on another buffer temporarily within a Lisp program! Use `set-buffer' instead. That avoids messing with the window-buffer correspondences." (interactive "BSwitch to buffer: ") ;; #ifdef I18N3 ;; #### Doc string should indicate that the buffer name will get ;; translated. ;; #endif (if (eq (minibuffer-window) (selected-window)) (error "Cannot switch buffers in minibuffer window")) (if (window-dedicated-p (selected-window)) (error "Cannot switch buffers in a dedicated window")) (let (buf) (if (null bufname) (setq buf (other-buffer (current-buffer))) (setq buf (get-buffer bufname)) (if (null buf) (progn (setq buf (get-buffer-create bufname)) (set-buffer-major-mode buf)))) (push-window-configuration) (set-buffer buf) (set-window-buffer (last-nonminibuf-window) buf norecord) buf)) (defun pop-to-buffer (bufname &optional not-this-window-p on-frame) "Select buffer BUFNAME in some window, preferably a different one. If BUFNAME is nil, then some other buffer is chosen. If `pop-up-windows' is non-nil, windows can be split to do this. If optional second arg NOT-THIS-WINDOW-P is non-nil, insist on finding another window even if BUFNAME is already visible in the selected window. If optional third arg is non-nil, it is the frame to pop to this buffer on. If `focus-follows-mouse' is non-nil, keyboard focus is left unchanged." ;; #ifdef I18N3 ;; #### Doc string should indicate that the buffer name will get ;; translated. ;; #endif ;; This is twisted. It is evil to throw the keyboard focus around ;; willy-nilly if the user wants focus-follows-mouse. (let ((oldbuf (current-buffer)) buf window frame) (if (null bufname) (setq buf (other-buffer (current-buffer))) (setq buf (get-buffer bufname)) (if (null buf) (progn (setq buf (get-buffer-create bufname)) (set-buffer-major-mode buf)))) (push-window-configuration) (set-buffer buf) (setq window (display-buffer buf not-this-window-p on-frame)) (setq frame (window-frame window)) ;; if the display-buffer hook decided to show this buffer in another ;; frame, then select that frame, (unless obeying focus-follows-mouse -sb). (if (and (not focus-follows-mouse) (not (eq frame (selected-frame)))) (select-frame frame)) (record-buffer buf) (if (and focus-follows-mouse on-frame (not (eq on-frame (selected-frame)))) (set-buffer oldbuf) ;; select-window will modify the internal keyboard focus of XEmacs (select-window window)) buf)) ;;; buffer.el ends here
