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
/
jigsaw.c
diff --git
a/hacks/glx/jigsaw.c
b/hacks/glx/jigsaw.c
index dc7b8c3db654e36527790693a3351d14c776d82a..5185f9b55fe135149cf1c8c8d80dccd5af3e612a 100644
(file)
--- a/
hacks/glx/jigsaw.c
+++ b/
hacks/glx/jigsaw.c
@@
-1,4
+1,4
@@
-/* xscreensaver, Copyright (c) 1997-201
5
Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1997-201
7
Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@
-55,15
+55,16
@@
"*wireframe: False \n" \
"*desktopGrabber: xscreensaver-getimage -no-desktop %s\n" \
"*grabDesktopImages: False \n" \
"*wireframe: False \n" \
"*desktopGrabber: xscreensaver-getimage -no-desktop %s\n" \
"*grabDesktopImages: False \n" \
- "*chooseRandomImages: True \n"
+ "*chooseRandomImages: True \n" \
+ "*suppressRotationAnimation: True\n" \
-# define
refresh
_jigsaw 0
+# define
free
_jigsaw 0
# define release_jigsaw 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
# define release_jigsaw 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
-#ifdef HAVE_
COCOA
+#ifdef HAVE_
JWXYZ
# include "jwxyz.h"
#else
# include <X11/Xlib.h>
# include "jwxyz.h"
#else
# include <X11/Xlib.h>
@@
-1324,8
+1325,15
@@
reshape_jigsaw (ModeInfo *mi, int width, int height)
{
jigsaw_configuration *jc = &sps[MI_SCREEN(mi)];
GLfloat h = (GLfloat) height / (GLfloat) width;
{
jigsaw_configuration *jc = &sps[MI_SCREEN(mi)];
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();
@@
-1337,6
+1345,14
@@
reshape_jigsaw (ModeInfo *mi, int width, int height)
0.0, 0.0, 0.0,
0.0, 1.0, 0.0);
0.0, 0.0, 0.0,
0.0, 1.0, 0.0);
+# ifdef HAVE_MOBILE /* Keep it the same relative size when rotated. */
+ {
+ int o = (int) current_device_rotation();
+ if (o != 0 && o != 180 && o != -180)
+ glScalef (1/h, 1/h, 1/h);
+ }
+# endif
+
glClear(GL_COLOR_BUFFER_BIT);
jc->line_thickness = (MI_IS_WIREFRAME (mi) ? 1 : MAX (1, height / 300.0));
glClear(GL_COLOR_BUFFER_BIT);
jc->line_thickness = (MI_IS_WIREFRAME (mi) ? 1 : MAX (1, height / 300.0));
@@
-1369,14
+1385,7
@@
init_jigsaw (ModeInfo *mi)
jigsaw_configuration *jc;
int wire = MI_IS_WIREFRAME(mi);
jigsaw_configuration *jc;
int wire = MI_IS_WIREFRAME(mi);
- if (!sps) {
- sps = (jigsaw_configuration *)
- calloc (MI_NUM_SCREENS(mi), sizeof (jigsaw_configuration));
- if (!sps) {
- fprintf(stderr, "%s: out of memory\n", progname);
- exit(1);
- }
- }
+ MI_INIT (mi, sps);
jc = &sps[MI_SCREEN(mi)];
jc->glx_context = init_GL(mi);
jc = &sps[MI_SCREEN(mi)];
jc->glx_context = init_GL(mi);
@@
-1434,7
+1443,7
@@
draw_jigsaw (ModeInfo *mi)
mi->polygon_count = 0;
glPushMatrix ();
mi->polygon_count = 0;
glPushMatrix ();
- glRotatef(current_device_rotation(), 0, 0, 1);
+/* glRotatef(current_device_rotation(), 0, 0, 1); */
gltrackball_rotate (jc->trackball);
animate (mi);
gltrackball_rotate (jc->trackball);
animate (mi);