X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=OSX%2FXScreenSaverView.h;h=fe568efe5facb733367afbb7134ca609195e3937;hp=6902c559ea749aac3708edcd55eb67b748ffee8c;hb=2762a7d7cf8d83e68b8f635941f6609119d630ae;hpb=4ade52359b6eba3621566dac79793a33aa4c915f diff --git a/OSX/XScreenSaverView.h b/OSX/XScreenSaverView.h index 6902c559..fe568efe 100644 --- a/OSX/XScreenSaverView.h +++ b/OSX/XScreenSaverView.h @@ -52,10 +52,8 @@ #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 +#define USE_CALAYER // requires USE_BACKBUFFER; required by iOS. @interface XScreenSaverView : ScreenSaverView # ifdef USE_IPHONE @@ -82,6 +80,8 @@ CGPoint tap_point; BOOL screenLocked; + 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 @@ -100,6 +100,12 @@ # ifdef USE_BACKBUFFER CGContextRef backbuffer; CGSize backbuffer_size; + CGColorSpaceRef colorspace; + +# ifndef USE_CALAYER + CGContextRef window_ctx; +# endif + # endif // USE_BACKBUFFER } @@ -109,6 +115,7 @@ - (void) prepareContext; - (void) resizeContext; - (NSUserDefaultsController *) userDefaultsController; ++ (NSString *) decompressXML:(NSData *)xml; #ifdef USE_IPHONE - (void)didRotate:(NSNotification *)notification;