Merge pull request #732 from arlyon/osx-fullscreen

Add platform-specific code to enable native fullscreen mode on OSX

runelite-client/src/main/java/net/runelite/client/Notifier.java

@@ -33,49 +33,22 @@ import java.util.ArrayList;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import net.runelite.client.config.RuneLiteConfig;
+import net.runelite.client.util.OSType;
 
 @Slf4j
 public class Notifier
 {
-	private enum OSType
-	{
-		Windows, MacOS, Linux, Other
-	}
 
 	// Default timeout of notification in milliseconds
 	private static final int DEFAULT_TIMEOUT = 10000;
 	private static final String DOUBLE_QUOTE = "\"";
 	private static final Escaper SHELL_ESCAPE;
-	private static final OSType DETECTED_OS;
 
 	static
 	{
 		final Escapers.Builder builder = Escapers.builder();
 		builder.addEscape('"', "'");
 		SHELL_ESCAPE = builder.build();
-
-		final String OS = System
-			.getProperty("os.name", "generic")
-			.toLowerCase();
-
-		if ((OS.contains("mac")) || (OS.contains("darwin")))
-		{
-			DETECTED_OS = OSType.MacOS;
-		}
-		else if (OS.contains("win"))
-		{
-			DETECTED_OS = OSType.Windows;
-		}
-		else if (OS.contains("nux"))
-		{
-			DETECTED_OS = OSType.Linux;
-		}
-		else
-		{
-			DETECTED_OS = OSType.Other;
-		}
-
-		log.debug("Detect OS: {}", DETECTED_OS);
 	}
 
 	private final String appName;
@@ -114,7 +87,7 @@ public class Notifier
 		final String escapedMessage = SHELL_ESCAPE.escape(message);
 		final String escapedSubtitle = subtitle != null ? SHELL_ESCAPE.escape(subtitle) : null;
 
-		switch (DETECTED_OS)
+		switch (OSType.getOSType())
 		{
 			case Linux:
 				sendLinuxNotification(escapedTitle, escapedMessage, type);

runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java

@@ -37,12 +37,14 @@ import java.awt.LayoutManager;
 import java.awt.SystemTray;
 import java.awt.Toolkit;
 import java.awt.TrayIcon;
+import java.awt.Window;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Enumeration;
 import javax.imageio.ImageIO;
 import javax.swing.BoxLayout;
@@ -65,6 +67,7 @@ import net.runelite.api.GameState;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.client.RuneLite;
 import net.runelite.client.RuneLiteProperties;
+import net.runelite.client.util.OSType;
 import org.pushingpixels.substance.api.skin.SubstanceGraphiteLookAndFeel;
 import org.pushingpixels.substance.internal.utils.SubstanceCoreUtilities;
 import org.pushingpixels.substance.internal.utils.SubstanceTitlePaneUtilities;
@@ -133,7 +136,9 @@ public class ClientUI extends JFrame
 		// Use custom UI font
 		setUIFont(new FontUIResource(FontManager.getRunescapeFont()));
 
-		return new ClientUI(runelite, properties, client);
+		ClientUI gui = new ClientUI(runelite, properties, client);
+		tryEnableOSXFullscreen(gui);
+		return gui;
 	}
 
 	private ClientUI(RuneLite runelite, RuneLiteProperties properties, Applet client)
@@ -455,4 +460,27 @@ public class ClientUI extends JFrame
 	{
 		return pluginToolbar;
 	}
+
+	/**
+	 * Enables the osx native fullscreen if running on a mac.
+	 *
+	 * @param gui The gui to enable the fullscreen on.
+	 */
+	private static void tryEnableOSXFullscreen(ClientUI gui)
+	{
+		if (OSType.getOSType() == OSType.MacOS)
+		{
+			try
+			{
+				Class.forName("com.apple.eawt.FullScreenUtilities")
+					.getMethod("setWindowCanFullScreen", Window.class, boolean.class)
+					.invoke(null, gui, true);
+				log.debug("macOS fullscreen enabled");
+			}
+			catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored)
+			{
+				// not running macOS, ignore
+			}
+		}
+	}
 }

runelite-client/src/main/java/net/runelite/client/util/OSType.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2018, arlyon <arlyon@me.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.client.util;
+
+/**
+ * An enum and util function to determine the OS.
+ */
+public enum OSType
+{
+	Windows,
+	MacOS,
+	Linux,
+	Other;
+
+	private final static OSType OS_TYPE;
+
+	static
+	{
+		final String OS = System
+			.getProperty("os.name", "generic")
+			.toLowerCase();
+
+		if ((OS.contains("mac")) || (OS.contains("darwin")))
+		{
+			OS_TYPE = OSType.MacOS;
+		}
+		else if (OS.contains("win"))
+		{
+			OS_TYPE = OSType.Windows;
+		}
+		else if (OS.contains("nux"))
+		{
+			OS_TYPE = OSType.Linux;
+		}
+		else
+		{
+			OS_TYPE = OSType.Other;
+		}
+	}
+
+	public static OSType getOSType()
+	{
+		return OS_TYPE;
+	}
+}