X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=hacks%2Fglx%2Fhilbert.c;h=dbb2ce6741d6bbd17ac8c12a793e72858b53007a;hb=39809ded547bdbb08207d3e514950425215b4410;hp=d8966f45c339eed72cc0e5f09c2079ffb531c598;hpb=6f5482d73adb0165c0130bb47d852644ab0c4869;p=xscreensaver diff --git a/hacks/glx/hilbert.c b/hacks/glx/hilbert.c index d8966f45..dbb2ce67 100644 --- a/hacks/glx/hilbert.c +++ b/hacks/glx/hilbert.c @@ -1,4 +1,4 @@ -/* hilbert, Copyright (c) 2011 Jamie Zawinski +/* hilbert, Copyright (c) 2011-2014 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -18,9 +18,10 @@ "*count: 30 \n" \ "*showFPS: False \n" \ "*wireframe: False \n" \ - "*geometry: 800x800\n" + "*geometry: 800x800\n" \ + "*suppressRotationAnimation: True\n" \ -# define refresh_hilbert 0 +# define free_hilbert 0 # define release_hilbert 0 #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) @@ -756,8 +757,15 @@ ENTRYPOINT void reshape_hilbert (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(); @@ -769,6 +777,14 @@ reshape_hilbert (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); } @@ -778,56 +794,44 @@ hilbert_handle_event (ModeInfo *mi, XEvent *event) { hilbert_configuration *bp = &bps[MI_SCREEN(mi)]; - if (event->xany.type == ButtonPress && - event->xbutton.button == Button1) - { - bp->button_down_p = True; - gltrackball_start (bp->trackball, - event->xbutton.x, event->xbutton.y, - MI_WIDTH (mi), MI_HEIGHT (mi)); - return True; - } - else if (event->xany.type == ButtonRelease && - event->xbutton.button == Button1) - { - bp->button_down_p = False; - return True; - } - else if (event->xany.type == ButtonPress && - (event->xbutton.button == Button4 || - event->xbutton.button == Button5 || - event->xbutton.button == Button6 || - event->xbutton.button == Button7)) - { - gltrackball_mousewheel (bp->trackball, event->xbutton.button, 10, - !!event->xbutton.state); - return True; - } - else if (event->xany.type == MotionNotify && - bp->button_down_p) - { - gltrackball_track (bp->trackball, - event->xmotion.x, event->xmotion.y, - MI_WIDTH (mi), MI_HEIGHT (mi)); - return True; - } + if (gltrackball_event_handler (event, bp->trackball, + MI_WIDTH (mi), MI_HEIGHT (mi), + &bp->button_down_p)) + return True; else if (event->xany.type == KeyPress) { KeySym keysym; char c = 0; XLookupString (&event->xkey, &c, 1, &keysym, 0); - if (c == '+' || c == '=') + if (c == '+' || c == '=' || + keysym == XK_Up || keysym == XK_Right || keysym == XK_Next) { bp->depth++; if (bp->depth > max_depth) bp->depth = max_depth; return True; } - else if (c == '-' || c == '_') + else if (c == '-' || c == '_' || + keysym == XK_Down || keysym == XK_Left || keysym == XK_Prior) { bp->depth--; if (bp->depth < 1) bp->depth = 1; return True; } + else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event)) + { + bp->depth += bp->depth_tick; + if (bp->depth > max_depth-1) + { + bp->depth = max_depth; + bp->depth_tick = -1; + } + else if (bp->depth <= 1) + { + bp->depth = 1; + bp->depth_tick = 1; + } + return True; + } } return False; @@ -841,14 +845,7 @@ init_hilbert (ModeInfo *mi) int wire = MI_IS_WIREFRAME(mi); int i; - if (!bps) { - bps = (hilbert_configuration *) - calloc (MI_NUM_SCREENS(mi), sizeof (hilbert_configuration)); - if (!bps) { - fprintf(stderr, "%s: out of memory\n", progname); - exit(1); - } - } + MI_INIT (mi, bps); bp = &bps[MI_SCREEN(mi)]; @@ -900,7 +897,7 @@ init_hilbert (ModeInfo *mi) do_wander ? wander_speed : 0, do_spin); bp->rot2 = make_rotator (0, 0, 0, 0, tilt_speed, True); - bp->trackball = gltrackball_init (); + bp->trackball = gltrackball_init (True); } if (mode_str && !strcasecmp(mode_str, "2d")) @@ -1017,10 +1014,7 @@ draw_hilbert (ModeInfo *mi) (y - 0.5) * 8, (z - 0.5) * 15); - /* Do it twice because we don't track the device's orientation. */ - glRotatef( current_device_rotation(), 0, 0, 1); gltrackball_rotate (bp->trackball); - glRotatef(-current_device_rotation(), 0, 0, 1); get_rotation (bp->rot, &x, &y, &z, !bp->button_down_p);