Mercurial > hg > xemacs-beta
view src/libinterface.h @ 4916:a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* configure:
* configure.ac (TAB):
USE_XFT* -> HAVE_XFT*.
lwlib/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* lwlib-colors.c:
* lwlib-colors.h:
* lwlib-fonts.c:
* lwlib-fonts.h:
* xlwmenu.c:
* xlwmenu.c (xlwMenuResources):
* xlwmenu.c (x_xft_text_width):
* xlwmenu.c (label_button_draw):
* xlwmenu.c (push_button_size):
* xlwmenu.c (push_button_draw):
* xlwmenu.c (make_drawing_gcs):
* xlwmenu.c (extract_font_extents):
* xlwmenu.c (default_font_of_font_list):
* xlwmenu.c (XlwMenuInitialize):
* xlwmenu.c (XlwMenuDestroy):
* xlwmenu.c (XlwMenuSetValues):
* xlwmenuP.h:
* xlwmenuP.h (_XlwMenu_part):
* xlwtabs.c:
* xlwtabs.c (TabsInit):
* xlwtabs.c (TabsDestroy):
* xlwtabs.c (TabsSetValues):
* xlwtabs.c (DrawTab):
* xlwtabs.c (TabWidth):
* xlwtabs.c (TabsAllocFgGC):
* xlwtabs.c (TabsAllocGreyGC):
* xlwtabsP.h:
USE_XFT* -> HAVE_XFT*.
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* Makefile.in.in:
* compiler.h:
* config.h.in:
* console-x-impl.h:
* console-x-impl.h (struct x_frame):
* console-x-impl.h (FRAME_X_TOTALLY_VISIBLE_P):
* console-x.h:
* console-xlike-inc.h:
* emacs.c (main_1):
* faces.c (complex_vars_of_faces):
* font-mgr.h:
* frame-x.c (x_delete_frame):
* frame-x.c (x_update_frame_external_traits):
* glyphs-x.c (update_widget_face):
* inline.c:
* objects-x-impl.h:
* objects-x-impl.h (struct x_color_instance_data):
* objects-x-impl.h (struct x_font_instance_data):
* objects-x.c:
* objects-x.c (x_initialize_color_instance):
* objects-x.c (x_initialize_font_instance):
* objects-x.c (x_print_font_instance):
* objects-x.c (x_finalize_font_instance):
* objects-x.c (x_font_instance_truename):
* objects-x.c (vars_of_objects_x):
* objects-x.h:
USE_XFT* -> HAVE_XFT*. But in objects-xlike-inc.c and
redisplay-xlike-inc.c, continue to use USE_XFT, and define
it appropriately in console-xlike-inc.h when both HAVE_XFT
and THIS_IS_X -- even if HAVE_XFT, we don't want to enable
XFT code when included in a *-gtk.c file.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 01 Feb 2010 22:00:29 -0600 |
parents | 1cecc3e9f0a0 |
children | 308d34e9f07d |
line wrap: on
line source
/* Define prototypes for graphics library interface functions. Copyright (C) 2002 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ #ifndef INCLUDED_libinterface_h_ #define INCLUDED_libinterface_h_ #ifdef HAVE_GIF #include <gif_lib.h> #endif /* HAVE_GIF */ #ifdef HAVE_PNG BEGIN_C_DECLS #define message message_ /* Yuck */ /* See comment in libinterface.c for the following */ #define PNG_EXPORT(type, symbol) type XCDECL symbol #define ZEXPORT XCDECL #define ZEXPORTVA XCDECL #include <png.h> #undef message END_C_DECLS #endif /* HAVE_PNG */ /* #### WARNING: Utterly random magic here to prevent namespace conflicts when no one bothers to be the least bit namespace-clean. Potential problems: INT32, FAR. DONT_NEED_JPEG avoids the problem with FAR in glyphs-msw.c. For some reason, putting the XPM code after this fixes other problems; don't move it before. --ben */ #if defined (HAVE_JPEG) && !defined (DONT_NEED_JPEG) BEGIN_C_DECLS #ifdef _MSC_VER # ifndef XMD_H /* Yuck! This tricks jpeglib.h into not defining INT32, which is defined in VC98/INCLUDE/basetsd.h */ # define UNDEF_XMD_H_ME_HARDER # define XMD_H # endif #endif /* _MSC_VER */ #include <jpeglib.h> #ifdef UNDEF_XMD_H_ME_HARDER # undef XMD_H #endif #include <jerror.h> END_C_DECLS boolean XCDECL qxe_jpeg_finish_decompress (j_decompress_ptr cinfo); boolean XCDECL qxe_jpeg_start_decompress (j_decompress_ptr cinfo); JDIMENSION XCDECL qxe_jpeg_read_scanlines (j_decompress_ptr cinfo, JSAMPARRAY scanlines, JDIMENSION max_lines); int XCDECL qxe_jpeg_read_header (j_decompress_ptr cinfo, boolean require_image); #define qxe_jpeg_create_decompress(cinfo) \ qxe_jpeg_CreateDecompress((cinfo), JPEG_LIB_VERSION, \ (size_t) sizeof(struct jpeg_decompress_struct)) void XCDECL qxe_jpeg_CreateDecompress (j_decompress_ptr cinfo, int version, size_t structsize); struct jpeg_error_mgr * XCDECL qxe_jpeg_std_error (struct jpeg_error_mgr *err); void XCDECL qxe_jpeg_destroy_decompress (j_decompress_ptr cinfo); boolean XCDECL qxe_jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired); #endif /* defined (HAVE_JPEG) && !defined (DONT_NEED_JPEG) */ #ifdef HAVE_XPM #ifndef HAVE_GTK /* #### ????????????????????? No comprendo ni un poco. This was here before, in a different file. --ben */ #include <X11/xpm.h> #endif void XCDECL qxe_XpmFreeXpmImage (XpmImage *image); void XCDECL qxe_XpmFreeXpmInfo (XpmInfo *info); int XCDECL qxe_XpmCreateXpmImageFromBuffer (char *buffer, XpmImage *image, XpmInfo *info); void XCDECL qxe_XpmFree (void *ptr); int XCDECL qxe_XpmReadFileToData (char *filename, char ***data_return); #endif /* HAVE_XPM */ #ifdef HAVE_TIFF #include "tiffio.h" tdata_t XCDECL qxe_TIFFmalloc (tsize_t x1); void XCDECL qxe_TIFFfree (tdata_t x1); void XCDECL qxe_TIFFClose (TIFF *x1); int XCDECL qxe_TIFFGetField (TIFF *x1, ttag_t x2, uint32 *x3); TIFF * XCDECL qxe_TIFFClientOpen (const char *x1, const char *x2, thandle_t x3, TIFFReadWriteProc x4, TIFFReadWriteProc x5, TIFFSeekProc x6, TIFFCloseProc x7, TIFFSizeProc x8, TIFFMapFileProc x9, TIFFUnmapFileProc x10); TIFFErrorHandler XCDECL qxe_TIFFSetErrorHandler (TIFFErrorHandler x1); TIFFErrorHandler XCDECL qxe_TIFFSetWarningHandler (TIFFErrorHandler x1); int XCDECL qxe_TIFFReadRGBAImage (TIFF *x1, uint32 x2, uint32 x3, uint32 *x4, int x5); #endif /* HAVE_TIFF */ #endif /* INCLUDED_libinterface_h_ */