Mercurial > hg > xemacs-beta
view netinstall/regedit.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 | 146d342ff859 |
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> * */ /* Manipulate the registry for XEmacs. */ #include "win32.h" #include <stdio.h> #if defined(CYGWIN) || defined(MINGW) #include <cygwin/version.h> #include <sys/mount.h> #endif #include "reginfo.h" #include "regedit.h" #include "msg.h" #include "resource.h" #include "dialog.h" static char * find_cygwin_mount (HKEY rkey, int *istext) { char buf[1000]; char *retval = 0; HKEY key; DWORD retvallen = 0; DWORD flags = 0; DWORD type; #if defined(CYGWIN) || defined(MINGW) sprintf (buf, "Software\\%s\\%s\\%s\\/", CYGWIN_INFO_CYGNUS_REGISTRY_NAME, CYGWIN_INFO_CYGWIN_REGISTRY_NAME, CYGWIN_INFO_CYGWIN_MOUNT_REGISTRY_NAME); if (RegOpenKeyEx (rkey, buf, 0, KEY_READ, &key) != ERROR_SUCCESS) return 0; if (RegQueryValueEx (key, "native", 0, &type, 0, &retvallen) == ERROR_SUCCESS) { retval = new char[retvallen+1]; if (RegQueryValueEx (key, "native", 0, &type, (BYTE *)retval, &retvallen) != ERROR_SUCCESS) { delete retval; retval = 0; } } retvallen = sizeof (flags); RegQueryValueEx (key, "flags", 0, &type, (BYTE *)&flags, &retvallen); RegCloseKey (key); if (retval) *istext = (flags & MOUNT_BINARY) ? 0 : 1; return retval; #else return 0; #endif } static char * find_xemacs_root (HKEY rkey, int* isnative) { char buf[1000]; char *retval = 0; HKEY key; DWORD retvallen = 0; DWORD type; DWORD itype; sprintf (buf, "Software\\%s\\%s", XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME, XEMACS_INFO_XEMACS_REGISTRY_NAME); if (RegOpenKeyEx (rkey, buf, 0, KEY_READ, &key) != ERROR_SUCCESS) return 0; if (RegQueryValueEx (key, XEMACS_INFO_XEMACS_ROOT_KEY, 0, &type, 0, &retvallen) == ERROR_SUCCESS) { retval = new char[retvallen+1]; if (RegQueryValueEx (key, XEMACS_INFO_XEMACS_ROOT_KEY, 0, &type, (BYTE *)retval, &retvallen) != ERROR_SUCCESS) { delete retval; retval = 0; } } retvallen = sizeof (itype); RegQueryValueEx (key, XEMACS_INFO_XEMACS_ROOT_TYPE, 0, &type, (BYTE *)&itype, &retvallen); if (itype == 1) *isnative = 1; else *isnative = 0; RegCloseKey (key); return retval; } char * find_root_location (int *issystem, int *isnative) { char *rv; if ((rv = find_xemacs_root (HKEY_CURRENT_USER, isnative))) { *issystem = 0; return rv; } else if ((rv = find_xemacs_root (HKEY_LOCAL_MACHINE, isnative))) { *issystem = 1; return rv; } return 0; } char * find_cygwin_root (int *issystem) { char *rv; int istext; if ((rv = find_cygwin_mount (HKEY_CURRENT_USER, &istext))) { *issystem = 0; return rv; } else if ((rv = find_cygwin_mount (HKEY_LOCAL_MACHINE, &istext))) { *issystem = 1; return rv; } return 0; } void create_xemacs_root (char *path, int issystem, int isnative) { char buf[1000]; HKEY key; DWORD disposition; DWORD itype = isnative ? 1 : 0; remove_xemacs_root (); sprintf (buf, "Software\\%s\\%s", XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME, XEMACS_INFO_XEMACS_REGISTRY_NAME); HKEY kr = issystem ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; if (RegCreateKeyEx (kr, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS, 0, &key, &disposition) != ERROR_SUCCESS) fatal ("create_xemacs_root"); RegSetValueEx (key, XEMACS_INFO_XEMACS_ROOT_KEY, 0, REG_SZ, (BYTE *)path, strlen (path)+1); RegSetValueEx (key, XEMACS_INFO_XEMACS_ROOT_TYPE, 0, REG_DWORD, (BYTE *)&itype, sizeof (itype)); // write out the package path sprintf (buf, "~\\.xemacs;%s\\site-packages;%s\\xemacs-packages", path, path); RegSetValueEx (key, XEMACS_INFO_XEMACS_PACKAGE_KEY, 0, REG_SZ, (BYTE *)buf, strlen (buf)+1); RegCloseKey (key); } void set_app_path (char *exe, char* path, int issystem) { char buf[1000]; HKEY key; DWORD disposition; sprintf (buf, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\%s", exe); HKEY kr = issystem ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; RegDeleteKey (kr, buf); if (RegCreateKeyEx (kr, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS, 0, &key, &disposition) != ERROR_SUCCESS) fatal ("set_app_path"); RegSetValueEx (key, "Path", 0, REG_SZ, (BYTE *)path, strlen (path)+1); RegCloseKey (key); } void set_install_path (char* path, int issystem) { char buf[1000]; HKEY key; DWORD disposition; sprintf (buf, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\XEmacs"); HKEY kr = issystem ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; RegDeleteKey (kr, buf); if (RegCreateKeyEx (kr, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS, 0, &key, &disposition) != ERROR_SUCCESS) fatal ("set_install_path"); RegSetValueEx (key, "DisplayName", 0, REG_SZ, (BYTE *)"XEmacs", strlen ("XEmacs")+1); sprintf (buf, "%s\\setup.exe -u", path); RegSetValueEx (key, "UninstallString", 0, REG_SZ, (BYTE *)buf, strlen (buf)+1); RegCloseKey (key); } void setup_explorer (char* file_type, char* name, char *exe) { char buf[1000]; char ftype[32]; HKEY key; DWORD disposition; sprintf (buf, ".%s", file_type); RegDeleteKey (HKEY_CLASSES_ROOT, buf); if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS, 0, &key, &disposition) != ERROR_SUCCESS) fatal ("setup_explorer"); // set default key sprintf (ftype, "%sfile", file_type); RegSetValueEx (key, NULL, 0, REG_SZ, (BYTE *)ftype, strlen (ftype)+1); RegCloseKey (key); // create file type entry RegDeleteKey (HKEY_CLASSES_ROOT, ftype); if (RegCreateKeyEx (HKEY_CLASSES_ROOT, ftype, 0, "XEmacs", 0, KEY_ALL_ACCESS, 0, &key, &disposition) != ERROR_SUCCESS) fatal ("setup_explorer"); RegSetValueEx (key, NULL, 0, REG_SZ, (BYTE *)name, strlen (name)+1); RegSetValueEx (key, "AlwaysShowExt", 0, REG_SZ, (BYTE *)"", strlen ("")+1); RegCloseKey (key); // make xemacs file the default icon sprintf(buf, "%s\\DefaultIcon", ftype); if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS, 0, &key, &disposition) != ERROR_SUCCESS) fatal ("setup_explorer"); sprintf(buf, "%s,1", exe); RegSetValueEx (key, NULL, 0, REG_SZ, (BYTE *)buf, strlen (buf)+1); RegCloseKey (key); // command default key (exe) sprintf(buf, "%s\\shell\\Open\\command", ftype); if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS, 0, &key, &disposition) != ERROR_SUCCESS) fatal ("setup_explorer"); sprintf(buf, "\"%s\"", exe); // Don't need %1 because dde will open the file RegSetValueEx (key, NULL, 0, REG_SZ, (BYTE *)buf, strlen (buf)+1); RegCloseKey (key); // ddeexec sprintf(buf, "%s\\shell\\Open\\ddeexec", ftype); if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS, 0, &key, &disposition) != ERROR_SUCCESS) fatal ("setup_explorer"); #define DDE_OPEN "Open(\"%1\")" RegSetValueEx (key, NULL, 0, REG_SZ, (BYTE *)DDE_OPEN, strlen (DDE_OPEN)+1); RegCloseKey (key); // ddeexec application sprintf(buf, "%s\\shell\\Open\\ddeexec\\application", ftype); if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS, 0, &key, &disposition) != ERROR_SUCCESS) fatal ("setup_explorer"); RegSetValueEx (key, NULL, 0, REG_SZ, (BYTE *)"XEmacs", strlen ("XEmacs")+1); RegCloseKey (key); // ddeexec topic sprintf(buf, "%s\\shell\\Open\\ddeexec\\topic", ftype); if (RegCreateKeyEx (HKEY_CLASSES_ROOT, buf, 0, "XEmacs", 0, KEY_ALL_ACCESS, 0, &key, &disposition) != ERROR_SUCCESS) fatal ("setup_explorer"); RegSetValueEx (key, NULL, 0, REG_SZ, (BYTE *)"system", strlen ("system")+1); RegCloseKey (key); } static void remove1 (HKEY rkey) { char buf[1000]; sprintf (buf, "Software\\%s\\%s", XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME, XEMACS_INFO_XEMACS_REGISTRY_NAME); RegDeleteKey (rkey, buf); sprintf (buf, "Software\\%s", XEMACS_INFO_XEMACS_ORG_REGISTRY_NAME); RegDeleteKey (rkey, buf); } void remove_xemacs_root () { remove1 (HKEY_LOCAL_MACHINE); remove1 (HKEY_CURRENT_USER); } void remove_app_path (char *exe) { char buf[1000]; sprintf (buf, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\%s", exe); RegDeleteKey (HKEY_LOCAL_MACHINE, buf); RegDeleteKey (HKEY_CURRENT_USER, buf); } void remove_uninstall_path () { char buf[1000]; sprintf (buf, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\XEmacs"); RegDeleteKey (HKEY_LOCAL_MACHINE, buf); RegDeleteKey (HKEY_CURRENT_USER, buf); }