X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utils%2Fresources.h;h=cbfc8d16a8bdf17c13a845cea47cf8413a8d5e18;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=9e1f6cebc5099166720e1ff1e996c49bdc6811b2;hpb=585e1a6717d1dd9b90fbb53acaaae82106354d33;p=xscreensaver

diff --git a/utils/resources.h b/utils/resources.h
index 9e1f6ceb..cbfc8d16 100644
--- a/utils/resources.h
+++ b/utils/resources.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1992, 1997, 2001 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1992-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
@@ -12,20 +12,30 @@
 #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 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 (Display *dpy, Window window, Colormap cmap,
+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);
 
+
+/* A utility function for event-handler functions:
+   Returns True if the event is a simple click, Space, Tab, etc.
+   Returns False otherwise.
+   The idea here is that most hacks interpret to clicks or basic
+   keypresses as "change it up".
+ */
+extern Bool screenhack_event_helper (Display *, Window, XEvent *);
+
 #endif /* __XSCREENSAVER_RESOURCES_H__ */