Mercurial > hg > xemacs-beta
view src/device-tty.c @ 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 | 141c2920ea48 |
children | 16112448d484 e0db3c197671 |
line wrap: on
line source
/* TTY device functions. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1994, 1995 Free Software Foundation, Inc. Copyright (C) 1996 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 in FSF. */ /* Authors: Ben Wing and Chuck Thompson. */ #include <config.h> #include "lisp.h" #include "device-impl.h" #include "events.h" #include "faces.h" #include "frame.h" #include "lstream.h" #include "redisplay.h" #include "sysdep.h" #include "console-tty-impl.h" #include "console-stream.h" #include "sysfile.h" #include "syssignal.h" /* for SIGWINCH */ Lisp_Object Qmake_device_early_tty_entry_point; #ifdef NEW_GC static const struct memory_description tty_device_data_description_1 [] = { { XD_END } }; DEFINE_LRECORD_IMPLEMENTATION ("tty-device", tty_device, 1, /*dumpable-flag*/ 0, 0, 0, 0, 0, tty_device_data_description_1, Lisp_Tty_Device); #endif /* NEW_GC */ static void allocate_tty_device_struct (struct device *d) { #ifdef NEW_GC d->device_data = alloc_lrecord_type (struct tty_device, &lrecord_tty_device); #else /* not NEW_GC */ d->device_data = xnew_and_zero (struct tty_device); #endif /* not NEW_GC */ } static void tty_init_device (struct device *d, Lisp_Object UNUSED (props)) { struct console *con = XCONSOLE (DEVICE_CONSOLE (d)); Lisp_Object terminal_type = CONSOLE_TTY_DATA (con)->terminal_type; /* Run part of the elisp side of the TTY device initialization. The post-init is run in the tty_finish_init_device() method. */ call0 (Qmake_device_early_tty_entry_point); DEVICE_INFD (d) = CONSOLE_TTY_DATA (con)->infd; DEVICE_OUTFD (d) = CONSOLE_TTY_DATA (con)->outfd; allocate_tty_device_struct (d); init_baud_rate (d); switch (init_tty_for_redisplay (d, (char *) XSTRING_DATA (terminal_type))) { #if 0 case TTY_UNABLE_OPEN_DATABASE: suppress_early_error_handler_backtrace = 1; signal_error (Qio_error, "Can't access terminal information database", Qunbound); break; #endif case TTY_TYPE_UNDEFINED: suppress_early_error_handler_backtrace = 1; signal_error (Qio_error, "Terminal type undefined (or can't access database?)", terminal_type); break; case TTY_TYPE_INSUFFICIENT: suppress_early_error_handler_backtrace = 1; signal_error (Qio_error, "Terminal type not powerful enough to run Emacs", terminal_type); break; case TTY_SIZE_UNSPECIFIED: suppress_early_error_handler_backtrace = 1; signal_error (Qio_error, "Can't determine window size of terminal", Qunbound); break; case TTY_INIT_SUCCESS: break; default: ABORT (); } init_one_device (d); } #ifndef NEW_GC static void free_tty_device_struct (struct device *d) { if (d->device_data) xfree (d->device_data, void *); } static void tty_delete_device (struct device *d) { free_tty_device_struct (d); } #endif /* not NEW_GC */ #ifdef SIGWINCH static SIGTYPE tty_device_size_change_signal (int UNUSED (signo)) { int old_errno = errno; asynch_device_change_pending++; #ifdef HAVE_UNIXOID_EVENT_LOOP signal_fake_event (); #endif EMACS_REESTABLISH_SIGNAL (SIGWINCH, tty_device_size_change_signal); errno = old_errno; SIGRETURN; } /* frame_change_signal does nothing but set a flag that it was called. When redisplay is called, it will notice that the flag is set and call handle_pending_device_size_change to do the actual work. */ static void tty_asynch_device_change (void) { Lisp_Object devcons, concons; DEVICE_LOOP_NO_BREAK (devcons, concons) { int width, height; Lisp_Object tail; struct device *d = XDEVICE (XCAR (devcons)); struct console *con = XCONSOLE (DEVICE_CONSOLE (d)); if (!DEVICE_TTY_P (d)) continue; get_tty_device_size (d, &width, &height); if (width > 0 && height > 0 && (CONSOLE_TTY_DATA (con)->width != width || CONSOLE_TTY_DATA (con)->height != height)) { CONSOLE_TTY_DATA (con)->width = width; CONSOLE_TTY_DATA (con)->height = height; for (tail = DEVICE_FRAME_LIST (d); !NILP (tail); tail = XCDR (tail)) { struct frame *f = XFRAME (XCAR (tail)); /* We know the frame is tty because we made sure that the device is tty. */ change_frame_size (f, height, width, 1); } } } } #endif /* SIGWINCH */ static Lisp_Object tty_device_system_metrics (struct device *d, enum device_metrics m) { struct console *con = XCONSOLE (DEVICE_CONSOLE (d)); switch (m) { case DM_size_device: return Fcons (make_int (CONSOLE_TTY_DATA (con)->width), make_int (CONSOLE_TTY_DATA (con)->height)); default: /* No such device metric property for TTY devices */ return Qunbound; } } /************************************************************************/ /* initialization */ /************************************************************************/ void syms_of_device_tty (void) { #ifdef NEW_GC INIT_LRECORD_IMPLEMENTATION (tty_device); #endif /* NEW_GC */ DEFSYMBOL (Qmake_device_early_tty_entry_point); } void console_type_create_device_tty (void) { /* device methods */ CONSOLE_HAS_METHOD (tty, init_device); #ifndef NEW_GC CONSOLE_HAS_METHOD (tty, delete_device); #endif /* not NEW_GC */ #ifdef SIGWINCH CONSOLE_HAS_METHOD (tty, asynch_device_change); #endif /* SIGWINCH */ CONSOLE_HAS_METHOD (tty, device_system_metrics); } void init_device_tty (void) { #ifdef SIGWINCH if (initialized && !noninteractive) EMACS_SIGNAL (SIGWINCH, tty_device_size_change_signal); #endif /* SIGWINCH */ }