summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2014-12-01 18:05:30 +0100
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2014-12-01 18:05:30 +0100
commit586c9e71554914daf7f60c4610c4ef4e85c274eb (patch)
tree6a3ff2b90f1a970e0e37d50b2222b3c8588e3201 /video
parent1c0920a8dd73105874a6aadcd35bec5814123709 (diff)
downloadmpv-586c9e71554914daf7f60c4610c4ef4e85c274eb.tar.bz2
mpv-586c9e71554914daf7f60c4610c4ef4e85c274eb.tar.xz
cocoa: allow to black out other display when going fs
fixes #1302
Diffstat (limited to 'video')
-rw-r--r--video/out/cocoa/events_view.m2
-rw-r--r--video/out/cocoa/mpvadapter.h1
-rw-r--r--video/out/cocoa_common.m5
3 files changed, 7 insertions, 1 deletions
diff --git a/video/out/cocoa/events_view.m b/video/out/cocoa/events_view.m
index c3e626b0fe..8e96ac1244 100644
--- a/video/out/cocoa/events_view.m
+++ b/video/out/cocoa/events_view.m
@@ -67,7 +67,7 @@
popts |= NSApplicationPresentationAutoHideDock;
NSDictionary *fsopts = @{
- NSFullScreenModeAllScreens : @NO,
+ NSFullScreenModeAllScreens : @([self.adapter fsModeAllScreens]),
NSFullScreenModeApplicationPresentationOptions : @(popts)
};
diff --git a/video/out/cocoa/mpvadapter.h b/video/out/cocoa/mpvadapter.h
index 8829abd096..f54c26593f 100644
--- a/video/out/cocoa/mpvadapter.h
+++ b/video/out/cocoa/mpvadapter.h
@@ -33,5 +33,6 @@
- (BOOL)keyboardEnabled;
- (BOOL)mouseEnabled;
- (NSScreen *)fsScreen;
+- (BOOL)fsModeAllScreens;
@property(nonatomic, assign) struct vo *vout;
@end
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 4ac6433f84..83c006d86f 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -795,6 +795,11 @@ void *vo_cocoa_cgl_pixel_format(struct vo *vo)
return s->fs_screen;
}
+- (BOOL)fsModeAllScreens
+{
+ return self.vout->opts->fs_black_out_screens;
+}
+
- (void)handleFilesArray:(NSArray *)files
{
[[EventsResponder sharedInstance] handleFilesArray:files];