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
/
spheremonics.c
diff --git
a/hacks/glx/spheremonics.c
b/hacks/glx/spheremonics.c
index 658b6e456022f12b38d8c6c3eefc6f0ff05b9537..9cefbf3dbb322b196c9cb8d446b1ff85edf38877 100644
(file)
--- a/
hacks/glx/spheremonics.c
+++ b/
hacks/glx/spheremonics.c
@@
-66,7
+66,7
@@
"*suppressRotationAnimation: True\n" \
"*labelfont: -*-helvetica-medium-r-normal-*-*-180-*-*-*-*-*-*\n"
"*suppressRotationAnimation: True\n" \
"*labelfont: -*-helvetica-medium-r-normal-*-*-180-*-*-*-*-*-*\n"
-# define
refresh
_spheremonics 0
+# define
free
_spheremonics 0
# define release_spheremonics 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
# define release_spheremonics 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@
-166,8
+166,15
@@
ENTRYPOINT void
reshape_spheremonics (ModeInfo *mi, int width, int height)
{
GLfloat h = (GLfloat) height / (GLfloat) width;
reshape_spheremonics (ModeInfo *mi, int width, int height)
{
GLfloat h = (GLfloat) height / (GLfloat) width;
+ int y = 0;
- glViewport (0, 0, (GLint) width, (GLint) height);
+ if (width > height * 5) { /* tiny window: show middle */
+ height = width * 9/16;
+ y = -height/2;
+ h = height / (GLfloat) width;
+ }
+
+ glViewport (0, y, (GLint) width, (GLint) height);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
@@
-695,7
+702,7
@@
init_spheremonics (ModeInfo *mi)
{
spheremonics_configuration *cc;
{
spheremonics_configuration *cc;
- MI_INIT (mi, ccs
, NULL
);
+ MI_INIT (mi, ccs);
cc = &ccs[MI_SCREEN(mi)];
cc = &ccs[MI_SCREEN(mi)];