X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Ftwang.c;h=1b2cdf6255793ae6734cbf64779ca851ebad0f9e;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hp=dec8fbe14b8b5ca91f0fa51fddaedeebeff97203;hpb=4ade52359b6eba3621566dac79793a33aa4c915f;p=xscreensaver diff --git a/hacks/twang.c b/hacks/twang.c index dec8fbe1..1b2cdf62 100644 --- a/hacks/twang.c +++ b/hacks/twang.c @@ -15,10 +15,7 @@ #include #include "screenhack.h" - -#ifdef HAVE_XSHM_EXTENSION #include "xshm.h" -#endif #define FLOAT double @@ -62,7 +59,6 @@ struct state { Screen *screen; /* the screen to draw on */ XImage *sourceImage; /* image source of stuff to draw */ XImage *workImage; /* work area image, used when rendering */ - XImage *backgroundImage; /* image filled with background pixels */ GC backgroundGC; /* GC for the background color */ GC foregroundGC; /* GC for the foreground color */ @@ -79,11 +75,9 @@ struct state { time_t start_time; async_load_state *img_loader; + Pixmap pm; - Bool useShm; /* whether or not to use xshm */ -#ifdef HAVE_XSHM_EXTENSION XShmSegmentInfo shmInfo; -#endif }; @@ -107,15 +101,16 @@ struct state { static void grabImage_start (struct state *st, XWindowAttributes *xwa) { - XFillRectangle (st->dpy, st->window, st->backgroundGC, 0, 0, - st->windowWidth, st->windowHeight); - st->backgroundImage = - XGetImage (st->dpy, st->window, 0, 0, st->windowWidth, st->windowHeight, - ~0L, ZPixmap); - - st->start_time = time ((time_t) 0); + /* On MacOS X11, XGetImage on a Window often gets an inexplicable BadMatch, + possibly due to the window manager having occluded something? It seems + nondeterministic. Loading the image into a pixmap instead fixes it. */ + if (st->pm) XFreePixmap (st->dpy, st->pm); + st->pm = XCreatePixmap (st->dpy, st->window, + xwa->width, xwa->height, xwa->depth); + + st->start_time = time ((time_t *) 0); st->img_loader = load_image_async_simple (0, xwa->screen, st->window, - st->window, 0, 0); + st->pm, 0, 0); } static void @@ -124,33 +119,18 @@ grabImage_done (struct state *st) XWindowAttributes xwa; XGetWindowAttributes (st->dpy, st->window, &xwa); - st->start_time = time ((time_t) 0); + st->start_time = time ((time_t *) 0); if (st->sourceImage) XDestroyImage (st->sourceImage); - st->sourceImage = XGetImage (st->dpy, st->window, 0, 0, st->windowWidth, st->windowHeight, + st->sourceImage = XGetImage (st->dpy, st->pm, 0, 0, + st->windowWidth, st->windowHeight, ~0L, ZPixmap); - if (st->workImage) XDestroyImage (st->workImage); - st->workImage = NULL; - -#ifdef HAVE_XSHM_EXTENSION - if (st->useShm) - { - st->workImage = create_xshm_image (st->dpy, xwa.visual, xwa.depth, - ZPixmap, 0, &st->shmInfo, - st->windowWidth, st->windowHeight); - if (!st->workImage) - { - st->useShm = False; - fprintf (stderr, "create_xshm_image failed\n"); - } - } - - if (st->workImage == NULL) -#endif /* HAVE_XSHM_EXTENSION */ + if (st->workImage) destroy_xshm_image (st->dpy, st->workImage, + &st->shmInfo); - /* just use XSubImage to acquire the right visual, depth, etc; - * easier than the other alternatives */ - st->workImage = XSubImage (st->sourceImage, 0, 0, st->windowWidth, st->windowHeight); + st->workImage = create_xshm_image (st->dpy, xwa.visual, xwa.depth, + ZPixmap, &st->shmInfo, + st->windowWidth, st->windowHeight); } /* set up the system */ @@ -524,7 +504,8 @@ static void renderFrame (struct state *st) { int n; - memcpy (st->workImage->data, st->backgroundImage->data, + /* This assumes black is zero. */ + memset (st->workImage->data, 0, st->workImage->bytes_per_line * st->workImage->height); sortTiles (st); @@ -534,14 +515,8 @@ static void renderFrame (struct state *st) renderTile (st, st->sortedTiles[n]); } -#ifdef HAVE_XSHM_EXTENSION - if (st->useShm) - XShmPutImage (st->dpy, st->window, st->backgroundGC, st->workImage, 0, 0, 0, 0, - st->windowWidth, st->windowHeight, False); - else -#endif /* HAVE_XSHM_EXTENSION */ - XPutImage (st->dpy, st->window, st->backgroundGC, st->workImage, - 0, 0, 0, 0, st->windowWidth, st->windowHeight); + put_xshm_image (st->dpy, st->window, st->backgroundGC, st->workImage, 0, 0, 0, 0, + st->windowWidth, st->windowHeight, &st->shmInfo); } /* set up the model */ @@ -581,6 +556,7 @@ static void setupModel (struct state *st) leftX = (st->windowWidth - (st->columns * st->tileSize) + st->tileSize) / 2; topY = (st->windowHeight - (st->rows * st->tileSize) + st->tileSize) / 2; + if (st->tileCount < 1) st->tileCount = 1; st->tiles = calloc (st->tileCount, sizeof (Tile)); st->sortedTiles = calloc (st->tileCount, sizeof (Tile *)); @@ -615,7 +591,7 @@ twang_draw (Display *dpy, Window window, void *closure) } if (!st->img_loader && - st->start_time + st->duration < time ((time_t) 0)) { + st->start_time + st->duration < time ((time_t *) 0)) { XWindowAttributes xgwa; XGetWindowAttributes (st->dpy, st->window, &xgwa); grabImage_start (st, &xgwa); @@ -638,6 +614,12 @@ twang_reshape (Display *dpy, Window window, void *closure, static Bool twang_event (Display *dpy, Window window, void *closure, XEvent *event) { + struct state *st = (struct state *) closure; + if (screenhack_event_helper (dpy, window, event)) + { + st->start_time = 0; + return True; + } return False; } @@ -645,6 +627,7 @@ static void twang_free (Display *dpy, Window window, void *closure) { struct state *st = (struct state *) closure; + if (st->pm) XFreePixmap (dpy, st->pm); free (st); } @@ -723,10 +706,6 @@ static void initParams (struct state *st) problems = 1; } -#ifdef HAVE_XSHM_EXTENSION - st->useShm = get_boolean_resource (st->dpy, "useSHM", "Boolean"); -#endif - if (problems) { exit (1); @@ -751,6 +730,7 @@ twang_init (Display *dpy, Window win) static const char *twang_defaults [] = { ".background: black", ".foreground: white", + ".lowrez: true", "*borderColor: blue", "*borderWidth: 3", "*delay: 10000", @@ -767,8 +747,9 @@ static const char *twang_defaults [] = { #else "*useSHM: False", #endif -#ifdef USE_IPHONE +#ifdef HAVE_MOBILE "*ignoreRotation: True", + "*rotateImages: True", #endif 0 };