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
/
timetunnel.c
diff --git
a/hacks/glx/timetunnel.c
b/hacks/glx/timetunnel.c
index 1dd5065ddc86f1a5d479defd90fbdca10daf3fc0..106f6a64c588b98a14950530a8545cdf716ff624 100644
(file)
--- a/
hacks/glx/timetunnel.c
+++ b/
hacks/glx/timetunnel.c
@@
-23,7
+23,7
@@
-# define
refresh
_tunnel 0
+# define
free
_tunnel 0
# define release_tunnel 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
# define release_tunnel 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@
-352,8
+352,15
@@
ENTRYPOINT void
reshape_tunnel (ModeInfo *mi, int width, int height)
{
GLfloat h = (GLfloat) height / (GLfloat) width;
reshape_tunnel (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();
@@
-1031,7
+1038,7
@@
init_tunnel (ModeInfo *mi)
wire = 0;
# endif
wire = 0;
# endif
- MI_INIT (mi, tconf
, NULL
);
+ MI_INIT (mi, tconf);
tc = &tconf[MI_SCREEN(mi)];
tc = &tconf[MI_SCREEN(mi)];