"*grabDesktopImages: False \n" \
"*chooseRandomImages: True \n"
-# define refresh_carousel 0
+# define free_carousel 0
# define release_carousel 0
# include "xlockmore.h"
#include "grab-ximage.h"
#include "texfont.h"
-# ifndef HAVE_COCOA
+# ifndef HAVE_JWXYZ
# include <X11/Intrinsic.h> /* for XrmDatabase in -debug mode */
# endif
int h = (MI_HEIGHT(mi) / 2) - 1;
if (w <= 10) w = 10;
if (h <= 10) h = 10;
+
+ if (w > h * 5) { /* tiny window: use 16:9 boxes */
+ h = w * 9/16;
+ }
+
load_texture_async (mi->xgwa.screen, mi->window, *ss->glx_context, w, h,
mipmap_p, frame->loading.texid,
image_loaded_cb, frame);
reshape_carousel (ModeInfo *mi, int width, int height)
{
GLfloat h = (GLfloat) height / (GLfloat) width;
+ int y = 0;
+
+ if (width > height * 5) { /* tiny window: show middle */
+ height = width * 9/16;
+ y = -height/2;
+ h = height / (GLfloat) width;
+ }
- glViewport (0, 0, (GLint) width, (GLint) height);
+ glViewport (0, y, (GLint) width, (GLint) height);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
static void
hack_resources (Display *dpy)
{
-# ifndef HAVE_COCOA
+# ifndef HAVE_JWXYZ
char *res = "desktopGrabber";
char *val = get_string_resource (dpy, res, "DesktopGrabber");
char buf1[255];
value.addr = buf2;
value.size = strlen(buf2);
XrmPutResource (&db, buf1, "String", &value);
-# endif /* !HAVE_COCOA */
+# endif /* !HAVE_JWXYZ */
}
glPushMatrix();
glLoadIdentity();
+/*
{
double rot = current_device_rotation();
glRotatef(rot, 0, 0, 1);
glScalef (s, 1/s, 1);
}
}
+*/
- if (MI_WIDTH(mi) < MI_HEIGHT(mi)) /* USE_IPHONE portrait orientation */
+# ifdef HAVE_MOBILE
+ if (MI_WIDTH(mi) < MI_HEIGHT(mi)) /* portrait orientation */
{
GLfloat s = (MI_WIDTH(mi) / (GLfloat) MI_HEIGHT(mi));
glScalef (s, s, s);
glTranslatef(-s/2, 0, 0);
}
+# endif
glOrtho(0, MI_WIDTH(mi), 0, MI_HEIGHT(mi), -1, 1);
glTranslatef ((MI_WIDTH(mi) - ss->loading_sw) / 2,
carousel_state *ss;
int wire = MI_IS_WIREFRAME(mi);
- if (sss == NULL) {
- if ((sss = (carousel_state *)
- calloc (MI_NUM_SCREENS(mi), sizeof(carousel_state))) == NULL)
- return;
- }
+ MI_INIT (mi, sss);
ss = &sss[screen];
if ((ss->glx_context = init_GL(mi)) != NULL) {