gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 15:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

changed some HAVE_LIBXFT #ifdefs to HAVE_XFT; clarified difference between the two in configure.ac and config.h.in comments

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@21239 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
arobert 2005-05-20 13:57:21 +00:00
parent 638d943dc9
commit 6ba6f8a2a4
5 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2005-05-20 Adrian Robert <arobert@cogsci.ucsd.edu>
* Headers/xlib/XGGState.h, Source/xlib/XGGState.m: Changed
HAVE_LIBXFT #ifdefs to HAVE_XFT.
* configure.ac, config.h.in: Changed comments for HAVE_XFT to
clarify that it is different from HAVE_LIBXFT (latter is just the
runtime lib, while former implies a functional installation).
2005-05-14 Adrian Robert <arobert@cogsci.ucsd.edu>
* Source/xlib/XGGState.m: Added missing #ifdefs to last patch so

6
Headers/xlib/XGGState.h
View file

@ -31,7 +31,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include "x11/XGServer.h"
#ifdef HAVE_LIBXFT
#ifdef HAVE_XFT
#define id xwindowsid
#include <X11/Xft/Xft.h>
#undef id
@ -52,7 +52,7 @@
Drawable draw;
Drawable alpha_buffer;
Region clipregion;
#ifdef HAVE_LIBXFT
#ifdef HAVE_XFT
XftDraw *xft_draw;
XftDraw *xft_alpha_draw;
XftColor xft_color;
@ -74,7 +74,7 @@
- (Drawable) drawable;
- (GC) graphicContext;
- (NSRect) clipRect;
#ifdef HAVE_LIBXFT
#ifdef HAVE_XFT
- (XftDraw *)xftDrawForDrawable: (Drawable)d;
- (XftColor)xftColor;
#endif

8
Source/xlib/XGGState.m
View file

@ -107,7 +107,7 @@ static Region emptyRegion;
alpha_buffer = 0;
xgcntxt = None;
agcntxt = None;
#ifdef HAVE_LIBXFT
#ifdef HAVE_XFT
xft_draw = NULL;
xft_alpha_draw = NULL;
memset(&xft_color, 0, sizeof(XftColor));
@ -257,7 +257,7 @@ static Region emptyRegion;
gsColorToRGB(&c);
gcv.foreground = xrRGBToPixel(context, c);
[self setGCValues: gcv withMask: GCForeground];
#ifdef HAVE_LIBXFT
#ifdef HAVE_XFT
xft_color.color.red = 65535.0 * c.field[0];
xft_color.color.green = 65535.0 * c.field[1];
xft_color.color.blue = 65535.0 * c.field[2];
@ -280,7 +280,7 @@ static Region emptyRegion;
agcntxt = XCreateGC(XDPY, draw, GCForeground, &gcv);
else
XChangeGC(XDPY, agcntxt, GCForeground, &gcv);
#ifdef HAVE_LIBXFT
#ifdef HAVE_XFT
xft_color.color.alpha = 65535.0 * value;
#endif
}
@ -363,7 +363,7 @@ static Region emptyRegion;
return xgcntxt;
}
#ifdef HAVE_LIBXFT
#ifdef HAVE_XFT
- (XftColor) xftColor
{
return xft_color;

2
config.h.in
View file

@ -77,7 +77,7 @@
/* Define to 1 if you have the <X11/extensions/XShm.h> header file. */
#undef HAVE_X11_EXTENSIONS_XSHM_H
/* Define if you have the Xft library */
/* Define if you have a functional XFreeType installation, including libXft. */
#undef HAVE_XFT
/* Define to the address where bug reports for this package should be sent. */

2
configure.ac
View file

@ -187,7 +187,7 @@ if test $WITH_XFT = yes; then
save_LIBS=${LIBS}
CPPFLAGS="$XFT_CFLAGS $CPPFLAGS"
LIBS="$XFT_LIBS $LIBS"
AC_DEFINE(HAVE_XFT,1,[Define if you have the Xft library])
AC_DEFINE(HAVE_XFT,1,[Define if you have a functional XFreeType installation, including libXft.])
AC_CHECK_LIB(Xft, XftDrawStringUtf8, have_utf8=yes, have_utf8=no)
if test "$have_utf8" = yes; then
AC_DEFINE(HAVE_UTF8,1,[Define if you have XftDrawStringUtf8])