X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fscreenhack.h;h=158a251fa8afa006bc3d9e52a704487fbadee3bb;hb=de041722414a2e31c1c04caa10aaec9d6952e9b4;hp=14e9a16cb0d1b1be5ff6c095eb5fa44b4b5df23f;hpb=88134d551a9911995c013c5ed06a32c2b1044b85;p=xscreensaver

diff --git a/hacks/screenhack.h b/hacks/screenhack.h
index 14e9a16c..158a251f 100644
--- a/hacks/screenhack.h
+++ b/hacks/screenhack.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1992, 1993 Jamie Zawinski <jwz@lucid.com>
+/* xscreensaver, Copyright (c) 1992-2001 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
@@ -9,8 +9,7 @@
  * implied warranty.
  */
 
-#if 0
- * Found in Don Hopkin`s .plan file:
+/* Found in Don Hopkins' .plan file:
  *
  *   The color situation is a total flying circus.  The X approach to
  *   device independence is to treat everything like a MicroVax framebuffer
@@ -33,10 +32,10 @@
  *   WHAT IS YOUR COLORMAP?
  *         cmap = DefaultColormap(display, DefaultScreen(display));
  *   AND WHAT IS YOUR FAVORITE COLOR?
- *         favorite_color = 0; /* Black. */
- *         /* Whoops! No, I mean: */
+ *         favorite_color = 0; / * Black. * /
+ *         / * Whoops! No, I mean: * /
  *         favorite_color = BlackPixel(display, DefaultScreen(display));
- *         /* AAAYYYYEEEEE!! (client dumps core & falls into the chasm) */
+ *         / * AAAYYYYEEEEE!! (client dumps core & falls into the chasm) * /
  *
  *   WHAT IS YOUR DISPLAY?
  *         display = XOpenDisplay("unix:0");
@@ -46,91 +45,62 @@
  *                              8, PseudoColor, &vinfo) != 0)
  *            visual = vinfo.visual;
  *   AND WHAT IS THE NET SPEED VELOCITY OF AN XConfigureWindow REQUEST?
- *         /* Is that a SubStructureRedirectMask or a ResizeRedirectMask? */
- *   WHAT??! HOW AM I SUPPOSED TO KNOW THAT?
+ *         / * Is that a SubStructureRedirectMask or a ResizeRedirectMask? * /
+ *   WHAT?! HOW AM I SUPPOSED TO KNOW THAT?
  *   AAAAUUUGGGHHH!!!! (server dumps core & falls into the chasm)
- *
-#endif /* 0 */
+ */
 
-#ifndef _SCREENHACK_H_
-#define _SCREENHACK_H_
+#ifndef __SCREENHACK_H__
+#define __SCREENHACK_H__
 
-#if __STDC__
 #include <stdlib.h>
+
+#include "config.h"
+
+#ifdef __hpux
+ /* Which of the ten billion standards does values.h belong to?
+    What systems always have it? */
+# include <values.h>
 #endif
 
+#include <stdio.h>
+
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
 #include <X11/Xos.h>
-#include "vroot.h"
+
+/* M_PI ought to have been defined in math.h, but... */
+#ifndef M_PI
+# define M_PI 3.1415926535
+#endif
+
+#ifndef M_PI_2
+# define M_PI_2 1.5707963267
+#endif
+
+#include "yarandom.h"
+#include "usleep.h"
+#include "resources.h"
+#include "hsv.h"
+#include "colors.h"
+#include "grabscreen.h"
+#include "visual.h"
 
 extern Bool mono_p;
 extern char *progname;
 extern char *progclass;
 extern XrmDatabase db;
 extern XrmOptionDescRec options [];
-extern int options_size;
 extern char *defaults [];
 
-#if __STDC__
-# if defined(SVR4) || defined(SYSV)
-#  ifndef random
-    extern int rand (void);
-#   define random() rand()
-#  endif
-#  ifndef srandom
-    extern void srand (unsigned int);
-#   define srandom(i) srand((unsigned int)(i))
-#  endif
-# else /* !totally-losing-SYSV */
-#  ifndef random
-    extern long random (void);
-#  endif
-#  ifndef srandom
-    extern void srandom (int);
-#  endif
-# endif /* !totally-losing-SYSV */
-#endif /* __STDC__ */
-
-#if __STDC__
-# define P(x)x
-#else
-# define P(x)()
-#endif
-
-extern void screenhack P((Display*,Window));
-
-#define usleep screenhack_usleep
-
-extern void screenhack_usleep P((unsigned long));
-extern char *get_string_resource P((char*,char*));
-extern Bool get_boolean_resource P((char*,char*));
-extern int get_integer_resource P((char*,char*));
-extern double get_float_resource P((char*,char*));
-extern unsigned int get_pixel_resource P((char*,char*,Display*,Colormap));
-extern unsigned int get_minutes_resource P((char*,char*));
-extern unsigned int get_seconds_resource P((char*,char*));
-
-extern Visual *get_visual_resource P((Display *, char *, char *));
-extern int get_visual_depth P((Display *, Visual *));
-
-extern void hsv_to_rgb P((int,double,double,unsigned short*,
-			  unsigned short*,unsigned short*));
-extern void rgb_to_hsv P((unsigned short,unsigned short,unsigned short,
-			  int*,double*,double*));
-extern void cycle_hue P((XColor*,int));
-
-extern void make_color_ramp P((int h1, double s1, double v1,
-			       int h2, double s2, double v2,
-			       XColor *pixels, int npixels));
-
-extern Pixmap grab_screen_image P((Display *dpy, Window window, int root_p));
+extern void screenhack (Display*,Window);
+extern void screenhack_handle_event (Display*, XEvent*);
+extern void screenhack_handle_events (Display*);
 
-static double _frand_tmp_;
-#define frand(f)							\
- (_frand_tmp_ = (((double) random()) / 					\
-		 (((double) ((unsigned int)~0)) / ((double) (f+f)))),	\
-  _frand_tmp_ < 0 ? -_frand_tmp_ : _frand_tmp_)
+/* Be Posixly correct */
+#undef  bzero
+#define bzero  __ERROR_use_memset_not_bzero_in_xscreensaver__
+#undef  bcopy
+#define bcopy  __ERROR_use_memcpy_not_bcopy_in_xscreensaver__
 
-#undef P
-#endif /* _SCREENHACK_H_ */
+#endif /* __SCREENHACK_H__ */