Mercurial > hg > xemacs-beta
annotate src/device-impl.h @ 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 | a9c41067dd88 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 872 | 1 /* Define device-object for XEmacs. |
| 2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. | |
| 3 Copyright (C) 1995, 2002 Ben Wing | |
| 4 Copyright (C) 1995 Sun Microsystems | |
| 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 /* Written by Chuck Thompson and Ben Wing. */ | |
| 26 | |
| 27 #ifndef INCLUDED_device_impl_h_ | |
| 28 #define INCLUDED_device_impl_h_ | |
| 29 | |
| 30 #include "console-impl.h" | |
| 31 #include "device.h" | |
| 32 | |
| 33 /* This should really be in redisplay.h but by putting it here we | |
| 34 won't have to ensure that redisplay.h is always included before | |
| 35 this file. */ | |
| 36 struct pixel_to_glyph_translation_cache | |
| 37 { | |
| 38 unsigned int valid :1; | |
| 39 struct frame *frame; | |
| 40 int low_x_coord, high_x_coord, col, obj_x; | |
| 41 int low_y_coord, high_y_coord, row, obj_y; | |
| 42 struct window *w; | |
| 43 Charbpos charpos; | |
| 44 Charbpos closest; | |
| 45 Charcount modeline_closest; | |
| 46 Lisp_Object obj1, obj2; | |
| 47 int retval; | |
| 48 }; | |
| 49 | |
| 50 /* Less public: */ | |
| 51 #define DEVICE_TYPE_NAME(d) ((d)->devmeths->name) | |
| 52 #define DEVICE_IMPL_FLAG(d, f) CONMETH_IMPL_FLAG ((d)->devmeths, (f)) | |
| 53 #define DEVICE_SPECIFIC_FRAME_PROPS(d) \ | |
| 54 ((d)->devmeths->device_specific_frame_props) | |
| 55 | |
| 56 /* More public: */ | |
| 57 #define DEVICE_TYPE(d) ((d)->devmeths->symbol) | |
| 58 #define XDEVICE_TYPE(d) DEVICE_TYPE (XDEVICE (d)) | |
| 59 | |
| 60 /******** Accessing / calling a device method *********/ | |
| 61 | |
| 62 #define HAS_DEVMETH_P(d, m) HAS_CONTYPE_METH_P ((d)->devmeths, m) | |
| 63 #define DEVMETH(d, m, args) CONTYPE_METH ((d)->devmeths, m, args) | |
| 64 #define MAYBE_DEVMETH(d, m, args) MAYBE_CONTYPE_METH ((d)->devmeths, m, args) | |
| 65 #define DEVMETH_OR_GIVEN(d, m, args, given) \ | |
| 66 CONTYPE_METH_OR_GIVEN((d)->devmeths, m, args, given) | |
| 67 #define MAYBE_INT_DEVMETH(d, m, args) \ | |
| 68 MAYBE_INT_CONTYPE_METH ((d)->devmeths, m, args) | |
| 69 #define MAYBE_LISP_DEVMETH(d, m, args) \ | |
| 70 MAYBE_LISP_CONTYPE_METH ((d)->devmeths, m, args) | |
| 71 | |
| 72 struct device | |
| 73 { | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
74 NORMAL_LISP_OBJECT_HEADER header; |
| 872 | 75 |
| 76 /* Methods for this device's console. This can also be retrieved | |
| 77 through device->console, but it's faster this way. */ | |
| 78 struct console_methods *devmeths; | |
| 79 | |
| 1204 | 80 /* Duplicates devmeths->symbol. See comment in struct console. */ |
| 934 | 81 enum console_variant devtype; |
| 82 | |
| 872 | 83 /* A structure of auxiliary data specific to the device type. |
| 84 struct x_device is used for X window frames; defined in console-x.h | |
| 85 struct tty_device is used to TTY's; defined in console-tty.h */ | |
| 86 void *device_data; | |
| 87 | |
| 88 /* redisplay flags */ | |
| 89 unsigned int buffers_changed :1; | |
| 90 unsigned int clip_changed :1; | |
| 91 unsigned int extents_changed :1; | |
| 92 unsigned int faces_changed :1; | |
| 93 unsigned int frame_changed :1; | |
| 905 | 94 unsigned int frame_layout_changed :1; /* The layout of frame |
| 95 elements has changed. */ | |
| 872 | 96 unsigned int glyphs_changed :1; |
| 97 unsigned int subwindows_changed :1; | |
| 98 unsigned int subwindows_state_changed :1; | |
| 99 unsigned int icon_changed :1; | |
| 100 unsigned int menubar_changed :1; | |
| 101 unsigned int modeline_changed :1; | |
| 102 unsigned int point_changed :1; | |
| 103 unsigned int size_changed :1; | |
| 104 unsigned int gutter_changed :1; | |
| 105 unsigned int toolbar_changed :1; | |
| 106 unsigned int windows_changed :1; | |
| 107 unsigned int windows_structure_changed :1; | |
| 108 | |
| 109 unsigned int locked :1; | |
| 110 | |
| 111 /* Cache information about last pixel position translated to a | |
| 112 glyph. The law of locality applies very heavily here so caching | |
| 113 the value leads to a significant win. At the moment this is | |
| 114 really X specific but once we have generic mouse support it won't | |
| 115 be. */ | |
| 116 struct pixel_to_glyph_translation_cache pixel_to_glyph_cache; | |
| 117 | |
| 118 /* Output baud rate of device; used for redisplay decisions. */ | |
| 119 int baud_rate; | |
| 120 | |
| 121 /* sound flags */ | |
| 122 unsigned int on_console_p :1; | |
| 123 unsigned int connected_to_nas_p :1; | |
| 124 | |
| 1204 | 125 #define MARKED_SLOT(x) Lisp_Object x; |
| 872 | 126 #include "devslots.h" |
| 127 | |
| 128 /* File descriptors for input and output. Much of the time | |
| 129 (but not always) these will be the same. For an X device, | |
| 130 these both hold the file descriptor of the socket used | |
| 131 to communicate with the X server. For a TTY device, these | |
| 132 may or may not be the same and point to the terminal that | |
| 133 is used for I/O. */ | |
| 134 int infd, outfd; | |
| 135 | |
| 136 /* infd and outfd are moved outside HAVE_UNIXOID_EVENT_LOOP conditionals, | |
| 137 because Win32, presumably the first port which does not use select() | |
| 138 polling, DOES have handles for a console device. -- kkm */ | |
| 139 | |
| 140 #ifdef HAVE_UNIXOID_EVENT_LOOP | |
| 141 /* holds some data necessary for SIGIO control. Perhaps this should | |
| 142 be inside of device_data; but it is used for both TTY's and X | |
| 143 device. Perhaps it should be conditionalized on SIGIO; but | |
| 144 this requires including syssignal.h. */ | |
| 145 int old_fcntl_owner; | |
| 146 #endif | |
| 147 }; | |
| 148 | |
| 149 /* Redefine basic properties more efficiently */ | |
| 150 | |
| 151 #undef DEVICE_LIVE_P | |
| 152 #define DEVICE_LIVE_P(d) (!EQ (DEVICE_TYPE (d), Qdead)) | |
| 153 #undef DEVICE_CONSOLE | |
| 154 #define DEVICE_CONSOLE(d) ((d)->console) | |
| 155 #undef DEVICE_FRAME_LIST | |
| 156 #define DEVICE_FRAME_LIST(d) ((d)->frame_list) | |
| 157 | |
| 158 #define DEVICE_TYPE_P(d, type) EQ (DEVICE_TYPE (d), Q##type) | |
| 159 | |
| 160 #ifdef ERROR_CHECK_TYPES | |
| 161 DECLARE_INLINE_HEADER ( | |
| 162 struct device * | |
| 163 error_check_device_type (struct device *d, Lisp_Object sym) | |
| 164 ) | |
| 165 { | |
| 166 assert (EQ (DEVICE_TYPE (d), sym)); | |
| 167 return d; | |
| 168 } | |
| 169 # define DEVICE_TYPE_DATA(d, type) \ | |
| 170 ((struct type##_device *) error_check_device_type (d, Q##type)->device_data) | |
| 171 #else | |
| 172 # define DEVICE_TYPE_DATA(d, type) \ | |
| 173 ((struct type##_device *) (d)->device_data) | |
| 174 #endif | |
| 175 | |
| 176 #define CHECK_DEVICE_TYPE(x, type) \ | |
| 177 do { \ | |
| 178 CHECK_DEVICE (x); \ | |
| 179 if (!(DEVICEP (x) && DEVICE_TYPE_P (XDEVICE (x), \ | |
| 180 type))) \ | |
| 181 dead_wrong_type_argument \ | |
| 182 (type##_console_methods->predicate_symbol, x); \ | |
| 183 } while (0) | |
| 184 #define CONCHECK_DEVICE_TYPE(x, type) \ | |
| 185 do { \ | |
| 186 CONCHECK_DEVICE (x); \ | |
| 187 if (!(DEVICEP (x) && DEVICE_TYPE_P (XDEVICE (x), \ | |
| 188 type))) \ | |
| 189 x = wrong_type_argument \ | |
| 190 (type##_console_methods->predicate_symbol, x); \ | |
| 191 } while (0) | |
| 192 | |
| 193 #define DEVICE_DISPLAY_P(dev) \ | |
| 194 (DEVICE_LIVE_P (dev) && \ | |
| 195 !DEVICE_IMPL_FLAG (dev, XDEVIMPF_IS_A_PRINTER)) | |
| 196 | |
| 197 #define CHECK_DISPLAY_DEVICE(dev) \ | |
| 198 do { \ | |
| 199 CHECK_DEVICE (dev); \ | |
| 200 if (!(DEVICEP (dev) \ | |
| 201 && DEVICE_DISPLAY_P (XDEVICE (dev)))) \ | |
| 202 dead_wrong_type_argument (Qdisplay, dev); \ | |
| 203 } while (0) | |
| 204 | |
| 205 #define CONCHECK_DISPLAY_DEVICE(dev) \ | |
| 206 do { \ | |
| 207 CONCHECK_DEVICE (dev); \ | |
| 208 if (!(DEVICEP (dev) \ | |
| 209 && DEVICE_DISPLAY_P (XDEVICE (dev)))) \ | |
| 210 wrong_type_argument (Qdisplay, dev); \ | |
| 211 } while (0) | |
| 212 | |
| 213 #define DEVICE_PRINTER_P(dev) \ | |
| 214 (DEVICE_LIVE_P (dev) && !DEVICE_DISPLAY_P (dev)) | |
| 215 | |
| 216 #define CHECK_PRINTER_DEVICE(dev) \ | |
| 217 do { \ | |
| 218 CHECK_DEVICE (dev); \ | |
| 219 if (!(DEVICEP (dev) \ | |
| 220 && DEVICE_PRINTER_P (XDEVICE (dev)))) \ | |
| 221 dead_wrong_type_argument (Qprinter, dev); \ | |
| 222 } while (0) | |
| 223 | |
| 224 #define CONCHECK_PRINTER_DEVICE(dev) \ | |
| 225 do { \ | |
| 226 CONCHECK_DEVICE (dev); \ | |
| 227 if (!(DEVICEP (dev) \ | |
| 228 && DEVICE_PRINTER_P (XDEVICE (dev)))) \ | |
| 229 wrong_type_argument (Qprinter, dev); \ | |
| 230 } while (0) | |
| 231 | |
| 232 /* #### These should be in the device-*.h files but there are | |
| 233 too many places where the abstraction is broken. Need to | |
| 234 fix. */ | |
| 235 | |
| 236 #define DEVICE_X_P(dev) CONSOLE_TYPESYM_X_P (DEVICE_TYPE (dev)) | |
| 237 #define CHECK_X_DEVICE(z) CHECK_DEVICE_TYPE (z, x) | |
| 238 #define CONCHECK_X_DEVICE(z) CONCHECK_DEVICE_TYPE (z, x) | |
| 239 | |
| 240 #define DEVICE_GTK_P(dev) CONSOLE_TYPESYM_GTK_P (DEVICE_TYPE (dev)) | |
| 241 #define CHECK_GTK_DEVICE(z) CHECK_DEVICE_TYPE (z, gtk) | |
| 242 #define CONCHECK_GTK_DEVICE(z) CONCHECK_DEVICE_TYPE (z, gtk) | |
| 243 | |
| 244 #define DEVICE_MSWINDOWS_P(dev) CONSOLE_TYPESYM_MSWINDOWS_P (DEVICE_TYPE (dev)) | |
| 245 #define CHECK_MSWINDOWS_DEVICE(z) CHECK_DEVICE_TYPE (z, mswindows) | |
| 246 #define CONCHECK_MSWINDOWS_DEVICE(z) CONCHECK_DEVICE_TYPE (z, mswindows) | |
| 247 | |
| 248 #define DEVICE_TTY_P(dev) CONSOLE_TYPESYM_TTY_P (DEVICE_TYPE (dev)) | |
| 249 #define CHECK_TTY_DEVICE(z) CHECK_DEVICE_TYPE (z, tty) | |
| 250 #define CONCHECK_TTY_DEVICE(z) CONCHECK_DEVICE_TYPE (z, tty) | |
| 251 | |
| 252 #define DEVICE_STREAM_P(dev) CONSOLE_TYPESYM_STREAM_P (DEVICE_TYPE (dev)) | |
| 253 #define CHECK_STREAM_DEVICE(z) CHECK_DEVICE_TYPE (z, stream) | |
| 254 #define CONCHECK_STREAM_DEVICE(z) CONCHECK_DEVICE_TYPE (z, stream) | |
| 255 | |
| 256 #define DEVICE_WIN_P(dev) CONSOLE_TYPESYM_WIN_P (DEVICE_TYPE (dev)) | |
| 257 | |
| 258 #define DEVICE_REDISPLAY_INFO(d) ((d)->redisplay_info) | |
| 259 | |
| 260 #define DEVICE_NAME(d) ((d)->name) | |
| 261 #define DEVICE_CLASS(d) ((d)->device_class) | |
| 262 /* Catch people attempting to set this. */ | |
| 263 #define DEVICE_SELECTED_FRAME(d) NON_LVALUE ((d)->selected_frame) | |
| 264 #define DEVICE_FRAME_WITH_FOCUS_REAL(d) ((d)->frame_with_focus_real) | |
| 265 #define DEVICE_FRAME_WITH_FOCUS_FOR_HOOKS(d) ((d)->frame_with_focus_for_hooks) | |
| 266 #define DEVICE_FRAME_THAT_OUGHT_TO_HAVE_FOCUS(d) \ | |
| 267 ((d)->frame_that_ought_to_have_focus) | |
| 268 #define DEVICE_USER_DEFINED_TAGS(d) ((d)->user_defined_tags) | |
| 269 #define DEVICE_CONNECTION(d) ((d)->connection) | |
| 270 #define DEVICE_CANON_CONNECTION(d) ((d)->canon_connection) | |
| 271 #define DEVICE_BAUD_RATE(d) ((d)->baud_rate) | |
| 272 #define DEVICE_INFD(d) ((d)->infd) | |
| 273 #define DEVICE_OUTFD(d) ((d)->outfd) | |
| 274 #define DEVICE_OLD_FCNTL_OWNER(d) ((d)->old_fcntl_owner) | |
| 275 #define DEVICE_ON_CONSOLE_P(d) ((d)->on_console_p) | |
| 276 #define DEVICE_CONNECTED_TO_NAS_P(d) ((d)->connected_to_nas_p) | |
| 277 | |
| 278 #define LOCK_DEVICE(d) ((void) ((d)->locked = 1)) | |
| 279 #define UNLOCK_DEVICE(d) ((void) ((d)->locked = 0)) | |
| 280 | |
| 281 #define INVALIDATE_DEVICE_PIXEL_TO_GLYPH_CACHE(d) \ | |
| 282 ((void) ((d)->pixel_to_glyph_cache.valid = 0)) | |
| 283 | |
| 284 #define INVALIDATE_PIXEL_TO_GLYPH_CACHE do { \ | |
| 285 Lisp_Object IPTGC_devcons, IPTGC_concons; \ | |
| 286 DEVICE_LOOP_NO_BREAK (IPTGC_devcons, IPTGC_concons) \ | |
| 287 INVALIDATE_DEVICE_PIXEL_TO_GLYPH_CACHE (XDEVICE (XCAR (IPTGC_devcons))); \ | |
| 288 } while (0) | |
| 289 | |
| 290 #define MARK_DEVICE_FACES_CHANGED(d) \ | |
| 291 ((void) (faces_changed = (d)->faces_changed = 1)) | |
| 292 | |
| 293 #define MARK_DEVICE_GLYPHS_CHANGED(d) \ | |
| 294 ((void) (glyphs_changed = (d)->glyphs_changed = 1)) | |
| 295 | |
| 296 #define MARK_DEVICE_SUBWINDOWS_CHANGED(d) \ | |
| 297 ((void) (subwindows_changed = (d)->subwindows_changed = 1)) | |
| 298 | |
| 299 #define MARK_DEVICE_SUBWINDOWS_STATE_CHANGED(d) \ | |
| 300 ((void) (subwindows_state_changed = (d)->subwindows_state_changed = 1)) | |
| 301 | |
| 302 #define MARK_DEVICE_TOOLBARS_CHANGED(d) \ | |
| 303 ((void) (toolbar_changed = (d)->toolbar_changed = 1)) | |
| 304 | |
| 305 #define MARK_DEVICE_GUTTERS_CHANGED(d) \ | |
| 306 ((void) (gutter_changed = (d)->gutter_changed = 1)) | |
| 307 | |
| 308 #define MARK_DEVICE_SIZE_CHANGED(d) \ | |
| 309 ((void) (size_changed = (d)->size_changed = 1)) | |
| 310 | |
| 311 #define MARK_DEVICE_FRAMES_FACES_CHANGED(d) do { \ | |
| 312 struct device *mdffc_d = (d); \ | |
| 313 Lisp_Object frmcons; \ | |
| 314 DEVICE_FRAME_LOOP (frmcons, mdffc_d) \ | |
| 315 XFRAME (XCAR (frmcons))->faces_changed = 1; \ | |
| 316 MARK_DEVICE_FACES_CHANGED (mdffc_d); \ | |
| 317 } while (0) | |
| 318 | |
| 319 #define MARK_DEVICE_FRAMES_GLYPHS_CHANGED(d) do { \ | |
| 320 struct device *mdffc_d = (d); \ | |
| 321 Lisp_Object frmcons; \ | |
| 322 DEVICE_FRAME_LOOP (frmcons, mdffc_d) \ | |
| 323 XFRAME (XCAR (frmcons))->glyphs_changed = 1; \ | |
| 324 MARK_DEVICE_GLYPHS_CHANGED (mdffc_d); \ | |
| 325 } while (0) | |
| 326 | |
| 327 #define MARK_DEVICE_FRAME_CHANGED(d) \ | |
| 328 ((void) (frame_changed = (d)->frame_changed = 1)) | |
| 329 | |
| 905 | 330 #define MARK_DEVICE_FRAME_LAYOUT_CHANGED(d) \ |
| 331 ((void) (frame_layout_changed = (d)->frame_layout_changed = 1)) | |
| 332 | |
| 872 | 333 #define MARK_DEVICE_WINDOWS_CHANGED(d) \ |
| 334 ((void) (windows_changed = (d)->windows_changed = 1)) | |
| 335 | |
| 336 #define MARK_DEVICE_WINDOWS_STRUCTURE_CHANGED(d) \ | |
| 337 ((void) (windows_structure_changed = (d)->windows_structure_changed = 1)) | |
| 338 | |
| 339 #endif /* INCLUDED_device_impl_h_ */ |