Mercurial > hg > xemacs-beta
annotate 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 |
| rev | line source |
|---|---|
| 428 | 1 /* Synched up with: FSF 19.31. */ |
| 2 | |
| 3 /* For building XEmacs under SunOS 4.1.* with static libraries. */ | |
| 4 | |
| 5 #ifndef _S_SUNOS4_H_ | |
| 6 #define _S_SUNOS4_H_ | |
| 7 | |
| 8 #include "bsd4-2.h" | |
| 9 | |
| 10 #ifndef SUNOS4 | |
| 11 #define SUNOS4 | |
| 12 #endif | |
| 13 | |
| 14 #if 0 /* This may have been needed for an earlier version of Sun OS 4. | |
| 15 It seems to cause warnings in 4.0.3 and 4.1. */ | |
| 16 #define O_NDELAY FNDELAY /* Non-blocking I/O (4.2 style) */ | |
| 17 #endif | |
| 18 | |
| 19 #ifdef NOT_C_CODE | |
| 20 /* The new sunOS unexec eliminates the need for a custom crt0.o, so we | |
| 21 can just let the compiler invoke the linker and don't have to guess | |
| 22 what options it might have passed it. */ | |
| 23 # define ORDINARY_LINK | |
| 24 # define START_FILES | |
| 25 # define LD_CMD $(CC) | |
| 26 # ifndef LD_SWITCH_SYSTEM | |
| 27 # define LD_SWITCH_SYSTEM "-Bstatic" | |
| 28 # endif | |
| 29 # define UNEXEC "unexsunos4.o" | |
| 30 #endif /* NOT_C_CODE */ | |
| 31 | |
| 32 #define RUN_TIME_REMAP | |
| 33 | |
| 34 /* these don't matter, but we have to define something to keep | |
| 35 sysdep.c from introducing bogus symbols */ | |
| 36 #define TEXT_START 0 | |
| 37 #define DATA_START 0 | |
| 38 | |
| 39 /* #### XEmacs: #define of SYSTEM_MALLOC removed. Is this OK? FSF says: | |
| 40 | |
| 41 In SunOS 4.1, a static function called by tzsetwall reportedly | |
| 42 clears the byte just past an eight byte region it mallocs, corrupting | |
| 43 GNU malloc's memory pool. But Sun's malloc doesn't seem to mind. */ | |
| 44 | |
| 45 /* XEmacs: additions for proper prototyping. */ | |
| 46 #ifndef NOT_C_CODE | |
| 47 #ifdef __STDC__ | |
| 48 /* Sun's headers are categorically losing. | |
| 49 Mly uses broken-sun.h to get the protos for this, but lcc provides all | |
| 50 of the prototypes for the ANSI routines. So I'm just going to put the | |
| 51 protos of the non-ANSI routines that we use here (I guess that would | |
| 52 be things that are Posix but not ANSI?) You're in a maze of twisty | |
| 53 little standards, all alike... | |
| 54 */ | |
| 55 /* Since lcc is not going to be heavily used anymore if it ever was, I'm | |
| 56 putting broken-sun.h back in. */ | |
| 57 /* Since Gcc 2.8 appears to have fixed the problem, I'm conditionalizing */ | |
| 58 /* this ugly hack. */ | |
| 59 | |
| 60 #if defined (__GNUC__) | |
| 61 #if defined (__GNUC_MINOR__) | |
| 62 #if ((__GNUC__ == 2) && (__GNUC_MINOR__ > 7)) || ((__GNUC__ > 2)) | |
| 63 /* Don't include for gcc 2.8.0*/ | |
| 64 #else | |
| 65 #include "../broken-sun.h" | |
| 66 #endif | |
| 67 | |
| 68 #else /* __GNUC_MINOR__ is undefined */ | |
| 69 #include "../broken-sun.h" | |
| 70 #endif | |
| 71 | |
| 72 #else | |
| 73 /* Not GNU C */ | |
| 74 #endif | |
| 75 | |
| 76 extern char *strdup (); | |
| 77 extern char *ttyname (int); | |
| 78 extern void tzsetwall (void); | |
| 79 extern int getpagesize (void); | |
| 80 | |
| 81 #include <memory.h> | |
| 82 #ifdef __SUNPRO_C | |
| 83 /* Suppress zillions of warnings from outdated SunOS4 prototypes */ | |
| 84 /* Bother! Sun can't even get the arg types right. */ | |
| 85 #include <string.h> | |
| 86 #define memset(a,b,c) memset((char*) (a), b, c) | |
| 87 #define memcpy(a,b,c) memcpy((char*) (a), (char*) (b), c) | |
| 88 #define memcmp(a,b,c) memcmp((char*) (a), (char*) (b), c) | |
| 89 #define memchr(a,b,c) memchr((char*) (a), b, c) | |
| 90 void * __builtin_alloca(int); | |
| 91 #ifdef HAVE_X_WINDOWS | |
| 92 #include <X11/Xlib.h> | |
| 93 #define XFree(p) XFree((char*)(p)) | |
| 94 #endif /* X Windows */ | |
| 95 #endif /* __SUNPRO_C */ | |
| 96 | |
| 97 #endif /* __STDC__ */ | |
| 98 | |
| 99 # ifdef __GNUC__ | |
| 100 /* XEmacs addition: */ | |
| 101 /* gcc has the bug that it claims to conform to the ANSI C standard | |
| 102 (which is what setting __STDC__ to 1 means) but does not necessarily | |
| 103 provide all of the library routines which the standard requires of a | |
| 104 conforming compiler -- such as memmove. The other Sun ANSI compilers | |
| 105 (Sun's acc and Lucid's lcc) do not have this bug. */ | |
| 106 # define memmove(to, from, size) bcopy ((char *) (from), (char *) (to), (size)) | |
| 107 /* We must define mkdir with this arg prototype | |
| 108 to match GCC's fixed stat.h. */ | |
| 109 # define MKDIR_PROTOTYPE \ | |
| 110 int mkdir (const char *dpath, unsigned short dmode) | |
| 111 # endif /* __GNUC__ */ | |
| 112 | |
| 551 | 113 /* ANSI C requires that realloc accept a null pointer argument, |
| 114 but ancient implementations such as SunOS 4 don't allow this. | |
| 115 We redefine realloc here so that the source code can be written to | |
| 116 use the ANSI C API. */ | |
| 117 #include <sys/types.h> | |
| 118 #ifdef __GNUC__ | |
| 119 inline /* Suppress warning: realloc_accepting_nullptr defined but not used */ | |
| 120 #endif | |
| 121 static void* | |
| 122 realloc_accepting_nullptr (void *ptr, size_t size) | |
| 123 { | |
| 124 extern char *realloc (); | |
| 125 extern char *malloc (); | |
| 126 return ptr ? (void *) realloc (ptr, size) : (void *) malloc (size); | |
| 127 } | |
| 128 #define realloc(ptr, size) realloc_accepting_nullptr (ptr, size) | |
| 129 | |
| 428 | 130 #endif /* C_CODE */ |
| 131 | |
| 132 #endif /* _S_SUNOS4_H_ */ |