view src/redisplay.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 39304a35b6b3
children 0af042a0c116
line wrap: on
line source

/* Redisplay data structures.
   Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
   Copyright (C) 1996 Chuck Thompson.
   Copyright (C) 1995, 1996, 2002, 2003, 2004 Ben Wing.

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. */

#ifndef INCLUDED_redisplay_h_
#define INCLUDED_redisplay_h_

/* Redisplay DASSERT types */
#define DB_DISP_POS		1
#define DB_DISP_TEXT_LAYOUT	2
#define DB_DISP_REDISPLAY	4

/* These are the possible return values from pixel_to_glyph_translation. */
#define OVER_MODELINE		0
#define OVER_TEXT		1
#define OVER_OUTSIDE		2
#define OVER_NOTHING		3
#define OVER_BORDER		4
#define OVER_TOOLBAR		5
#define OVER_V_DIVIDER		6

#define NO_BLOCK	-1

/* Imagine that the text in the buffer is displayed on a piece of paper
   the width of the frame and very very tall.  The line start cache is
   an array of struct line_start_cache's, describing the start and
   end buffer positions for a contiguous set of lines on that piece
   of paper. */

typedef struct line_start_cache line_start_cache;
struct line_start_cache
{
  Charbpos start, end;
  int height;
};

typedef struct
{
  Dynarr_declare (line_start_cache);
} line_start_cache_dynarr;

/* The possible types of runes.

   #### The Lisp_Glyph type is broken.  There should instead be a pixmap
   type.  Currently the device-specific output routines have to worry
   about whether the glyph is textual or not, etc.  For Mule this is
   a big problem because you might need multiple fonts to display the
   text.  It also eliminates optimizations that could come from glumping
   the text of multiple text glyphs together -- this makes displaying
   binary files (with lots of control chars, etc.) very very slow. */

#define RUNE_BLANK	0
#define RUNE_CHAR	1
#define RUNE_DGLYPH	2
#define RUNE_HLINE	3
#define RUNE_VLINE	4

#define CURSOR_ON	0
#define CURSOR_OFF	1
#define NO_CURSOR	2
#define NEXT_CURSOR	3
#define IGNORE_CURSOR	4

/* #### NOTE: these indexes depend on the order in which the faces are added
   to the cache in the function reset_face_cachels. */
#define DEFAULT_INDEX	(face_index) 0
#define MODELINE_INDEX	(face_index) 1

/* A rune is a single display element, such as a printable character
   or pixmap.  Any single character in a buffer has one or more runes
   (or zero, if the character is invisible) corresponding to it.
   (Printable characters typically have one rune associated with them,
   but control characters have two -- a ^ and a letter -- and other
   non-printing characters (those displayed in octal) have four. */

/* WARNING! In compare_runes (one of the most heavily used functions)
   two runes are compared. So please be careful with changes to this
   structure. See comments in compare_runes.

   #### This should really be made smaller.
*/

struct rune_dglyph
{
  Lisp_Object glyph;
  Lisp_Object extent;	/* extent rune is attached to, if any.
			   If this is a rune in the modeline
			   then this might be nil. */

  int ascent;           /* Ascent of this glyph, in pixels. */
  int descent;          /* Descent of this glyph, in pixels. */
  int yoffset;          /* Offset from line top to reach glyph top */
  int xoffset;		/* Number of pixels that need to be
			   chopped off the left of the glyph.
			   This has the effect of shifting the
			   glyph to the left while still clipping
			   at XPOS. */
};

typedef struct rune rune;
struct rune
{
  face_index findex;		/* face rune is displayed with.  The
				   face_index is an index into a
				   window-specific array of face cache
				   elements.  Each face cache element
				   corresponds to one "merged face"
				   (the result of merging all the
				   faces that overlap the rune) and
				   contains the instance values for
				   each of the face properties in this
				   particular window. */

  Charxpos charpos;		/* buffer position this rune is displaying;
				   for the modeline, the value here is a
				   Charcount, but who's looking? */
  Charxpos endpos;		/* if set this rune covers a range of pos;
				   used in redisplay_move_cursor(). */
				/* #### Chuck, what does it mean for a rune
				   to cover a range of pos?  I don't get
				   this. */


