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.39.tar.gz
[xscreensaver]
/
hacks
/
glx
/
lavalite.c
diff --git
a/hacks/glx/lavalite.c
b/hacks/glx/lavalite.c
index b1604a2212829b623850e7be27dde2a78cc2f831..73d5805ed0d093218c7830d2236485f21be04192 100644
(file)
--- a/
hacks/glx/lavalite.c
+++ b/
hacks/glx/lavalite.c
@@
-70,7
+70,7
@@
"*geometry: 600x900\n" \
"*count: " DEF_COUNT " \n" \
"*geometry: 600x900\n" \
"*count: " DEF_COUNT " \n" \
-# define
refresh
_lavalite 0
+# define
free
_lavalite 0
# define release_lavalite 0
# define release_lavalite 0
@@
-92,7
+92,7
@@
#include "marching.h"
#include "rotator.h"
#include "gltrackball.h"
#include "marching.h"
#include "rotator.h"
#include "gltrackball.h"
-#include "x
pm-ximage
.h"
+#include "x
image-loader
.h"
#include <ctype.h>
#ifdef USE_GL /* whole file */
#include <ctype.h>
#ifdef USE_GL /* whole file */
@@
-300,8
+300,15
@@
ENTRYPOINT void
reshape_lavalite (ModeInfo *mi, int width, int height)
{
GLfloat h = (GLfloat) height / (GLfloat) width;
reshape_lavalite (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 * 3;
+ y = -height/2;
+ h = height / (GLfloat) width;
+ }
+
+ glViewport (0, y, (GLint) width, (GLint) height);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
@@
-326,7
+333,6
@@
load_texture (ModeInfo *mi, const char *filename)
{
Display *dpy = mi->dpy;
Visual *visual = mi->xgwa.visual;
{
Display *dpy = mi->dpy;
Visual *visual = mi->xgwa.visual;
- Colormap cmap = mi->xgwa.colormap;
char buf[1024];
XImage *image;
char buf[1024];
XImage *image;
@@
-338,7
+344,7
@@
load_texture (ModeInfo *mi, const char *filename)
return False;
}
return False;
}
- image =
xpm_file_to_ximage (dpy, visual, cmap
, filename);
+ image =
file_to_ximage (dpy, visual
, filename);
if (!image) return False;
clear_gl_error();
if (!image) return False;
clear_gl_error();
@@
-1274,7
+1280,7
@@
init_lavalite (ModeInfo *mi)
lavalite_configuration *bp;
int wire = MI_IS_WIREFRAME(mi);
lavalite_configuration *bp;
int wire = MI_IS_WIREFRAME(mi);
- MI_INIT (mi, bps
, NULL
);
+ MI_INIT (mi, bps);
bp = &bps[MI_SCREEN(mi)];
bp = &bps[MI_SCREEN(mi)];