Mercurial > hg > xemacs-beta
annotate src/event-tty.c @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | 0c544f2f566c |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* The event_stream interface for tty's. |
| 2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. | |
| 3 Copyright (C) 1995 Sun Microsystems, Inc. | |
| 1268 | 4 Copyright (C) 1995, 2002, 2003 Ben Wing. |
| 428 | 5 |
| 6 This file is part of XEmacs. | |
| 7 | |
| 8 XEmacs is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 10 Free Software Foundation; either version 2, or (at your option) any | |
| 11 later version. | |
| 12 | |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 19 along with XEmacs; see the file COPYING. If not, write to | |
| 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 21 Boston, MA 02111-1307, USA. */ | |
| 22 | |
| 23 /* Synched up with: Not in FSF. */ | |
| 24 | |
| 25 #include <config.h> | |
| 26 #include "lisp.h" | |
| 27 | |
| 28 #include "device.h" | |
| 872 | 29 #include "console-tty-impl.h" |
| 428 | 30 #include "events.h" |
| 31 #include "frame.h" | |
| 32 #include "process.h" | |
| 33 | |
| 34 #include "sysproc.h" | |
| 35 #include "syswait.h" | |
| 36 #include "systime.h" | |
| 37 | |
| 38 /* Mask of bits indicating the descriptors that we wait for input on */ | |
| 39 extern SELECT_TYPE input_wait_mask, non_fake_input_wait_mask; | |
| 40 extern SELECT_TYPE process_only_mask, tty_only_mask; | |
| 41 | |
| 42 static struct event_stream *tty_event_stream; | |
| 43 | |
| 1292 | 44 #ifdef WIN32_ANY |
| 45 extern int mswindows_is_blocking; | |
| 46 #endif | |
| 47 | |
| 3735 | 48 static int last_quit_check_signal_tick_count; |
| 49 | |
| 428 | 50 |
| 51 /************************************************************************/ | |
| 52 /* timeout events */ | |
| 53 /************************************************************************/ | |
| 54 | |
| 55 /* The pending timers are stored in an ordered list, where the first timer | |
| 56 on the list is the first one to fire. Times recorded here are | |
| 57 absolute. */ | |
| 58 static struct low_level_timeout *tty_timer_queue; | |
| 59 | |
| 60 static int | |
| 61 emacs_tty_add_timeout (EMACS_TIME thyme) | |
| 62 { | |
| 63 return add_low_level_timeout (&tty_timer_queue, thyme); | |
| 64 } | |
| 65 | |
| 66 static void | |
| 67 emacs_tty_remove_timeout (int id) | |
| 68 { | |
| 69 remove_low_level_timeout (&tty_timer_queue, id); | |
| 70 } | |
| 71 | |
| 72 static void | |
| 440 | 73 tty_timeout_to_emacs_event (Lisp_Event *emacs_event) |
| 428 | 74 { |
| 934 | 75 /* timeout events have nil as channel */ |
| 76 SET_EVENT_TYPE (emacs_event, timeout_event); | |
| 77 SET_EVENT_TIMESTAMP_ZERO (emacs_event); /* #### */ | |
| 1268 | 78 SET_EVENT_TIMEOUT_INTERVAL_ID (emacs_event, |
| 79 pop_low_level_timeout (&tty_timer_queue, 0)); | |
| 1204 | 80 SET_EVENT_TIMEOUT_FUNCTION (emacs_event, Qnil); |
| 81 SET_EVENT_TIMEOUT_OBJECT (emacs_event, Qnil); | |
| 428 | 82 } |
| 83 | |
| 84 | |
| 85 | |
| 86 static int | |
| 1268 | 87 emacs_tty_event_pending_p (int how_many) |
| 428 | 88 { |
| 3735 | 89 Lisp_Object event; |
| 90 int tick_count_val; | |
| 91 | |
| 92 /* Cf. the comments on emacs_Xt_event_pending_p in event-xlike-inc.c . */ | |
| 93 | |
| 1268 | 94 if (!how_many) |
| 428 | 95 { |
| 96 EMACS_TIME sometime; | |
| 3735 | 97 |
| 98 /* (1) Any pending events in the dispatch queue? */ | |
| 99 if (!NILP(dispatch_event_queue)) | |
| 100 { | |
| 101 return 1; | |
| 102 } | |
| 103 | |
| 104 /* (2) Any TTY or process input available? */ | |
| 105 if (poll_fds_for_input (non_fake_input_wait_mask)) | |
| 106 return 1; | |
| 107 | |
| 108 /* (3) Any timeout input available? */ | |
| 428 | 109 EMACS_GET_TIME (sometime); |
| 110 if (tty_timer_queue && | |
| 111 EMACS_TIME_EQUAL_OR_GREATER (sometime, tty_timer_queue->time)) | |
| 112 return 1; | |
| 3735 | 113 } |
| 114 else | |
| 115 { | |
| 116 /* HOW_MANY > 0 */ | |
| 117 EVENT_CHAIN_LOOP (event, dispatch_event_queue) | |
| 118 { | |
| 119 if (command_event_p (event)) | |
| 120 { | |
| 121 how_many--; | |
| 122 if (how_many <= 0) | |
| 123 return 1; | |
| 124 } | |
| 125 } | |
| 1268 | 126 |
| 428 | 127 } |
| 128 | |
| 3735 | 129 tick_count_val = quit_check_signal_tick_count; |
| 130 | |
| 131 /* Checking in_modal_loop here is a bit cargo-cultish, since its use is | |
| 132 specific to builds with a window system. */ | |
| 133 if (!in_modal_loop && | |
| 134 (last_quit_check_signal_tick_count != tick_count_val)) | |
| 135 { | |
| 136 last_quit_check_signal_tick_count = tick_count_val; | |
| 137 | |
| 138 /* We need to drain the entire queue now -- if we only drain part of | |
| 139 it, we may later on end up with events actually pending but | |
| 140 detect_input_pending() returning false because there wasn't | |
| 141 another SIGIO. */ | |
| 142 event_stream_drain_queue (); | |
| 143 | |
| 144 if (!how_many) | |
| 145 return !NILP (dispatch_event_queue); | |
| 146 | |
| 147 EVENT_CHAIN_LOOP (event, dispatch_event_queue) | |
| 148 { | |
| 149 if (command_event_p (event)) | |
| 150 { | |
| 151 how_many--; | |
| 152 if (how_many <= 0) | |
| 153 return 1; | |
| 154 } | |
| 155 } | |
| 156 } | |
| 157 | |
| 158 return 0; | |
| 428 | 159 } |
| 160 | |
| 161 static void | |
| 440 | 162 emacs_tty_next_event (Lisp_Event *emacs_event) |
| 428 | 163 { |
| 164 while (1) | |
| 165 { | |
| 166 int ndesc; | |
| 167 int i; | |
| 168 SELECT_TYPE temp_mask = input_wait_mask; | |
| 169 EMACS_TIME time_to_block; | |
| 170 EMACS_SELECT_TIME select_time_to_block, *pointer_to_this; | |
| 171 | |
| 3541 | 172 if (!NILP (dispatch_event_queue)) |
| 173 { | |
| 174 Lisp_Object event, event2; | |
| 175 event2 = wrap_event (emacs_event); | |
| 176 event = dequeue_dispatch_event (); | |
| 177 Fcopy_event (event, event2); | |
| 178 Fdeallocate_event (event); | |
| 179 return; | |
| 180 } | |
| 181 | |
| 428 | 182 if (!get_low_level_timeout_interval (tty_timer_queue, &time_to_block)) |
| 183 /* no timer events; block indefinitely */ | |
| 184 pointer_to_this = 0; | |
| 185 else | |
| 186 { | |
| 187 EMACS_TIME_TO_SELECT_TIME (time_to_block, select_time_to_block); | |
| 188 pointer_to_this = &select_time_to_block; | |
| 189 } | |
| 190 | |
| 1292 | 191 #ifdef WIN32_ANY |
| 192 mswindows_is_blocking = 1; | |
| 193 #endif | |
| 428 | 194 ndesc = select (MAXDESC, &temp_mask, 0, 0, pointer_to_this); |
| 1292 | 195 #ifdef WIN32_ANY |
| 196 mswindows_is_blocking = 0; | |
| 197 #endif | |
| 428 | 198 if (ndesc > 0) |
| 199 { | |
| 200 /* Look for a TTY event */ | |
| 201 for (i = 0; i < MAXDESC; i++) | |
| 202 { | |
| 203 /* To avoid race conditions (among other things, an infinite | |
| 204 loop when called from Fdiscard_input()), we must return | |
| 205 user events ahead of process events. */ | |
| 206 if (FD_ISSET (i, &temp_mask) && FD_ISSET (i, &tty_only_mask)) | |
| 207 { | |
| 1204 | 208 struct console *c = find_tty_or_stream_console_from_fd (i); |
| 428 | 209 |
| 210 assert (c); | |
| 771 | 211 if (read_event_from_tty_or_stream_desc (emacs_event, c)) |
| 428 | 212 return; |
| 213 } | |
| 214 } | |
| 215 | |
| 216 /* Look for a process event */ | |
| 217 for (i = 0; i < MAXDESC; i++) | |
| 218 { | |
| 219 if (FD_ISSET (i, &temp_mask) && FD_ISSET (i, &process_only_mask)) | |
| 220 { | |
| 221 Lisp_Object process; | |
| 440 | 222 Lisp_Process *p = get_process_from_usid (FD_TO_USID(i)); |
| 428 | 223 |
| 224 assert (p); | |
| 793 | 225 process = wrap_process (p); |
| 934 | 226 set_event_type (emacs_event, process_event); |
| 227 /* process events have nil as channel */ | |
| 228 SET_EVENT_TIMESTAMP_ZERO (emacs_event); /* #### */ | |
| 1204 | 229 SET_EVENT_PROCESS_PROCESS (emacs_event, process); |
| 428 | 230 return; |
| 231 } | |
| 232 } | |
| 233 | |
| 234 /* We might get here when a fake event came through a signal. */ | |
| 235 /* Return a dummy event, so that a cycle of the command loop will | |
| 236 occur. */ | |
| 237 drain_signal_event_pipe (); | |
| 934 | 238 set_event_type (emacs_event, eval_event); |
| 239 /* eval events have nil as channel */ | |
| 1204 | 240 SET_EVENT_EVAL_FUNCTION (emacs_event, Qidentity); |
| 241 SET_EVENT_EVAL_OBJECT (emacs_event, Qnil); | |
| 428 | 242 return; |
| 243 } | |
| 244 else if (ndesc == 0) /* timeout fired */ | |
| 245 { | |
| 246 tty_timeout_to_emacs_event (emacs_event); | |
| 247 return; | |
| 248 } | |
| 249 } | |
| 250 } | |
| 251 | |
| 252 static void | |
| 2286 | 253 emacs_tty_format_magic_event (Lisp_Event *UNUSED (emacs_event), |
| 254 Lisp_Object UNUSED (pstream)) | |
| 788 | 255 { |
| 256 /* Nothing to do currently */ | |
| 257 } | |
| 258 | |
| 259 static int | |
| 2286 | 260 emacs_tty_compare_magic_event (Lisp_Event *UNUSED (e1), |
| 261 Lisp_Event *UNUSED (e2)) | |
| 788 | 262 { |
| 263 return 1; | |
| 264 } | |
| 265 | |
| 266 static Hashcode | |
| 2286 | 267 emacs_tty_hash_magic_event (Lisp_Event *UNUSED (e)) |
| 788 | 268 { |
| 269 return 0; | |
| 270 } | |
| 271 | |
| 272 static void | |
| 2286 | 273 emacs_tty_handle_magic_event (Lisp_Event *UNUSED (emacs_event)) |
| 428 | 274 { |
| 275 /* Nothing to do currently */ | |
| 276 } | |
| 277 | |
| 278 | |
| 279 static void | |
| 853 | 280 emacs_tty_select_process (Lisp_Process *process, int doin, int doerr) |
| 428 | 281 { |
| 853 | 282 int infd, errfd; |
| 283 | |
| 284 event_stream_unixoid_select_process (process, doin, doerr, &infd, &errfd); | |
| 428 | 285 } |
| 286 | |
| 287 static void | |
| 853 | 288 emacs_tty_unselect_process (Lisp_Process *process, int doin, int doerr) |
| 428 | 289 { |
| 853 | 290 int infd, errfd; |
| 291 | |
| 292 event_stream_unixoid_unselect_process (process, doin, doerr, &infd, &errfd); | |
| 428 | 293 } |
| 294 | |
| 295 static void | |
| 296 emacs_tty_select_console (struct console *con) | |
| 297 { | |
| 298 event_stream_unixoid_select_console (con); | |
| 299 } | |
| 300 | |
| 301 static void | |
| 302 emacs_tty_unselect_console (struct console *con) | |
| 303 { | |
| 304 event_stream_unixoid_unselect_console (con); | |
| 305 } | |
| 306 | |
| 307 static void | |
| 1204 | 308 emacs_tty_drain_queue (void) |
| 428 | 309 { |
| 1204 | 310 drain_tty_devices (); |
| 428 | 311 } |
| 312 | |
| 853 | 313 static void |
| 314 emacs_tty_create_io_streams (void* inhandle, void* outhandle, | |
| 315 void *errhandle, Lisp_Object* instream, | |
| 316 Lisp_Object* outstream, | |
| 317 Lisp_Object* errstream, | |
| 318 USID* in_usid, | |
| 319 USID* err_usid, | |
| 320 int flags) | |
| 428 | 321 { |
| 853 | 322 event_stream_unixoid_create_io_streams |
| 323 (inhandle, outhandle, errhandle, instream, outstream, | |
| 324 errstream, in_usid, err_usid, flags); | |
| 428 | 325 } |
| 326 | |
| 853 | 327 static void |
| 328 emacs_tty_delete_io_streams (Lisp_Object instream, | |
| 329 Lisp_Object outstream, | |
| 330 Lisp_Object errstream, | |
| 331 USID* in_usid, | |
| 332 USID* err_usid) | |
| 428 | 333 { |
| 853 | 334 event_stream_unixoid_delete_io_streams |
| 335 (instream, outstream, errstream, in_usid, err_usid); | |
| 428 | 336 } |
| 337 | |
| 338 | |
| 339 /************************************************************************/ | |
| 340 /* initialization */ | |
| 341 /************************************************************************/ | |
| 342 | |
| 343 void | |
| 344 reinit_vars_of_event_tty (void) | |
| 345 { | |
| 1204 | 346 tty_event_stream = xnew_and_zero (struct event_stream); |
| 428 | 347 |
| 348 tty_event_stream->event_pending_p = emacs_tty_event_pending_p; | |
| 349 tty_event_stream->next_event_cb = emacs_tty_next_event; | |
| 350 tty_event_stream->handle_magic_event_cb = emacs_tty_handle_magic_event; | |
| 788 | 351 tty_event_stream->format_magic_event_cb = emacs_tty_format_magic_event; |
| 352 tty_event_stream->compare_magic_event_cb= emacs_tty_compare_magic_event; | |
| 353 tty_event_stream->hash_magic_event_cb = emacs_tty_hash_magic_event; | |
| 428 | 354 tty_event_stream->add_timeout_cb = emacs_tty_add_timeout; |
| 355 tty_event_stream->remove_timeout_cb = emacs_tty_remove_timeout; | |
| 356 tty_event_stream->select_console_cb = emacs_tty_select_console; | |
| 357 tty_event_stream->unselect_console_cb = emacs_tty_unselect_console; | |
| 358 tty_event_stream->select_process_cb = emacs_tty_select_process; | |
| 359 tty_event_stream->unselect_process_cb = emacs_tty_unselect_process; | |
| 1204 | 360 tty_event_stream->drain_queue_cb = emacs_tty_drain_queue; |
| 853 | 361 tty_event_stream->create_io_streams_cb = emacs_tty_create_io_streams; |
| 362 tty_event_stream->delete_io_streams_cb = emacs_tty_delete_io_streams; | |
| 3735 | 363 |
| 364 last_quit_check_signal_tick_count = 0; | |
| 428 | 365 } |
| 366 | |
| 367 void | |
| 368 vars_of_event_tty (void) | |
| 369 { | |
| 370 } | |
| 371 | |
| 372 void | |
| 373 init_event_tty_late (void) | |
| 374 { | |
| 375 event_stream = tty_event_stream; | |
| 376 } |