Mercurial > hg > xemacs-beta
comparison src/redisplay-output.c @ 793:e38acbeb1cae
[xemacs-hg @ 2002-03-29 04:46:17 by ben]
lots o' fixes
etc/ChangeLog: New file.
Separated out all entries for etc/ into their own ChangeLog.
Includes entries for the following files:
etc/BABYL, etc/BETA, etc/CHARSETS, etc/DISTRIB, etc/Emacs.ad,
etc/FTP, etc/GNUS-NEWS, etc/GOATS, etc/HELLO, etc/INSTALL,
etc/MACHINES, etc/MAILINGLISTS, etc/MSDOS, etc/MYTHOLOGY, etc/NEWS,
etc/OXYMORONS, etc/PACKAGES, etc/README, etc/TUTORIAL,
etc/TUTORIAL.de, etc/TUTORIAL.ja, etc/TUTORIAL.ko, etc/TUTORIAL.se,
etc/aliases.ksh, etc/altrasoft-logo.xpm, etc/check_cygwin_setup.sh,
etc/custom/example-themes/europe-theme.el,
etc/custom/example-themes/ex-custom-file,
etc/custom/example-themes/example-theme.el, etc/e/eterm.ti,
etc/edt-user.doc, etc/enriched.doc, etc/etags.1, etc/gnuserv.1,
etc/gnuserv.README, etc/package-index.LATEST.gpg,
etc/package-index.LATEST.pgp, etc/photos/jan.png, etc/recycle.xpm,
etc/refcard.tex, etc/sample.Xdefaults, etc/sample.emacs,
etc/sgml/CATALOG, etc/sgml/HTML32.dtd, etc/skk/SKK.tut.E,
etc/smilies/Face_ase.xbm, etc/smilies/Face_ase2.xbm,
etc/smilies/Face_ase3.xbm, etc/smilies/Face_smile.xbm,
etc/smilies/Face_weep.xbm, etc/sounds, etc/toolbar,
etc/toolbar/workshop-cap-up.xpm, etc/xemacs-ja.1, etc/xemacs.1,
etc/yow.lines, etc\BETA, etc\NEWS, etc\README, etc\TUTORIAL,
etc\TUTORIAL.de, etc\check_cygwin_setup.sh, etc\sample.init.el,
etc\unicode\README, etc\unicode\mule-ucs\*, etc\unicode\other\*
unicode/unicode-consortium/8859-16.TXT: New file.
mule/english.el: Define this charset now, since a bug was fixed that formerly
prevented it.
mule/ethio-util.el: Fix compile errors involving Unicode `characters', which should be
integers.
Makefile.in.in: Always include gui.c, to fix compile error when TTY-only.
EmacsFrame.c, abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, bytecode.h, callint.c, callproc.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.c, console-msw.h, console-tty.c, console-x.c, console-x.h, console.c, console.h, data.c, database.c, device-gtk.c, device-msw.c, device-x.c, device.c, device.h, dialog-msw.c, doc.c, doprnt.c, dumper.c, dynarr.c, editfns.c, eldap.c, eldap.h, elhash.c, elhash.h, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, events.h, extents.c, extents.h, faces.c, faces.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, free-hook.c, general-slots.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gtk-xemacs.c, gui-msw.c, gui-x.c, gui-x.h, gui.c, gui.h, gutter.c, gutter.h, indent.c, input-method-xlib.c, insdel.c, keymap.c, keymap.h, 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-canna.c, mule-ccl.c, mule-charset.c, mule-wnnfns.c, native-gtk-toolbar.c, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, opaque.c, opaque.h, postgresql.c, postgresql.h, print.c, process-unix.c, process.c, process.h, rangetab.c, rangetab.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, search.c, select-gtk.c, select-x.c, sound.c, specifier.c, specifier.h, strftime.c, symbols.c, symeval.h, syntax.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, toolbar.h, tooltalk.c, tooltalk.h, ui-gtk.c, ui-gtk.h, undo.c, vm-limit.c, window.c, window.h: Eliminate XSETFOO. Replace all usages with wrap_foo().
Make symbol->name a Lisp_Object, not Lisp_String *. Eliminate
nearly all uses of Lisp_String * in favor of Lisp_Object, and
correct macros so most of them favor Lisp_Object.
Create new error-behavior ERROR_ME_DEBUG_WARN -- output warnings,
but at level `debug' (usually ignored). Use it when instantiating
specifiers, so problems can be debugged. Move
log-warning-minimum-level into C so that we can optimize
ERROR_ME_DEBUG_WARN.
Fix warning levels consistent with new definitions.
Add default_ and parent fields to char table; not yet implemented.
New fun Dynarr_verify(); use for further error checking on Dynarrs.
Rearrange code at top of lisp.h in conjunction with dynarr changes.
Fix eifree(). Use Eistrings in various places
(format_event_object(), where_is_to_char(), and callers thereof)
to avoid fixed-size strings buffers. New fun write_eistring().
Reindent and fix GPM code to follow standards.
Set default MS Windows font to Lucida Console (same size as
Courier New but less interline spacing, so more lines fit).
Increase default frame size on Windows to 50 lines. (If that's too
big for the workspace, the frame will be shrunk as necessary.)
Fix problem with text files with no newlines (). (Change
`convert-eol' coding system to use `nil' for autodetect,
consistent with make-coding-system.)
Correct compile warnings in vm-limit.c.
Fix handling of reverse-direction charsets to avoid errors when
opening (e.g.) mule-ucs/lisp/reldata/uiso8859-6.el.
Recode some object printing methods to use write_fmt_string()
instead of a fixed buffer and sprintf.
Turn on display of png comments as warnings (level `info'), now
that they're unobtrusive.
Revamped the sound documentation.
Fixed bug in redisplay w.r.t. hscroll/truncation/continuation
glyphs causing jumping up and down of the lines, since they're
bigger than the line size. (It was seen most obviously when
there's a horizontal scroll bar, e.g. do C-h a glyph or something
like that.) The problem was that the glyph-contrib-p setting on
glyphs was ignored even if it was set properly, which it wasn't
until now.
author | ben |
---|---|
date | Fri, 29 Mar 2002 04:49:13 +0000 |
parents | fdefd0186b75 |
children | a5954632b187 |
comparison
equal
deleted
inserted
replaced
792:4e83fdb13eb9 | 793:e38acbeb1cae |
---|---|
1 /* Synchronize redisplay structures and output changes. | 1 /* Synchronize redisplay structures and output changes. |
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) 1995, 1996 Ben Wing. | 3 Copyright (C) 1995, 1996, 2002 Ben Wing. |
4 Copyright (C) 1996 Chuck Thompson. | 4 Copyright (C) 1996 Chuck Thompson. |
5 Copyright (C) 1999 Andy Piper. | 5 Copyright (C) 1999 Andy Piper. |
6 | 6 |
7 This file is part of XEmacs. | 7 This file is part of XEmacs. |
8 | 8 |
246 have been set anyway if the layout has changed. So it looks | 246 have been set anyway if the layout has changed. So it looks |
247 like we need yet another change flag that we can set here and | 247 like we need yet another change flag that we can set here and |
248 then clear in redisplay_output_layout (). */ | 248 then clear in redisplay_output_layout (). */ |
249 Lisp_Object window, image; | 249 Lisp_Object window, image; |
250 Lisp_Image_Instance* ii; | 250 Lisp_Image_Instance* ii; |
251 XSETWINDOW (window, w); | 251 window = wrap_window (w); |
252 image = glyph_image_instance (crb->object.dglyph.glyph, | 252 image = glyph_image_instance (crb->object.dglyph.glyph, |
253 window, ERROR_ME_NOT, 1); | 253 window, ERROR_ME_DEBUG_WARN, 1); |
254 | 254 |
255 if (!IMAGE_INSTANCEP (image)) | 255 if (!IMAGE_INSTANCEP (image)) |
256 return 0; | 256 return 0; |
257 ii = XIMAGE_INSTANCE (image); | 257 ii = XIMAGE_INSTANCE (image); |
258 | 258 |
374 int defheight, defwidth; | 374 int defheight, defwidth; |
375 | 375 |
376 if (Dynarr_length (db->runes) <= cursor_location) | 376 if (Dynarr_length (db->runes) <= cursor_location) |
377 abort (); | 377 abort (); |
378 | 378 |
379 XSETWINDOW (window, w); | 379 window = wrap_window (w); |
380 | 380 |
381 rb = Dynarr_atp (db->runes, cursor_location); | 381 rb = Dynarr_atp (db->runes, cursor_location); |
382 *cursor_start = rb->xpos; | 382 *cursor_start = rb->xpos; |
383 | 383 |
384 default_face_height_and_width (window, &defheight, &defwidth); | 384 default_face_height_and_width (window, &defheight, &defwidth); |
534 ****************************************************************************/ | 534 ****************************************************************************/ |
535 static void | 535 static void |
536 clear_left_border (struct window *w, int y, int height) | 536 clear_left_border (struct window *w, int y, int height) |
537 { | 537 { |
538 struct frame *f = XFRAME (w->frame); | 538 struct frame *f = XFRAME (w->frame); |
539 Lisp_Object window; | 539 Lisp_Object window = wrap_window (w); |
540 | 540 |
541 XSETWINDOW (window, w); | |
542 redisplay_clear_region (window, DEFAULT_INDEX, | 541 redisplay_clear_region (window, DEFAULT_INDEX, |
543 FRAME_LEFT_BORDER_START (f), y, | 542 FRAME_LEFT_BORDER_START (f), y, |
544 FRAME_BORDER_WIDTH (f), height); | 543 FRAME_BORDER_WIDTH (f), height); |
545 } | 544 } |
546 | 545 |
551 ****************************************************************************/ | 550 ****************************************************************************/ |
552 static void | 551 static void |
553 clear_right_border (struct window *w, int y, int height) | 552 clear_right_border (struct window *w, int y, int height) |
554 { | 553 { |
555 struct frame *f = XFRAME (w->frame); | 554 struct frame *f = XFRAME (w->frame); |
556 Lisp_Object window; | 555 Lisp_Object window = wrap_window (w); |
557 | 556 |
558 XSETWINDOW (window, w); | |
559 redisplay_clear_region (window, DEFAULT_INDEX, | 557 redisplay_clear_region (window, DEFAULT_INDEX, |
560 FRAME_RIGHT_BORDER_START (f), | 558 FRAME_RIGHT_BORDER_START (f), |
561 y, FRAME_BORDER_WIDTH (f), height); | 559 y, FRAME_BORDER_WIDTH (f), height); |
562 } | 560 } |
563 | 561 |
723 else | 721 else |
724 findex = (face_index) -1; | 722 findex = (face_index) -1; |
725 | 723 |
726 if (findex != (face_index) -1) | 724 if (findex != (face_index) -1) |
727 { | 725 { |
728 Lisp_Object window; | 726 Lisp_Object window = wrap_window (w); |
729 | 727 |
730 XSETWINDOW (window, w); | |
731 | 728 |
732 /* Clear the empty area. */ | 729 /* Clear the empty area. */ |
733 redisplay_clear_region (window, findex, x, y, width, height); | 730 redisplay_clear_region (window, findex, x, y, width, height); |
734 | 731 |
735 /* Mark that we should clear the border. This is | 732 /* Mark that we should clear the border. This is |
1241 | 1238 |
1242 /* This makes the glyph area fit into the display area. */ | 1239 /* This makes the glyph area fit into the display area. */ |
1243 if (!redisplay_normalize_glyph_area (db, dga)) | 1240 if (!redisplay_normalize_glyph_area (db, dga)) |
1244 return; | 1241 return; |
1245 | 1242 |
1246 XSETWINDOW (window, w); | 1243 window = wrap_window (w); |
1247 | 1244 |
1248 /* Clear the area the subwindow is going into. */ | 1245 /* Clear the area the subwindow is going into. */ |
1249 redisplay_clear_clipped_region (window, findex, | 1246 redisplay_clear_clipped_region (window, findex, |
1250 db, dga, 0, image_instance); | 1247 db, dga, 0, image_instance); |
1251 | 1248 |
1392 | 1389 |
1393 /* Flip through the widgets in the layout displaying as necessary */ | 1390 /* Flip through the widgets in the layout displaying as necessary */ |
1394 LIST_LOOP (rest, IMAGE_INSTANCE_LAYOUT_CHILDREN (p)) | 1391 LIST_LOOP (rest, IMAGE_INSTANCE_LAYOUT_CHILDREN (p)) |
1395 { | 1392 { |
1396 Lisp_Object child = glyph_image_instance (XCAR (rest), image_instance, | 1393 Lisp_Object child = glyph_image_instance (XCAR (rest), image_instance, |
1397 ERROR_ME_NOT, 1); | 1394 ERROR_ME_DEBUG_WARN, 1); |
1398 | 1395 |
1399 struct display_box cdb; | 1396 struct display_box cdb; |
1400 /* For losing HP-UX */ | 1397 /* For losing HP-UX */ |
1401 cdb.xpos = db->xpos; | 1398 cdb.xpos = db->xpos; |
1402 cdb.ypos = db->ypos; | 1399 cdb.ypos = db->ypos; |
1541 int cursor_height, int offset_bitmap) | 1538 int cursor_height, int offset_bitmap) |
1542 { | 1539 { |
1543 struct frame *f = XFRAME (w->frame); | 1540 struct frame *f = XFRAME (w->frame); |
1544 struct device *d = XDEVICE (f->device); | 1541 struct device *d = XDEVICE (f->device); |
1545 Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance); | 1542 Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance); |
1546 Lisp_Object window; | 1543 Lisp_Object window = wrap_window (w); |
1547 XSETWINDOW (window, w); | 1544 |
1548 | 1545 |
1549 dga->height = IMAGE_INSTANCE_PIXMAP_HEIGHT (p); | 1546 dga->height = IMAGE_INSTANCE_PIXMAP_HEIGHT (p); |
1550 dga->width = IMAGE_INSTANCE_PIXMAP_WIDTH (p); | 1547 dga->width = IMAGE_INSTANCE_PIXMAP_WIDTH (p); |
1551 | 1548 |
1552 /* This makes the glyph area fit into the display area. */ | 1549 /* This makes the glyph area fit into the display area. */ |
1916 If window is topmost, clear the internal border above it. | 1913 If window is topmost, clear the internal border above it. |
1917 ****************************************************************************/ | 1914 ****************************************************************************/ |
1918 void | 1915 void |
1919 redisplay_clear_top_of_window (struct window *w) | 1916 redisplay_clear_top_of_window (struct window *w) |
1920 { | 1917 { |
1921 Lisp_Object window; | 1918 Lisp_Object window = wrap_window (w); |
1922 XSETWINDOW (window, w); | 1919 |
1923 | 1920 |
1924 if (!NILP (Fwindow_highest_p (window))) | 1921 if (!NILP (Fwindow_highest_p (window))) |
1925 { | 1922 { |
1926 struct frame *f = XFRAME (w->frame); | 1923 struct frame *f = XFRAME (w->frame); |
1927 int x, y, width, height; | 1924 int x, y, width, height; |
1968 Lisp_Object window; | 1965 Lisp_Object window; |
1969 int bflag = 0 ; /* (window_needs_vertical_divider (w) ? 0 : 1);*/ | 1966 int bflag = 0 ; /* (window_needs_vertical_divider (w) ? 0 : 1);*/ |
1970 layout_bounds bounds; | 1967 layout_bounds bounds; |
1971 | 1968 |
1972 bounds = calculate_display_line_boundaries (w, bflag); | 1969 bounds = calculate_display_line_boundaries (w, bflag); |
1973 XSETWINDOW (window, w); | 1970 window = wrap_window (w); |
1974 | 1971 |
1975 if (window_is_leftmost (w)) | 1972 if (window_is_leftmost (w)) |
1976 redisplay_clear_region (window, DEFAULT_INDEX, FRAME_LEFT_BORDER_START (f), | 1973 redisplay_clear_region (window, DEFAULT_INDEX, FRAME_LEFT_BORDER_START (f), |
1977 ypos1, FRAME_BORDER_WIDTH (f), height); | 1974 ypos1, FRAME_BORDER_WIDTH (f), height); |
1978 | 1975 |