Object *objects;
struct patternindex patternindex;
+# ifdef HAVE_GLBITMAP
XFontStruct *mode_font;
GLuint font_dlist;
+# else
+ texture_font_data *font_data;
+# endif
} jugglestruct;
static jugglestruct *juggles = (jugglestruct *) NULL;
free(sp->pattern);
sp->pattern = NULL;
}
+# ifdef HAVE_GLBITMAP
if (sp->mode_font!=None) {
XFreeFontInfo(NULL,sp->mode_font,1);
sp->mode_font = None;
}
+# endif /* HAVE_GLBITMAP */
}
static Bool
sp->glx_context = init_GL(mi);
+# ifdef HAVE_GLBITMAP
load_font (mi->dpy, "titleFont", &sp->mode_font, &sp->font_dlist);
+# else /* !HAVE_GLBITMAP */
+ sp->font_data = load_texture_font (mi->dpy, "titleFont");
+# endif /* !HAVE_GLBITMAP */
reshape_juggle (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
clear_gl_error(); /* WTF? sometimes "invalid op" from glViewport! */
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glPushMatrix ();
+ glRotatef(current_device_rotation(), 0, 0, 1);
glTranslatef(0,-3,0);
}
}
- if(sp->mode_font != None) {
- print_gl_string (mi->dpy, sp->mode_font, sp->font_dlist,
- mi->xgwa.width, mi->xgwa.height,
- 10, mi->xgwa.height - 10,
- sp->pattern, False);
- }
+ print_gl_string (mi->dpy,
+# ifdef HAVE_GLBITMAP
+ sp->mode_font, sp->font_dlist,
+# else /* !HAVE_GLBITMAP */
+ sp->font_data,
+# endif /* !HAVE_GLBITMAP */
+ mi->xgwa.width, mi->xgwa.height,
+ 10, mi->xgwa.height - 10,
+ sp->pattern, False);
#ifdef MEMTEST
if((int)(sp->time/10) % 1000 == 0)