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.37.tar.gz
[xscreensaver]
/
hacks
/
triangle.c
diff --git
a/hacks/triangle.c
b/hacks/triangle.c
index 1a93de257dd59fa4aba3d9e6cb363dec9d45e973..d73c1226f547bbc040b10391e5c7af967971d727 100644
(file)
--- a/
hacks/triangle.c
+++ b/
hacks/triangle.c
@@
-51,7
+51,7
@@
static const char sccsid[] = "@(#)triangle.c 4.04 97/07/28 xlockmore";
"*fpsSolid: true \n" \
# define SMOOTH_COLORS
"*fpsSolid: true \n" \
# define SMOOTH_COLORS
-# define
triangle_handle_event
0
+# define
release_triangle
0
# include "xlockmore.h" /* in xscreensaver distribution */
#else /* STANDALONE */
# include "xlock.h" /* in xlockmore distribution */
# include "xlockmore.h" /* in xscreensaver distribution */
#else /* STANDALONE */
# include "xlock.h" /* in xlockmore distribution */
@@
-223,11
+223,7
@@
init_triangle (ModeInfo * mi)
short *tmp;
int i, dim, one;
short *tmp;
int i, dim, one;
- if (triangles == NULL) {
- if ((triangles = (trianglestruct *) calloc(MI_NUM_SCREENS(mi),
- sizeof (trianglestruct))) == NULL)
- return;
- }
+ MI_INIT (mi, triangles, 0);
tp = &triangles[MI_SCREEN(mi)];
tp->width = MI_WIN_WIDTH(mi);
tp = &triangles[MI_SCREEN(mi)];
tp->width = MI_WIN_WIDTH(mi);
@@
-298,11
+294,11
@@
draw_triangle (ModeInfo * mi)
XClearWindow(MI_DISPLAY(mi), MI_WINDOW(mi));
if (!mono_p)
{
XClearWindow(MI_DISPLAY(mi), MI_WINDOW(mi));
if (!mono_p)
{
- free_colors(mi->
dpy
, mi->xgwa.colormap, mi->colors,
+ free_colors(mi->
xgwa.screen
, mi->xgwa.colormap, mi->colors,
mi->npixels);
mi->npixels =
get_integer_resource (mi->dpy, "ncolors", "Integer");
mi->npixels);
mi->npixels =
get_integer_resource (mi->dpy, "ncolors", "Integer");
- make_smooth_colormap (mi->
dpy
,
+ make_smooth_colormap (mi->
xgwa.screen
,
mi->xgwa.visual, mi->xgwa.colormap,
mi->colors, &mi->npixels,
True, &mi->writable_p, True);
mi->xgwa.visual, mi->xgwa.colormap,
mi->colors, &mi->npixels,
True, &mi->writable_p, True);
@@
-352,18
+348,21
@@
reshape_triangle(ModeInfo * mi, int width, int height)
}
ENTRYPOINT void
}
ENTRYPOINT void
-re
lease_triangle
(ModeInfo * mi)
+re
fresh_triangle
(ModeInfo * mi)
{
{
- if (triangles != NULL) {
- (void) free((void *) triangles);
- triangles = NULL;
- }
+ /* Do nothing, it will refresh by itself */
}
}
-ENTRYPOINT
void
-
refresh_triangle (ModeInfo * mi
)
+ENTRYPOINT
Bool
+
triangle_handle_event (ModeInfo *mi, XEvent *event
)
{
{
- /* Do nothing, it will refresh by itself */
+ if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
+ {
+ reshape_triangle (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
+ return True;
+ }
+ return False;
}
}
+
XSCREENSAVER_MODULE ("Triangle", triangle)
XSCREENSAVER_MODULE ("Triangle", triangle)