X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fgrab-ximage.c;h=0f718476e75d7b4e909b7f9b24e7622d74855e51;hb=39809ded547bdbb08207d3e514950425215b4410;hp=b1c1cf45a6fdeb28ae691658659feb9874fbbad3;hpb=0d6b320def9180cf907ceaed56b23a972a11b757;p=xscreensaver diff --git a/hacks/glx/grab-ximage.c b/hacks/glx/grab-ximage.c index b1c1cf45..0f718476 100644 --- a/hacks/glx/grab-ximage.c +++ b/hacks/glx/grab-ximage.c @@ -1,5 +1,5 @@ /* grab-ximage.c --- grab the screen to an XImage for use with OpenGL. - * xscreensaver, Copyright (c) 2001, 2003, 2005 Jamie Zawinski + * xscreensaver, Copyright (c) 2001-2008 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -17,12 +17,31 @@ #include #include #include -#include -#include -#include /* only for GLfloat */ -#include /* for gluBuild2DMipmaps */ +#ifdef HAVE_ANDROID +#include +#endif + +#ifdef HAVE_JWXYZ +# include "jwxyz.h" +# ifndef HAVE_JWZGLES +# include +# endif +#else +# include +# include +# include /* only for GLfloat */ +# include /* for gluBuild2DMipmaps */ +# include /* for glXMakeCurrent() */ +#endif + +#ifdef HAVE_JWZGLES +# include "jwzgles.h" +#endif /* HAVE_JWZGLES */ + +#include "grab-ximage.h" #include "grabscreen.h" +#include "pow2.h" #include "visual.h" /* If REFORMAT_IMAGE_DATA is defined, then we convert Pixmaps to textures @@ -47,16 +66,18 @@ #define REFORMAT_IMAGE_DATA -#ifdef HAVE_XSHM_EXTENSION -# include "resources.h" -# include "xshm.h" -#endif /* HAVE_XSHM_EXTENSION */ +#include "xshm.h" extern char *progname; -#include #include +#ifdef HAVE_JWXYZ +# include "jwxyz.h" +#else +# include +#endif + #undef MAX #define MAX(a,b) ((a)>(b)?(a):(b)) @@ -80,7 +101,8 @@ bigendian (void) /* Given a bitmask, returns the position and width of the field. */ static void -decode_mask (unsigned int mask, unsigned int *pos_ret, unsigned int *size_ret) +decode_mask (unsigned long mask, unsigned long *pos_ret, + unsigned long *size_ret) { int i; for (i = 0; i < 32; i++) @@ -123,23 +145,22 @@ convert_ximage_to_rgba32 (Screen *screen, XImage *image) Visual *visual = DefaultVisualOfScreen (screen); int x, y; - unsigned int crpos=0, cgpos=0, cbpos=0, capos=0; /* bitfield positions */ - unsigned int srpos=0, sgpos=0, sbpos=0; - unsigned int srmsk=0, sgmsk=0, sbmsk=0; - unsigned int srsiz=0, sgsiz=0, sbsiz=0; - int i; + unsigned long crpos=0, cgpos=0, cbpos=0, capos=0; /* bitfield positions */ + unsigned long srpos=0, sgpos=0, sbpos=0; + unsigned long srmsk=0, sgmsk=0, sbmsk=0; + unsigned long srsiz=0, sgsiz=0, sbsiz=0; XColor *colors = 0; unsigned char spread_map[3][256]; - /* Note: height+2 in "to" to be to work around an array bounds overrun + /* Note: height+2 in "to" to work around an array bounds overrun in gluBuild2DMipmaps / gluScaleImage. */ XImage *from = image; XImage *to = XCreateImage (dpy, visual, 32, /* depth */ - ZPixmap, 0, 0, from->width, from->height + 2, + ZPixmap, 0, 0, from->width, from->height, 32, /* bitmap pad */ 0); - to->data = (char *) calloc (to->height, to->bytes_per_line); + to->data = (char *) calloc (to->height + 2, to->bytes_per_line); /* Set the bit order in the XImage structure to whatever the local host's native bit order is. @@ -179,6 +200,7 @@ convert_ximage_to_rgba32 (Screen *screen, XImage *image) if (colors == 0) /* truecolor */ { + int i; for (i = 0; i < 256; i++) { spread_map[0][i] = spread_bits (i, srsiz); @@ -187,6 +209,10 @@ convert_ximage_to_rgba32 (Screen *screen, XImage *image) } } + /* trying to track down an intermittent crash in ximage_putpixel_32 */ + if (to->width < from->width) abort(); + if (to->height < from->height) abort(); + for (y = 0; y < from->height; y++) for (x = 0; x < from->width; x++) { @@ -291,10 +317,7 @@ pixmap_to_gl_ximage (Screen *screen, Window window, Pixmap pixmap) Visual *visual = DefaultVisualOfScreen (screen); unsigned int width, height, depth; -# ifdef HAVE_XSHM_EXTENSION - Bool use_shm = get_boolean_resource ("useSHM", "Boolean"); XShmSegmentInfo shm_info; -# endif /* HAVE_XSHM_EXTENSION */ XImage *server_ximage = 0; XImage *client_ximage = 0; @@ -306,32 +329,18 @@ pixmap_to_gl_ximage (Screen *screen, Window window, Pixmap pixmap) XGetGeometry (dpy, pixmap, &root, &x, &y, &width, &height, &bw, &depth); } + if (width < 5 || height < 5) /* something's gone wrong somewhere... */ + return 0; + /* Convert the server-side Pixmap to a client-side GL-ordered XImage. */ -# ifdef HAVE_XSHM_EXTENSION - if (use_shm) - { - server_ximage = create_xshm_image (dpy, visual, depth, - ZPixmap, 0, &shm_info, - width, height); - if (server_ximage) - XShmGetImage (dpy, pixmap, server_ximage, 0, 0, ~0L); - else - use_shm = False; - } -# endif /* HAVE_XSHM_EXTENSION */ - - if (!server_ximage) - server_ximage = XGetImage (dpy, pixmap, 0, 0, width, height, ~0L, ZPixmap); + server_ximage = create_xshm_image (dpy, visual, depth, ZPixmap, &shm_info, + width, height); + get_xshm_image (dpy, pixmap, server_ximage, 0, 0, ~0L, &shm_info); client_ximage = convert_ximage_to_rgba32 (screen, server_ximage); -# ifdef HAVE_XSHM_EXTENSION - if (use_shm) - destroy_xshm_image (dpy, server_ximage, &shm_info); - else -# endif /* HAVE_XSHM_EXTENSION */ - XDestroyImage (server_ximage); + destroy_xshm_image (dpy, server_ximage, &shm_info); return client_ximage; } @@ -360,7 +369,7 @@ typedef struct { #define SHORT_5_6_5 GL_UNSIGNED_SHORT_5_6_5 #define SHORT_5_6_5_REV GL_UNSIGNED_SHORT_5_6_5_REV -static conversion_table ctable[] = { +static const conversion_table ctable[] = { { 8, 0x000000E0, 0x0000001C, 0x00000003, BYTE_3_3_2, GL_RGB }, { 8, 0x00000007, 0x00000038, 0x000000C0, BYTE_2_3_3_REV, GL_RGB }, { 16, 0x0000F800, 0x000007E0, 0x0000001F, SHORT_5_6_5, GL_RGB }, @@ -458,6 +467,7 @@ gl_settings_for_ximage (XImage *image, #endif /* ! REFORMAT_IMAGE_DATA */ typedef struct { + GLXContext glx_context; Pixmap pixmap; int pix_width, pix_height, pix_depth; int texid; @@ -500,19 +510,6 @@ double_time (void) } -/* return the next larger power of 2. */ -static int -to_pow2 (int i) -{ - static unsigned int pow2[] = { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, - 2048, 4096, 8192, 16384, 32768, 65536 }; - int j; - for (j = 0; j < countof(pow2); j++) - if (pow2[j] >= i) return pow2[j]; - abort(); /* too big! */ -} - - /* Loads the given XImage into GL's texture memory. The image may be of any size. If mipmap_p is true, then make mipmaps instead of just a single texture. @@ -531,8 +528,8 @@ ximage_to_texture (XImage *ximage, GLenum err = 0; int orig_width = ximage->width; int orig_height = ximage->height; - int tex_width = 0; - int tex_height = 0; + GLsizei tex_width = 0; + GLsizei tex_height = 0; AGAIN: @@ -556,15 +553,15 @@ ximage_to_texture (XImage *ximage, So first, create a texture of that size (but don't write any data into it.) */ - tex_width = to_pow2 (ximage->width); - tex_height = to_pow2 (ximage->height); + tex_width = (GLsizei) to_pow2 (ximage->width); + tex_height = (GLsizei) to_pow2 (ximage->height); if (debug_p) fprintf (stderr, "%s: texture %d x %d (%d x %d)\n", progname, ximage->width, ximage->height, tex_width, tex_height); - glTexImage2D (GL_TEXTURE_2D, 0, 3, tex_width, tex_height, 0, + glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, tex_width, tex_height, 0, format, type, 0); err = glGetError(); @@ -585,7 +582,7 @@ ximage_to_texture (XImage *ximage, if (!s || !*s) { - sprintf (buf, "unknown error %d", err); + sprintf (buf, "unknown error %d", (int) err); s = buf; } @@ -622,89 +619,33 @@ ximage_to_texture (XImage *ximage, } -static void screen_to_texture_async_cb (Screen *screen, +static void load_texture_async_cb (Screen *screen, Window window, Drawable drawable, const char *name, XRectangle *geometry, void *closure); /* Grabs an image of the desktop (or another random image file) and - loads tht image into GL's texture memory. - Writes to stderr and returns False on error. - */ -Bool -screen_to_texture (Screen *screen, Window window, - int desired_width, int desired_height, - Bool mipmap_p, - char **filename_return, - XRectangle *geometry_return, - int *image_width_return, - int *image_height_return, - int *texture_width_return, - int *texture_height_return) -{ - Display *dpy = DisplayOfScreen (screen); - img_closure *data = (img_closure *) calloc (1, sizeof(*data)); - XWindowAttributes xgwa; - char *filename = 0; - XRectangle geom = { 0, 0, 0, 0 }; - int wret; - - if (! image_width_return) - image_width_return = &wret; - - if (debug_p) - data->load_time = double_time(); - - data->texid = -1; - data->mipmap_p = mipmap_p; - data->filename_return = filename_return; - data->geometry_return = geometry_return; - data->image_width_return = image_width_return; - data->image_height_return = image_height_return; - data->texture_width_return = texture_width_return; - data->texture_height_return = texture_height_return; - - XGetWindowAttributes (dpy, window, &xgwa); - data->pix_width = xgwa.width; - data->pix_height = xgwa.height; - data->pix_depth = xgwa.depth; - - if (desired_width && desired_width < xgwa.width) - data->pix_width = desired_width; - if (desired_height && desired_height < xgwa.height) - data->pix_height = desired_height; - - data->pixmap = XCreatePixmap (dpy, window, data->pix_width, data->pix_height, - data->pix_depth); - load_random_image (screen, window, data->pixmap, &filename, &geom); - screen_to_texture_async_cb (screen, window, data->pixmap, filename, &geom, - data); - - return (*image_width_return != 0); -} - - -/* Like the above, but the image is loaded in a background process, - and a callback is run when the loading is complete. + loads the image into GL's texture memory. When the callback is called, the image data will have been loaded into texture number `texid' (via glBindTexture.) If an error occurred, width/height will be 0. */ void -screen_to_texture_async (Screen *screen, Window window, - int desired_width, int desired_height, - Bool mipmap_p, - GLuint texid, - void (*callback) (const char *filename, - XRectangle *geometry, - int image_width, - int image_height, - int texture_width, - int texture_height, - void *closure), - void *closure) +load_texture_async (Screen *screen, Window window, + GLXContext glx_context, + int desired_width, int desired_height, + Bool mipmap_p, + GLuint texid, + void (*callback) (const char *filename, + XRectangle *geometry, + int image_width, + int image_height, + int texture_width, + int texture_height, + void *closure), + void *closure) { Display *dpy = DisplayOfScreen (screen); XWindowAttributes xgwa; @@ -713,25 +654,27 @@ screen_to_texture_async (Screen *screen, Window window, if (debug_p) data->load_time = double_time(); - data->texid = texid; - data->mipmap_p = mipmap_p; - data->callback = callback; - data->closure = closure; + data->texid = texid; + data->mipmap_p = mipmap_p; + data->glx_context = glx_context; + data->callback = callback; + data->closure = closure; XGetWindowAttributes (dpy, window, &xgwa); data->pix_width = xgwa.width; data->pix_height = xgwa.height; data->pix_depth = xgwa.depth; - if (desired_width && desired_width < xgwa.width) + /* Allow the pixmap to be larger than the window. Esper wants this. */ + if (desired_width /* && desired_width < xgwa.width */) data->pix_width = desired_width; - if (desired_height && desired_height < xgwa.height) + if (desired_height /* && desired_height < xgwa.height */) data->pix_height = desired_height; data->pixmap = XCreatePixmap (dpy, window, data->pix_width, data->pix_height, data->pix_depth); - fork_load_random_image (screen, window, data->pixmap, - screen_to_texture_async_cb, data); + load_image_async (screen, window, data->pixmap, + load_texture_async_cb, data); } @@ -739,9 +682,8 @@ screen_to_texture_async (Screen *screen, Window window, This is used in both synchronous and asynchronous mode. */ static void -screen_to_texture_async_cb (Screen *screen, Window window, Drawable drawable, - const char *name, XRectangle *geometry, - void *closure) +load_texture_async_cb (Screen *screen, Window window, Drawable drawable, + const char *name, XRectangle *geometry, void *closure) { Display *dpy = DisplayOfScreen (screen); Bool ok; @@ -756,10 +698,13 @@ screen_to_texture_async_cb (Screen *screen, Window window, Drawable drawable, free (data); data = 0; + if (dd.glx_context) + glXMakeCurrent (dpy, window, dd.glx_context); + if (geometry->width <= 0 || geometry->height <= 0) { /* This can happen if an old version of xscreensaver-getimage - is installed. */ + is installed. Or if we have no image (checkerboard). */ geometry->x = 0; geometry->y = 0; geometry->width = dd.pix_width;