X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=OSX%2FXScreenSaverView.h;h=cc6867b573340c16cfa0700cc55b3785e309b18d;hb=d1ae2829ff0fd2a96c16a0c8c5420efaa47d7b30;hp=6902c559ea749aac3708edcd55eb67b748ffee8c;hpb=4ade52359b6eba3621566dac79793a33aa4c915f;p=xscreensaver

diff --git a/OSX/XScreenSaverView.h b/OSX/XScreenSaverView.h
index 6902c559..cc6867b5 100644
--- a/OSX/XScreenSaverView.h
+++ b/OSX/XScreenSaverView.h
@@ -1,13 +1,13 @@
-/* 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
-* 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-2015 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"
@@ -25,6 +25,7 @@
 # define NSImage UIImage
 # define NSEvent UIEvent
 # define NSWindow UIWindow
+# define NSOpenGLContext EAGLContext
 #else
 # import <Cocoa/Cocoa.h>
 # import <ScreenSaver/ScreenSaver.h>
@@ -35,6 +36,14 @@
 #import "PrefsReader.h"
 
 #ifdef USE_IPHONE
+
+@class XScreenSaverView;
+
+@protocol XScreenSaverViewDelegate
+- (void) wantsFadeOut:(XScreenSaverView *)saverView;
+- (void) didShake:(XScreenSaverView *)saverView;
+@end
+
 @interface ScreenSaverView : NSView
 - (id)initWithFrame:(NSRect)frame isPreview:(BOOL)isPreview;
 - (NSTimeInterval)animationTimeInterval;
@@ -52,10 +61,9 @@
 #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
+// Currently only OpenGL backbuffers are supported (OSX and iOS).
+# define BACKBUFFER_OPENGL
 
 @interface XScreenSaverView : ScreenSaverView
 # ifdef USE_IPHONE
@@ -78,28 +86,51 @@
 
 # ifdef USE_IPHONE
   UIDeviceOrientation orientation, new_orientation;
-  double tap_time;
-  CGPoint tap_point;
   BOOL screenLocked;
 
-  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
+  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;
 
-  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;
 
   NSDictionary *function_tables;
 
+  id<XScreenSaverViewDelegate> _delegate;
+
 # endif // USE_IPHONE
 
 # ifdef USE_BACKBUFFER
   CGContextRef backbuffer;
-  CGSize backbuffer_size;
+  CGSize backbuffer_size;	// pixels, not points.
+  CGColorSpaceRef colorspace;
+
+#  ifdef BACKBUFFER_OPENGL
+  void *backbuffer_data;
+  size_t backbuffer_len;
+
+  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;
+#   ifndef USE_IPHONE
+  BOOL double_buffered_p, gl_apple_client_storage_p;
+#   else // USE_IPHONE
+  BOOL gl_limited_npot_p;
+  GLuint gl_framebuffer, gl_renderbuffer;
+#   endif // USE_IPHONE
+#  endif
+
 # endif // USE_BACKBUFFER
 }
 
@@ -107,17 +138,24 @@
 
 - (void) render_x11;
 - (void) prepareContext;
-- (void) resizeContext;
 - (NSUserDefaultsController *) userDefaultsController;
++ (NSString *) decompressXML:(NSData *)xml;
 
 #ifdef USE_IPHONE
-- (void)didRotate:(NSNotification *)notification;
+- (BOOL)reshapeRotatedWindow;
 - (void)setScreenLocked:(BOOL)locked;
-#endif // USE_IPHONE
+- (NSDictionary *)getGLProperties;
+- (void)addExtraRenderbuffers:(CGSize)size;
+@property (nonatomic, assign) id<XScreenSaverViewDelegate> delegate;
+#else // !USE_IPHONE
+- (NSOpenGLPixelFormat *)getGLPixelFormat;
+#endif // !USE_IPHONE
 
 #ifdef USE_BACKBUFFER
-- (void)initLayer;
-- (void)createBackbuffer;
+- (void)enableBackbuffer:(CGSize)new_backbuffer_size;
+- (void)createBackbuffer:(CGSize)s;
+- (void)drawBackbuffer;
+- (void)flushBackbuffer;
 #endif // USE_BACKBUFFER
 
 @end