wok view fltk/stuff/Fl_XFont_On_Demand.patch @ rev 22317
updated xwax (1.5 -> 1.7)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Thu Nov 14 15:16:09 2019 +0100 (2019-11-14) |
| parents | |
| children |
line source
1 Index: src/fl_font.cxx
2 ===================================================================
3 --- src/fl_font.cxx (revision 10503)
4 +++ src/fl_font.cxx (revision 10504)
5 @@ -55,6 +55,12 @@
6 # include "fl_font_x.cxx"
7 #endif // WIN32
9 +#if ! (defined(WIN32) || defined(__APPLE__))
10 +XFontStruct *fl_X_core_font()
11 +{
12 + return fl_xfont.value();
13 +}
14 +#endif
16 double fl_width(const char* c) {
17 if (c) return fl_width(c, (int) strlen(c));
18 Index: src/gl_draw.cxx
19 ===================================================================
20 --- src/gl_draw.cxx (revision 10503)
21 +++ src/gl_draw.cxx (revision 10504)
22 @@ -81,7 +81,7 @@
23 * then sorting through them at draw time (for normal X rendering) to find which one can
24 * render the current glyph... But for now, just use the first font in the list for GL...
25 */
26 - XFontStruct *font = fl_xfont;
27 + XFontStruct *font = fl_X_core_font();
28 int base = font->min_char_or_byte2;
29 int count = font->max_char_or_byte2-base+1;
30 fl_fontsize->listbase = glGenLists(256);
31 Index: FL/x.H
32 ===================================================================
33 --- FL/x.H (revision 10503)
34 +++ FL/x.H (revision 10504)
35 @@ -132,6 +132,7 @@
36 XFontStruct *ptr;
37 };
38 extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
39 +extern FL_EXPORT XFontStruct* fl_X_core_font();
41 // this object contains all X-specific stuff about a window:
42 // Warning: this object is highly subject to change!