vcl: second part of fix for fdo#43458 - get xrandr / y positioning right

3 files changed, 23 insertions, 20 deletions

diff --git a/vcl/inc/vcl/wrkwin.hxx b/vcl/inc/vcl/wrkwin.hxx
index c58f6971ffc0..c9a3da94b0a2 100644
--- a/vcl/inc/vcl/wrkwin.hxx
+++ b/vcl/inc/vcl/wrkwin.hxx
@@ -80,30 +80,33 @@ public:
 
     virtual sal_Bool    Close();
 
-    /** The default value of nDisplay = -1 means "don't care" and
-        allows to backends to use any screen [** or display? terminology!]
-        they like (most probably the current one).
+    /** The default value of nDisplayScreen = -1 means "don't care" and
+        allows to backends to use any screen they like (most probably
+        the current one).
 
         NOTE: The default value cannot be 0, because 0 is a legitimate
-        screen number.
+        Display Screen number.
      */
-    void            ShowFullScreenMode( sal_Bool bFullScreenMode = sal_True, sal_Int32 nDisplay = -1 );
+    void            ShowFullScreenMode( sal_Bool bFullScreenMode = sal_True,
+                                        sal_Int32 nDisplayScreen = -1 );
     void            EndFullScreenMode() { ShowFullScreenMode( sal_False ); }
-    sal_Bool            IsFullScreenMode() const { return mbFullScreenMode; }
+    sal_Bool        IsFullScreenMode() const { return mbFullScreenMode; }
 
-    void            StartPresentationMode( sal_Bool bPresentation = sal_True, sal_uInt16 nFlags = 0, sal_Int32 nDisplay = 0 );
+    void            StartPresentationMode( sal_Bool   bPresentation = sal_True,
+                                           sal_uInt16 nFlags = 0,
+                                           sal_Int32  nDisplayScreen = 0 );
     void            EndPresentationMode() {  StartPresentationMode( sal_False ); }
-    sal_Bool            IsPresentationMode() const { return mbPresentationMode; }
+    sal_Bool        IsPresentationMode() const { return mbPresentationMode; }
 
-    sal_Bool            IsMinimized() const;
+    sal_Bool        IsMinimized() const;
 
-    sal_Bool            SetPluginParent( SystemParentData* pParent );
+    sal_Bool        SetPluginParent( SystemParentData* pParent );
 
     void            Minimize();
     void            Restore();
 
     void            Maximize( sal_Bool bMaximize = sal_True );
-    sal_Bool            IsMaximized() const;
+    sal_Bool        IsMaximized() const;
 };
 
 #endif // _SV_WRKWIN_HXX
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 091f88899e0f..ef5ba5f0e0ae 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -177,15 +177,15 @@ WorkWindow::~WorkWindow()
 
 // -----------------------------------------------------------------------
 
-void WorkWindow::ShowFullScreenMode( sal_Bool bFullScreenMode, sal_Int32 nDisplay )
+void WorkWindow::ShowFullScreenMode( sal_Bool bFullScreenMode, sal_Int32 nDisplayScreen )
 {
     if ( !mbFullScreenMode == !bFullScreenMode )
         return;
 
-    if( (nDisplay < 0)
-    || (nDisplay >= static_cast<sal_Int32>(Application::GetScreenCount()) ) )
+    if( (nDisplayScreen < 0)
+    || (nDisplayScreen >= static_cast<sal_Int32>(Application::GetScreenCount()) ) )
     {
-        nDisplay = GetScreenNumber();
+        nDisplayScreen = GetScreenNumber();
     }
 
     mbFullScreenMode = bFullScreenMode != 0;
@@ -204,13 +204,13 @@ void WorkWindow::ShowFullScreenMode( sal_Bool bFullScreenMode, sal_Int32 nDispla
         }
 
         mpWindowImpl->mpFrameWindow->mpWindowImpl->mbWaitSystemResize = sal_True;
-        ImplGetFrame()->ShowFullScreen( bFullScreenMode, nDisplay );
+        ImplGetFrame()->ShowFullScreen( bFullScreenMode, nDisplayScreen );
     }
 }
 
 // -----------------------------------------------------------------------
 
-void WorkWindow::StartPresentationMode( sal_Bool bPresentation, sal_uInt16 nFlags, sal_Int32 nDisplay )
+void WorkWindow::StartPresentationMode( sal_Bool bPresentation, sal_uInt16 nFlags, sal_Int32 nDisplayScreen )
 {
     if ( !bPresentation == !mbPresentationMode )
         return;
@@ -223,7 +223,7 @@ void WorkWindow::StartPresentationMode( sal_Bool bPresentation, sal_uInt16 nFlag
         mnPresentationFlags     = nFlags;
 
         if ( !(mnPresentationFlags & PRESENTATION_NOFULLSCREEN) )
-            ShowFullScreenMode( sal_True, nDisplay );
+            ShowFullScreenMode( sal_True, nDisplayScreen );
         if ( !mbSysChild )
         {
             if ( mnPresentationFlags & PRESENTATION_HIDEALLAPPS )
@@ -245,7 +245,7 @@ void WorkWindow::StartPresentationMode( sal_Bool bPresentation, sal_uInt16 nFlag
             if ( mnPresentationFlags & PRESENTATION_HIDEALLAPPS )
                 mpWindowImpl->mpFrame->SetAlwaysOnTop( sal_False );
         }
-        ShowFullScreenMode( mbPresentationFull, nDisplay );
+        ShowFullScreenMode( mbPresentationFull, nDisplayScreen );
 
         mbPresentationMode      = sal_False;
         mbPresentationVisible   = sal_False;
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 0768093ef9fb..4869c4594873 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1880,7 +1880,7 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, int eType, Rectangle *pSiz
     if( eType == SET_FULLSCREEN )
     {
         maGeometry.nX = aNewMonitor.x;
-        maGeometry.nY = aNewMonitor.x;
+        maGeometry.nY = aNewMonitor.y;
         maGeometry.nWidth = aNewMonitor.width;
         maGeometry.nHeight = aNewMonitor.height;
         m_nStyle |= SAL_FRAME_STYLE_PARTIAL_FULLSCREEN;