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 */
time_t start_time;
async_load_state *img_loader;
+ Pixmap pm;
Bool useShm; /* whether or not to use xshm */
#ifdef HAVE_XSHM_EXTENSION
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
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);
{
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);
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 *));
}
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);
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;
}
twang_free (Display *dpy, Window window, void *closure)
{
struct state *st = (struct state *) closure;
+ if (st->pm) XFreePixmap (dpy, st->pm);
free (st);
}
"*useSHM: True",
#else
"*useSHM: False",
+#endif
+#ifdef HAVE_MOBILE
+ "*ignoreRotation: True",
+ "*rotateImages: True",
#endif
0
};