projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.30.tar.gz
[xscreensaver]
/
hacks
/
glx
/
font-ximage.c
diff --git
a/hacks/glx/font-ximage.c
b/hacks/glx/font-ximage.c
index 227327fcf4d81ea0b8b949b7692fb6286427ca54..22ef3a814e7388a972d54d8a09e9953fb0af4f9d 100644
(file)
--- a/
hacks/glx/font-ximage.c
+++ b/
hacks/glx/font-ximage.c
@@
-68,7
+68,7
@@
to_pow2 (int i)
This XImage will be 32 bits per pixel, 8 each per R, G, and B, with the
extra byte set to 0xFF.
This XImage will be 32 bits per pixel, 8 each per R, G, and B, with the
extra byte set to 0xFF.
- Foregroun
e
and background are GL-style color specifiers: 4 floats from
+ Foregroun
d
and background are GL-style color specifiers: 4 floats from
0.0-1.0.
*/
XImage *
0.0-1.0.
*/
XImage *
@@
-128,7
+128,7
@@
text_to_ximage (Screen *screen, Visual *visual,
XCharStruct o2;
int ascent, descent, direction;
token = 0;
XCharStruct o2;
int ascent, descent, direction;
token = 0;
- XTextExtents (f, line, strlen(line),
+ XTextExtents (f, line,
(int)
strlen(line),
&direction, &ascent, &descent, &o2);
overall.lbearing = MAX(overall.lbearing, o2.lbearing);
overall.rbearing = MAX(overall.rbearing, o2.rbearing);
&direction, &ascent, &descent, &o2);
overall.lbearing = MAX(overall.lbearing, o2.lbearing);
overall.rbearing = MAX(overall.rbearing, o2.rbearing);
@@
-166,7
+166,7
@@
text_to_ximage (Screen *screen, Visual *visual,
int ascent, descent, direction;
token = 0;
int ascent, descent, direction;
token = 0;
- XTextExtents(f, line, strlen(line),
+ XTextExtents(f, line,
(int)
strlen(line),
&direction, &ascent, &descent, &o2);
XDrawString(dpy, bitmap, gc,
overall.lbearing + margin + xoff,
&direction, &ascent, &descent, &o2);
XDrawString(dpy, bitmap, gc,
overall.lbearing + margin + xoff,
@@
-174,7
+174,7
@@
text_to_ximage (Screen *screen, Visual *visual,
(f->descent * lines) +
margin +
yoff),
(f->descent * lines) +
margin +
yoff),
- line, strlen(line));
+ line,
(int)
strlen(line));
lines++;
}
free(text2);
lines++;
}
free(text2);