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.21.tar.gz
[xscreensaver]
/
utils
/
colorbars.c
diff --git
a/utils/colorbars.c
b/utils/colorbars.c
index cf4fd92d7a2fcd5b6c686a9660c1ea1e57921f7c..61e001201ceb6ece91066c319c7e2dccb967dbb8 100644
(file)
--- a/
utils/colorbars.c
+++ b/
utils/colorbars.c
@@
-70,7
+70,10
@@
draw_colorbars (Screen *screen, Visual *visual,
int xx, yy;
unsigned int bw, d;
XGetGeometry (dpy, drawable,
int xx, yy;
unsigned int bw, d;
XGetGeometry (dpy, drawable,
- &root, &xx, &yy, &width, &height, &bw, &d);
+ &root, &xx, &yy,
+ (unsigned int *) &width,
+ (unsigned int *) &height,
+ &bw, &d);
}
for (j = 0; j < sizeof(colors) / sizeof(*colors); j++)
}
for (j = 0; j < sizeof(colors) / sizeof(*colors); j++)
@@
-115,14
+118,15
@@
draw_colorbars (Screen *screen, Visual *visual,
if (logo_map)
{
Window root;
if (logo_map)
{
Window root;
- int logo_width, logo_height;
+
unsigned
int logo_width, logo_height;
int w = width;
int h = height * heights[0] / 100;
int w = width;
int h = height * heights[0] / 100;
- int x1, y1, bw, d;
+ int x1, y1;
+ unsigned int bw, d;
XGetGeometry (dpy, logo_map, &root, &x1, &y1,
&logo_width, &logo_height, &bw, &d);
XGetGeometry (dpy, logo_map, &root, &x1, &y1,
&logo_width, &logo_height, &bw, &d);
- x1 = x + (w - logo_width) / 2;
- y1 = y + (h - logo_height) / 2;
+ x1 = x + (w -
(int)
logo_width) / 2;
+ y1 = y + (h -
(int)
logo_height) / 2;
if (logo_mask)
{
XSetClipMask (dpy, gc, logo_mask);
if (logo_mask)
{
XSetClipMask (dpy, gc, logo_mask);