  short xpos;			/* horizontal starting position in pixels */
  short width;			/* pixel width of rune */


  unsigned char cursor_type;	/* is this rune covered by the cursor? */
  unsigned int type;		/* type of rune object */
				/* We used to do bitfields here, but if I
				   (JV) count correctly that doesn't matter
				   for the size of the structure. All the bit
				   fiddling _does_ slow down redisplay by
				   about 10%. So don't do that */

  union				/* Information specific to the type of rune */
  {
    /* #### Glyphs are rare. Is it really necessary to waste 8 bytes on every
       rune for that?! */
    /* DGLYPH */
    struct rune_dglyph dglyph;

    /* CHAR */
    struct
    {
      Ichar ch;		/* Character of this rune. */
    } chr;

    /* HLINE */
    struct
    {
      short thickness;	/* how thick to make hline */
      short yoffset;	/* how far down from top of line to put top */
    } hline;
  } object;			/* actual rune object */
};

typedef struct
{
  Dynarr_declare (rune);
} rune_dynarr;

/* These must have distinct values.  Note that the ordering actually
   represents priority levels.  TEXT has the lowest priority level. */
enum display_type
{
  TEXT,
  LEFT_OUTSIDE_MARGIN,
  LEFT_INSIDE_MARGIN,
  RIGHT_INSIDE_MARGIN,
  RIGHT_OUTSIDE_MARGIN,
  OVERWRITE
};

/* A display block represents a run of text on a single line.
   Apparently there is only one display block per line for each
   of the types listed in `enum display_type'.

   A display block consists mostly of an array of runes, one per
   atomic display element (printable character, pixmap, etc.). */

/* #### Yuckity yuckity yuck yuck yuck yuck yuck!!

   Chuck, I think you should redo this.  It should not be the
   responsibility of the device-specific code to worry about
   the different faces.  The generic stuff in redisplay-output.c
   should glump things up into sub-blocks, each of which
   corresponds to a single pixmap or a single run of text in
   the same font.

   It might still make sense for the device-specific output routine
   to get passed an entire display line.  That way, it can make
   calls to XDrawText() (which draws multiple runs of single-font
   data) instead of XDrawString().  The reason for this is to
   reduce the amount of X traffic, which will help things significantly
   on a slow line. */

typedef struct display_block display_block;
struct display_block
{
  enum display_type type;	/* type of display block */

  int start_pos;		/* starting pixel position of block */
  int end_pos;			/* ending pixel position of block */

  rune_dynarr *runes;		/* Dynamic array of runes */
};

typedef struct
{
  Dynarr_declare (display_block);
} display_block_dynarr;

typedef struct layout_bounds_type
{
  int left_out;
  int left_in;
  int left_white;
  int right_white;
  int right_in;
  int right_out;
} layout_bounds;

typedef struct glyph_block glyph_block;
struct glyph_block
{
  Lisp_Object glyph;
  Lisp_Object extent;
  /* The rest are only used by margin routines. */
  face_index findex;
  int active;
  int width;
};

typedef struct
{
  Dynarr_declare (glyph_block);
} glyph_block_dynarr;

/*************************************************************************/
/*                              display lines                            */
/*************************************************************************/

/* Modeline commentary: IMO the modeline is handled very badly, we
  special case virtually *everything* in the redisplay routines for
  the modeline. The fact that dl->charpos can be either a buffer
  position or a char count highlights this. There is no abstraction at
  all that I can find and it means that the code is made very ugly as
  a result. Either we should treat the modeline *entirely* separately,
  or we should abstract to something that applies equally well to the
  modeline and to buffer text, the things are not enormously different
  after all and handling them identically at some level would
  eliminate some bugs that still exist (mainly to do with modeline
  handling). This problem doesn't help trying to implement gutters
  which are somewhere in between buffer text and modeline text.

  Redisplay commentary: Everything in redisplay is tied very tightly
  to the things that are being displayed, and the context,
  e.g. buffers and windows. According to Chuck this is so that we can
  get speed, which seems fine to me, however this usage is extended
  too far down the redisplay routines IMO. At some level there should
  be functions that know how to display strings with extents and
  faces, regardless of buffer etc. After all the window system does
  not care. <andy@xemacs.org> */

