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
/
bouncingcow.c
diff --git
a/hacks/glx/bouncingcow.c
b/hacks/glx/bouncingcow.c
index a2faf1f8190549e002987f681d8c53b082fdf8db..2229f7157d13c1a043e74bc6fd4901267112e221 100644
(file)
--- a/
hacks/glx/bouncingcow.c
+++ b/
hacks/glx/bouncingcow.c
@@
-16,7
+16,7
@@
"*showFPS: False \n" \
"*wireframe: False \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
-# define
refresh
_cow 0
+# define
free
_cow 0
# define release_cow 0
#define DEF_SPEED "1.0"
#define DEF_TEXTURE "(none)"
# define release_cow 0
#define DEF_SPEED "1.0"
#define DEF_TEXTURE "(none)"
@@
-156,8
+156,15
@@
ENTRYPOINT void
reshape_cow (ModeInfo *mi, int width, int height)
{
GLfloat h = (GLfloat) height / (GLfloat) width;
reshape_cow (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();
@@
-211,6
+218,7
@@
load_texture (ModeInfo *mi, const char *filename)
}
image = xpm_file_to_ximage (dpy, visual, cmap, filename);
}
image = xpm_file_to_ximage (dpy, visual, cmap, filename);
+ if (!image) return False;
clear_gl_error();
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA,
clear_gl_error();
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA,
@@
-238,14
+246,7
@@
init_cow (ModeInfo *mi)
int i;
Bool tex_p = False;
int i;
Bool tex_p = False;
- if (!bps) {
- bps = (cow_configuration *)
- calloc (MI_NUM_SCREENS(mi), sizeof (cow_configuration));
- if (!bps) {
- fprintf(stderr, "%s: out of memory\n", progname);
- exit(1);
- }
- }
+ MI_INIT (mi, bps);
bp = &bps[MI_SCREEN(mi)];
bp = &bps[MI_SCREEN(mi)];