Mercurial > hg > xemacs-beta
view src/sysfile.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 | 804517e16990 |
children | 70921960b980 |
line wrap: on
line source
/* Copyright (C) 1995 Free Software Foundation, Inc. Copyright (C) 2000, 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: Not really in FSF. */ #ifndef INCLUDED_sysfile_h_ #define INCLUDED_sysfile_h_ /* The anonymous voice of the past says: Must come before sysfile.h So instead we just put it here. --ben */ #ifdef HAVE_LIBGEN_H #include <libgen.h> #endif #include <errno.h> #ifndef WIN32_NATIVE # include <sys/errno.h> /* <errno.h> does not always imply this */ #endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif #ifndef INCLUDED_FCNTL # define INCLUDED_FCNTL # include <fcntl.h> #endif /* INCLUDED_FCNTL */ /* The anonymous voice of the past says: In some systems loading it twice is suicidal. */ #ifndef INCLUDED_SYS_TYPES # define INCLUDED_SYS_TYPES # include <sys/types.h> /* some typedefs are used in sys/file.h */ #endif /* INCLUDED_SYS_TYPES */ #ifndef WIN32_NATIVE # include <sys/file.h> #endif #include <sys/stat.h> #if defined (WIN32_NATIVE) || defined (CYGWIN) # include <io.h> #endif #ifdef WIN32_NATIVE # include <direct.h> #else /* Some configuration files' definitions for the LOAD_AVE_CVT macro (like sparc.h's) use macros like FSCALE, defined here. */ # ifdef HAVE_GTK /* I hate GTK */ # undef MIN # undef MAX # endif /* HAVE_GTK */ # include <sys/param.h> /* As per Martin's recommendation, we do not include this. There was a comment stating that stuff from here was needed on NeXT, Cygwin, and sunplay.c. However, Cygwin includes this automatically from fcntl.h, and Martin says that a "conforming" system should never need this. We will put it back if necessary on systems requiring it. */ /* # include <sys/fcntl.h> */ #endif /* WIN32_NATIVE */ #ifndef STDERR_FILENO #define STDIN_FILENO 0 #define STDOUT_FILENO 1 #define STDERR_FILENO 2 #endif #ifndef O_RDONLY #define O_RDONLY 0 #endif #ifndef O_WRONLY #define O_WRONLY 1 #endif #ifndef O_RDWR #define O_RDWR 2 #endif /* file opening defaults */ #ifndef OPEN_BINARY #ifdef O_BINARY #define OPEN_BINARY O_BINARY #else #define OPEN_BINARY (0) #endif #endif #ifndef OPEN_TEXT #ifdef O_TEXT #define OPEN_TEXT O_TEXT #else #define OPEN_TEXT (0) #endif #endif #ifndef CREAT_MODE #ifdef WIN32_NATIVE #define CREAT_MODE (S_IREAD | S_IWRITE) #else #define CREAT_MODE (0666) #endif #endif #ifndef READ_TEXT #ifdef O_TEXT #define READ_TEXT "rt" #else #define READ_TEXT "r" #endif #endif #ifndef READ_BINARY #ifdef O_BINARY #define READ_BINARY "rb" #else #define READ_BINARY "r" #endif #endif #ifndef READ_PLUS_TEXT #ifdef O_TEXT #define READ_PLUS_TEXT "r+t" #else #define READ_PLUS_TEXT "r+" #endif #endif #ifndef READ_PLUS_BINARY #ifdef O_BINARY #define READ_PLUS_BINARY "r+b" #else #define READ_PLUS_BINARY "r+" #endif #endif #ifndef WRITE_TEXT #ifdef O_TEXT #define WRITE_TEXT "wt" #else #define WRITE_TEXT "w" #endif #endif #ifndef WRITE_BINARY #ifdef O_BINARY #define WRITE_BINARY "wb" #else #define WRITE_BINARY "w" #endif #endif #ifndef APPEND_TEXT #ifdef O_TEXT #define APPEND_TEXT "at" #else #define APPEND_TEXT "a" #endif #endif #ifndef APPEND_BINARY #ifdef O_BINARY #define APPEND_BINARY "ab" #else #define APPEND_BINARY "a" #endif #endif #ifndef O_NONBLOCK #ifdef O_NDELAY #define O_NONBLOCK O_NDELAY #else #define O_NONBLOCK 04000 #endif #endif #if !S_IRUSR # if S_IREAD # define S_IRUSR S_IREAD # else # define S_IRUSR 00400 # endif #endif #if !S_IWUSR # if S_IWRITE # define S_IWUSR S_IWRITE # else # define S_IWUSR 00200 # endif #endif #if !S_IXUSR # if S_IEXEC # define S_IXUSR S_IEXEC # else # define S_IXUSR 00100 # endif #endif #ifdef STAT_MACROS_BROKEN #undef S_ISBLK #undef S_ISCHR #undef S_ISDIR #undef S_ISFIFO #undef S_ISLNK #undef S_ISMPB #undef S_ISMPC #undef S_ISNWK #undef S_ISREG #undef S_ISSOCK #endif /* STAT_MACROS_BROKEN. */ #if !defined(S_ISBLK) && defined(S_IFBLK) #define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK) #endif #if !defined(S_ISCHR) && defined(S_IFCHR) #define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR) #endif #if !defined(S_ISDIR) && defined(S_IFDIR) #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif #if !defined(S_ISREG) && defined(S_IFREG) #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) #endif #if !defined(S_ISFIFO) && defined(S_IFIFO) #define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) #endif #if !defined(S_ISLNK) && defined(S_IFLNK) #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) #endif #if !defined(S_ISSOCK) && defined(S_IFSOCK) #define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) #endif #if !defined(S_ISMPB) && defined(S_IFMPB) /* V7 */ #define S_ISMPB(m) (((m) & S_IFMT) == S_IFMPB) #define S_ISMPC(m) (((m) & S_IFMT) == S_IFMPC) #endif #if !defined(S_ISNWK) && defined(S_IFNWK) /* HP/UX */ #define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK) #endif /* Client .c files should simply use `PATH_MAX'. */ #ifndef PATH_MAX # if defined (_MAX_PATH) /* MS Win -- and preferable to _POSIX_PATH_MAX, which is also defined */ # define PATH_MAX _MAX_PATH # elif defined (_POSIX_PATH_MAX) # define PATH_MAX _POSIX_PATH_MAX # elif defined (MAXPATHLEN) # define PATH_MAX MAXPATHLEN # else # define PATH_MAX 1024 # endif #endif /* The following definitions are needed under Windows, at least */ #ifndef X_OK # define X_OK 1 #endif #ifndef R_OK # define R_OK 4 #endif #ifndef D_OK # define D_OK 8 #endif #ifndef W_OK # define W_OK 2 #endif #ifndef F_OK # define F_OK 0 #endif #ifndef FD_CLOEXEC # define FD_CLOEXEC 1 #endif #ifdef emacs /* Emacs needs to use its own definitions of certain system calls on some systems (like SunOS 4.1 and USG systems, where the read system call is interruptible but Emacs expects it not to be; and under MULE, where all filenames need to be converted to external format). We used to play preprocessor games, but in the long run that just leads you to ruin. So we explicitly put in the new calls, even if the source gets marginally less pretty. Current files where we don't use retry_ or qxe_ versions: -- all sound files except ntplay.c (includes esd.c libsst.[ch] libst.h linuxplay.c sgiplay.c sunplay.c hpplay.c nas.c) -- all unex* files -- hftctl.c -- lib-src files */ ssize_t retry_read (int, void *, size_t); ssize_t retry_write (int, const void *, size_t); int retry_open (const Extbyte *path, int oflag, ...); int qxe_open (const Ibyte *path, int oflag, ...); int qxe_interruptible_open (const Ibyte *path, int oflag, int mode); int retry_close (int); Bytecount read_allowing_quit (int fildes, void *buf, Bytecount size); Bytecount write_allowing_quit (int fildes, const void *buf, Bytecount size); /* Now the stdio versions ... */ size_t retry_fread (void *, size_t, size_t, FILE *); size_t retry_fwrite (const void *, size_t, size_t, FILE *); FILE *retry_fopen (const Extbyte *path, const Char_ASCII *mode); FILE *qxe_fopen (const Ibyte *path, const Char_ASCII *mode); int retry_fclose (FILE *); /* encapsulations: file-information calls */ int qxe_access (const Ibyte *path, int mode); int qxe_eaccess (const Ibyte *path, int mode); int qxe_lstat (const Ibyte *path, struct stat *buf); int qxe_readlink (const Ibyte *path, Ibyte *buf, size_t bufsiz); int qxe_fstat (int fd, struct stat *buf); int qxe_stat (const Ibyte *path, struct stat *buf); Ibyte *qxe_realpath (const Ibyte *path, Ibyte resolved_path []); /* encapsulations: file-manipulation calls */ int qxe_chmod (const Ibyte *path, mode_t mode); #if defined (HAVE_LINK) int qxe_link (const Ibyte *existing, const Ibyte *new); #endif /* defined (HAVE_LINK) */ int qxe_rename (const Ibyte *old, const Ibyte *new); #if defined (HAVE_SYMLINK) int qxe_symlink (const Ibyte *name1, const Ibyte *name2); #endif /* defined (HAVE_SYMLINK) */ int qxe_unlink (const Ibyte *path); #endif /* emacs */ #ifndef HAVE_H_ERRNO extern int h_errno; #endif #ifndef HAVE_DUP2 int dup2 (int oldd, int newd); #endif #ifndef HAVE_STRERROR /* X11R6 defines strerror as a macro */ # ifdef strerror # undef strerror # endif const char *strerror (int); #endif /* DEFAULT_DIRECTORY_SEP is the default value of Vdirectory_sep_char. DIRECTORY_SEP is the currently preferred separator between elements of a path, when paths are canonicalized. DEVICE_SEP is the separator between devices and paths (might not be defined). SEPCHAR is the separator between paths in a path search string (e.g. the PATH environment variable). IS_DIRECTORY_SEP() returns true if the character is any directory separator (there might be more than one allowed on a system.). IS_DEVICE_SEP() returns true if the character is a device separator. IS_ANY_SEP() returns true if the character is a directory or device separator. */ #ifdef emacs /* We used to put some of this stuff in the s+m files for the various types of MS Windows, but that's disingenuous. The various definitions above were specifically created for MS Windows, and the "if not, then let's define the defaults" stuff (formerly in lisp.h) specifically knows about what is going to get redefined and how, and code all over the place that works with filenames has to conditionalize on WIN32_NATIVE anyway. It's much clearer if we put all related definitions in one place. (In fact, I discovered a number of bugs in the process.) S+M files should be used for simple on-off or multiple-choice settings, or possibly string settings. Anything that gets to the level of programming should be elsewhere, and anything that ends up having lots of complicated interactions scattered around in many files should be consolidated. */ #ifdef WIN32_NATIVE #define SEPCHAR ';' #define DEFAULT_DIRECTORY_SEP '\\' DECLARE_INLINE_HEADER (Ibyte sysfile_get_directory_sep (void)) { if (!CHARP (Vdirectory_sep_char) || (XCHAR (Vdirectory_sep_char) != '/' && XCHAR (Vdirectory_sep_char) != '\\')) { warn_when_safe (Qfile_name, Qerror, "`directory-sep-char' set to invalid %s: resetting to %c.", DEFAULT_DIRECTORY_SEP); Vdirectory_sep_char = make_char (DEFAULT_DIRECTORY_SEP); } return XCHAR (Vdirectory_sep_char); } #define DIRECTORY_SEP sysfile_get_directory_sep() #else /* not WIN32_NATIVE */ #define SEPCHAR ':' #define DEFAULT_DIRECTORY_SEP '/' #define DIRECTORY_SEP '/' #endif /* WIN32_NATIVE */ #if defined (WIN32_NATIVE) || defined (CYGWIN) #define DEVICE_SEP ':' #define IS_DEVICE_SEP(c) ((c) == DEVICE_SEP) DECLARE_INLINE_HEADER (int IS_DIRECTORY_SEP (Ichar c)) { return (c == '/' || c == '\\'); } DECLARE_INLINE_HEADER (int IS_ANY_SEP (Ichar c)) { return (c == '/' || c == '\\' || c == ':'); } #else /* not (defined (WIN32_NATIVE) || defined (CYGWIN)) */ #define IS_DEVICE_SEP(c) 0 #define IS_DIRECTORY_SEP(c) ((c) == DIRECTORY_SEP) #define IS_ANY_SEP(c) IS_DIRECTORY_SEP (c) #endif /* defined (WIN32_NATIVE) || defined (CYGWIN) */ #endif /* emacs */ #endif /* INCLUDED_sysfile_h_ */