Add X11EmbedContainer Qt5 port

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)
 

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
 		}
 	}
 

plugins/vst_base/VstPlugin.h

@@ -130,7 +130,7 @@ private:
 
 	QString m_plugin;
 	QPointer<QWidget> m_pluginWidget;
-	int m_pluginWindowID;
+	WId m_pluginWindowID;
 	QSize m_pluginGeometry;
 
 	bool m_badDllFormat;

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

src/gui/X11EmbedContainer.h

@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef X11EMBEDCONTAINER_H
+#define X11EMBEDCONTAINER_H
+
+#include <QtGlobal>
+
+#if QT_VERSION < 0x050000
+#include <QX11EmbedContainer>
+#else
+
+#include <QtWidgets/QWidget>
+
+class QX11EmbedContainerPrivate;
+class Q_GUI_EXPORT QX11EmbedContainer : public QWidget
+{
+	Q_OBJECT
+public:
+	QX11EmbedContainer(QWidget *parent = 0);
+	~QX11EmbedContainer();
+
+	void embedClient(WId id);
+	void discardClient();
+
+	WId clientWinId() const;
+
+	QSize minimumSizeHint() const;
+
+	enum Error {
+		Unknown,
+		Internal,
+		InvalidWindowID
+	};
+	Error error() const;
+
+Q_SIGNALS:
+	void clientIsEmbedded();
+	void clientClosed();
+	void error(QX11EmbedContainer::Error);
+
+protected:
+	//bool x11Event(XEvent *);
+	bool nativeEvent(const QByteArray &eventType, void *message, long *result);
+	bool eventFilter(QObject *, QEvent *) override;
+	void paintEvent(QPaintEvent *e) override;
+	void resizeEvent(QResizeEvent *);
+	void showEvent(QShowEvent *);
+	void hideEvent(QHideEvent *);
+	bool event(QEvent *);
+
+private:
+	Q_DECLARE_PRIVATE(QX11EmbedContainer)
+	Q_DISABLE_COPY(QX11EmbedContainer)
+	bool x11Event(void *e, long *result);
+};
+
+#endif // X11EMBEDCONTAINER_H
+
+#endif