typedef struct display_line display_line;
struct display_line
{
  short ypos;				/* vertical position in pixels
					   of the baseline for this line. */
  unsigned short ascent, descent;	/* maximum values for this line.
					   The ascent is the number of
					   pixels above the baseline, and
					   the descent is the number of
					   pixels below the baseline.
					   The descent includes the baseline
					   pixel-row itself, I think. */
  unsigned short clip;			/* amount of bottom of line to clip
					   in pixels.*/
  unsigned short top_clip;		/* amount of top of line to clip
					   in pixels.*/
  Charxpos charpos;			/* first buffer position on line */
  Charxpos end_charpos;			/* last buffer position on line */
  Charcount offset;			/* adjustment to charpos vals */
  Charcount num_chars;			/* # of chars on line
					   including expansion of tabs
					   and control chars */
  int cursor_elt;			/* rune block of TEXT display
					   block cursor is at or -1 */
  char used_prop_data;			/* can't incrementally update if line
					   used propagation data */

  layout_bounds bounds;			/* line boundary positions */

  char modeline;			/* t if this line is a modeline */

  char line_continuation;		/* t if this line continues to
					   next display line. */

  /* Dynamic array of display blocks */
  display_block_dynarr *display_blocks;

  /* Dynamic arrays of left and right glyph blocks */
  glyph_block_dynarr *left_glyphs;
  glyph_block_dynarr *right_glyphs;

  face_index	left_margin_findex;
  face_index	right_margin_findex;
  face_index	default_findex;
};

#define DISPLAY_LINE_INIT(dl)			\
  do						\
    {						\
      xzero (dl);				\
      dl.default_findex = DEFAULT_INDEX;	\
    }						\
  while (0)

#define DISPLAY_LINE_HEIGHT(dl) \
(dl->ascent + dl->descent - (dl->clip + dl->top_clip))
#define DISPLAY_LINE_YPOS(dl) \
(dl->ypos - (dl->ascent - dl->top_clip))
#define DISPLAY_LINE_YEND(dl) \
((dl->ypos + dl->descent) - dl->clip)

typedef struct
{
  Dynarr_declare (display_line);
} display_line_dynarr;

/* The following two structures are used to represent an area to
displayed and where to display it. Using these two structures all
combinations of clipping and position can be accommodated.  */

/* This represents an area to be displayed into. */
typedef struct display_box display_box;
struct display_box
{
  int xpos;		/* absolute horizontal position of area */
  int ypos;		/* absolute vertical position of area */
  int width, height;
};

/* This represents the area from a glyph to be displayed. */
typedef struct display_glyph_area display_glyph_area;
struct display_glyph_area
{
  int xoffset;		/* horizontal offset of the glyph, +ve means
			   display the glyph with x offset by xoffset,
			   -ve means display starting xoffset into the
			   glyph. */
  int yoffset;		/* vertical offset of the glyph, +ve means
			   display the glyph with y offset by yoffset,
			   -ve means display starting xoffset into the
			   glyph. */
  int width, height;	/* width and height of glyph to display. */
};

/* It could be argued that the following two structs belong in
   extents.h, but they're only used by redisplay and it simplifies
   the header files to put them here. */

typedef struct
{
  Dynarr_declare (EXTENT);
} EXTENT_dynarr;

struct font_metric_info
{
  int width;
  int height;			/* always ascent + descent; for convenience */
  int ascent;
  int descent;

  int proportional_p;
};

/* NOTE NOTE NOTE: Currently the positions in an extent fragment
   structure are Bytexpos's, not Charxpos's.  This could change. */

struct extent_fragment
{
  Lisp_Object object; /* buffer or string */
  struct frame *frm;
  Bytexpos pos, end;
  EXTENT_dynarr *extents;
  glyph_block_dynarr *begin_glyphs, *end_glyphs;
  unsigned int invisible:1;
  unsigned int invisible_ellipses:1;
  unsigned int previously_invisible:1;
  unsigned int invisible_ellipses_already_displayed:1;
};

#define EDGE_TOP 1
#define EDGE_LEFT 2
#define EDGE_BOTTOM 4
#define EDGE_RIGHT 8
#define EDGE_ALL (EDGE_TOP | EDGE_LEFT | EDGE_BOTTOM | EDGE_RIGHT)


