projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://www.jwz.org/xscreensaver/xscreensaver-5.09.tar.gz
[xscreensaver]
/
hacks
/
glx
/
glxfonts.h
diff --git
a/hacks/glx/glxfonts.h
b/hacks/glx/glxfonts.h
index 32bee489f9a3ac7bfdb82b2089e0be92c9313c8d..1bffc54837cfb758e7af1dda5561dc9f2dd462b1 100644
(file)
--- a/
hacks/glx/glxfonts.h
+++ b/
hacks/glx/glxfonts.h
@@
-1,4
+1,4
@@
-/* glxfonts, Copyright (c) 2001-200
4
Jamie Zawinski <jwz@jwz.org>
+/* glxfonts, Copyright (c) 2001-200
9
Jamie Zawinski <jwz@jwz.org>
* Loads X11 fonts for use with OpenGL.
*
* Permission to use, copy, modify, distribute, and sell this software and its
* Loads X11 fonts for use with OpenGL.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@
-9,12
+9,18
@@
* software for any purpose. It is provided "as is" without express or
* implied warranty.
*
* software for any purpose. It is provided "as is" without express or
* implied warranty.
*
- *
Compute normal vectors for arbitrary triangles
.
+ *
Loads X11 fonts for use with OpenGL
.
*/
#ifndef __GLXFONTS_H__
#define __GLXFONTS_H__
*/
#ifndef __GLXFONTS_H__
#define __GLXFONTS_H__
+/* This is basically the same as glXUseXFont().
+ We have our own version of it for portability.
+ */
+extern void xscreensaver_glXUseXFont (Display *dpy, Font font,
+ int first, int count, int listbase);
+
/* 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.
/* 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.
@@
-23,8
+29,9
@@
extern void load_font (Display *, char *resource,
XFontStruct **font_ret,
GLuint *dlist_ret);
XFontStruct **font_ret,
GLuint *dlist_ret);
-/* Width of the string in pixels. */
-extern int string_width (XFontStruct *f, const char *c);
+/* Bounding box of the string in pixels.
+ */
+extern int string_width (XFontStruct *f, const char *c, int *height_ret);
/* Draws the string on the window at the given pixel position.
Newlines and tab stops are honored.
/* Draws the string on the window at the given pixel position.
Newlines and tab stops are honored.
@@
-35,6
+42,7
@@
void print_gl_string (Display *dpy,
GLuint font_dlist,
int window_width, int window_height,
GLfloat x, GLfloat y,
GLuint font_dlist,
int window_width, int window_height,
GLfloat x, GLfloat y,
- const char *string);
+ const char *string,
+ Bool clear_background_p);
#endif /* __GLXFONTS_H__ */
#endif /* __GLXFONTS_H__ */