Mercurial > hg > xemacs-beta
annotate src/faces.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 | 1fae11d56ad2 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Face data structures. |
| 2 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 5043 | 3 Copyright (C) 1995, 2002, 2010 Ben Wing |
|
5080
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
5047
diff
changeset
|
4 Copyright (C) 2010 Didier Verna |
| 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 | |
| 440 | 25 #ifndef INCLUDED_faces_h_ |
| 26 #define INCLUDED_faces_h_ | |
| 428 | 27 |
| 771 | 28 #include "charset.h" /* for NUM_LEADING_BYTES */ |
| 3659 | 29 #include "specifier.h" |
| 428 | 30 |
| 440 | 31 /* a Lisp_Face is the C object corresponding to a face. There is one |
| 32 of these per face. It basically contains all of the specifiers for | |
| 33 the built-in face properties, plus the plist of user-specified | |
| 428 | 34 properties. */ |
| 35 | |
| 36 struct Lisp_Face | |
| 37 { | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
38 NORMAL_LISP_OBJECT_HEADER header; |
| 428 | 39 |
| 40 Lisp_Object name; | |
| 41 Lisp_Object doc_string; | |
| 42 unsigned int dirty :1; /* Set whenever a face property is changed on | |
| 43 a face. */ | |
| 44 | |
| 45 Lisp_Object foreground; | |
| 46 Lisp_Object background; | |
| 47 Lisp_Object font; | |
| 48 | |
| 49 Lisp_Object display_table; | |
| 50 Lisp_Object background_pixmap; | |
|
5080
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
5047
diff
changeset
|
51 Lisp_Object background_placement; |
| 428 | 52 |
| 53 Lisp_Object underline; | |
| 54 Lisp_Object strikethru; | |
| 55 Lisp_Object highlight; | |
| 56 Lisp_Object dim; | |
| 57 Lisp_Object blinking; | |
| 58 Lisp_Object reverse; | |
| 59 | |
| 60 Lisp_Object plist; | |
| 61 | |
| 62 Lisp_Object charsets_warned_about; | |
| 63 }; | |
| 64 | |
| 65 /* | |
| 66 | |
| 67 A face cache element caches the results of instantiating the | |
| 68 properties of a face in a particular window. (Instantiation can | |
| 69 take a long time so this is very important.) Each window contains | |
| 70 an array of face cache elements (called the "face cache"), one for | |
| 71 each face that has been seen in the window so far. | |
| 72 | |
| 73 Some tricky stuff is done to make sure the face cache does not | |
| 74 become inconsistent: | |
| 75 | |
| 76 1) Switching buffers in a window clears the face cache for that | |
| 77 window, because this can change the way any property is | |
| 78 instantiated in the window. | |
| 79 2) Setting a face property causes that face to be marked as | |
| 80 dirty. This causes various stuff to happen to make sure | |
| 81 the appropriate face cache elements are invalidated. | |
| 82 (#### Actually this doesn't work quite right, and errs | |
| 83 too much on the side of invalidating unnecessary stuff.) | |
| 84 | |
| 85 There are also face cache elements for "merged faces", which are the | |
| 86 result of merging all the faces that overlap a particular buffer | |
| 87 position. The merging is always done in the context of a particular | |
| 88 domain (specifically, a window), and the face cache element is | |
| 89 specific to a particular window. (Face cache elements are contained | |
| 90 in an array that is attached to each struct_window.) The reason that | |
| 91 the merging takes place in the context of a particular window has | |
| 92 to do with the way the merging works: | |
| 93 | |
| 94 1) All extents overlying the buffer position are sorted by descending | |
| 95 priority. | |
| 96 2) The property of a particular merged face comes from the highest- | |
| 97 priority face that specifies a value for that particular property. | |
| 98 3) The way to determine whether a face specifies a value for a | |
| 99 particular property is to instantiate that face's property in | |
| 100 the window in question with the no-fallback option set, to | |
| 101 see if we got anything. | |
| 102 | |
| 103 For Mule, things get a bit trickier because there can be multiple | |
| 104 fonts per face/window combination -- the charset is an argument | |
| 105 to specifier-instance. | |
| 106 | |
| 107 We have two possible data structure representations: | |
| 108 | |
| 109 1) Keep the original "one font per face cache element" representation | |
| 110 and use a different face cache element for each charset. | |
| 111 2) Allow multiple fonts to be in a single face cache element. | |
| 112 | |
| 113 I've chosen to use (2) -- the data structure gets more complicated | |
| 114 but the algorithms for maintaining face cache elements end up | |
| 115 simpler. | |
| 116 */ | |
| 117 | |
| 118 #define NUM_STATIC_CACHEL_FACES 4 | |
| 119 | |
| 120 typedef struct face_cachel face_cachel; | |
| 121 struct face_cachel | |
| 122 { | |
| 3092 | 123 #ifdef NEW_GC |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5126
diff
changeset
|
124 NORMAL_LISP_OBJECT_HEADER header; |
| 3263 | 125 #endif /* NEW_GC */ |
| 428 | 126 /* There are two kinds of cachels; those created from a single face |
| 127 and those created by merging more than one face. In the former | |
| 128 case, the FACE element specifies the face used. In the latter | |
| 129 case, the MERGED_FACES_STATIC and MERGED_FACES elements specify | |
| 130 the faces used for merging by giving the indices of the | |
| 131 corresponding single-face cachels. | |
| 132 | |
| 133 Formerly we didn't bother to keep track of the faces used for | |
| 442 | 134 merging. We do now because we need to do so because there is no |
| 428 | 135 other way to properly handle multiple charsets for Mule in the |
| 136 presence of display tables short of always computing the values | |
| 137 for all charsets, which is very expensive. Instead, we use a | |
| 138 lazy scheme where we only compute the font for a particular charset | |
| 139 when it is needed. (The exception is the font for the ASCII charset. | |
| 140 We always compute it, just like the other attributes, because | |
| 141 many places in the C code refer to the font of the ASCII charset | |
| 142 and expect it to always be there.) | |
| 143 | |
| 144 We store the first four faces in a static array, and use a | |
| 145 Dynarr for the rest. This has the advantage that the space used | |
| 146 is small but the Dynarr will almost never be created, so we | |
| 147 won't spend much time in malloc()/free(). | |
| 148 | |
| 149 The order of the faces here is decreasing extent priority. */ | |
| 150 Lisp_Object face; | |
| 151 int merged_faces_static[NUM_STATIC_CACHEL_FACES]; | |
| 152 int_dynarr *merged_faces; | |
| 153 int nfaces; | |
| 154 | |
| 155 /* The values stored here are computed by calling specifier_instance() | |
| 156 on the appropriate specifiers. This means that we will have either | |
| 157 a value computed from the face itself or a value computed from the | |
| 158 default face. We need to distinguish the two so that merging works | |
| 159 properly -- a value that comes from the default face is treated | |
| 160 as "unspecified" during merging and is overridden by lower-priority | |
| 161 faces. This is what the _specified flags below are for. */ | |
| 162 | |
| 163 Lisp_Object foreground; | |
| 164 Lisp_Object background; | |
| 771 | 165 /* There are currently 128 or 129 possible charsets under Mule. For the |
| 428 | 166 moment we just take the easy way out and allocate space for each |
| 167 of them. This avoids messing with Dynarrs. | |
| 168 | |
| 169 #### We should look into this and probably clean it up | |
| 3094 | 170 to use Dynarrs. This may be a big space hog as is. |
| 171 sjt sez: doesn't look like it, my total face cache is 170KB. | |
| 172 Could be reduced to maybe 50KB. */ | |
| 428 | 173 Lisp_Object font[NUM_LEADING_BYTES]; |
| 174 | |
| 175 Lisp_Object display_table; | |
| 176 Lisp_Object background_pixmap; | |
|
5080
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
5047
diff
changeset
|
177 Lisp_Object background_placement; |
| 428 | 178 |
| 179 unsigned int underline :1; | |
| 180 unsigned int strikethru :1; | |
| 181 unsigned int highlight :1; | |
| 182 unsigned int dim :1; | |
| 183 unsigned int blinking :1; | |
| 184 unsigned int reverse :1; | |
| 185 | |
| 186 /* Used when merging to tell if the above field represents an actual | |
| 187 value of this face or a fallback value. */ | |
| 3659 | 188 DECLARE_INLINE_LISP_BIT_VECTOR(NUM_LEADING_BYTES) font_specified; |
| 189 | |
| 428 | 190 unsigned int foreground_specified :1; |
| 191 unsigned int background_specified :1; | |
| 192 unsigned int display_table_specified :1; | |
| 193 unsigned int background_pixmap_specified :1; | |
|
5080
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
5047
diff
changeset
|
194 unsigned int background_placement_specified :1; |
| 428 | 195 |
| 196 unsigned int strikethru_specified :1; | |
| 197 unsigned int underline_specified :1; | |
| 198 unsigned int highlight_specified :1; | |
| 199 unsigned int dim_specified :1; | |
| 200 unsigned int blinking_specified :1; | |
| 201 unsigned int reverse_specified :1; | |
| 202 | |
| 203 /* The updated flag is set after we calculate the values for the | |
| 204 face cachel and cleared whenever a face changes, to indicate | |
| 205 that the values stored here might be wrong. The next time | |
| 206 we go to access the values, we recompute them; if any values | |
| 207 change, we set the DIRTY flag, which tells the output routines | |
| 208 that a face value has in fact changed and the sections of text | |
| 209 using this face need to be redrawn. | |
| 210 | |
| 211 It is trickier with fonts because we don't automatically | |
| 212 recompute the fonts but do it only when it is necessary. | |
| 213 (The ASCII font is an exception, of course; see above). | |
| 214 | |
| 215 In the case of fonts, we maintain a separate updated flag | |
| 216 for each font. Whenever we need to access the font for | |
| 217 a particular charset, we recalculate it if either its | |
| 218 value is Qunbound (meaning it's never been computed at all) | |
| 219 or the updated flag is not set. We set the dirty flag if | |
| 220 the value is not the same as before and the previous value | |
| 221 was not Qunbound. | |
| 222 | |
| 223 #### Note that we don't yet deal with the case of the new | |
| 224 value being Qunbound, as could happen if no fonts of the | |
| 225 right sort are available on the system. In this case, the | |
| 226 whole program will just crash. For the moment, this is | |
| 227 OK (for debugging purposes) but we should fix this by | |
| 228 storing a "blank font" if the instantiation fails. */ | |
| 229 unsigned int dirty :1; | |
| 230 unsigned int updated :1; | |
| 3659 | 231 |
| 232 DECLARE_INLINE_LISP_BIT_VECTOR(NUM_LEADING_BYTES) font_updated; | |
| 233 | |
| 234 /* Whether the font for the charset in question was determined in the | |
| 235 "final stage"; that is, the last stage Lisp code could specify it, | |
| 236 after the initial stage and before the fallback. */ | |
| 237 DECLARE_INLINE_LISP_BIT_VECTOR(NUM_LEADING_BYTES) font_final_stage; | |
| 428 | 238 }; |
| 239 | |
| 3092 | 240 #ifdef NEW_GC |
| 241 typedef struct face_cachel Lisp_Face_Cachel; | |
| 242 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
3676
diff
changeset
|
243 DECLARE_LISP_OBJECT (face_cachel, Lisp_Face_Cachel); |
| 3092 | 244 |
| 245 #define XFACE_CACHEL(x) \ | |
| 246 XRECORD (x, face_cachel, Lisp_Face_Cachel) | |
| 247 #define wrap_face_cachel(p) wrap_record (p, face_cachel) | |
| 248 #define FACE_CACHEL_P(x) RECORDP (x, face_cachel) | |
| 249 #define CHECK_FACE_CACHEL(x) CHECK_RECORD (x, face_cachel) | |
| 250 #define CONCHECK_FACE_CACHEL(x) CONCHECK_RECORD (x, face_cachel) | |
| 251 #endif /* NEW_GC */ | |
| 252 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
3676
diff
changeset
|
253 DECLARE_LISP_OBJECT (face, Lisp_Face); |
| 440 | 254 #define XFACE(x) XRECORD (x, face, Lisp_Face) |
| 617 | 255 #define wrap_face(p) wrap_record (p, face) |
| 428 | 256 #define FACEP(x) RECORDP (x, face) |
| 257 #define CHECK_FACE(x) CHECK_RECORD (x, face) | |
| 258 | |
| 259 Lisp_Object ensure_face_cachel_contains_charset (struct face_cachel *cachel, | |
| 260 Lisp_Object domain, | |
| 261 Lisp_Object charset); | |
| 262 void ensure_face_cachel_complete (struct face_cachel *cachel, | |
| 263 Lisp_Object domain, | |
| 264 unsigned char *charsets); | |
| 265 void update_face_cachel_data (struct face_cachel *cachel, | |
| 266 Lisp_Object domain, | |
| 267 Lisp_Object face); | |
| 268 void face_cachel_charset_font_metric_info (struct face_cachel *cachel, | |
| 269 unsigned char *charsets, | |
| 270 struct font_metric_info *fm); | |
| 271 void mark_face_cachels (face_cachel_dynarr *elements); | |
| 272 void mark_face_cachels_as_clean (struct window *w); | |
| 273 void mark_face_cachels_as_not_updated (struct window *w); | |
| 274 void reset_face_cachel (struct face_cachel *inst); | |
| 275 void reset_face_cachels (struct window *w); | |
| 276 face_index get_builtin_face_cache_index (struct window *w, | |
| 277 Lisp_Object face); | |
| 3094 | 278 /* WARNING: this interface may change. */ |
| 279 face_index merge_face_list_to_cache_index (struct window *w, | |
| 280 Lisp_Object *face_list, int count); | |
| 281 | |
| 428 | 282 #ifdef MEMORY_USAGE_STATS |
| 283 int compute_face_cachel_usage (face_cachel_dynarr *face_cachels, | |
|
5157
1fae11d56ad2
redo memory-usage mechanism, add way of dynamically initializing Lisp objects
Ben Wing <ben@xemacs.org>
parents:
5128
diff
changeset
|
284 struct usage_stats *ustats); |
| 428 | 285 #endif /* MEMORY_USAGE_STATS */ |
| 286 | |
| 287 EXFUN (Fface_name, 1); | |
| 288 EXFUN (Ffind_face, 1); | |
| 289 EXFUN (Fget_face, 1); | |
| 290 | |
| 291 extern Lisp_Object Qstrikethru, Vbuilt_in_face_specifiers, Vdefault_face; | |
| 292 extern Lisp_Object Vleft_margin_face, Vpointer_face, Vright_margin_face; | |
| 432 | 293 extern Lisp_Object Vtext_cursor_face, Vvertical_divider_face; |
| 428 | 294 extern Lisp_Object Vtoolbar_face, Vgui_element_face, Vwidget_face; |
| 295 | |
| 296 void mark_all_faces_as_clean (void); | |
| 297 void init_frame_faces (struct frame *f); | |
| 298 void init_device_faces (struct device *d); | |
| 299 void init_global_faces (struct device *d); | |
| 300 face_index get_extent_fragment_face_cache_index (struct window *w, | |
| 301 struct extent_fragment *ef); | |
| 302 void update_frame_face_values (struct frame *f); | |
| 303 void face_property_was_changed (Lisp_Object face, Lisp_Object property, | |
| 304 Lisp_Object locale); | |
| 305 void default_face_font_info (Lisp_Object domain, int *ascent, | |
|
5047
07dcc7000bbf
put width before height consistently, fix a real bug found in the process
Ben Wing <ben@xemacs.org>
parents:
5043
diff
changeset
|
306 int *descent, int *width, int *height, |
| 428 | 307 int *proportional_p); |
|
5047
07dcc7000bbf
put width before height consistently, fix a real bug found in the process
Ben Wing <ben@xemacs.org>
parents:
5043
diff
changeset
|
308 void default_face_width_and_height (Lisp_Object domain, int *width, |
|
07dcc7000bbf
put width before height consistently, fix a real bug found in the process
Ben Wing <ben@xemacs.org>
parents:
5043
diff
changeset
|
309 int *height); |
| 428 | 310 |
| 311 #define FACE_CACHEL_FONT(cachel, charset) \ | |
| 771 | 312 (cachel->font[XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE]) |
| 428 | 313 |
| 3659 | 314 #define FACE_CACHEL_FONT_UPDATED(x) \ |
| 315 ((struct Lisp_Bit_Vector *)(&((x)->font_updated))) | |
| 316 #define FACE_CACHEL_FONT_SPECIFIED(x) \ | |
| 317 ((struct Lisp_Bit_Vector *)(&((x)->font_specified))) | |
| 318 #define FACE_CACHEL_FONT_FINAL_STAGE(x) \ | |
| 319 ((struct Lisp_Bit_Vector *)(&((x)->font_final_stage))) | |
| 320 | |
| 428 | 321 #define WINDOW_FACE_CACHEL(window, index) \ |
| 322 Dynarr_atp ((window)->face_cachels, index) | |
| 323 | |
| 324 #define FACE_CACHEL_FINDEX_UNSAFE(cachel, offset) \ | |
| 325 ((offset) < NUM_STATIC_CACHEL_FACES \ | |
| 326 ? (cachel)->merged_faces_static[offset] \ | |
| 327 : Dynarr_at ((cachel)->merged_faces, (offset) - NUM_STATIC_CACHEL_FACES)) | |
| 328 | |
| 329 #define WINDOW_FACE_CACHEL_FACE(window, index) \ | |
| 330 (WINDOW_FACE_CACHEL (window, index)->face) | |
| 331 #define WINDOW_FACE_CACHEL_FOREGROUND(window, index) \ | |
| 332 (WINDOW_FACE_CACHEL (window, index)->foreground) | |
| 333 #define WINDOW_FACE_CACHEL_BACKGROUND(window, index) \ | |
| 334 (WINDOW_FACE_CACHEL (window, index)->background) | |
| 335 /* #### This can be referenced by various functions, | |
| 336 but face_cachels isn't initialized for the stream device. | |
| 337 Since it doesn't need the value we just return nil here to avoid | |
| 338 blowing up in multiple places. */ | |
| 339 #define WINDOW_FACE_CACHEL_FONT(window, index, charset) \ | |
| 340 ((window)->face_cachels \ | |
| 341 ? FACE_CACHEL_FONT (WINDOW_FACE_CACHEL (window, index), charset) \ | |
| 342 : Qnil) | |
| 343 #define WINDOW_FACE_CACHEL_DISPLAY_TABLE(window, index) \ | |
| 344 (WINDOW_FACE_CACHEL (window, index)->display_table) | |
| 345 #define WINDOW_FACE_CACHEL_BACKGROUND_PIXMAP(window, index) \ | |
| 346 (WINDOW_FACE_CACHEL (window, index)->background_pixmap) | |
|
5080
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
5047
diff
changeset
|
347 #define WINDOW_FACE_CACHEL_BACKGROUND_PLACEMENT(window, index) \ |
|
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
5047
diff
changeset
|
348 (WINDOW_FACE_CACHEL (window, index)->background_placement) |
| 428 | 349 #define WINDOW_FACE_CACHEL_DIRTY(window, index) \ |
| 350 (WINDOW_FACE_CACHEL (window, index)->dirty) | |
| 351 #define WINDOW_FACE_CACHEL_UNDERLINE_P(window, index) \ | |
| 352 (WINDOW_FACE_CACHEL (window, index)->underline) | |
| 353 #define WINDOW_FACE_CACHEL_HIGHLIGHT_P(window, index) \ | |
| 354 (WINDOW_FACE_CACHEL (window, index)->highlight) | |
| 355 #define WINDOW_FACE_CACHEL_DIM_P(window, index) \ | |
| 356 (WINDOW_FACE_CACHEL (window, index)->dim) | |
| 357 #define WINDOW_FACE_CACHEL_BLINKING_P(window, index) \ | |
| 358 (WINDOW_FACE_CACHEL (window, index)->blinking) | |
| 359 #define WINDOW_FACE_CACHEL_REVERSE_P(window, index) \ | |
| 360 (WINDOW_FACE_CACHEL (window, index)->reverse) | |
| 361 | |
| 362 #define FACE_PROPERTY_SPECIFIER(face, property) Fget (face, property, Qnil) | |
| 363 | |
| 364 #define FACE_PROPERTY_INSTANCE_1(face, property, domain, errb, no_fallback, depth) \ | |
| 365 specifier_instance (FACE_PROPERTY_SPECIFIER (face, property), Qunbound, \ | |
| 366 domain, errb, 1, no_fallback, depth) | |
| 367 | |
| 368 #define FACE_PROPERTY_INSTANCE(face, property, domain, no_fallback, depth) \ | |
| 793 | 369 FACE_PROPERTY_INSTANCE_1 (face, property, domain, ERROR_ME_DEBUG_WARN, \ |
| 428 | 370 no_fallback, depth) |
| 371 | |
| 3659 | 372 Lisp_Object face_property_matching_instance |
| 373 (Lisp_Object face, | |
| 374 Lisp_Object property, | |
| 375 Lisp_Object charset, | |
| 376 Lisp_Object domain, | |
| 377 Error_Behavior errb, | |
| 378 int no_fallback, | |
| 379 Lisp_Object depth, | |
| 380 enum font_specifier_matchspec_stages stages); | |
| 428 | 381 |
| 382 #define FACE_PROPERTY_SPEC_LIST(face, property, locale) \ | |
| 383 Fspecifier_spec_list (FACE_PROPERTY_SPECIFIER (face, property), \ | |
| 384 locale, Qnil, Qnil) | |
| 498 | 385 #define SET_FACE_PROPERTY(face, property, value, locale, tag, how_to_add) \ |
| 428 | 386 Fadd_spec_to_specifier (FACE_PROPERTY_SPECIFIER (face, property), \ |
| 498 | 387 value, locale, tag, how_to_add) |
| 428 | 388 |
| 389 #define FACE_FOREGROUND(face, domain) \ | |
| 390 FACE_PROPERTY_INSTANCE (face, Qforeground, domain, 0, Qzero) | |
| 391 #define FACE_BACKGROUND(face, domain) \ | |
| 392 FACE_PROPERTY_INSTANCE (face, Qbackground, domain, 0, Qzero) | |
| 3676 | 393 |
| 394 /* Calling this function on the default face with the ASCII character set | |
| 395 may delete any X11 frames; see the code at the end of | |
| 396 x_find_charset_font. */ | |
| 428 | 397 #define FACE_FONT(face, domain, charset) \ |
| 398 face_property_matching_instance (face, Qfont, charset, domain, \ | |
| 3659 | 399 ERROR_ME_DEBUG_WARN, 0, Qzero, \ |
|
5015
d95c102a96d3
cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings)
Ben Wing <ben@xemacs.org>
parents:
3676
diff
changeset
|
400 STAGE_INITIAL) |
| 428 | 401 #define FACE_DISPLAY_TABLE(face, domain) \ |
| 402 FACE_PROPERTY_INSTANCE (face, Qdisplay_table, domain, 0, Qzero) | |
| 403 #define FACE_BACKGROUND_PIXMAP(face, domain) \ | |
| 404 FACE_PROPERTY_INSTANCE (face, Qbackground_pixmap, domain, 0, Qzero) | |
|
5080
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
5047
diff
changeset
|
405 |
|
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
5047
diff
changeset
|
406 extern Lisp_Object Qbackground_placement; |
|
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
5047
diff
changeset
|
407 #define FACE_BACKGROUND_PLACEMENT(face, domain) \ |
|
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
5047
diff
changeset
|
408 FACE_PROPERTY_INSTANCE (face, Qbackground_placement, domain, 0, Qzero) |
|
5502045ec510
The background-placement face property.
Didier Verna <didier@lrde.epita.fr>
parents:
5047
diff
changeset
|
409 |
| 428 | 410 #define FACE_UNDERLINE_P(face, domain) \ |
| 411 (!NILP (FACE_PROPERTY_INSTANCE (face, Qunderline, domain, 0, Qzero))) | |
| 440 | 412 #define FACE_STRIKETHRU_P(face, domain) \ |
| 413 (!NILP (FACE_PROPERTY_INSTANCE (face, Qstrikethru, domain, 0, Qzero))) | |
| 428 | 414 #define FACE_HIGHLIGHT_P(face, domain) \ |
| 415 (!NILP (FACE_PROPERTY_INSTANCE (face, Qhighlight, domain, 0, Qzero))) | |
| 416 #define FACE_DIM_P(face, domain) \ | |
| 417 (!NILP (FACE_PROPERTY_INSTANCE (face, Qdim, domain, 0, Qzero))) | |
| 418 #define FACE_BLINKING_P(face, domain) \ | |
| 419 (!NILP (FACE_PROPERTY_INSTANCE (face, Qblinking, domain, 0, Qzero))) | |
| 420 #define FACE_REVERSE_P(face, domain) \ | |
| 421 (!NILP (FACE_PROPERTY_INSTANCE (face, Qreverse, domain, 0, Qzero))) | |
| 422 | |
| 440 | 423 #endif /* INCLUDED_faces_h_ */ |