X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=OSX%2FXScreenSaverView.h;h=fe568efe5facb733367afbb7134ca609195e3937;hb=2762a7d7cf8d83e68b8f635941f6609119d630ae;hp=7365b9d82080e0566111c4ccdfb95f502215aaf8;hpb=6f5482d73adb0165c0130bb47d852644ab0c4869;p=xscreensaver

diff --git a/OSX/XScreenSaverView.h b/OSX/XScreenSaverView.h
index 7365b9d8..fe568efe 100644
--- a/OSX/XScreenSaverView.h
+++ b/OSX/XScreenSaverView.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2006-2012 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2006-2013 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
@@ -52,6 +52,9 @@
 #endif // USE_IPHONE
 
 
+#define USE_BACKBUFFER  // must be in sync with jwxyz.m
+#define USE_CALAYER     // requires USE_BACKBUFFER; required by iOS.
+
 @interface XScreenSaverView : ScreenSaverView
 # ifdef USE_IPHONE
 			      <UIAlertViewDelegate>
@@ -77,21 +80,33 @@
   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;
 
-  CGContextRef backbuffer;
-  NSSize backbuffer_size;
-
   NSTimer *crash_timer;
 
+  NSDictionary *function_tables;
+
 # endif // USE_IPHONE
 
+# ifdef USE_BACKBUFFER
+  CGContextRef backbuffer;
+  CGSize backbuffer_size;
+  CGColorSpaceRef colorspace;
+
+#  ifndef USE_CALAYER
+  CGContextRef window_ctx;
+#  endif
+
+# endif // USE_BACKBUFFER
 }
 
 - (id)initWithFrame:(NSRect)frame saverName:(NSString*)n isPreview:(BOOL)p;
@@ -100,11 +115,16 @@
 - (void) prepareContext;
 - (void) resizeContext;
 - (NSUserDefaultsController *) userDefaultsController;
++ (NSString *) decompressXML:(NSData *)xml;
 
 #ifdef USE_IPHONE
 - (void)didRotate:(NSNotification *)notification;
 - (void)setScreenLocked:(BOOL)locked;
-- (void)createBackbuffer;
 #endif // USE_IPHONE
 
+#ifdef USE_BACKBUFFER
+- (void)initLayer;
+- (void)createBackbuffer;
+#endif // USE_BACKBUFFER
+
 @end