X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fcarousel.c;h=3d6e22814fd3e666af3479f9cfe05c8da4dc7750;hb=2762a7d7cf8d83e68b8f635941f6609119d630ae;hp=4fd1b2fcb2266856b203223004a9c97871ed239d;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver diff --git a/hacks/glx/carousel.c b/hacks/glx/carousel.c index 4fd1b2fc..3d6e2281 100644 --- a/hacks/glx/carousel.c +++ b/hacks/glx/carousel.c @@ -1,4 +1,4 @@ -/* carousel, Copyright (c) 2005-2006 Jamie Zawinski +/* carousel, Copyright (c) 2005-2013 Jamie Zawinski * Loads a sequence of images and rotates them around. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -12,7 +12,7 @@ * Created: 21-Feb-2005 */ -#define DEF_FONT "-*-times-bold-r-normal-*-240-*" +#define DEF_FONT "-*-helvetica-bold-r-normal-*-240-*" #define DEFAULTS "*count: 7 \n" \ "*delay: 10000 \n" \ "*wireframe: False \n" \ @@ -50,6 +50,14 @@ # include /* for XrmDatabase in -debug mode */ # endif +/* Should be in */ +# ifndef GL_TEXTURE_MAX_ANISOTROPY_EXT +# define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE +# endif +# ifndef GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT +# define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF +# endif + typedef struct { double x, y, w, h; } rect; @@ -80,6 +88,7 @@ typedef struct { typedef struct { GLXContext *glx_context; + GLfloat anisotropic; rotator *rot; trackball_state *trackball; Bool button_down_p; @@ -218,11 +227,15 @@ load_image (ModeInfo *mi, image_frame *frame) if (wire) image_loaded_cb (0, 0, 0, 0, 0, 0, frame); else - load_texture_async (mi->xgwa.screen, mi->window, *ss->glx_context, - (MI_WIDTH(mi) / 2) - 1, - (MI_HEIGHT(mi) / 2) - 1, - mipmap_p, frame->loading.texid, - image_loaded_cb, frame); + { + int w = (MI_WIDTH(mi) / 2) - 1; + int h = (MI_HEIGHT(mi) / 2) - 1; + if (w <= 10) w = 10; + if (h <= 10) h = 10; + load_texture_async (mi->xgwa.screen, mi->window, *ss->glx_context, w, h, + mipmap_p, frame->loading.texid, + image_loaded_cb, frame); + } } @@ -255,6 +268,10 @@ image_loaded_cb (const char *filename, XRectangle *geom, glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, mipmap_p ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR); + if (ss->anisotropic >= 1.0) + glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, + ss->anisotropic); + glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); @@ -268,8 +285,11 @@ image_loaded_cb (const char *filename, XRectangle *geom, free (frame->loading.title); frame->loading.title = (filename ? strdup (filename) : 0); - if (frame->loading.title) /* strip filename to part after last /. */ - { + /* xscreensaver-getimage returns paths relative to the image directory + now, so leave the sub-directory part in. Unless it's an absolute path. + */ + if (frame->loading.title && frame->loading.title[0] == '/') + { /* strip filename to part after last /. */ char *s = strrchr (frame->loading.title, '/'); if (s) strcpy (frame->loading.title, s+1); } @@ -431,7 +451,9 @@ carousel_handle_event (ModeInfo *mi, XEvent *event) } else if (event->xany.type == ButtonPress && (event->xbutton.button == Button4 || - event->xbutton.button == Button5)) + event->xbutton.button == Button5 || + event->xbutton.button == Button6 || + event->xbutton.button == Button7)) { gltrackball_mousewheel (ss->trackball, event->xbutton.button, 5, !event->xbutton.state); @@ -477,7 +499,6 @@ loading_msg (ModeInfo *mi, int n) carousel_state *ss = &sss[MI_SCREEN(mi)]; int wire = MI_IS_WIREFRAME(mi); char text[100]; - GLfloat scale; if (wire) return; @@ -490,8 +511,6 @@ loading_msg (ModeInfo *mi, int n) if (ss->loading_sw == 0) /* only do this once, so that the string doesn't move. */ ss->loading_sw = texture_string_width (ss->texfont, text, &ss->loading_sh); - scale = ss->loading_sh / (GLfloat) MI_HEIGHT(mi); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glMatrixMode(GL_PROJECTION); @@ -501,8 +520,26 @@ loading_msg (ModeInfo *mi, int n) glMatrixMode(GL_MODELVIEW); glPushMatrix(); glLoadIdentity(); - gluOrtho2D(0, MI_WIDTH(mi), 0, MI_HEIGHT(mi)); + { + double rot = current_device_rotation(); + glRotatef(rot, 0, 0, 1); + if ((rot > 45 && rot < 135) || + (rot < -45 && rot > -135)) + { + GLfloat s = MI_WIDTH(mi) / (GLfloat) MI_HEIGHT(mi); + glScalef (s, 1/s, 1); + } + } + + if (MI_WIDTH(mi) < MI_HEIGHT(mi)) /* USE_IPHONE portrait orientation */ + { + GLfloat s = (MI_WIDTH(mi) / (GLfloat) MI_HEIGHT(mi)); + glScalef (s, s, s); + glTranslatef(-s/2, 0, 0); + } + + glOrtho(0, MI_WIDTH(mi), 0, MI_HEIGHT(mi), -1, 1); glTranslatef ((MI_WIDTH(mi) - ss->loading_sw) / 2, (MI_HEIGHT(mi) - ss->loading_sh) / 2, 0); @@ -539,6 +576,7 @@ init_carousel (ModeInfo *mi) if ((ss->glx_context = init_GL(mi)) != NULL) { reshape_carousel (mi, MI_WIDTH(mi), MI_HEIGHT(mi)); + clear_gl_error(); /* WTF? sometimes "invalid op" from glViewport! */ } else { MI_CLEARWINDOW(mi); } @@ -574,6 +612,12 @@ init_carousel (ModeInfo *mi) ss->trackball = gltrackball_init (); } + if (strstr ((char *) glGetString(GL_EXTENSIONS), + "GL_EXT_texture_filter_anisotropic")) + glGetFloatv (GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &ss->anisotropic); + else + ss->anisotropic = 0.0; + glDisable (GL_LIGHTING); glEnable (GL_DEPTH_TEST); glDisable (GL_CULL_FACE); @@ -806,6 +850,8 @@ draw_carousel (ModeInfo *mi) glPushMatrix(); + glRotatef(current_device_rotation(), 0, 0, 1); + /* Run the startup "un-shrink" animation. */