Mercurial > hg > xemacs-beta
view netinstall/ini.cc @ 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 | 3078fd1074e8 |
children |
line wrap: on
line source
/* * Copyright (c) 2000, Red Hat, Inc. * * This program 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 of the License, or * (at your option) any later version. * * A copy of the GNU General Public License can be found at * http://www.gnu.org/ * * Written by DJ Delorie <dj@cygnus.com> * */ /* The purpose of this file is to get and parse the setup.ini file from the mirror site. A few support routines for the bison and flex parsers are provided also. We check to see if this setup.ini is older than the one we used last time, and if so, warn the user. */ #include "win32.h" #include <stdio.h> #include <stdlib.h> #include <stdarg.h> #include "ini.h" #include "resource.h" #include "concat.h" #include "state.h" #include "geturl.h" #include "dialog.h" #include "msg.h" #include "mkdir.h" #include "log.h" #include "reginfo.h" #include "version.h" unsigned int setup_timestamp = 0; char *setup_version = 0; extern "C" int yyparse (); /*extern int yydebug;*/ static char *error_buf = 0; static int error_count = 0; void do_ini (HINSTANCE h) { char *ini_file = get_url_to_string (concat (MIRROR_SITE, "/setup.ini", 0)); dismiss_url_status_dialog (); if (!ini_file) { note (IDS_SETUPINI_MISSING, MIRROR_SITE); next_dialog = IDD_SITE; return; } package = 0; npackages = 0; setup_timestamp = 0; setup_version = 0; ini_init (ini_file); setup_timestamp = 0; /*yydebug = 1;*/ if (yyparse () || error_count > 0) { if (error_count == 1) MessageBox (0, error_buf, "Parse Error", 0); else MessageBox (0, error_buf, "Parse Errors", 0); } else { /* save known-good setup.ini locally */ FILE *inif = fopen ("setup.ini", "wb"); if (inif) { fwrite (ini_file, 1, strlen (ini_file), inif); fclose (inif); } } if (root_dir) { mkdir_p (1, concat (root_dir, XEMACS_SETUP_DIR, 0)); unsigned int old_timestamp = 0; FILE *ots = fopen (concat (root_dir, XEMACS_SETUP_DIR, "timestamp", 0), "rt"); if (ots) { fscanf (ots, "%u", &old_timestamp); fclose (ots); if (old_timestamp && setup_timestamp && (old_timestamp > setup_timestamp)) { int yn = yesno (IDS_OLD_SETUPINI); if (yn == IDNO) exit_setup (1); } } if (setup_timestamp) { FILE *nts = fopen (concat (root_dir, XEMACS_SETUP_DIR, "timestamp", 0), "wt"); if (nts) { fprintf (nts, "%u", setup_timestamp); fclose (nts); } } } msg ("setup_version is %s, our_version is %s", setup_version? setup_version : "(null)", version); if (setup_version) { char *ini_version = canonicalize_version (setup_version); char *our_version = canonicalize_version (version); if (strcmp (our_version, ini_version) < 0) note (IDS_OLD_SETUP_VERSION, version, setup_version); } next_dialog = IDD_CHOOSE; } extern "C" int yylineno; extern "C" int CDECL yyerror (char *s, ...) { char buf[1000]; int len; sprintf (buf, "setup.ini line %d: ", yylineno); va_list args; va_start (args, s); vsprintf (buf + strlen (buf), s, args); OutputDebugString (buf); if (error_buf) { strcat (error_buf, "\n"); len = strlen (error_buf) + strlen (buf) + 5; error_buf = (char *) realloc (error_buf, len); strcat (error_buf, buf); } else { len = strlen (buf) + 5; error_buf = (char *) malloc (len); strcpy (error_buf, buf); } error_count++; return 0; } extern "C" int CDECL fprintf (FILE *f, const char *s, ...); static char stderrbuf[1000]; int CDECL fprintf (FILE *f, const char *fmt, ...) { char buf[1000]; int rv; va_list args; va_start (args, fmt); if (f == stderr) { rv = vsprintf (buf, fmt, args); strcat (stderrbuf, buf); if (char *nl = strchr (stderrbuf, '\n')) { *nl = 0; /*OutputDebugString (stderrbuf);*/ MessageBox (0, buf, "XEmacs Setup", 0); stderrbuf[0] = 0; } } else { rv = vfprintf (f, fmt, args); } return rv; }