Mercurial > hg > xemacs-beta
annotate src/sunpro.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 | e91cf17f6ab7 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Sunpro-specific routines. |
| 2 | |
| 3 Copyright (C) 1994 Sun Microsystems, Inc. | |
| 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: Not in FSF. */ | |
| 23 | |
| 4105 | 24 /* Commentary: |
| 25 | |
| 26 According to Paul Keusemann in <20070802140358.GA19566@visi.com>, this | |
| 27 feature probably still works as of 2007-08-02. However, that doesn't seem | |
| 28 reliable since there doesn't seem to be a way to configure it! */ | |
| 29 | |
| 428 | 30 #include <config.h> |
| 31 #include "lisp.h" | |
| 32 | |
| 33 /* #### | |
| 34 | |
| 35 The following junk used to be in lisp/prim/files.el. It obviously | |
| 36 doesn't belong there, but should go somewhere. | |
| 37 | |
| 38 (if (fboundp 'ut-log-text) ;; #### Sun stuff; what is this? | |
| 39 (ut-log-text "Reading a file.")) | |
| 40 */ | |
| 41 | |
| 42 /* Whether usage tracking is turned on (Sun only) */ | |
| 43 Lisp_Object Vusage_tracking; | |
| 44 #ifdef USAGE_TRACKING | |
| 45 #include <ut.h> | |
| 46 #endif | |
| 47 | |
| 48 DEFUN ("ut-log-text", Fut_log_text, 1, MANY, 0, /* | |
| 49 Log a usage-tracking message if `usage-tracking' is non-nil. | |
| 50 Args are the same as to `format'. Returns whether the message was | |
| 51 actually logged. If usage-tracking support was not compiled in, this | |
| 52 function has no effect and always returns `nil'. See function | |
| 53 `has-usage-tracking-p'. | |
| 54 */ | |
| 2286 | 55 #ifdef USAGE_TRACKING |
| 56 (int nargs, Lisp_Object *args) | |
| 57 #else | |
| 58 (int UNUSED (nargs), Lisp_Object *UNUSED (args)) | |
| 59 #endif | |
| 4105 | 60 ) |
| 428 | 61 { |
| 62 #ifdef USAGE_TRACKING | |
| 63 Lisp_Object xs; | |
| 771 | 64 unsigned char *s; |
| 428 | 65 |
| 66 if (!NILP (Vusage_tracking)) | |
| 67 { | |
| 68 xs = Fformat (nargs, args); | |
| 69 CHECK_STRING (xs); | |
| 70 s = XSTRING_DATA (xs); | |
| 71 ut_log_text ((char *) s); | |
| 72 } | |
| 73 return Vusage_tracking; | |
| 74 #else | |
| 75 return Qnil; | |
| 76 #endif | |
| 77 } | |
| 78 | |
| 79 | |
| 80 /************************************************************************/ | |
| 81 /* initialization */ | |
| 82 /************************************************************************/ | |
| 83 | |
| 84 void | |
| 85 syms_of_sunpro (void) | |
| 86 { | |
| 87 DEFSUBR (Fut_log_text); | |
| 88 } | |
| 89 | |
| 90 void | |
| 91 vars_of_sunpro (void) | |
| 92 { | |
| 93 DEFVAR_LISP ("usage-tracking", &Vusage_tracking /* | |
| 94 Whether usage tracking is turned on (Sun internal use only). | |
| 95 Has no effect if usage tracking support has not been compiled in. | |
| 96 */ ); | |
| 97 Vusage_tracking = Qnil; | |
| 98 | |
| 99 Fprovide (intern ("sparcworks")); | |
| 100 #ifdef USAGE_TRACKING | |
| 101 Fprovide (intern ("usage-tracking")); | |
| 102 #endif | |
| 103 } | |
| 104 | |
| 105 void | |
| 106 init_sunpro (void) | |
| 107 { | |
| 108 Vusage_tracking = Qnil; | |
| 109 #ifdef USAGE_TRACKING | |
| 110 if (!purify_flag) | |
| 111 { /* Enabled only when not dumping an executable */ | |
| 112 Vusage_tracking = Qt; | |
| 113 ut_initialize ("xemacs", NULL, NULL); | |
| 114 } | |
| 115 #endif | |
| 116 } |