Disable macOS' native full screen

It clashes with the method used by FLTK and gives very unreliable behaviour.
TigerVNC · Jan 22, 2025 · f5b42e4 · f5b42e4
1 parent e3e4848
commit f5b42e4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/vncviewer/DesktopWindow.cxx b/vncviewer/DesktopWindow.cxx
@@ -1,5 +1,5 @@
 /* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
- * Copyright 2011 Pierre Ossman <ossman@cendio.se> for Cendio AB
+ * Copyright 2011-2025 Pierre Ossman <ossman@cendio.se> for Cendio AB
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -199,6 +199,11 @@ DesktopWindow::DesktopWindow(int w, int h, const char *name,
 
   show();
 
+#ifdef __APPLE__
+  // FLTK does its own full screen, so disable the system one
+  cocoa_prevent_native_fullscreen(this);
+#endif
+
   // Full screen events are not sent out for a hidden window,
   // so send a fake one here to set up things properly.
   if (fullscreen_active())

diff --git a/vncviewer/cocoa.h b/vncviewer/cocoa.h
@@ -1,4 +1,4 @@
-/* Copyright 2011 Pierre Ossman <ossman@cendio.se> for Cendio AB
+/* Copyright 2011-2025 Pierre Ossman <ossman@cendio.se> for Cendio AB
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
 
 class Fl_Window;
 
+void cocoa_prevent_native_fullscreen(Fl_Window *win);
+
 int cocoa_get_level(Fl_Window *win);
 void cocoa_set_level(Fl_Window *win, int level);
 

diff --git a/vncviewer/cocoa.mm b/vncviewer/cocoa.mm
@@ -1,4 +1,4 @@
-/* Copyright 2011 Pierre Ossman <ossman@cendio.se> for Cendio AB
+/* Copyright 2011-2025 Pierre Ossman <ossman@cendio.se> for Cendio AB
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +30,16 @@
 
 static bool captured = false;
 
+void cocoa_prevent_native_fullscreen(Fl_Window *win)
+{
+  NSWindow *nsw;
+  nsw = (NSWindow*)fl_xid(win);
+  assert(nsw);
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 100700
+  nsw.collectionBehavior |= NSWindowCollectionBehaviorFullScreenNone;
+#endif
+}
+
 int cocoa_get_level(Fl_Window *win)
 {
   NSWindow *nsw;