diff options
author | Ken Moore <ken@ixsystems.com> | 2018-01-08 16:08:32 -0500 |
---|---|---|
committer | Ken Moore <ken@ixsystems.com> | 2018-01-08 16:08:32 -0500 |
commit | 9d762d405e158910671a3bed8e5bf0ff00862609 (patch) | |
tree | 382784e798bdd8e8cce8e55a7b307d289395f1d9 | |
parent | Merge branch 'master' of github.com:trueos/lumina (diff) | |
download | lumina-9d762d405e158910671a3bed8e5bf0ff00862609.tar.gz lumina-9d762d405e158910671a3bed8e5bf0ff00862609.tar.bz2 lumina-9d762d405e158910671a3bed8e5bf0ff00862609.zip |
Get the window appearing now (compositing disabled at the moment)
-rw-r--r-- | src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.cpp | 13 |
1 files changed, 8 insertions, 5 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 b384fa43..30a6a47d 100644 --- a/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.cpp +++ b/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.cpp @@ -10,7 +10,7 @@ #include "NativeWindowSystem.h" #include <global-objects.h> -#define DISABLE_COMPOSITING 0 +#define DISABLE_COMPOSITING 1 //XCB Library includes #include <xcb/xcb.h> @@ -556,12 +556,12 @@ void NativeWindowSystem::ChangeWindowProperties(NativeWindowObject* win, QList< } if(props.contains(NativeWindowObject::Visible)){ - //qDebug() << "Check Window Visibility:" << vals[ props.indexOf(NativeWindowObject::Visible) ]; + qDebug() << "Check Window Visibility:" << vals[ props.indexOf(NativeWindowObject::Visible) ]; if( vals[ props.indexOf(NativeWindowObject::Visible) ].toBool() ){ - //qDebug() << " - Map it!"; + qDebug() << " - Map it!"; xcb_map_window(QX11Info::connection(), win->id()); }else{ - //qDebug() << " - Unmap it!"; + qDebug() << " - Unmap it!"; xcb_unmap_window(QX11Info::connection(), win->id()); } } @@ -783,6 +783,7 @@ void NativeWindowSystem::NewWindowDetected(WId id){ registerClientEvents(win->id()); NWindows << win; UpdateWindowProperties(win, NativeWindowObject::allProperties()); + win->setProperty(NativeWindowObject::FrameExtents, QVariant::fromValue<QList<int> >( QList<int>() << 5 << 5 << 30 << 5 )); qDebug() << "New Window [& associated ID's]:" << win->id() << win->property(NativeWindowObject::Name).toString(); SetupNewWindow(win); //Now setup the connections with this window @@ -791,6 +792,7 @@ void NativeWindowSystem::NewWindowDetected(WId id){ connect(win, SIGNAL(RequestPing(WId)), this, SLOT(RequestPing(WId)) ); connect(win, SIGNAL(RequestReparent(WId, WId, QPoint)), this, SLOT(RequestReparent(WId, WId, QPoint)) ); connect(win, SIGNAL(RequestPropertiesChange(WId, QList<NativeWindowObject::Property>, QList<QVariant>)), this, SLOT(RequestPropertiesChange(WId, QList<NativeWindowObject::Property>, QList<QVariant>)) ); + xcb_map_window(QX11Info::connection(), win->id()); emit NewWindowAvailable(win); } @@ -940,11 +942,12 @@ void NativeWindowSystem::NewMouseRelease(int buttoncode, WId win){ } void NativeWindowSystem::CheckDamageID(WId win){ + qDebug() << "Got Damage Event:" << win; for(int i=0; i<NWindows.length(); i++){ if(NWindows[i]->damageId() == win || NWindows[i]->id() == win || NWindows[i]->frameId()==win){ + qDebug() << " - Found window"; UpdateWindowImage(NWindows[i]); NWindows[i]->emit VisualChanged(); - //qDebug() << "Got DAMAGE Event"; return; } } |