Mercurial > hg > xemacs-beta
view src/src-headers @ 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 | 3ecd8885ac67 |
children | 308d34e9f07d |
line wrap: on
line source
: #-*- Perl -*- # Copyright (C) 1998 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. # Author: Martin Buchholz eval 'exec perl -w -S $0 ${1+"$@"}' if 0; use strict; my ($myName, $srcdir); ($myName = $0) =~ s@.*/@@; my $usage =" Usage: $myName Generates header file fragments from the Emacs sources and writes them to stdout.\n"; die $usage if @ARGV; ($srcdir = $0) =~ s@[^/]+$@@; chdir $srcdir or die "$srcdir: $!"; # Find include dependencies my (%exists, %uses); opendir SRCDIR, "." or die "$srcdir: $!"; for (grep (/\.[ch]$/, readdir (SRCDIR))) { $exists{$_} = 1; } closedir SRCDIR; { my %generated_header; for (qw (config.h sheap-adjust.h paths.h Emacs.ad.h)) { $generated_header{$_} = 1; } for my $file (keys %exists) { open (FILE, $file) or die "$file: $!"; undef $/; $_ = <FILE>; RemoveComments ($_); s/[ \t]+//g; for (/^\#include([^\n]+)/gmo) { if (m@^\"([A-Za-z0-9_-]+\.h)\"@) { $uses{$file}{$1} = 1 if exists $exists{$1}; } elsif (m@<([A-Za-z0-9_-]+\.h)>@) { $uses{$file}{$1} = 1 if exists $generated_header{$1}; } elsif (m@\"../lwlib/([A-Za-z0-9_-]+\.h)\"@) { $uses{$file}{"\$(LWLIB_SRCDIR)/lwlib.h"} = 1; } } } # Make transitive closure of %uses while (1) { my $changedP = 0; for my $x (keys %uses) { for my $y (keys %{$uses{$x}}) { for my $z (keys %{$uses{$y}}) { if (! exists $uses{$x}{$z}) { $uses{$x}{$z} = 1; $changedP = 1; } } } } last if !$changedP; } } # End of finding include dependencies my (%used, %maxargs); my $minargs = '(?:[0-8])'; my $maxargs = '(?:[0-8]|MANY|UNEVALLED)'; my $doc = "(?:0|STR)"; my $fun = '(?:\\bF[a-z0-9_]+X?\\b)'; my $defun = "^DEFUN\\s*\\(\\s+STR\\s+($fun)\\s+$minargs\\s+($maxargs)\\s+$doc\\s+\\("; my $var = '(?:\\b(?:Q[KS]?[a-z0-9_]+D?|V(?:[a-z0-9_]+)|Q_TT[A-Z]+)\\b)'; my $pat = "(?:$var|$fun)"; my %automagic; my (%decl_file, %defn_file); for my $file (keys %exists) { open (FILE, $file) or die "$file: $!"; undef $/; $_ = <FILE>; RemoveComments($_); RemoveStrings ($_); s/,/ /gmo; s/^\s*EXFUN[^\n]+//gmo; # Now search for DECLARE_LRECORD to find types for predicates for my $sym (/^DECLARE_LRECORD\s*\(\s*([a-z_]+)\s+struct /gmo) { $automagic{"Q${sym}p"} = 1; } if ($file =~ /\.c$/) { my @match = (/$defun/gmo); while (my $fun = shift @match) { $defn_file{$fun} = $file; $maxargs{$fun} = shift @match; } # Now do Lisp_Object variables for my $defs (/^\s*Lisp_Object\s+((?:$var\s*)+)\s*;/gmo) { for my $var (split (' ',$defs)) { $defn_file{$var} = $file; } } } # Remove declarations of Lisp_Objects s/^extern\s+Lisp_Object\s+(?:$var\s*)+\s*;//gmo; # Remove declarations of functions s/^Lisp_Object $fun//; # Find all uses of symbols for (/($pat)/gmo) { $used{$_}{$file} = 1; } } my %candidates; for my $file (keys %exists) { @{$candidates{$file}} = (); my $header1 = $file; $header1 =~ s/\.c$/.h/; my $header2 = $header1; $header2 =~ s/-\w+\././; push @{$candidates{$file}}, $header1 if exists $exists{$header1}; push @{$candidates{$file}}, $header2 if exists $exists{$header2} && $header1 ne $header2; } SYM: for my $sym (keys %used) { next SYM unless my $defn_file = $defn_file{$sym}; my @users = keys %{$used{$sym}}; if (@users == 1) { die "$sym\n" unless $defn_file eq $users[0]; next SYM; } for my $candidate (@{$candidates{$defn_file}}) { if (!grep (!exists $uses{$_}{$candidate}, @users)) { $decl_file{$sym} = $candidate; next SYM; } } $decl_file{$sym} = 'lisp.h'; } # Print global Lisp_Objects { my $line; sub flushvars { if (defined $line) { print "extern Lisp_Object $line;\n"; undef $line; } } sub printvar { my $var = shift; if (!defined $line) { $line = $var; return; } if ($var =~ /^Vcharset_/) { flushvars (); $line = $var; flushvars (); return; } if (length "$line, $var" > 59) { flushvars (); $line = $var; return; } $line = "$line, $var"; } END { flushvars (); } } delete @decl_file{ keys %automagic, qw(Qzero Qnull_pointer)}; # Print Lisp_Object var declarations for my $file (keys %exists) { # Print EXFUNs if (my @funs = grep ($decl_file{$_} eq $file && exists $maxargs{$_}, keys %decl_file)) { print "\n\n$file:\n\n"; for $fun (sort @funs) { print "EXFUN ($fun, $maxargs{$fun});\n"; } print "\n"; } if (my @vars = grep ($decl_file{$_} eq $file && /^[QV]/, keys %decl_file)) { print "\n\n$file:\n\n"; for $var (sort @vars) { printvar ($var); } flushvars (); print "\n\n"; } } #for my $var (sort grep (keys %{$used{$_}} > 1 , keys %defn_file)) { # printvar ($var); #} sub RemoveComments { $_[0] =~ s{ ( [^\"\'/]+ | (?:\"[^\"\\]*(?:\\.[^\"\\]*)*\" [^\"\'/]*)+ | (?:\'[^\'\\]*(?:\\.[^\'\\]*)*\' [^\"\'/]*)+ ) | / (?: \*[^*]*\*+(?:[^/*][^*]*\*+)*/ | /[^\n]* ) }{defined $1 ? $1 : ""}gsxeo; } sub RemoveStrings { $_[0] =~ s{ ( (?:\"[^\"\\]*(?:\\.[^\"\\]*)*\") | (?:\'[^\'\\]*(?:\\.[^\'\\]*)*\') ) }{ STR }gxo; }