X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fspheremonics.c;h=70b7ff6eb19486861c214e72f6057bb83facbd28;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=efef9f8826cdd9f42bc83eaa224a71aa6ed62e99;hpb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;p=xscreensaver diff --git a/hacks/glx/spheremonics.c b/hacks/glx/spheremonics.c index efef9f88..70b7ff6e 100644 --- a/hacks/glx/spheremonics.c +++ b/hacks/glx/spheremonics.c @@ -63,7 +63,8 @@ #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 release_spheremonics 0 @@ -71,7 +72,7 @@ #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" @@ -178,6 +179,14 @@ reshape_spheremonics (ModeInfo *mi, int width, int height) 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); } @@ -845,10 +854,9 @@ draw_spheremonics (ModeInfo *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)