/* bubbles.h - definitions for bubbles screensaver */
-/* $Id: bubbles.h,v 1.4 2002/01/17 02:16:04 jwz Exp $ */
+/* $Id: bubbles.h,v 1.6 2006/02/25 20:11:57 jwz Exp $ */
#ifndef _BUBBLES_H_
#define _BUBBLES_H_
+#ifdef HAVE_JWXYZ
+# include "jwxyz.h"
+#else
+# include <X11/Xlib.h>
+#endif
+
/***************************************************************************
* Options you might like to change to affect the program's behaviour *
***************************************************************************/
* better name...)
*/
-#if defined(HAVE_GDK_PIXBUF) || defined(HAVE_XPM)
struct bub_step {
int radius;
long area;
};
typedef struct bub_step Bubble_Step;
-#endif /* HAVE_XPM || HAVE_GDK_PIXBUF */
-
-/* Make sure default bubble isn't compiled when we don't have XPM
-Disable file I/O code too. */
-#if !defined(HAVE_XPM) && !defined(HAVE_GDK_PIXBUF)
-# define NO_DEFAULT_BUBBLE
-# undef BUBBLES_IO
-#endif /* !HAVE_XPM && !HAVE_GDK_PIXBUF */
-
-/* Make sure default bubble is compiled in when we have XPM and no file I/O */
-#if defined(HAVE_XPM) || defined(HAVE_GDK_PIXBUF)
-# ifndef BUBBLES_IO
-# undef NO_DEFAULT_BUBBLE
-# endif /* BUBBLES_IO */
-#endif /* HAVE_XPM || HAVE_GDK_PIXBUF */
+
+extern void init_default_bubbles(void);
+extern int num_default_bubbles;
+typedef struct { const unsigned char *png; unsigned long size; } bubble_png;
+extern bubble_png default_bubbles[];
#endif /* _BUBBLES_H_ */