X11EmbedContainer: Fix XEMBED protocol implementation

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

Hide file tree

Showing 7 changed files with 153 additions and 254 deletions.
diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h
@@ -787,19 +787,6 @@ class EXPORT RemotePlugin : public QObject, public RemotePluginBase
 		unlock();
 	}
 
-	void showUI()
-	{
-		lock();
-		sendMessage( IdShowUI );
-		unlock();
-	}
-
-	void hideUI()
-	{
-		lock();
-		sendMessage( IdHideUI );
-		unlock();
-	}
 
 	inline bool failed() const
 	{
@@ -816,6 +803,9 @@ class EXPORT RemotePlugin : public QObject, public RemotePluginBase
 		m_commMutex.unlock();
 	}
 
+public slots:
+	void showUI();
+	void hideUI();
 
 protected:
 	inline void setSplittedChannels( bool _on )

diff --git a/plugins/vst_base/RemoteVstPlugin.cpp b/plugins/vst_base/RemoteVstPlugin.cpp
@@ -556,6 +556,11 @@ bool RemoteVstPlugin::processMessage( const message & _m )
 			break;
 		}
 
+		case IdShowUI:
+			ShowWindow( m_window, SW_SHOWNORMAL );
+			UpdateWindow( m_window );
+			break;
+
 		default:
 			return RemotePluginClient::processMessage( _m );
 	}
@@ -687,9 +692,6 @@ void RemoteVstPlugin::initEditor()
 						SWP_NOMOVE | SWP_NOZORDER );
 	pluginDispatch( effEditTop );
 
-	ShowWindow( m_window, SW_SHOWNORMAL );
-	UpdateWindow( m_window );
-
 #ifdef LMMS_BUILD_LINUX
 	m_windowID = (intptr_t) GetProp( m_window, "__wine_x11_whole_window" );
 #endif

diff --git a/plugins/vst_base/VstPlugin.cpp b/plugins/vst_base/VstPlugin.cpp
@@ -229,35 +229,31 @@ void VstPlugin::showEditor( QWidget * _parent, bool isEffect )
 		return;
 	}
 
-	m_pluginWidget = new QWidget( _parent );
+	QX11EmbedContainer * xe = new QX11EmbedContainer;
+	m_pluginWidget = xe;
 	m_pluginWidget->setFixedSize( m_pluginGeometry );
 	m_pluginWidget->setWindowTitle( name() );
+
+	connect(xe, SIGNAL(clientIsEmbedded()), this, SLOT(showUI()));
+
 	if( _parent == NULL )
 	{
 		vstSubWin * sw = new vstSubWin(
 					gui->mainWindow()->workspace() );
+		sw->setWidget( m_pluginWidget );
+
 		if( isEffect )
 		{
 			sw->setAttribute( Qt::WA_TranslucentBackground );
 			sw->setWindowFlags( Qt::FramelessWindowHint );
-			sw->setWidget( m_pluginWidget );
-			QX11EmbedContainer * xe = new QX11EmbedContainer( sw );
-			xe->embedClient( m_pluginWindowID );
-			xe->setFixedSize( m_pluginGeometry );
-			xe->show();
-		} 
+		}
 		else
 		{
 			sw->setWindowFlags( Qt::WindowCloseButtonHint );
-			sw->setWidget( m_pluginWidget );
-
-			QX11EmbedContainer * xe = new QX11EmbedContainer( sw );
-			xe->embedClient( m_pluginWindowID );
-			xe->setFixedSize( m_pluginGeometry );
-			xe->move( 4, 24 );
-			xe->show();
 		}
 	}
+	xe->embedClient( m_pluginWindowID );
+	xe->setFixedSize( m_pluginGeometry );
 
 #endif
 

diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp
@@ -392,6 +392,20 @@ void RemotePlugin::processMidiEvent( const MidiEvent & _e,
 	unlock();
 }
 
+void RemotePlugin::showUI()
+{
+	lock();
+	sendMessage( IdShowUI );
+	unlock();
+}
+
+void RemotePlugin::hideUI()
+{
+	lock();
+	sendMessage( IdHideUI );
+	unlock();
+}
+
 
 
 

diff --git a/src/gui/SubWindow.cpp b/src/gui/SubWindow.cpp
@@ -97,7 +97,10 @@ void SubWindow::paintEvent( QPaintEvent * )
 {
 	QPainter p( this );
 	QRect rect( 0, 0, width(), m_titleBarHeight );
-	bool isActive = SubWindow::mdiArea()->activeSubWindow() == this;
+
+	bool isActive = mdiArea()
+			? mdiArea()->activeSubWindow() == this
+			: false;
 
 	p.fillRect( rect, isActive ? activeColor() : p.pen().brush() );