projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.37.tar.gz
[xscreensaver]
/
hacks
/
glx
/
b_lockglue.c
diff --git
a/hacks/glx/b_lockglue.c
b/hacks/glx/b_lockglue.c
index 4f24c53f117c32e3913ef373b6646b45ea333386..a6236c64a9320cf4ec4a664323b8bf1984d8e22d 100644
(file)
--- a/
hacks/glx/b_lockglue.c
+++ b/
hacks/glx/b_lockglue.c
@@
-34,31
+34,16
@@
struct glb_config glb_config =
1.5, /* scale_factor */
-4, /* screen_bottom */
4, /* screen_top */
1.5, /* scale_factor */
-4, /* screen_bottom */
4, /* screen_top */
-#if 0
- {0.1, 0.0, 0.4, 0.0}, /* bg_colour */
-#else
- {0.0, 0.0, 0.0, 0.0}, /* bg_colour */
-#endif
-#if 0
- {0.7, 0.7, 0.0, 0.3} /* bubble_colour */
-#else
{0.0, 0.0, 0.7, 0.3} /* bubble_colour */
{0.0, 0.0, 0.7, 0.3} /* bubble_colour */
-#endif
};
#ifdef STANDALONE
};
#ifdef STANDALONE
-#define PROGCLASS "Bubble3D"
-#define HACK_INIT init_bubble3d
-#define HACK_RESHAPE reshape_bubble3d
-#define HACK_DRAW draw_bubble3d
-#define bubble3d_opts xlockmore_opts
-
# define DEFAULTS "*delay: 10000 \n" \
"*showFPS: False \n"
# define DEFAULTS "*delay: 10000 \n" \
"*showFPS: False \n"
-#
define DEF_TRANSPARENT "False"
-#
define DEF_COLOR "random"
-
+#
define refresh_bubble3d 0
+#
define release_bubble3d 0
+# define bubble3d_handle_event 0
#include "xlockmore.h"
#else
#include "xlock.h"
#include "xlockmore.h"
#else
#include "xlock.h"
@@
-67,6
+52,10
@@
struct glb_config glb_config =
#ifdef USE_GL
#ifdef USE_GL
+
+#define DEF_TRANSPARENT "True"
+#define DEF_BUBBLECOLOR "random"
+
static Bool transparent_p;
static char *bubble_color_str;
static Bool transparent_p;
static char *bubble_color_str;
@@
-76,22
+65,22
@@
static char *bubble_color_str;
static XrmOptionDescRec opts[] = {
{ "-transparent", ".transparent", XrmoptionNoArg, "True" },
{ "+transparent", ".transparent", XrmoptionNoArg, "False" },
static XrmOptionDescRec opts[] = {
{ "-transparent", ".transparent", XrmoptionNoArg, "True" },
{ "+transparent", ".transparent", XrmoptionNoArg, "False" },
- { "-color",
".bubble3d.bubblecolor",
XrmoptionSepArg, 0 },
+ { "-color",
".bubblecolor",
XrmoptionSepArg, 0 },
};
static argtype vars[] = {
{&transparent_p, "transparent", "Transparent", DEF_TRANSPARENT, t_Bool},
};
static argtype vars[] = {
{&transparent_p, "transparent", "Transparent", DEF_TRANSPARENT, t_Bool},
- {&bubble_color_str, "bubblecolor", "BubbleColor", DEF_COLOR, t_String},
+ {&bubble_color_str, "bubblecolor", "BubbleColor", DEF_
BUBBLE
COLOR, t_String},
};
};
-ModeSpecOpt bubble3d_opts = {countof(opts), opts, countof(vars), vars, NULL};
+
ENTRYPOINT
ModeSpecOpt bubble3d_opts = {countof(opts), opts, countof(vars), vars, NULL};
#ifdef USE_MODULES
ModStruct bubbles3d_description =
{"bubbles3d",
"init_bubble3d",
"draw_bubble3d",
#ifdef USE_MODULES
ModStruct bubbles3d_description =
{"bubbles3d",
"init_bubble3d",
"draw_bubble3d",
-
"release_bubble3d"
,
+
NULL
,
"change_bubble3d",
"init_bubble3d",
NULL,
"change_bubble3d",
"init_bubble3d",
NULL,
@@
-149,7
+138,7
@@
init(struct context *c)
c->draw_context = glb_draw_init();
}
c->draw_context = glb_draw_init();
}
-void
+
ENTRYPOINT
void
reshape_bubble3d(ModeInfo *mi, int w, int h)
{
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
reshape_bubble3d(ModeInfo *mi, int w, int h)
{
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
@@
-167,7
+156,9
@@
do_display(struct context *c)
glb_draw_step(c->draw_context);
}
glb_draw_step(c->draw_context);
}
-void
+static void free_bubble3d(ModeInfo * mi);
+
+ENTRYPOINT void
init_bubble3d(ModeInfo * mi)
{
Display *display = MI_DISPLAY(mi);
init_bubble3d(ModeInfo * mi)
{
Display *display = MI_DISPLAY(mi);
@@
-175,12
+166,7
@@
init_bubble3d(ModeInfo * mi)
int screen = MI_SCREEN(mi);
struct context *c;
int screen = MI_SCREEN(mi);
struct context *c;
- if (contexts == 0) {
- contexts = (struct context *) malloc(sizeof (struct context) * MI_NUM_SCREENS(mi));
-
- if (contexts == 0)
- return;
- }
+ MI_INIT (mi, contexts, free_bubble3d);
c = &contexts[screen];
c->glx_context = init_GL(mi);
init_colors(mi);
c = &contexts[screen];
c->glx_context = init_GL(mi);
init_colors(mi);
@@
-194,7
+180,7
@@
init_bubble3d(ModeInfo * mi)
MI_CLEARWINDOW(mi);
}
MI_CLEARWINDOW(mi);
}
-void
+
ENTRYPOINT
void
draw_bubble3d(ModeInfo * mi)
{
struct context *c = &contexts[MI_SCREEN(mi)];
draw_bubble3d(ModeInfo * mi)
{
struct context *c = &contexts[MI_SCREEN(mi)];
@@
-209,7
+195,20
@@
draw_bubble3d(ModeInfo * mi)
glXMakeCurrent(display, window, *(c->glx_context));
glb_config.polygon_count = 0;
glXMakeCurrent(display, window, *(c->glx_context));
glb_config.polygon_count = 0;
+ glPushMatrix();
+
+# ifdef HAVE_MOBILE /* Keep it the same relative size when rotated. */
+ {
+ GLfloat h = MI_HEIGHT(mi) / (GLfloat) MI_WIDTH(mi);
+ int o = (int) current_device_rotation();
+ if (o != 0 && o != 180 && o != -180)
+ glScalef (1/h, 1/h, 1/h);
+ glRotatef(o, 0, 0, 1);
+ }
+# endif
+
do_display(c);
do_display(c);
+ glPopMatrix();
mi->polygon_count = glb_config.polygon_count;
if (mi->fps_p) do_fps (mi);
mi->polygon_count = glb_config.polygon_count;
if (mi->fps_p) do_fps (mi);
@@
-217,23
+216,22
@@
draw_bubble3d(ModeInfo * mi)
glXSwapBuffers(display, window);
}
glXSwapBuffers(display, window);
}
-void
+#ifndef STANDALONE
+ENTRYPOINT void
change_bubble3d(ModeInfo * mi)
{
/* nothing */
}
change_bubble3d(ModeInfo * mi)
{
/* nothing */
}
+#endif /* !STANDALONE */
-void
-
releas
e_bubble3d(ModeInfo * mi)
+
static
void
+
fre
e_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);
+ struct context *c = &contexts[MI_SCREEN(mi)];
+ if (c->draw_context)
+ glb_draw_end(c->draw_context);
}
}
+XSCREENSAVER_MODULE ("Bubble3D", bubble3d)
+
#endif /* USE_GL */
#endif /* USE_GL */