Mercurial > hg > xemacs-beta
view src/s/windowsnt.h @ 872:79c6ff3eef26
[xemacs-hg @ 2002-06-20 21:18:01 by ben]
font changes etc.; some 21.4 changes
mule/mule-msw-init-late.el: Specify charset->windows-registry conversion.
mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c.
cl-macs.el: Document better.
font-lock.el: Move Lisp function regexp to lisp-mode.el.
lisp-mode.el: Various indentation fixes:
Handle flet functions better.
Handle argument lists in defuns and flets.
Handle quoted lists, e.g. property lists -- don't indent like
function calls. Distinguish between lambdas and other lists.
lisp-mode.el: Handle this form.
faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code:
-- Fix lots of bogus code in msw-faces.el, msw-font-menu.el,
font-menu.el that was "truenaming" font specs -- i.e. in the
process of frobbing a particular field in a general user-specified
font spec with wildcarded fields, sticking in particular values
for all the remaining wildcarded fields. This bug was rampant
everywhere except in x-faces.el (the oldest and only correctly
written code). This also means that we need to work with font
names at all times and not font instances, because a font instance
is essentially a truenamed font.
-- Total rewrite of extremely junky code in msw-faces.el. Work
with names as well as font instances, and return names; stop
truenaming when canonicalizing and frobbing; fix handling of the
combined style field, i.e. weight/slant (also fixed in font.el).
-- Totally rewrite the frobbing functions in faces.el. This time,
we frob all the instantiators rather than just computing a single
instance value and working backwards. That way, e.g., `bold' will
work for all charsets that have bold available, rather than only
for whatever charset was part of the computed font instance
(another example of the truename virus). Also fix up code to look
at the fallbacks (all of them) when no global value present, so we
don't need to put something in the global value. Intelligently
handle a request to frob a buffer locale, rather than signalling
an error. When frobbing instantiators, try hard to figure out
what device type is associated with them, and frob each according
to its own proper device type. Correctly handle inheritance
vectors given as instantiators. Preserve existing tags when
putting back frobbed instantiators. Extract out general
specifier-frobbing code into specifier.el. Document everything
cleanly. Do lots of other things better, etc.
-- Don't duplicatively set a global specification for the default
font -- it's already in the fallback and we no longer need a
default global specification present. Delete various code in
x-faces.el and msw-faces.el that duplicated the lists of fonts in
faces.c.
-- init-global-faces was not being called at all under MS Windows!
Major bogosity. That caused device-specific values to get stuck
into all the fonts, making it very hard to change them -- setting
global specs caused nothing to happen.
-- Correct weight names in font.el.
-- Lots more font fixups in objects*.c.
Printer.el: Warning fix.
specifier.el: Add more args to map-specifier.
Add various "heuristic" specifier functions to aid in creation of
specifier-munging code such as in faces.el.
subr.el: New functions.
lwlib.c: Fix warning.
config.inc.samp: Clean up, add args to control fastcall (not yet supported! the
changes needed are in another ws of mine), profile support, vc6
support, union-type.
xemacs.dsp, xemacs.mak: Semi-major overhaul.
Fix bug where dump-id was always getting recomputed, forcing a
redump even when nothing changed.
Add support for fastcall. Support edit-and-continue (on by
default) with vc6. Use incremental linking when doing a debug
compilation. Add support for profiling.
Consolidate the various debug flags.
Partial support for "batch-compiling" -- compiling many files on a
single invocation of the compiler. Doesn't seem to help that much
for me, so it's not finished or enabled by default.
Remove HAVE_MSW_C_DIRED, we always do.
Correct some sloppy use of directories.
s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine
HAVE_MMAP).
s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32
variants (Cygwin, native, MinGW). Both of these are properly used
in another ws.
alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made:
(1) Separation of various header files into an external and an
internal version, similar to the existing separation of process.h
and procimpl.h. Eventually this should be done for all Lisp
objects. The external version has the same name as currently; the
internal adds -impl. The external file has XFOO() macros for
objects, but the structure is opaque and defined only in the
internal file. It's now reasonable to move all prototypes in
lisp.h into the appropriate external file, and this should be
done. Currently, separation has been done on extents.h,
objects*.h, console.h, device.h, frame.h, and window.h.
For c/d/f/w, the most basic properties are available in the
external header file, with the macros resolving to functions. In
the internal header file, the macros are redefined to directly
access the structure. Also, the global MARK_FOO_CHANGED macros
have been made into functions so that they can be accessed without
needing to include lots of -impl headers -- they are used in
almost exclusively in non-time-critical functions, and take up
enough time that the function overhead will be negligible.
Similarly, the function overhead from making the basic properties
mentioned above into functions is negligible, and code that does
heavy accessing of c/d/f/w structures inevitably ends up needing
the internal header files, anyway.
(2) More face changes.
-- Major rewrite of objects-msw.c. Now handles wildcard specs
properly, rather than "truenaming" (or even worse, signalling an
error, which previously happened with some of the fallbacks if you
tried to use them in make-font-instance!).
-- Split charset matching of fonts into two stages -- one to find
a font specifically designed for a particular charset (by
examining its registry), the second to find a Unicode font that
can support the charset. This needs to proceed as two complete,
separate instantiations in order to work properly (otherwise many
of the fonts in the HELLO page look wrong). This should also make
it easy to support iso10646 (Unicode) fonts under X.
-- All default values for fonts are now completely specified in
the fallbacks. Stuff from mule-x-init.el has all been moved here,
merged with the existing specs, and totally rethought so you get
sensible results. (HELLO now looks much better!).
-- Generalize the "default X/GTK device" stuff into a
per-device-type "default device".
-- Add mswindows-{set-}charset-registry. In time,
charset<->code-page conversion functions will be removed.
-- Wrap protective code around calls to compute device specifier tags,
and do this computation before calling the face initialization code
because the latter may need these tags to be correctly updated.
(3) Other changes.
EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes.
config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of
#ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside!
eval.c: Let detailed backtraces be detailed.
specifier.c: Don't override user's print-string-length/print-length settings.
glyphs.c: New function image-instance-instantiator.
config.h.in, sysdep.c: Changes for fastcall.
sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both
EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP
NEEDS TO GO IN, TOO.
search.c: Fix *evil* crash due to incorrect synching of syntax-cache code
with 21.1. THIS SHOULD GO INTO 21.4.
author | ben |
---|---|
date | Thu, 20 Jun 2002 21:19:10 +0000 |
parents | 28426972f654 |
children | 8b464283e891 |
line wrap: on
line source
/* System description file for Windows 9x and NT. Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. Copyright (C) 2001, 2002 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: FSF 19.31. */ /* Capsule summary of different preprocessor flags: 1. Keep in mind that there are two possible OS environments we are dealing with -- Cygwin and Native Windows. MS Windows natively provides file-system, process, and window-system services through the Win32 API, implemented by various DLL's. (The most important and KERNEL32, USER32, and GDI32. KERNEL32 implements the basic file-system and process services. USER32 implements the fundamental window-system services such as creating windows and handling messages. GDI32 implements higher-level drawing capabilities -- fonts, colors, lines, etc.) The C library is implemented on top of Win32 using either MSVCRT (dynamically linked) or LIBC.LIB (statically linked). Cygwin provides a POSIX emulation layer on top of MS Windows -- in particular, providing the file-system, process, tty, and signal semantics that are part of a modern, standard Unix operating system. Cygwin does this using its own DLL, cygwin1.dll, which makes calls to the Win32 API services in kernel32.dll. Cygwin also provides its own implementation of the C library, called `newlib' (libcygwin.a; libc.a and libm.a are symlinked to it), which is implemented on top of the Unix system calls provided in cygwin1.dll. In addition, Cygwin provides static import libraries that give you direct access to the Win32 API -- XEmacs uses this to provide GUI support under Cygwin. The two environments also use different compilers -- Native Windows uses Visual C++, and Cygwin uses GCC. (MINGW, however, is a way of using GCC to target the Native Windows environment. This works similarly to building with Cygwin, but the resulting executable does not use the Cygwin DLL. Instead, MINGW provides import libraries for the standard C library DLL's (specifically CRTDLL -- #### how does this differ from MSVCRT and LIBC.LIB?).) 2. There are two windowing environments we can target XEmacs for when running under MS Windows -- Windows native, and X. (It may seem strange to write an X application under Windows, but there are in fact many X servers out there running on Windows, and as far as I know there is no real (or at least, that works well) networking Window-system extension under MS Windows. Furthermore, if you're porting a Unix application to Windows and use Cygwin to assist you, it might seem natural to use an X server to avoid having to port all the code to Windows.) For XEmacs, there are various reasons people could come up with for why we would want to keep maintaining X Windows under MS Windows support. That gives us four possible build environments. I (Ben) build regularly on fully-native-everything, Andy builds on Cygwin + MS Windows + X Windows for windowing. The build flags used for these divisions are: CYGWIN -- for Cygwin-only stuff. WIN32_NATIVE -- Win32 native OS-level stuff (files, process, etc.). Applies whenever linking against the native C libraries -- i.e. all compilations with VC++ and with MINGW, but never Cygwin. HAVE_X_WINDOWS -- for X Windows (regardless of whether under MS Win) HAVE_MS_WINDOWS -- MS Windows native windowing system (anything related to the appearance of the graphical screen). May or may not apply to any of VC++, MINGW, Cygwin. Finally, there's also the MINGW build environment, which uses GCC \(similar to Cygwin), but native MS Windows libraries rather than a POSIX emulation layer (the Cygwin approach). This environment defines WIN32_NATIVE, but also defines MINGW, which is used mostly because uses its own include files (related to Cygwin), which have a few things messed up. Formerly, we had a whole host of flags. Here's the conversion, for porting code from GNU Emacs and such: WINDOWSNT -> WIN32_NATIVE WIN32 -> WIN32_NATIVE _WIN32 -> WIN32_NATIVE HAVE_WIN32 -> WIN32_NATIVE DOS_NT -> WIN32_NATIVE HAVE_NTGUI -> WIN32_NATIVE, unless it ends up already bracketed by this HAVE_FACES -> always true MSDOS -> determine whether this code is really specific to MS-DOS (and not Windows -- e.g. DJGPP code); if so, delete the code; otherwise, convert to WIN32_NATIVE (we do not support MS-DOS w/DOS Extender under XEmacs) __CYGWIN__ -> CYGWIN __CYGWIN32__ -> CYGWIN __MINGW32__ -> MINGW */ #include "win32-native.h" /* In case non-Microsoft compiler is used, we fake _MSC_VER */ #ifndef _MSC_VER #define _MSC_VER 1 #endif /* Stuff from old nt/config.h: */ #define NTHEAP_PROBE_BASE 1 #define LISP_FLOAT_TYPE #ifdef HAVE_X_WINDOWS #define HAVE_XREGISTERIMINSTANTIATECALLBACK #define THIS_IS_X11R6 #define HAVE_XMU #define HAVE_XLOCALE_H #define HAVE_X11_LOCALE_H #define GETTIMEOFDAY_ONE_ARGUMENT #define LWLIB_USES_ATHENA #define LWLIB_MENUBARS_LUCID #define LWLIB_SCROLLBARS_LUCID #define LWLIB_DIALOGS_ATHENA #define LWLIB_TABS_LUCID #define LWLIB_WIDGETS_ATHENA /* These are what gets defined under Cygwin */ #define _BSD_SOURCE 1 #define _SVID_SOURCE 1 #define X_LOCALE 1 #define NARROWPROTO 1 #endif /* HAVE_X_WINDOWS */ #define HAVE_LOCALE_H #define STDC_HEADERS #define HAVE_LONG_FILE_NAMES #define HAVE_TIMEVAL #define HAVE_TZNAME #define HAVE_H_ERRNO #define HAVE_CLOSEDIR #define HAVE_DUP2 #define HAVE_EXECVPE #define HAVE_FMOD #define HAVE_FREXP #define HAVE_FTIME #define HAVE_GETCWD #define HAVE_GETHOSTNAME #define HAVE_GETPAGESIZE #define getpagesize() 4096 #define HAVE_GETTIMEOFDAY #define HAVE_LINK #define HAVE_LOGB #define HAVE_MKDIR #define HAVE_MKTIME #define HAVE_RENAME #define HAVE_RMDIR #define HAVE_SELECT #define HAVE_STRERROR #define HAVE_SOCKETS #ifdef DEBUG_XEMACS #define USE_ASSERTIONS #define MEMORY_USAGE_STATS #endif /* DEBUG_XEMACS */ #define HAVE_DRAGNDROP #define SIZEOF_SHORT 2 #define SIZEOF_INT 4 #define SIZEOF_LONG 4 #define SIZEOF_LONG_LONG 0 #define SIZEOF_VOID_P 4 typedef int mode_t; typedef int pid_t; typedef int uid_t; typedef int gid_t; typedef int pid_t; typedef int ssize_t; /* If your system uses COFF (Common Object File Format) then define the preprocessor symbol "COFF". */ #define COFF /* define MAIL_USE_FLOCK if the mailer uses flock to interlock access to /usr/spool/mail/$USER. The alternative is that a lock file named /usr/spool/mail/$USER.lock. */ #define MAIL_USE_POP #define HAVE_LOCKING #define MAIL_USE_LOCKING /* See unexnt.c */ #if (_MSC_VER >= 1100) && !defined(PDUMP) #define DUMP_SEPARATE_SECTION #endif #ifdef DUMP_SEPARATE_SECTION #pragma data_seg("xdata") #pragma bss_seg("xdata") #endif #ifdef emacs /* intl-auto-encap-win32.[ch] assumes _WIN32_WINNT>=0x0400 We don't want this set when building command-line helpers in lib-src */ # ifndef _WIN32_WINNT # define _WIN32_WINNT 0x0400 # endif #endif /* The VC++ (5.0, at least) headers treat WINVER non-existent as 0x0400 */ #if defined (WINVER) && WINVER < 0x0400 # undef WINVER # define WINVER 0x0400 #endif /* Vararg routines, main(), and callback routines for library functions (qsort(), signal(), etc.) need to be __cdecl if we use the fastcall convention by default (a good idea, since it speeds things up). #### Why do they have to complain about this? Why not just do the right thing automatically? Prefix with X because plain CDECL is already defined by the VC++ header files. */ #define XCDECL __cdecl /* MSVC 6.0 has a mechanism to declare functions which never return */ #if (_MSC_VER >= 1200) #define DOESNT_RETURN __declspec(noreturn) void #define DECLARE_DOESNT_RETURN(decl) __declspec(noreturn) extern void decl #define DECLARE_DOESNT_RETURN_GCC_ATTRIBUTE_SYNTAX_SUCKS(decl,str,idx) \ __declspec(noreturn) extern void __cdecl decl PRINTF_ARGS(str,idx) #else #define DECLARE_DOESNT_RETURN_GCC_ATTRIBUTE_SYNTAX_SUCKS(decl,str,idx) \ extern void __cdecl decl PRINTF_ARGS(str,idx) #endif /* MSVC 6.0 */ /* MSVC warnings no-no crap. When adding one to this section, 1. Think twice 2. Insert textual description of the warning. 3. Think twice. Undo still works */ #if (_MSC_VER >= 800) /* 'expression' : signed/unsigned mismatch */ /* #pragma warning ( disable : 4018 ) */ /* unnamed type definition in parentheses (Martin added a pedantically correct definition of ALIGNOF, which generates temporary anonymous structures, and MSVC complains) */ #pragma warning ( disable : 4116 ) #endif /* compiler understands #pragma warning*/ /* MSVC version >= 2.x without /Za supports __inline */ #if (_MSC_VER < 900) || defined (__STDC__) # define inline #else # define inline __inline #endif /* lisp.h defines abort() as a macro. therefore, we must include all files that contain prototypes for abort() before then. */ #include <../include/process.h>