nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

config.h with have_xft_utf8

Browse source
This commit is contained in:
fluxgen 2002-11-17 17:20:49 +00:00
parent ee5cecd7fb
commit 9a9e59a233
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/XftFontImp.cc
View file

@ -19,11 +19,15 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
//$Id: XftFontImp.cc,v 1.3 2002/10/16 23:56:13 fluxgen Exp $ //$Id: XftFontImp.cc,v 1.4 2002/11/17 17:20:49 fluxgen Exp $
#include "XftFontImp.hh" #include "XftFontImp.hh"
#include "BaseDisplay.hh" #include "BaseDisplay.hh"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif //HAVE_CONFIG_H
XftFontImp::XftFontImp(const char *name, bool utf8):m_xftfont(0), XftFontImp::XftFontImp(const char *name, bool utf8):m_xftfont(0),
m_utf8mode(utf8) { m_utf8mode(utf8) {
if (name != 0) if (name != 0)
@ -86,7 +90,7 @@ void XftFontImp::drawText(Drawable w, int screen, GC gc, const char *text, size_
&rendcol, &xftcolor); &rendcol, &xftcolor);
// draw string // draw string
#ifdef X_HAVE_UTF8_STRING #ifdef HAVE_XFT_UTF8_STRING
if (m_utf8mode) { if (m_utf8mode) {
XftDrawStringUtf8(draw, XftDrawStringUtf8(draw,
&xftcolor, &xftcolor,
@ -94,7 +98,7 @@ void XftFontImp::drawText(Drawable w, int screen, GC gc, const char *text, size_
x, y, x, y,
(XftChar8 *)(text), len); (XftChar8 *)(text), len);
} else } else
#endif // X_HAVE_UTF8_STRING #endif // HAVE_XFT_UTF8_STRING
{ {
XftDrawString8(draw, XftDrawString8(draw,
&xftcolor, &xftcolor,
@ -112,14 +116,14 @@ unsigned int XftFontImp::textWidth(const char * const text, unsigned int len) co
if (m_xftfont == 0) if (m_xftfont == 0)
return 0; return 0;
XGlyphInfo ginfo; XGlyphInfo ginfo;
#ifdef X_HAVE_UTF8_STRING #ifdef HAVE_XFT_UTF8_STRING
if (m_utf8mode) { if (m_utf8mode) {
XftTextExtentsUtf8(BaseDisplay::getXDisplay(), XftTextExtentsUtf8(BaseDisplay::getXDisplay(),
m_xftfont, m_xftfont,
(XftChar8 *)text, len, (XftChar8 *)text, len,
&ginfo); &ginfo);
} else } else
#endif //X_HAVE_UTF8_STRING #endif //HAVE_XFT_UTF8_STRING
{ {
XftTextExtents8(BaseDisplay::getXDisplay(), XftTextExtents8(BaseDisplay::getXDisplay(),
m_xftfont, m_xftfont,