/*************************************************************************/
/*                              change flags                             */
/*************************************************************************/

/* Quick flags to signal redisplay.  redisplay() sets them all to 0
   when it finishes.  If none of them are set when it starts, it
   assumes that nothing needs to be done.  Functions that make a change
   that is (potentially) visible on the screen should set the
   appropriate flag.

   If any of these flags are set, redisplay will look more carefully
   to see if anything has really changed. */

/* Nonzero if the contents of a buffer have changed since the last time
   redisplay completed. */
extern int buffers_changed;
extern int buffers_changed_set;

/* Nonzero if head_clip or tail_clip of a buffer has changed
   since last redisplay that finished. */
extern int clip_changed;
extern int clip_changed_set;

/* Nonzero if any extent has changed since the last time redisplay completed. */
extern int extents_changed;
extern int extents_changed_set;

/* Nonzero if any face has changed since the last time redisplay completed. */
extern int faces_changed;

/* Nonzero means one or more frames have been marked as garbaged. */
extern int frame_changed;

/* True if any of the builtin display glyphs (continuation,
   hscroll, control-arrow, etc) is in need of updating
   somewhere. */
extern int glyphs_changed;
extern int glyphs_changed_set;

/* True if any displayed subwindow is in need of updating
   somewhere. */
extern int subwindows_changed;
extern int subwindows_changed_set;

/* True if any displayed subwindow is in need of updating
   somewhere. */
extern int subwindows_state_changed;
extern int subwindows_state_changed_set;

/* True if an icon is in need of updating somewhere. */
extern int icon_changed;
extern int icon_changed_set;

/* True if a menubar is in need of updating somewhere. */
extern int menubar_changed;
extern int menubar_changed_set;

/* True iff we should redraw the modelines on the next redisplay. */
extern int modeline_changed;
extern int modeline_changed_set;

/* Nonzero if point has changed in some buffer since the last time
   redisplay completed. */
extern int point_changed;
extern int point_changed_set;

/* Nonzero if some frame has changed its size. */
extern int size_changed;

/* Nonzero if some device has signaled that it wants to change size. */
extern int asynch_device_change_pending;

/* Nonzero if some frame has changed the layout of internal elements
   (gutters or toolbars). */
extern int frame_layout_changed;

/* Nonzero if any toolbar has changed. */
extern int toolbar_changed;
extern int toolbar_changed_set;

/* Nonzero if any gutter has changed. */
extern int gutter_changed;
extern int gutter_changed_set;

/* Nonzero if any window has changed since the last time redisplay completed */
extern int windows_changed;

/* Nonzero if any frame's window structure has changed since the last
   time redisplay completed. */
extern int windows_structure_changed;

/* These macros can be relatively expensive.  Since they are often
   called numerous times between each call to redisplay, we keep track
   if each has already been called and don't bother doing most of the
   work if it is currently set. */

#define MARK_TYPE_CHANGED(object) do {				\
  if (!object##_changed_set) {					\
    Lisp_Object MTC_devcons, MTC_concons;			\
    DEVICE_LOOP_NO_BREAK (MTC_devcons, MTC_concons)		\
      {								\
	Lisp_Object MTC_frmcons;				\
	struct device *MTC_d = XDEVICE (XCAR (MTC_devcons));	\
	DEVICE_FRAME_LOOP (MTC_frmcons, MTC_d)			\
	  {							\
	    struct frame *MTC_f = XFRAME (XCAR (MTC_frmcons));	\
	    MTC_f->object##_changed = 1;			\
	    MTC_f->modiff++;					\
	  }							\
	MTC_d->object##_changed = 1;				\
      }								\
    object##_changed = 1;					\
    object##_changed_set = 1; }					\
  }  while (0)

