From http://www.jwz.org/xscreensaver/xscreensaver-5.31.tar.gz

[xscreensaver] / OSX / SaverRunner.h

diff --git a/OSX/SaverRunner.h b/OSX/SaverRunner.h
index 541bb2cf9261f1c448a876d3d115a55b58c5f1c9..35d22354761c410b581fa2489d3c394598b12e28 100644 (file)
--- a/OSX/SaverRunner.h
+++ b/OSX/SaverRunner.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2006-2012 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2006-2014 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
@@ -33,10 +33,6 @@
 
 @class ScreenSaverView;
 
-#ifdef USE_IPHONE
-# import "SaverListController.h"
-#endif
-
 @interface SaverRunner : NSObject
 {
   NSString *saverName;         // the one currently loaded
@@ -48,30 +44,38 @@
   NSBundle *saverBundle;
   NSArray  *windows;
   IBOutlet NSMenu *menubar;
+  NSTimer *anim_timer;
 
 # else  // USE_IPHONE
 
-  ScreenSaverView *saverView;
-  UINavigationController *rootViewController;
+  UINavigationController *rotating_nav;                // Hierarchy 1 (UI)
   IBOutlet UIWindow *window;
+  IBOutlet UIView *view;
+
+  UINavigationController *nonrotating_nav;     // Hierarchy 2 (savers)
+  UIWindow *saverWindow;
+  UIView *backgroundView;
+  ScreenSaverView *saverView;
+
   EAGLContext *eagl_ctx;
   GLuint gl_framebuffer, gl_renderbuffer;
-  IBOutlet UIView *view;
-  SaverListController *listController;
   UIImage *saved_screenshot;
+  UIView *aboutBox;
+  NSTimer *splashTimer;
 
 # endif // USE_IPHONE
 }
 
-- (void) aboutPanel: (id)sender;
-- (void) openPreferences: (id)sender;
-- (void)loadSaver:(NSString *)name launch:(BOOL)launch;
+- (void) loadSaver: (NSString *)name launch:(BOOL)launch;
 - (void) loadSaver: (NSString *)name;
-- (void)selectedSaverDidChange:(NSDictionary *)change;
+- (void) selectedSaverDidChange:(NSDictionary *)change;
+- (void) aboutPanel: (id)sender;
 
-#ifdef USE_IPHONE
-- (void) loadSaverMenu: (id)sender;
+#ifndef USE_IPHONE
+- (void) openPreferences: (id)sender;
+#else  // USE_IPHONE
+- (void) openPreferences: (NSString *)which;
 - (UIImage *) screenshot;
-#endif
+#endif // USE_IPHONE
 
 @end