Mercurial > hg > xemacs-beta
annotate src/sysdep.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 | 5bb998bf84bd |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* System-dependent prototypes |
| 2 Copyright (C) 1985, 1993, 1994 Free Software Foundation, Inc. | |
| 814 | 3 Copyright (C) 2001, 2002 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: FSF 19.30. Split out of sysdep.c/emacs.c. */ | |
| 23 | |
| 440 | 24 #ifndef INCLUDED_sysdep_h_ |
| 25 #define INCLUDED_sysdep_h_ | |
| 428 | 26 |
| 27 #include <setjmp.h> | |
| 28 | |
| 442 | 29 #ifdef PDUMP |
| 30 int pdump_read_file (char **pdump_start_pos, size_t *pdump_length); | |
| 31 #endif | |
| 32 | |
| 428 | 33 int eight_bit_tty (struct device *d); |
| 34 | |
| 35 void stuff_char (struct console *con, int c); | |
| 36 | |
| 37 void init_baud_rate (struct device *d); | |
| 38 | |
| 39 void set_exclusive_use (int fd); | |
| 40 | |
| 41 void set_descriptor_non_blocking (int fd); | |
| 42 | |
| 43 int get_pty_max_bytes (int fd); | |
| 867 | 44 Ibyte get_eof_char (int fd); |
| 428 | 45 |
| 46 /* Wait for subprocess with process id `pid' to terminate and | |
| 47 make sure it will get eliminated (not remain forever as a zombie) */ | |
| 48 void wait_for_termination (int pid); | |
| 49 | |
| 50 /* flush any pending output | |
| 51 * (may flush input as well; it does not matter the way we use it) | |
| 52 */ | |
| 53 void flush_pending_output (int channel); | |
| 54 | |
| 55 void child_setup_tty (int out); | |
| 56 | |
| 57 /* Suspend the Emacs process; give terminal to its superior. */ | |
| 58 void sys_suspend (void); | |
| 59 /* Suspend a process if possible; give terminal to its superior. */ | |
| 60 void sys_suspend_process (int process); | |
| 61 | |
| 62 void request_sigio (void); | |
| 63 void unrequest_sigio (void); | |
| 64 | |
| 1928 | 65 BEGIN_C_DECLS |
| 66 | |
| 4029 | 67 #ifndef WIN32_NATIVE |
| 68 extern char **environ; | |
| 69 #endif | |
| 70 | |
| 428 | 71 void stop_interrupts (void); |
| 72 void start_interrupts (void); | |
| 1927 | 73 MODULE_API void slow_down_interrupts (void); |
| 74 MODULE_API void speed_up_interrupts (void); | |
| 428 | 75 void init_poll_for_quit (void); |
| 76 | |
| 1928 | 77 END_C_DECLS |
| 78 | |
| 428 | 79 /* Used so that signals can break out of system calls that aren't |
| 80 naturally interruptible. */ | |
| 81 | |
| 82 extern JMP_BUF break_system_call_jump; | |
| 83 extern volatile int can_break_system_calls; | |
| 84 | |
| 85 /* Call these functions if you want to change some terminal parameter -- | |
| 86 reset the console, change the parameter, and init it again. */ | |
| 87 void init_one_console (struct console *c); | |
| 88 void reset_one_console (struct console *c); | |
| 89 void init_one_device (struct device *d); | |
| 90 void reset_one_device (struct device *d); | |
| 91 | |
| 92 /* Prepare all terminals for exiting Emacs; move the cursor to the | |
| 93 bottom of the frame, turn off special modes, etc. Called at exit. | |
| 94 This calls reset_one_console() on all consoles and does some other | |
| 95 stuff (e.g. fix the foreground pgroup). */ | |
| 96 | |
| 97 void reset_all_consoles (void); | |
| 98 | |
| 99 /* Call these functions if you are going to temporarily exit back to | |
| 100 the shell (e.g. when suspending). This calls reset_one_console() | |
| 101 on the initial console and does some other stuff (e.g. fix the | |
| 102 foreground pgroup). */ | |
| 103 | |
| 104 void reset_initial_console (void); | |
| 105 void reinit_initial_console (void); | |
| 106 | |
| 107 /* We muck around with our process group. This function needs | |
| 108 to be called at startup. The rest of the mucking is done as | |
| 109 part of the functions reset_all_consoles(), reset_initial_console(), | |
| 110 and reinit_initial_console(). */ | |
| 111 | |
| 112 void init_process_group (void); | |
| 113 void munge_tty_process_group (void); | |
| 114 void unmunge_tty_process_group (void); | |
| 115 | |
| 116 void disconnect_controlling_terminal (void); | |
| 117 | |
| 118 /* Return nonzero if safe to use tabs in output. | |
| 119 At the time this is called, init_sys_modes has not been done yet. */ | |
| 120 int tabs_safe_p (struct device *d); | |
| 121 | |
| 122 /* Get terminal size from system. | |
| 123 If zero or a negative number is stored, the value is not valid. */ | |
| 124 void get_tty_device_size (struct device *d, int *widthp, int *heightp); | |
| 125 /* Set the logical window size associated with descriptor FD */ | |
| 126 int set_window_size (int fd, int height, int width); | |
| 127 | |
| 128 /* Set up the proper status flags for use of a pty. */ | |
| 129 void setup_pty (int fd); | |
| 130 | |
| 131 /* Return the address of the start of the text segment prior to unexec. */ | |
| 132 char *start_of_text (void); | |
| 133 /* Return the address of the start of the data segment prior to unexec. */ | |
| 134 void *start_of_data (void); | |
| 135 | |
| 136 /* Get_system_name returns as its value a string for system-name to return. */ | |
| 137 void init_system_name (void); | |
| 138 | |
| 771 | 139 #ifdef WIN32_NATIVE |
| 140 void *sbrk (unsigned long increment); | |
| 428 | 141 #endif |
| 142 | |
| 801 | 143 Bytecount total_data_usage (void); |
| 144 | |
| 440 | 145 #endif /* INCLUDED_sysdep_h_ */ |