X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fjulia.c;h=7311ce72023e777351c8ef6482322b0661e3832f;hb=39809ded547bdbb08207d3e514950425215b4410;hp=f0236617e5929014c01806fb54d48c807053a921;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver diff --git a/hacks/julia.c b/hacks/julia.c index f0236617..7311ce72 100644 --- a/hacks/julia.c +++ b/hacks/julia.c @@ -38,40 +38,25 @@ static const char sccsid[] = "@(#)julia.c 4.03 97/04/10 xlockmore"; */ #ifdef STANDALONE -# define DEFAULTS "*count: 1000 \n" \ - "*cycles: 20 \n" \ - "*delay: 10000 \n" \ - "*ncolors: 200 \n" \ - "*fpsSolid: true \n" \ +# define DEFAULTS "*count: 1000 \n" \ + "*cycles: 20 \n" \ + "*delay: 10000 \n" \ + "*ncolors: 200 \n" \ + "*fpsSolid: true \n" \ + "*ignoreRotation: True \n" \ # define UNIFORM_COLORS +# define release_julia 0 # define reshape_julia 0 -# define julia_handle_event 0 # include "xlockmore.h" /* in xscreensaver distribution */ #else /* !STANDALONE */ # include "xlock.h" /* in xlockmore distribution */ #endif /* !STANDALONE */ -static Bool track_p; - #define DEF_MOUSE "False" -static XrmOptionDescRec opts[] = -{ - {"-mouse", ".julia.mouse", XrmoptionNoArg, "on"}, - {"+mouse", ".julia.mouse", XrmoptionNoArg, "off"}, -}; -static argtype vars[] = -{ - {&track_p, "mouse", "Mouse", DEF_MOUSE, t_Bool}, -}; -static OptionStruct desc[] = -{ - {"-/+mouse", "turn on/off mouse tracking"}, -}; - -ENTRYPOINT ModeSpecOpt julia_opts = { 2, opts, 1, vars, desc }; +ENTRYPOINT ModeSpecOpt julia_opts = { 0, }; #define numpoints ((0x2<depth)-1) @@ -91,11 +76,13 @@ typedef struct { int nbuffers; int redrawing, redrawpos; Pixmap pixmap; -#ifndef HAVE_COCOA +#ifndef HAVE_JWXYZ Cursor cursor; #endif GC stippledGC; XPoint **pointBuffer; /* pointer for XDrawPoints */ + Bool button_down_p; + int mouse_x, mouse_y; } juliastruct; @@ -140,28 +127,13 @@ apply(juliastruct * jp, register double xr, register double xi, int d) static void incr(ModeInfo * mi, juliastruct * jp) { - int cx, cy; - - if (track_p) - { - Window r, c; - int rx, ry; - unsigned int m; - XQueryPointer(MI_DISPLAY(mi), MI_WINDOW(mi), - &r, &c, &rx, &ry, &cx, &cy, &m); - if (cx <= 0 || cy <= 0 || - cx >= MI_WIN_WIDTH(mi) || cy >= MI_WIN_HEIGHT(mi)) - goto NOTRACK; - } - - if (track_p) + if (jp->button_down_p) { - jp->cr = ((double) (cx + 2 - jp->centerx)) * 2 / jp->centerx; - jp->ci = ((double) (cy + 2 - jp->centery)) * 2 / jp->centery; + jp->cr = ((double) (jp->mouse_x + 2 - jp->centerx)) * 2 / jp->centerx; + jp->ci = ((double) (jp->mouse_y + 2 - jp->centery)) * 2 / jp->centery; } else { - NOTRACK: #if 0 jp->cr = 1.5 * (sin(M_PI * (jp->inc / 300.0)) * sin(jp->inc * M_PI / 200.0)); @@ -191,11 +163,7 @@ init_julia(ModeInfo * mi) XGCValues gcv; int i; - if (julias == NULL) { - if ((julias = (juliastruct *) calloc(MI_NUM_SCREENS(mi), - sizeof (juliastruct))) == NULL) - return; - } + MI_INIT (mi, julias); jp = &julias[MI_SCREEN(mi)]; jp->centerx = MI_WIN_WIDTH(mi) / 2; @@ -206,8 +174,8 @@ init_julia(ModeInfo * mi) jp->depth = 10; -#ifndef HAVE_COCOA - if (track_p && !jp->cursor) +#ifndef HAVE_JWXYZ + if (jp->button_down_p && !jp->cursor && !jp->cursor) { Pixmap bit; XColor black; @@ -220,7 +188,7 @@ init_julia(ModeInfo * mi) 0, 0); XFreePixmap (display, bit); } -#endif /* HAVE_COCOA */ +#endif /* HAVE_JWXYZ */ if (jp->pixmap != None && jp->circsize != (MIN(jp->centerx, jp->centery) / 60) * 2 + 1) { @@ -230,7 +198,7 @@ init_julia(ModeInfo * mi) if (jp->pixmap == None) { GC fg_gc = None, bg_gc = None; - jp->circsize = (MIN(jp->centerx, jp->centery) / 96) * 2 + 1; + jp->circsize = MAX(8, (MIN(jp->centerx, jp->centery) / 96) * 2 + 1); jp->pixmap = XCreatePixmap(display, window, jp->circsize, jp->circsize, 1); gcv.foreground = 1; fg_gc = XCreateGC(display, jp->pixmap, GCForeground, &gcv); @@ -249,14 +217,14 @@ init_julia(ModeInfo * mi) XFreeGC(display, bg_gc); } -#ifndef HAVE_COCOA +#ifndef HAVE_JWXYZ if (MI_WIN_IS_INROOT(mi)) ; else if (jp->circsize > 0) XDefineCursor (display, window, jp->cursor); else XUndefineCursor (display, window); -#endif /* HAVE_COCOA */ +#endif /* HAVE_JWXYZ */ if (!jp->stippledGC) { gcv.foreground = MI_WIN_BLACK_PIXEL(mi); @@ -284,6 +252,37 @@ init_julia(ModeInfo * mi) } +ENTRYPOINT Bool +julia_handle_event (ModeInfo *mi, XEvent *event) +{ + juliastruct *jp = &julias[MI_SCREEN(mi)]; + + if (event->xany.type == ButtonPress && + event->xbutton.button == Button1) + { + jp->button_down_p = True; + jp->mouse_x = event->xbutton.x; + jp->mouse_y = event->xbutton.y; + return True; + } + else if (event->xany.type == ButtonRelease && + event->xbutton.button == Button1) + { + jp->button_down_p = False; + return True; + } + else if (event->xany.type == MotionNotify && jp->button_down_p) + { + jp->mouse_x = event->xmotion.x; + jp->mouse_y = event->xmotion.y; + return True; + } + + return False; +} + + + /* hack: moved here by jwz. */ #define ERASE_IMAGE(d,w,g,x,y,xl,yl,xs,ys) \ if (ylcenterx * jp->cr / 2) + jp->centerx - 2; new_circle.y = (int) (jp->centery * jp->ci / 2) + jp->centery - 2; XSetForeground(display, gc, MI_WIN_BLACK_PIXEL(mi)); - ERASE_IMAGE(display, window, gc, new_circle.x, new_circle.y, - old_circle.x, old_circle.y, jp->circsize, jp->circsize); + XFillArc(display, window, gc, + old_circle.x-jp->circsize/2-2, + old_circle.y-jp->circsize/2-2, + jp->circsize+4, jp->circsize+4, + 0, 360*64); /* draw a circle at the c-parameter so you can see it's effect on the structure of the julia set */ XSetForeground(display, jp->stippledGC, MI_WIN_WHITE_PIXEL(mi)); -#ifndef HAVE_COCOA +#ifndef HAVE_JWXYZ XSetTSOrigin(display, jp->stippledGC, new_circle.x, new_circle.y); XSetStipple(display, jp->stippledGC, jp->pixmap); XSetFillStyle(display, jp->stippledGC, FillOpaqueStippled); -#endif /* HAVE_COCOA */ - XFillRectangle(display, window, jp->stippledGC, new_circle.x, new_circle.y, - jp->circsize, jp->circsize); +#endif /* HAVE_JWXYZ */ + XDrawArc(display, window, jp->stippledGC, + new_circle.x-jp->circsize/2, + new_circle.y-jp->circsize/2, + jp->circsize, jp->circsize, + 0, 360*64); + if (jp->erase == 1) { XDrawPoints(display, window, gc, jp->pointBuffer[jp->buffer], numpoints, CoordModeOrigin); @@ -400,36 +406,29 @@ draw_julia (ModeInfo * mi) } ENTRYPOINT void -release_julia (ModeInfo * mi) +free_julia (ModeInfo * mi) { - if (julias != NULL) { - int screen; - - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) { - Display *display = MI_DISPLAY(mi); - juliastruct *jp = &julias[screen]; - int buffer; - - if (jp->pointBuffer) { - for (buffer = 0; buffer < jp->nbuffers; buffer++) - if (jp->pointBuffer[buffer]) - (void) free((void *) jp->pointBuffer[buffer]); - (void) free((void *) jp->pointBuffer); - } - if (jp->stippledGC != None) - XFreeGC(display, jp->stippledGC); - if (jp->pixmap != None) - XFreePixmap(display, jp->pixmap); -#ifndef HAVE_COCOA - if (jp->cursor) - XFreeCursor (display, jp->cursor); -#endif - } - (void) free((void *) julias); - julias = NULL; + Display *display = MI_DISPLAY(mi); + juliastruct *jp = &julias[MI_SCREEN(mi)]; + int buffer; + + if (jp->pointBuffer) { + for (buffer = 0; buffer < jp->nbuffers; buffer++) + if (jp->pointBuffer[buffer]) + (void) free((void *) jp->pointBuffer[buffer]); + (void) free((void *) jp->pointBuffer); } + if (jp->stippledGC != None) + XFreeGC(display, jp->stippledGC); + if (jp->pixmap != None) + XFreePixmap(display, jp->pixmap); +#ifndef HAVE_JWXYZ + if (jp->cursor) + XFreeCursor (display, jp->cursor); +#endif } +#ifndef STANDALONE ENTRYPOINT void refresh_julia (ModeInfo * mi) { @@ -438,5 +437,6 @@ refresh_julia (ModeInfo * mi) jp->redrawing = 1; jp->redrawpos = 0; } +#endif XSCREENSAVER_MODULE ("Julia", julia)