X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fswirl.c;h=5a3d97a2a5dcabf626fac89523a6f359d9ebab0c;hb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;hp=0d0f5abf4f56472a2e32529d898aa293c84e1c7f;hpb=6bb727f03bff0389fbb1349d7df4c9d8d7532959;p=xscreensaver diff --git a/hacks/swirl.c b/hacks/swirl.c index 0d0f5abf..5a3d97a2 100644 --- a/hacks/swirl.c +++ b/hacks/swirl.c @@ -1,7 +1,7 @@ /* -*- Mode: C; tab-width: 4 -*- * swirl --- swirly color-cycling patterns. */ -#if !defined( lint ) && !defined( SABER ) +#if 0 static const char sccsid[] = "@(#)swirl.c 4.00 97/01/01 xlockmore"; #endif @@ -19,7 +19,7 @@ static const char sccsid[] = "@(#)swirl.c 4.00 97/01/01 xlockmore"; * event will the author be liable for any lost revenue or profits or * other special, indirect and consequential damages. * - * 13-May-97: jwz@netscape.com: turned into a standalone program. + * 13-May-97: jwz@jwz.org: turned into a standalone program. * 21-Apr-95: improved startup time for TrueColour displays * (limited to 16bpp to save memory) S.Early * 09-Jan-95: fixed colour maps (more colourful) and the image now spirals @@ -30,22 +30,26 @@ static const char sccsid[] = "@(#)swirl.c 4.00 97/01/01 xlockmore"; */ #ifdef STANDALONE -# define PROGCLASS "Swirl" -# define HACK_INIT init_swirl -# define HACK_DRAW draw_swirl -# define swirl_opts xlockmore_opts # define DEFAULTS "*count: 5 \n" \ "*delay: 10000 \n" \ - "*ncolors: 200 \n" + "*ncolors: 200 \n" \ + "*useSHM: True \n" \ + "*fpsSolid: true \n" \ + # define SMOOTH_COLORS # define WRITABLE_COLORS +# define reshape_swirl 0 +# define swirl_handle_event 0 # include "xlockmore.h" /* from the xscreensaver distribution */ -# include +# ifdef HAVE_XSHM_EXTENSION +# include "xshm.h" +# endif /* HAVE_XSHM_EXTENSION */ #else /* !STANDALONE */ # include "xlock.h" /* from the xlockmore distribution */ +# undef HAVE_XSHM_EXTENSION #endif /* !STANDALONE */ -ModeSpecOpt swirl_opts = { +ENTRYPOINT ModeSpecOpt swirl_opts = { 0, NULL, 0, NULL, NULL }; #include @@ -219,9 +223,7 @@ initialise_swirl(ModeInfo * mi, SWIRL_P swirl) #endif /* !STANDALONE */ -#ifdef STANDALONE -# define MI_COLORMAP MI_WIN_COLORMAP -#else /* !STANDALONE */ +#ifndef STANDALONE swirl->fg = MI_FG_COLOR(mi); swirl->bg = MI_BG_COLOR(mi); swirl->fgcol.pixel = swirl->fg; @@ -248,11 +250,27 @@ initialise_image(ModeInfo * mi, SWIRL_P swirl) if (swirl->ximage != NULL) XDestroyImage(swirl->ximage); - swirl->ximage = XCreateImage(dpy, swirl->visual, swirl->rdepth, ZPixmap, - 0, 0, swirl->width, swirl->height, - 8, 0); - swirl->ximage->data = swirl->image = - (unsigned char *) calloc(swirl->height, swirl->ximage->bytes_per_line); + swirl->ximage = 0; +#ifdef HAVE_XSHM_EXTENSION + if (mi->use_shm) + { + swirl->ximage = create_xshm_image(dpy, swirl->visual, swirl->rdepth, + ZPixmap, 0, &mi->shm_info, + swirl->width, swirl->height); + if (!swirl->ximage) + mi->use_shm = False; + } +#endif /* HAVE_XSHM_EXTENSION */ + + if (!swirl->ximage) + { + swirl->ximage = XCreateImage(dpy, swirl->visual, swirl->rdepth, ZPixmap, + 0, 0, swirl->width, swirl->height, + 8, 0); + swirl->image = (unsigned char *) + calloc(swirl->height, swirl->ximage->bytes_per_line); + swirl->ximage->data = (char *) swirl->image; + } } /****************************************************************/ @@ -1107,10 +1125,17 @@ draw_point(ModeInfo * mi, SWIRL_P swirl) draw_block(swirl->ximage, x, y, r, do_point(swirl, x, y)); /* update the screen */ -/* PURIFY 4.0.1 on SunOS4 and on Solaris 2 reports a 256 byte memory leak on * - the next line. */ - XPutImage(MI_DISPLAY(mi), MI_WINDOW(mi), MI_GC(mi), swirl->ximage, - x, y, x, y, r, r); + +#ifdef HAVE_XSHM_EXTENSION + if (mi->use_shm) + XShmPutImage(MI_DISPLAY(mi), MI_WINDOW(mi), MI_GC(mi), swirl->ximage, + x, y, x, y, r, r, False); + else +#endif /* !HAVE_XSHM_EXTENSION */ + /* PURIFY 4.0.1 on SunOS4 and on Solaris 2 reports a 256 byte memory + leak on the next line. */ + XPutImage(MI_DISPLAY(mi), MI_WINDOW(mi), MI_GC(mi), swirl->ximage, + x, y, x, y, r, r); } /****************************************************************/ @@ -1220,7 +1245,7 @@ next_point(SWIRL_P swirl) * * - win is the window to draw in */ -void +ENTRYPOINT void init_swirl(ModeInfo * mi) { Display *display = MI_DISPLAY(mi); @@ -1229,19 +1254,14 @@ init_swirl(ModeInfo * mi) /* does the swirls array exist? */ if (swirls == NULL) { - int i; - /* allocate an array, one entry for each screen */ - swirls = (SWIRL_P) calloc(ScreenCount(display), sizeof (SWIRL)); - - /* initialise them all */ - for (i = 0; i < ScreenCount(display); i++) - initialise_swirl(mi, &swirls[i]); + swirls = (SWIRL_P) calloc(MI_NUM_SCREENS(mi), sizeof (SWIRL)); } /* get a pointer to this swirl */ swirl = &(swirls[MI_SCREEN(mi)]); - - /* get window parameters */ + initialise_swirl(mi, swirl); + + /* get window parameters */ swirl->win = window; swirl->width = MI_WIN_WIDTH(mi); swirl->height = MI_WIN_HEIGHT(mi); @@ -1322,7 +1342,7 @@ init_swirl(ModeInfo * mi) * * - win is the window to draw in */ -void +ENTRYPOINT void draw_swirl(ModeInfo * mi) { SWIRL_P swirl = &(swirls[MI_SCREEN(mi)]); @@ -1415,8 +1435,8 @@ draw_swirl(ModeInfo * mi) /****************************************************************/ -void -release_swirl(ModeInfo * mi) +ENTRYPOINT void +release_swirl (ModeInfo * mi) { /* does the swirls array exist? */ if (swirls != NULL) { @@ -1426,10 +1446,14 @@ release_swirl(ModeInfo * mi) for (i = 0; i < MI_NUM_SCREENS(mi); i++) { SWIRL_P swirl = &(swirls[i]); +#ifndef STANDALONE if (swirl->cmap != (Colormap) NULL) XFreeColormap(MI_DISPLAY(mi), swirl->cmap); +#endif /* STANDALONE */ +#ifndef STANDALONE if (swirl->rgb_values != NULL) XFree((void *) swirl->rgb_values); +#endif /* !STANDALONE */ if (swirl->ximage != NULL) XDestroyImage(swirl->ximage); if (swirl->knots) @@ -1443,8 +1467,8 @@ release_swirl(ModeInfo * mi) /****************************************************************/ -void -refresh_swirl(ModeInfo * mi) +ENTRYPOINT void +refresh_swirl (ModeInfo * mi) { SWIRL_P swirl = &(swirls[MI_SCREEN(mi)]); @@ -1454,3 +1478,5 @@ refresh_swirl(ModeInfo * mi) swirl->drawing = False; } } + +XSCREENSAVER_MODULE ("Swirl", swirl)