-/* xscreensaver, Copyright (c) 2002, 2004 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2002-2008 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* surfaces would be too hard.
*/
-#include <X11/Intrinsic.h>
-
-extern XtAppContext app;
-
-#define PROGCLASS "Spheremonics"
-#define HACK_INIT init_spheremonics
-#define HACK_DRAW draw_spheremonics
-#define HACK_RESHAPE reshape_spheremonics
-#define HACK_HANDLE_EVENT spheremonics_handle_event
-#define EVENT_MASK PointerMotionMask
-#define ccs_opts xlockmore_opts
-
-#define DEF_DURATION "100"
-#define DEF_SPIN "XYZ"
-#define DEF_WANDER "False"
-#define DEF_RESOLUTION "64"
-#define DEF_BBOX "False"
-#define DEF_GRID "True"
-#define DEF_SMOOTH "True"
-#define DEF_PARMS "(default)"
-
-#define DEFAULTS "*delay: 30000 \n" \
- "*resolution: " DEF_RESOLUTION "\n" \
- "*showFPS: False \n" \
- "*wireframe: False \n" \
- "*duration: " DEF_DURATION "\n" \
- "*spin: " DEF_SPIN "\n" \
- "*wander: " DEF_WANDER "\n" \
- "*bbox: " DEF_BBOX "\n" \
- "*grid: " DEF_GRID "\n" \
- "*smooth: " DEF_SMOOTH "\n" \
- "*parameters: " DEF_PARMS "\n" \
+#define DEFAULTS "*delay: 30000 \n" \
+ "*showFPS: False \n" \
+ "*wireframe: False \n" \
+ "*labelfont: -*-helvetica-medium-r-normal-*-180-*\n"
+# define refresh_spheremonics 0
+# define release_spheremonics 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
#ifdef USE_GL /* whole file */
-#include <GL/glu.h>
+#define DEF_DURATION "100"
+#define DEF_SPIN "XYZ"
+#define DEF_WANDER "False"
+#define DEF_RESOLUTION "64"
+#define DEF_BBOX "False"
+#define DEF_GRID "True"
+#define DEF_SMOOTH "True"
+#define DEF_PARMS "(default)"
typedef struct {
GLXContext *glx_context;
XFontStruct *font;
GLuint font_list;
int change_tick;
+ int done_once;
} spheremonics_configuration;
{&static_parms, "parameters", "Parameters", DEF_PARMS, t_String},
};
-ModeSpecOpt ccs_opts = {countof(opts), opts, countof(vars), vars, NULL};
+ENTRYPOINT ModeSpecOpt spheremonics_opts = {countof(opts), opts, countof(vars), vars, NULL};
/* Window management, etc
*/
-void
+ENTRYPOINT void
reshape_spheremonics (ModeInfo *mi, int width, int height)
{
GLfloat h = (GLfloat) height / (GLfloat) width;
/* spheremonics_configuration *cc = &ccs[MI_SCREEN(mi)]; */
int wire = MI_IS_WIREFRAME(mi);
- static GLfloat pos[4] = {5.0, 5.0, 10.0, 1.0};
+ static const GLfloat pos[4] = {5.0, 5.0, 10.0, 1.0};
glEnable(GL_NORMALIZE);
lighting effect.
*/
glDisable(GL_CULL_FACE);
- glLightModeli (GL_LIGHT_MODEL_TWO_SIDE, TRUE);
+ glLightModeli (GL_LIGHT_MODEL_TWO_SIDE, True);
}
}
static void
draw_bounding_box (ModeInfo *mi)
{
- spheremonics_configuration *cc = &ccs[MI_SCREEN(mi)];
+ /* spheremonics_configuration *cc = &ccs[MI_SCREEN(mi)]; */
- static GLfloat c1[4] = { 0.2, 0.2, 0.6, 1.0 };
- static GLfloat c2[4] = { 1.0, 0.0, 0.0, 1.0 };
+ static const GLfloat c1[4] = { 0.2, 0.2, 0.6, 1.0 };
+ static const GLfloat c2[4] = { 1.0, 0.0, 0.0, 1.0 };
int wire = MI_IS_WIREFRAME(mi);
- GLfloat x1 = cc->bbox[0].x;
- GLfloat y1 = cc->bbox[0].y;
- GLfloat z1 = cc->bbox[0].z;
- GLfloat x2 = cc->bbox[1].x;
- GLfloat y2 = cc->bbox[1].y;
- GLfloat z2 = cc->bbox[1].z;
+ GLfloat x1,y1,z1,x2,y2,z2;
-#if 1
+# if 0
+ x1 = cc->bbox[0].x;
+ y1 = cc->bbox[0].y;
+ z1 = cc->bbox[0].z;
+ x2 = cc->bbox[1].x;
+ y2 = cc->bbox[1].y;
+ z2 = cc->bbox[1].z;
+# else
x1 = y1 = z1 = -0.5;
x2 = y2 = z2 = 0.5;
-#endif
+# endif
if (do_bbox && !wire)
{
glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE, c1);
glFrontFace(GL_CCW);
+ glEnable(GL_CULL_FACE);
glBegin(wire ? GL_LINE_LOOP : GL_QUADS);
glNormal3f(0, 1, 0);
glVertex3f(x2, y1, z1); glVertex3f(x2, y1, z2);
glVertex3f(x2, y2, z2); glVertex3f(x2, y2, z1);
glEnd();
+ glDisable(GL_CULL_FACE);
}
glPushAttrib (GL_LIGHTING);
if (s > 0.001)
{
- static GLfloat c[4] = { 0.6, 0.5, 1.0, 1.0 };
+ static const GLfloat c[4] = { 0.6, 0.5, 1.0, 1.0 };
glPushAttrib (GL_LIGHTING);
glDisable (GL_LIGHTING);
tweak_parameters (mi);
- {
- static Bool done = False;
- if (!done || (0 == (random() % 20)))
- {
- init_colors (mi);
- done = True;
- }
- }
+ if (!cc->done_once || (0 == (random() % 20)))
+ {
+ init_colors (mi);
+ cc->done_once = True;
+ }
{
glNewList(cc->dlist, GL_COMPILE);
\f
-void
+ENTRYPOINT void
init_spheremonics (ModeInfo *mi)
{
spheremonics_configuration *cc;
fprintf(stderr, "%s: out of memory\n", progname);
exit(1);
}
-
- cc = &ccs[MI_SCREEN(mi)];
}
cc = &ccs[MI_SCREEN(mi)];
if (*s == 'x' || *s == 'X') spinx = True;
else if (*s == 'y' || *s == 'Y') spiny = True;
else if (*s == 'z' || *s == 'Z') spinz = True;
+ else if (*s == '0') ;
else
{
fprintf (stderr,
}
-Bool
+ENTRYPOINT Bool
spheremonics_handle_event (ModeInfo *mi, XEvent *event)
{
spheremonics_configuration *cc = &ccs[MI_SCREEN(mi)];
}
else if (event->xany.type == ButtonPress &&
(event->xbutton.button == Button4 ||
- event->xbutton.button == Button5))
+ event->xbutton.button == Button5 ||
+ event->xbutton.button == Button6 ||
+ event->xbutton.button == Button7))
{
gltrackball_mousewheel (cc->trackball, event->xbutton.button, 10,
!!event->xbutton.state);
}
-void
+ENTRYPOINT void
draw_spheremonics (ModeInfo *mi)
{
spheremonics_configuration *cc = &ccs[MI_SCREEN(mi)];
if (!cc->glx_context)
return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(cc->glx_context));
+
glShadeModel(GL_SMOOTH);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
print_gl_string (mi->dpy, cc->font, cc->font_list,
mi->xgwa.width, mi->xgwa.height,
10, mi->xgwa.height - 10,
- buf);
+ buf, False);
}
if (!static_parms)
glXSwapBuffers(dpy, window);
}
+XSCREENSAVER_MODULE ("Spheremonics", spheremonics)
+
#endif /* USE_GL */
projects / xscreensaver / blobdiff