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.19.tar.gz
[xscreensaver]
/
hacks
/
triangle.c
diff --git
a/hacks/triangle.c
b/hacks/triangle.c
index 1ccc5264ee3c3dba6806357e7d71a83b0d1e00b5..1a93de257dd59fa4aba3d9e6cb363dec9d45e973 100644
(file)
--- a/
hacks/triangle.c
+++ b/
hacks/triangle.c
@@
-47,9
+47,10
@@
static const char sccsid[] = "@(#)triangle.c 4.04 97/07/28 xlockmore";
#ifdef STANDALONE
# define DEFAULTS "*delay: 10000 \n" \
#ifdef STANDALONE
# define DEFAULTS "*delay: 10000 \n" \
- "*ncolors: 128 \n"
+ "*ncolors: 128 \n" \
+ "*fpsSolid: true \n" \
+
# define SMOOTH_COLORS
# define SMOOTH_COLORS
-# define reshape_triangle 0
# define triangle_handle_event 0
# include "xlockmore.h" /* in xscreensaver distribution */
#else /* STANDALONE */
# define triangle_handle_event 0
# include "xlockmore.h" /* in xscreensaver distribution */
#else /* STANDALONE */
@@
-105,7
+106,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;
@@
-117,11
+118,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 */
@@
-299,6
+300,8
@@
draw_triangle (ModeInfo * mi)
{
free_colors(mi->dpy, mi->xgwa.colormap, mi->colors,
mi->npixels);
{
free_colors(mi->dpy, mi->xgwa.colormap, mi->colors,
mi->npixels);
+ mi->npixels =
+ get_integer_resource (mi->dpy, "ncolors", "Integer");
make_smooth_colormap (mi->dpy,
mi->xgwa.visual, mi->xgwa.colormap,
mi->colors, &mi->npixels,
make_smooth_colormap (mi->dpy,
mi->xgwa.visual, mi->xgwa.colormap,
mi->colors, &mi->npixels,
@@
-341,6
+344,13
@@
draw_triangle (ModeInfo * mi)
}
}
}
}
+ENTRYPOINT void
+reshape_triangle(ModeInfo * mi, int width, int height)
+{
+ XClearWindow (MI_DISPLAY (mi), MI_WINDOW(mi));
+ init_triangle (mi);
+}
+
ENTRYPOINT void
release_triangle(ModeInfo * mi)
{
ENTRYPOINT void
release_triangle(ModeInfo * mi)
{