Mercurial > hg > xemacs-beta
view src/systime.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
/* systime.h - System-dependent definitions for time manipulations. Copyright (C) 1992, 1993, 1994 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.30. */ #ifndef INCLUDED_systime_h_ #define INCLUDED_systime_h_ #ifdef TIME_WITH_SYS_TIME # include <sys/time.h> # include <time.h> #else # ifdef HAVE_SYS_TIME_H # include <sys/time.h> # else # include <time.h> # endif #endif #ifdef HAVE_SYS_TIMES_H /* Need this for struct tms */ # include <sys/times.h> #endif /* select() is supposed to be (Unix98) defined in sys/time.h, but FreeBSD and Irix 5 put it in unistd.h instead. If we have it, including it can't hurt. */ #ifdef HAVE_UNISTD_H #include <unistd.h> #endif #ifdef WIN32_NATIVE /* This defines struct timeval */ #include <winsock.h> struct timezone { int tz_minuteswest; /* minutes west of Greenwich */ int tz_dsttime; /* type of dst correction */ }; #ifdef HAVE_X_WINDOWS /* Provides gettimeofday etc */ #include <X11/Xw32defs.h> #include <X11/Xos.h> #else /* X11R6 on NT provides the single parameter version of this command */ void gettimeofday (struct timeval *, struct timezone *); #endif /* HAVE_X_WINDOWS */ #endif /* WIN32_NATIVE */ /* struct utimbuf */ #ifdef HAVE_UTIME # include <utime.h> #endif #ifdef WIN32_NATIVE # include <sys/utime.h> #ifdef emacs int mswindows_utime (Lisp_Object path, struct utimbuf *thymes); #endif #endif #if defined(HAVE_TZNAME) && !defined(WIN32_NATIVE) && !defined(CYGWIN) #ifndef tzname /* For SGI. */ extern char *tzname[]; /* RS6000 and others want it this way. */ #endif #endif /* On some configurations (hpux8.0, X11R4), sys/time.h and X11/Xos.h disagree about the name of the guard symbol. */ #ifdef HPUX #ifdef _STRUCT_TIMEVAL #ifndef __TIMEVAL__ #define __TIMEVAL__ #endif #endif #endif /* EMACS_TIME is the type to use to represent temporal intervals. At one point this was 'struct timeval' on some systems, int on others. But this is stupid. Other things than select() code like to manipulate time values, and so microsecond precision should be maintained. Separate typedefs and conversion functions are provided for select(). EMACS_SECS (TIME) is an rvalue for the seconds component of TIME. EMACS_SET_SECS (TIME, SECONDS) sets that to SECONDS. EMACS_USECS (TIME) is an rvalue for the microseconds component of TIME. EMACS_SET_USECS (TIME, MICROSECONDS) sets that to MICROSECONDS. Note that all times are returned in "normalized" format (i.e. the usecs value is in the range 0 <= value < 1000000) and are assumed to be passed in in this format. EMACS_SET_SECS_USECS (TIME, SECS, USECS) sets both components of TIME. EMACS_GET_TIME (TIME) stores the current system time in TIME, which should be an lvalue. set_file_times (PATH, ATIME, MTIME) changes the last-access and last-modification times of the file named PATH to ATIME and MTIME, which are EMACS_TIMEs. EMACS_NORMALIZE_TIME (TIME) coerces TIME into normalized format. EMACS_ADD_TIME (DEST, SRC1, SRC2) adds SRC1 to SRC2 and stores the result in DEST. Either or both may be negative. EMACS_SUB_TIME (DEST, SRC1, SRC2) subtracts SRC2 from SRC1 and stores the result in DEST. Either or both may be negative. EMACS_TIME_NEG_P (TIME) is true iff TIME is negative. EMACS_TIME_EQUAL (TIME1, TIME2) is true iff TIME1 is the same as TIME2. EMACS_TIME_GREATER (TIME1, TIME2) is true iff TIME1 is greater than TIME2. EMACS_TIME_EQUAL_OR_GREATER (TIME1, TIME2) is true iff TIME1 is greater than or equal to TIME2. */ #ifdef HAVE_TIMEVAL #define EMACS_SELECT_TIME struct timeval #define EMACS_TIME_TO_SELECT_TIME(time, select_time) ((select_time) = (time)) #else /* not HAVE_TIMEVAL */ struct timeval { long tv_sec; /* seconds */ long tv_usec; /* microseconds */ }; #define EMACS_SELECT_TIME int #define EMACS_TIME_TO_SELECT_TIME(time, select_time) \ EMACS_TIME_TO_INT (time, select_time) #endif /* not HAVE_TIMEVAL */ #define EMACS_TIME_TO_INT(time, intvar) \ do { \ EMACS_TIME tmptime = time; \ \ if (tmptime.tv_usec > 0) \ (intvar) = tmptime.tv_sec + 1; \ else \ (intvar) = tmptime.tv_sec; \ } while (0) #define EMACS_TIME struct timeval #define EMACS_SECS(time) ((time).tv_sec + 0) #define EMACS_USECS(time) ((time).tv_usec + 0) #define EMACS_SET_SECS(time, seconds) ((time).tv_sec = (seconds)) #define EMACS_SET_USECS(time, microseconds) ((time).tv_usec = (microseconds)) #if !defined (HAVE_GETTIMEOFDAY) int gettimeofday (struct timeval *, void *); #endif /* On SVR4, the compiler may complain if given this extra BSD arg. */ #ifdef GETTIMEOFDAY_ONE_ARGUMENT #define EMACS_GETTIMEOFDAY(time) gettimeofday(time) #else #define EMACS_GETTIMEOFDAY(time) gettimeofday(time,0) #endif /* According to the Xt sources, some NTP daemons on some systems may return non-normalized values. */ #define EMACS_GET_TIME(time) \ do { \ EMACS_GETTIMEOFDAY (&(time)); \ EMACS_NORMALIZE_TIME (time); \ } while (0) #define EMACS_NORMALIZE_TIME(time) \ do { \ while ((time).tv_usec >= 1000000) \ { \ (time).tv_usec -= 1000000; \ (time).tv_sec++; \ } \ while ((time).tv_usec < 0) \ { \ (time).tv_usec += 1000000; \ (time).tv_sec--; \ } \ } while (0) #define EMACS_ADD_TIME(dest, src1, src2) \ do { \ (dest).tv_sec = (src1).tv_sec + (src2).tv_sec; \ (dest).tv_usec = (src1).tv_usec + (src2).tv_usec; \ EMACS_NORMALIZE_TIME (dest); \ } while (0) #define EMACS_SUB_TIME(dest, src1, src2) \ do { \ (dest).tv_sec = (src1).tv_sec - (src2).tv_sec; \ (dest).tv_usec = (src1).tv_usec - (src2).tv_usec; \ EMACS_NORMALIZE_TIME (dest); \ } while (0) #define EMACS_TIME_NEG_P(time) ((long)(time).tv_sec < 0) #define EMACS_TIME_EQUAL(time1, time2) \ ((time1).tv_sec == (time2).tv_sec && \ (time1).tv_usec == (time2).tv_usec) #define EMACS_TIME_GREATER(time1, time2) \ ((time1).tv_sec > (time2).tv_sec || \ ((time1).tv_sec == (time2).tv_sec && \ (time1).tv_usec > (time2).tv_usec)) #define EMACS_TIME_EQUAL_OR_GREATER(time1, time2) \ ((time1).tv_sec > (time2).tv_sec || \ ((time1).tv_sec == (time2).tv_sec && \ (time1).tv_usec >= (time2).tv_usec)) #define EMACS_SET_SECS_USECS(time, secs, usecs) \ (EMACS_SET_SECS (time, secs), EMACS_SET_USECS (time, usecs)) #ifdef emacs int set_file_times (Lisp_Object path, EMACS_TIME atime, EMACS_TIME mtime); void get_process_times (double *user_time, double *system_time, double *real_time); Ibyte *qxe_ctime (const time_t *value); #endif #ifdef WIN32_NATIVE /* setitimer emulation for Win32 (see win32.c) */ struct itimerval { struct timeval it_value; struct timeval it_interval; }; #define ITIMER_REAL 1 #define ITIMER_PROF 2 #endif /* WIN32_NATIVE */ #if defined (WIN32_NATIVE) || defined (CYGWIN) int mswindows_setitimer (int kind, const struct itimerval *itnew, struct itimerval *itold); #endif /* defined (WIN32_NATIVE) || defined (CYGWIN) */ /* #### Move this comment elsewhere when we figure out the place. "qxe" is a unique prefix used to identify encapsulations of standard library functions. We used to play pre-processing games but in general this leads to nothing but trouble because someone first encountering the code will have no idea that what appears to be a call to a library function has actually been redefined to be a call somewhere else. This is doubly true when the redefinition occurs in out-of-the way s+m files and only on certainly systems. The name "qxe" was chosen because it is a unique string that is not going to be found anywhere else in the sources (unlike, for example, the prefixes "xemacs" or "sys") and is easy to type. Alternative names are certainly possible, and suggestions are welcome. By making the encapsulation explicit we might be making the code that uses is slightly less pretty, but this is more than compensated for by the huge increase in clarity. "Standard library function" can refer to any function in any standard library. If we are explicitly changing the semantics (e.g. Mule-encapsulating), we should use an extended version of the prefix, e.g. perhaps "qxe_xlat_" for functions that Mule- encapsulate, or "qxe_retry_" for functions that automatically retry a system call interrupted by EINTR. In general, if there is no prefix extension, it means the function is trying to provide (more or less) the same semantics as the standard library function; but be aware that the reimplementation may be incomplete or differ in important respects. This is especially the case when attempts are made to implement Unix functions on MS Windows. (The comment on the particular encapsulation should describe what standard function is being emulated, if this is not obvious, and what the differences, if any, from that standard function are.) An example of this is the qxe_setitimer() function. This attempts to emulate the POSIX (Unix98?) standard setitimer(), as found on all modern versions of Unix. Normally, we just call the system- provided setitimer() function. When emulated on MS Windows and Cygwin, however, the ITNEW and ITOLD values cannot be different from each other if both are non-zero, due to limitations in the underlying multimedia-timer API. By simply using setitimer() with preprocessor tricks, a programmer would almost have to be a mind-reader to figure this out. With the explicit encapsulation, a programmer need only look at the definition of qxe_setitimer() to see what its semantics are. */ int qxe_setitimer (int kind, const struct itimerval *itnew, struct itimerval *itold); #endif /* INCLUDED_systime_h_ */