-/* tronbit, Copyright (c) 2011-2012 Jamie Zawinski <jwz@jwz.org>
+/* tronbit, Copyright (c) 2011-2014 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
glPushMatrix();
glLoadIdentity();
- glRotatef(current_device_rotation(), 0, 0, 1);
+ /* glRotatef(current_device_rotation(), 0, 0, 1); */
glOrtho (0, mi->xgwa.width, 0, mi->xgwa.height, -1, 1);
for (k = 0; k < overlays; k++)
j = bp->histogram_fp + 1;
for (i = 0; i < samples; i++)
{
- GLfloat x = i;
- GLfloat y = bp->histogram[j];
- GLfloat z = 0;
+ GLfloat x, y, z;
+ if (j >= samples) j = 0;
+ x = i;
+ y = bp->histogram[j];
+ z = 0;
y += (int) ((random() % 16) - 8);
y += 16; /* margin at bottom of screen */
y *= scaley;
glVertex3f (x, y, z);
- if (++j >= samples) j = 0;
+ ++j;
polys++;
}
glEnd();
{
bit_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, 3,
- !!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 == '1' || c == '0')
+
+ if (keysym == XK_Up || keysym == XK_Left || keysym == XK_Prior)
+ c = '1';
+ else if (keysym == XK_Down || keysym == XK_Right || keysym == XK_Next)
+ c = '0';
+
+ if (c == ' ' || c == '\t' || c == '\n' || c == '1' || c == '0')
{
bp->kbd = c;
return True;
bit_configuration *bp;
int i;
- if (!bps) {
- bps = (bit_configuration *)
- calloc (MI_NUM_SCREENS(mi), sizeof (bit_configuration));
- if (!bps) {
- fprintf(stderr, "%s: out of memory\n", progname);
- exit(1);
- }
- }
+ MI_INIT (mi, bps, NULL);
bp = &bps[MI_SCREEN(mi)];
spin_accel,
do_wander ? wander_speed : 0,
False);
- bp->trackball = gltrackball_init ();
+ bp->trackball = gltrackball_init (False);
}
for (i = 0; i < countof(bp->dlists); i++)
}
glPushMatrix ();
- glRotatef(current_device_rotation(), 0, 0, 1);
glScalef(1.1, 1.1, 1.1);
+# ifdef HAVE_MOBILE /* Keep it the same relative size when rotated. */
+ {
+ GLfloat h = MI_HEIGHT(mi) / (GLfloat) MI_WIDTH(mi);
+ int o = (int) current_device_rotation();
+ if (o != 0 && o != 180 && o != -180)
+ glScalef (1/h, 1/h, 1/h);
+ glRotatef(o, 0, 0, 1);
+ }
+# endif
+
{
double x, y, z;
get_position (bp->rot, &x, &y, &z, !bp->button_down_p);