X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fglplanet.c;h=c0e0a573e872afbba7885512c91d7f317d70d6c2;hp=f2080b303af96aa6b258f2b46bd5419745cc0c61;hb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;hpb=2c902d6065f9856adf31e8540a94f1e42e68e905 diff --git a/hacks/glx/glplanet.c b/hacks/glx/glplanet.c index f2080b30..c0e0a573 100644 --- a/hacks/glx/glplanet.c +++ b/hacks/glx/glplanet.c @@ -35,34 +35,13 @@ */ -/*- - * 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 "Planet" -# define HACK_INIT init_planet -# define HACK_DRAW draw_planet -# define HACK_RESHAPE reshape_planet -# define HACK_HANDLE_EVENT planet_handle_event -# define EVENT_MASK PointerMotionMask -# define planet_opts xlockmore_opts -#define DEFAULTS "*delay: 15000 \n" \ +#define DEFAULTS "*delay: 20000 \n" \ "*showFPS: False \n" \ - "*rotate: True \n" \ - "*roll: True \n" \ - "*wander: True \n" \ "*wireframe: False \n" \ - "*light: True \n" \ - "*texture: True \n" \ - "*stars: True \n" \ - "*image: BUILTIN \n" \ "*imageForeground: Green \n" \ "*imageBackground: Blue \n" - +# define refresh_planet 0 # include "xlockmore.h" /* from the xscreensaver distribution */ #else /* !STANDALONE */ # include "xlock.h" /* from the xlockmore distribution */ @@ -80,16 +59,13 @@ # endif /* VMS */ #endif - -#include - #define DEF_ROTATE "True" #define DEF_ROLL "True" #define DEF_WANDER "True" #define DEF_TEXTURE "True" #define DEF_STARS "True" #define DEF_LIGHT "True" -#define DEF_RESOLUTION "64" +#define DEF_RESOLUTION "128" #define DEF_IMAGE "BUILTIN" #undef countof @@ -105,34 +81,34 @@ static char *which_image; static int resolution; static XrmOptionDescRec opts[] = { - {"-rotate", ".glplanet.rotate", XrmoptionNoArg, (caddr_t) "true" }, - {"+rotate", ".glplanet.rotate", XrmoptionNoArg, (caddr_t) "false" }, - {"-roll", ".glplanet.roll", XrmoptionNoArg, (caddr_t) "true" }, - {"+roll", ".glplanet.roll", XrmoptionNoArg, (caddr_t) "false" }, - {"-wander", ".glplanet.wander", XrmoptionNoArg, (caddr_t) "true" }, - {"+wander", ".glplanet.wander", XrmoptionNoArg, (caddr_t) "false" }, - {"-texture", ".glplanet.texture", XrmoptionNoArg, (caddr_t) "true" }, - {"+texture", ".glplanet.texture", XrmoptionNoArg, (caddr_t) "false" }, - {"-stars", ".glplanet.stars", XrmoptionNoArg, (caddr_t) "true" }, - {"+stars", ".glplanet.stars", XrmoptionNoArg, (caddr_t) "false" }, - {"-light", ".glplanet.light", XrmoptionNoArg, (caddr_t) "true" }, - {"+light", ".glplanet.light", XrmoptionNoArg, (caddr_t) "false" }, - {"-image", ".glplanet.image", XrmoptionSepArg, (caddr_t) 0 }, - {"-resolution", ".glplanet.resolution", XrmoptionSepArg, (caddr_t) 0 }, + {"-rotate", ".glplanet.rotate", XrmoptionNoArg, "true" }, + {"+rotate", ".glplanet.rotate", XrmoptionNoArg, "false" }, + {"-roll", ".glplanet.roll", XrmoptionNoArg, "true" }, + {"+roll", ".glplanet.roll", XrmoptionNoArg, "false" }, + {"-wander", ".glplanet.wander", XrmoptionNoArg, "true" }, + {"+wander", ".glplanet.wander", XrmoptionNoArg, "false" }, + {"-texture", ".glplanet.texture", XrmoptionNoArg, "true" }, + {"+texture", ".glplanet.texture", XrmoptionNoArg, "false" }, + {"-stars", ".glplanet.stars", XrmoptionNoArg, "true" }, + {"+stars", ".glplanet.stars", XrmoptionNoArg, "false" }, + {"-light", ".glplanet.light", XrmoptionNoArg, "true" }, + {"+light", ".glplanet.light", XrmoptionNoArg, "false" }, + {"-image", ".glplanet.image", XrmoptionSepArg, 0 }, + {"-resolution", ".glplanet.resolution", XrmoptionSepArg, 0 }, }; static argtype vars[] = { - {(caddr_t *) &do_rotate, "rotate", "Rotate", DEF_ROTATE, t_Bool}, - {(caddr_t *) &do_roll, "roll", "Roll", DEF_ROLL, t_Bool}, - {(caddr_t *) &do_wander, "wander", "Wander", DEF_WANDER, t_Bool}, - {(caddr_t *) &do_texture, "texture", "Texture", DEF_TEXTURE, t_Bool}, - {(caddr_t *) &do_stars, "stars", "Stars", DEF_STARS, t_Bool}, - {(caddr_t *) &do_light, "light", "Light", DEF_LIGHT, t_Bool}, - {(caddr_t *) &which_image, "image", "Image", DEF_IMAGE, t_String}, - {(caddr_t *) &resolution, "resolution","Resolution", DEF_RESOLUTION, t_Int}, + {&do_rotate, "rotate", "Rotate", DEF_ROTATE, t_Bool}, + {&do_roll, "roll", "Roll", DEF_ROLL, t_Bool}, + {&do_wander, "wander", "Wander", DEF_WANDER, t_Bool}, + {&do_texture, "texture", "Texture", DEF_TEXTURE, t_Bool}, + {&do_stars, "stars", "Stars", DEF_STARS, t_Bool}, + {&do_light, "light", "Light", DEF_LIGHT, t_Bool}, + {&which_image, "image", "Image", DEF_IMAGE, t_String}, + {&resolution, "resolution","Resolution", DEF_RESOLUTION, t_Int}, }; -ModeSpecOpt planet_opts = {countof(opts), opts, countof(vars), vars, NULL}; +ENTRYPOINT ModeSpecOpt planet_opts = {countof(opts), opts, countof(vars), vars, NULL}; #ifdef USE_MODULES ModStruct planet_description = @@ -142,7 +118,13 @@ ModStruct planet_description = "Animates texture mapped sphere (planet)", 0, NULL}; #endif +# ifdef __GNUC__ + __extension__ /* don't warn about "string length is greater than the length + ISO C89 compilers are required to support" when including + the following XPM file... */ +# endif #include "../images/earth.xpm" + #include "xpm-ximage.h" #include "rotator.h" #include "gltrackball.h" @@ -184,25 +166,6 @@ typedef struct { static planetstruct *planets = NULL; -static inline void -normalize(GLfloat v[3]) -{ - GLfloat d = (GLfloat) sqrt((double) (v[0] * v[0] + - v[1] * v[1] + - v[2] * v[2])); - if (d != 0) - { - v[0] /= d; - v[1] /= d; - v[2] /= d; - } - else - { - v[0] = v[1] = v[2] = 0; - } -} - - /* Set up and enable texturing on our object */ static void setup_xpm_texture (ModeInfo *mi, char **xpm_data) @@ -286,7 +249,7 @@ setup_texture(ModeInfo * mi) } -void +static void init_stars (ModeInfo *mi) { int i, j; @@ -327,7 +290,7 @@ init_stars (ModeInfo *mi) } -void +static void draw_stars (ModeInfo * mi) { int width = MI_WIDTH(mi); @@ -445,7 +408,7 @@ init_sun (ModeInfo * mi) #define RANDSIGN() ((random() & 1) ? 1 : -1) -void +ENTRYPOINT void reshape_planet (ModeInfo *mi, int width, int height) { GLfloat h = (GLfloat) height / (GLfloat) width; @@ -462,13 +425,13 @@ reshape_planet (ModeInfo *mi, int width, int height) } -Bool +ENTRYPOINT Bool planet_handle_event (ModeInfo *mi, XEvent *event) { planetstruct *gp = &planets[MI_SCREEN(mi)]; if (event->xany.type == ButtonPress && - event->xbutton.button & Button1) + event->xbutton.button == Button1) { gp->button_down_p = True; gltrackball_start (gp->trackball, @@ -477,11 +440,21 @@ planet_handle_event (ModeInfo *mi, XEvent *event) return True; } else if (event->xany.type == ButtonRelease && - event->xbutton.button & Button1) + event->xbutton.button == Button1) { gp->button_down_p = False; return True; } + else if (event->xany.type == ButtonPress && + (event->xbutton.button == Button4 || + event->xbutton.button == Button5 || + event->xbutton.button == Button6 || + event->xbutton.button == Button7)) + { + gltrackball_mousewheel (gp->trackball, event->xbutton.button, 10, + !!event->xbutton.state); + return True; + } else if (event->xany.type == MotionNotify && gp->button_down_p) { @@ -495,7 +468,7 @@ planet_handle_event (ModeInfo *mi, XEvent *event) } -void +ENTRYPOINT void init_planet (ModeInfo * mi) { planetstruct *gp; @@ -514,8 +487,8 @@ init_planet (ModeInfo * mi) } { - char *f = get_string_resource("imageForeground", "Foreground"); - char *b = get_string_resource("imageBackground", "Background"); + char *f = get_string_resource(mi->dpy, "imageForeground", "Foreground"); + char *b = get_string_resource(mi->dpy, "imageBackground", "Background"); char *s; if (!f) f = strdup("white"); if (!b) b = strdup("black"); @@ -543,8 +516,8 @@ init_planet (ModeInfo * mi) } { - double spin_speed = 1.0; - double wander_speed = 0.05; + double spin_speed = 0.5; + double wander_speed = 0.02; gp->rot = make_rotator (do_roll ? spin_speed : 0, do_roll ? spin_speed : 0, 0, 1, @@ -609,7 +582,7 @@ init_planet (ModeInfo * mi) glEndList(); } -void +ENTRYPOINT void draw_planet (ModeInfo * mi) { planetstruct *gp = &planets[MI_SCREEN(mi)]; @@ -651,7 +624,7 @@ draw_planet (ModeInfo * mi) glRotatef (gp->z * 360, 0.0, 0.0, 1.0); if (do_rotate && !gp->button_down_p) { - gp->z -= 0.01; /* the sun sets in the west */ + gp->z -= 0.005; /* the sun sets in the west */ if (gp->z < 0) gp->z += 1; } @@ -666,7 +639,7 @@ draw_planet (ModeInfo * mi) } -void +ENTRYPOINT void release_planet (ModeInfo * mi) { if (planets != NULL) { @@ -677,7 +650,8 @@ release_planet (ModeInfo * mi) if (gp->glx_context) { /* Display lists MUST be freed while their glXContext is current. */ - glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context)); + /* but this gets a BadMatch error. -jwz */ + /*glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context));*/ if (glIsList(gp->platelist)) glDeleteLists(gp->platelist, 1); @@ -692,5 +666,6 @@ release_planet (ModeInfo * mi) } -#endif +XSCREENSAVER_MODULE_2 ("GLPlanet", glplanet, planet) +#endif