-/* polyhedra, Copyright (c) 2004 Jamie Zawinski <jwz@jwz.org>
+/* polyhedra, Copyright (c) 2004-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
* is in "polyhedra.c".
*/
-#include <X11/Intrinsic.h>
-
-extern XtAppContext app;
-
-#define PROGCLASS "Polyhedra"
-#define HACK_INIT init_polyhedra
-#define HACK_DRAW draw_polyhedra
-#define HACK_RESHAPE reshape_polyhedra
-#define HACK_HANDLE_EVENT polyhedra_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_TITLES "True"
-#define DEF_DURATION "12"
-#define DEF_WHICH "-1"
-
#define DEFAULTS "*delay: 30000 \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
"*titleFont3: -*-times-bold-r-normal-*-80-*\n" \
+# define refresh_polyhedra 0
+# define release_polyhedra 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
#include "xlockmore.h"
-#include <GL/glu.h>
+
+
+#define DEF_SPIN "True"
+#define DEF_WANDER "True"
+#define DEF_SPEED "1.0"
+#define DEF_TITLES "True"
+#define DEF_DURATION "12"
+#define DEF_WHICH "random"
#include "glxfonts.h"
#include "normals.h"
#include "colors.h"
#include "rotator.h"
#include "gltrackball.h"
-#include <ctype.h>
#ifdef USE_GL /* whole file */
-#include <GL/glu.h>
-
typedef struct {
GLXContext *glx_context;
rotator *rot;
XFontStruct *xfont1, *xfont2, *xfont3;
GLuint font1_dlist, font2_dlist, font3_dlist;
+ time_t last_change_time;
+ int change_tick;
+
} polyhedra_configuration;
static polyhedra_configuration *bps = NULL;
{&do_which_str,"which", "Which", DEF_WHICH, t_String},
};
-ModeSpecOpt sws_opts = {countof(opts), opts, countof(vars), vars, NULL};
+ENTRYPOINT ModeSpecOpt polyhedra_opts = {countof(opts), opts, countof(vars), vars, NULL};
\f
kludge_normal (int n, const int *indices, const point *points)
{
XYZ normal = { 0, 0, 0 };
- XYZ p;
+ XYZ p = { 0, 0, 0 };
int i;
for (i = 0; i < n; ++i) {
*/
static void new_label (ModeInfo *mi);
-void
+ENTRYPOINT void
reshape_polyhedra (ModeInfo *mi, int width, int height)
{
GLfloat h = (GLfloat) height / (GLfloat) width;
}
-Bool
+ENTRYPOINT Bool
polyhedra_handle_event (ModeInfo *mi, XEvent *event)
{
polyhedra_configuration *bp = &bps[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 (bp->trackball, event->xbutton.button, 10,
!!event->xbutton.state);
polyhedra_configuration *bp = &bps[MI_SCREEN(mi)];
polyhedron *p;
int wire = MI_IS_WIREFRAME(mi);
- static GLfloat bcolor[4] = {0.0, 0.0, 0.0, 1.0};
int i;
/* Use the GLU polygon tesselator so that nonconvex faces are displayed
new_label (mi);
+ if (wire)
+ glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+
glNewList (bp->object_list, GL_COMPILE);
for (i = 0; i < p->nfaces; i++)
{
glColor3f (0, 1, 0);
else
{
+ GLfloat bcolor[4];
bcolor[0] = bp->colors[f->color].red / 65536.0;
bcolor[1] = bp->colors[f->color].green / 65536.0;
bcolor[2] = bp->colors[f->color].blue / 65536.0;
+ bcolor[2] = 1.0;
glMaterialfv (GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, bcolor);
}
}
-void
+ENTRYPOINT void
init_polyhedra (ModeInfo *mi)
{
polyhedra_configuration *bp;
int x;
char c;
do_which = -1;
- if (1 == sscanf (do_which_str, " %d %c", &x, &c))
+ if (!strcasecmp (do_which_str, "random"))
+ ;
+ else if (1 == sscanf (do_which_str, " %d %c", &x, &c))
do_which = x;
else if (*do_which_str)
{
}
-void
+ENTRYPOINT void
draw_polyhedra (ModeInfo *mi)
{
polyhedra_configuration *bp = &bps[MI_SCREEN(mi)];
Display *dpy = MI_DISPLAY(mi);
Window window = MI_WINDOW(mi);
- static time_t last_time = 0;
-
- static GLfloat bspec[4] = {1.0, 1.0, 1.0, 1.0};
- static GLfloat bshiny = 128.0;
+ static const GLfloat bspec[4] = {1.0, 1.0, 1.0, 1.0};
+ GLfloat bshiny = 128.0;
if (!bp->glx_context)
return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+
if (bp->mode == 0 && do_which >= 0 && bp->change_to < 0)
;
else if (bp->mode == 0)
{
- static int tick = 0;
-
if (bp->change_to >= 0)
- tick = 999, last_time = 1;
- if (tick++ > 10)
+ bp->change_tick = 999, bp->last_change_time = 1;
+ if (bp->change_tick++ > 10)
{
time_t now = time((time_t *) 0);
- if (last_time == 0) last_time = now;
- tick = 0;
- if (!bp->button_down_p && now - last_time >= duration)
+ if (bp->last_change_time == 0) bp->last_change_time = now;
+ bp->change_tick = 0;
+ if (!bp->button_down_p && now - bp->last_change_time >= duration)
{
bp->mode = 1; /* go out */
bp->mode_tick = 20 * speed;
- last_time = now;
+ bp->last_change_time = now;
}
}
}
glXSwapBuffers(dpy, window);
}
+XSCREENSAVER_MODULE ("Polyhedra", polyhedra)
+
#endif /* USE_GL */