X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=OSX%2FXScreenSaverView.h;h=b54685079a2ac9ca36ceb221da324da9e6a38867;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=0fe2046c0d4de0a3df3cf1b616ee82378b02737a;hpb=c141c2b05e374757b6499d12bb8a6d4d943b1529;p=xscreensaver

diff --git a/OSX/XScreenSaverView.h b/OSX/XScreenSaverView.h
index 0fe2046c..b5468507 100644
--- a/OSX/XScreenSaverView.h
+++ b/OSX/XScreenSaverView.h
@@ -1,13 +1,13 @@
-/* xscreensaver, Copyright (c) 2006-2012 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
-* the above copyright notice appear in all copies and that both that
-* copyright notice and this permission notice appear in supporting
-* documentation.  No representations are made about the suitability of this
-* software for any purpose.  It is provided "as is" without express or 
-* implied warranty.
-*/
+/* xscreensaver, Copyright (c) 2006-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
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation.  No representations are made about the suitability of this
+ * software for any purpose.  It is provided "as is" without express or 
+ * implied warranty.
+ */
 
 /* This is a subclass of Apple's ScreenSaverView that knows how to run
    xscreensaver programs without X11 via the dark magic of the "jwxyz"
@@ -52,10 +52,11 @@
 #endif // USE_IPHONE
 
 
-#ifdef USE_IPHONE
-# define USE_BACKBUFFER  /* must be in sync with jwxyz.h */
-#endif
+#define USE_BACKBUFFER  // must be in sync with jwxyz.m
 
+// If USE_BACKBUFFER is enabled, one of these must also be enabled.
+// #define BACKBUFFER_CGCONTEXT   // Not supported by iOS.
+#define BACKBUFFER_CALAYER
 
 @interface XScreenSaverView : ScreenSaverView
 # ifdef USE_IPHONE
@@ -78,25 +79,34 @@
 
 # ifdef USE_IPHONE
   UIDeviceOrientation orientation, new_orientation;
-  double tap_time;
-  CGPoint tap_point;
   BOOL screenLocked;
 
+  CGSize initial_bounds;
+	
   GLfloat rotation_ratio;	// ratio thru rotation anim, or -1
   NSSize rot_from, rot_to;	// start size rect, end size rect
   GLfloat angle_from, angle_to;	// start angle, end angle
   double rot_start_time;
+  BOOL ignore_rotation_p;
 
   NSSize rot_current_size;
   GLfloat rot_current_angle;
 
   NSTimer *crash_timer;
 
+  NSDictionary *function_tables;
+
 # endif // USE_IPHONE
 
 # ifdef USE_BACKBUFFER
   CGContextRef backbuffer;
   CGSize backbuffer_size;
+  CGColorSpaceRef colorspace;
+
+#  ifdef BACKBUFFER_CGCONTEXT
+  CGContextRef window_ctx;
+#  endif
+
 # endif // USE_BACKBUFFER
 }
 
@@ -106,6 +116,7 @@
 - (void) prepareContext;
 - (void) resizeContext;
 - (NSUserDefaultsController *) userDefaultsController;
++ (NSString *) decompressXML:(NSData *)xml;
 
 #ifdef USE_IPHONE
 - (void)didRotate:(NSNotification *)notification;