diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-05-04 21:58:59 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-05-04 21:58:59 +0000 |
| commit | e2baef33cdfd3e5f90cdce2685b6239b1979b721 (patch) | |
| tree | e521ea201d7cec8fa93dd4b57e86a1de8c6cf29e /src/gl_draw.cxx | |
| parent | 13005b2a3f0f16579522523460a82dca48e855a4 (diff) | |
gl_font() didn't work properly for X11 when Xft was used (STR #12)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2976 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/gl_draw.cxx')
| -rw-r--r-- | src/gl_draw.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx index 25ef3468f..c19d0139d 100644 --- a/src/gl_draw.cxx +++ b/src/gl_draw.cxx @@ -1,5 +1,5 @@ // -// "$Id: gl_draw.cxx,v 1.7.2.5.2.10 2003/01/30 21:44:33 easysw Exp $" +// "$Id: gl_draw.cxx,v 1.7.2.5.2.11 2003/05/04 21:58:59 easysw Exp $" // // OpenGL drawing support routines for the Fast Light Tool Kit (FLTK). // @@ -36,6 +36,10 @@ #include "Fl_Gl_Choice.H" #include "Fl_Font.H" +#if USE_XFT +extern XFontStruct* fl_xxfont(); +#endif // USE_XFT + int gl_height() {return fl_height();} int gl_descent() {return fl_descent();} double gl_width(const char* s) {return fl_width(s);} @@ -58,6 +62,9 @@ void gl_font(int fontid, int size) { aglUseFont(aglGetCurrentContext(), fl_fontsize->font, fl_fontsize->face, fl_fontsize->size, 0, 256, fl_fontsize->listbase); #else +# if USE_XFT + fl_xfont = fl_xxfont(); +# endif // USE_XFT int base = fl_xfont->min_char_or_byte2; int count = fl_xfont->max_char_or_byte2-base+1; fl_fontsize->listbase = glGenLists(256); @@ -159,5 +166,5 @@ void gl_draw_image(const uchar* b, int x, int y, int w, int h, int d, int ld) { #endif // -// End of "$Id: gl_draw.cxx,v 1.7.2.5.2.10 2003/01/30 21:44:33 easysw Exp $". +// End of "$Id: gl_draw.cxx,v 1.7.2.5.2.11 2003/05/04 21:58:59 easysw Exp $". // |