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.16.tar.gz
[xscreensaver]
/
hacks
/
triangle.c
diff --git
a/hacks/triangle.c
b/hacks/triangle.c
index 3f413432564b15c8f46f4f75db4043d443e9ca2c..48a8b20d67c86090fe53a07d2e1509a78a7d4c9b 100644
(file)
--- a/
hacks/triangle.c
+++ b/
hacks/triangle.c
@@
-107,7
+107,7
@@
draw_atriangle(ModeInfo * mi, XPoint * p, int y_0, int y_1, int y_2, double dinv
Window window = MI_WINDOW(mi);
GC gc = MI_GC(mi);
Window window = MI_WINDOW(mi);
GC gc = MI_GC(mi);
- if (MI_N
PIXEL
S(mi) > 2) { /* color */
+ if (MI_N
COLOR
S(mi) > 2) { /* color */
int dmax, dmin;
long color;
int dmax, dmin;
long color;
@@
-119,11
+119,11
@@
draw_atriangle(ModeInfo * mi, XPoint * p, int y_0, int y_1, int y_2, double dinv
if (dmax == 0) {
color = BLUE;
} else {
if (dmax == 0) {
color = BLUE;
} else {
- color = MI_N
PIXEL
S(mi) -
- (int) ((double) MI_N
PIXEL
S(mi) / M_PI_2 * atan(dinv * (dmax - dmin)));
+ color = MI_N
COLOR
S(mi) -
+ (int) ((double) MI_N
COLOR
S(mi) / M_PI_2 * atan(dinv * (dmax - dmin)));
}
}
- XSetForeground(display, gc,
MI_PIXEL(mi, color % MI_NPIXELS(mi))
);
+ XSetForeground(display, gc,
mi->colors[color % MI_NCOLORS(mi)].pixel
);
XFillPolygon(display, window, gc, p, 3, Convex, CoordModeOrigin);
} else {
/* mono */
XFillPolygon(display, window, gc, p, 3, Convex, CoordModeOrigin);
} else {
/* mono */