Mercurial > hg > xemacs-beta
view netinstall/uninstall.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 | a307f9a2021d |
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 intall all the packages selected in the install list (in ini.h). Note that we use a separate thread to maintain the progress dialog, so we avoid the complexity of handling two tasks in one thread. We also create or update all the files in /etc/setup and create the mount points. */ #include <io.h> #include <stdio.h> #include <stdlib.h> #include <ctype.h> #ifndef WIN32_NATIVE #include <unistd.h> #endif #include <sys/types.h> #include <sys/stat.h> #include <errno.h> #include <zlib.h> #include "win32.h" #include "commctrl.h" #include "resource.h" #include "ini.h" #include "dialog.h" #include "concat.h" #include "geturl.h" #include "mkdir.h" #include "state.h" #include "tar.h" #include "diskfull.h" #include "msg.h" #include "regedit.h" #include "reginfo.h" #include "log.h" #include "hash.h" #include "desktop.h" #include "port.h" #define XM_DONE (WM_USER + 101) static HWND unins_dialog = 0; static HWND unins_action = 0; static HWND unins_pkgname = 0; static HWND unins_filename = 0; static HWND unins_pprogress = 0; static HWND unins_iprogress = 0; static HWND unins_diskfull = 0; static HANDLE init_event; static int package_bytes = 0; static int uninstall_started = 0; extern char * map_filename (char *fn, int type); static void start_uninstall (); char * base (char *s); static BOOL dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) { switch (id) { case IDCANCEL: exit_setup (1); case IDOK: if (uninstall_started == 0) { uninstall_started = 1; start_uninstall(); } else exit_setup(0); break; } return FALSE; } static BOOL CALLBACK dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { case WM_INITDIALOG: unins_dialog = h; unins_action = GetDlgItem (h, IDC_UNINS_ACTION); unins_pkgname = GetDlgItem (h, IDC_UNINS_PKG); unins_filename = GetDlgItem (h, IDC_UNINS_FILE); unins_pprogress = GetDlgItem (h, IDC_UNINS_PPROGRESS); unins_iprogress = GetDlgItem (h, IDC_UNINS_IPROGRESS); unins_diskfull = GetDlgItem (h, IDC_UNINS_DISKFULL); SendMessage (unins_pprogress, PBM_SETRANGE, 0, MAKELPARAM (0, 100)); SendMessage (unins_iprogress, PBM_SETRANGE, 0, MAKELPARAM (0, 100)); SendMessage (unins_diskfull, PBM_SETRANGE, 0, MAKELPARAM (0, 100)); SetWindowText (unins_pkgname, ""); SetWindowText (unins_filename, ""); SendMessage (unins_pprogress, PBM_SETPOS, (WPARAM) 0, 0); SendMessage (unins_iprogress, PBM_SETPOS, (WPARAM) 0, 0); SendMessage (unins_diskfull, PBM_SETPOS, (WPARAM) 0, 0); return FALSE; case XM_DONE: { SetWindowText (GetDlgItem (h, IDOK), "Ok"); LONG style = GetWindowLong (GetDlgItem (h, IDCANCEL), GWL_STYLE); SetWindowLong (GetDlgItem (h, IDCANCEL), GWL_STYLE, style & WS_DISABLED); } return FALSE; case WM_COMMAND: return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); } return DefWindowProc (h, message, wParam, lParam); } static DWORD WINAPI uninstall_all (void *); static void start_uninstall () { DWORD tid; HANDLE thread; init_event = CreateEvent (0, 0, 0, 0); thread = CreateThread (0, 0, uninstall_all, 0, 0, &tid); WaitForSingleObject (init_event, 10000); CloseHandle (init_event); } static void progress (int bytes, int num) { int perc; log (0, "%d bytes", bytes); if (package_bytes > 100) { perc = (bytes * 100) / package_bytes; SendMessage (unins_pprogress, PBM_SETPOS, (WPARAM) perc, 0); } if (npackages > 0) { perc = (num * 100) / npackages; SendMessage (unins_iprogress, PBM_SETPOS, (WPARAM) perc, 0); } } static int num_installs, num_uninstalls; static void uninstall_one (char *name, int type, int num) { hash dirs; char line[_MAX_PATH]; char* fname = (type == TY_GENERIC ? concat (root_dir, XEMACS_PACKAGE_DIR, "pkginfo/MANIFEST.", name, 0) : concat (root_dir, XEMACS_SETUP_DIR, "MANIFEST.", name, 0)); FILE* lst = fopen (fname, "rb"); int pos = 0; if (lst) { fseek (lst, 0, SEEK_END); package_bytes = ftell (lst); fseek (lst, 0, SEEK_SET); SetWindowText (unins_pkgname, name); SetWindowText (unins_action, "Uninstalling..."); log (0, "uninstalling %s", name); while (fgets (line, sizeof (line), lst)) { progress (pos, num); pos += strlen(line); if (line[strlen(line)-1] == '\n') line[strlen(line)-1] = 0; dirs.add_subdirs (line); char *d = map_filename (line, type); DWORD dw = GetFileAttributes (d); if (dw != 0xffffffff && !(dw & FILE_ATTRIBUTE_DIRECTORY)) { log (LOG_BABBLE, "unlink %s", d); DeleteFile (d); } } fclose (lst); remove (fname); dirs.reverse_sort (); char *subdir = 0; while ((subdir = dirs.enumerate (subdir)) != 0) { char *d = map_filename (subdir, type); if (RemoveDirectory (d)) log (LOG_BABBLE, "rmdir %s", d); } num_uninstalls ++; } } void do_uninstall (HINSTANCE h) { num_installs = 0, num_uninstalls = 0; next_dialog = 0; // we're done after this if (!root_dir) fatal ("no installation found"); int rv = DialogBox (h, MAKEINTRESOURCE (IDD_UNINSTALL), 0, dialog_proc); if (rv == -1) fatal (IDS_DIALOG_FAILED); } static void read_installed_db () { if (!root_dir) return; char line[1000], pkg[1000], inst[1000], src[1000]; int instsz, srcsz; FILE *db = fopen (concat (root_dir, XEMACS_SETUP_DIR, "installed.db", 0), "rt"); if (!db) return; while (fgets (line, 1000, db)) { src[0] = 0; srcsz = 0; sscanf (line, "%s %s %d %s %d", pkg, inst, &instsz, src, &srcsz); log (0, "read %s", pkg); Package* np = new_package(strdup(pkg)); pinfo(*np).install = inst; pinfo(*np).install_size = instsz; // pick up versoin char *v, *d; for (v=base (inst); *v; v++) if (*v == '-' && isdigit(v[1])) { v++; break; } if (!v) v = inst; for (d=v; *d; d++) if (strncmp (d, ".tar", 4) == 0 || strncmp (d, "-pkg", 4) == 0) { *d = 0; break; } if (v[0]) pinfo(*np).version = strdup (v); else pinfo(*np).version = "0"; // Crude but effective if (pkg != 0) if (strncmp ("xemacs-i686", pkg, 11) == 0 || (strncmp ("xemacs-i586", pkg, 11) == 0)) { np->type = install_type; xemacs_package = np; } } fclose (db); } static DWORD WINAPI uninstall_all (void *) { int i; SetEvent (init_event); int df = diskfull (root_dir); SendMessage (unins_diskfull, PBM_SETPOS, (WPARAM) df, 0); read_installed_db(); log (0, "There are %d packages\n", npackages); for (i=0; i<npackages; i++) { log (0, "uninstalling %s\n", package[i].name); uninstall_one (package[i].name, package[i].type, i); } PostMessage (unins_dialog, XM_DONE, 0, 0); remove (concat (root_dir, XEMACS_SETUP_DIR, "installed.db.old", 0)); remove (concat (root_dir, XEMACS_SETUP_DIR, "installed.db", 0)); remove_desktop_setup(); remove_xemacs_root(); remove_uninstall_path(); if (num_installs == 0) { // exit_msg = IDS_UNINSTALL_COMPLETE; return FALSE; } return FALSE; }