gtk3: substantial re-work and cleanup of event handling

Implement SalTimer ourselves rather more cleanly
Remove nasty GtkXLib cruft inherited from X backend
Merge and cleanup most Yield / mainloop bits into GtkData

vcl/inc/unx/gtk/gtkdata.hxx

@@ -40,10 +40,10 @@
 #include <unx/gtk/gtksys.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <osl/conditn.h>
+#include "saltimer.hxx"
 
 #include <list>
 
-class GtkXLib;
 class GtkSalDisplay;
 
 inline GdkWindow * widget_get_window(GtkWidget *widget)
@@ -79,45 +79,27 @@ inline void widget_set_can_default(GtkWidget *widget, gboolean can_default)
 #endif
 }
 
-class GtkXLib : public SalXLib
+class GtkSalTimer : public SalTimer
 {
-    GtkSalDisplay       *m_pGtkSalDisplay;
-    std::list<GSource *> m_aSources;
-    GSource             *m_pTimeout;
-    GSource				*m_pUserEvent;
-    oslMutex             m_aDispatchMutex;
-    oslCondition         m_aDispatchCondition;
-    XIOErrorHandler      m_aOrigGTKXIOErrorHandler;
-
+    GSource *m_pTimeout;
 public:
-    static gboolean      timeoutFn(gpointer data);
-    static gboolean      userEventFn(gpointer data);
-
-    GtkXLib();
-    virtual ~GtkXLib();
-
-    virtual void    Init();
-    virtual void    Yield( bool bWait, bool bHandleAllCurrentEvents );
-    virtual void    Insert( int fd, void* data,
-                            YieldFunc	pending,
-                            YieldFunc	queued,
-                            YieldFunc	handle );
-    virtual void    Remove( int fd );
-
-    virtual void    StartTimer( sal_uLong nMS );
-    virtual void    StopTimer();
-    virtual void    Wakeup();
-    virtual void    PostUserEvent();
+    GtkSalTimer();
+    ~GtkSalTimer();
+    sal_uLong m_nTimeoutMS;
+    virtual void Start( sal_uLong nMS );
+    virtual void Stop();
 };
 
-#if GTK_CHECK_VERSION(3,0,0)
 class GtkData : public SalData
-#else
-class GtkData : public X11SalData
-#endif
 {
+    oslMutex m_aDispatchMutex;
+    oslCondition m_aDispatchCondition;
+    GSource *m_pUserEvent;
+
+    GtkSalDisplay *m_pGtkSalDisplay;
+
 public:
-    GtkData() {}
+    GtkData();
     virtual ~GtkData();
 
     virtual void Init();
@@ -125,12 +107,12 @@ public:
     virtual void initNWF();
     virtual void deInitNWF();
 
-    GtkSalDisplay *pDisplay;
-    GtkSalDisplay *GetDisplay() { return pDisplay; }
-#if GTK_CHECK_VERSION(3,0,0)
-    GtkXLib *pXLib_;
-    SalXLib *GetLib() { return pXLib_; }
-#endif
+    static gboolean userEventFn( gpointer data );
+
+    void PostUserEvent();
+    void Yield( bool bWait, bool bHandleAllCurrentEvents );
+    GtkSalDisplay *GetDisplay() { return m_pGtkSalDisplay; }
+    inline GdkDisplay *GetGdkDisplay();
 };
 
 inline GtkData* GetGtkSalData()
@@ -210,10 +192,12 @@ public:
 
     oslMutex        hEventGuard_;
     std::list< SalUserEvent > m_aUserEvents;
-    guint32 GetLastUserEventTime( bool b ) { return GDK_CURRENT_TIME; } // horrible hack
+    guint32 GetLastUserEventTime( bool /* b */ ) { return GDK_CURRENT_TIME; } // horrible hack
 #endif
 };
 
+inline GdkDisplay *GtkData::GetGdkDisplay() { return m_pGtkSalDisplay->GetGdkDisplay(); }
+
 
 #endif // _VCL_GTKDATA_HXX
 

vcl/inc/unx/gtk/gtkframe.hxx

@@ -180,6 +180,7 @@ class GtkSalFrame : public SalFrame, basebmp::BitmapDeviceDamageTracker
 
     int                             m_nScreen;
     GtkWidget*                      m_pWindow;
+    guint                           m_nIdleFullScreen;
 #if GTK_CHECK_VERSION(3,0,0)
     basebmp::BitmapDeviceSharedPtr  m_aFrame;
 #endif

vcl/inc/unx/gtk/gtkinst.hxx

@@ -100,6 +100,7 @@ public:
     virtual SalFrame*           CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle );
     virtual SalObject*          CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True );
     virtual SalSystem*          CreateSalSystem();
