-/* glxfonts, Copyright (c) 2001-2012 Jamie Zawinski <jwz@jwz.org>
- * Loads X11 fonts for use with OpenGL.
+/* glxfonts, Copyright (c) 2001-2014 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* implied warranty.
*
* Draws 2D text over the GL scene, e.g., the FPS displays.
- *
- * There are two implementations here: one using glBitmap (the OpenGL 1.1 way)
- * and one using textures via texfont.c (since OpenGLES doesn't have glBitmap).
+ * Also billboarding.
+ * The lower-level character rendering code is in texfont.c.
*/
#ifdef HAVE_CONFIG_H
#include "resources.h"
#include "glxfonts.h"
+#include "texfont.h"
#include "fps.h"
-#ifndef HAVE_GLBITMAP
-# include "texfont.h"
-#endif /* HAVE_GLBITMAP */
-
/* These are in xlock-gl.c */
extern void clear_gl_error (void);
it might result in a round-trip, and stall of the pipeline.)
*/
-
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
-/* Width (and optionally height) of the string in pixels.
- */
-int
-string_width (XFontStruct *f, const char *c, int *height_ret)
-{
- int x = 0;
- int max_w = 0;
- int h = f->ascent + f->descent;
- while (*c)
- {
- int cc = *((unsigned char *) c);
- if (*c == '\n')
- {
- if (x > max_w) max_w = x;
- x = 0;
- h += f->ascent + f->descent;
- }
- else
- x += (f->per_char
- ? f->per_char[cc-f->min_char_or_byte2].width
- : f->min_bounds.rbearing);
- c++;
- }
- if (x > max_w) max_w = x;
- if (height_ret) *height_ret = h;
-
- return max_w;
-}
-
-
-#ifdef HAVE_GLBITMAP
-
-/* Mostly lifted from the Mesa implementation of glXUseXFont(), since
- Mac OS 10.6 no longer supports aglUseFont() which was their analog
- of that. This code could be in libjwxyz instead, but we might as
- well use the same text-drawing code on both X11 and Cocoa.
- */
-static void
-fill_bitmap (Display *dpy, Window win, GC gc,
- unsigned int width, unsigned int height,
- int x0, int y0, char c, GLubyte *bitmap)
-{
- XImage *image;
- int x, y;
- Pixmap pixmap;
-
- pixmap = XCreatePixmap (dpy, win, 8*width, height, 1);
- XSetForeground(dpy, gc, 0);
- XFillRectangle (dpy, pixmap, gc, 0, 0, 8*width, height);
- XSetForeground(dpy, gc, 1);
- XDrawString (dpy, pixmap, gc, x0, y0, &c, 1);
-
- image = XGetImage (dpy, pixmap, 0, 0, 8*width, height, 1, XYPixmap);
-
- /* Fill the bitmap (X11 and OpenGL are upside down wrt each other). */
- for (y = 0; y < height; y++)
- for (x = 0; x < 8*width; x++)
- if (XGetPixel (image, x, y))
- bitmap[width*(height - y - 1) + x/8] |= (1 << (7 - (x % 8)));
-
- XFreePixmap (dpy, pixmap);
- XDestroyImage (image);
-}
-
-
-#if 0
-static void
-dump_bitmap (unsigned int width, unsigned int height, GLubyte *bitmap)
-{
- int x, y;
-
- printf (" ");
- for (x = 0; x < 8*width; x++)
- printf ("%o", 7 - (x % 8));
- putchar ('\n');
- for (y = 0; y < height; y++)
- {
- printf ("%3o:", y);
- for (x = 0; x < 8*width; x++)
- putchar ((bitmap[width*(height - y - 1) + x/8] & (1 << (7 - (x % 8))))
- ? '#' : '.');
- printf (" ");
- for (x = 0; x < width; x++)
- printf ("0x%02x, ", bitmap[width*(height - y - 1) + x]);
- putchar ('\n');
- }
-}
-#endif
-
-
-void
-xscreensaver_glXUseXFont (Display *dpy, Font font,
- int first, int count, int listbase)
-{
- Window win = RootWindowOfScreen (DefaultScreenOfDisplay (dpy));
- Pixmap pixmap;
- GC gc;
- XGCValues values;
- unsigned long valuemask;
-
- XFontStruct *fs;
-
- GLint swapbytes, lsbfirst, rowlength;
- GLint skiprows, skippixels, alignment;
-
- unsigned int max_width, max_height, max_bm_width, max_bm_height;
- GLubyte *bm;
-
- int i;
-
- clear_gl_error ();
-
- fs = XQueryFont (dpy, font);
- if (!fs)
- {
- /*gl_error (CC->gl_ctx, GL_INVALID_VALUE,
- "Couldn't get font structure information");*/
- abort();
- return;
- }
-
- /* Allocate a bitmap that can fit all characters. */
- max_width = fs->max_bounds.rbearing - fs->min_bounds.lbearing;
- max_height = fs->max_bounds.ascent + fs->max_bounds.descent;
- max_bm_width = (max_width + 7) / 8;
- max_bm_height = max_height;
-
- bm = (GLubyte *) malloc ((max_bm_width * max_bm_height) * sizeof (GLubyte));
- if (!bm)
- {
- /*gl_error (CC->gl_ctx, GL_OUT_OF_MEMORY,
- "Couldn't allocate bitmap in glXUseXFont()");*/
- abort();
- return;
- }
-
- /* Save the current packing mode for bitmaps. */
- glGetIntegerv (GL_UNPACK_SWAP_BYTES, &swapbytes);
- glGetIntegerv (GL_UNPACK_LSB_FIRST, &lsbfirst);
- glGetIntegerv (GL_UNPACK_ROW_LENGTH, &rowlength);
- glGetIntegerv (GL_UNPACK_SKIP_ROWS, &skiprows);
- glGetIntegerv (GL_UNPACK_SKIP_PIXELS, &skippixels);
- glGetIntegerv (GL_UNPACK_ALIGNMENT, &alignment);
-
- /* Enforce a standard packing mode which is compatible with
- fill_bitmap() from above. This is actually the default mode,
- except for the (non)alignment. */
- glPixelStorei (GL_UNPACK_SWAP_BYTES, GL_FALSE);
- glPixelStorei (GL_UNPACK_LSB_FIRST, GL_FALSE);
- glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
- glPixelStorei (GL_UNPACK_SKIP_ROWS, 0);
- glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0);
- glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
-
- clear_gl_error(); /* WTF? sometimes "invalid op" from glPixelStorei! */
-
-
- pixmap = XCreatePixmap (dpy, win, 10, 10, 1);
- values.foreground = 0;
- values.background = 1;
- values.font = fs->fid;
- valuemask = GCForeground | GCBackground | GCFont;
- gc = XCreateGC (dpy, pixmap, valuemask, &values);
- XFreePixmap (dpy, pixmap);
-
-# ifdef HAVE_COCOA
- /* Anti-aliasing of fonts looks like crap with 1-bit bitmaps.
- It would be nice if we were using full-depth bitmaps, so
- that the text showed up anti-aliased on screen, but
- glBitmap() doesn't work that way. */
- jwxyz_XSetAntiAliasing (dpy, gc, False);
-# endif
-
- for (i = 0; i < count; i++)
- {
- unsigned int width, height, bm_width, bm_height;
- GLfloat x0, y0, dx, dy;
- XCharStruct *ch;
- int x, y;
- int c = first + i;
- int list = listbase + i;
-
- if (fs->per_char
- && (c >= fs->min_char_or_byte2) && (c <= fs->max_char_or_byte2))
- ch = &fs->per_char[c-fs->min_char_or_byte2];
- else
- ch = &fs->max_bounds;
-
- /* I'm not entirely clear on why this is necessary on OSX, but
- without it, the characters are clipped. And it does not hurt
- under real X11. -- jwz. */
- ch->lbearing--;
- ch->ascent++;
-
- /* glBitmap()'s parameters:
- "Bitmap parameters xorig, yorig, width, and height are
- computed from font metrics as descent-1, -lbearing,
- rbearing-lbearing, and ascent+descent, respectively.
- xmove is taken from the glyph's width metric, and
- ymove is set to zero. Finally, the glyph's image is
- converted to the appropriate format for glBitmap."
- */
- width = ch->rbearing - ch->lbearing;
- height = ch->ascent + ch->descent;
- x0 = - ch->lbearing;
- y0 = ch->descent - 1;
- dx = ch->width;
- dy = 0;
-
- /* X11's starting point. */
- x = - ch->lbearing;
- y = ch->ascent;
-
- /* Round the width to a multiple of eight. We will use this also
- for the pixmap for capturing the X11 font. This is slightly
- inefficient, but it makes the OpenGL part real easy. */
- bm_width = (width + 7) / 8;
- bm_height = height;
-
- glNewList (list, GL_COMPILE);
- if ((c >= fs->min_char_or_byte2) && (c <= fs->max_char_or_byte2)
- && (bm_width > 0) && (bm_height > 0))
- {
- memset (bm, '\0', bm_width * bm_height);
- fill_bitmap (dpy, win, gc, bm_width, bm_height, x, y, c, bm);
- glBitmap (width, height, x0, y0, dx, dy, bm);
-#if 0
- printf ("width/height = %d/%d\n", width, height);
- printf ("bm_width/bm_height = %d/%d\n", bm_width, bm_height);
- dump_bitmap (bm_width, bm_height, bm);
-#endif
- }
- else
- glBitmap (0, 0, 0.0, 0.0, dx, dy, NULL);
- glEndList ();
- }
-
- free (bm);
- XFreeFontInfo( NULL, fs, 0 );
- XFreeGC (dpy, gc);
-
- /* Restore saved packing modes. */
- glPixelStorei(GL_UNPACK_SWAP_BYTES, swapbytes);
- glPixelStorei(GL_UNPACK_LSB_FIRST, lsbfirst);
- glPixelStorei(GL_UNPACK_ROW_LENGTH, rowlength);
- glPixelStorei(GL_UNPACK_SKIP_ROWS, skiprows);
- glPixelStorei(GL_UNPACK_SKIP_PIXELS, skippixels);
- glPixelStorei(GL_UNPACK_ALIGNMENT, alignment);
-
- check_gl_error ("xscreensaver_glXUseXFont");
-}
-
-
-
-/* Loads the font named by the X resource "res".
- Returns an XFontStruct.
- Also converts the font to a set of GL lists and returns the first list.
-*/
-void
-load_font (Display *dpy, char *res, XFontStruct **font_ret, GLuint *dlist_ret)
-{
- XFontStruct *f;
-
- const char *font = get_string_resource (dpy, res, "Font");
- const char *def1 = "-*-helvetica-medium-r-normal-*-180-*";
- const char *def2 = "fixed";
- Font id;
- int first, last;
-
- if (!res || !*res) abort();
- if (!font_ret && !dlist_ret) abort();
-
- if (!font) font = def1;
-
- f = XLoadQueryFont(dpy, font);
- if (!f && !!strcmp (font, def1))
- {
- fprintf (stderr, "%s: unable to load font \"%s\", using \"%s\"\n",
- progname, font, def1);
- font = def1;
- f = XLoadQueryFont(dpy, font);
- }
-
- if (!f && !!strcmp (font, def2))
- {
- fprintf (stderr, "%s: unable to load font \"%s\", using \"%s\"\n",
- progname, font, def2);
- font = def2;
- f = XLoadQueryFont(dpy, font);
- }
-
- if (!f)
- {
- fprintf (stderr, "%s: unable to load fallback font \"%s\" either!\n",
- progname, font);
- exit (1);
- }
-
- id = f->fid;
- first = f->min_char_or_byte2;
- last = f->max_char_or_byte2;
-
-
- if (dlist_ret)
- {
- clear_gl_error ();
- *dlist_ret = glGenLists ((GLuint) last+1);
- check_gl_error ("glGenLists");
- xscreensaver_glXUseXFont (dpy, id, first, last-first+1,
- *dlist_ret + first);
- }
-
- if (font_ret)
- *font_ret = f;
-}
-
-#endif /* HAVE_GLBITMAP */
-
-
/* Draws the string on the window at the given pixel position.
Newlines and tab stops are honored.
Any numbers inside [] will be rendered as a subscript.
- Assumes the font has been loaded as with load_font().
+ Assumes the font has been loaded as with load_texture_font().
+
+ If width and height are 0, then instead the text is placed
+ into the 3D scene at the origin, billboarded to face the
+ viewer.
*/
void
print_gl_string (Display *dpy,
-# ifdef HAVE_GLBITMAP
- XFontStruct *font, GLuint font_dlist,
-# else
- texture_font_data *font_data,
-# endif
+ texture_font_data *data,
int window_width, int window_height,
GLfloat x, GLfloat y,
const char *string,
Bool clear_background_p)
{
-
- /* If window_width was specified, we're drawing ortho in pixel coordinates.
- Otherwise, we're just dropping the text at the current position in the
- scene, billboarded. */
Bool in_scene_p = (window_width == 0);
-# ifdef HAVE_GLBITMAP
- GLfloat line_height = font->ascent + font->descent;
- int cw = string_width (font, "m", 0);
-# else /* !HAVE_GLBITMAP */
int line_height = 0;
- int cw = texture_string_width (font_data, "m", &line_height);
-# endif /* !HAVE_GLBITMAP */
-
- GLfloat sub_shift = (line_height * 0.3);
- int tabs = cw * 7;
int lines = 0;
const char *c;
GLfloat color[4];
-# ifdef HAVE_GLBITMAP
- /* Sadly, this causes a stall of the graphics pipeline (as would the
- equivalent calls to glGet*.) But there's no way around this, short
- of having each caller set up the specific display matrix we need
- here, which would kind of defeat the purpose of centralizing this
- code in one file.
- */
- glPushAttrib (GL_TRANSFORM_BIT | /* for matrix contents */
- GL_ENABLE_BIT | /* for various glDisable calls */
- GL_CURRENT_BIT | /* for glColor3f() */
- GL_LIST_BIT); /* for glListBase() */
-# ifdef DEBUG
- check_gl_error ("glPushAttrib");
-# endif
-# else /* !HAVE_GLBITMAP */
- Bool tex_p = glIsEnabled (GL_TEXTURE_2D);
- Bool texs_p = glIsEnabled (GL_TEXTURE_GEN_S);
- Bool text_p = glIsEnabled (GL_TEXTURE_GEN_T);
- Bool light_p = glIsEnabled (GL_LIGHTING);
- Bool blend_p = glIsEnabled (GL_BLEND);
- Bool depth_p = glIsEnabled (GL_DEPTH_TEST);
- Bool cull_p = glIsEnabled (GL_CULL_FACE);
- Bool fog_p = glIsEnabled (GL_FOG);
- GLint oblend;
+ Bool tex_p = glIsEnabled (GL_TEXTURE_2D);
+ Bool texs_p = glIsEnabled (GL_TEXTURE_GEN_S);
+ Bool text_p = glIsEnabled (GL_TEXTURE_GEN_T);
+ Bool light_p = glIsEnabled (GL_LIGHTING);
+ Bool blend_p = glIsEnabled (GL_BLEND);
+ Bool depth_p = glIsEnabled (GL_DEPTH_TEST);
+ Bool cull_p = glIsEnabled (GL_CULL_FACE);
+ Bool fog_p = glIsEnabled (GL_FOG);
+ GLint oblend;
+ GLint ovp[4];
+
# ifndef HAVE_JWZGLES
- GLint opoly[2];
- glGetIntegerv (GL_POLYGON_MODE, opoly);
+ GLint opoly[2];
+ glGetIntegerv (GL_POLYGON_MODE, opoly);
# endif
- glGetIntegerv (GL_BLEND_DST, &oblend);
-# endif /* !HAVE_GLBITMAP */
- glGetFloatv (GL_CURRENT_COLOR, color);
+ if (!in_scene_p)
+ glGetIntegerv (GL_VIEWPORT, ovp);
+
+ glGetIntegerv (GL_BLEND_DST, &oblend);
+ glGetFloatv (GL_CURRENT_COLOR, color);
for (c = string; *c; c++)
if (*c == '\n') lines++;
+ texture_string_width (data, "m", &line_height);
y -= line_height;
- {
- /* disable lighting and texturing when drawing bitmaps!
- (glPopAttrib() restores these.)
- */
-# ifdef HAVE_GLBITMAP
- glDisable (GL_TEXTURE_2D);
-# else /* !HAVE_GLBITMAP */
- glEnable (GL_TEXTURE_2D);
- glDisable (GL_TEXTURE_GEN_S);
- glDisable (GL_TEXTURE_GEN_T);
- glPolygonMode (GL_FRONT, GL_FILL);
- glEnable (GL_BLEND);
- glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-# endif /* !HAVE_GLBITMAP */
+ glEnable (GL_TEXTURE_2D);
+ glEnable (GL_BLEND);
+ glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ glPolygonMode (GL_FRONT, GL_FILL);
- glDisable (GL_LIGHTING);
+ glDisable (GL_TEXTURE_GEN_S);
+ glDisable (GL_TEXTURE_GEN_T);
+ glDisable (GL_LIGHTING);
+ glDisable (GL_CULL_FACE);
+ glDisable (GL_FOG);
+ if (!in_scene_p)
+ glDisable (GL_DEPTH_TEST);
- if (!in_scene_p)
- glDisable (GL_DEPTH_TEST);
- glDisable (GL_CULL_FACE);
- glDisable (GL_FOG);
-
- /* glPopAttrib() does not restore matrix changes, so we must
- push/pop the matrix stacks to be non-intrusive there.
- */
- glMatrixMode(GL_PROJECTION);
+ /* Each matrix mode has its own stack, so we need to push/pop
+ them separately.
+ */
+ glMatrixMode(GL_PROJECTION);
+ glPushMatrix();
+ {
+# ifdef DEBUG
+ check_gl_error ("glPushMatrix");
+# endif
+ if (!in_scene_p)
+ glLoadIdentity();
+
+ glMatrixMode(GL_MODELVIEW);
glPushMatrix();
{
# ifdef DEBUG
check_gl_error ("glPushMatrix");
# endif
+
if (!in_scene_p)
- glLoadIdentity();
+ {
+ int rot = (int) current_device_rotation();
+ while (rot <= -180) rot += 360;
+ while (rot > 180) rot -= 360;
- /* Each matrix mode has its own stack, so we need to push/pop
- them separately. */
- glMatrixMode(GL_MODELVIEW);
- glPushMatrix();
- {
- unsigned int i;
- int x2 = x;
- Bool sub_p = False;
+ glLoadIdentity();
+ glViewport (0, 0, window_width, window_height);
+ glOrtho (0, window_width, 0, window_height, -1, 1);
-# ifdef DEBUG
- check_gl_error ("glPushMatrix");
-# endif
+ if (rot > 135 || rot < -135) /* 180 */
+ {
+ glTranslatef (window_width, window_height, 0);
+ glRotatef (180, 0, 0, 1);
+ }
+ else if (rot > 45) /* 90 */
+ {
+ glTranslatef (window_width, 0, 0);
+ glRotatef (90, 0, 0, 1);
+ }
+ else if (rot < -45) /* 270 */
+ {
+ glTranslatef(0, window_height, 0);
+ glRotatef (-90, 0, 0, 1);
+ }
+ }
- if (!in_scene_p)
- {
- double rot = current_device_rotation();
-
- glLoadIdentity();
- glOrtho (0, window_width, 0, window_height, -1, 1);
-
- if (rot > 135 || rot < -135)
- {
- glTranslatef (window_width, window_height, 0);
- glRotatef (180, 0, 0, 1);
- }
- else if (rot > 45)
- {
- glTranslatef (window_width, 0, 0);
- glRotatef (90, 0, 0, 1);
- y -= (window_height - window_width);
- if (y < line_height * lines + 10)
- y = line_height * lines + 10;
- }
- else if (rot < -45)
- {
- glTranslatef(0, window_height, 0);
- glRotatef (-90, 0, 0, 1);
- y -= (window_height - window_width);
- if (y < line_height * lines + 10)
- y = line_height * lines + 10;
- }
- }
# ifdef DEBUG
- check_gl_error ("glOrtho");
+ check_gl_error ("glOrtho");
# endif
- /* Let's always dropshadow the FPS and Title text. */
- if (! in_scene_p)
- clear_background_p = True;
+ /* Let's always dropshadow the FPS and Title text. */
+ if (! in_scene_p)
+ clear_background_p = True;
-#if 0
- if (clear_background_p)
- {
- int w, h;
- glColor3f (0, 0, 0);
-# ifdef HAVE_GLBITMAP
- w = string_width (font, string, &h);
- glRecti (x - font->descent,
- y + line_height,
- x + w + 2*font->descent,
- y + line_height - h - font->descent);
-# else /* !HAVE_GLBITMAP */
- {
- int descent = line_height * 0.2;
- if (descent < 2) descent = 2;
- w = texture_string_width (font_data, string, &h);
- glRecti (x - descent,
- y + line_height,
- x + w + 2*descent,
- y + line_height - h - descent);
- }
-# endif /* !HAVE_GLBITMAP */
- glColor3f (1, 1, 1);
- }
-#endif /* 0 */
+ /* draw the text */
- /* draw the text */
+ glTranslatef (x, y, 0);
- for (i = 0; i < strlen(string); i++)
+ {
+ const XPoint offsets[] = {{ -1, -1 },
+ { -1, 1 },
+ { 1, 1 },
+ { 1, -1 },
+ { 0, 0 }};
+ int i;
+
+ glColor3f (0, 0, 0);
+ for (i = 0; i < countof(offsets); i++)
{
- unsigned char c = (unsigned char) string[i];
- if (c == '\n')
- {
- y -= line_height;
- x2 = x;
- }
- else if (c == '\t')
- {
- x2 -= x;
- x2 = ((x2 + tabs) / tabs) * tabs; /* tab to tab stop */
- x2 += x;
- }
- else if (c == '[' && (isdigit (string[i+1])))
- {
- sub_p = True;
- y -= sub_shift;
- }
- else if (c == ']' && sub_p)
- {
- sub_p = False;
- y += sub_shift;
- }
- else
- {
- /* outline font in black */
- const XPoint offsets[] = {{ -1, -1 },
- { -1, 1 },
- { 1, 1 },
- { 1, -1 },
- { 0, 0 }};
- int j;
-# ifndef HAVE_GLBITMAP
- char s[2];
- s[0] = c;
- s[1] = 0;
-# endif /* !HAVE_GLBITMAP */
-
- glColor3f (0, 0, 0);
- for (j = 0; j < countof(offsets); j++)
- {
- if (! clear_background_p)
- j = countof(offsets)-1;
- if (offsets[j].x == 0)
- glColor4fv (color);
-
-# ifdef HAVE_GLBITMAP
- glRasterPos2f (x2 + offsets[j].x, y + offsets[j].y);
- glCallList (font_dlist + (int)(c));
-# else /* !HAVE_GLBITMAP */
- glPushMatrix();
- glTranslatef (x2 + offsets[j].x, y + offsets[j].y, 0);
- print_texture_string (font_data, s);
- glPopMatrix();
-# endif /* !HAVE_GLBITMAP */
- }
-# ifdef HAVE_GLBITMAP
- x2 += (font->per_char
- ? font->per_char[c - font->min_char_or_byte2].width
- : font->min_bounds.width);
-# else /* !HAVE_GLBITMAP */
- x2 += texture_string_width (font_data, s, 0);
-# endif /* !HAVE_GLBITMAP */
- }
+ if (! clear_background_p)
+ i = countof(offsets)-1;
+ if (offsets[i].x == 0)
+ glColor4fv (color);
+
+ glPushMatrix();
+ glTranslatef (offsets[i].x, offsets[i].y, 0);
+ print_texture_string (data, string);
+ glPopMatrix();
}
+ }
+
# ifdef DEBUG
- check_gl_error ("print_gl_string");
+ check_gl_error ("print_texture_string");
# endif
- }
- glPopMatrix();
}
- glMatrixMode(GL_PROJECTION);
glPopMatrix();
}
-# ifdef HAVE_GLBITMAP
- glPopAttrib();
-# ifdef DEBUG
- check_gl_error ("glPopAttrib");
-# endif
-# else /* !HAVE_GLBITMAP */
+ glMatrixMode(GL_PROJECTION);
+ glPopMatrix();
+
if (tex_p) glEnable (GL_TEXTURE_2D); else glDisable (GL_TEXTURE_2D);
- if (texs_p) glEnable (GL_TEXTURE_GEN_S);/*else glDisable (GL_TEXTURE_GEN_S);*/
- if (text_p) glEnable (GL_TEXTURE_GEN_T);/*else glDisable (GL_TEXTURE_GEN_T);*/
+ if (texs_p) glEnable (GL_TEXTURE_GEN_S);/*else glDisable(GL_TEXTURE_GEN_S);*/
+ if (text_p) glEnable (GL_TEXTURE_GEN_T);/*else glDisable(GL_TEXTURE_GEN_T);*/
if (blend_p) glEnable (GL_BLEND); else glDisable (GL_BLEND);
if (light_p) glEnable (GL_LIGHTING); /*else glDisable (GL_LIGHTING);*/
if (depth_p) glEnable (GL_DEPTH_TEST); else glDisable (GL_DEPTH_TEST);
if (cull_p) glEnable (GL_CULL_FACE); /*else glDisable (GL_CULL_FACE);*/
if (fog_p) glEnable (GL_FOG); /*else glDisable (GL_FOG);*/
-# ifndef HAVE_JWZGLES
- glPolygonMode (GL_FRONT, opoly[0]);
-# endif
+
+ if (!in_scene_p)
+ glViewport (ovp[0], ovp[1], ovp[2], ovp[3]);
+
glBlendFunc (GL_SRC_ALPHA, oblend);
-# endif /* !HAVE_GLBITMAP */
+
+# ifndef HAVE_JWZGLES
+ glPolygonMode (GL_FRONT, opoly[0]);
+# endif
glMatrixMode(GL_MODELVIEW);
}
projects / xscreensaver / blobdiff