• YAMAMOTO Mitsuharu's avatar
    Don't link libXft when using cairo · 5f4e8e2e
    YAMAMOTO Mitsuharu authored
    * configure.ac: Check cairo early.  Don't try Xft if cairo is used.
    * lwlib/lwlib-utils.h [USE_CAIRO]: Include cairo.h and fontconfig.h.
    (XftFont, XftDraw, XftColor, XGlyphInfo) [USE_CAIRO]: New typedefs.
    (XftFontOpenName, XftFontClose, XftDrawCreate, XftDrawDestroy)
    (XftDrawRect, XftDrawStringUtf8, XftTextExtentsUtf8) [USE_CAIRO]: New macros.
    (crxft_font_open_name, crxft_font_close, crxft_draw_create)
    (crxft_draw_rect, crxft_draw_string, crxft_text_extents) [USE_CAIRO]: New
    externs.
    * lwlib/lwlib-utils.c [USE_CAIRO]: Include math.h, cairo-ft.h, and
    cairo-xlib.h.
    (crxft_font_open_name, crxft_font_close, crxft_draw_create)
    (crxft_set_source_color, crxft_draw_rect, crxft_draw_string)
    (crxft_text_extents) [USE_CAIRO]: New Xft compatibility functions.
    * lwlib/xlwmenuP.h [USE_CAIRO]: Include lwlib-utils.h.
    * lwlib/xlwmenu.c (display_menu_item) [USE_CAIRO]: Call
    cairo_surface_mark_dirty and cairo_surface_flush.
    * lwlib/lwlib-Xaw.c [USE_CAIRO]: Include stdlib.h and lwlib-utils.h.
    (draw_text) [USE_CAIRO]: Call cairo_surface_flush.
    * src/xsettings.c [USE_CAIRO]: Include fontconfig.h
    (apply_xft_settings) [!HAVE_XFT]: Don't call XftDefaultSubstitute or
    XftDefaultSet.
    * lwlib/lwlib-Xaw.c:
    * lwlib/lwlib-int.h:
    * lwlib/xlwmenu.c:
    * lwlib/xlwmenuP.h:
    * src/xrdb.c:
    * src/xsettings.c:
    * src/xterm.c: Replace all #ifdef HAVE_XFT with #if defined USE_CAIRO ||
    defined HAVE_XFT.
    * src/xfns.c (x_default_font_parameter): Replace #ifdef HAVE_XFT with #if
    defined	USE_CAIRO || defined HAVE_XFT.
    5f4e8e2e
Name
Last commit
Last update
admin Loading commit data...
build-aux Loading commit data...
doc Loading commit data...
etc Loading commit data...
leim Loading commit data...
lib Loading commit data...
lib-src Loading commit data...
lisp Loading commit data...
lwlib Loading commit data...
m4 Loading commit data...
modules Loading commit data...
msdos Loading commit data...
nextstep Loading commit data...
nt Loading commit data...
oldXMenu Loading commit data...
src Loading commit data...
test Loading commit data...
.clang-format Loading commit data...
.dir-locals.el Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.gitlab-ci.yml Loading commit data...
BUGS Loading commit data...
CONTRIBUTE Loading commit data...
COPYING Loading commit data...
ChangeLog.1 Loading commit data...
ChangeLog.2 Loading commit data...
ChangeLog.3 Loading commit data...
GNUmakefile Loading commit data...
INSTALL Loading commit data...
INSTALL.REPO Loading commit data...
Makefile.in Loading commit data...
README Loading commit data...
autogen.sh Loading commit data...
config.bat Loading commit data...
configure.ac Loading commit data...
make-dist Loading commit data...