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
/
hypnowheel.c
diff --git
a/hacks/glx/hypnowheel.c
b/hacks/glx/hypnowheel.c
index 4a8fe5e2a0c93183c923918aced8296f3569c1b5..0602e6e4e423970125bb7a3afa06255f9ca6f29d 100644
(file)
--- a/
hacks/glx/hypnowheel.c
+++ b/
hacks/glx/hypnowheel.c
@@
-24,7
+24,7
@@
"*wireframe: False \n" \
"*suppressRotationAnimation: True\n" \
"*wireframe: False \n" \
"*suppressRotationAnimation: True\n" \
-# define
refresh
_hypnowheel 0
+# define
free
_hypnowheel 0
# define release_hypnowheel 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
# define release_hypnowheel 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@
-137,8
+137,15
@@
ENTRYPOINT void
reshape_hypnowheel (ModeInfo *mi, int width, int height)
{
GLfloat h = (GLfloat) height / (GLfloat) width;
reshape_hypnowheel (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 * 3) { /* tiny window: show middle */
+ height = width;
+ y = -height/2;
+ h = height / (GLfloat) width;
+ }
+
+ glViewport (0, y, (GLint) width, (GLint) height);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
@@
-169,7
+176,7
@@
init_hypnowheel (ModeInfo *mi)
int wire = MI_IS_WIREFRAME(mi);
int i;
int wire = MI_IS_WIREFRAME(mi);
int i;
- MI_INIT (mi, bps
, NULL
);
+ MI_INIT (mi, bps);
bp = &bps[MI_SCREEN(mi)];
bp = &bps[MI_SCREEN(mi)];