-#if !defined( lint ) && !defined( SABER )
+#if 0
static const char sccsid[] = "@(#)b_lockglue.c 4.11 98/06/16 xlockmore";
-
#endif
/*-
*/
struct glb_config glb_config =
{
+ 0, /* transparent_p */
#if GLB_SLOW_GL
2, /* subdivision_depth */
#else
3, /* subdivision_depth */
#endif
5, /* nr_nudge_axes */
- 0.3, /* nudge_angle_factor */
- 0.15, /* nudge_factor */
+ 0.01, /* nudge_angle_factor */
+ 0.20, /* nudge_factor */
0.1, /* rotation_factor */
8, /* create_bubbles_every */
8, /* max_bubbles */
{0.7, 0.8, 0.9, 1.0}, /* p_bubble_group */
0.5, /* max_size */
0.1, /* min_size */
- 0.1, /* max_speed */
- 0.03, /* min_speed */
+ 0.03, /* max_speed */
+ 0.005, /* min_speed */
1.5, /* scale_factor */
-4, /* screen_bottom */
4, /* screen_top */
};
#ifdef STANDALONE
-#define PROGCLASS "Bubble3D"
-#define HACK_INIT init_bubble3d
-#define HACK_DRAW draw_bubble3d
-#define bubble3d_opts xlockmore_opts
-# define DEFAULTS ""
+# define DEFAULTS "*delay: 10000 \n" \
+ "*showFPS: False \n"
+
+# define refresh_bubble3d 0
+# define bubble3d_handle_event 0
#include "xlockmore.h"
#else
#include "xlock.h"
#ifdef USE_GL
-ModeSpecOpt bubble3d_opts =
-{0, NULL, 0, NULL, NULL};
+
+#define DEF_TRANSPARENT "True"
+#define DEF_COLOR "random"
+
+static Bool transparent_p;
+static char *bubble_color_str;
+
+#undef countof
+#define countof(x) (sizeof((x))/sizeof((*x)))
+
+static XrmOptionDescRec opts[] = {
+ { "-transparent", ".transparent", XrmoptionNoArg, "True" },
+ { "+transparent", ".transparent", XrmoptionNoArg, "False" },
+ { "-color", ".bubble3d.bubblecolor", XrmoptionSepArg, 0 },
+};
+
+static argtype vars[] = {
+ {&transparent_p, "transparent", "Transparent", DEF_TRANSPARENT, t_Bool},
+ {&bubble_color_str, "bubblecolor", "BubbleColor", DEF_COLOR, t_String},
+};
+
+ENTRYPOINT ModeSpecOpt bubble3d_opts = {countof(opts), opts, countof(vars), vars, NULL};
#ifdef USE_MODULES
ModStruct bubbles3d_description =
static struct context *contexts = 0;
+static void
+parse_color (ModeInfo *mi, const char *name, const char *s, GLfloat *a)
+{
+ XColor c;
+
+ if (! XParseColor (MI_DISPLAY(mi), MI_COLORMAP(mi), s, &c))
+ {
+ fprintf (stderr, "%s: can't parse %s color %s", progname, name, s);
+ exit (1);
+ }
+ a[0] = c.red / 65536.0;
+ a[1] = c.green / 65536.0;
+ a[2] = c.blue / 65536.0;
+}
+
+static void
+init_colors(ModeInfo *mi)
+{
+ if (strncasecmp(bubble_color_str, "auto", strlen("auto")) == 0) {
+ glb_config.bubble_colour[0] = ((float) (NRAND(100)) / 100.0);
+ glb_config.bubble_colour[1] = ((float) (NRAND(100)) / 100.0);
+ /* I keep more blue */
+ glb_config.bubble_colour[2] = ((float) (NRAND(50)) / 100.0) + 0.50;
+ } else if (strncasecmp(bubble_color_str, "random", strlen("random")) == 0) {
+ glb_config.bubble_colour[0] = -1.0;
+ } else {
+ parse_color(mi, "bubble", bubble_color_str, glb_config.bubble_colour);
+ }
+}
+
static void
init(struct context *c)
{
+ glb_config.transparent_p = transparent_p;
glb_sphere_init();
c->draw_context = glb_draw_init();
}
-static void
-reshape(int w, int h)
+ENTRYPOINT void
+reshape_bubble3d(ModeInfo *mi, int w, int h)
{
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
glMatrixMode(GL_PROJECTION);
glb_draw_step(c->draw_context);
}
-void
+ENTRYPOINT void
init_bubble3d(ModeInfo * mi)
{
Display *display = MI_DISPLAY(mi);
struct context *c;
if (contexts == 0) {
- contexts = (struct context *) malloc(sizeof (struct context) * MI_NUM_SCREENS(mi));
+ contexts = (struct context *) calloc(sizeof (struct context), MI_NUM_SCREENS(mi));
if (contexts == 0)
return;
}
c = &contexts[screen];
c->glx_context = init_GL(mi);
+ init_colors(mi);
if (c->glx_context != 0) {
init(c);
- reshape(MI_WIDTH(mi), MI_HEIGHT(mi));
+ reshape_bubble3d(mi, MI_WIDTH(mi), MI_HEIGHT(mi));
do_display(c);
glFinish();
glXSwapBuffers(display, window);
MI_CLEARWINDOW(mi);
}
-void
+ENTRYPOINT void
draw_bubble3d(ModeInfo * mi)
{
struct context *c = &contexts[MI_SCREEN(mi)];
glXMakeCurrent(display, window, *(c->glx_context));
+ glb_config.polygon_count = 0;
do_display(c);
+ mi->polygon_count = glb_config.polygon_count;
+ if (mi->fps_p) do_fps (mi);
glFinish();
glXSwapBuffers(display, window);
}
-void
+#ifndef STANDALONE
+ENTRYPOINT void
change_bubble3d(ModeInfo * mi)
{
/* nothing */
}
+#endif /* !STANDALONE */
-void
+ENTRYPOINT void
release_bubble3d(ModeInfo * mi)
{
- struct context *c = &contexts[MI_SCREEN(mi)];
-
- if (contexts != 0) {
- glb_draw_end(c->draw_context);
- (void) free((void *) contexts);
- contexts = 0;
- }
- FreeAllGL(mi);
+ if (contexts) {
+ int screen;
+ for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
+ struct context *c = &contexts[screen];
+ if (c->draw_context)
+ glb_draw_end(c->draw_context);
+ }
+ free (contexts);
+ contexts = 0;
+ }
+ FreeAllGL(mi);
}
+XSCREENSAVER_MODULE ("Bubble3D", bubble3d)
+
#endif /* USE_GL */