X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fstonerview.c;h=2aa5e129a5883cadaf3e8ebab0b5ae63065e6004;hp=1ac784cb400a822f12963dd2348472f2a0d6be48;hb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;hpb=ccb7f4903325f92555a9722bba74b58346654ba0

diff --git a/hacks/glx/stonerview.c b/hacks/glx/stonerview.c
index 1ac784cb..2aa5e129 100644
--- a/hacks/glx/stonerview.c
+++ b/hacks/glx/stonerview.c
@@ -15,43 +15,158 @@
 
 /* Ported away from GLUT (so that it can do `-root' and work with xscreensaver)
    by Jamie Zawinski <jwz@jwz.org>, 22-Jan-2001.
+
+   Revamped to work in the xlockmore framework so that it will also work
+   with the MacOS X port of xscreensaver by jwz, 21-Feb-2006.
  */
 
-#include "config.h"
+#define DEFAULTS	"*delay:	20000       \n" \
+			"*showFPS:      False       \n" \
+			"*wireframe:    False       \n"
+
+# define refresh_stonerview 0
+#undef countof
+#define countof(x) (sizeof((x))/sizeof((*x)))
+
+#include "xlockmore.h"
+
+#ifdef USE_GL /* whole file */
+
+#include "stonerview.h"
+#include "gltrackball.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/time.h>
+typedef struct {
+  GLXContext *glx_context;
+  stonerview_state *st;
+  trackball_state *trackball;
+  Bool button_down_p;
+} stonerview_configuration;
 
-#include <GL/gl.h>
+static stonerview_configuration *bps = NULL;
 
-#include "yarandom.h"
-#include "usleep.h"
-#include "stonerview-move.h"
+ENTRYPOINT ModeSpecOpt stonerview_opts = {0, NULL, 0, NULL, NULL};
 
-extern int init_view(int *argc, char *argv[]);
-extern void win_draw(void);
 
+ENTRYPOINT void
+reshape_stonerview (ModeInfo *mi, int width, int height)
+{
+  GLfloat h = (GLfloat) height / (GLfloat) width;
+
+  glViewport(0, 0, (GLint) width, (GLint) height);
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
+  glFrustum(-1.0, 1.0, -h, h, 5.0, 60.0);
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
+  glTranslatef(0.0, 0.0, -40.0);
+}
 
-int main(int argc, char *argv[])
+
+ENTRYPOINT void 
+init_stonerview (ModeInfo *mi)
 {
+  stonerview_configuration *bp;
 
-  /* Randomize -- only need to do this here because this program
-     doesn't use the `screenhack.h' or `lockmore.h' APIs. */
-# undef ya_rand_init
-  ya_rand_init (0);
+  if (!bps) {
+    bps = (stonerview_configuration *)
+      calloc (MI_NUM_SCREENS(mi), sizeof (stonerview_configuration));
+    if (!bps) {
+      fprintf(stderr, "%s: out of memory\n", progname);
+      exit(1);
+    }
+
+    bp = &bps[MI_SCREEN(mi)];
+  }
+
+  bp = &bps[MI_SCREEN(mi)];
+
+  bp->glx_context = init_GL(mi);
+
+  bp->trackball = gltrackball_init ();
+  bp->st = init_view(MI_IS_WIREFRAME(mi));
+  init_move(bp->st);
+
+  reshape_stonerview (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
+}
+
+
+ENTRYPOINT void
+draw_stonerview (ModeInfo *mi)
+{
+  stonerview_configuration *bp = &bps[MI_SCREEN(mi)];
 
-  if (!init_view(&argc, argv))
-    return -1;
-  if (!init_move())
-    return -1;
+  glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
 
-  while (1)
+  glPushMatrix ();
+  gltrackball_rotate (bp->trackball);
+  win_draw(bp->st);
+  if (! bp->button_down_p)
+    move_increment(bp->st);
+  glPopMatrix ();
+
+  mi->polygon_count = NUM_ELS;
+  if (mi->fps_p) do_fps (mi);
+  glFinish();
+
+  glXSwapBuffers(MI_DISPLAY (mi), MI_WINDOW(mi));
+}
+
+ENTRYPOINT void
+release_stonerview (ModeInfo *mi)
+{
+  if (bps) {
+    int screen;
+    for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
+      stonerview_configuration *bp = &bps[screen];
+      if (bp->st)
+        win_release (bp->st);
+    }
+    free (bps);
+    bps = 0;
+  }
+  FreeAllGL(mi);
+}
+
+ENTRYPOINT Bool
+stonerview_handle_event (ModeInfo *mi, XEvent *event)
+{
+  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))
     {
-      win_draw();
-      move_increment();
-      usleep (20000);
+      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;
     }
 
-  return 0;
+  return False;
 }
+
+XSCREENSAVER_MODULE ("StonerView", stonerview)
+
+#endif /* USE_GL */