mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gl_draw.cxx: simplified/clarified #define's

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7500 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2010-04-14 09:29:08 +00:00
parent 4b32140457
commit 97c893ab5e
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/gl_draw.cxx
View File

@ -60,6 +60,7 @@ double gl_width(uchar c) {return fl_width(c);}
static Fl_Font_Descriptor *gl_fontsize; static Fl_Font_Descriptor *gl_fontsize;
#define GL_DRAW_USES_TEXTURES (defined(__APPLE__) && !__ppc__) // 1 only for non-PPC OSX
#ifndef __APPLE__ #ifndef __APPLE__
# define USE_OksiD_style_GL_font_selection 1 // Most hosts except OSX # define USE_OksiD_style_GL_font_selection 1 // Most hosts except OSX
#else #else
@ -75,6 +76,7 @@ static Fl_Font_Descriptor *gl_fontsize;
*/ */
void gl_font(int fontid, int size) { void gl_font(int fontid, int size) {
fl_font(fontid, size); fl_font(fontid, size);
#if !GL_DRAW_USES_TEXTURES
if (!fl_fontsize->listbase) { if (!fl_fontsize->listbase) {
#ifdef USE_OksiD_style_GL_font_selection #ifdef USE_OksiD_style_GL_font_selection
@ -94,6 +96,7 @@ void gl_font(int fontid, int size) {
fl_fontsize->listbase = glGenLists(256); fl_fontsize->listbase = glGenLists(256);
glXUseXFont(font->fid, base, count, fl_fontsize->listbase+base); glXUseXFont(font->fid, base, count, fl_fontsize->listbase+base);
# elif defined(WIN32) # elif defined(WIN32)
// this is unused because USE_OksiD_style_GL_font_selection == 1
int base = fl_fontsize->metr.tmFirstChar; int base = fl_fontsize->metr.tmFirstChar;
int count = fl_fontsize->metr.tmLastChar-base+1; int count = fl_fontsize->metr.tmLastChar-base+1;
HFONT oldFid = (HFONT)SelectObject(fl_gc, fl_fontsize->fid); HFONT oldFid = (HFONT)SelectObject(fl_gc, fl_fontsize->fid);
@ -101,7 +104,6 @@ void gl_font(int fontid, int size) {
wglUseFontBitmaps(fl_gc, base, count, fl_fontsize->listbase+base); wglUseFontBitmaps(fl_gc, base, count, fl_fontsize->listbase+base);
SelectObject(fl_gc, oldFid); SelectObject(fl_gc, oldFid);
# elif defined(__APPLE_QUARTZ__) # elif defined(__APPLE_QUARTZ__)
#if __ppc__
//AGL is not supported for use in 64-bit applications: //AGL is not supported for use in 64-bit applications:
//http://developer.apple.com/mac/library/documentation/Carbon/Conceptual/Carbon64BitGuide/OtherAPIChanges/OtherAPIChanges.html //http://developer.apple.com/mac/library/documentation/Carbon/Conceptual/Carbon64BitGuide/OtherAPIChanges/OtherAPIChanges.html
short font, face, size; short font, face, size;
@ -114,18 +116,15 @@ void gl_font(int fontid, int size) {
fl_fontsize->listbase = glGenLists(256); fl_fontsize->listbase = glGenLists(256);
aglUseFont(aglGetCurrentContext(), font, face, aglUseFont(aglGetCurrentContext(), font, face,
size, 0, 256, fl_fontsize->listbase); size, 0, 256, fl_fontsize->listbase);
# endif
# else # else
# error unsupported platform # error unsupported platform
# endif # endif
#endif // USE_OksiD_style_GL_font_selection #endif // USE_OksiD_style_GL_font_selection
} }
gl_fontsize = fl_fontsize;
#if !(defined( __APPLE_QUARTZ__) && !__ppc__)
glListBase(fl_fontsize->listbase); glListBase(fl_fontsize->listbase);
#endif #endif // !GL_DRAW_USES_TEXTURES
gl_fontsize = fl_fontsize;
} }
#ifndef __APPLE__ #ifndef __APPLE__
@ -196,8 +195,8 @@ void gl_remove_displaylist_fonts()
#endif #endif
} }
#if defined( __APPLE__) && !__ppc__ #if GL_DRAW_USES_TEXTURES
static void gl_draw_cocoa(const char* str, int n); static void gl_draw_textures(const char* str, int n);
#endif #endif
/** /**
@ -208,22 +207,15 @@ static void gl_draw_cocoa(const char* str, int n);
void gl_draw(const char* str, int n) { void gl_draw(const char* str, int n) {
#ifdef __APPLE__ #ifdef __APPLE__
#if !__ppc__ #if GL_DRAW_USES_TEXTURES
gl_draw_cocoa(str, n); gl_draw_textures(str, n);
#else #else
// Should be converting the text here, as for other platforms???
glCallLists(n, GL_UNSIGNED_BYTE, str); glCallLists(n, GL_UNSIGNED_BYTE, str);
#endif #endif
#else #else
static xchar *buf = NULL; static xchar *buf = NULL;
static int l = 0; static int l = 0;
// if (n > l) {
// buf = (xchar*) realloc(buf, sizeof(xchar) * (n + 20));
// l = n + 20;
// }
// n = fl_utf2unicode((const unsigned char*)str, n, buf);
int wn = fl_utf8toUtf16(str, n, (unsigned short*)buf, l); int wn = fl_utf8toUtf16(str, n, (unsigned short*)buf, l);
if(wn >= l) { if(wn >= l) {
buf = (xchar*) realloc(buf, sizeof(xchar) * (wn + 1)); buf = (xchar*) realloc(buf, sizeof(xchar) * (wn + 1));
@ -364,13 +356,13 @@ void gl_draw_image(const uchar* b, int x, int y, int w, int h, int d, int ld) {
glDrawPixels(w,h,d<4?GL_RGB:GL_RGBA,GL_UNSIGNED_BYTE,(const ulong*)b); glDrawPixels(w,h,d<4?GL_RGB:GL_RGBA,GL_UNSIGNED_BYTE,(const ulong*)b);
} }
#if (defined( __APPLE__) && !__ppc__) || defined(FL_DOXYGEN) #if GL_DRAW_USES_TEXTURES || defined(FL_DOXYGEN)
#include <FL/glu.h> #include <FL/glu.h>
// manages a fifo pile of pre-computed string textures // manages a fifo pile of pre-computed string textures
class gl_texture_fifo { class gl_texture_fifo {
friend void gl_draw_cocoa(const char *, int); friend void gl_draw_textures(const char *, int);
private: private:
typedef struct { // information for a pre-computed texture typedef struct { // information for a pre-computed texture
GLuint texName; // its name GLuint texName; // its name
@ -523,7 +515,7 @@ int gl_texture_fifo::already_known(const char *str, int n)
static gl_texture_fifo *gl_fifo = NULL; // points to the texture pile class instance static gl_texture_fifo *gl_fifo = NULL; // points to the texture pile class instance
// draws a utf8 string using pre-computed texture if available // draws a utf8 string using pre-computed texture if available
static void gl_draw_cocoa(const char* str, int n) static void gl_draw_textures(const char* str, int n)
{ {
if (! gl_fifo) gl_fifo = new gl_texture_fifo(); if (! gl_fifo) gl_fifo = new gl_texture_fifo();
if (!gl_fifo->textures_generated) { if (!gl_fifo->textures_generated) {
@ -566,7 +558,7 @@ void gl_texture_pile_height(int max)
/** @} */ /** @} */
#endif // __APPLE__ #endif // GL_DRAW_USES_TEXTURES
#endif // HAVE_GL #endif // HAVE_GL