void mark_buffers_changed (void);
#define MARK_BUFFERS_CHANGED mark_buffers_changed ()
void mark_clip_changed (void);
#define MARK_CLIP_CHANGED mark_clip_changed ()
void mark_extents_changed (void);
#define MARK_EXTENTS_CHANGED mark_extents_changed ()
void mark_icon_changed (void);
#define MARK_ICON_CHANGED mark_icon_changed ()
void mark_menubar_changed (void);
#define MARK_MENUBAR_CHANGED mark_menubar_changed ()
void mark_modeline_changed (void);
#define MARK_MODELINE_CHANGED mark_modeline_changed ()
void mark_point_changed (void);
#define MARK_POINT_CHANGED mark_point_changed ()
void mark_toolbar_changed (void);
#define MARK_TOOLBAR_CHANGED mark_toolbar_changed ()
void mark_gutter_changed (void);
#define MARK_GUTTER_CHANGED mark_gutter_changed ()
void mark_glyphs_changed (void);
#define MARK_GLYPHS_CHANGED mark_glyphs_changed ()
void mark_subwindows_changed (void);
#define MARK_SUBWINDOWS_CHANGED mark_subwindows_changed ()
void mark_subwindows_state_changed (void);
#define MARK_SUBWINDOWS_STATE_CHANGED mark_subwindows_state_changed ()

#define CLASS_RESET_CHANGED_FLAGS(p) do {	\
  (p)->buffers_changed = 0;			\
  (p)->clip_changed = 0;			\
  (p)->extents_changed = 0;			\
  (p)->faces_changed = 0;			\
  (p)->frame_changed = 0;			\
  (p)->frame_layout_changed = 0;		\
  (p)->icon_changed = 0;			\
  (p)->menubar_changed = 0;			\
  (p)->modeline_changed = 0;			\
  (p)->point_changed = 0;			\
  (p)->toolbar_changed = 0;			\
  (p)->gutter_changed = 0;			\
  (p)->glyphs_changed = 0;			\
  (p)->subwindows_changed = 0;			\
  (p)->subwindows_state_changed = 0;		\
  (p)->windows_changed = 0;			\
  (p)->windows_structure_changed = 0;		\
} while (0)

#define GLOBAL_RESET_CHANGED_FLAGS do {		\
  buffers_changed = 0;				\
  clip_changed = 0;				\
  extents_changed = 0;				\
  frame_changed = 0;				\
  frame_layout_changed = 0;			\
  icon_changed = 0;				\
  menubar_changed = 0;				\
  modeline_changed = 0;				\
  point_changed = 0;				\
  toolbar_changed = 0;				\
  gutter_changed = 0;				\
  glyphs_changed = 0;				\
  subwindows_changed = 0;			\
  subwindows_state_changed = 0;			\
  windows_changed = 0;				\
  windows_structure_changed = 0;		\
} while (0)

#define CLASS_REDISPLAY_FLAGS_CHANGEDP(p)	\
  ( (p)->buffers_changed ||			\
    (p)->clip_changed ||			\
    (p)->extents_changed ||			\
    (p)->faces_changed ||			\
    (p)->frame_changed ||			\
    (p)->frame_layout_changed ||		\
    (p)->icon_changed ||			\
    (p)->menubar_changed ||			\
    (p)->modeline_changed ||			\
    (p)->point_changed ||			\
    (p)->toolbar_changed ||			\
    (p)->gutter_changed ||			\
    (p)->glyphs_changed ||			\
    (p)->size_changed ||			\
    (p)->subwindows_changed ||			\
    (p)->subwindows_state_changed ||		\
    (p)->windows_changed ||			\
    (p)->windows_structure_changed )

#define GLOBAL_REDISPLAY_FLAGS_CHANGEDP		\
  ( buffers_changed ||				\
    clip_changed ||				\
    extents_changed ||				\
    faces_changed ||				\
    frame_changed ||				\
    frame_layout_changed ||			\
    icon_changed ||				\
    menubar_changed ||				\
    modeline_changed ||				\
    point_changed ||				\
    toolbar_changed ||				\
    gutter_changed ||				\
    glyphs_changed ||				\
    size_changed ||				\
    subwindows_changed ||			\
    subwindows_state_changed ||			\
    windows_changed ||				\
    windows_structure_changed )


/* Anytime a console, device or frame is added or deleted we need to reset
   these flags. */
