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.07.tar.gz
[xscreensaver]
/
hacks
/
glx
/
texfont.c
diff --git
a/hacks/glx/texfont.c
b/hacks/glx/texfont.c
index 28869abbc40f43c83f22c00481401292cacb7e48..15822a4924369e413f705366139277219e92fdec 100644
(file)
--- a/
hacks/glx/texfont.c
+++ b/
hacks/glx/texfont.c
@@
-1,4
+1,4
@@
-/* texfonts, Copyright (c) 2005
, 2006
Jamie Zawinski <jwz@jwz.org>
+/* texfonts, Copyright (c) 2005
-2007
Jamie Zawinski <jwz@jwz.org>
* Loads X11 fonts into textures for use with OpenGL.
*
* Permission to use, copy, modify, distribute, and sell this software and its
* Loads X11 fonts into textures for use with OpenGL.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@
-46,7
+46,7
@@
struct texture_font_data {
int grid_mag; /* 1, 2, 4, or 8 */
int ntextures; /* 1, 4, 16, or 64 (grid_mag ^ 2) */
int grid_mag; /* 1, 2, 4, or 8 */
int ntextures; /* 1, 4, 16, or 64 (grid_mag ^ 2) */
- GLuint texid[
32];
+ GLuint texid[
64]; /* must hold ntextures */
};
};
@@
-140,8
+140,8
@@
load_texture_font (Display *dpy, char *res)
texture_font_data *data = 0;
char *font = get_string_resource (dpy, res, "Font");
texture_font_data *data = 0;
char *font = get_string_resource (dpy, res, "Font");
- const char *def1 = "-*-
times-bold
-r-normal-*-240-*";
- const char *def2 = "-*-
times-bold
-r-normal-*-180-*";
+ const char *def1 = "-*-
helvetica-medium
-r-normal-*-240-*";
+ const char *def2 = "-*-
helvetica-medium
-r-normal-*-180-*";
const char *def3 = "fixed";
XFontStruct *f;
int which;
const char *def3 = "fixed";
XFontStruct *f;
int which;