X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=OSX%2FXScreenSaverView.h;h=c60dfc8a1129a8f2a2f22a24387b81d1d261f78c;hb=7edd66e6bd3209013ee059819747b10b5835635b;hp=ffb9327dbf2e5fc6cad291e35e5b77a4d8b3e085;hpb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;p=xscreensaver

diff --git a/OSX/XScreenSaverView.h b/OSX/XScreenSaverView.h
index ffb9327d..c60dfc8a 100644
--- a/OSX/XScreenSaverView.h
+++ b/OSX/XScreenSaverView.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2006-2013 Jamie Zawinski <jwz@jwz.org>
+/* 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
@@ -53,7 +53,10 @@
 
 
 #define USE_BACKBUFFER  // must be in sync with jwxyz.m
-#define USE_CALAYER     // requires USE_BACKBUFFER; required by iOS.
+
+// 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
@@ -76,20 +79,19 @@
 
 # ifdef USE_IPHONE
   UIDeviceOrientation orientation, new_orientation;
-  double tap_time;
-  CGPoint tap_point;
   BOOL screenLocked;
 
-  CGSize initial_bounds;
+  CGSize initial_bounds;	// portrait-mode size (pixels, not points).
 	
-  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
+  GLfloat rotation_ratio;	// ratio [0-1] thru rotation anim, or -1
+  NSSize rot_current_size;	// intermediate or at-rest orientation.
+  NSSize rot_from, rot_to;	// start/end size rect (pixels, not points)
+  GLfloat rot_current_angle;	// only right angles when rotation complete.
+  GLfloat angle_from, angle_to;	// start angle, end angle (degrees)
   double rot_start_time;
-  BOOL ignore_rotation_p;
 
-  NSSize rot_current_size;
-  GLfloat rot_current_angle;
+  BOOL ignore_rotation_p;	// whether hack requested "always portrait".
+				// some want this, some do not.
 
   NSTimer *crash_timer;
 
@@ -99,10 +101,10 @@
 
 # ifdef USE_BACKBUFFER
   CGContextRef backbuffer;
-  CGSize backbuffer_size;
+  CGSize backbuffer_size;	// pixels, not points.
   CGColorSpaceRef colorspace;
 
-#  ifndef USE_CALAYER
+#  ifdef BACKBUFFER_CGCONTEXT
   CGContextRef window_ctx;
 #  endif
 
@@ -119,12 +121,13 @@
 
 #ifdef USE_IPHONE
 - (void)didRotate:(NSNotification *)notification;
+- (BOOL)reshapeRotatedWindow;
 - (void)setScreenLocked:(BOOL)locked;
 #endif // USE_IPHONE
 
 #ifdef USE_BACKBUFFER
 - (void)initLayer;
-- (void)createBackbuffer;
+- (void)createBackbuffer:(CGSize)s;
 #endif // USE_BACKBUFFER
 
 @end