#define RESET_CHANGED_SET_FLAGS do {	\
  buffers_changed_set = 0;		\
  clip_changed_set = 0;			\
  extents_changed_set = 0;		\
  icon_changed_set = 0;			\
  menubar_changed_set = 0;		\
  modeline_changed_set = 0;		\
  point_changed_set = 0;		\
  toolbar_changed_set = 0;		\
  gutter_changed_set = 0;		\
  glyphs_changed_set = 0;		\
  subwindows_changed_set = 0;		\
  subwindows_state_changed_set = 0;	\
} while (0)


/*************************************************************************/
/*                       redisplay global variables                      */
/*************************************************************************/

extern const struct sized_memory_description display_line_dynarr_description;

/* redisplay structure used by various utility routines. */
extern display_line_dynarr *cmotion_display_lines;

/* Nonzero means truncate lines in all windows less wide than the frame. */
extern int truncate_partial_width_windows;

/* Nonzero if we're in a display critical section. */
extern int in_display;

/* Whether we should delay size changes.  Broken out of
   enter_redisplay_critical_section(). */
extern int hold_frame_size_changes;

/* Nonzero means no need to redraw the entire frame on resuming
   a suspended Emacs.  This is useful on terminals with multiple pages,
   where one page is used for Emacs and another for all else. */
extern int no_redraw_on_reenter;

/* Non-nil means flash the frame instead of ringing the bell.  */
extern Lisp_Object Vvisible_bell;

/* Thickness of shadow border around 3D modelines. */
extern Lisp_Object Vmodeline_shadow_thickness;

/* Scroll if point lands on the bottom line and that line is partially
   clipped. */
extern int scroll_on_clipped_lines;

extern Lisp_Object Vglobal_mode_string;

/* The following two variables are defined in emacs.c and are used
   to convey information discovered on the command line way early
   (before *anything* is initialized). */

/* If non-zero, a window-system was specified on the command line.
   Defined in emacs.c. */
extern int display_arg;

/* Type of display specified.  Defined in emacs.c. */
extern const Ascbyte *display_use;

/* Nonzero means reading single-character input with prompt
   so put cursor on minibuffer after the prompt.  */

extern int cursor_in_echo_area;

extern Lisp_Object Qbar_cursor, Qcursor_in_echo_area, Vwindow_system;

extern Lisp_Object Qtop_bottom;


/*************************************************************************/
/*                     redisplay exported functions                      */
/*************************************************************************/
EXFUN (Fredraw_frame, 2);

int redisplay_text_width_string (Lisp_Object domain, Lisp_Object face,
				 Ibyte *nonreloc, Lisp_Object reloc,
				 Bytecount offset, Bytecount len);
int redisplay_frame (struct frame *f, int preemption_check);
void redisplay_no_pre_idle_hook (void);
void redisplay (void);
Lisp_Object eval_within_redisplay (Lisp_Object dont_trust_this_damn_sucker);
struct display_block *get_display_block_from_line (struct display_line *dl,
						   enum display_type type);
layout_bounds calculate_display_line_boundaries (struct window *w,
						 int modeline);
Charbpos point_at_center (struct window *w, int type, Charbpos start,
			  Charbpos point);
int line_at_center (struct window *w, int type, Charbpos start,
		    Charbpos point);
int window_half_pixpos (struct window *w);
void redisplay_echo_area (void);
void free_display_structs (struct window_mirror *mir);
void free_display_lines (display_line_dynarr *dla);
void mark_redisplay_structs (display_line_dynarr *dla);
void generate_displayable_area (struct window *w, Lisp_Object disp_string,
				int xpos, int ypos, int width, int height,
				display_line_dynarr* dl,
				Charbpos start_pos, face_index default_face);
/* `generate_title_string' in frame.c needs this */
void generate_formatted_string_db (Lisp_Object format_str,
				   Lisp_Object result_str,
				   struct window *w,
				   struct display_line *dl,
				   struct display_block *db,
				   face_index findex,
				   int min_pixpos, int max_pixpos, int type);
int real_current_modeline_height (struct window *w);
int pixel_to_glyph_translation (struct frame *f, int x_coord,
				int y_coord, int *col, int *row,
				int *obj_x, int *obj_y,
				struct window **w, Charbpos *charbpos,
				Charbpos *closest, Charcount *modeline_closest,
				Lisp_Object *obj1, Lisp_Object *obj2);
void glyph_to_pixel_translation (struct window *w, int char_x,
				 int char_y, int *pix_x, int *pix_y);
