#define DEFAULTS "*delay: 30000 \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
- "*labelfont: -*-helvetica-medium-r-normal-*-180-*\n"
+ "*suppressRotationAnimation: True\n" \
+ "*labelfont: -*-helvetica-medium-r-normal-*-*-180-*-*-*-*-*-*\n"
-# define refresh_spheremonics 0
+# define free_spheremonics 0
# define release_spheremonics 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
#include "xlockmore.h"
-#include "glxfonts.h"
+#include "texfont.h"
#include "normals.h"
#include "colors.h"
#include "rotator.h"
reshape_spheremonics (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();
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);
}
{
spheremonics_configuration *cc;
- if (!ccs) {
- ccs = (spheremonics_configuration *)
- calloc (MI_NUM_SCREENS(mi), sizeof (spheremonics_configuration));
- if (!ccs) {
- fprintf(stderr, "%s: out of memory\n", progname);
- exit(1);
- }
- }
+ MI_INIT (mi, ccs);
cc = &ccs[MI_SCREEN(mi)];
cc->m[4], cc->m[5], cc->m[6], cc->m[7]);
glColor3f(1.0, 1.0, 0.0);
- print_gl_string (mi->dpy, cc->font_data,
- mi->xgwa.width, mi->xgwa.height,
- 10, mi->xgwa.height - 10,
- buf, False);
+ print_texture_label (mi->dpy, cc->font_data,
+ mi->xgwa.width, mi->xgwa.height,
+ 1, buf);
}
if (!static_parms)