Mercurial > hg > xemacs-beta
view src/window.h @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
author | ben |
---|---|
date | Sun, 05 May 2002 11:33:57 +0000 |
parents | e38acbeb1cae |
children | 79c6ff3eef26 |
line wrap: on
line source
/* Window definitions for XEmacs. Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1995, 1996 Ben Wing. Copyright (C) 1996 Chuck Thompson. 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: FSF 19.30. */ #ifndef INCLUDED_window_h_ #define INCLUDED_window_h_ #include "redisplay.h" #ifdef HAVE_SCROLLBARS #include "scrollbar.h" #endif /* All windows in use are arranged into a tree, with pointers up and down. Windows that are leaves of the tree are actually displayed and show the contents of buffers. Windows that are not leaves are used for representing the way groups of leaf windows are arranged on the frame. Leaf windows never become non-leaves. They are deleted only by calling delete-window on them (but this can be done implicitly). Combination windows can be created and deleted at any time. A leaf window has a non-nil buffer field, and also has markers in its start and pointm fields. Non-leaf windows have nil in these fields. Non-leaf windows are either vertical or horizontal combinations. A vertical combination window has children that are arranged on the frame one above the next. Its vchild field points to the uppermost child. The parent field of each of the children points to the vertical combination window. The next field of each child points to the child below it, or is nil for the lowest child. The prev field of each child points to the child above it, or is nil for the highest child. A horizontal combination window has children that are side by side. Its hchild field points to the leftmost child. In each child the next field points to the child to the right and the prev field points to the child to the left. The children of a vertical combination window may be leaf windows or horizontal combination windows. The children of a horizontal combination window may be leaf windows or vertical combination windows. At the top of the tree are two windows which have nil as parent. The second of these is minibuf_window. The first one manages all the frame area that is not minibuffer, and is called the root window. Different windows can be the root at different times; initially the root window is a leaf window, but if more windows are created then that leaf window ceases to be root and a newly made combination window becomes root instead. In any case, on screens which have an ordinary window and a minibuffer, prev of the minibuf window is the root window and next of the root window is the minibuf window. On minibufferless screens or minibuffer-only screens, the root window and the minibuffer window are one and the same, so its prev and next members are nil. A dead window has the `dead' flag set on it. Note that unlike other dead objects, dead windows can be made live again through restoring a window configuration. This means that the values in a dead window need to be preserved, except for those that are reconstructed by from the window configuration. */ struct window { struct lcrecord_header header; /* The upper left corner coordinates of this window, as integers (pixels) relative to upper left corner of frame = 0, 0 */ int pixel_left; int pixel_top; /* The size of the window (in pixels) */ int pixel_height; int pixel_width; /* Number of columns display within the window is scrolled to the left. */ int hscroll; /* Idem for the window's modeline */ Charcount modeline_hscroll; /* Amount to clip off the top line for pixel-based scrolling. Point will remain constant but this will be incremented to incrementally shift lines up. */ int top_yoffset; /* Amount to clip off the left of the lines for pixel-based scrolling. Hscroll will remain constant but this will be incremented to incrementally shift lines left.*/ int left_xoffset; /* face cache elements correct for this window and its current buffer */ face_cachel_dynarr *face_cachels; /* glyph cache elements correct for this window and its current buffer */ glyph_cachel_dynarr *glyph_cachels; /* List of starting positions for display lines. Only valid if buffer has not changed. */ line_start_cache_dynarr *line_start_cache; int line_cache_validation_override; /* Length of longest line currently displayed. Used to control the width of the horizontal scrollbars. */ int max_line_len; /* Frame coords of point at that time */ int last_point_x[3]; int last_point_y[3]; /* Number of characters in buffer past bottom of window, as of last redisplay that finished. */ /* need one for each set of display structures */ int window_end_pos[3]; /* Set by the extent code when extents in the gutter are changed. */ int gutter_extent_modiff[4]; /* Set by redisplay to the last position seen. This is used to implement the redisplay-end-trigger-functions. */ Charbpos last_redisplay_pos; #define WINDOW_SLOT_DECLARATION #define WINDOW_SLOT(slot) Lisp_Object slot; #include "winslots.h" /* one-bit flags: */ /* marker used when restoring a window configuration */ unsigned int config_mark :1; /* Non-zero means window was dead. */ unsigned int dead :1; /* Non-zero means next redisplay must use the value of start set up for it in advance. Set by scrolling commands. */ unsigned int force_start :1; /* Non-zero means must regenerate modeline of this window */ unsigned int redo_modeline :1; /* Non-zero means current value of `start' was the beginning of a line when it was chosen. */ unsigned int start_at_line_beg :1; /* new redisplay flag */ unsigned int windows_changed :1; unsigned int shadow_thickness_changed :1; /* Vertical divider flag and validity of it */ unsigned int need_vertical_divider_p :1; unsigned int need_vertical_divider_valid_p :1; }; DECLARE_LRECORD (window, struct window); #define XWINDOW(x) XRECORD (x, window, struct window) #define wrap_window(p) wrap_record (p, window) #define WINDOWP(x) RECORDP (x, window) #define CHECK_WINDOW(x) CHECK_RECORD (x, window) #define CONCHECK_WINDOW(x) CONCHECK_RECORD (x, window) #define CURRENT_DISP 0 #define DESIRED_DISP 1 #define CMOTION_DISP 2 struct window_mirror { struct lcrecord_header header; /* Frame this mirror is on. */ struct frame *frame; /* Following child (to right or down) at same level of tree */ struct window_mirror *next; /* There is no prev field because we never traverse this structure backwards. Same goes for the parent field. */ /* First child of this window. */ /* vchild is used if this is a vertical combination, hchild if this is a horizontal combination. */ struct window_mirror *hchild, *vchild; /* Dynamic array of display lines */ display_line_dynarr *current_display_lines; display_line_dynarr *desired_display_lines; /* Buffer current_display_lines represent. */ struct buffer *buffer; #ifdef HAVE_SCROLLBARS /* Scrollbars associated with window, if any. */ struct scrollbar_instance *scrollbar_vertical_instance; struct scrollbar_instance *scrollbar_horizontal_instance; #endif /* HAVE_SCROLLBARS */ /* Flag indicating whether a subwindow is currently being displayed. */ unsigned int subwindows_being_displayed :1; /* Keep track of the truncation status in this window so we can detect when it has changed. #### Magic variables would be a huge win here. */ unsigned int truncate_win :1; }; DECLARE_LRECORD (window_mirror, struct window_mirror); #define XWINDOW_MIRROR(x) XRECORD (x, window_mirror, struct window_mirror) #define wrap_window_mirror(p) wrap_record (p, window_mirror) #define WINDOW_MIRRORP(x) RECORDP (x, window_mirror) #define CHECK_WINDOW_MIRROR(x) CHECK_RECORD (x, window_mirror) #define CONCHECK_WINDOW_MIRROR(x) CONCHECK_RECORD (x, window_mirror) #define WINDOW_LIVE_P(x) (!(x)->dead) #define CHECK_LIVE_WINDOW(x) do { \ CHECK_WINDOW (x); \ if (!WINDOW_LIVE_P (XWINDOW (x))) \ dead_wrong_type_argument (Qwindow_live_p, (x)); \ } while (0) #define CONCHECK_LIVE_WINDOW(x) do { \ CONCHECK_WINDOW (x); \ if (!WINDOW_LIVE_P (XWINDOW (x))) \ x = wrong_type_argument (Qwindow_live_p, (x)); \ } while (0) /* 1 if W is a minibuffer window. */ #define MINI_WINDOW_P(W) (!NILP ((W)->mini_p)) /* 1 if we are dealing with a parentless window (this includes the root window on a frame and the minibuffer window; both of these are siblings). */ #define TOP_LEVEL_WINDOW_P(w) NILP ((w)->parent) /* Set all redisplay flags indicating a window has changed */ #define MARK_WINDOWS_CHANGED(w) do { \ (w)->windows_changed = 1; \ if (!NILP (w->frame)) \ { \ struct frame *mwc_frame = XFRAME (w->frame); \ MARK_FRAME_WINDOWS_CHANGED (mwc_frame); \ } \ else \ windows_changed = 1; \ } while (0) /* #### This should be fixed not to call MARK_FRAME_CHANGED because faces are cached per window. Also, other code which changes window's face should use this macro. */ #define MARK_WINDOW_FACES_CHANGED(w) \ MARK_FRAME_FACES_CHANGED (XFRAME ((w)->frame)) #define WINDOW_TTY_P(w) FRAME_TTY_P (XFRAME ((w)->frame)) #define WINDOW_X_P(w) FRAME_X_P (XFRAME ((w)->frame)) #define WINDOW_NS_P(w) FRAME_NS_P (XFRAME ((w)->frame)) #define WINDOW_WIN_P(w) FRAME_WIN_P (XFRAME ((w)->frame)) DECLARE_LRECORD (window_configuration, struct window_config); EXFUN (Fget_buffer_window, 3); EXFUN (Fmove_to_window_line, 2); EXFUN (Frecenter, 2); EXFUN (Freplace_buffer_in_windows, 3); EXFUN (Fselect_window, 2); EXFUN (Fselected_window, 1); EXFUN (Fset_window_buffer, 3); EXFUN (Fset_window_hscroll, 2); EXFUN (Fset_window_point, 2); EXFUN (Fset_window_start, 3); EXFUN (Fwindow_buffer, 1); EXFUN (Fwindow_highest_p, 1); EXFUN (Fwindow_point, 1); EXFUN (Fwindow_start, 1); /* The minibuffer window of the selected frame. Note that you cannot test for minibufferness of an arbitrary window by comparing against this; but you can test for minibufferness of the selected window or of any window that is displayed. */ extern Lisp_Object minibuf_window; /* Prompt to display in front of the minibuffer contents, or nil */ extern Lisp_Object Vminibuf_prompt; /* Prompt to display in front of the minibuffer prompt, or nil */ extern Lisp_Object Vminibuf_preprompt; Lisp_Object allocate_window (void); int window_char_width (struct window *, int include_margins_p); int window_char_height (struct window *, int include_gutters_p); int window_displayed_height (struct window *); int window_is_leftmost (struct window *w); int window_is_rightmost (struct window *w); int window_is_lowest (struct window *w); int window_is_highest (struct window *w); int window_truncation_on (struct window *w); int window_needs_vertical_divider (struct window *); int window_scrollbar_width (struct window *w); int window_scrollbar_height (struct window *w); int window_modeline_height (struct window *w); int window_left_margin_width (struct window *w); int window_right_margin_width (struct window *w); int window_top_gutter_height (struct window *w); int window_bottom_gutter_height (struct window *w); int window_left_gutter_width (struct window *w, int modeline); int window_right_gutter_width (struct window *w, int modeline); void delete_all_subwindows (struct window *w); void set_window_pixheight (Lisp_Object window, int pixheight, int nodelete); void set_window_pixwidth (Lisp_Object window, int pixwidth, int nodelete); void window_scroll (Lisp_Object window, Lisp_Object n, int direction, Error_Behavior errb); int buffer_window_count (struct buffer *b, struct frame *f); int buffer_window_mru (struct window *w); void check_frame_size (struct frame *frame, int *rows, int *cols); int frame_pixsize_valid_p (struct frame *frame, int width, int height); int frame_size_valid_p (struct frame *frame, int rows, int cols); struct window *decode_window (Lisp_Object window); struct window *find_window_by_pixel_pos (int pix_x, int pix_y, Lisp_Object win); void free_window_mirror (struct window_mirror *mir); Lisp_Object real_window (struct window_mirror *mir, int no_abort); struct window_mirror *find_window_mirror (struct window *w); display_line_dynarr *window_display_lines (struct window *w, int); struct buffer *window_display_buffer (struct window *w); void set_window_display_buffer (struct window *w, struct buffer *b); void update_frame_window_mirror (struct frame *f); int map_windows (struct frame *f, int (*mapfun) (struct window *w, void *closure), void *closure); void some_window_value_changed (Lisp_Object specifier, struct window *w, Lisp_Object oldval); int invalidate_vertical_divider_cache_in_window (struct window *w, void *u_n_u_s_e_d); int window_divider_width (struct window *w); #define WINDOW_FRAME(w) ((w)->frame) #define WINDOW_XFRAME(w) XFRAME (WINDOW_FRAME (w)) #define WINDOW_BUFFER(w) ((w)->buffer) #define WINDOW_XBUFFER(w) XBUFFER (WINDOW_BUFFER (w)) #define WINDOW_DEVICE(w) FRAME_DEVICE (XFRAME (WINDOW_FRAME (w))) #define WINDOW_XDEVICE(w) XDEVICE (WINDOW_DEVICE (w)) #define WINDOW_CONSOLE(w) DEVICE_CONSOLE (XDEVICE (WINDOW_DEVICE (w))) #define WINDOW_XCONSOLE(w) XCONSOLE (WINDOW_CONSOLE (w)) /* XEmacs window size and positioning macros. */ #define WINDOW_TOP(w) ((w)->pixel_top) #define WINDOW_TEXT_TOP(w) (WINDOW_TOP (w) + window_top_gutter_height (w)) #define WINDOW_TEXT_TOP_CLIP(w) ((w)->top_yoffset) #define WINDOW_BOTTOM(w) ((w)->pixel_top + (w)->pixel_height) #define WINDOW_TEXT_BOTTOM(w) (WINDOW_BOTTOM (w) - window_bottom_gutter_height (w)) #define WINDOW_LEFT(w) ((w)->pixel_left) #define WINDOW_TEXT_LEFT(w) (WINDOW_LEFT (w) + window_left_gutter_width (w, 0)) #define WINDOW_MODELINE_LEFT(w) \ (WINDOW_LEFT (w) + window_left_gutter_width (w, 1)) #define WINDOW_RIGHT(w) ((w)->pixel_left + (w)->pixel_width) #define WINDOW_TEXT_RIGHT(w) \ (WINDOW_RIGHT (w) - window_right_gutter_width (w, 0)) #define WINDOW_MODELINE_RIGHT(w) \ (WINDOW_RIGHT (w) - window_right_gutter_width (w, 1)) #define WINDOW_HEIGHT(w) ((w)->pixel_height) #define WINDOW_TEXT_HEIGHT(w) (WINDOW_TEXT_BOTTOM (w) - WINDOW_TEXT_TOP (w)) #define WINDOW_WIDTH(w) ((w)->pixel_width) #define WINDOW_TEXT_WIDTH(w) (WINDOW_TEXT_RIGHT (w) - WINDOW_TEXT_LEFT (w)) #define WINDOW_HAS_MODELINE_P(w) (!NILP (w->has_modeline_p)) #define MODELINE_OFF_SHADOW_THICKNESS_ADJUSTED(win) \ abs ((!WINDOW_HAS_MODELINE_P (win) \ ? ((XINT (win->modeline_shadow_thickness) > 1) \ ? XINT (win->modeline_shadow_thickness) - 1 \ : ((XINT (win->modeline_shadow_thickness) < -1) \ ? XINT (win->modeline_shadow_thickness) + 1 \ : XINT (win->modeline_shadow_thickness))) \ : XINT (win->modeline_shadow_thickness))) #define MODELINE_SHADOW_THICKNESS(win) \ (MODELINE_OFF_SHADOW_THICKNESS_ADJUSTED (win) > 10 \ ? 10 \ : MODELINE_OFF_SHADOW_THICKNESS_ADJUSTED (win)) #endif /* INCLUDED_window_h_ */