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

diff --git a/OSX/XScreenSaverView.h b/OSX/XScreenSaverView.h
index dffa58e9..1965ef8e 100644
--- a/OSX/XScreenSaverView.h
+++ b/OSX/XScreenSaverView.h
@@ -29,6 +29,7 @@
 #else
 # import <Cocoa/Cocoa.h>
 # import <ScreenSaver/ScreenSaver.h>
+//# define USE_TOUCHBAR
 #endif
 
 
@@ -68,6 +69,8 @@
 @interface XScreenSaverView : ScreenSaverView
 # ifdef USE_IPHONE
 			      <UIAlertViewDelegate>
+# elif defined(USE_TOUCHBAR)
+			      <NSTouchBarDelegate>
 # endif
 {
   struct xscreensaver_function_table *xsft;
@@ -85,6 +88,8 @@
   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;
   BOOL _ignoreRotation;		// whether hack requested "always portrait".
@@ -106,6 +111,11 @@
 
 # endif // !USE_IPHONE
 
+# ifdef USE_TOUCHBAR
+  XScreenSaverView *touchbar_view;
+  BOOL touchbar_p;
+# endif
+
   NSOpenGLContext *ogl_ctx;      // OpenGL rendering context
 
 # ifdef JWXYZ_QUARTZ
@@ -144,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;