+    virtual SalTimer*           CreateSalTimer();
     virtual void                AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
     virtual SalVirtualDevice*   CreateVirtualDevice( SalGraphics*,
                                                      long nDX, long nDY,

vcl/unx/gtk/app/gtkinst.cxx

@@ -419,6 +419,7 @@ SalVirtualDevice* GtkInstance::CreateVirtualDevice( SalGraphics *pG,
                                                     const SystemGraphicsData *pGd )
 {
 #if GTK_CHECK_VERSION(3,0,0)
+    (void)pG; (void) pGd;
     SvpSalVirtualDevice* pNew = new SvpSalVirtualDevice( nBitCount );
     pNew->SetSize( nDX, nDY );
     return pNew;
@@ -436,6 +437,15 @@ SalBitmap* GtkInstance::CreateSalBitmap()
 #endif
 }
 
+SalTimer* GtkInstance::CreateSalTimer()
+{
+#if GTK_CHECK_VERSION(3,0,0)
+    return new GtkSalTimer();
+#else
+    return X11SalInstance::CreateSalTimer();
+#endif
+}
+
 // FIXME: these should all be in a more generic, shared base of unix's salinst.cxx
 
 osl::SolarMutex* GtkInstance::GetYieldMutex()
@@ -486,7 +496,7 @@ bool GtkInstance::CheckYieldMutex()
 
 void GtkInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
 {
-    GetGtkSalData()->GetLib()->Yield( bWait, bHandleAllCurrentEvents );
+    GetGtkSalData()->Yield( bWait, bHandleAllCurrentEvents );
 }
 
 bool GtkInstance::AnyInput( sal_uInt16 nType )

vcl/unx/gtk/window/gtkframe.cxx

@@ -441,6 +441,7 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent, sal_uLong nStyle )
 {
     m_nScreen = getDisplay()->GetDefaultScreenNumber();
     getDisplay()->registerFrame( this );
+    m_nIdleFullScreen   = 0;
     m_nDuringRender     = 0;
     m_bDefaultPos       = true;
     m_bDefaultSize      = ( (nStyle & SAL_FRAME_STYLE_SIZEABLE) && ! pParent );
@@ -457,11 +458,14 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData )
 #endif
     m_bDefaultPos       = true;
     m_bDefaultSize      = true;
+    m_nIdleFullScreen   = 0;
     Init( pSysData );
 }
 
 GtkSalFrame::~GtkSalFrame()
 {
+    g_idle_remove_by_data (this);
+
     for( unsigned int i = 0; i < SAL_N_ELEMENTS(m_aGraphics); ++i )
     {
         if( !m_aGraphics[i].pGraphics )
@@ -640,9 +644,9 @@ void GtkSalFrame::InitCommon()
     gtk_widget_realize( m_pWindow );
 
     //system data
-    GtkSalDisplay* pDisp = GetGtkSalData()->GetDisplay();
     m_aSystemData.nSize         = sizeof( SystemChildData );
 #if !GTK_CHECK_VERSION(3,0,0)
+    GtkSalDisplay* pDisp = GetGtkSalData()->GetDisplay();
     m_aSystemData.pDisplay      = pDisp->GetDisplay();
     m_aSystemData.pVisual		= pDisp->GetVisual( m_nScreen ).GetVisual();
     m_aSystemData.nDepth		= pDisp->GetVisual( m_nScreen ).GetDepth();
@@ -2335,12 +2339,12 @@ String GtkSalFrame::GetKeyName( sal_uInt16 nKeyCode )
 
 GdkDisplay *GtkSalFrame::getGdkDisplay()
 {
-    return GetGtkSalData()->pDisplay->GetGdkDisplay();
+    return GetGtkSalData()->GetGdkDisplay();
 }
 
 GtkSalDisplay *GtkSalFrame::getDisplay()
 {
-    return GetGtkSalData()->pDisplay;
+    return GetGtkSalData()->GetDisplay();
 }
 
 SalFrame::SalPointerState GtkSalFrame::GetPointerState()
@@ -3180,8 +3184,11 @@ gboolean GtkSalFrame::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer f
     return sal_False;
 }
 
-IMPL_LINK( GtkSalFrame, ImplDelayedFullScreenHdl, void*, EMPTYARG )
+extern "C" {
+gboolean implDelayedFullScreenHdl (void *)
 {
+    g_warning ("FIXME: nasty delayed full-screen hdl workaround !");
+#if 0
 #if !GTK_CHECK_VERSION(3,0,0)
     Atom nStateAtom = getDisplay()->getWMAdaptor()->getAtom(vcl_sal::WMAdaptor::NET_WM_STATE);
     Atom nFSAtom = getDisplay()->getWMAdaptor()->getAtom(vcl_sal::WMAdaptor::NET_WM_STATE_FULLSCREEN );
@@ -3210,7 +3217,9 @@ IMPL_LINK( GtkSalFrame, ImplDelayedFullScreenHdl, void*, EMPTYARG )
                     );
     }
 #endif
-    return 0;
+#endif
+    return FALSE;
+}
 }
 
 gboolean GtkSalFrame::signalMap( GtkWidget*, GdkEvent*, gpointer frame )
@@ -3224,7 +3233,7 @@ gboolean GtkSalFrame::signalMap( GtkWidget*, GdkEvent*, gpointer frame )
         /* #i110881# workaorund a gtk issue (see https://bugzilla.redhat.com/show_bug.cgi?id=623191#c8)
            gtk_window_fullscreen can run into a race condition with the window's showstate
         */
-        Application::PostUserEvent( LINK( pThis, GtkSalFrame, ImplDelayedFullScreenHdl ) );
+        g_idle_add_full( G_PRIORITY_HIGH, implDelayedFullScreenHdl, pThis, NULL );
     }
 
     bool bSetFocus = pThis->m_bSetFocusOnMap;