Mercurial > hg > xemacs-beta
annotate src/terminfo.c @ 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 | 04bc9d2f42c7 |
children | 308d34e9f07d |
rev | line source |
---|---|
428 | 1 /* Interface from Emacs to terminfo. |
2 Copyright (C) 1985, 1986, 1993 Free Software Foundation, Inc. | |
3 | |
4 This file is part of XEmacs. | |
5 | |
6 XEmacs is free software; you can redistribute it and/or modify it | |
7 under the terms of the GNU General Public License as published by the | |
8 Free Software Foundation; either version 2, or (at your option) any | |
9 later version. | |
10 | |
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
14 for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with XEmacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
19 Boston, MA 02111-1307, USA. */ | |
20 | |
21 /* Synched up with: FSF 19.30. */ | |
22 | |
23 #include <config.h> | |
24 | |
25 #include <string.h> | |
26 | |
27 /* Every little bit of this God-damned file has caused all manner | |
28 of headaches due to inconsistent and incorrect header files | |
29 on one system or other, and we don't currently need anything here, | |
30 so just comment the whole damn lot out!!! */ | |
31 | |
32 #ifndef HAVE_TERMIOS | |
33 | |
34 #ifdef AIX | |
35 #include <termio.h> | |
36 #endif /* AIX */ | |
37 | |
38 /* Interface to curses/terminfo library. | |
39 Turns out that all of the terminfo-level routines look | |
40 like their termcap counterparts except for tparm, which replaces | |
41 tgoto. Not only is the calling sequence different, but the string | |
42 format is different too. | |
43 */ | |
44 | |
442 | 45 #include CURSES_H_FILE |
428 | 46 /* Sun, in their infinite lameness, supplies (possibly) broken headers |
47 even under Solaris. GCC feels it necessary to correct things by | |
48 supplying its own headers. Unfortunately, if you build GCC under | |
49 one version of Solaris and then upgrade your Solaris, you may get | |
50 screwed because Sun in their continuing lameness changes curses.h | |
51 in such a way that the "fixed" GCC headers are now broken. (GCC | |
52 is equally lame in that it supplies "fixed" headers for curses.h | |
53 but not term.h.) However, it seems to work to just not include | |
54 term.h under Solaris, so we try that. KLUDGE! */ | |
55 #if !(defined (__GNUC__) && defined (SOLARIS2)) | |
442 | 56 #include TERM_H_FILE |
428 | 57 #endif |
58 | |
59 extern void *xmalloc (int size); | |
60 | |
61 #if 0 /* If this isn't declared somewhere, too bad */ | |
442 | 62 extern char * tparm (const char *string, int arg1, int arg2, int arg3, |
428 | 63 int arg4, int arg5, int arg6, int arg7, int arg8, |
64 int arg9); | |
65 #endif | |
66 /* XEmacs: renamed this function because just tparam() conflicts with | |
67 ncurses (We don't use this function anyway!) */ | |
68 char * | |
2286 | 69 emacs_tparam (const char *string, char *outstring, int UNUSED (len), int arg1, |
428 | 70 int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, |
71 int arg8, int arg9) | |
72 { | |
73 char *temp; | |
74 | |
75 temp = (char *) tparm (string, arg1, arg2, arg3, arg4, arg5, arg6, arg7, | |
76 arg8, arg9); | |
77 if (outstring == 0) | |
78 outstring = (char *) xmalloc (strlen (temp) + 1); | |
79 strcpy (outstring, temp); | |
80 return outstring; | |
81 } | |
82 | |
83 #endif /* not HAVE_TERMIOS */ |