Mercurial > hg > xemacs-beta
annotate lib-src/getopt1.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 | 84b14dcb0985 |
| children | 061f4f90f874 |
| rev | line source |
|---|---|
| 428 | 1 /* getopt_long and getopt_long_only entry points for GNU getopt. |
| 2 Copyright (C) 1987,88,89,90,91,92,93,94,96,97 Free Software Foundation, Inc. | |
| 3 | |
| 4 NOTE: The canonical source of this file is maintained with the GNU C Library. | |
| 5 Bugs can be reported to bug-glibc@prep.ai.mit.edu. | |
| 6 | |
| 7 This program 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 This program is distributed in the hope that it will be useful, | |
| 13 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 GNU General Public License for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with this program; if not, write to the Free Software | |
| 19 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | |
| 20 USA. */ | |
| 21 | |
| 22 #ifdef HAVE_CONFIG_H | |
| 438 | 23 #include <config.h> |
| 428 | 24 #endif |
| 25 | |
| 26 #include "getopt.h" | |
| 27 | |
| 28 #include <stdio.h> | |
| 29 | |
| 30 /* Comment out all this code if we are using the GNU C Library, and are not | |
| 31 actually compiling the library itself. This code is part of the GNU C | |
| 32 Library, but also included in many other GNU distributions. Compiling | |
| 33 and linking in this code is a waste when using the GNU C library | |
| 34 (especially if it is a shared library). Rather than having every GNU | |
| 35 program understand `configure --with-gnu-libc' and omit the object files, | |
| 36 it is simpler to just do this in the source for each such file. */ | |
| 37 | |
| 38 #define GETOPT_INTERFACE_VERSION 2 | |
| 39 #if !defined (_LIBC) && defined (__GLIBC__) && __GLIBC__ >= 2 | |
| 40 #include <gnu-versions.h> | |
| 41 #if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION | |
| 42 #define ELIDE_CODE | |
| 43 #endif | |
| 44 #endif | |
| 45 | |
| 46 #ifndef ELIDE_CODE | |
| 47 | |
| 48 | |
| 49 /* This needs to come after some library #include | |
| 50 to get __GNU_LIBRARY__ defined. */ | |
| 51 #ifdef __GNU_LIBRARY__ | |
| 52 #include <stdlib.h> | |
| 53 #endif | |
| 54 | |
| 55 #ifndef NULL | |
| 56 #define NULL 0 | |
| 57 #endif | |
| 58 | |
| 59 int | |
| 60 getopt_long (int argc, char *const *argv, const char *options, | |
| 61 const struct option *long_options, int *opt_index) | |
| 62 { | |
| 63 return _getopt_internal (argc, argv, options, long_options, opt_index, 0); | |
| 64 } | |
| 65 | |
| 66 /* Like getopt_long, but '-' as well as '--' can indicate a long option. | |
| 67 If an option that starts with '-' (not '--') doesn't match a long option, | |
| 68 but does match a short option, it is parsed as a short option | |
| 69 instead. */ | |
| 70 | |
| 71 int | |
| 72 getopt_long_only (int argc, char *const *argv, const char *options, | |
| 73 const struct option *long_options, int *opt_index) | |
| 74 { | |
| 75 return _getopt_internal (argc, argv, options, long_options, opt_index, 1); | |
| 76 } | |
| 77 | |
| 78 | |
| 79 #endif /* Not ELIDE_CODE. */ | |
| 80 | |
| 81 #ifdef TEST | |
| 82 | |
| 83 #include <stdio.h> | |
| 84 | |
| 85 int | |
| 86 main (int argc, char **argv) | |
| 87 { | |
| 88 int c; | |
| 89 int digit_optind = 0; | |
| 90 | |
| 91 while (1) | |
| 92 { | |
| 93 int this_option_optind = optind ? optind : 1; | |
| 94 int option_index = 0; | |
| 95 static struct option long_options[] = | |
| 96 { | |
| 97 {"add", 1, 0, 0}, | |
| 98 {"append", 0, 0, 0}, | |
| 99 {"delete", 1, 0, 0}, | |
| 100 {"verbose", 0, 0, 0}, | |
| 101 {"create", 0, 0, 0}, | |
| 102 {"file", 1, 0, 0}, | |
| 103 {0, 0, 0, 0} | |
| 104 }; | |
| 105 | |
| 106 c = getopt_long (argc, argv, "abc:d:0123456789", | |
| 107 long_options, &option_index); | |
| 108 if (c == -1) | |
| 109 break; | |
| 110 | |
| 111 switch (c) | |
| 112 { | |
| 113 case 0: | |
| 114 printf ("option %s", long_options[option_index].name); | |
| 115 if (optarg) | |
| 116 printf (" with arg %s", optarg); | |
| 117 printf ("\n"); | |
| 118 break; | |
| 119 | |
| 120 case '0': | |
| 121 case '1': | |
| 122 case '2': | |
| 123 case '3': | |
| 124 case '4': | |
| 125 case '5': | |
| 126 case '6': | |
| 127 case '7': | |
| 128 case '8': | |
| 129 case '9': | |
| 130 if (digit_optind != 0 && digit_optind != this_option_optind) | |
| 131 printf ("digits occur in two different argv-elements.\n"); | |
| 132 digit_optind = this_option_optind; | |
| 133 printf ("option %c\n", c); | |
| 134 break; | |
| 135 | |
| 136 case 'a': | |
| 137 printf ("option a\n"); | |
| 138 break; | |
| 139 | |
| 140 case 'b': | |
| 141 printf ("option b\n"); | |
| 142 break; | |
| 143 | |
| 144 case 'c': | |
| 145 printf ("option c with value `%s'\n", optarg); | |
| 146 break; | |
| 147 | |
| 148 case 'd': | |
| 149 printf ("option d with value `%s'\n", optarg); | |
| 150 break; | |
| 151 | |
| 152 case '?': | |
| 153 break; | |
| 154 | |
| 155 default: | |
| 156 printf ("?? getopt returned character code 0%o ??\n", c); | |
| 157 } | |
| 158 } | |
| 159 | |
| 160 if (optind < argc) | |
| 161 { | |
| 162 printf ("non-option ARGV-elements: "); | |
| 163 while (optind < argc) | |
| 164 printf ("%s ", argv[optind++]); | |
| 165 printf ("\n"); | |
| 166 } | |
| 167 | |
| 168 exit (0); | |
| 169 } | |
| 170 | |
| 171 #endif /* TEST */ |