X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=OSX%2FXScreenSaverView.h;h=1965ef8e95c2ece05b11b2e02d1c4003647559bb;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hp=06f0ebe29a4ffd812b542d2830e4d2cd96e929f8;hpb=aa75c7476aeaa84cf3abc192b376a8b03c325213;p=xscreensaver

diff --git a/OSX/XScreenSaverView.h b/OSX/XScreenSaverView.h
index 06f0ebe2..1965ef8e 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
@@ -29,6 +29,7 @@
 #else
 # import <Cocoa/Cocoa.h>
 # import <ScreenSaver/ScreenSaver.h>
+//# define USE_TOUCHBAR
 #endif
 
 
@@ -42,6 +43,7 @@
 @protocol XScreenSaverViewDelegate
 - (void) wantsFadeOut:(XScreenSaverView *)saverView;
 - (void) didShake:(XScreenSaverView *)saverView;
+- (void) openPreferences: (NSString *)which;
 @end
 
 @interface ScreenSaverView : NSView
@@ -67,6 +69,8 @@
 @interface XScreenSaverView : ScreenSaverView
 # ifdef USE_IPHONE
 			      <UIAlertViewDelegate>
+# elif defined(USE_TOUCHBAR)
+			      <NSTouchBarDelegate>
 # endif
 {
   struct xscreensaver_function_table *xsft;
@@ -82,6 +86,9 @@
   Window xwindow;
   void *xdata;
   fps_state *fpst;
+  void (*fps_cb) (Display *, Window, fps_state *, void *);
+
+  BOOL _lowrez_p;		// Whether the saver prefers 1990s pixels.
 
 # ifdef USE_IPHONE
   BOOL screenLocked;
@@ -93,12 +100,22 @@
 
   id<XScreenSaverViewDelegate> _delegate;
 
+  UIView *closeBox;
+  NSTimer *closeBoxTimer;
+
+  CGAffineTransform pinch_transform;
+
 # else // !USE_PHONE
 
   NSOpenGLPixelFormat *pixfmt;
 
 # endif // !USE_IPHONE
 
+# ifdef USE_TOUCHBAR
+  XScreenSaverView *touchbar_view;
+  BOOL touchbar_p;
+# endif
+
   NSOpenGLContext *ogl_ctx;      // OpenGL rendering context
 
 # ifdef JWXYZ_QUARTZ
@@ -107,7 +124,7 @@
 
 #  ifdef BACKBUFFER_OPENGL
   void *backbuffer_data;
-  size_t backbuffer_len;
+  GLsizei backbuffer_len;
 
   GLsizei gl_texture_w, gl_texture_h;
 
@@ -137,8 +154,9 @@
 - (NSUserDefaultsController *) userDefaultsController;
 + (NSString *) decompressXML:(NSData *)xml;
 
-#ifdef USE_IPHONE
 - (CGFloat) hackedContentScaleFactor;
+
+#ifdef USE_IPHONE
 - (void)setScreenLocked:(BOOL)locked;
 - (NSDictionary *)getGLProperties;
 - (void)addExtraRenderbuffers:(CGSize)size;