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

diff --git a/OSX/XScreenSaverView.h b/OSX/XScreenSaverView.h
index c60dfc8a..cc6867b5 100644
--- a/OSX/XScreenSaverView.h
+++ b/OSX/XScreenSaverView.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2006-2014 Jamie Zawinski <jwz@jwz.org>
+/* 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
@@ -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;
@@ -53,10 +62,8 @@
 
 
 #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
+// Currently only OpenGL backbuffers are supported (OSX and iOS).
+# define BACKBUFFER_OPENGL
 
 @interface XScreenSaverView : ScreenSaverView
 # ifdef USE_IPHONE
@@ -97,6 +104,8 @@
 
   NSDictionary *function_tables;
 
+  id<XScreenSaverViewDelegate> _delegate;
+
 # endif // USE_IPHONE
 
 # ifdef USE_BACKBUFFER
@@ -104,8 +113,22 @@
   CGSize backbuffer_size;	// pixels, not points.
   CGColorSpaceRef colorspace;
 
-#  ifdef BACKBUFFER_CGCONTEXT
-  CGContextRef window_ctx;
+#  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
@@ -115,19 +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)enableBackbuffer:(CGSize)new_backbuffer_size;
 - (void)createBackbuffer:(CGSize)s;
+- (void)drawBackbuffer;
+- (void)flushBackbuffer;
 #endif // USE_BACKBUFFER
 
 @end