Mercurial > hg > xemacs-beta
annotate netinstall/net.cc @ 4967:0d4c9d0f6a8d
rewrite dynarr code
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-03 Ben Wing <ben@xemacs.org>
* device-x.c (x_get_resource_prefix):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_get_resource_prefix):
* device-x.c (Fx_put_resource):
* dialog-msw.c:
* dialog-msw.c (handle_question_dialog_box):
* dired-msw.c (mswindows_sort_files):
* dired-msw.c (mswindows_get_files):
* extents.c (extent_fragment_sort_by_priority):
* extents.c (Fset_extent_parent):
* file-coding.c (coding_reader):
* file-coding.c (coding_writer):
* file-coding.c (gzip_convert):
* frame.c (generate_title_string):
* gutter.c (calculate_gutter_size_from_display_lines):
* indent.c (vmotion_1):
* lread.c (read_bit_vector):
* mule-coding.c (iso2022_decode):
* rangetab.c:
* rangetab.c (Fcopy_range_table):
* rangetab.c (Fget_range_table):
* rangetab.c (unified_range_table_copy_data):
* redisplay-msw.c (mswindows_output_string):
* redisplay-output.c (output_display_line):
* redisplay-output.c (redisplay_move_cursor):
* redisplay-output.c (redisplay_clear_bottom_of_window):
* redisplay-tty.c (tty_output_ichar_dynarr):
* redisplay-tty.c (set_foreground_to):
* redisplay-tty.c (set_background_to):
* redisplay-xlike-inc.c (XLIKE_output_string):
* redisplay.c (redisplay_window_text_width_string):
* redisplay.c (redisplay_text_width_string):
* redisplay.c (create_text_block):
* redisplay.c (SET_CURRENT_MODE_CHARS_PIXSIZE):
* redisplay.c (generate_fstring_runes):
* redisplay.c (regenerate_modeline):
* redisplay.c (ensure_modeline_generated):
* redisplay.c (real_current_modeline_height):
* redisplay.c (create_string_text_block):
* redisplay.c (regenerate_window):
* redisplay.c (REGEN_INC_FIND_START_END):
* redisplay.c (point_visible):
* redisplay.c (redisplay_window):
* redisplay.c (mark_glyph_block_dynarr):
* redisplay.c (line_start_cache_start):
* redisplay.c (start_with_line_at_pixpos):
* redisplay.c (update_line_start_cache):
* redisplay.c (glyph_to_pixel_translation):
* redisplay.c (pixel_to_glyph_translation):
* sysdep.c (qxe_readdir):
* text.c (dfc_convert_to_external_format):
* text.c (dfc_convert_to_internal_format):
* toolbar-common.c (common_output_toolbar_button):
* window.c (window_modeline_height):
* window.c (Fwindow_last_line_visible_height):
* window.c (window_displayed_height):
* window.c (window_scroll):
* window.c (get_current_pixel_pos):
Use Dynarr_begin() in place of Dynarr_atp (foo, 0).
* dynarr.c (Dynarr_realloc):
* dynarr.c (Dynarr_lisp_realloc):
* dynarr.c (Dynarr_resize):
* dynarr.c (Dynarr_insert_many):
* dynarr.c (Dynarr_delete_many):
* dynarr.c (Dynarr_memory_usage):
* dynarr.c (stack_like_malloc):
* dynarr.c (stack_like_free):
* lisp.h:
* lisp.h (DECLARE_DYNARR_LISP_IMP):
* lisp.h (XD_DYNARR_DESC):
* lisp.h (Dynarr_pop):
* gutter.c (output_gutter):
* redisplay-output.c (sync_rune_structs):
* redisplay-output.c (redisplay_output_window):
Redo the dynarr code, add greater checks.
Rename the `len', `largest' and `max' members to `len_',
`largest_' and `max_' to try and catch existing places that might
directly modify these values. Make new accessors Dynarr_largest()
and Dynarr_max() and make them and existing Dynarr_length() be
non-lvalues by adding '+ 0' to them; fix a couple of places in the
redisplay code that tried to modify the length directly by setting
Dynarr_length(). Use the accessors whenever possible even in the
dynarr code itself. The accessors also verify that 0 <= len <=
largest <= max. Rename settor function Dynarr_set_size() to
Dynarr_set_length() and use it more consistently; also create
lower-level Dynarr_set_length_1(). This latter function should be
the only function that directly modifies the `len_' member of a
Dynarr, and in the process makes sure that the `largest' value is
kept correct.
Consistently use ERROR_CHECK_STRUCTURES instead of
ERROR_CHECK_TYPES for error-checking code. Reintroduce the
temporarily disabled verification code on the positions of
Dynarr_at(), Dynarr_atp() and Dynarr_atp_past_end().
Also create Dynarr_resize_if() in place of a repeated
code fragment. Clean up all the functions that modify Dynarrs to
use the new macros and functions and verify the correctness of the
Dynarr both before and after the change.
Note that there are two kinds of verification -- one for accessing
and one for modifying. The difference is that the modify
verification additionally checks to make sure that the Dynarr
isn't locked. (This is used in redisplay to check for problems
with reentrancy.)
* lrecord.h: Move XD_DYNARR_DESC to lisp.h, grouping with the dynarr code.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 03 Feb 2010 20:51:18 -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 |