Bug 1848599 Allow to place kiosk mode browser to selected monitor r=emilio

Differential Revision: https://phabricator.services.mozilla.com/D186163

Author: stransky

browser/components/BrowserContentHandler.sys.mjs

@@ -399,7 +399,8 @@ nsBrowserContentHandler.prototype = {
 
   /* nsICommandLineHandler */
   handle: function bch_handle(cmdLine) {
-    if (cmdLine.handleFlag("kiosk", false)) {
+    if (cmdLine.handleFlag("kiosk", false) ||
+        cmdLine.handleFlagWithParam("kiosk-monitor", false)) {
       gKiosk = true;
     }
     if (cmdLine.handleFlag("disable-pinch", false)) {
@@ -632,6 +633,7 @@ nsBrowserContentHandler.prototype = {
     info +=
       "  --first-startup    Run post-install actions before opening a new window.\n";
     info += "  --kiosk            Start the browser in kiosk mode.\n";
+    info += "  --kiosk-monitor <num> Place kiosk browser window on given monitor.\n";
     info +=
       "  --disable-pinch    Disable touch-screen and touch-pad pinch gestures.\n";
     return info;

toolkit/xre/nsAppRunner.cpp

@@ -320,6 +320,9 @@ bool gRestartedByOS = false;
 
 bool gIsGtest = false;
 
+bool gKioskMode = false;
+int gKioskMonitor = -1;
+
 nsString gAbsoluteArgv0Path;
 
 #if defined(XP_WIN)
@@ -3988,6 +3991,13 @@ int XREMain::XRE_mainInit(bool* aExitFlag) {
 #endif
   }
 
+  gKioskMode = CheckArg("kiosk");
+  const char* kioskMonitorNumber = nullptr;
+  if (CheckArg("kiosk-monitor", &kioskMonitorNumber, CheckArgFlag::None)) {
+    gKioskMode = true;
+    gKioskMonitor = atoi(kioskMonitorNumber);
+  }
+
   nsresult rv;
   ArgResult ar;
 

toolkit/xre/nsAppRunner.h

@@ -54,6 +54,9 @@ extern nsString gAbsoluteArgv0Path;
 
 extern bool gIsGtest;
 
+extern bool gKioskMode;
+extern int gKioskMonitor;
+
 namespace mozilla {
 nsresult AppInfoConstructor(const nsID& aIID, void** aResult);
 }  // namespace mozilla

widget/gtk/ScreenHelperGTK.cpp

@@ -294,6 +294,10 @@ ScreenHelperGTK::ScreenHelperGTK() {
   gScreenGetter->Init();
 }
 
+int ScreenHelperGTK::GetMonitorCount() {
+  return gdk_screen_get_n_monitors(gdk_screen_get_default());
+}
+
 ScreenHelperGTK::~ScreenHelperGTK() { gScreenGetter = nullptr; }
 
 }  // namespace mozilla::widget

widget/gtk/ScreenHelperGTK.h

@@ -20,6 +20,7 @@ class ScreenHelperGTK final : public ScreenManager::Helper {
   ScreenHelperGTK();
   ~ScreenHelperGTK();
 
+  static int GetMonitorCount();
   static gint GetGTKMonitorScaleFactor(gint aMonitorNum = 0);
   static RefPtr<widget::Screen> GetScreenForWindow(nsWindow* aWindow);
 };

widget/gtk/nsWindow.cpp

@@ -6184,6 +6184,15 @@ nsresult nsWindow::Create(nsIWidget* aParent, nsNativeWidget aNativeParent,
   }
 #endif
 
+  if (mWindowType == WindowType::TopLevel && gKioskMode) {
+    if (gKioskMonitor != -1) {
+      mKioskMonitor = Some(gKioskMonitor);
+      LOG("  set kiosk mode monitor %d", mKioskMonitor.value());
+    } else {
+      LOG("  set kiosk mode");
+    }
+  }
+
   if (mWindowType == WindowType::Popup) {
     MOZ_ASSERT(aInitData);
     // gdk does not automatically set the cursor for "temporary"
@@ -7389,6 +7398,26 @@ bool nsWindow::SynchronouslyRepaintOnResize() {
   return true;
 }
 
+void nsWindow::KioskLockOnMonitor() {
+  // Available as of GTK 3.18+
+  static auto sGdkWindowFullscreenOnMonitor =
+      (void (*)(GdkWindow* window, gint monitor))dlsym(
+          RTLD_DEFAULT, "gdk_window_fullscreen_on_monitor");
+
+  if (!sGdkWindowFullscreenOnMonitor) {
+    return;
+  }
+
+  int monitor = mKioskMonitor.value();
+  if (monitor < 0 || monitor >= ScreenHelperGTK::GetMonitorCount()) {
+    LOG("nsWindow::KioskLockOnMonitor() wrong monitor number! (%d)\n", monitor);
+    return;
+  }
+
+  LOG("nsWindow::KioskLockOnMonitor() locked on %d\n", monitor);
+  sGdkWindowFullscreenOnMonitor(gtk_widget_get_window(mShell), monitor);
+}
+
 static bool IsFullscreenSupported(GtkWidget* aShell) {
 #ifdef MOZ_X11
   GdkScreen* screen = gtk_widget_get_screen(aShell);
@@ -7420,8 +7449,17 @@ nsresult nsWindow::MakeFullScreen(bool aFullScreen) {
       }
     }
 
-    gtk_window_fullscreen(GTK_WINDOW(mShell));
+    if (mKioskMonitor.isSome()) {
+      KioskLockOnMonitor();
+    } else {
+      gtk_window_fullscreen(GTK_WINDOW(mShell));
+    }
   } else {
+    // Kiosk mode always use fullscreen mode.
+    if (gKioskMode) {
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+
     gtk_window_unfullscreen(GTK_WINDOW(mShell));
 
     if (mIsPIPWindow) {

widget/gtk/nsWindow.h

@@ -980,6 +980,8 @@ class nsWindow final : public nsBaseWidget {
 
   void SetUserTimeAndStartupTokenForActivatedWindow();
 
+  void KioskLockOnMonitor();
+
 #ifdef MOZ_X11
   typedef enum {GTK_WIDGET_COMPOSIDED_DEFAULT = 0,
                 GTK_WIDGET_COMPOSIDED_DISABLED = 1,
@@ -1003,6 +1005,9 @@ class nsWindow final : public nsBaseWidget {
   LayoutDeviceIntRect mLastLoggedBoundSize;
   int mLastLoggedScale = -1;
 #endif
+  // Running in kiosk mode and requested to stay on specified monitor.
+  // If monitor is removed minimize the window.
+  mozilla::Maybe<int> mKioskMonitor;
 };
 
 #endif /* __nsWindow_h__ */