projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.39.tar.gz
[xscreensaver]
/
OSX
/
XScreenSaverView.h
diff --git
a/OSX/XScreenSaverView.h
b/OSX/XScreenSaverView.h
index dffa58e97081deb37ad6cadf471e75146a34afb7..1965ef8e95c2ece05b11b2e02d1c4003647559bb 100644
(file)
--- a/
OSX/XScreenSaverView.h
+++ b/
OSX/XScreenSaverView.h
@@
-29,6
+29,7
@@
#else
# import <Cocoa/Cocoa.h>
# import <ScreenSaver/ScreenSaver.h>
#else
# import <Cocoa/Cocoa.h>
# import <ScreenSaver/ScreenSaver.h>
+//# define USE_TOUCHBAR
#endif
#endif
@@
-68,6
+69,8
@@
@interface XScreenSaverView : ScreenSaverView
# ifdef USE_IPHONE
<UIAlertViewDelegate>
@interface XScreenSaverView : ScreenSaverView
# ifdef USE_IPHONE
<UIAlertViewDelegate>
+# elif defined(USE_TOUCHBAR)
+ <NSTouchBarDelegate>
# endif
{
struct xscreensaver_function_table *xsft;
# endif
{
struct xscreensaver_function_table *xsft;
@@
-85,6
+88,8
@@
fps_state *fpst;
void (*fps_cb) (Display *, Window, fps_state *, void *);
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".
# ifdef USE_IPHONE
BOOL screenLocked;
BOOL _ignoreRotation; // whether hack requested "always portrait".
@@
-106,6
+111,11
@@
# endif // !USE_IPHONE
# endif // !USE_IPHONE
+# ifdef USE_TOUCHBAR
+ XScreenSaverView *touchbar_view;
+ BOOL touchbar_p;
+# endif
+
NSOpenGLContext *ogl_ctx; // OpenGL rendering context
# ifdef JWXYZ_QUARTZ
NSOpenGLContext *ogl_ctx; // OpenGL rendering context
# ifdef JWXYZ_QUARTZ
@@
-144,8
+154,9
@@
- (NSUserDefaultsController *) userDefaultsController;
+ (NSString *) decompressXML:(NSData *)xml;
- (NSUserDefaultsController *) userDefaultsController;
+ (NSString *) decompressXML:(NSData *)xml;
-#ifdef USE_IPHONE
- (CGFloat) hackedContentScaleFactor;
- (CGFloat) hackedContentScaleFactor;
+
+#ifdef USE_IPHONE
- (void)setScreenLocked:(BOOL)locked;
- (NSDictionary *)getGLProperties;
- (void)addExtraRenderbuffers:(CGSize)size;
- (void)setScreenLocked:(BOOL)locked;
- (NSDictionary *)getGLProperties;
- (void)addExtraRenderbuffers:(CGSize)size;