comparison src/redisplay-output.c @ 2500:3d8143fc88e1

[xemacs-hg @ 2005-01-24 23:33:30 by ben] get working with VC7 config.inc.samp: Declare OPTIONAL_LIBRARY_DIR as root of library directories. Redo all graphics library defaults to mirror the versions and directories in the current binary aux distribution on xemacs web site. Enable TIFF and COMPFACE by default since you can now compile with them and binary libs are provided. xemacs.mak: Put our own directories first in case of conflict (e.g. config.h in compface). xemacs.mak: Use MSVCRT to avoid link problems. s/windowsnt.h: bytecode.c, print.c: Add casts to avoid warning. compiler.h: Add MSC_VERSION and include definitions of DOESNT_RETURN and friends here, like for GCC. Need different definitions for VC7 and VC6. s/windowsnt.h: Remove stuff moved to compiler.h. Disable warning 4646 ("function declared with __declspec(noreturn) has non-void return type") on VC7 since lots of Lisp primitives trigger this and there is no easy way to kludge around the warning. glyphs-eimage.c: Some really nasty hacks to allow TIFF and JPEG to both be compiled. #### The better solution is to move the TIFF and JPEG code to different files. glyphs-msw.c: Define __STDC__ to avoid problems with compface.h. intl-auto-encap-win32.c, intl-auto-encap-win32.h, intl-encap-win32.c, syswindows.h: Those wankers at Microsoft cannot leave well enough alone. Various functions change parameter types semi-randomly between VC6 and VC7, so we need to include our own versions that can handle both kinds with appropriate casting. EmacsFrame.c, EmacsShell-sub.c, EmacsShell.c, alloc.c, alloca.c, buffer.c, bytecode.c, charset.h, chartab.c, cm.c, console-stream.c, console.c, data.c, debug.h, device-msw.c, device-tty.c, device-x.c, doprnt.c, dumper.c, dynarr.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, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, free-hook.c, gccache-gtk.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, glyphs.c, gtk-glue.c, gutter.c, input-method-xlib.c, insdel.c, intl-win32.c, keymap.c, lisp.h, lread.c, lstream.c, macros.c, malloc.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, mule-coding.c, native-gtk-toolbar.c, number.c, objects-msw.c, objects.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, regex.c, scrollbar-gtk.c, scrollbar-x.c, search.c, select-x.c, signal.c, specifier.c, specifier.h, strftime.c, sunplay.c, symbols.c, sysdep.c, sysproc.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, ui-gtk.c, unexnt.c, unicode.c, win32.c, window.c, xgccache.c, s/windowsnt.h: abort() -> ABORT(). Eliminate preprocessor games with abort() since it creates huge problems in VC7, solvable only by including massive amounts of files in every compile (and not worth it).
author ben
date Mon, 24 Jan 2005 23:34:34 +0000
parents 04bc9d2f42c7
children 2b84dd8eb906
comparison
equal deleted inserted replaced
2499:4c5ee4d2e921 2500:3d8143fc88e1
417 else if (start_pos < bounds.right_in) 417 else if (start_pos < bounds.right_in)
418 *next_start = bounds.right_in; 418 *next_start = bounds.right_in;
419 else if (start_pos <= bounds.right_out) 419 else if (start_pos <= bounds.right_out)
420 *next_start = bounds.right_out; 420 *next_start = bounds.right_out;
421 else 421 else
422 abort (); 422 ABORT ();
423 } 423 }
424 424
425 for (block = 0; block < Dynarr_length (dba); block++) 425 for (block = 0; block < Dynarr_length (dba); block++)
426 { 426 {
427 struct display_block *db = Dynarr_atp (dba, block); 427 struct display_block *db = Dynarr_atp (dba, block);
460 struct rune *rb; 460 struct rune *rb;
461 Lisp_Object window; 461 Lisp_Object window;
462 int defheight, defwidth; 462 int defheight, defwidth;
463 463
464 if (Dynarr_length (db->runes) <= cursor_location) 464 if (Dynarr_length (db->runes) <= cursor_location)
465 abort (); 465 ABORT ();
466 466
467 window = wrap_window (w); 467 window = wrap_window (w);
468 468
469 rb = Dynarr_atp (db->runes, cursor_location); 469 rb = Dynarr_atp (db->runes, cursor_location);
470 *cursor_start = rb->xpos; 470 *cursor_start = rb->xpos;
1608 /* nothing is as nothing does */ 1608 /* nothing is as nothing does */
1609 break; 1609 break;
1610 1610
1611 case IMAGE_POINTER: 1611 case IMAGE_POINTER:
1612 default: 1612 default:
1613 abort (); 1613 ABORT ();
1614 } 1614 }
1615 } 1615 }
1616 IMAGE_INSTANCE_OPTIMIZE_OUTPUT (childii) = 0; 1616 IMAGE_INSTANCE_OPTIMIZE_OUTPUT (childii) = 0;
1617 } 1617 }
1618 } 1618 }
1720 { 1720 {
1721 w = NULL; 1721 w = NULL;
1722 f = XFRAME (locale); 1722 f = XFRAME (locale);
1723 } 1723 }
1724 else 1724 else
1725 abort (); 1725 ABORT ();
1726 1726
1727 d = XDEVICE (f->device); 1727 d = XDEVICE (f->device);
1728 1728
1729 /* if we have subwindows in the region we have to unmap them */ 1729 /* if we have subwindows in the region we have to unmap them */
1730 redisplay_unmap_subwindows_maybe (f, x, y, width, height); 1730 redisplay_unmap_subwindows_maybe (f, x, y, width, height);