Mercurial > emacs
view lwlib/xrdb.c @ 27634:6c9ee29e8955
* dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
around image definitions and prototypes.
(gamma_correct) [WINDOWSNT]: New prototype.
* w32term.c (x_make_frame_visible): Replace call to
input_poll_signal with poll_for_input.
* window.c [WINDOWSNT]: Include w32term.h.
* xdisp.c [WINDOWSNT]: Include w32term.h.
* makefile.nt: Add dependencies on w32gui.h.
(OBJ1): Include atimer.obj.
($(BLD)\atimer.obj): New dependency rule.
* w32.c (sigmask): New function (does nothing).
(sigunblock): Ditto.
* frame.c [WINDOWSNT]: Include w32term.h.
* w32gui.h (struct W32FontStruct): Add ascent and descent slots.
* lread.c (syms_of_lread): Fix literal newlines.
* emacs.c (USAGE): Split into USAGE1 and USAGE2, to work-around
the string constant limit (2048 bytes) in MSVC.
(main): Ditto.
author | Andrew Innes <andrewi@gnu.org> |
---|---|
date | Sun, 06 Feb 2000 23:37:51 +0000 |
parents | e0d966fb548f |
children |
line wrap: on
line source
/* This file overrides the R4 or R5 mit/lib/Xt/Initialize.c, except that the functions lwlib_GetFileDatabase(), lwlib_CombineFileDatabase(), and lwlib_xrdb_initialize() are called. By doing this silly cpp hack, we avoid version skew problems. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <X11/Xlib.h> #include <X11/cursorfont.h> #include <X11/Xutil.h> #ifdef XlibSpecificationRelease #if XlibSpecificationRelease >= 5 #define HAVE_X11R5 #endif #endif extern struct _XrmHashBucketRec *lwlib_GetFileDatabase (); extern void lwlib_xrdb_initialize (); /* Replace all calls to XrmGetFileDatabase() with lwlib_GetFileDatabase(), calls to XrmCombineFileDatabase() with lwlib_CombineFileDatabase(), and rename the defined _XtDisplayInitialize() function. */ #define XrmGetFileDatabase lwlib_GetFileDatabase #define XrmCombineFileDatabase lwlib_CombineFileDatabase #define _XtDisplayInitialize _orig_XtDisplayInitialize /* Suck in the original code. Don't change this: see comments in Imakefile. */ #include "Initialize.c" #undef XrmGetFileDatabase #undef XrmCombineFileDatabase #undef _XtDisplayInitialize /* Now provide a definition of _XtDisplayInitialize() which invokes the original code after calling our initialization hook. Note that the R4 and R5 versions of _XtDisplayInitialize() take different arguments. */ #ifndef HAVE_X11R5 void _XtDisplayInitialize(dpy, pd, name, class, urlist, num_urs, argc, argv) Display *dpy; XtPerDisplay pd; String name, class; XrmOptionDescRec *urlist; Cardinal num_urs; Cardinal *argc; char *argv[]; { lwlib_xrdb_initialize(dpy); _orig_XtDisplayInitialize(dpy, pd, name, class, urlist, num_urs, argc, argv); } #else /* HAVE_X11R5 */ void _XtDisplayInitialize(dpy, pd, name, urlist, num_urs, argc, argv) Display *dpy; XtPerDisplay pd; String name; XrmOptionDescRec *urlist; Cardinal num_urs; int *argc; char **argv; { lwlib_xrdb_initialize(dpy); _orig_XtDisplayInitialize(dpy, pd, name, urlist, num_urs, argc, argv); } #endif /* HAVE_X11R5 */