Mercurial > hg > xemacs-beta
diff src/redisplay-output.c @ 800:a5954632b187
[xemacs-hg @ 2002-03-31 08:27:14 by ben]
more fixes, first crack at finishing behavior implementation
TODO.ben-mule-21-5: Update.
configure.in: Fix for new error-checking types.
make-mswin-unicode.pl: Don't be fucked up by CRLF. Output code
to force errors when nonintercepted Windows calls issued.
behavior.el, dumped-lisp.el, menubar-items.el: Add support for saving using custom. Load into a dumped XEmacs.
Correct :title to :short-doc in accordance with behavior-defs.el.
Add a submenu under Options for turning on/off behaviors.
cl-macs.el: Properly document `loop'. Fix a minor bug in keymap iteration and
add support for bit-vector iteration.
lisp-mode.el: Rearrange and add items for macro expanding.
menubar-items.el: Document connection between these two functions.
window.el: Port stuff from GNU 21.1.
config.inc.samp, xemacs.mak: Separate out and add new variable for controlling error-checking.
s/windowsnt.h: Use new ERROR_CHECK_ALL; not related to DEBUG_XEMACS.
alloc.c, backtrace.h, buffer.c, buffer.h, bytecode.c, callproc.c, casetab.c, charset.h, chartab.c, cmdloop.c, config.h.in, console-msw.c, console-stream.c, console-tty.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dired-msw.c, dired.c, dumper.c, editfns.c, eldap.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, file-coding.h, fileio.c, frame-msw.c, frame.c, frame.h, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, insdel.c, intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, intl-win32.c, keymap.c, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-x.c, menubar.c, mule-coding.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, opaque.c, print.c, process-nt.c, process-unix.c, process.c, rangetab.c, redisplay-msw.c, redisplay-output.c, redisplay.c, regex.c, scrollbar-msw.c, select-msw.c, signal.c, specifier.c, specifier.h, symbols.c, sysdep.c, syswindows.h, text.c, text.h, toolbar-msw.c, tooltalk.c, ui-gtk.c, unicode.c, window.c: Redo error-checking macros: ERROR_CHECK_TYPECHECK ->
ERROR_CHECK_TYPES, ERROR_CHECK_CHARBPOS -> ERROR_CHECK_TEXT, add
ERROR_CHECK_DISPLAY, ERROR_CHECK_STRUCTURES. Document these in
config.h.in. Fix code to follow docs. Fix *_checking_assert()
in accordance with new names.
Attempt to fix periodic redisplay crash freeing display line
structures. Add first implementation of sledgehammer redisplay
check.
Redo print_*() to use write_fmt_string(), write_fmt_string_lisp().
Fix bug in md5 handling.
Rename character-to-unicode to char-to-unicode; same for
unicode-to-char{acter}.
Move chartab documentation to `make-char-table'.
Some header cleanup.
Clean up remaining places where nonintercepted Windows calls are
being used.
automated/mule-tests.el: Fix for new Unicode support.
author | ben |
---|---|
date | Sun, 31 Mar 2002 08:30:17 +0000 |
parents | e38acbeb1cae |
children | 6504113e7c2d |
line wrap: on
line diff
--- a/src/redisplay-output.c Sat Mar 30 04:46:48 2002 +0000 +++ b/src/redisplay-output.c Sun Mar 31 08:30:17 2002 +0000 @@ -107,16 +107,16 @@ display_line_dynarr *cdla, display_line_dynarr *ddla) { - int cdla_len = Dynarr_length (cdla); - struct display_line dl, *clp, *dlp; int db_elt; + int local = 0; dlp = Dynarr_atp (ddla, line); if (line >= Dynarr_largest (cdla)) { clp = &dl; clp->display_blocks = Dynarr_new (display_block); + local = 1; } else { @@ -143,40 +143,42 @@ clp->right_glyphs = 0; } - if (!do_blocks && line >= cdla_len) + if (do_blocks || line < Dynarr_length (cdla)) { - Dynarr_add (cdla, *clp); - return; + for (db_elt = 0; db_elt < Dynarr_length (dlp->display_blocks); db_elt++) + { + struct display_block db, *cdb; + struct display_block *ddb = Dynarr_atp (dlp->display_blocks, db_elt); + + if (db_elt >= Dynarr_largest (clp->display_blocks)) + { + cdb = &db; + memcpy (cdb, ddb, sizeof (struct display_block)); + cdb->runes = Dynarr_new (rune); + Dynarr_add (clp->display_blocks, *cdb); + } + else + { + rune_dynarr *tr; + + cdb = Dynarr_atp (clp->display_blocks, db_elt); + tr = cdb->runes; + memcpy (cdb, ddb, sizeof (struct display_block)); + cdb->runes = tr; + Dynarr_increment (clp->display_blocks); + } + + sync_rune_structs (w, cdb->runes, ddb->runes); + } } - for (db_elt = 0; db_elt < Dynarr_length (dlp->display_blocks); db_elt++) + if (local) + Dynarr_add (cdla, *clp); + else if (line >= Dynarr_length (cdla)) { - struct display_block db, *cdb; - struct display_block *ddb = Dynarr_atp (dlp->display_blocks, db_elt); - - if (db_elt >= Dynarr_largest (clp->display_blocks)) - { - cdb = &db; - memcpy (cdb, ddb, sizeof (struct display_block)); - cdb->runes = Dynarr_new (rune); - Dynarr_add (clp->display_blocks, *cdb); - } - else - { - rune_dynarr *tr; - - cdb = Dynarr_atp (clp->display_blocks, db_elt); - tr = cdb->runes; - memcpy (cdb, ddb, sizeof (struct display_block)); - cdb->runes = tr; - Dynarr_increment (clp->display_blocks); - } - - sync_rune_structs (w, cdb->runes, ddb->runes); + assert (line == Dynarr_length (cdla)); + Dynarr_increment (cdla); } - - if (line >= cdla_len) - Dynarr_add (cdla, *clp); } /*****************************************************************************