X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=OSX%2FXScreenSaverView.h;h=06f0ebe29a4ffd812b542d2830e4d2cd96e929f8;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=5ca2fb8b49137106df4f0d84cc247b0159b94381;hpb=8afc01a67be4fbf3f1cc0fce9adf01b5289a21c6;p=xscreensaver diff --git a/OSX/XScreenSaverView.h b/OSX/XScreenSaverView.h index 5ca2fb8b..06f0ebe2 100644 --- a/OSX/XScreenSaverView.h +++ b/OSX/XScreenSaverView.h @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 2006-2013 Jamie Zawinski +/* xscreensaver, Copyright (c) 2006-2016 Jamie Zawinski * * 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 # import @@ -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,11 +61,8 @@ #endif // USE_IPHONE -#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 @@ -78,56 +84,81 @@ fps_state *fpst; # ifdef USE_IPHONE - UIDeviceOrientation orientation, new_orientation; - double tap_time; - CGPoint tap_point; BOOL screenLocked; + BOOL _ignoreRotation; // whether hack requested "always portrait". + // some want this, some do not. + NSTimer *crash_timer; - 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; + NSDictionary *function_tables; - NSSize rot_current_size; - GLfloat rot_current_angle; + id _delegate; - NSTimer *crash_timer; +# else // !USE_PHONE - NSDictionary *function_tables; + NSOpenGLPixelFormat *pixfmt; + +# endif // !USE_IPHONE -# endif // USE_IPHONE + NSOpenGLContext *ogl_ctx; // OpenGL rendering context -# ifdef USE_BACKBUFFER +# ifdef JWXYZ_QUARTZ CGContextRef backbuffer; - CGSize backbuffer_size; 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; + + 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 +# 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; -- (void) resizeContext; - (NSUserDefaultsController *) userDefaultsController; + (NSString *) decompressXML:(NSData *)xml; #ifdef USE_IPHONE -- (void)didRotate:(NSNotification *)notification; +- (CGFloat) hackedContentScaleFactor; - (void)setScreenLocked:(BOOL)locked; -#endif // USE_IPHONE - -#ifdef USE_BACKBUFFER -- (void)initLayer; -- (void)createBackbuffer; -#endif // USE_BACKBUFFER +- (NSDictionary *)getGLProperties; +- (void)addExtraRenderbuffers:(CGSize)size; +- (NSString *)getCAGravity; +- (void)orientationChanged; +@property (nonatomic, assign) id delegate; +@property (nonatomic) BOOL ignoreRotation; +- (BOOL)suppressRotationAnimation; +- (BOOL)rotateTouches; +#else // !USE_IPHONE +- (NSOpenGLPixelFormat *)getGLPixelFormat; +#endif // !USE_IPHONE + +- (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; @end