X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fpulsar.c;h=c344c82bbb6eca843b03e6ff5839b965fd6a2c2f;hp=7c67b83537991a979bb68885711e3f631ace43f6;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=3d9140a05b5272fed0883a0af0a71e30ef44d47f diff --git a/hacks/glx/pulsar.c b/hacks/glx/pulsar.c index 7c67b835..c344c82b 100644 --- a/hacks/glx/pulsar.c +++ b/hacks/glx/pulsar.c @@ -40,13 +40,6 @@ #include #include -/*- - * due to a Bug/feature in VMS X11/Intrinsic.h has to be placed before xlock. - * otherwise caddr_t is not defined correctly - */ - -#include - #ifdef STANDALONE # define PROGCLASS "Screensaver" # define HACK_INIT init_screensaver @@ -74,13 +67,6 @@ #ifdef USE_GL /* whole file */ -#ifdef HAVE_XPM -# include -# ifndef PIXEL_ALREADY_TYPEDEFED -# define PIXEL_ALREADY_TYPEDEFED /* Sigh, Xmu/Drawing.h needs this... */ -# endif -#endif - #ifdef HAVE_XMU # ifndef VMS # include @@ -93,9 +79,11 @@ #include #include -#include -#include +#include #include +#include + +#include "xpm-ximage.h" /* Functions for loading and storing textures */ @@ -138,41 +126,41 @@ static char *which_image; static XrmOptionDescRec opts[] = { - {"-quads", ".pulsar.quads", XrmoptionSepArg, (caddr_t) NULL }, - {"-light", ".pulsar.light", XrmoptionNoArg, (caddr_t) "true" }, - {"+light", ".pulsar.light", XrmoptionNoArg, (caddr_t) "false" }, - {"-wire", ".pulsar.wire", XrmoptionNoArg, (caddr_t) "true" }, - {"+wire", ".pulsar.wire", XrmoptionNoArg, (caddr_t) "false" }, - {"-blend", ".pulsar.blend", XrmoptionNoArg, (caddr_t) "true" }, - {"+blend", ".pulsar.blend", XrmoptionNoArg, (caddr_t) "false" }, - {"-fog", ".pulsar.fog", XrmoptionNoArg, (caddr_t) "true" }, - {"+fog", ".pulsar.fog", XrmoptionNoArg, (caddr_t) "false" }, - {"-antialias", ".pulsar.antialias", XrmoptionNoArg, (caddr_t) "true" }, - {"+antialias", ".pulsar.antialias", XrmoptionNoArg, (caddr_t) "false" }, - {"-texture", ".pulsar.texture", XrmoptionNoArg, (caddr_t) "true" }, - {"+texture", ".pulsar.texture", XrmoptionNoArg, (caddr_t) "false" }, - {"-texture_quality", ".pulsar.texture_quality", XrmoptionNoArg, (caddr_t) "true" }, - {"+texture_quality", ".pulsar.texture_quality", XrmoptionNoArg, (caddr_t) "false" }, - {"-mipmap", ".pulsar.mipmap", XrmoptionNoArg, (caddr_t) "true" }, - {"+mipmap", ".pulsar.mipmap", XrmoptionNoArg, (caddr_t) "false" }, - {"-do_depth", ".pulsar.doDepth", XrmoptionNoArg, (caddr_t) "true" }, - {"+do_depth", ".pulsar.doDepth", XrmoptionNoArg, (caddr_t) "false" }, - {"-image", ".pulsar.image", XrmoptionSepArg, (caddr_t) NULL }, + {"-quads", ".pulsar.quads", XrmoptionSepArg, 0 }, + {"-light", ".pulsar.light", XrmoptionNoArg, "true" }, + {"+light", ".pulsar.light", XrmoptionNoArg, "false" }, + {"-wire", ".pulsar.wire", XrmoptionNoArg, "true" }, + {"+wire", ".pulsar.wire", XrmoptionNoArg, "false" }, + {"-blend", ".pulsar.blend", XrmoptionNoArg, "true" }, + {"+blend", ".pulsar.blend", XrmoptionNoArg, "false" }, + {"-fog", ".pulsar.fog", XrmoptionNoArg, "true" }, + {"+fog", ".pulsar.fog", XrmoptionNoArg, "false" }, + {"-antialias", ".pulsar.antialias", XrmoptionNoArg, "true" }, + {"+antialias", ".pulsar.antialias", XrmoptionNoArg, "false" }, + {"-texture", ".pulsar.texture", XrmoptionNoArg, "true" }, + {"+texture", ".pulsar.texture", XrmoptionNoArg, "false" }, + {"-texture_quality", ".pulsar.texture_quality", XrmoptionNoArg, "true" }, + {"+texture_quality", ".pulsar.texture_quality", XrmoptionNoArg, "false" }, + {"-mipmap", ".pulsar.mipmap", XrmoptionNoArg, "true" }, + {"+mipmap", ".pulsar.mipmap", XrmoptionNoArg, "false" }, + {"-do_depth", ".pulsar.doDepth", XrmoptionNoArg, "true" }, + {"+do_depth", ".pulsar.doDepth", XrmoptionNoArg, "false" }, + {"-image", ".pulsar.image", XrmoptionSepArg, 0 }, }; static argtype vars[] = { - {(caddr_t *) &num_quads, "quads", "Quads", DEF_NUM_QUADS, t_Int}, - {(caddr_t *) &do_light, "light", "Light", DEF_LIGHT, t_Bool}, - {(caddr_t *) &do_wire, "wire", "Wire", DEF_WIRE, t_Bool}, - {(caddr_t *) &do_blend, "blend", "Blend", DEF_BLEND, t_Bool}, - {(caddr_t *) &do_fog, "fog", "Fog", DEF_FOG, t_Bool}, - {(caddr_t *) &do_antialias, "antialias", "Antialias", DEF_ANTIALIAS, t_Bool}, - {(caddr_t *) &do_texture, "texture", "Texture", DEF_TEXTURE, t_Bool}, - {(caddr_t *) &do_texture_quality, "texture_quality", "Texture_quality", DEF_TEXTURE_QUALITY, t_Bool}, - {(caddr_t *) &do_mipmap, "mipmap", "Mipmap", DEF_MIPMAP, t_Bool}, - {(caddr_t *) &do_depth, "doDepth", "DoDepth", DEF_DO_DEPTH, t_Bool}, - {(caddr_t *) &which_image, "image", "Image", DEF_IMAGE, t_String}, + {&num_quads, "quads", "Quads", DEF_NUM_QUADS, t_Int}, + {&do_light, "light", "Light", DEF_LIGHT, t_Bool}, + {&do_wire, "wire", "Wire", DEF_WIRE, t_Bool}, + {&do_blend, "blend", "Blend", DEF_BLEND, t_Bool}, + {&do_fog, "fog", "Fog", DEF_FOG, t_Bool}, + {&do_antialias, "antialias", "Antialias", DEF_ANTIALIAS, t_Bool}, + {&do_texture, "texture", "Texture", DEF_TEXTURE, t_Bool}, + {&do_texture_quality, "texture_quality", "Texture_quality", DEF_TEXTURE_QUALITY, t_Bool}, + {&do_mipmap, "mipmap", "Mipmap", DEF_MIPMAP, t_Bool}, + {&do_depth, "doDepth", "DoDepth", DEF_DO_DEPTH, t_Bool}, + {&which_image, "image", "Image", DEF_IMAGE, t_String}, }; @@ -188,7 +176,7 @@ static OptionStruct desc[] = {"-/+ texture_quality", "whether to do enable linear/mipmap filtering (much much slower)"}, {"-/+ mipmap", "whether to do enable mipmaps (much slower)"}, {"-/+ depth", "whether to do enable depth buffer checking (slower)"}, - {"-image ", "texture image to load (PPM, PPM4, TIFF(?), XPM(?))"}, + {"-image ", "texture image to load"}, }; ModeSpecOpt screensaver_opts = {countof(opts), opts, countof(vars), vars, desc}; @@ -230,7 +218,8 @@ static int frame = 0; struct quad *quads; -GLubyte *Generate_Image(int *width, int *height, int *format) +GLubyte * +Generate_Image(int *width, int *height, int *format) { GLubyte *result; int i, j, c; @@ -238,7 +227,7 @@ GLubyte *Generate_Image(int *width, int *height, int *format) *width = checkImageWidth; *height = checkImageHeight; - result = (GLubyte *)malloc(4 * *width * *height); + result = (GLubyte *)malloc(4 * (*width) * (*height)); counter = 0; for (i = 0; i < checkImageWidth; i++) { @@ -256,210 +245,25 @@ GLubyte *Generate_Image(int *width, int *height, int *format) } - -#ifdef TIFF -#include -/* Load a TIFF texture: requires libtiff */ -uint32 *LoadTIFF(char *filename, int *width, int *height, int *format) -{ - TIFF *tif; - char emsg[1024]; - uint32 *raster; - TIFFRGBAImage img; - tsize_t npixels; - - tif = TIFFOpen(filename, "r"); - if (tif == NULL) { - fprintf(stderr, "Problem showing %s\n", filename); - return Generate_Image(&width, &height, &format); - } - if (TIFFRGBAImageBegin(&img, tif, 0, emsg)) { - npixels = (tsize_t) (img.width * img.height); - raster = (uint32 *) _TIFFmalloc(npixels * (tsize_t) sizeof(uint32)); - if (raster != NULL) { - if (TIFFRGBAImageGet(&img, raster, img.width, img.height) == 0) { - TIFFError(filename, emsg); - return Generate_Image(&width, &height, &format); - } - } - TIFFRGBAImageEnd(&img); - } else { - TIFFError(filename, emsg); - return Generate_Image(&width, &height, &format); - } - - *width = img.width; - *height = img.height; - *format = GL_RGBA; - - TIFFClose(tif); - return raster; -} -#endif - -/* Load a modified version of PPM format with an extra byte for alpha */ -GLubyte *LoadPPM4(const char *filename, int *width, int *height, int *format) -{ - char buff[1024]; - GLubyte *data; - int sizeX, sizeY; - FILE *fp; - int maxval; - - fp = fopen(filename, "rb"); - if (!fp) - { - fprintf(stderr, "Unable to open file '%s'\n", filename); - return Generate_Image(width, height, format); - } - - if (!fgets(buff, sizeof(buff), fp)) - { - perror("Unable to read header filename\n"); - return Generate_Image(width, height, format); - } - - if (buff[0] != '6' || buff[1] != 'P') - { - fprintf(stderr, "Invalid image format (must be `6P')\n"); - return Generate_Image(width, height, format); - } - - do - { - fgets(buff, sizeof(buff), fp); - } - while (buff[0] == '#'); - - if (sscanf(buff, "%d %d", &sizeX, &sizeY) != 2) - { - fprintf(stderr, "Error loading image `%s'\n", filename); - return Generate_Image(width, height, format); - } - - if (fscanf(fp, "%d", &maxval) != 1) - { - fprintf(stderr, "Error loading image `%s'\n", filename); - return Generate_Image(width, height, format); - } - - while (fgetc(fp) != '\n') - ; - - data = (GLubyte *)malloc(4 * sizeX * sizeY); - if (data == NULL) - { - fprintf(stderr, "Unable to allocate memory\n"); - exit(1); - } - - if (fread(data, 4 * sizeX, sizeY, fp) != sizeY) - { - fprintf(stderr, "Error loading image `%s'\n", filename); - return Generate_Image(width, height, format); - } - - fclose(fp); - - *width = sizeX; - *height = sizeY; - *format = GL_RGBA; - return data; -} - -/* Load a plain PPM image */ -GLubyte *LoadPPM(const char *filename, int *width, int *height, int *format) -{ - char buff[1024]; - GLubyte *data; - GLint sizeX, sizeY; - FILE *fp; - int maxval; - - fp = fopen(filename, "rb"); - if (!fp) - { - fprintf(stderr, "Unable to open file '%s'\n", filename); - return Generate_Image(width, height, format); - exit(1); - } - if (!fgets(buff, sizeof(buff), fp)) - { - perror(filename); - return Generate_Image(width, height, format); - } - - if (buff[0] != 'P' || buff[1] != '6') - { - fprintf(stderr, "Invalid image format (must be `P6')\n"); - return Generate_Image(width, height, format); - } - - do - { - fgets(buff, sizeof(buff), fp); - } - while (buff[0] == '#'); - - if (sscanf(buff, "%d %d", &sizeX, &sizeY) != 2) - { - fprintf(stderr, "Error loading image `%s'\n", filename); - return Generate_Image(width, height, format); - } - - if (fscanf(fp, "%d", &maxval) != 1) - { - fprintf(stderr, "Error loading image `%s'\n", filename); - return Generate_Image(width, height, format); - } - - while (fgetc(fp) != '\n') - ; - - data = (GLubyte *)malloc(3 * sizeX * sizeY); - if (data == NULL) - { - fprintf(stderr, "Unable to allocate memory\n"); - exit(1); - } - - if (fread(data, 3 * sizeX, sizeY, fp) != sizeY) - { - fprintf(stderr, "Error loading image `%s'\n", filename); - return Generate_Image(width, height, format); - } - - fclose(fp); - - *width = sizeX; - *height = sizeY; - *format = GL_RGB; - return data; -} - /* Create a texture in OpenGL. First an image is loaded and stored in a raster buffer, then it's */ -void Create_Texture(char *filename) +void Create_Texture(ModeInfo *mi, const char *filename) { int height, width; GLubyte *image; - GLint a; int format; if ( !strncmp(filename, "BUILTIN", 7)) image = Generate_Image(&width, &height, &format); - else if ( !strncmp((filename+strlen(filename)-3), "ppm", 3)) - image = LoadPPM(filename, &width, &height, &format); - else if ( !strncmp((filename+strlen(filename)-4), "ppm4", 4)) - image = LoadPPM4(filename, &width, &height, &format); -#ifdef TIFF - else if ( !strncmp((filename+strlen(filename)-4), "tiff", 4)) - image = (GLubyte *)LoadTIFF(filename, &width, &height, &format); -#endif - else { - fprintf(stderr, "Unknown file format extension: '%s'\n", filename); - image = Generate_Image(&width, &height, &format); - } + else + { + XImage *ximage = xpm_file_to_ximage (MI_DISPLAY (mi), MI_VISUAL (mi), + MI_COLORMAP (mi), filename); + image = (GLubyte *) ximage->data; + width = ximage->width; + height = ximage->height; + format = GL_RGBA; + } /* GL_MODULATE or GL_DECAL depending on what you want */ glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); @@ -483,7 +287,21 @@ void Create_Texture(char *filename) /* mipmaps make the image look much nicer */ if (do_mipmap) - a=gluBuild2DMipmaps(GL_TEXTURE_2D, format, width, height, format, GL_UNSIGNED_BYTE, image); + { + int status; + clear_gl_error(); + status = gluBuild2DMipmaps(GL_TEXTURE_2D, 3, width, height, format, + GL_UNSIGNED_BYTE, image); + if (status) + { + const char *s = (char *) gluErrorString (status); + fprintf (stderr, "%s: error mipmapping %dx%d texture: %s\n", + progname, width, height, + (s ? s : "(unknown)")); + exit (1); + } + check_gl_error("mipmapping"); + } else { clear_gl_error(); @@ -491,8 +309,6 @@ void Create_Texture(char *filename) format, GL_UNSIGNED_BYTE, image); check_gl_error("texture"); } - - free(image); } void resetProjection(void) { @@ -542,7 +358,7 @@ void GenerateQuad(void) } } -void initializeGL(GLsizei width, GLsizei height) +void initializeGL(ModeInfo *mi, GLsizei width, GLsizei height) { GLfloat fogColor[4] = { 0.1, 0.1, 0.1, 0.1 }; @@ -586,7 +402,7 @@ void initializeGL(GLsizei width, GLsizei height) if (do_texture) - Create_Texture(which_image); + Create_Texture(mi, which_image); GenerateQuad(); } @@ -613,7 +429,7 @@ void drawQuads(void) { GLvoid drawScene(ModeInfo * mi) { - check_gl_error ("drawScene"); +/* check_gl_error ("drawScene"); */ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); /* we have to do this here because the FPS meter turns these 3 features off!! */ @@ -647,7 +463,7 @@ GLvoid drawScene(ModeInfo * mi) /* increment frame-counter */ frame++; - check_gl_error ("drawScene"); +/* check_gl_error ("drawScene"); */ } @@ -690,7 +506,7 @@ init_screensaver(ModeInfo * mi) gp->window = MI_WINDOW(mi); if ((gp->glx_context = init_GL(mi)) != NULL) { reshape_screensaver(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); - initializeGL(MI_WIDTH(mi), MI_HEIGHT(mi)); + initializeGL(mi, MI_WIDTH(mi), MI_HEIGHT(mi)); } else { MI_CLEARWINDOW(mi); }