X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=OSX%2FXScreenSaverView.h;h=dffa58e97081deb37ad6cadf471e75146a34afb7;hp=06f0ebe29a4ffd812b542d2830e4d2cd96e929f8;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hpb=d6b0217f2417bd19187f0ebc389d6c5c2233b11c

diff --git a/OSX/XScreenSaverView.h b/OSX/XScreenSaverView.h
index 06f0ebe2..dffa58e9 100644
--- a/OSX/XScreenSaverView.h
+++ b/OSX/XScreenSaverView.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2006-2016 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2006-2017 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
@@ -42,6 +42,7 @@
 @protocol XScreenSaverViewDelegate
 - (void) wantsFadeOut:(XScreenSaverView *)saverView;
 - (void) didShake:(XScreenSaverView *)saverView;
+- (void) openPreferences: (NSString *)which;
 @end
 
 @interface ScreenSaverView : NSView
@@ -82,6 +83,7 @@
   Window xwindow;
   void *xdata;
   fps_state *fpst;
+  void (*fps_cb) (Display *, Window, fps_state *, void *);
 
 # ifdef USE_IPHONE
   BOOL screenLocked;
@@ -93,6 +95,11 @@
 
   id<XScreenSaverViewDelegate> _delegate;
 
+  UIView *closeBox;
+  NSTimer *closeBoxTimer;
+
+  CGAffineTransform pinch_transform;
+
 # else // !USE_PHONE
 
   NSOpenGLPixelFormat *pixfmt;
@@ -107,7 +114,7 @@
 
 #  ifdef BACKBUFFER_OPENGL
   void *backbuffer_data;
-  size_t backbuffer_len;
+  GLsizei backbuffer_len;
 
   GLsizei gl_texture_w, gl_texture_h;