Mercurial > hg > xemacs-beta
view lisp/text-props.el @ 872:79c6ff3eef26
[xemacs-hg @ 2002-06-20 21:18:01 by ben]
font changes etc.; some 21.4 changes
mule/mule-msw-init-late.el: Specify charset->windows-registry conversion.
mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c.
cl-macs.el: Document better.
font-lock.el: Move Lisp function regexp to lisp-mode.el.
lisp-mode.el: Various indentation fixes:
Handle flet functions better.
Handle argument lists in defuns and flets.
Handle quoted lists, e.g. property lists -- don't indent like
function calls. Distinguish between lambdas and other lists.
lisp-mode.el: Handle this form.
faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code:
-- Fix lots of bogus code in msw-faces.el, msw-font-menu.el,
font-menu.el that was "truenaming" font specs -- i.e. in the
process of frobbing a particular field in a general user-specified
font spec with wildcarded fields, sticking in particular values
for all the remaining wildcarded fields. This bug was rampant
everywhere except in x-faces.el (the oldest and only correctly
written code). This also means that we need to work with font
names at all times and not font instances, because a font instance
is essentially a truenamed font.
-- Total rewrite of extremely junky code in msw-faces.el. Work
with names as well as font instances, and return names; stop
truenaming when canonicalizing and frobbing; fix handling of the
combined style field, i.e. weight/slant (also fixed in font.el).
-- Totally rewrite the frobbing functions in faces.el. This time,
we frob all the instantiators rather than just computing a single
instance value and working backwards. That way, e.g., `bold' will
work for all charsets that have bold available, rather than only
for whatever charset was part of the computed font instance
(another example of the truename virus). Also fix up code to look
at the fallbacks (all of them) when no global value present, so we
don't need to put something in the global value. Intelligently
handle a request to frob a buffer locale, rather than signalling
an error. When frobbing instantiators, try hard to figure out
what device type is associated with them, and frob each according
to its own proper device type. Correctly handle inheritance
vectors given as instantiators. Preserve existing tags when
putting back frobbed instantiators. Extract out general
specifier-frobbing code into specifier.el. Document everything
cleanly. Do lots of other things better, etc.
-- Don't duplicatively set a global specification for the default
font -- it's already in the fallback and we no longer need a
default global specification present. Delete various code in
x-faces.el and msw-faces.el that duplicated the lists of fonts in
faces.c.
-- init-global-faces was not being called at all under MS Windows!
Major bogosity. That caused device-specific values to get stuck
into all the fonts, making it very hard to change them -- setting
global specs caused nothing to happen.
-- Correct weight names in font.el.
-- Lots more font fixups in objects*.c.
Printer.el: Warning fix.
specifier.el: Add more args to map-specifier.
Add various "heuristic" specifier functions to aid in creation of
specifier-munging code such as in faces.el.
subr.el: New functions.
lwlib.c: Fix warning.
config.inc.samp: Clean up, add args to control fastcall (not yet supported! the
changes needed are in another ws of mine), profile support, vc6
support, union-type.
xemacs.dsp, xemacs.mak: Semi-major overhaul.
Fix bug where dump-id was always getting recomputed, forcing a
redump even when nothing changed.
Add support for fastcall. Support edit-and-continue (on by
default) with vc6. Use incremental linking when doing a debug
compilation. Add support for profiling.
Consolidate the various debug flags.
Partial support for "batch-compiling" -- compiling many files on a
single invocation of the compiler. Doesn't seem to help that much
for me, so it's not finished or enabled by default.
Remove HAVE_MSW_C_DIRED, we always do.
Correct some sloppy use of directories.
s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine
HAVE_MMAP).
s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32
variants (Cygwin, native, MinGW). Both of these are properly used
in another ws.
alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made:
(1) Separation of various header files into an external and an
internal version, similar to the existing separation of process.h
and procimpl.h. Eventually this should be done for all Lisp
objects. The external version has the same name as currently; the
internal adds -impl. The external file has XFOO() macros for
objects, but the structure is opaque and defined only in the
internal file. It's now reasonable to move all prototypes in
lisp.h into the appropriate external file, and this should be
done. Currently, separation has been done on extents.h,
objects*.h, console.h, device.h, frame.h, and window.h.
For c/d/f/w, the most basic properties are available in the
external header file, with the macros resolving to functions. In
the internal header file, the macros are redefined to directly
access the structure. Also, the global MARK_FOO_CHANGED macros
have been made into functions so that they can be accessed without
needing to include lots of -impl headers -- they are used in
almost exclusively in non-time-critical functions, and take up
enough time that the function overhead will be negligible.
Similarly, the function overhead from making the basic properties
mentioned above into functions is negligible, and code that does
heavy accessing of c/d/f/w structures inevitably ends up needing
the internal header files, anyway.
(2) More face changes.
-- Major rewrite of objects-msw.c. Now handles wildcard specs
properly, rather than "truenaming" (or even worse, signalling an
error, which previously happened with some of the fallbacks if you
tried to use them in make-font-instance!).
-- Split charset matching of fonts into two stages -- one to find
a font specifically designed for a particular charset (by
examining its registry), the second to find a Unicode font that
can support the charset. This needs to proceed as two complete,
separate instantiations in order to work properly (otherwise many
of the fonts in the HELLO page look wrong). This should also make
it easy to support iso10646 (Unicode) fonts under X.
-- All default values for fonts are now completely specified in
the fallbacks. Stuff from mule-x-init.el has all been moved here,
merged with the existing specs, and totally rethought so you get
sensible results. (HELLO now looks much better!).
-- Generalize the "default X/GTK device" stuff into a
per-device-type "default device".
-- Add mswindows-{set-}charset-registry. In time,
charset<->code-page conversion functions will be removed.
-- Wrap protective code around calls to compute device specifier tags,
and do this computation before calling the face initialization code
because the latter may need these tags to be correctly updated.
(3) Other changes.
EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes.
config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of
#ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside!
eval.c: Let detailed backtraces be detailed.
specifier.c: Don't override user's print-string-length/print-length settings.
glyphs.c: New function image-instance-instantiator.
config.h.in, sysdep.c: Changes for fastcall.
sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both
EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP
NEEDS TO GO IN, TOO.
search.c: Fix *evil* crash due to incorrect synching of syntax-cache code
with 21.1. THIS SHOULD GO INTO 21.4.
author | ben |
---|---|
date | Thu, 20 Jun 2002 21:19:10 +0000 |
parents | 3ecd8885ac67 |
children | 57b76886836d |
line wrap: on
line source
;;; text-props.el --- implements properties of characters ;; Copyright (C) 1993-4, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Amdahl Corporation. ;; Copyright (C) 1995 Ben Wing. ;; Author: Jamie Zawinski <jwz@jwz.org> ;; Maintainer: XEmacs Development Team ;; Keywords: extensions, wp, faces, dumped ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the Free ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; Commentary: ;; This file is dumped with XEmacs. ;; This is a nearly complete implementation of the FSF19 text properties API. ;; Please let me know if you notice any differences in behavior between ;; this implementation and the FSF implementation. ;; However, keep in mind that this interface has been implemented because it ;; is useful. Compatibility with code written for FSF19 is a secondary goal ;; to having a clean and useful interface. ;; The cruftier parts of the FSF API, such as the special handling of ;; properties like `mouse-face', `front-sticky', and other properties whose ;; value is a list of names of *other* properties set at this position, are ;; not implemented. The reason for this is that if you feel you need that ;; kind of functionality, it's a good hint that you should be using extents ;; instead of text properties. ;; When should I use Text Properties, and when should I use Extents? ;; ================================================================== ;; If you are putting a `button' or `hyperlink' of some kind into a buffer, ;; the most natural interface is one which deals with properties of regions ;; with explicit endpoints that behave more-or-less like markers. That is ;; what `make-extent', `extent-at', and `extent-property' are for. ;; If you are dealing with styles of text, where things do not have explicit ;; endpoints (as is done in font-lock.el and shell-font.el) or if you want to ;; partition a buffer (that is, change some attribute of a range from one ;; value to another without disturbing the properties outside of that range) ;; then an interface that deals with properties of characters may be most ;; natural. ;; Another way of thinking of it is, do you care where the endpoints of the ;; region are? If you do, then you should use extents. If it's ok for the ;; region to become divided, and for two regions with identical properties to ;; be merged into one region, then you might want to use text properties. ;; Some applications want the attributes they add to be copied by the killing ;; and yanking commands, and some do not. This is orthogonal to whether text ;; properties or extents are used. Remember that text properties are ;; implemented in terms of extents, so anything you can do with one you can ;; do with the other. It's just a matter of which way of creating and ;; managing them is most appropriate to your application. ;; Implementation details: ;; ======================= ;; This package uses extents with a non-nil 'text-prop property. It assumes ;; free reign over the endpoints of any extent with that property. It will ;; not alter any extent which does not have that property. ;; Right now, the text-property functions create one extent for each distinct ;; property; that is, if a range of text has two text-properties on it, there ;; will be two extents. As the set of text-properties is going to be small, ;; this is probably not a big deal. It would be possible to share extents. ;; One tricky bit is that undo/kill/yank must be made to not fragment things: ;; these extents must not be allowed to overlap. We accomplish this by using ;; a custom `paste-function' property on the extents. ;; shell-font.el and font-lock.el could put-text-property to attach fonts to ;; the buffer. However, what these packages are interested in is the ;; efficient extent partitioning behavior which this code exhibits, not the ;; duplicability aspect of it. In fact, either of these packages could be ;; implemented by creating a one-character non-expandable extent for each ;; character in the buffer, except that that would be extremely wasteful of ;; memory. (Redisplay performance would be fine, however.) ;; If these packages were to use put-text-property to make the extents, then ;; when one copied text from a shell buffer or a font-locked source buffer ;; and pasted it somewhere else (a sendmail buffer, or a buffer not in ;; font-lock mode) then the fonts would follow, and there's no easy way to ;; get rid of them (other than pounding out a call to put-text-property by ;; hand.) This is annoying. Maybe it wouldn't be so annoying if there was a ;; more general set of commands for handling styles of text (in fact, if ;; there were such a thing, copying the fonts would probably be exactly what ;; one wanted) but we aren't there yet. So these packages use the interface ;; of `put-nonduplicable-text-property' which is the same, except that it ;; doesn't make duplicable extents. ;; `put-text-property' and `put-nonduplicable-text-property' don't get along: ;; they will interfere with each other, reusing each others' extents without ;; checking that the "duplicableness" is correct. This is a bug, but it's ;; one that I don't care enough to fix this right now. ;;; Code: (defun set-text-properties (start end props &optional buffer-or-string) "You should NEVER use this function. It is ideologically blasphemous. It is provided only to ease porting of broken FSF Emacs programs. Instead, use `remove-text-properties' to remove the specific properties you do not want. Completely replace properties of text from START to END. The third argument PROPS is the new property list. The optional fourth argument, BUFFER-OR-STRING, is the string or buffer containing the text." (map-extents #'(lambda (extent ignored) ;; #### dmoore - shouldn't this use ;; (extent-start-position extent) ;; (extent-end-position extent) (remove-text-properties start end (list (extent-property extent 'text-prop) nil) buffer-or-string) nil) buffer-or-string start end nil nil 'text-prop) (add-text-properties start end props buffer-or-string)) ;;; The following functions can probably stay in lisp, since they're so simple. ;(defun get-text-property (pos prop &optional buffer) ; "Returns the value of the PROP property at the given position." ; (let ((e (extent-at pos buffer prop))) ; (if e ; (extent-property e prop) ; nil))) (defun extent-properties-at-1 (position buffer-or-string text-props-only) (let ((extent nil) (props nil) new-props) (while (setq extent (extent-at position buffer-or-string (if text-props-only 'text-prop nil) extent)) (if text-props-only ;; Only return the one prop which the `text-prop' property points at. (let ((prop (extent-property extent 'text-prop))) (setq new-props (list prop (extent-property extent prop)))) ;; Return all the properties... (setq new-props (extent-properties extent)) ;; ...but! Don't return the `begin-glyph' or `end-glyph' properties ;; unless the position is exactly at the appropriate endpoint. Yeah, ;; this is kind of a kludge. ;; #### Bug, this doesn't work for end-glyphs (on end-open extents) ;; because we've already passed the extent with the glyph by the time ;; it's appropriate to return the glyph. We could return the end ;; glyph one character early I guess... But then next-property-change ;; would have to stop one character early as well. It could back up ;; when it hit an end-glyph... ;; #### Another bug, if there are multiple glyphs at the same position, ;; we only see the first one. (cond ((or (extent-begin-glyph extent) (extent-end-glyph extent)) (if (/= position (if (extent-property extent 'begin-glyph) (extent-start-position extent) (extent-end-position extent))) (let ((rest new-props) prev) (while rest (cond ((or (eq (car rest) 'begin-glyph) (eq (car rest) 'end-glyph)) (if prev (setcdr prev (cdr (cdr rest))) (setq new-props (cdr (cdr new-props)))) (setq rest nil))) (setq prev rest rest (cdr rest)))))))) (cond ((null props) (setq props new-props)) (t (while new-props (or (getf props (car new-props)) (setq props (cons (car new-props) (cons (car (cdr new-props)) props)))) (setq new-props (cdr (cdr new-props))))))) props)) (defun extent-properties-at (position &optional object) "Return the properties of the character at the given position in OBJECT. OBJECT is either a string or a buffer. The properties of overlapping extents are merged. The returned value is a property list, some of which may be shared with other structures. You must not modify it. If POSITION is at the end of OBJECT, the value is nil. This returns all properties on all extents. See also `text-properties-at'." (extent-properties-at-1 position object nil)) (defun text-properties-at (position &optional object) "Return the properties of the character at the given position in OBJECT. OBJECT is either a string or a buffer. The properties of overlapping extents are merged. The returned value is a property list, some of which may be shared with other structures. You must not modify it. If POSITION is at the end of OBJECT, the value is nil. This returns only those properties added with `put-text-property'. See also `extent-properties-at'." (extent-properties-at-1 position object t)) (defun text-property-any (start end prop value &optional buffer-or-string) "Check text from START to END to see if PROP is ever `eq' to VALUE. If so, return the position of the first character whose PROP is `eq' to VALUE. Otherwise return nil. The optional fifth argument, BUFFER-OR-STRING, is the buffer or string containing the text and defaults to the current buffer." (while (and start (< start end) (not (eq value (get-text-property start prop buffer-or-string)))) (setq start (next-single-property-change start prop buffer-or-string end))) ;; we have to insert a special check for end due to the illogical ;; definition of next-single-property-change (blame FSF for this). (if (eq start end) nil start)) (defun text-property-not-all (start end prop value &optional buffer-or-string) "Check text from START to END to see if PROP is ever not `eq' to VALUE. If so, return the position of the first character whose PROP is not `eq' to VALUE. Otherwise, return nil. The optional fifth argument, BUFFER-OR-STRING, is the buffer or string containing the text and defaults to the current buffer." (if (not (eq value (get-text-property start prop buffer-or-string))) start (let ((retval (next-single-property-change start prop buffer-or-string end))) ;; we have to insert a special check for end due to the illogical ;; definition of previous-single-property-change (blame FSF for this). (if (eq retval end) nil retval)))) ;; Older versions that only work sometimes (when VALUE is non-nil ;; for text-property-any, and maybe only when VALUE is nil for ;; text-property-not-all). They might be faster in those cases, ;; but that's not obvious. ;(defun text-property-any (start end prop value &optional buffer) ; "Check text from START to END to see if PROP is ever `eq' to VALUE. ;If so, return the position of the first character whose PROP is `eq' ;to VALUE. Otherwise return nil." ; ;; #### what should (text-property-any x y 'foo nil) return when there ; ;; is no foo property between x and y? Either t or nil seems sensible, ; ;; since a character with a property of nil is indistinguishable from ; ;; a character without that property set. ; (map-extents ; #'(lambda (e ignore) ; (if (eq value (extent-property e prop)) ; ;; return non-nil to stop mapping ; (max start (extent-start-position e)) ; nil)) ; nil start end buffer)) ; ;(defun text-property-not-all (start end prop value &optional buffer) ; "Check text from START to END to see if PROP is ever not `eq' to VALUE. ;If so, return the position of the first character whose PROP is not ;`eq' to VALUE. Otherwise, return nil." ; (let (maxend) ; (map-extents ; #'(lambda (e ignore) ; ;;### no, actually, this is harder. We need to collect all props ; ;; for a given character, and then determine whether no extent ; ;; contributes the given value. Doing this without consing lots ; ;; of lists is the tricky part. ; (if (eq value (extent-property e prop)) ; (progn ; (setq maxend (extent-end-position e)) ; nil) ; (max start maxend))) ; nil start end buffer))) (defun next-property-change (pos &optional buffer-or-string limit) "Return the position of next property change. Scans forward from POS in BUFFER-OR-STRING (defaults to the current buffer) until it finds a change in some text property, then returns the position of the change. Returns nil if the properties remain unchanged all the way to the end. If the value is non-nil, it is a position greater than POS, never equal. If the optional third argument LIMIT is non-nil, don't search past position LIMIT; return LIMIT if nothing is found before LIMIT. If two or more extents with conflicting non-nil values for a property overlap a particular character, it is undefined which value is considered to be the value of the property. (Note that this situation will not happen if you always use the text-property primitives.)" (let ((limit-was-nil (null limit))) (or limit (setq limit (if (bufferp buffer-or-string) (point-max buffer-or-string) (length buffer-or-string)))) (let ((value (extent-properties-at pos buffer-or-string))) (while (and (< (setq pos (next-extent-change pos buffer-or-string)) limit) (plists-eq value (extent-properties-at pos buffer-or-string))))) (if (< pos limit) pos (if limit-was-nil nil limit)))) (defun previous-property-change (pos &optional buffer-or-string limit) "Return the position of previous property change. Scans backward from POS in BUFFER-OR-STRING (defaults to the current buffer) until it finds a change in some text property, then returns the position of the change. Returns nil if the properties remain unchanged all the way to the beginning. If the value is non-nil, it is a position less than POS, never equal. If the optional third argument LIMIT is non-nil, don't search back past position LIMIT; return LIMIT if nothing is found until LIMIT. If two or more extents with conflicting non-nil values for a property overlap a particular character, it is undefined which value is considered to be the value of the property. (Note that this situation will not happen if you always use the text-property primitives.)" (let ((limit-was-nil (null limit))) (or limit (setq limit (if (bufferp buffer-or-string) (point-min buffer-or-string) 0))) (let ((value (extent-properties-at (1- pos) buffer-or-string))) (while (and (> (setq pos (previous-extent-change pos buffer-or-string)) limit) (plists-eq value (extent-properties-at (1- pos) buffer-or-string))))) (if (> pos limit) pos (if limit-was-nil nil limit)))) (defun text-property-bounds (pos prop &optional object at-flag) "Return the bounds of property PROP at POS. This returns a cons (START . END) of the largest region of text containing POS which has a non-nil value for PROP. The return value is nil if POS does not have a non-nil value for PROP. OBJECT specifies the buffer or string to search in. Optional arg AT-FLAG controls what \"at POS\" means, and has the same meaning as for `extent-at'." (or object (setq object (current-buffer))) (and (get-char-property pos prop object at-flag) (let ((begin (if (stringp object) 0 (point-min object))) (end (if (stringp object) (length object) (point-max object)))) (cons (previous-single-property-change (1+ pos) prop object begin) (next-single-property-change pos prop object end))))) (defun next-text-property-bounds (count pos prop &optional object) "Return the COUNTth bounded property region of property PROP after POS. If COUNT is less than zero, search backwards. This returns a cons \(START . END) of the COUNTth maximal region of text that begins after POS \(starts before POS) and has a non-nil value for PROP. If there aren't that many regions, nil is returned. OBJECT specifies the buffer or string to search in." (or object (setq object (current-buffer))) (let ((begin (if (stringp object) 0 (point-min object))) (end (if (stringp object) (length object) (point-max object)))) (catch 'hit-end (if (> count 0) (progn (while (> count 0) (if (>= pos end) (throw 'hit-end nil) (and (get-char-property pos prop object) (setq pos (next-single-property-change pos prop object end))) (setq pos (next-single-property-change pos prop object end))) (setq count (1- count))) (and (< pos end) (cons pos (next-single-property-change pos prop object end)))) (while (< count 0) (if (<= pos begin) (throw 'hit-end nil) (and (get-char-property (1- pos) prop object) (setq pos (previous-single-property-change pos prop object begin))) (setq pos (previous-single-property-change pos prop object begin))) (setq count (1+ count))) (and (> pos begin) (cons (previous-single-property-change pos prop object begin) pos)))))) ;(defun detach-all-extents (&optional buffer) ; (map-extents #'(lambda (x i) (detach-extent x) nil) ; buffer)) (provide 'text-props) ;;; text-props.el ends here