X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utils%2Fresources.h;h=231fe23090441e23d8f9c2355d62e6aadc7258a6;hb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;hp=14ce1acb617b04f8fb9bc01c1029d12eb17e0f3c;hpb=df7adbee81405e2849728a24b498ad2117784b1f;p=xscreensaver

diff --git a/utils/resources.h b/utils/resources.h
index 14ce1acb..231fe230 100644
--- a/utils/resources.h
+++ b/utils/resources.h
@@ -1,4 +1,5 @@
-/* xscreensaver, Copyright (c) 1992, 1997 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1992, 1997, 2001, 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
@@ -12,13 +13,21 @@
 #ifndef __XSCREENSAVER_RESOURCES_H__
 #define __XSCREENSAVER_RESOURCES_H__
 
-extern char *get_string_resource (char*,char*);
-extern Bool get_boolean_resource (char*,char*);
-extern int get_integer_resource (char*,char*);
-extern double get_float_resource (char*,char*);
-extern unsigned int get_pixel_resource (char*,char*,Display*,Colormap);
-extern unsigned int get_minutes_resource (char*,char*);
-extern unsigned int get_seconds_resource (char*,char*);
-extern int parse_time (char *string, Bool seconds_default_p, Bool silent_p);
+extern char *get_string_resource (Display*,char*,char*);
+extern Bool get_boolean_resource (Display*,char*,char*);
+extern int get_integer_resource (Display*,char*,char*);
+extern double get_float_resource (Display*,char*,char*);
+extern unsigned int get_pixel_resource (Display*,Colormap,char*,char*);
+extern unsigned int get_minutes_resource (Display*,char*,char*);
+extern unsigned int get_seconds_resource (Display*,char*,char*);
+extern int parse_time (const char *string, Bool seconds_default_p,
+                       Bool silent_p);
+extern Pixmap
+xscreensaver_logo (Screen *screen, Visual *visual,
+                   Drawable drawable, Colormap cmap,
+                   unsigned long background_color,
+                   unsigned long **pixels_ret, int *npixels_ret,
+                   Pixmap *mask_ret,
+                   Bool big_p);
 
 #endif /* __XSCREENSAVER_RESOURCES_H__ */