Mercurial > hg > xemacs-beta
annotate src/libinterface.h @ 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 | 543769b89fed |
| children | 1cecc3e9f0a0 |
| rev | line source |
|---|---|
| 870 | 1 /* Define prototypes for graphics library interface functions. |
| 2 Copyright (C) 2002 Ben Wing. | |
| 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: Not in FSF. */ | |
| 22 | |
| 23 #ifndef INCLUDED_libinterface_h_ | |
| 24 #define INCLUDED_libinterface_h_ | |
| 25 | |
| 26 #ifdef HAVE_GIF | |
| 27 #include "gifrlib.h" | |
| 28 #endif /* HAVE_GIF */ | |
| 29 | |
| 30 #ifdef HAVE_PNG | |
| 1743 | 31 BEGIN_C_DECLS |
| 870 | 32 #define message message_ /* Yuck */ |
| 33 /* See comment in libinterface.c for the following */ | |
| 34 #define PNG_EXPORT(type, symbol) type XCDECL symbol | |
| 35 #define ZEXPORT XCDECL | |
| 36 #define ZEXPORTVA XCDECL | |
| 37 #include <png.h> | |
| 38 #undef message | |
| 1743 | 39 END_C_DECLS |
| 870 | 40 #endif /* HAVE_PNG */ |
| 41 | |
| 42 /* #### WARNING: Utterly random magic here to prevent namespace conflicts | |
| 43 when no one bothers to be the least bit namespace-clean. Potential | |
| 44 problems: INT32, FAR. DONT_NEED_JPEG avoids the problem with FAR in | |
| 45 glyphs-msw.c. For some reason, putting the XPM code after this fixes | |
| 46 other problems; don't move it before. --ben */ | |
| 47 #if defined (HAVE_JPEG) && !defined (DONT_NEED_JPEG) | |
| 1743 | 48 BEGIN_C_DECLS |
| 870 | 49 #ifdef _MSC_VER |
| 50 # ifndef XMD_H | |
| 51 /* Yuck! This tricks jpeglib.h into not defining INT32, which is defined | |
| 52 in VC98/INCLUDE/basetsd.h */ | |
| 53 # define UNDEF_XMD_H_ME_HARDER | |
| 54 # define XMD_H | |
| 55 # endif | |
| 56 #endif /* _MSC_VER */ | |
| 57 #include <jpeglib.h> | |
| 58 #ifdef UNDEF_XMD_H_ME_HARDER | |
| 59 # undef XMD_H | |
| 60 #endif | |
| 61 #include <jerror.h> | |
| 1743 | 62 END_C_DECLS |
| 870 | 63 |
| 64 boolean XCDECL qxe_jpeg_finish_decompress (j_decompress_ptr cinfo); | |
| 65 boolean XCDECL qxe_jpeg_start_decompress (j_decompress_ptr cinfo); | |
| 66 JDIMENSION XCDECL qxe_jpeg_read_scanlines (j_decompress_ptr cinfo, | |
| 67 JSAMPARRAY scanlines, | |
| 68 JDIMENSION max_lines); | |
| 69 int XCDECL qxe_jpeg_read_header (j_decompress_ptr cinfo, boolean require_image); | |
| 70 #define qxe_jpeg_create_decompress(cinfo) \ | |
| 71 qxe_jpeg_CreateDecompress((cinfo), JPEG_LIB_VERSION, \ | |
| 72 (size_t) sizeof(struct jpeg_decompress_struct)) | |
| 73 void XCDECL qxe_jpeg_CreateDecompress (j_decompress_ptr cinfo, int version, | |
| 74 size_t structsize); | |
| 75 struct jpeg_error_mgr * XCDECL qxe_jpeg_std_error (struct jpeg_error_mgr *err); | |
| 76 void XCDECL qxe_jpeg_destroy_decompress (j_decompress_ptr cinfo); | |
| 77 boolean XCDECL qxe_jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired); | |
| 78 | |
| 79 #endif /* defined (HAVE_JPEG) && !defined (DONT_NEED_JPEG) */ | |
| 80 | |
| 81 #ifdef HAVE_XPM | |
| 82 | |
| 83 #ifndef HAVE_GTK /* #### ????????????????????? No comprendo ni un poco. | |
| 84 This was here before, in a different file. --ben */ | |
| 85 #include <X11/xpm.h> | |
| 86 #endif | |
| 87 | |
| 88 void XCDECL qxe_XpmFreeXpmImage (XpmImage *image); | |
| 89 void XCDECL qxe_XpmFreeXpmInfo (XpmInfo *info); | |
| 90 int XCDECL qxe_XpmCreateXpmImageFromBuffer (char *buffer, XpmImage *image, | |
| 91 XpmInfo *info); | |
| 92 void XCDECL qxe_XpmFree (void *ptr); | |
| 93 int XCDECL qxe_XpmReadFileToData (char *filename, char ***data_return); | |
| 94 | |
| 95 #endif /* HAVE_XPM */ | |
| 96 | |
| 97 #ifdef HAVE_TIFF | |
| 98 #include "tiffio.h" | |
| 99 | |
| 100 tdata_t XCDECL qxe_TIFFmalloc (tsize_t x1); | |
| 101 void XCDECL qxe_TIFFfree (tdata_t x1); | |
| 102 void XCDECL qxe_TIFFClose (TIFF *x1); | |
| 103 int XCDECL qxe_TIFFGetField (TIFF *x1, ttag_t x2, uint32 *x3); | |
| 104 TIFF * XCDECL qxe_TIFFClientOpen (const char *x1, const char *x2, | |
| 105 thandle_t x3, TIFFReadWriteProc x4, | |
| 106 TIFFReadWriteProc x5, TIFFSeekProc x6, | |
| 107 TIFFCloseProc x7, TIFFSizeProc x8, | |
| 108 TIFFMapFileProc x9, TIFFUnmapFileProc x10); | |
| 109 TIFFErrorHandler XCDECL qxe_TIFFSetErrorHandler (TIFFErrorHandler x1); | |
| 110 TIFFErrorHandler XCDECL qxe_TIFFSetWarningHandler (TIFFErrorHandler x1); | |
| 111 int XCDECL qxe_TIFFReadRGBAImage (TIFF *x1, uint32 x2, uint32 x3, uint32 *x4, | |
| 112 int x5); | |
| 113 | |
| 114 #endif /* HAVE_TIFF */ | |
| 115 | |
| 116 #endif /* INCLUDED_libinterface_h_ */ |