Mercurial > hg > xemacs-beta
annotate src/libinterface.h @ 4882:eab9498ecc0e
merge most of rest of redisplay-x.c and redisplay-gtk.c into redisplay-xlike-inc.c
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-01-18 Ben Wing <ben@xemacs.org>
* redisplay-gtk.c:
* redisplay-gtk.c (gtk_bevel_area):
* redisplay-x.c:
* redisplay-x.c (THIS_IS_X):
* redisplay-xlike-inc.c:
* redisplay-xlike-inc.c (XLIKE_text_width_single_run):
* redisplay-xlike-inc.c (XLIKE_text_width):
* redisplay-xlike-inc.c (XLIKE_output_display_block):
* redisplay-xlike-inc.c (XLIKE_get_gc):
* redisplay-xlike-inc.c (XLIKE_output_string):
* redisplay-xlike-inc.c (XLIKE_OUTPUT_XLIKE_PIXMAP):
* redisplay-xlike-inc.c (XLIKE_output_pixmap):
* redisplay-xlike-inc.c (XLIKE_output_vertical_divider):
* redisplay-xlike-inc.c (XLIKE_output_blank):
* redisplay-xlike-inc.c (XLIKE_output_horizontal_line):
* redisplay-xlike-inc.c (XLIKE_clear_region):
* redisplay-xlike-inc.c (XLIKE_output_eol_cursor):
* redisplay-xlike-inc.c (XLIKE_clear_frame_window):
* redisplay-xlike-inc.c (XLIKE_clear_frame):
* redisplay-xlike-inc.c (XLIKE_flash):
* redisplay-xlike-inc.c (console_type_create_redisplay_XLIKE):
Move lots more code into redisplay-xlike-inc.c. Use macros to
isolate the code that differs among X vs. GTK, to reduce the need
for ifdefs in the middle of the code. Now, redisplay-x.c and
redisplay-gtk.c only contain a few functions whose implementation
is completely different from one to the other, or which are not
present at all in one of them.
GTK code not currently tested, but it has bitrotted somewhat
any. Doing this will help keep it less bitrotty.
* depend: Regenerate.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 18 Jan 2010 08:44:49 -0600 |
| parents | 1cecc3e9f0a0 |
| children | 308d34e9f07d |
| 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 | |
|
4708
1cecc3e9f0a0
Use giflib or libungif to provide GIF support, instead of using internal
Jerry James <james@xemacs.org>
parents:
1743
diff
changeset
|
27 #include <gif_lib.h> |
| 870 | 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_ */ |