X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fgflux.c;h=ad14d01f2c1827e3a9f95f5ac99c03c4d905738b;hb=40eacb5812ef7c0e3374fb139afbb4f5bc8bbfb5;hp=172f4061925ab86aa9c9b52e63d67502e0c9e1cd;hpb=a94197e76a5dea5cb60542840809d6c20d0abbf3;p=xscreensaver diff --git a/hacks/glx/gflux.c b/hacks/glx/gflux.c index 172f4061..ad14d01f 100644 --- a/hacks/glx/gflux.c +++ b/hacks/glx/gflux.c @@ -35,6 +35,7 @@ * 21 July 2000 : cleaned up code from bug hunts, manpage written * 24 November 2000 : fixed x co-ord calculation in solid - textured * 05 March 2001 : put back non pnmlib code with #ifdefs + * 11 May 2002 : fixed image problems with large images */ @@ -51,6 +52,8 @@ # define HACK_INIT init_gflux # define HACK_DRAW draw_gflux # define HACK_RESHAPE reshape_gflux +# define HACK_HANDLE_EVENT gflux_handle_event +# define EVENT_MASK PointerMotionMask # define gflux_opts xlockmore_opts #define DEFAULTS "*delay: 20000 \n" \ "*showFPS: False \n" \ @@ -101,6 +104,7 @@ #include #include "grab-ximage.h" +#include "gltrackball.h" static enum {wire=0,solid,light,checker,textured,grab} _draw; /* draw style */ @@ -119,6 +123,9 @@ static int _waveChange = 50; static float _waveHeight = 1.0; static float _waveFreq = 3.0; +static trackball_state *trackball; +static Bool button_down_p = False; + #define WIDTH 320 #define HEIGHT 240 @@ -239,6 +246,43 @@ double getGrid(double,double,double); /* BEGINNING OF FUNCTIONS */ +Bool +gflux_handle_event (ModeInfo *mi, XEvent *event) +{ + if (event->xany.type == ButtonPress && + event->xbutton.button & Button1) + { + button_down_p = True; + gltrackball_start (trackball, + event->xbutton.x, event->xbutton.y, + MI_WIDTH (mi), MI_HEIGHT (mi)); + return True; + } + else if (event->xany.type == ButtonRelease && + event->xbutton.button & Button1) + { + button_down_p = False; + return True; + } + else if (event->xany.type == MotionNotify && + button_down_p) + { + gltrackball_track (trackball, + event->xmotion.x, event->xmotion.y, + MI_WIDTH (mi), MI_HEIGHT (mi)); + return True; + } + + return False; +} + + +static void +userRot(void) +{ + gltrackball_rotate (trackball); +} + /* draw the gflux once */ void draw_gflux(ModeInfo * mi) { @@ -342,6 +386,8 @@ void init_gflux(ModeInfo * mi) } gp = &gflux[screen]; + trackball = gltrackball_init (); + { char *s = get_string_resource ("mode", "Mode"); if (!s || !*s) _draw = wire; @@ -576,18 +622,21 @@ grabTexture(void) int real_height = gflux->modeinfo->xgwa.height; XImage *ximage = screen_to_ximage (gflux->modeinfo->xgwa.screen, gflux->window); + Bool bigimage = False; + int size = 0; if (ximage->width > 1280 || /* that's too damned big... */ ximage->height > 1280) { Display *dpy = gflux->modeinfo->dpy; Visual *v = gflux->modeinfo->xgwa.visual; - int size = (ximage->width < ximage->height ? - ximage->width : ximage->height); int real_size = (ximage->width < ximage->height ? real_width : real_height); XImage *x2; int x, y, xoff, yoff; + size = (ximage->width < ximage->height ? + ximage->width : ximage->height); + bigimage = True; if (size > 1024) size = 1024; @@ -614,16 +663,18 @@ grabTexture(void) /* Add a border. */ { unsigned long gray = 0xAAAAAAAAL; /* so shoot me */ + int width = (bigimage ? size : real_width); + int height = (bigimage ? size : real_height); int i; for (i = 0; i < real_height; i++) { XPutPixel (ximage, 0, i, gray); - XPutPixel (ximage, real_width-1, i, gray); + XPutPixel (ximage, width-1, i, gray); } for (i = 0; i < real_width; i++) { XPutPixel (ximage, i, 0, gray); - XPutPixel (ximage, i, real_height-1, gray); + XPutPixel (ximage, i, height-1, gray); } } @@ -631,8 +682,16 @@ grabTexture(void) gflux->imageHeight = ximage->height; gflux->image = ximage->data; - gflux->tex_xscale = ((GLfloat) real_width / (GLfloat) ximage->width); - gflux->tex_yscale = ((GLfloat) real_height / (GLfloat) ximage->height); + if (bigimage) /* don't scale really large images */ + { + gflux->tex_xscale = 1; + gflux->tex_yscale = 1; + } + else + { + gflux->tex_xscale = ((GLfloat) real_width / (GLfloat) ximage->width); + gflux->tex_yscale = ((GLfloat) real_height / (GLfloat) ximage->height); + } ximage->data = 0; XDestroyImage (ximage); @@ -703,6 +762,7 @@ void displayTexture(void) glRotatef(anglex,1,0,0); glRotatef(angley,0,1,0); glRotatef(anglez,0,0,1); + userRot(); glScalef(1,1,(GLfloat)_waveHeight); glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); glEnable(GL_TEXTURE_2D); @@ -742,10 +802,12 @@ void displayTexture(void) glEnd(); } - time -= _speed; - anglex -= _rotationx; - angley -= _rotationy; - anglez -= _rotationz; + if (! button_down_p) { + time -= _speed; + anglex -= _rotationx; + angley -= _rotationy; + anglez -= _rotationz; + } } void displaySolid(void) { @@ -763,6 +825,7 @@ void displaySolid(void) glRotatef(anglex,1,0,0); glRotatef(angley,0,1,0); glRotatef(anglez,0,0,1); + userRot(); glScalef(1,1,(GLfloat)_waveHeight); glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); @@ -782,10 +845,12 @@ void displaySolid(void) glEnd(); } - time -= _speed; - anglex -= _rotationx; - angley -= _rotationy; - anglez -= _rotationz; + if (! button_down_p) { + time -= _speed; + anglex -= _rotationx; + angley -= _rotationy; + anglez -= _rotationz; + } } @@ -805,6 +870,7 @@ void displayLight(void) glRotatef(anglex,1,0,0); glRotatef(angley,0,1,0); glRotatef(anglez,0,0,1); + userRot(); glScalef(1,1,(GLfloat)_waveHeight); glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); @@ -834,10 +900,12 @@ void displayLight(void) glEnd(); } - time -= _speed; - anglex -= _rotationx; - angley -= _rotationy; - anglez -= _rotationz; + if (! button_down_p) { + time -= _speed; + anglex -= _rotationx; + angley -= _rotationy; + anglez -= _rotationz; + } } void displayWire(void) @@ -858,6 +926,7 @@ void displayWire(void) glRotatef(anglex,1,0,0); glRotatef(angley,0,1,0); glRotatef(anglez,0,0,1); + userRot(); glScalef(1,1,(GLfloat)_waveHeight); glClear(GL_COLOR_BUFFER_BIT); @@ -882,10 +951,12 @@ void displayWire(void) glEnd(); } - time -= _speed; - anglex -= _rotationx; - angley -= _rotationy; - anglez -= _rotationz; + if (! button_down_p) { + time -= _speed; + anglex -= _rotationx; + angley -= _rotationy; + anglez -= _rotationz; + } } /* generates new ripples */ @@ -895,12 +966,14 @@ void calcGrid(void) double tmp; static int newWave; + if (button_down_p) return; + tmp = 1.0/((double)_waveChange); if(!(counter%_waveChange)) { newWave = ((int)(counter*tmp))%_waves; - gflux->dispx[newWave] = 1.0 - ((double)random())/RAND_MAX; - gflux->dispy[newWave] = 1.0 - ((double)random())/RAND_MAX; - gflux->freq[newWave] = _waveFreq * ((float)random())/RAND_MAX; + gflux->dispx[newWave] = -frand(1.0); + gflux->dispy[newWave] = -frand(1.0); + gflux->freq[newWave] = _waveFreq * frand(1.0); gflux->wa[newWave] = 0.0; } counter++;