Mercurial > hg > xemacs-beta
view src/s/sunos4-0.h @ 4477:e34711681f30
Don't determine whether to call general device-type code at startup,
rather decide in the device-specific code itself.
lisp/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* startup.el (command-line):
Use initial-device-type, not initial-window-system; just call
#'make-device, leave the special behaviour to be done the first
time a console type is initialised to be decided on by the
respective console code.
* x-init.el (x-app-defaults-directory): Declare that it should be
bound.
(x-define-dead-key): Have the macro take a DEVICE argument.
(x-initialize-compose): Have the function take a DEVICE argument,
and use it when checking if various keysyms are available on the
keyboard.
(x-initialize-keyboard): Have the function take a DEVICE argument,
allowing device-specific keyboard initialisation.
(make-device-early-x-entry-point-called-p): New.
(make-device-late-x-entry-point-called-p): New. Rename
pre-x-win-initted, x-win-initted.
(make-device-early-x-entry-point): Rename init-pre-x-win, take the
call to make-x-device out (it should be called from the
device-creation code, not vice-versa).
(make-device-late-x-entry-point): Rename init-post-x-win, have it
take a DEVICE argument, use that DEVICE argument when working out
what device-specific things need doing. Don't use
create-console-hook in core code.
* x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument;
use it.
* x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it.
* mule/mule-x-init.el: Remove #'init-mule-x-win, an empty
function.
* tty-init.el (make-device-early-tty-entry-point-called-p): New.
Rename pre-tty-win-initted.
(make-device-early-tty-entry-point): New.
Rename init-pre-tty-win.
(make-frame-after-init-entry-point): New.
Rename init-post-tty-win to better reflect when it's called.
* gtk-init.el (gtk-early-lisp-options-file): New.
Move this path to a documented variable.
(gtk-command-switch-alist): Wrap the docstring to fewer than 79
columns.
(make-device-early-gtk-entry-point-called-p): New.
(make-device-late-gtk-entry-point-called-p): New.
Renamed gtk-pre-win-initted, gtk-post-win-initted to these.
(make-device-early-gtk-entry-point): New.
(make-device-late-gtk-entry-point): New.
Renamed init-pre-gtk-win, init-post-gtk-win to these.
Have make-device-late-gtk-entry-point take a device argument, and use
it; have make-device-early-gtk-entry-point load the GTK-specific
startup code, instead of doing that in C.
(init-gtk-win): Deleted, functionality moved to the GTK device
creation code.
(gtk-define-dead-key): Have it take a DEVICE argument; use this
argument.
(gtk-initialize-compose): Ditto.
* coding.el (set-terminal-coding-system):
Correct the docstring; the function isn't broken.
src/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* redisplay.c (Vinitial_device_type): New.
(Vinitial_window_system): Removed.
Rename initial-window-system to initial-device type, making it
a stream if we're noninteractive. Update its docstring.
* device-x.c (Qmake_device_early_x_entry_point,
Qmake_device_late_x_entry_point): New.
Rename Qinit_pre_x_win, Qinit_post_x_win.
(x_init_device): Call #'make-device-early-x-entry-point earlier,
now we rely on it to find the application class and the
app-defaults directory.
(x_finish_init_device): Call #'make-device-late-x-entry-point with
the created device.
(Vx_app_defaults_directory): Always make this available, to
simplify code in x-init.el.
* device-tty.c (Qmake_device_early_tty_entry_point): New.
Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to
frame-tty.c as Qmake_frame_after_init_entry_point.
(tty_init_device): Call #'make-device-early-tty-entry-point before
doing anything.
* frame-tty.c (Qmake_frame_after_init_entry_point): New.
* frame-tty.c (tty_after_init_frame): Have it call the
better-named #'make-frame-after-init-entry-point function
instead of #'init-post-tty-win (since it's called after frame, not
device, creation).
* device-msw.c (Qmake_device_early_mswindows_entry_point,
Qmake_device_late_mswindows_entry_point): New.
Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win.
(mswindows_init_device): Call
#'make-device-early-mswindows-entry-point here, instead of having
its predecessor call us.
(mswindows_finish_init_device): Call
#'make-device-early-mswindows-entry-point, for symmetry with the
other device types (though it's an empty function).
* device-gtk.c (Qmake_device_early_gtk_entry_point,
Qmake_device_late_gtk_entry_point): New.
Rename Qinit_pre_gtk_win, Qinit_post_gtk_win.
(gtk_init_device): Call #'make-device-early-gtk-entry-point; don't
load ~/.xemacs/gtk-options.el ourselves, leave that to lisp.
(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
with the created device as an argument.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 09 Jul 2008 20:46:22 +0200 |
parents | e9a3f8b4de53 |
children |
line wrap: on
line source
/* Synched up with: FSF 19.31. */ /* For building XEmacs under SunOS 4.1.* with static libraries. */ #ifndef _S_SUNOS4_H_ #define _S_SUNOS4_H_ #include "bsd4-2.h" #ifndef SUNOS4 #define SUNOS4 #endif #if 0 /* This may have been needed for an earlier version of Sun OS 4. It seems to cause warnings in 4.0.3 and 4.1. */ #define O_NDELAY FNDELAY /* Non-blocking I/O (4.2 style) */ #endif #ifdef NOT_C_CODE /* The new sunOS unexec eliminates the need for a custom crt0.o, so we can just let the compiler invoke the linker and don't have to guess what options it might have passed it. */ # define ORDINARY_LINK # define START_FILES # define LD_CMD $(CC) # ifndef LD_SWITCH_SYSTEM # define LD_SWITCH_SYSTEM "-Bstatic" # endif # define UNEXEC "unexsunos4.o" #endif /* NOT_C_CODE */ #define RUN_TIME_REMAP /* these don't matter, but we have to define something to keep sysdep.c from introducing bogus symbols */ #define TEXT_START 0 #define DATA_START 0 /* #### XEmacs: #define of SYSTEM_MALLOC removed. Is this OK? FSF says: In SunOS 4.1, a static function called by tzsetwall reportedly clears the byte just past an eight byte region it mallocs, corrupting GNU malloc's memory pool. But Sun's malloc doesn't seem to mind. */ /* XEmacs: additions for proper prototyping. */ #ifndef NOT_C_CODE #ifdef __STDC__ /* Sun's headers are categorically losing. Mly uses broken-sun.h to get the protos for this, but lcc provides all of the prototypes for the ANSI routines. So I'm just going to put the protos of the non-ANSI routines that we use here (I guess that would be things that are Posix but not ANSI?) You're in a maze of twisty little standards, all alike... */ /* Since lcc is not going to be heavily used anymore if it ever was, I'm putting broken-sun.h back in. */ /* Since Gcc 2.8 appears to have fixed the problem, I'm conditionalizing */ /* this ugly hack. */ #if defined (__GNUC__) #if defined (__GNUC_MINOR__) #if ((__GNUC__ == 2) && (__GNUC_MINOR__ > 7)) || ((__GNUC__ > 2)) /* Don't include for gcc 2.8.0*/ #else #include "../broken-sun.h" #endif #else /* __GNUC_MINOR__ is undefined */ #include "../broken-sun.h" #endif #else /* Not GNU C */ #endif extern char *strdup (); extern char *ttyname (int); extern void tzsetwall (void); extern int getpagesize (void); #include <memory.h> #ifdef __SUNPRO_C /* Suppress zillions of warnings from outdated SunOS4 prototypes */ /* Bother! Sun can't even get the arg types right. */ #include <string.h> #define memset(a,b,c) memset((char*) (a), b, c) #define memcpy(a,b,c) memcpy((char*) (a), (char*) (b), c) #define memcmp(a,b,c) memcmp((char*) (a), (char*) (b), c) #define memchr(a,b,c) memchr((char*) (a), b, c) void * __builtin_alloca(int); #ifdef HAVE_X_WINDOWS #include <X11/Xlib.h> #define XFree(p) XFree((char*)(p)) #endif /* X Windows */ #endif /* __SUNPRO_C */ #endif /* __STDC__ */ # ifdef __GNUC__ /* XEmacs addition: */ /* gcc has the bug that it claims to conform to the ANSI C standard (which is what setting __STDC__ to 1 means) but does not necessarily provide all of the library routines which the standard requires of a conforming compiler -- such as memmove. The other Sun ANSI compilers (Sun's acc and Lucid's lcc) do not have this bug. */ # define memmove(to, from, size) bcopy ((char *) (from), (char *) (to), (size)) /* We must define mkdir with this arg prototype to match GCC's fixed stat.h. */ # define MKDIR_PROTOTYPE \ int mkdir (const char *dpath, unsigned short dmode) # endif /* __GNUC__ */ /* ANSI C requires that realloc accept a null pointer argument, but ancient implementations such as SunOS 4 don't allow this. We redefine realloc here so that the source code can be written to use the ANSI C API. */ #include <sys/types.h> #ifdef __GNUC__ inline /* Suppress warning: realloc_accepting_nullptr defined but not used */ #endif static void* realloc_accepting_nullptr (void *ptr, size_t size) { extern char *realloc (); extern char *malloc (); return ptr ? (void *) realloc (ptr, size) : (void *) malloc (size); } #define realloc(ptr, size) realloc_accepting_nullptr (ptr, size) #endif /* C_CODE */ #endif /* _S_SUNOS4_H_ */