Get a bit more work on the new window-embed routine for Lumina 2

2 files changed, 6 insertions, 2 deletions

diff --git a/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.cpp b/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.cpp
index 65fa98a7..0d1e9c10 100644
--- a/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.cpp
@@ -631,6 +631,7 @@ void NativeWindowSystem::SetupNewWindow(NativeWindowObject *win){
 
     win->addDamageID( (uint) dmgID); //save this for later
   }else{
+    /*
     //xcb_reparent_window(QX11Info::connection(), win->id(), this->winId(), 0, 0);
     //Also use a partial-composite here - make sure the window pixmap is available even when the window is obscured
     xcb_composite_redirect_window(QX11Info::connection(), win->id(), XCB_COMPOSITE_REDIRECT_AUTOMATIC);
@@ -639,6 +640,7 @@ void NativeWindowSystem::SetupNewWindow(NativeWindowObject *win){
     Damage dmgID = XDamageCreate(QX11Info::display(), win->id(), XDamageReportRawRectangles);
 
     win->addDamageID( (uint) dmgID); //save this for later
+    */
   }
   //win->addFrameWinID(this->winId());
   registerClientEvents(win->id());
@@ -795,7 +797,7 @@ void NativeWindowSystem::NewWindowDetected(WId id){
   if(attr == 0){ return; } //could not get attributes of window
   if(attr->override_redirect){ free(attr); return; } //window has override redirect set (do not manage)
   free(attr);
-  xcb_reparent_window(QX11Info::connection(), id, QX11Info::appRootWindow(), 0, 0);
+  //xcb_reparent_window(QX11Info::connection(), id, QX11Info::appRootWindow(), 0, 0);
   //Now go ahead and create/populate the container for this window
   NativeWindowObject *win = new NativeWindowObject(id);
 
diff --git a/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.h b/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.h
index 0b6cd67e..f6033674 100644
--- a/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.h
+++ b/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.h
@@ -127,12 +127,14 @@ public slots:
 	void NewMouseRelease(int buttoncode, WId win = 0);
 	void CheckDamageID(WId);
 
+	void RequestReparent(WId, WId, QPoint); //client, parent, relative origin point in parent
+
+
 private slots:
 	//These are the slots which are built-in and automatically connected when a new NativeWindow is created
 	void RequestClose(WId);
 	void RequestKill(WId);
 	void RequestPing(WId);
-	void RequestReparent(WId, WId, QPoint); //client, parent, relative origin point in parent
 
 	//Window-mgmt functions (see Window-mgmt.cpp for details)
 	void ArrangeWindows(WId primary, QString type);