From 921fefbf2a5e4078f4dff19c3c664cbbd9b751d1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B8rgen=20Lind?= Date: Tue, 10 Apr 2012 15:28:54 +0200 Subject: [PATCH] Add public api to retrieve struct wl_display * MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I3e1b77419152cf1fbec64e517cf817f0d4a39b66 Reviewed-by: Samuel Rødal --- src/compositor/compositor_api/waylandcompositor.cpp | 4 ++++ src/compositor/compositor_api/waylandcompositor.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/compositor/compositor_api/waylandcompositor.cpp b/src/compositor/compositor_api/waylandcompositor.cpp index 79a875a..e8df248 100644 --- a/src/compositor/compositor_api/waylandcompositor.cpp +++ b/src/compositor/compositor_api/waylandcompositor.cpp @@ -85,6 +85,10 @@ WaylandCompositor::~WaylandCompositor() delete m_compositor; } +struct wl_display *WaylandCompositor::waylandDisplay() const +{ + return m_compositor->wl_display(); +} void WaylandCompositor::frameFinished(WaylandSurface *surface) { Wayland::Surface *surfaceImpl = surface? surface->handle():0; diff --git a/src/compositor/compositor_api/waylandcompositor.h b/src/compositor/compositor_api/waylandcompositor.h index 1986bf7..4fadf82 100644 --- a/src/compositor/compositor_api/waylandcompositor.h +++ b/src/compositor/compositor_api/waylandcompositor.h @@ -63,6 +63,8 @@ public: WaylandCompositor(QWindow *window = 0, const char *socketName = 0); virtual ~WaylandCompositor(); + struct wl_display *waylandDisplay() const; + void frameFinished(WaylandSurface *surface = 0); void destroyClientForSurface(WaylandSurface *surface); -- 2.7.4