Mercurial > hg > xemacs-beta
view lib-src/yow.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 | 943eaba38521 |
children |
line wrap: on
line source
/* * yow.c * * Print a quotation from Zippy the Pinhead. * Qux <Kaufman-David@Yale> March 6, 1986 * * With dynamic memory allocation. */ /* Synched up with: FSF 19.28. */ #include <config.h> #include <stdio.h> #include <ctype.h> #include <../src/paths.h> /* For PATH_DATA. */ #if __STDC__ || defined(STDC_HEADERS) #include <stdlib.h> #include <unistd.h> #include <string.h> #include <time.h> /* for time() */ #endif #define BUFSIZE 80 #define SEP '\0' #ifndef YOW_FILE #define YOW_FILE "yow.lines" #endif void yow (FILE *fp); void setup_yow (FILE *fp); #ifdef WIN32_NATIVE #define rootrelativepath(rel) \ ({\ static char res[BUFSIZE], *p;\ strcpy (res, argv[0]);\ p = res + strlen (res);\ while (p != res && *p != '/' && *p != '\\' && *p != ':') p--;\ strcpy (p + 1, "../");\ strcpy (p + 4, rel);\ &res;}) #endif int main (int argc, char *argv[]) { FILE *fp; char file[BUFSIZ]; if (argc > 2 && !strcmp (argv[1], "-f")) strcpy (file, argv[2]); else #ifdef PATH_DATA #ifdef vms sprintf (file, "%s%s", PATH_DATA, YOW_FILE); #else sprintf (file, "%s/%s", PATH_DATA, YOW_FILE); #endif #else /* !PATH_DATA */ { fprintf (stderr, "%s: the location of the \"%s\" file was not supplied at compile-time.\n\ You must supply it with the -f command-line option.\n", argv[0], YOW_FILE); exit (1); } #endif if ((fp = fopen(file, "r")) == NULL) { perror(file); exit(1); } /* initialize random seed */ srand((int) (getpid() + time((time_t *) 0))); setup_yow(fp); yow(fp); fclose(fp); return 0; } static long len = -1; static long header_len; #define AVG_LEN 40 /* average length of a quotation */ /* Sets len and header_len */ void setup_yow (FILE *fp) { int c; /* Get length of file */ /* Because the header (stuff before the first SEP) can be very long, * thus biasing our search in favor of the first quotation in the file, * we explicitly skip that. */ while ((c = getc(fp)) != SEP) { if (c == EOF) { fprintf(stderr, "File contains no separators.\n"); exit(2); } } header_len = ftell(fp); if (header_len > AVG_LEN) header_len -= AVG_LEN; /* allow the first quotation to appear */ if (fseek(fp, 0L, 2) == -1) { perror("fseek 1"); exit(1); } len = ftell(fp) - header_len; } /* go to a random place in the file and print the quotation there */ void yow (FILE *fp) { long offset; int c, i = 0; char *buf; int bufsize; offset = rand() % len + header_len; if (fseek(fp, offset, 0) == -1) { perror("fseek 2"); exit(1); } /* Read until SEP, read next line, print it. (Note that we will never print anything before the first separator.) If we hit EOF looking for the first SEP, just recurse. */ while ((c = getc(fp)) != SEP) if (c == EOF) { yow(fp); return; } /* Skip leading whitespace, then read in a quotation. If we hit EOF before we find a non-whitespace char, recurse. */ while (isspace(c = getc(fp))) ; if (c == EOF) { yow(fp); return; } bufsize = BUFSIZE; buf = (char *) malloc(bufsize); if (buf == (char *)0) { fprintf(stderr, "can't allocate any memory\n"); exit (3); } buf[i++] = c; while ((c = getc(fp)) != SEP && c != EOF) { buf[i++] = c; if (i == bufsize-1) { /* Yow! Is this quotation too long yet? */ bufsize *= 2; buf = (char *)realloc(buf, bufsize); if (buf == (char *)0) { fprintf(stderr, "can't allocate more memory\n"); exit (3); } } } buf[i++] = 0; printf("%s\n", buf); }