gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 12:58:08 +01:00
Code Issues Projects Releases Wiki Activity

support for compiling with xft2

Browse Source
This commit is contained in:
dan
2003-06-10 01:56:26 +00:00
parent 8904783aee
commit 64468fcf63
4 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -97,6 +97,7 @@ Changes since version 0.80.2:
(Peter Zijlstra <a.p.zijlstra@chello.nl>) (Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Icon arrangement that takes the new extended xinerama 'strut' into account - Icon arrangement that takes the new extended xinerama 'strut' into account
(Peter Zijlstra <a.p.zijlstra@chello.nl>) (Peter Zijlstra <a.p.zijlstra@chello.nl>)
- Fixed the 'KDE omnipresent' bug.
Changes since version 0.80.1: Changes since version 0.80.1:

2
WINGs/Makefile.am
View File

@@ -110,7 +110,7 @@ libWUtil_a_SOURCES = \
CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\" CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \ INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG
wcolorpanel.o: wcolorpanel.c wcolorpanel.o: wcolorpanel.c

5
WINGs/widgets.c
View File

@@ -629,7 +629,12 @@ WMCreateScreenWithRContext(Display *display, int screen, RContext *context)
scrPtr->xftFontSetCache = WMCreateHashTable(WMStringPointerHashCallbacks); scrPtr->xftFontSetCache = WMCreateHashTable(WMStringPointerHashCallbacks);
#ifdef XFT #ifdef XFT
# ifdef XFT2
scrPtr->hasXftSupport = 1;
# else
scrPtr->hasXftSupport = XftDefaultHasRender(scrPtr->display); scrPtr->hasXftSupport = XftDefaultHasRender(scrPtr->display);
# endif
scrPtr->xftdraw = XftDrawCreate(scrPtr->display, W_DRAWABLE(scrPtr), scrPtr->xftdraw = XftDrawCreate(scrPtr->display, W_DRAWABLE(scrPtr),
scrPtr->visual, scrPtr->colormap); scrPtr->visual, scrPtr->colormap);

31
configure.ac
View File

@@ -232,9 +232,14 @@ if test "$ac_cv_prog_gcc" = yes; then
fi fi
dnl pkg-config
dnl ----------
dnl AC_ARG_VAR(PKGCONFIG, [pkg-config command])
AC_CHECK_PROG(PKGCONFIG, pkg-config, pkg-config)
dnl gettext dnl gettext
dnl ======= dnl -------
dnl AM_GNU_GETTEXT dnl AM_GNU_GETTEXT
@@ -517,13 +522,29 @@ AC_ARG_ENABLE(xft,
xft=$enableval, xft=yes) xft=$enableval, xft=yes)
if test "$xft" = yes; then if test "$xft" = yes; then
AC_CHECK_LIB(Xft, XftDrawCreate, [XFTLIBS="-lXft" if test "x$PKGCONFIG" != x -a "`$PKGCONFIG xft; echo $?`" = 0; then
AC_SUBST(XFTLIBS) XFTCONFIG="$PKGCONFIG xft"
AC_DEFINE(XFT, 1, [define if you want support for antialiased fonts (set by configure)])], pkgconfig_xft=yes
else
AC_CHECK_PROG(XFTCONFIG, xft-config, xft-config)
fi
if test "x$XFTCONFIG" != x; then
XFTLIBS=`$XFTCONFIG --libs`
XFTFLAGS=`$XFTCONFIG --cflags`
AC_MSG_CHECKING([for the Xft2 library])
AC_MSG_RESULT([found])
AC_DEFINE(XFT2, 1, [define if you have Xft version 2 (set by configure)])
else
AC_CHECK_LIB(Xft, XftDrawCreate, [XFTLIBS="-lXft" XFTFLAGS=""],
xft=no, $XLFLAGS $XLIBS) xft=no, $XLFLAGS $XLIBS)
fi
if test "$xft" = yes; then
AC_SUBST(XFTFLAGS)
AC_SUBST(XFTLIBS)
AC_DEFINE(XFT, 1, [define if you want support for antialiased fonts (set by configure)])
fi
fi fi
dnl XINERAMA support dnl XINERAMA support
dnl ================ dnl ================
xinerama=no xinerama=no