Add X11EmbedContainer Qt5 port

LMMS · Sep 1, 2017 · e661d26 · e661d26
1 parent 24d320d
commit e661d26
Show file tree

Hide file tree

Showing 6 changed files with 1,295 additions and 9 deletions.
diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt
@@ -28,6 +28,7 @@ SET(REMOTE_VST_PLUGIN_FILEPATH "RemoteVstPlugin" CACHE STRING "Relative file pat
 
 ADD_DEFINITIONS(-DREMOTE_VST_PLUGIN_FILEPATH="${REMOTE_VST_PLUGIN_FILEPATH}")
 BUILD_PLUGIN(vstbase vst_base.cpp VstPlugin.cpp VstPlugin.h communication.h MOCFILES VstPlugin.h)
+TARGET_LINK_LIBRARIES(vstbase x11embedcontainer)
 
 IF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE)
 

diff --git a/plugins/vst_base/VstPlugin.cpp b/plugins/vst_base/VstPlugin.cpp
@@ -32,10 +32,7 @@
 #include <QMdiArea>
 #include <QMdiSubWindow>
 #ifdef LMMS_BUILD_LINUX
-#if QT_VERSION < 0x050000
-#include <QX11EmbedContainer>
-#include <QX11Info>
-#endif
+#include "X11EmbedContainer.h"
 #else
 #include <QLayout>
 #endif
@@ -244,25 +241,21 @@ void VstPlugin::showEditor( QWidget * _parent, bool isEffect )
 			sw->setAttribute( Qt::WA_TranslucentBackground );
 			sw->setWindowFlags( Qt::FramelessWindowHint );
 			sw->setWidget( m_pluginWidget );
-#if QT_VERSION < 0x050000
 			QX11EmbedContainer * xe = new QX11EmbedContainer( sw );
 			xe->embedClient( m_pluginWindowID );
 			xe->setFixedSize( m_pluginGeometry );
 			xe->show();
-#endif
 		} 
 		else
 		{
 			sw->setWindowFlags( Qt::WindowCloseButtonHint );
 			sw->setWidget( m_pluginWidget );
 
-#if QT_VERSION < 0x050000
 			QX11EmbedContainer * xe = new QX11EmbedContainer( sw );
 			xe->embedClient( m_pluginWindowID );
 			xe->setFixedSize( m_pluginGeometry );
 			xe->move( 4, 24 );
 			xe->show();
-#endif
 		}
 	}
 

diff --git a/plugins/vst_base/VstPlugin.h b/plugins/vst_base/VstPlugin.h
@@ -130,7 +130,7 @@ public slots:
 
 	QString m_plugin;
 	QPointer<QWidget> m_pluginWidget;
-	int m_pluginWindowID;
+	WId m_pluginWindowID;
 	QSize m_pluginGeometry;
 
 	bool m_badDllFormat;

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -91,6 +91,25 @@ SET(LMMS_SRCS
 	PARENT_SCOPE
 )
 
+IF(QT5)
+    add_library(x11embedcontainer STATIC
+        X11EmbedContainer
+    )
+    FIND_PACKAGE(Qt5Core COMPONENTS Private)
+    FIND_PACKAGE(Qt5Widgets COMPONENTS Private)
+    FIND_PACKAGE(Qt5X11Extras REQUIRED)
+
+	include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS})
+	include_directories(${Qt5Widgets_PRIVATE_INCLUDE_DIRS})
+
+
+	target_link_Libraries(x11embedcontainer
+		 xcb xcb-util X11-xcb Qt5::X11Extras
+	)
+ELSE()
+    add_library(x11embedcontainer STATIC /dev/null)
+ENDIF()
+
 set(LMMS_UIS
 	${LMMS_UIS}
 	gui/dialogs/about_dialog.ui