-/* xscreensaver, Copyright (c) 2001-2013 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2001-2014 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
#include <stdio.h>
#include <string.h>
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
# include "jwxyz.h"
-#else /* !HAVE_COCOA - real Xlib */
+#else /* real Xlib */
# include <X11/Xlib.h>
# include <X11/Xutil.h>
-#endif /* !HAVE_COCOA */
+#endif /* !HAVE_JWXYZ */
#include "minixpm.h"
r = g = b = -1;
line += 4;
}
+ else if (!strncasecmp(line, "white", 5))
+ {
+ r = g = b = 255;
+ line += 5;
+ }
+ else if (!strncasecmp(line, "black", 5))
+ {
+ r = g = b = 0;
+ line += 5;
+ }
else
{
if (*line != '#') {