[Libreoffice-commits] core.git: vcl/unx

Jan Holesovsky kendy at collabora.com
Fri Jun 19 03:14:29 PDT 2015


 vcl/unx/gtk/window/gtksalframe.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 405abaa406d259536aa2e8f75cbbd9c5fc592958
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Jun 19 12:11:17 2015 +0200

    SAL_NO_MOUSEGRABS disables grabbing of keyboard too.
    
    No need to introduce a special env. var for this I hope.
    
    Change-Id: I700299c4f40d504a4a437e9bb73f5b24856f9bf8

diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 624ba1a..14ab8a4 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -2825,6 +2825,10 @@ void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents )
 
 void GtkSalFrame::grabKeyboard( bool bGrab )
 {
+    static const char* pEnv = getenv("SAL_NO_MOUSEGRABS"); // let's not introduce a special var for this
+    if (pEnv && *pEnv)
+        return;
+
     if (!m_pWindow)
         return;
 


More information about the Libreoffice-commits mailing list