projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.30.tar.gz
[xscreensaver]
/
hacks
/
glx
/
extrusion.c
diff --git
a/hacks/glx/extrusion.c
b/hacks/glx/extrusion.c
index 6637512f6b20dc55b66b4f13993f38c3132ccd13..1073b7465e5c467eb4f207753545ac15b8e06a99 100644
(file)
--- a/
hacks/glx/extrusion.c
+++ b/
hacks/glx/extrusion.c
@@
-285,7
+285,7
@@
init_rotation (ModeInfo *mi)
0.2,
0.005,
True);
0.2,
0.005,
True);
- gp->trackball = gltrackball_init ();
+ gp->trackball = gltrackball_init (
True
);
lastx = (random() % (int) (max_lastx - min_lastx)) + min_lastx;
lasty = (random() % (int) (max_lasty - min_lasty)) + min_lasty;
lastx = (random() % (int) (max_lastx - min_lastx)) + min_lastx;
lasty = (random() % (int) (max_lasty - min_lasty)) + min_lasty;
@@
-438,11
+438,14
@@
initializeGL(ModeInfo *mi, GLsizei width, GLsizei height)
glViewport( 0, 0, width, height );
glEnable(GL_DEPTH_TEST);
glViewport( 0, 0, width, height );
glEnable(GL_DEPTH_TEST);
- glClearColor(0,0,0,0);
glDisable (GL_CULL_FACE);
glLightModeli (GL_LIGHT_MODEL_TWO_SIDE, True);
glShadeModel(GL_SMOOTH);
glDisable (GL_CULL_FACE);
glLightModeli (GL_LIGHT_MODEL_TWO_SIDE, True);
glShadeModel(GL_SMOOTH);
+# ifdef HAVE_JWZGLES /* #### glPolygonMode other than GL_FILL unimplemented */
+ MI_IS_WIREFRAME(mi) = 0;
+# endif
+
if (do_light)
SetupLight();
if (MI_IS_WIREFRAME(mi)) {
if (do_light)
SetupLight();
if (MI_IS_WIREFRAME(mi)) {
@@
-477,48
+480,38
@@
extrusion_handle_event (ModeInfo *mi, XEvent *event)
if (event->xany.type == ButtonPress &&
(event->xbutton.button == Button4 ||
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 (gp->trackball, event->xbutton.button, 10,
- !!event->xbutton.state);
- return True;
}
else if (event->xany.type == ButtonPress && /* rotate with left button */
!event->xbutton.state) /* if no modifier keys */
{
}
else if (event->xany.type == ButtonPress && /* rotate with left button */
!event->xbutton.state) /* if no modifier keys */
{
- gp->button_down_p = True;
- gltrackball_start (gp->trackball,
- event->xbutton.x, event->xbutton.y,
- MI_WIDTH (mi), MI_HEIGHT (mi));
- return True;
}
else if (event->xany.type == ButtonPress) /* deform with other buttons */
{ /* or with modifier keys */
gp->button2_down_p = True;
}
else if (event->xany.type == ButtonPress) /* deform with other buttons */
{ /* or with modifier keys */
gp->button2_down_p = True;
- gp->mouse_start_x = gp->mouse_x = event->xbutton.x;
- gp->mouse_start_y = gp->mouse_y = event->xbutton.y;
- return True;
}
else if (event->xany.type == ButtonRelease)
{
gp->button_down_p = False;
gp->button2_down_p = False;
}
else if (event->xany.type == ButtonRelease)
{
gp->button_down_p = False;
gp->button2_down_p = False;
- return True;
}
else if (event->xany.type == MotionNotify)
{
}
else if (event->xany.type == MotionNotify)
{
- if (gp->button_down_p)
- gltrackball_track (gp->trackball,
- event->xmotion.x, event->xmotion.y,
- MI_WIDTH (mi), MI_HEIGHT (mi));
if (gp->button2_down_p)
{
gp->mouse_x = event->xmotion.x;
gp->mouse_y = event->xmotion.y;
}
if (gp->button2_down_p)
{
gp->mouse_x = event->xmotion.x;
gp->mouse_y = event->xmotion.y;
}
- return True;
}
}
+ if (gltrackball_event_handler (event, gp->trackball,
+ MI_WIDTH (mi), MI_HEIGHT (mi),
+ &gp->button_down_p))
+ return True;
+
return False;
}
return False;
}