X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fbouncingcow.c;h=35b0142211fa563ee191105ce4d67670b13f12fa;hp=a12beca6ccf19e1898fc60efe1808c46b0324844;hb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;hpb=e4fa2ac140f7bc56571373a7b7eb585fa4500e38

diff --git a/hacks/glx/bouncingcow.c b/hacks/glx/bouncingcow.c
index a12beca6..35b01422 100644
--- a/hacks/glx/bouncingcow.c
+++ b/hacks/glx/bouncingcow.c
@@ -1,4 +1,4 @@
-/* bouncingcow, Copyright (c) 2003 Jamie Zawinski <jwz@jwz.org>
+/* bouncingcow, Copyright (c) 2003-2006 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
@@ -11,30 +11,19 @@
  * Boing, boing, boing.  Cow, cow, cow.
  */
 
-#include <X11/Intrinsic.h>
-
-extern XtAppContext app;
-
-#define PROGCLASS	"BouncingCow"
-#define HACK_INIT	init_cow
-#define HACK_DRAW	draw_cows
-#define HACK_RESHAPE	reshape_cow
-#define HACK_HANDLE_EVENT cow_handle_event
-#define EVENT_MASK      PointerMotionMask
-#define sws_opts	xlockmore_opts
-
-#define DEF_SPEED       "1.0"
-#define DEF_TEXTURE     "(none)"
-
 #define DEFAULTS	"*delay:	30000       \n" \
 			"*count:        1           \n" \
 			"*showFPS:      False       \n" \
 			"*wireframe:    False       \n" \
-			"*speed:      " DEF_SPEED " \n" \
-			"*texture:    " DEF_TEXTURE   "\n" \
 
 /* #define DEBUG */
 
+
+# define refresh_cow 0
+# define release_cow 0
+#define DEF_SPEED       "1.0"
+#define DEF_TEXTURE     "(none)"
+
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
 
@@ -51,15 +40,12 @@ extern XtAppContext app;
 
 #ifdef USE_GL /* whole file */
 
-#include <GL/glu.h>
-
-
 #include "gllist.h"
 
 extern struct gllist
  *cow_face, *cow_hide, *cow_hoofs, *cow_horns, *cow_tail, *cow_udder;
 
-struct gllist **all_objs[] = {
+static struct gllist **all_objs[] = {
  &cow_face, &cow_hide, &cow_hoofs, &cow_horns, &cow_tail, &cow_udder
 };
 
@@ -100,7 +86,7 @@ static const char *do_texture;
 static XrmOptionDescRec opts[] = {
   { "-speed",      ".speed",     XrmoptionSepArg, 0 },
   {"-texture",     ".texture",   XrmoptionSepArg, 0 },
-  {"+texture",     ".texture",   XrmoptionNoArg, (caddr_t) "(none)" },
+  {"+texture",     ".texture",   XrmoptionNoArg, "(none)" },
 };
 
 static argtype vars[] = {
@@ -108,7 +94,7 @@ static argtype vars[] = {
   {&do_texture, "texture",    "Texture", DEF_TEXTURE,   t_String},
 };
 
-ModeSpecOpt sws_opts = {countof(opts), opts, countof(vars), vars, NULL};
+ENTRYPOINT ModeSpecOpt cow_opts = {countof(opts), opts, countof(vars), vars, NULL};
 
 
 #define BOTTOM 28.0
@@ -169,7 +155,7 @@ tick_floater (ModeInfo *mi, floater *f)
 
 /* Window management, etc
  */
-void
+ENTRYPOINT void
 reshape_cow (ModeInfo *mi, int width, int height)
 {
   GLfloat h = (GLfloat) height / (GLfloat) width;
@@ -190,13 +176,13 @@ reshape_cow (ModeInfo *mi, int width, int height)
 }
 
 
-Bool
+ENTRYPOINT Bool
 cow_handle_event (ModeInfo *mi, XEvent *event)
 {
   cow_configuration *bp = &bps[MI_SCREEN(mi)];
 
   if (event->xany.type == ButtonPress &&
-      event->xbutton.button & Button1)
+      event->xbutton.button == Button1)
     {
       bp->button_down_p = True;
       gltrackball_start (bp->trackball,
@@ -205,11 +191,21 @@ cow_handle_event (ModeInfo *mi, XEvent *event)
       return True;
     }
   else if (event->xany.type == ButtonRelease &&
-           event->xbutton.button & Button1)
+           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)
     {
@@ -274,7 +270,7 @@ load_texture (ModeInfo *mi, const char *filename)
 }
 
 
-void
+ENTRYPOINT void
 init_cow (ModeInfo *mi)
 {
   cow_configuration *bp;
@@ -332,9 +328,7 @@ init_cow (ModeInfo *mi)
   for (i = 0; i < countof(all_objs); i++)
     {
       GLfloat black[4] = {0, 0, 0, 1};
-      struct gllist *gll = *all_objs[i];
-      if (wire)
-        gll->primitive = GL_LINE_LOOP;
+      const struct gllist *gll = *all_objs[i];
 
       glNewList (bp->dlists[i], GL_COMPILE);
 
@@ -414,7 +408,7 @@ init_cow (ModeInfo *mi)
           glMaterialf  (GL_FRONT_AND_BACK, GL_SHININESS,           shiny);
         }
 
-      renderList (gll);
+      renderList (gll, wire);
 
       glMatrixMode(GL_TEXTURE);
       glPopMatrix();
@@ -502,8 +496,8 @@ draw_floater (ModeInfo *mi, floater *f)
 
 
 
-void
-draw_cows (ModeInfo *mi)
+ENTRYPOINT void
+draw_cow (ModeInfo *mi)
 {
   cow_configuration *bp = &bps[MI_SCREEN(mi)];
   Display *dpy = MI_DISPLAY(mi);
@@ -513,6 +507,8 @@ draw_cows (ModeInfo *mi)
   if (!bp->glx_context)
     return;
 
+  glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
   glPushMatrix ();
@@ -553,4 +549,6 @@ draw_cows (ModeInfo *mi)
   glXSwapBuffers(dpy, window);
 }
 
+XSCREENSAVER_MODULE_2 ("BouncingCow", bouncingcow, cow)
+
 #endif /* USE_GL */