annotate lisp/mule/mule-msw-init-late.el @ 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 980575c76541
children 308d34e9f07d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
780
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
1 ;;; mule-msw-init-late.el --- initialization code for MS Windows under MULE
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
2 ;;; Copyright (C) 2001, 2002 Ben Wing.
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
3
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
4 ;; This file is part of XEmacs.
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
5
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
6 ;; XEmacs is free software; you can redistribute it and/or modify it
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
7 ;; under the terms of the GNU General Public License as published by
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
8 ;; the Free Software Foundation; either version 2, or (at your option)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
9 ;; any later version.
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
10
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
11 ;; XEmacs is distributed in the hope that it will be useful, but
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
12 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
13 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
14 ;; General Public License for more details.
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
15
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
16 ;; You should have received a copy of the GNU General Public License
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
17 ;; along with XEmacs; see the file COPYING. If not, write to the
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
18 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
19 ;; Boston, MA 02111-1307, USA.
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
20
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
21 ;; mapping between XEmacs charsets and code pages. something like this
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
22 ;; will might around once all the Unicode code is written, so we know how
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
23 ;; to choose the right font. (perhaps "code pages" will become "Unicode
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
24 ;; subranges"; they're more or less equivalent under Windows from a font
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
25 ;; perspective.) But ... in reality, we can just query the charset for its
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
26 ;; Unicode ranges, and the "charset ID" is not a good indicator of what a
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
27 ;; particular font supports; e.g. there's no charset ID at all for Indian
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
28 ;; fonts, but Windows clearly supports them. (The docs say that Indian
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
29 ;; support is "all Unicode"; i.e. charset ID's are on their way out. I
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
30 ;; guess we're supposed to query the font for what ranges it supports, and
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
31 ;; what its preferred range is.)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
32
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
33 (let ((l '((ascii . "Western")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
34 (latin-iso8859-2 . "Central European")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
35 (cyrillic-iso8859-5 . "Cyrillic")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
36 (latin-iso8859-1 . "Western")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
37 (greek-iso8859-7 . "Greek")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
38 (latin-iso8859-9 . "Turkish")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
39 (hebrew-iso8859-8 . "Hebrew")
4805
980575c76541 Move the arabic-iso8859-6 character set back to C, otherwise X11 lookup fails.
Aidan Kehoe <kehoea@parhasard.net>
parents: 4491
diff changeset
40 (arabic-iso8859-6 . "Arabic")
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
41 (latin-iso8859-4 . "Baltic")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
42 (vietnamese-viscii-lower . "Viet Nam")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
43 (vietnamese-viscii-upper . "Viet Nam")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
44 (thai-tis620 . "Thai")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
45 (latin-jisx0201 . "Japanese")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
46 (katakana-jisx0201 . "Japanese")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
47 ;; (japanese-jisx0208-1978 . "Japanese")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
48 (japanese-jisx0208 . "Japanese")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
49 (japanese-jisx0212 . "Japanese")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
50 (chinese-gb2312 . "Simplified Chinese")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
51 (korean-ksc5601 . "Korean")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
52 (chinese-big5-1 . "Traditional Chinese")
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
53 (chinese-big5-2 . "Traditional Chinese"))))
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
54 (while l
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
55 (let ((charset (car (car l)))
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
56 (registry (cdr (car l))))
4103
b4f4e0cc90f1 [xemacs-hg @ 2007-08-07 23:08:47 by aidan]
aidan
parents: 872
diff changeset
57 (declare-fboundp (mswindows-set-charset-registry charset registry))
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
58 (setq l (cdr l)))))
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 780
diff changeset
59
780
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
60 (let ((l '((ascii . 1252)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
61 (latin-iso8859-2 . 1250)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
62 (cyrillic-iso8859-5 . 1251)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
63 (latin-iso8859-1 . 1252)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
64 (greek-iso8859-7 . 1253)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
65 (latin-iso8859-9 . 1254)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
66 (hebrew-iso8859-8 . 1255)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
67 ;; (arabic-iso8859-6 . 1256)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
68 (latin-iso8859-4 . 1257)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
69 (vietnamese-viscii-lower . 1258)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
70 (vietnamese-viscii-upper . 1258)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
71 ;; (thai-tis620 . 874)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
72 (latin-jisx0201 . 932)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
73 (katakana-jisx0201 . 932)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
74 ;; (japanese-jisx0208-1978 . 932)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
75 (japanese-jisx0208 . 932)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
76 (japanese-jisx0212 . 932)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
77 (chinese-gb2312 . 936)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
78 (korean-ksc5601 . 949)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
79 (chinese-big5-1 . 950)
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
80 (chinese-big5-2 . 950))))
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
81 (while l
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
82 (let ((charset (car (car l)))
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
83 (code-page (cdr (car l))))
4103
b4f4e0cc90f1 [xemacs-hg @ 2007-08-07 23:08:47 by aidan]
aidan
parents: 872
diff changeset
84 (declare-fboundp (mswindows-set-charset-code-page charset code-page))
780
578cb2932d72 [xemacs-hg @ 2002-03-18 10:07:30 by ben]
ben
parents:
diff changeset
85 (setq l (cdr l)))))