Mercurial > hg > xemacs-beta

comparison src/frame.c @ 2500:3d8143fc88e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 ecf1ebac70d8
children 9f70af3ac939
comparison
equal deleted inserted replaced
2499:4c5ee4d2e921 2500:3d8143fc88e1
879 } 879 }
880 880
881 /* use this instead of XFRAME (DEVICE_SELECTED_FRAME (d)) to catch 881 /* use this instead of XFRAME (DEVICE_SELECTED_FRAME (d)) to catch
882 the possibility of there being no frames on the device (just created). 882 the possibility of there being no frames on the device (just created).
883 There is no point doing this inside of redisplay because errors 883 There is no point doing this inside of redisplay because errors
884 cause an abort(), indicating a flaw in the logic, and error_check_frame() 884 cause an ABORT(), indicating a flaw in the logic, and error_check_frame()
885 will catch this just as well. */ 885 will catch this just as well. */
886 886
887 struct frame * 887 struct frame *
888 device_selected_frame (struct device *d) 888 device_selected_frame (struct device *d)
889 { 889 {
1741 would have to be minibuffer-less, which implies that at some 1741 would have to be minibuffer-less, which implies that at some
1742 point their minibuffer frames must have been deleted, but 1742 point their minibuffer frames must have been deleted, but
1743 that is prohibited at the top; you can't delete surrogate 1743 that is prohibited at the top; you can't delete surrogate
1744 minibuffer frames. */ 1744 minibuffer frames. */
1745 if (NILP (frame_with_minibuf)) 1745 if (NILP (frame_with_minibuf))
1746 abort (); 1746 ABORT ();
1747 1747
1748 con->default_minibuffer_frame = frame_with_minibuf; 1748 con->default_minibuffer_frame = frame_with_minibuf;
1749 } 1749 }
1750 else 1750 else
1751 /* No frames left on this console--say no minibuffer either. */ 1751 /* No frames left on this console--say no minibuffer either. */
1823 case -1: 1823 case -1:
1824 *frame = DEVICE_SELECTED_FRAME (d); 1824 *frame = DEVICE_SELECTED_FRAME (d);
1825 break; 1825 break;
1826 1826
1827 default: 1827 default:
1828 abort (); /* method is incorrectly written */ 1828 ABORT (); /* method is incorrectly written */
1829 } 1829 }
1830 1830
1831 return 0; 1831 return 0;
1832 } 1832 }
1833 1833
3211 /* No, because it would hose toolbar updates. The toolbar 3211 /* No, because it would hose toolbar updates. The toolbar
3212 update code relies on this function to cause window `top' and 3212 update code relies on this function to cause window `top' and
3213 `left' coordinates to be recomputed even though no frame size 3213 `left' coordinates to be recomputed even though no frame size
3214 change occurs. --kyle */ 3214 change occurs. --kyle */
3215 if (in_display || hold_frame_size_changes) 3215 if (in_display || hold_frame_size_changes)
3216 abort (); 3216 ABORT ();
3217 3217
3218 frame = wrap_frame (f); 3218 frame = wrap_frame (f);
3219 3219
3220 default_face_height_and_width (frame, &real_font_height, 0); 3220 default_face_height_and_width (frame, &real_font_height, 0);
3221 default_face_height_and_width_1 (frame, &font_height, &font_width); 3221 default_face_height_and_width_1 (frame, &font_height, &font_width);