From b09f2e8440b7a0c9532d730d52296cf05b944ee2 Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Mon, 26 Aug 2013 08:18:56 +0200 Subject: Add QWaylandOutput to support multiple outputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a new QWaylandOutput class to support multiple outputs. Each QWaylandOutput need a window for rendering. Rename OutputGlobal to Output and Output to OutputResource. Add support for physical size, mode and available geometry. Use better defaults for geometry and refreshRate from the QWindow if available. A window is no longer passed to QWaylandCompositor constructor and all output related methods are removed, however one or more outputs are required for hardware integration. QWaylandCompositor returns a list of outputs and offers an API to add or remove outputs. Hardware integrations can run headless. Change-Id: I742996571ddb78328f7bfa4f79b25a81995279e1 Done-with: Jan Arne Petersen Done-with: Jørgen Lind Reviewed-by: Giulio Camuffo --- .../compositor/xcomposite_share/xcompositehandler.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp') diff --git a/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp b/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp index 5e002377e..13f2e65c1 100644 --- a/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp +++ b/src/hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp @@ -50,9 +50,7 @@ QT_BEGIN_NAMESPACE XCompositeHandler::XCompositeHandler(QtWayland::Compositor *compositor, Display *display) : QtWaylandServer::qt_xcomposite(compositor->wl_display(), 1) { - compositor->window()->create(); - - mFakeRootWindow = new QWindow(compositor->window()); + mFakeRootWindow = new QWindow(); mFakeRootWindow->setGeometry(QRect(-1,-1,1,1)); mFakeRootWindow->create(); mFakeRootWindow->show(); -- cgit v1.2.3