annotate netinstall/dialog.cc @ 4690:257b468bf2ca

Move the #'query-coding-region implementation to C. This is necessary because there is no reasonable way to access the corresponding mswindows-multibyte functionality from Lisp, and we need such functionality if we're going to have a reliable and portable #'query-coding-region implementation. However, this change doesn't yet provide #'query-coding-region for the mswindow-multibyte coding systems, there should be no functional differences between an XEmacs with this change and one without it. src/ChangeLog addition: 2009-09-19 Aidan Kehoe <kehoea@parhasard.net> Move the #'query-coding-region implementation to C. This is necessary because there is no reasonable way to access the corresponding mswindows-multibyte functionality from Lisp, and we need such functionality if we're going to have a reliable and portable #'query-coding-region implementation. However, this change doesn't yet provide #'query-coding-region for the mswindow-multibyte coding systems, there should be no functional differences between an XEmacs with this change and one without it. * mule-coding.c (struct fixed_width_coding_system): Add a new coding system type, fixed_width, and implement it. It uses the CCL infrastructure but has a much simpler creation API, and its own query_method, formerly in lisp/mule/mule-coding.el. * unicode.c: Move the Unicode query method implementation here from unicode.el. * lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table here. * intl-win32.c (complex_vars_of_intl_win32): Use Fmake_coding_system_internal, not Fmake_coding_system. * general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence here. * file-coding.h (enum coding_system_variant): Add fixed_width_coding_system here. (struct coding_system_methods): Add query_method and query_lstream_method to the coding system methods. Provide flags for the query methods. Declare the default query method; initialise it correctly in INITIALIZE_CODING_SYSTEM_TYPE. * file-coding.c (default_query_method): New function, the default query method for coding systems that do not set it. Moved from coding.el. (make_coding_system_1): Accept new elements in PROPS in #'make-coding-system; aliases, a list of aliases; safe-chars and safe-charsets (these were previously accepted but not saved); and category. (Fmake_coding_system_internal): New function, what used to be #'make-coding-system--on Mule builds, we've now moved some of the functionality of this to Lisp. (Fcoding_system_canonical_name_p): Move this earlier in the file, since it's now called from within make_coding_system_1. (Fquery_coding_region): Move the implementation of this here, from coding.el. (complex_vars_of_file_coding): Call Fmake_coding_system_internal, not Fmake_coding_system; specify safe-charsets properties when we're a mule build. * extents.h (mouse_highlight_priority, Fset_extent_priority, Fset_extent_face, Fmap_extents): Make these available to other C files. lisp/ChangeLog addition: 2009-09-19 Aidan Kehoe <kehoea@parhasard.net> Move the #'query-coding-region implementation to C. * coding.el: Consolidate code that depends on the presence or absence of Mule at the end of this file. (default-query-coding-region, query-coding-region): Move these functions to C. (default-query-coding-region-safe-charset-skip-chars-map): Remove this variable, the corresponding C variable is Vdefault_query_coding_region_chartab_cache in file-coding.c. (query-coding-string): Update docstring to reflect actual multiple values, be more careful about not modifying a range table that we're currently mapping over. (encode-coding-char): Make the implementation of this simpler. (featurep 'mule): Autoload #'make-coding-system from mule/make-coding-system.el if we're a mule build; provide an appropriate compiler macro. Do various non-mule compatibility things if we're not a mule build. * update-elc.el (additional-dump-dependencies): Add mule/make-coding-system as a dump time dependency if we're a mule build. * unicode.el (ccl-encode-to-ucs-2): (decode-char): (encode-char): Move these earlier in the file, for the sake of some byte compile warnings. (unicode-query-coding-region): Move this to unicode.c * mule/make-coding-system.el: New file, not dumped. Contains the functionality to rework the arguments necessary for fixed-width coding systems, and contains the implementation of #'make-coding-system, which now calls #'make-coding-system-internal. * mule/vietnamese.el (viscii): * mule/latin.el (iso-8859-2): (windows-1250): (iso-8859-3): (iso-8859-4): (iso-8859-14): (iso-8859-15): (iso-8859-16): (iso-8859-9): (macintosh): (windows-1252): * mule/hebrew.el (iso-8859-8): * mule/greek.el (iso-8859-7): (windows-1253): * mule/cyrillic.el (iso-8859-5): (koi8-r): (koi8-u): (windows-1251): (alternativnyj): (koi8-ru): (koi8-t): (koi8-c): (koi8-o): * mule/arabic.el (iso-8859-6): (windows-1256): Move all these coding systems to being of type fixed-width, not of type CCL. This allows the distinct query-coding-region for them to be in C, something which will eventually allow us to implement query-coding-region for the mswindows-multibyte coding systems. * mule/general-late.el (posix-charset-to-coding-system-hash): Document why we're pre-emptively persuading the byte compiler that the ELC for this file needs to be written using escape-quoted. Call #'set-unicode-query-skip-chars-args, now the Unicode query-coding-region implementation is in C. * mule/thai-xtis.el (tis-620): Don't bother checking whether we're XEmacs or not here. * mule/mule-coding.el: Move the eight bit fixed-width functionality from this file to make-coding-system.el. tests/ChangeLog addition: 2009-09-19 Aidan Kehoe <kehoea@parhasard.net> * automated/mule-tests.el: Check a coding system's type, not an 8-bit-fixed property, for whether that coding system should be treated as a fixed-width coding system. * automated/query-coding-tests.el: Don't test the query coding functionality for mswindows-multibyte coding systems, it's not yet implemented.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 19 Sep 2009 22:53:13 +0100
parents 3078fd1074e8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
1 /*
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
2 * Copyright (c) 2000, Red Hat, Inc.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
3 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
4 * This program is free software; you can redistribute it and/or modify
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
7 * (at your option) any later version.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
8 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
9 * A copy of the GNU General Public License can be found at
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
10 * http://www.gnu.org/
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
11 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
12 * Written by DJ Delorie <dj@cygnus.com>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
13 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
14 */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
15
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
16 /* The purpose of this file is to provide common functionality for
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
17 all the dialogs in the program. */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
18
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
19 #include "win32.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
20 #include <stdio.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
21 #include <stdlib.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
22 #include "dialog.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
23 #include "msg.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
24 #include "log.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
25
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
26 char *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
27 eget (HWND h, int id, char *var)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
28 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
29 char tmp[4000];
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
30 if (var)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
31 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
32 free (var);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
33 var = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
34 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
35 if (GetDlgItemText (h, id, tmp, sizeof (tmp)) > 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
36 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
37 var = (char *) malloc (strlen (tmp)+1);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
38 strcpy (var, tmp);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
39 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
40 return var;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
41 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
42
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
43 int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
44 eget (HWND h, int id)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
45 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
46 BOOL s;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
47 int r = GetDlgItemInt (h, id, &s, TRUE);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
48 return r;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
49 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
50
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
51 void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
52 eset (HWND h, int id, char *val)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
53 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
54 SetDlgItemText (h, id, val);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
55 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
56
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
57 void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
58 eset (HWND h, int id, int val)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
59 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
60 SetDlgItemInt (h, id, (UINT)val, TRUE);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
61 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
62
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
63 int
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
64 rbget (HWND h, int *ids)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
65 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
66 int i;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
67 for (i=0; ids[i]; i++)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
68 if (IsDlgButtonChecked (h, ids[i]) == BST_CHECKED)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
69 return ids[i];
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
70 return 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
71 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
72
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
73 void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
74 rbset (HWND h, int *ids, int id)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
75 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
76 int i;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
77 for (i=0; ids[i]; i++)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
78 CheckDlgButton (h, ids[i], id==ids[i] ? BST_CHECKED : BST_UNCHECKED);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
79 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
80
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
81 void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
82 fatal (char *m)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
83 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
84 DWORD e = GetLastError ();
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
85 char *buf;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
86 FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
87 0,
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
88 e,
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
89 0,
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
90 (CHAR *)&buf,
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
91 0,
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
92 0);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
93 MessageBox (0, buf, m, 0);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
94 exit_setup (1);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
95 }