X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fpiecewise.c;h=980600c75220782d09e663d3ea2055c4a4aa6d28;hb=8afc01a67be4fbf3f1cc0fce9adf01b5289a21c6;hp=336dd5120e69d1a3afc6b8ef4d3679a43f886d18;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver diff --git a/hacks/piecewise.c b/hacks/piecewise.c index 336dd512..980600c7 100644 --- a/hacks/piecewise.c +++ b/hacks/piecewise.c @@ -500,10 +500,12 @@ static void event_shred(event *e) /******** fringe intersection */ +#if 0 static inline int check_fringe_intersection(double ye, fringe *lo, fringe *hi, double x, double y) { return ye <= y && ((x < lo->c->x) ^ lo->side) && ((x < hi->c->x) ^ hi->side); } +#endif /* 0 */ static void fringe_intersect(struct state *st, event **eq, double y, fringe *lo, fringe *hi) { @@ -813,6 +815,7 @@ static void draw_circle(struct state *st, Drawable w, GC gc, circle *c) /******** toplevel */ +#if 0 static void check_for_leaks (void) { @@ -830,6 +833,7 @@ check_for_leaks (void) } #endif /* HAVE_SBRK */ } +#endif static void * piecewise_init (Display *dd, Window ww) @@ -861,7 +865,9 @@ piecewise_init (Display *dd, Window ww) st->colors[0].pixel = get_pixel_resource(st->dpy, st->xgwa.colormap, "foreground", "Foreground"); } else { - make_color_loop(st->dpy, st->xgwa.colormap, 0, 1, 1, 120, 1, 1, 240, 1, 1, st->colors, &st->ncolors, True, False); + make_color_loop(st->xgwa.screen, st->xgwa.visual, st->xgwa.colormap, + 0, 1, 1, 120, 1, 1, 240, 1, 1, + st->colors, &st->ncolors, True, False); if (st->ncolors < 2) goto MONO; } @@ -932,7 +938,7 @@ piecewise_draw (Display *dpy, Window window, void *closure) st->b = (st->b == st->ba ? st->bb : st->ba); } - check_for_leaks(); +/* check_for_leaks(); */ return st->delay; } @@ -940,6 +946,8 @@ static void piecewise_reshape (Display *dpy, Window window, void *closure, unsigned int w, unsigned int h) { + struct state *st = (struct state *) closure; + XGetWindowAttributes(st->dpy, st->window, &st->xgwa); } static Bool @@ -973,6 +981,9 @@ static const char *piecewise_defaults [] = { #ifdef HAVE_DOUBLE_BUFFER_EXTENSION "*useDBE: True", #endif /* HAVE_DOUBLE_BUFFER_EXTENSION */ +#ifdef USE_IPHONE + "*ignoreRotation: True", +#endif 0 };