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.38.tar.gz
[xscreensaver]
/
hacks
/
glx
/
morph3d.c
diff --git
a/hacks/glx/morph3d.c
b/hacks/glx/morph3d.c
index 4bea5766f90002f2545eb7a9dd62b7a5d1c87e07..078044496b5fa57d31990b708f740b7adc8a6cab 100644
(file)
--- a/
hacks/glx/morph3d.c
+++ b/
hacks/glx/morph3d.c
@@
-58,9
+58,9
@@
static const char sccsid[] = "@(#)morph3d.c 5.01 2001/03/01 xlockmore";
"*count: 0 \n" \
"*suppressRotationAnimation: True\n" \
"*count: 0 \n" \
"*suppressRotationAnimation: True\n" \
-# define
refresh
_morph3d 0
+# define
free
_morph3d 0
# define release_morph3d 0
# define release_morph3d 0
-# define morph3d_handle_event
0
+# define morph3d_handle_event
xlockmore_no_events
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
# include "xlock.h" /* from the xlockmore distribution */
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
# include "xlock.h" /* from the xlockmore distribution */
@@
-595,8
+595,14
@@
ENTRYPOINT void
reshape_morph3d(ModeInfo * mi, int width, int height)
{
morph3dstruct *mp = &morph3d[MI_SCREEN(mi)];
reshape_morph3d(ModeInfo * mi, int width, int height)
{
morph3dstruct *mp = &morph3d[MI_SCREEN(mi)];
+ int y = 0;
- glViewport(0, 0, mp->WindW = (GLint) width, mp->WindH = (GLint) height);
+ if (width > height * 5) { /* tiny window: show middle */
+ height = width;
+ y = -height/2;
+ }
+
+ glViewport(0, y, mp->WindW = (GLint) width, mp->WindH = (GLint) height);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glFrustum(-1.0, 1.0, -1.0, 1.0, 5.0, 15.0);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glFrustum(-1.0, 1.0, -1.0, 1.0, 5.0, 15.0);
@@
-719,7
+725,7
@@
init_morph3d(ModeInfo * mi)
{
morph3dstruct *mp;
{
morph3dstruct *mp;
- MI_INIT (mi, morph3d
, NULL
);
+ MI_INIT (mi, morph3d);
mp = &morph3d[MI_SCREEN(mi)];
mp->step = NRAND(90);
mp->VisibleSpikes = 1;
mp = &morph3d[MI_SCREEN(mi)];
mp->step = NRAND(90);
mp->VisibleSpikes = 1;