X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=OSX%2FXScreenSaverView.h;h=06f0ebe29a4ffd812b542d2830e4d2cd96e929f8;hp=cc6867b573340c16cfa0700cc55b3785e309b18d;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hpb=88cfe534a698a0562e81345957a50714af1453bc

diff --git a/OSX/XScreenSaverView.h b/OSX/XScreenSaverView.h
index cc6867b5..06f0ebe2 100644
--- a/OSX/XScreenSaverView.h
+++ b/OSX/XScreenSaverView.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2006-2015 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2006-2016 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
@@ -61,7 +61,6 @@
 #endif // USE_IPHONE
 
 
-#define USE_BACKBUFFER  // must be in sync with jwxyz.m
 // Currently only OpenGL backbuffers are supported (OSX and iOS).
 # define BACKBUFFER_OPENGL
 
@@ -85,32 +84,25 @@
   fps_state *fpst;
 
 # ifdef USE_IPHONE
-  UIDeviceOrientation orientation, new_orientation;
   BOOL screenLocked;
-
-  CGSize initial_bounds;	// portrait-mode size (pixels, not points).
-	
-  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;	// whether hack requested "always portrait".
+  BOOL _ignoreRotation;		// whether hack requested "always portrait".
 				// some want this, some do not.
-
   NSTimer *crash_timer;
 
   NSDictionary *function_tables;
 
   id<XScreenSaverViewDelegate> _delegate;
 
-# endif // USE_IPHONE
+# else // !USE_PHONE
+
+  NSOpenGLPixelFormat *pixfmt;
+
+# endif // !USE_IPHONE
 
-# ifdef USE_BACKBUFFER
+  NSOpenGLContext *ogl_ctx;      // OpenGL rendering context
+
+# ifdef JWXYZ_QUARTZ
   CGContextRef backbuffer;
-  CGSize backbuffer_size;	// pixels, not points.
   CGColorSpaceRef colorspace;
 
 #  ifdef BACKBUFFER_OPENGL
@@ -119,7 +111,6 @@
 
   GLsizei gl_texture_w, gl_texture_h;
 
-  NSOpenGLContext *ogl_ctx;      // OpenGL rendering context
   GLuint backbuffer_texture;
   GLenum gl_texture_target;
   GLenum gl_pixel_format, gl_pixel_type;
@@ -131,31 +122,43 @@
 #   endif // USE_IPHONE
 #  endif
 
-# endif // USE_BACKBUFFER
+# endif // JWXYZ_QUARTZ
+
+# if defined JWXYZ_GL && defined USE_IPHONE
+  NSOpenGLContext *ogl_ctx_pixmap;
+# endif // JWXYZ_GL && USE_IPHONE
 }
 
 - (id)initWithFrame:(NSRect)frame saverName:(NSString*)n isPreview:(BOOL)p;
 
 - (void) render_x11;
+- (NSOpenGLContext *) oglContext;
 - (void) prepareContext;
 - (NSUserDefaultsController *) userDefaultsController;
 + (NSString *) decompressXML:(NSData *)xml;
 
 #ifdef USE_IPHONE
-- (BOOL)reshapeRotatedWindow;
+- (CGFloat) hackedContentScaleFactor;
 - (void)setScreenLocked:(BOOL)locked;
 - (NSDictionary *)getGLProperties;
 - (void)addExtraRenderbuffers:(CGSize)size;
+- (NSString *)getCAGravity;
+- (void)orientationChanged;
 @property (nonatomic, assign) id<XScreenSaverViewDelegate> delegate;
+@property (nonatomic) BOOL ignoreRotation;
+- (BOOL)suppressRotationAnimation;
+- (BOOL)rotateTouches;
 #else // !USE_IPHONE
 - (NSOpenGLPixelFormat *)getGLPixelFormat;
 #endif // !USE_IPHONE
 
-#ifdef USE_BACKBUFFER
 - (void)enableBackbuffer:(CGSize)new_backbuffer_size;
+- (void)setViewport;
 - (void)createBackbuffer:(CGSize)s;
+- (void)reshape_x11;
+#ifdef JWXYZ_QUARTZ
 - (void)drawBackbuffer;
+#endif // JWXYZ_QUARTZ
 - (void)flushBackbuffer;
-#endif // USE_BACKBUFFER
 
 @end