Mercurial > hg > xemacs-beta
annotate src/window-impl.h @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | a9c41067dd88 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 872 | 1 /* Window definitions for XEmacs. |
| 2 Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995 | |
| 3 Free Software Foundation, Inc. | |
| 4 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. | |
| 5 Copyright (C) 1995, 1996, 2002 Ben Wing. | |
| 6 Copyright (C) 1996 Chuck Thompson. | |
| 7 | |
| 8 This file is part of XEmacs. | |
| 9 | |
| 10 XEmacs is free software; you can redistribute it and/or modify it | |
| 11 under the terms of the GNU General Public License as published by the | |
| 12 Free Software Foundation; either version 2, or (at your option) any | |
| 13 later version. | |
| 14 | |
| 15 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 18 for more details. | |
| 19 | |
| 20 You should have received a copy of the GNU General Public License | |
| 21 along with XEmacs; see the file COPYING. If not, write to | |
| 22 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 23 Boston, MA 02111-1307, USA. */ | |
| 24 | |
| 25 /* Synched up with: FSF 19.30. */ | |
| 26 | |
| 27 #ifndef INCLUDED_window_impl_h_ | |
| 28 #define INCLUDED_window_impl_h_ | |
| 29 | |
| 30 #include "window.h" | |
| 31 | |
| 32 /* All windows in use are arranged into a tree, with pointers up and down. | |
| 33 | |
| 34 Windows that are leaves of the tree are actually displayed | |
| 35 and show the contents of buffers. Windows that are not leaves | |
| 36 are used for representing the way groups of leaf windows are | |
| 37 arranged on the frame. Leaf windows never become non-leaves. | |
| 38 They are deleted only by calling delete-window on them (but | |
| 39 this can be done implicitly). Combination windows can be created | |
| 40 and deleted at any time. | |
| 41 | |
| 42 A leaf window has a non-nil buffer field, and also | |
| 43 has markers in its start and pointm fields. Non-leaf windows | |
| 44 have nil in these fields. | |
| 45 | |
| 46 Non-leaf windows are either vertical or horizontal combinations. | |
| 47 | |
| 48 A vertical combination window has children that are arranged on the frame | |
| 49 one above the next. Its vchild field points to the uppermost child. | |
| 50 The parent field of each of the children points to the vertical | |
| 51 combination window. The next field of each child points to the | |
| 52 child below it, or is nil for the lowest child. The prev field | |
| 53 of each child points to the child above it, or is nil for the | |
| 54 highest child. | |
| 55 | |
| 56 A horizontal combination window has children that are side by side. | |
| 57 Its hchild field points to the leftmost child. In each child | |
| 58 the next field points to the child to the right and the prev field | |
| 59 points to the child to the left. | |
| 60 | |
| 61 The children of a vertical combination window may be leaf windows | |
| 62 or horizontal combination windows. The children of a horizontal | |
| 63 combination window may be leaf windows or vertical combination windows. | |
| 64 | |
| 65 At the top of the tree are two windows which have nil as parent. | |
| 66 The second of these is minibuf_window. The first one manages all | |
| 67 the frame area that is not minibuffer, and is called the root window. | |
| 68 Different windows can be the root at different times; | |
| 69 initially the root window is a leaf window, but if more windows | |
| 70 are created then that leaf window ceases to be root and a newly | |
| 71 made combination window becomes root instead. | |
| 72 | |
| 73 In any case, on screens which have an ordinary window and a | |
| 74 minibuffer, prev of the minibuf window is the root window and next of | |
| 75 the root window is the minibuf window. On minibufferless screens or | |
| 76 minibuffer-only screens, the root window and the minibuffer window are | |
| 77 one and the same, so its prev and next members are nil. | |
| 78 | |
| 79 A dead window has the `dead' flag set on it. Note that unlike other | |
| 80 dead objects, dead windows can be made live again through restoring a | |
| 81 window configuration. This means that the values in a dead window | |
| 82 need to be preserved, except for those that are reconstructed by from | |
| 83 the window configuration. */ | |
| 84 | |
| 85 struct window | |
| 86 { | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
87 NORMAL_LISP_OBJECT_HEADER header; |
| 872 | 88 |
| 89 /* The upper left corner coordinates of this window, | |
| 90 as integers (pixels) relative to upper left corner of frame = 0, 0 */ | |
| 91 int pixel_left; | |
| 92 int pixel_top; | |
| 93 /* The size of the window (in pixels) */ | |
| 94 int pixel_height; | |
| 95 int pixel_width; | |
| 96 | |
| 97 /* Number of columns display within the window is scrolled to the left. */ | |
| 98 int hscroll; | |
| 99 /* Idem for the window's modeline */ | |
| 100 Charcount modeline_hscroll; | |
| 101 /* Amount to clip off the top line for pixel-based scrolling. Point | |
| 102 will remain constant but this will be incremented to | |
| 103 incrementally shift lines up. */ | |
| 104 int top_yoffset; | |
| 105 /* Amount to clip off the left of the lines for pixel-based | |
| 106 scrolling. Hscroll will remain constant but this will be | |
| 107 incremented to incrementally shift lines left.*/ | |
| 108 int left_xoffset; | |
| 109 | |
| 110 /* face cache elements correct for this window and its current buffer */ | |
| 111 face_cachel_dynarr *face_cachels; | |
| 112 /* glyph cache elements correct for this window and its current buffer */ | |
| 113 glyph_cachel_dynarr *glyph_cachels; | |
| 114 /* List of starting positions for display lines. Only valid if | |
| 115 buffer has not changed. */ | |
| 116 line_start_cache_dynarr *line_start_cache; | |
| 117 int line_cache_validation_override; | |
| 118 | |
| 119 /* Length of longest line currently displayed. Used to control the | |
| 120 width of the horizontal scrollbars. */ | |
| 121 int max_line_len; | |
| 122 | |
| 123 /* Frame coords of point at that time */ | |
| 124 int last_point_x[3]; | |
| 125 int last_point_y[3]; | |
| 126 | |
| 127 /* Number of characters in buffer past bottom of window, | |
| 128 as of last redisplay that finished. */ | |
| 129 /* need one for each set of display structures */ | |
| 130 int window_end_pos[3]; | |
| 131 | |
| 132 /* Set by the extent code when extents in the gutter are changed. */ | |
| 133 int gutter_extent_modiff[4]; | |
| 134 | |
| 135 /* Set by redisplay to the last position seen. This is used | |
| 136 to implement the redisplay-end-trigger-functions. */ | |
| 137 Charbpos last_redisplay_pos; | |
| 138 | |
| 139 #define WINDOW_SLOT_DECLARATION | |
| 140 #define WINDOW_SLOT(slot) Lisp_Object slot; | |
| 141 #include "winslots.h" | |
| 142 | |
| 143 /* one-bit flags: */ | |
| 144 | |
| 145 /* marker used when restoring a window configuration */ | |
| 146 unsigned int config_mark :1; | |
| 147 /* Non-zero means window was dead. */ | |
| 148 unsigned int dead :1; | |
| 149 /* Non-zero means next redisplay must use the value of start | |
| 150 set up for it in advance. Set by scrolling commands. */ | |
| 151 unsigned int force_start :1; | |
| 152 /* Non-zero means must regenerate modeline of this window */ | |
| 153 unsigned int redo_modeline :1; | |
| 154 /* Non-zero means current value of `start' | |
| 155 was the beginning of a line when it was chosen. */ | |
| 156 unsigned int start_at_line_beg :1; | |
| 157 /* new redisplay flag */ | |
| 158 unsigned int windows_changed :1; | |
| 159 unsigned int shadow_thickness_changed :1; | |
| 160 /* Vertical divider flag and validity of it */ | |
| 161 unsigned int need_vertical_divider_p :1; | |
| 162 unsigned int need_vertical_divider_valid_p :1; | |
| 163 }; | |
| 164 | |
| 165 #define CURRENT_DISP 0 | |
| 166 #define DESIRED_DISP 1 | |
| 167 #define CMOTION_DISP 2 | |
| 168 | |
| 169 struct window_mirror | |
| 170 { | |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
171 NORMAL_LISP_OBJECT_HEADER header; |
| 872 | 172 |
| 173 /* Frame this mirror is on. */ | |
| 174 struct frame *frame; | |
| 175 | |
| 176 /* Following child (to right or down) at same level of tree */ | |
| 177 struct window_mirror *next; | |
| 178 | |
| 179 /* There is no prev field because we never traverse this structure | |
| 180 backwards. Same goes for the parent field. */ | |
| 181 | |
| 182 /* First child of this window. */ | |
| 183 /* vchild is used if this is a vertical combination, | |
| 184 hchild if this is a horizontal combination. */ | |
| 185 struct window_mirror *hchild, *vchild; | |
| 186 | |
| 187 /* Dynamic array of display lines */ | |
| 188 display_line_dynarr *current_display_lines; | |
| 189 display_line_dynarr *desired_display_lines; | |
| 190 | |
| 191 /* Buffer current_display_lines represent. */ | |
| 192 struct buffer *buffer; | |
| 193 | |
| 194 #ifdef HAVE_SCROLLBARS | |
| 195 /* Scrollbars associated with window, if any. */ | |
| 196 struct scrollbar_instance *scrollbar_vertical_instance; | |
| 197 struct scrollbar_instance *scrollbar_horizontal_instance; | |
| 198 #endif /* HAVE_SCROLLBARS */ | |
| 199 | |
| 200 /* Flag indicating whether a subwindow is currently being displayed. */ | |
| 201 unsigned int subwindows_being_displayed :1; | |
| 202 | |
| 203 /* Keep track of the truncation status in this window so we can | |
| 204 detect when it has changed. #### Magic variables would be a huge | |
| 205 win here. */ | |
| 206 unsigned int truncate_win :1; | |
| 207 }; | |
| 208 | |
| 209 /* Redefine basic properties more efficiently */ | |
| 210 | |
| 211 #undef WINDOW_LIVE_P | |
| 212 #define WINDOW_LIVE_P(x) (!(x)->dead) | |
| 213 #undef WINDOW_FRAME | |
| 214 #define WINDOW_FRAME(w) ((w)->frame) | |
| 215 #undef WINDOW_BUFFER | |
| 216 #define WINDOW_BUFFER(w) ((w)->buffer) | |
| 217 | |
| 218 /* 1 if W is a minibuffer window. */ | |
| 219 #define MINI_WINDOW_P(W) (!NILP ((W)->mini_p)) | |
| 220 | |
| 221 /* 1 if we are dealing with a parentless window (this includes the | |
| 222 root window on a frame and the minibuffer window; both of these | |
| 223 are siblings). */ | |
| 224 #define TOP_LEVEL_WINDOW_P(w) NILP ((w)->parent) | |
| 225 | |
| 226 /* Set all redisplay flags indicating a window has changed */ | |
| 227 #define MARK_WINDOWS_CHANGED(w) do { \ | |
| 228 (w)->windows_changed = 1; \ | |
| 229 if (!NILP (w->frame)) \ | |
| 230 { \ | |
| 231 struct frame *mwc_frame = XFRAME (w->frame); \ | |
| 232 MARK_FRAME_WINDOWS_CHANGED (mwc_frame); \ | |
| 233 } \ | |
| 234 else \ | |
| 235 windows_changed = 1; \ | |
| 236 } while (0) | |
| 237 | |
| 238 /* #### This should be fixed not to call MARK_FRAME_CHANGED because | |
| 239 faces are cached per window. Also, other code which changes window's | |
| 240 face should use this macro. | |
| 241 */ | |
| 242 #define MARK_WINDOW_FACES_CHANGED(w) \ | |
| 243 MARK_FRAME_FACES_CHANGED (XFRAME ((w)->frame)) | |
| 244 | |
| 245 #define WINDOW_TTY_P(w) FRAME_TTY_P (XFRAME ((w)->frame)) | |
| 246 #define WINDOW_X_P(w) FRAME_X_P (XFRAME ((w)->frame)) | |
| 247 #define WINDOW_NS_P(w) FRAME_NS_P (XFRAME ((w)->frame)) | |
| 248 #define WINDOW_WIN_P(w) FRAME_WIN_P (XFRAME ((w)->frame)) | |
| 249 | |
| 250 /* XEmacs window size and positioning macros. */ | |
| 251 #define WINDOW_TOP(w) ((w)->pixel_top) | |
| 252 #define WINDOW_TEXT_TOP(w) (WINDOW_TOP (w) + window_top_gutter_height (w)) | |
| 253 #define WINDOW_TEXT_TOP_CLIP(w) ((w)->top_yoffset) | |
| 254 #define WINDOW_BOTTOM(w) ((w)->pixel_top + (w)->pixel_height) | |
| 255 #define WINDOW_TEXT_BOTTOM(w) (WINDOW_BOTTOM (w) - window_bottom_gutter_height (w)) | |
| 256 #define WINDOW_LEFT(w) ((w)->pixel_left) | |
| 257 #define WINDOW_TEXT_LEFT(w) (WINDOW_LEFT (w) + window_left_gutter_width (w, 0)) | |
| 258 #define WINDOW_MODELINE_LEFT(w) \ | |
| 259 (WINDOW_LEFT (w) + window_left_gutter_width (w, 1)) | |
| 260 #define WINDOW_RIGHT(w) ((w)->pixel_left + (w)->pixel_width) | |
| 261 #define WINDOW_TEXT_RIGHT(w) \ | |
| 262 (WINDOW_RIGHT (w) - window_right_gutter_width (w, 0)) | |
| 263 #define WINDOW_MODELINE_RIGHT(w) \ | |
| 264 (WINDOW_RIGHT (w) - window_right_gutter_width (w, 1)) | |
| 265 | |
| 266 #define WINDOW_HEIGHT(w) ((w)->pixel_height) | |
| 267 #define WINDOW_TEXT_HEIGHT(w) (WINDOW_TEXT_BOTTOM (w) - WINDOW_TEXT_TOP (w)) | |
| 268 #define WINDOW_WIDTH(w) ((w)->pixel_width) | |
| 269 #define WINDOW_TEXT_WIDTH(w) (WINDOW_TEXT_RIGHT (w) - WINDOW_TEXT_LEFT (w)) | |
| 270 | |
| 271 #define WINDOW_HAS_MODELINE_P(w) (!NILP (w->has_modeline_p)) | |
| 272 | |
| 273 #define MODELINE_OFF_SHADOW_THICKNESS_ADJUSTED(win) \ | |
| 274 abs ((!WINDOW_HAS_MODELINE_P (win) \ | |
| 275 ? ((XINT (win->modeline_shadow_thickness) > 1) \ | |
| 276 ? XINT (win->modeline_shadow_thickness) - 1 \ | |
| 277 : ((XINT (win->modeline_shadow_thickness) < -1) \ | |
| 278 ? XINT (win->modeline_shadow_thickness) + 1 \ | |
| 279 : XINT (win->modeline_shadow_thickness))) \ | |
| 280 : XINT (win->modeline_shadow_thickness))) | |
| 281 | |
| 282 #define MODELINE_SHADOW_THICKNESS(win) \ | |
| 283 (MODELINE_OFF_SHADOW_THICKNESS_ADJUSTED (win) > 10 \ | |
| 284 ? 10 \ | |
| 285 : MODELINE_OFF_SHADOW_THICKNESS_ADJUSTED (win)) | |
| 286 | |
| 287 #endif /* INCLUDED_window_impl_h_ */ |