Mercurial > hg > xemacs-beta
comparison src/redisplay.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 | 6504113e7c2d |
children | 2b6fa2618f76 |
comparison
equal
deleted
inserted
replaced
825:eb3bc15a6e0f | 826:6728e641994e |
---|---|
1 /* Redisplay data structures. | 1 /* Redisplay data structures. |
2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. | 2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. |
3 Copyright (C) 1996 Chuck Thompson. | 3 Copyright (C) 1996 Chuck Thompson. |
4 Copyright (C) 1995, 1996 Ben Wing. | 4 Copyright (C) 1995, 1996, 2002 Ben Wing. |
5 | 5 |
6 This file is part of XEmacs. | 6 This file is part of XEmacs. |
7 | 7 |
8 XEmacs is free software; you can redistribute it and/or modify it | 8 XEmacs is free software; you can redistribute it and/or modify it |
9 under the terms of the GNU General Public License as published by the | 9 under the terms of the GNU General Public License as published by the |
110 faces that overlap the rune) and | 110 faces that overlap the rune) and |
111 contains the instance values for | 111 contains the instance values for |
112 each of the face properties in this | 112 each of the face properties in this |
113 particular window. */ | 113 particular window. */ |
114 | 114 |
115 Charbpos charbpos; /* buffer position this rune is displaying; | 115 Charxpos charpos; /* buffer position this rune is displaying; |
116 for the modeline, the value here is a | 116 for the modeline, the value here is a |
117 Charcount, but who's looking? */ | 117 Charcount, but who's looking? */ |
118 Charbpos endpos; /* if set this rune covers a range of pos */ | 118 Charxpos endpos; /* if set this rune covers a range of pos; |
119 used in redisplay_move_cursor(). */ | |
119 /* #### Chuck, what does it mean for a rune | 120 /* #### Chuck, what does it mean for a rune |
120 to cover a range of pos? I don't get | 121 to cover a range of pos? I don't get |
121 this. */ | 122 this. */ |
122 /* #### This isn't used as an rvalue anywhere! | |
123 remove! */ | |
124 | 123 |
125 | 124 |
126 short xpos; /* horizontal starting position in pixels */ | 125 short xpos; /* horizontal starting position in pixels */ |
127 short width; /* pixel width of rune */ | 126 short width; /* pixel width of rune */ |
128 | 127 |
256 | 255 |
257 /*************************************************************************/ | 256 /*************************************************************************/ |
258 /* display lines */ | 257 /* display lines */ |
259 /*************************************************************************/ | 258 /*************************************************************************/ |
260 | 259 |
261 /* Modeline commentary: IMO the modeline is handled very badly, we | 260 /* Modeline commentary: IMO the modeline is handled very badly, we |
262 special case virtually *everything* in the redisplay routines for | 261 special case virtually *everything* in the redisplay routines for |
263 the modeline. The fact that dl->charbpos can be either a buffer | 262 the modeline. The fact that dl->charpos can be either a buffer |
264 position or a char count highlights this. There is no abstraction at | 263 position or a char count highlights this. There is no abstraction at |
265 all that I can find and it means that the code is made very ugly as | 264 all that I can find and it means that the code is made very ugly as |
266 a result. Either we should treat the modeline *entirely* separately, | 265 a result. Either we should treat the modeline *entirely* separately, |
267 or we should abstract to something that applies equally well to the | 266 or we should abstract to something that applies equally well to the |
268 modeline and to buffer text, the things are not enormously different | 267 modeline and to buffer text, the things are not enormously different |
294 pixel-row itself, I think. */ | 293 pixel-row itself, I think. */ |
295 unsigned short clip; /* amount of bottom of line to clip | 294 unsigned short clip; /* amount of bottom of line to clip |
296 in pixels.*/ | 295 in pixels.*/ |
297 unsigned short top_clip; /* amount of top of line to clip | 296 unsigned short top_clip; /* amount of top of line to clip |
298 in pixels.*/ | 297 in pixels.*/ |
299 Charbpos charbpos; /* first buffer position on line */ | 298 Charxpos charpos; /* first buffer position on line */ |
300 Charbpos end_charbpos; /* last buffer position on line */ | 299 Charxpos end_charpos; /* last buffer position on line */ |
301 Charcount offset; /* adjustment to charbpos vals */ | 300 Charcount offset; /* adjustment to charpos vals */ |
302 Charcount num_chars; /* # of chars on line | 301 Charcount num_chars; /* # of chars on line |
303 including expansion of tabs | 302 including expansion of tabs |
304 and control chars */ | 303 and control chars */ |
305 int cursor_elt; /* rune block of TEXT display | 304 int cursor_elt; /* rune block of TEXT display |
306 block cursor is at or -1 */ | 305 block cursor is at or -1 */ |
384 | 383 |
385 int proportional_p; | 384 int proportional_p; |
386 }; | 385 }; |
387 | 386 |
388 /* NOTE NOTE NOTE: Currently the positions in an extent fragment | 387 /* NOTE NOTE NOTE: Currently the positions in an extent fragment |
389 structure are Bytebpos's, not Charbpos's. This could change. */ | 388 structure are Bytexpos's, not Charxpos's. This could change. */ |
390 | 389 |
391 struct extent_fragment | 390 struct extent_fragment |
392 { | 391 { |
393 Lisp_Object object; /* buffer or string */ | 392 Lisp_Object object; /* buffer or string */ |
394 struct frame *frm; | 393 struct frame *frm; |
395 Bytebpos pos, end; | 394 Bytexpos pos, end; |
396 EXTENT_dynarr *extents; | 395 EXTENT_dynarr *extents; |
397 glyph_block_dynarr *begin_glyphs, *end_glyphs; | 396 glyph_block_dynarr *begin_glyphs, *end_glyphs; |
398 unsigned int invisible:1; | 397 unsigned int invisible:1; |
399 unsigned int invisible_ellipses:1; | 398 unsigned int invisible_ellipses:1; |
400 unsigned int previously_invisible:1; | 399 unsigned int previously_invisible:1; |
696 struct display_block *get_display_block_from_line (struct display_line *dl, | 695 struct display_block *get_display_block_from_line (struct display_line *dl, |
697 enum display_type type); | 696 enum display_type type); |
698 layout_bounds calculate_display_line_boundaries (struct window *w, | 697 layout_bounds calculate_display_line_boundaries (struct window *w, |
699 int modeline); | 698 int modeline); |
700 Charbpos point_at_center (struct window *w, int type, Charbpos start, | 699 Charbpos point_at_center (struct window *w, int type, Charbpos start, |
701 Charbpos point); | 700 Charbpos point); |
702 int line_at_center (struct window *w, int type, Charbpos start, Charbpos point); | 701 int line_at_center (struct window *w, int type, Charbpos start, |
702 Charbpos point); | |
703 int window_half_pixpos (struct window *w); | 703 int window_half_pixpos (struct window *w); |
704 void redisplay_echo_area (void); | 704 void redisplay_echo_area (void); |
705 void free_display_structs (struct window_mirror *mir); | 705 void free_display_structs (struct window_mirror *mir); |
706 void free_display_lines (display_line_dynarr *dla); | 706 void free_display_lines (display_line_dynarr *dla); |
707 void mark_redisplay_structs (display_line_dynarr *dla); | 707 void mark_redisplay_structs (display_line_dynarr *dla); |
727 void glyph_to_pixel_translation (struct window *w, int char_x, | 727 void glyph_to_pixel_translation (struct window *w, int char_x, |
728 int char_y, int *pix_x, int *pix_y); | 728 int char_y, int *pix_x, int *pix_y); |
729 int point_in_line_start_cache (struct window *w, Charbpos point, | 729 int point_in_line_start_cache (struct window *w, Charbpos point, |
730 int min_past); | 730 int min_past); |
731 int point_would_be_visible (struct window *w, Charbpos startp, | 731 int point_would_be_visible (struct window *w, Charbpos startp, |
732 Charbpos point); | 732 Charbpos point); |
733 Charbpos start_of_last_line (struct window *w, Charbpos startp); | 733 Charbpos start_of_last_line (struct window *w, Charbpos startp); |
734 Charbpos end_of_last_line (struct window *w, Charbpos startp); | 734 Charbpos end_of_last_line (struct window *w, Charbpos startp); |
735 Charbpos start_with_line_at_pixpos (struct window *w, Charbpos point, | 735 Charbpos start_with_line_at_pixpos (struct window *w, Charbpos point, |
736 int pixpos); | 736 int pixpos); |
737 Charbpos start_with_point_on_display_line (struct window *w, Charbpos point, | 737 Charbpos start_with_point_on_display_line (struct window *w, Charbpos point, |
738 int line); | 738 int line); |
739 int redisplay_variable_changed (Lisp_Object sym, Lisp_Object *val, | 739 int redisplay_variable_changed (Lisp_Object sym, Lisp_Object *val, |
740 Lisp_Object in_object, int flags); | 740 Lisp_Object in_object, int flags); |
741 void redisplay_glyph_changed (Lisp_Object glyph, Lisp_Object property, | 741 void redisplay_glyph_changed (Lisp_Object glyph, Lisp_Object property, |
742 Lisp_Object locale); | 742 Lisp_Object locale); |
743 | 743 |