Mercurial > hg > xemacs-beta
annotate netinstall/net.cc @ 5124:623d57b7fbe8 ben-lisp-object
separate regular and disksave finalization, print method fixes.
Create separate disksave method and make the finalize method only be for
actual object finalization, not disksave finalization.
Fix places where 0 was given in place of a printer -- print methods are
mandatory, and internal objects formerly without a print method now must
explicitly specify internal_object_printer().
Change the defn of CONSOLE_LIVE_P to avoid problems in some weird situations.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-01-20 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (very_old_free_lcrecord):
* alloc.c (disksave_object_finalization_1):
* alloc.c (make_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* buffer.c:
* bytecode.c:
* bytecode.c (Fcompiled_function_p):
* chartab.c:
* console-impl.h:
* console-impl.h (CONSOLE_TYPE_P):
* console.c:
* console.c (set_quit_events):
* data.c:
* data.c (Fmake_ephemeron):
* database.c:
* database.c (finalize_database):
* database.c (Fclose_database):
* device-msw.c:
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device.c:
* elhash.c:
* elhash.c (finalize_hash_table):
* eval.c:
* eval.c (bind_multiple_value_limits):
* event-stream.c:
* event-stream.c (finalize_command_builder):
* events.c:
* events.c (mark_event):
* extents.c:
* extents.c (finalize_extent_info):
* extents.c (uninit_buffer_extents):
* faces.c:
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.h:
* file-coding.h (struct coding_system_methods):
* file-coding.h (struct detector):
* floatfns.c:
* floatfns.c (extract_float):
* fns.c:
* fns.c (Fidentity):
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (finalize_fc_config):
* frame.c:
* glyphs.c:
* glyphs.c (finalize_image_instance):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* gui.c:
* gui.c (gui_error):
* keymap.c:
* lisp.h (struct Lisp_Symbol):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE):
* lrecord.h (DEFINE_DUMPABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_FROB_BLOCK_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_INTERNAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_SIZABLE_INTERNAL_LISP_OBJECT):
* lrecord.h (MAKE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_GENERAL_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_LISP_OBJECT):
* lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_GENERAL_LISP_OBJECT):
* lrecord.h (MAKE_MODULE_LISP_OBJECT):
* lstream.c:
* lstream.c (finalize_lstream):
* lstream.c (disksave_lstream):
* marker.c:
* marker.c (finalize_marker):
* mule-charset.c (make_charset):
* number.c:
* objects.c:
* objects.c (finalize_color_instance):
* objects.c (finalize_font_instance):
* opaque.c:
* opaque.c (make_opaque_ptr):
* process-nt.c:
* process-nt.c (nt_finalize_process_data):
* process-nt.c (nt_deactivate_process):
* process.c:
* process.c (finalize_process):
* procimpl.h (struct process_methods):
* scrollbar.c:
* scrollbar.c (free_scrollbar_instance):
* specifier.c (finalize_specifier):
* symbols.c:
* toolbar.c:
* toolbar.c (Ftoolbar_button_p):
* tooltalk.c:
* ui-gtk.c:
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* window.c:
* window.c (finalize_window):
* window.c (mark_window_as_deleted):
Separate out regular and disksave finalization. Instead of a
FOR_DISKSAVE argument to the finalizer, create a separate object
method `disksaver'. Make `finalizer' have only one argument.
Go through and separate out all finalize methods into finalize
and disksave. Delete lots of thereby redundant disksave checking.
Delete places that signal an error if we attempt to disksave --
all of these objects are non-dumpable and we will get an error
from pdump anyway if we attempt to dump them. After this is done,
only one object remains that has a disksave method -- lstream.
Change DEFINE_*_LISP_OBJECT_WITH_PROPS to DEFINE_*_GENERAL_LISP_OBJECT,
which is used for specifying either property methods or disksave
methods (or in the future, any other less-used methods).
Remove the for_disksave argument to finalize_process_data. Don't
provide a disksaver for processes because no one currently needs
it.
Clean up various places where objects didn't provide a print method.
It was made mandatory in previous changes, and all methods now
either provide their own print method or use internal_object_printer
or external_object_printer.
Change the definition of CONSOLE_LIVE_P to use the contype enum
rather than looking into the conmeths structure -- in some weird
situations with dead objects, the conmeths structure is NULL,
and printing such objects from debug_print() will crash if we try
to look into the conmeths structure.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 20 Jan 2010 07:05:57 -0600 |
| parents | 685b588e92d8 |
| children |
| rev | line source |
|---|---|
| 448 | 1 /* |
| 2 * Copyright (c) 2000, Red Hat, Inc. | |
| 3 * | |
| 4 * This program is free software; you can redistribute it and/or modify | |
| 5 * it under the terms of the GNU General Public License as published by | |
| 6 * the Free Software Foundation; either version 2 of the License, or | |
| 7 * (at your option) any later version. | |
| 8 * | |
| 9 * A copy of the GNU General Public License can be found at | |
| 10 * http://www.gnu.org/ | |
| 11 * | |
| 12 * Written by DJ Delorie <dj@cygnus.com> | |
| 13 * | |
| 673 | 14 * Sync'ed with cinstall 2001-10-16 |
| 448 | 15 */ |
| 16 | |
| 17 /* The purpose of this file is to get the network configuration | |
| 18 information from the user. */ | |
| 19 | |
| 20 #include "win32.h" | |
| 21 #include <stdio.h> | |
| 22 #include <stdlib.h> | |
| 23 #include "dialog.h" | |
| 24 #include "resource.h" | |
| 25 #include "state.h" | |
| 26 #include "msg.h" | |
| 27 #include "log.h" | |
| 28 | |
| 29 static int rb[] = { IDC_NET_IE5, IDC_NET_DIRECT, IDC_NET_PROXY, 0 }; | |
| 30 | |
| 31 static void | |
| 32 check_if_enable_next (HWND h) | |
| 33 { | |
| 34 int e = 0, p = 0, pu = 0; | |
| 35 if (net_method == IDC_NET_IE5) | |
| 36 pu = 1; | |
| 37 if (net_method == IDC_NET_IE5 || net_method == IDC_NET_DIRECT) | |
| 38 e = 1; | |
| 39 else if (net_method == IDC_NET_PROXY) | |
| 40 { | |
| 41 p = pu = 1; | |
| 42 if (net_proxy_host && net_proxy_port) | |
| 43 e = 1; | |
| 44 } | |
| 45 EnableWindow (GetDlgItem (h, IDOK), e); | |
| 46 EnableWindow (GetDlgItem (h, IDC_PROXY_HOST), p); | |
| 47 EnableWindow (GetDlgItem (h, IDC_PROXY_PORT), p); | |
| 48 } | |
| 49 | |
| 50 static void | |
| 51 load_dialog (HWND h) | |
| 52 { | |
| 53 rbset (h, rb, net_method); | |
| 54 eset (h, IDC_PROXY_HOST, net_proxy_host); | |
| 55 if (net_proxy_port == 0) | |
| 56 net_proxy_port = 80; | |
| 57 eset (h, IDC_PROXY_PORT, net_proxy_port); | |
| 58 check_if_enable_next (h); | |
| 59 } | |
| 60 | |
| 61 static void | |
| 62 save_dialog (HWND h) | |
| 63 { | |
| 64 net_method = rbget (h, rb); | |
| 65 net_proxy_host = eget (h, IDC_PROXY_HOST, net_proxy_host); | |
| 66 net_proxy_port = eget (h, IDC_PROXY_PORT); | |
| 67 } | |
| 68 | |
| 69 static BOOL | |
| 70 dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) | |
| 71 { | |
| 72 switch (id) | |
| 73 { | |
| 74 | |
| 75 case IDC_NET_IE5: | |
| 76 case IDC_NET_DIRECT: | |
| 77 case IDC_NET_PROXY: | |
| 78 case IDC_PROXY_HOST: | |
| 79 case IDC_PROXY_PORT: | |
| 80 save_dialog (h); | |
| 81 check_if_enable_next (h); | |
| 82 break; | |
| 83 | |
| 84 case IDOK: | |
| 85 save_dialog (h); | |
| 86 switch (source) | |
| 87 { | |
| 88 case IDC_SOURCE_NETINST: | |
| 89 case IDC_SOURCE_DOWNLOAD: | |
| 90 NEXT (IDD_SITE); | |
| 91 break; | |
| 92 case IDC_SOURCE_CWD: | |
| 93 NEXT (0); | |
| 94 break; | |
| 95 default: | |
| 96 msg ("source is default? %d\n", source); | |
| 97 NEXT (0); | |
| 98 } | |
| 99 break; | |
| 100 | |
| 101 case IDC_BACK: | |
| 102 save_dialog (h); | |
| 103 switch (source) | |
| 104 { | |
| 105 case IDC_SOURCE_DOWNLOAD: | |
| 106 NEXT (IDD_LOCAL_DIR); | |
| 107 break; | |
| 108 case IDC_SOURCE_NETINST: | |
| 109 case IDC_SOURCE_CWD: | |
| 110 NEXT (IDD_ROOT); | |
| 111 break; | |
| 112 } | |
| 113 break; | |
| 114 | |
| 115 case IDCANCEL: | |
| 116 NEXT (0); | |
| 117 break; | |
| 118 } | |
| 119 } | |
| 120 | |
| 121 static BOOL CALLBACK | |
| 122 dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) | |
| 123 { | |
| 124 switch (message) | |
| 125 { | |
| 126 case WM_INITDIALOG: | |
| 127 load_dialog (h); | |
| 673 | 128 |
| 129 // Check to see if any radio buttons are selected. If not, select a default. | |
| 130 if ((!SendMessage(GetDlgItem (h, IDC_NET_IE5), BM_GETCHECK, 0, 0) == BST_CHECKED) | |
| 131 && (!SendMessage(GetDlgItem (h, IDC_NET_PROXY), BM_GETCHECK, 0, 0) == BST_CHECKED)) | |
| 132 { | |
| 133 SendMessage(GetDlgItem (h, IDC_NET_DIRECT), BM_CLICK, 0, 0); | |
| 134 } | |
| 448 | 135 return FALSE; |
| 136 case WM_COMMAND: | |
| 137 return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); | |
| 138 } | |
| 139 return FALSE; | |
| 140 } | |
| 141 | |
| 142 void | |
| 143 do_net (HINSTANCE h) | |
| 144 { | |
| 145 int rv = 0; | |
| 146 | |
| 673 | 147 net_method = IDC_NET_DIRECT; |
| 448 | 148 rv = DialogBox (h, MAKEINTRESOURCE (IDD_NET), 0, dialog_proc); |
| 149 if (rv == -1) | |
| 150 fatal (IDS_DIALOG_FAILED); | |
| 151 | |
| 152 log (0, "net: %s", | |
| 153 (net_method == IDC_NET_IE5) ? "IE5" : | |
| 154 (net_method == IDC_NET_DIRECT) ? "Direct" : "Proxy"); | |
| 155 } | |
| 156 |