Kaydet (Commit) c70a5937 authored tarafından Caolán McNamara's avatar Caolán McNamara

gtk3: for x11 case set Display and Visual so opengl slide effects can work

Change-Id: Ib354a3bc0e2069117717068d7cfc02623765a6fa
üst 3fae8c02
...@@ -1088,6 +1088,18 @@ void GtkSalFrame::InitCommon() ...@@ -1088,6 +1088,18 @@ void GtkSalFrame::InitCommon()
m_aSystemData.pAppContext = nullptr; m_aSystemData.pAppContext = nullptr;
m_aSystemData.pShellWidget = m_aSystemData.pWidget; m_aSystemData.pShellWidget = m_aSystemData.pWidget;
m_aSystemData.pToolkit = "gtk3"; m_aSystemData.pToolkit = "gtk3";
GdkScreen* pScreen = gtk_window_get_screen(GTK_WINDOW(m_pWindow));
GdkVisual* pVisual = gdk_screen_get_system_visual(pScreen);
m_aSystemData.nDepth = gdk_visual_get_depth(pVisual);
#if defined(GDK_WINDOWING_X11)
GdkDisplay *pDisplay = getGdkDisplay();
if (GDK_IS_X11_DISPLAY(pDisplay))
{
m_aSystemData.pDisplay = gdk_x11_display_get_xdisplay(pDisplay);
m_aSystemData.pVisual = gdk_x11_visual_get_xvisual(pVisual);
}
#endif
m_bGraphics = false; m_bGraphics = false;
m_pGraphics = nullptr; m_pGraphics = nullptr;
......
...@@ -55,6 +55,18 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow ) ...@@ -55,6 +55,18 @@ GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow )
m_aSystemData.pAppContext = nullptr; m_aSystemData.pAppContext = nullptr;
m_aSystemData.pShellWidget = GTK_WIDGET(pParent->getWindow()); m_aSystemData.pShellWidget = GTK_WIDGET(pParent->getWindow());
m_aSystemData.pToolkit = "gtk3"; m_aSystemData.pToolkit = "gtk3";
GdkScreen* pScreen = gtk_window_get_screen(GTK_WINDOW(pParent->getWindow()));
GdkVisual* pVisual = gdk_screen_get_system_visual(pScreen);
m_aSystemData.nDepth = gdk_visual_get_depth(pVisual);
#if defined(GDK_WINDOWING_X11)
GdkDisplay *pDisplay = pParent->getGdkDisplay();
if (GDK_IS_X11_DISPLAY(pDisplay))
{
m_aSystemData.pDisplay = gdk_x11_display_get_xdisplay(pDisplay);
m_aSystemData.pVisual = gdk_x11_visual_get_xvisual(pVisual);
}
#endif
g_signal_connect( G_OBJECT(m_pSocket), "button-press-event", G_CALLBACK(signalButton), this ); g_signal_connect( G_OBJECT(m_pSocket), "button-press-event", G_CALLBACK(signalButton), this );
g_signal_connect( G_OBJECT(m_pSocket), "button-release-event", G_CALLBACK(signalButton), this ); g_signal_connect( G_OBJECT(m_pSocket), "button-release-event", G_CALLBACK(signalButton), this );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment