"*showFPS: False \n" \
"*fpsSolid: True \n" \
"*useSHM: True \n" \
- "*titleFont: -*-helvetica-medium-r-normal-*-180-*\n" \
+ "*titleFont: -*-helvetica-medium-r-normal-*-*-180-*-*-*-*-*-*\n" \
"*desktopGrabber: xscreensaver-getimage -no-desktop %s\n" \
"*grabDesktopImages: False \n" \
"*chooseRandomImages: True \n"
# define DEF_MIPMAP "True"
#include "grab-ximage.h"
-#include "glxfonts.h"
+#include "texfont.h"
typedef struct {
double x, y, w, h;
static const char *
blurb (void)
{
-# ifdef HAVE_COCOA
+# ifdef HAVE_JWXYZ
return "GLSlideshow";
# else
static char buf[255];
if (do_titles &&
- img->title && *img->title)
+ img->title && *img->title &&
+ (sp->state == IN || sp->state == FULL))
{
- int x = 10;
- int y = mi->xgwa.height - 10;
- glColor4f (0, 0, 0, sp->opacity); /* cheap-assed dropshadow */
- print_gl_string (mi->dpy, ss->font_data,
- mi->xgwa.width, mi->xgwa.height, x, y,
- img->title, False);
- x++; y++;
glColor4f (1, 1, 1, sp->opacity);
- print_gl_string (mi->dpy, ss->font_data,
- mi->xgwa.width, mi->xgwa.height, x, y,
- img->title, False);
+ print_texture_label (mi->dpy, ss->font_data,
+ mi->xgwa.width, mi->xgwa.height,
+ 1, img->title);
}
}
glPopMatrix();
glPushMatrix();
+/*
{
GLfloat rot = current_device_rotation();
glTranslatef (0.5, 0.5, 0);
}
glTranslatef (-0.5, -0.5, 0);
}
+*/
for (i = 0; i < ss->nsprites; i++)
draw_sprite (mi, ss->sprites[i]);
glViewport (0, 0, width, height);
glMatrixMode (GL_PROJECTION);
glLoadIdentity();
+ glRotatef (current_device_rotation(), 0, 0, 1);
glMatrixMode (GL_MODELVIEW);
glLoadIdentity();
static void
check_fps (ModeInfo *mi)
{
-#ifndef HAVE_COCOA /* always assume Cocoa is fast enough */
+#ifndef HAVE_JWXYZ /* always assume Cocoa and mobile are fast enough */
slideshow_state *ss = &sss[MI_SCREEN(mi)];
/* Need this in case zoom changed. */
reshape_slideshow (mi, mi->xgwa.width, mi->xgwa.height);
-#endif /* HAVE_COCOA */
+#endif /* HAVE_JWXYZ */
}
slideshow_state *ss;
int wire = MI_IS_WIREFRAME(mi);
- if (sss == NULL) {
- if ((sss = (slideshow_state *)
- calloc (MI_NUM_SCREENS(mi), sizeof(slideshow_state))) == NULL)
- return;
- }
+ MI_INIT (mi, sss, NULL);
ss = &sss[screen];
if ((ss->glx_context = init_GL(mi)) != NULL) {