int point_in_line_start_cache (struct window *w, Charbpos point,
			       int min_past);
int point_would_be_visible (struct window *w, Charbpos startp,
			    Charbpos point, int partially);
Charbpos start_of_last_line (struct window *w, Charbpos startp);
Charbpos end_of_last_line (struct window *w, Charbpos startp);
Charbpos start_with_line_at_pixpos (struct window *w, Charbpos point,
				    int pixpos);
Charbpos start_with_point_on_display_line (struct window *w, Charbpos point,
					   int line);
int redisplay_variable_changed (Lisp_Object sym, Lisp_Object *val,
				Lisp_Object in_object, int flags);
void redisplay_glyph_changed (Lisp_Object glyph, Lisp_Object property,
			      Lisp_Object locale);

#ifdef MEMORY_USAGE_STATS
int compute_display_line_dynarr_usage (display_line_dynarr *dyn,
				       struct usage_stats *ustats);
int compute_line_start_cache_dynarr_usage (line_start_cache_dynarr *dyn,
					   struct usage_stats *ustats);
#endif


/* defined in redisplay-output.c */
int get_next_display_block (layout_bounds bounds,
			    display_block_dynarr *dba, int start_pos,
			    int *next_start);
void redisplay_output_layout (Lisp_Object domain,
			      Lisp_Object image_instance,
			      struct display_box* db,
			      struct display_glyph_area* dga,
			      face_index findex, int cursor_start,
			      int cursor_width,
			      int cursor_height);
void redisplay_output_subwindow (struct window *w,
				 Lisp_Object image_instance,
				 struct display_box* db,
				 struct display_glyph_area* dga,
				 face_index findex, int cursor_start,
				 int cursor_width,
				 int cursor_height);
void redisplay_unmap_subwindows_maybe (struct frame* f, int x, int y,
				       int width, int height);
void redisplay_output_pixmap (struct window *w,
			      Lisp_Object image_instance,
			      struct display_box* db,
			      struct display_glyph_area* dga,
			      face_index findex, int cursor_start,
			      int cursor_width,
			      int cursor_height, int offset_bitmap);
int redisplay_calculate_display_boxes (struct display_line *dl, int xpos,
				       int xoffset, int yoffset, int start_pixpos,
				       int width, struct display_box* dest,
				       struct display_glyph_area* src);
int redisplay_normalize_glyph_area (struct display_box* dest,
				    struct display_glyph_area* glyphsrc);
void redisplay_clear_to_window_end (struct window *w, int ypos1, int ypos2);
void redisplay_clear_region (Lisp_Object window, face_index findex, int x,
			     int y, int width, int height);
void redisplay_clear_top_of_window (struct window *w);
void redisplay_clear_bottom_of_window (struct window *w,
				       display_line_dynarr *ddla,
				       int min_start, int max_end);
void redisplay_update_line (struct window *w, int first_line,
			    int last_line, int update_values);
void redisplay_output_window (struct window *w);
void bevel_modeline (struct window *w, struct display_line *dl);
int redisplay_move_cursor (struct window *w, Charbpos new_point,
			   int no_output_end);
void redisplay_redraw_cursor (struct frame *f, int run_begin_end_meths);
void output_display_line (struct window *w, display_line_dynarr *cdla,
			  display_line_dynarr *ddla, int line,
			  int force_start, int force_end);
void sync_display_line_structs (struct window *w, int line, int do_blocks,
				display_line_dynarr *cdla,
				display_line_dynarr *ddla);
void redisplay_redraw_exposed_area (struct frame *f, int x, int y, int width,
				    int height);
void register_post_redisplay_action (void (*fun) (Lisp_Object),
				     Lisp_Object arg);
int begin_hold_frame_size_changes (void);
int enter_redisplay_critical_section (void);
void exit_redisplay_critical_section (int);
int enter_redisplay_critical_section_maybe (void);
void exit_redisplay_critical_section_maybe (int depth);
int enter_redisplay_critical_section_if (Boolint from_outside);
void exit_redisplay_critical_section_if (Boolint from_outside, int depth);

void redisplay_cancel_ritual_suicide(void);

#endif /* INCLUDED_redisplay_h_ */