bp->glx_context = init_GL(mi);
- bp->trackball = gltrackball_init ();
- bp->st = init_view(MI_IS_WIREFRAME(mi), transparent_p);
- init_move(bp->st);
+ bp->trackball = gltrackball_init (False);
+ bp->st = stonerview_init_view(MI_IS_WIREFRAME(mi), transparent_p);
+ stonerview_init_move(bp->st);
reshape_stonerview (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
clear_gl_error(); /* WTF? sometimes "invalid op" from glViewport! */
glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
glPushMatrix ();
+ glRotatef( current_device_rotation(), 0, 0, 1);
gltrackball_rotate (bp->trackball);
- win_draw(bp->st);
+
+ stonerview_win_draw(bp->st);
if (! bp->button_down_p)
- move_increment(bp->st);
+ stonerview_move_increment(bp->st);
glPopMatrix ();
mi->polygon_count = NUM_ELS;
for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
stonerview_configuration *bp = &bps[screen];
if (bp->st)
- win_release (bp->st);
+ stonerview_win_release (bp->st);
}
free (bps);
bps = 0;
{
stonerview_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;
return False;
}