X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fcubestorm.c;h=b5bba46ed6d1f97ccb7d6b02735bd09445b6b2a0;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=cfc53c0e8158c802aa0f6ced126185c9e45007e2;hpb=96bdd7cf6ea60c418a76921acaf0e34d6f5be930;p=xscreensaver diff --git a/hacks/glx/cubestorm.c b/hacks/glx/cubestorm.c index cfc53c0e..b5bba46e 100644 --- a/hacks/glx/cubestorm.c +++ b/hacks/glx/cubestorm.c @@ -1,4 +1,4 @@ -/* cubestorm, Copyright (c) 2003 Jamie Zawinski +/* cubestorm, Copyright (c) 2003-2014 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 @@ -9,36 +9,15 @@ * implied warranty. */ -#include - -extern XtAppContext app; - -#define PROGCLASS "CubeStorm" -#define HACK_INIT init_cube -#define HACK_DRAW draw_cube -#define HACK_RESHAPE reshape_cube -#define HACK_HANDLE_EVENT cube_handle_event -#define EVENT_MASK PointerMotionMask -#define sws_opts xlockmore_opts - -#define DEF_SPIN "True" -#define DEF_WANDER "True" -#define DEF_SPEED "1.0" -#define DEF_THICKNESS "0.06" -#define DEF_COUNT "4" - #define DEFAULTS "*delay: 30000 \n" \ - "*count: 30 \n" \ + "*count: " DEF_COUNT "\n" \ "*showFPS: False \n" \ "*fpsSolid: True \n" \ "*wireframe: False \n" \ - "*speed: " DEF_SPEED " \n" \ - "*spin: " DEF_SPIN "\n" \ - "*wander: " DEF_WANDER "\n" \ - "*thickness: " DEF_THICKNESS "\n" \ - "*count: " DEF_COUNT "\n" \ +# define refresh_cube 0 +# define release_cube 0 #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) @@ -50,7 +29,12 @@ extern XtAppContext app; #ifdef USE_GL /* whole file */ -#include +#define DEF_SPIN "True" +#define DEF_WANDER "True" +#define DEF_SPEED "1.0" +#define DEF_THICKNESS "0.06" +#define DEF_COUNT "4" +#define DEF_DBUF "False" typedef struct { rotator *rot; @@ -78,6 +62,7 @@ static Bool do_spin; static Bool do_wander; static GLfloat speed; static GLfloat thickness; +static Bool dbuf_p; static XrmOptionDescRec opts[] = { { "-spin", ".spin", XrmoptionNoArg, "True" }, @@ -85,17 +70,20 @@ static XrmOptionDescRec opts[] = { { "-wander", ".wander", XrmoptionNoArg, "True" }, { "+wander", ".wander", XrmoptionNoArg, "False" }, { "-speed", ".speed", XrmoptionSepArg, 0 }, - { "-thickness", ".thickness", XrmoptionSepArg, 0 }, + { "-db", ".doubleBuffer", XrmoptionNoArg, "True"}, + { "+db", ".doubleBuffer", XrmoptionNoArg, "False"}, + { "-thickness", ".thickness", XrmoptionSepArg, 0 }, }; static argtype vars[] = { - {(caddr_t *) &do_spin, "spin", "Spin", DEF_SPIN, t_Bool}, - {(caddr_t *) &do_wander, "wander", "Wander", DEF_WANDER, t_Bool}, - {(caddr_t *) &speed, "speed", "Speed", DEF_SPEED, t_Float}, - {(caddr_t *) &thickness, "thickness", "Thickness", DEF_THICKNESS, t_Float}, + {&do_spin, "spin", "Spin", DEF_SPIN, t_Bool}, + {&do_wander, "wander", "Wander", DEF_WANDER, t_Bool}, + {&speed, "speed", "Speed", DEF_SPEED, t_Float}, + {&thickness, "thickness", "Thickness", DEF_THICKNESS, t_Float}, + {&dbuf_p, "doubleBuffer", "DoubleBuffer", DEF_DBUF, t_Bool}, }; -ModeSpecOpt sws_opts = {countof(opts), opts, countof(vars), vars, NULL}; +ENTRYPOINT ModeSpecOpt cube_opts = {countof(opts), opts, countof(vars), vars, NULL}; static void @@ -169,7 +157,7 @@ new_cube_colors (ModeInfo *mi) /* Window management, etc */ -void +ENTRYPOINT void reshape_cube (ModeInfo *mi, int width, int height) { GLfloat h = (GLfloat) height / (GLfloat) width; @@ -190,34 +178,15 @@ reshape_cube (ModeInfo *mi, int width, int height) } -Bool +ENTRYPOINT Bool cube_handle_event (ModeInfo *mi, XEvent *event) { cube_configuration *bp = &bps[MI_SCREEN(mi)]; - if (event->xany.type == ButtonPress && - event->xbutton.button & Button1) - { - bp->button_down_p = True; - gltrackball_start (bp->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) - { - bp->button_down_p = False; - return True; - } - else if (event->xany.type == MotionNotify && - bp->button_down_p) - { - gltrackball_track (bp->trackball, - event->xmotion.x, event->xmotion.y, - MI_WIDTH (mi), MI_HEIGHT (mi)); - return True; - } + if (gltrackball_event_handler (event, bp->trackball, + MI_WIDTH (mi), MI_HEIGHT (mi), + &bp->button_down_p)) + return True; else if (event->xany.type == KeyPress) { KeySym keysym; @@ -228,17 +197,20 @@ cube_handle_event (ModeInfo *mi, XEvent *event) glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); return True; } - else if (c == '\r' || c == '\n') - { - new_cube_colors (mi); - return True; - } + else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event)) + goto DEF; + } + else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event)) + { + DEF: + new_cube_colors (mi); + return True; } return False; } -void +ENTRYPOINT void init_cube (ModeInfo *mi) { cube_configuration *bp; @@ -252,17 +224,19 @@ init_cube (ModeInfo *mi) fprintf(stderr, "%s: out of memory\n", progname); exit(1); } - - bp = &bps[MI_SCREEN(mi)]; } +# ifdef HAVE_JWZGLES + dbuf_p = True; +# endif + bp = &bps[MI_SCREEN(mi)]; bp->glx_context = init_GL(mi); if (MI_COUNT(mi) <= 0) MI_COUNT(mi) = 1; - bp->trackball = gltrackball_init (); + bp->trackball = gltrackball_init (True); bp->subcubes = (subcube *) calloc (MI_COUNT(mi), sizeof(subcube)); for (i = 0; i < MI_COUNT(mi); i++) { @@ -317,11 +291,12 @@ init_cube (ModeInfo *mi) draw_faces (mi); glEndList (); + glDrawBuffer(dbuf_p ? GL_BACK : GL_FRONT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); } -void +ENTRYPOINT void draw_cube (ModeInfo *mi) { cube_configuration *bp = &bps[MI_SCREEN(mi)]; @@ -334,6 +309,8 @@ draw_cube (ModeInfo *mi) if (!bp->glx_context) return; + glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context)); + glShadeModel(GL_SMOOTH); glEnable(GL_DEPTH_TEST); @@ -371,9 +348,9 @@ draw_cube (ModeInfo *mi) for (i = 0; i < MI_COUNT(mi); i++) { - static GLfloat bcolor[4] = {0.0, 0.0, 0.0, 1.0}; - static GLfloat bspec[4] = {1.0, 1.0, 1.0, 1.0}; - static GLfloat bshiny = 128.0; + GLfloat bcolor[4] = {0.0, 0.0, 0.0, 1.0}; + GLfloat bspec[4] = {1.0, 1.0, 1.0, 1.0}; + GLfloat bshiny = 128.0; glPushMatrix(); @@ -417,7 +394,10 @@ draw_cube (ModeInfo *mi) if (mi->fps_p) do_fps (mi); glFinish(); - glXSwapBuffers(dpy, window); + if (dbuf_p) + glXSwapBuffers(dpy, window); } +XSCREENSAVER_MODULE_2 ("CubeStorm", cubestorm, cube) + #endif /* USE_GL */