diff options
author | Samuel Rødal <samuel.rodal@digia.com> | 2013-04-09 16:52:59 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@digia.com> | 2013-04-17 09:39:21 +0200 |
commit | 82d52cdae8bb5c328db68123cb16d9d1fe4efb81 (patch) | |
tree | 58429ba7ec7cf33d520c28765ebb216d9415e620 /src/compositor/wayland_wrapper/qwlcompositor.cpp | |
parent | 05d054ad7207764293525661876ebc689940a15c (diff) |
Adapted code to use qtwaylandscanner.
We include the wayland.xml since we need to generate bindings for the
core protocol as well.
Also, WAYLANDSOURCES has been split into WAYLANDSERVERSOURCES and
WAYLANDCLIENTSOURCES since we need to produce different output in the
server and client cases.
Change-Id: I0bd493d41ca6b26dfd2d9b1463d4b762786537f9
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/compositor/wayland_wrapper/qwlcompositor.cpp')
-rw-r--r-- | src/compositor/wayland_wrapper/qwlcompositor.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/compositor/wayland_wrapper/qwlcompositor.cpp b/src/compositor/wayland_wrapper/qwlcompositor.cpp index 26defc0ba..ee7fe796b 100644 --- a/src/compositor/wayland_wrapper/qwlcompositor.cpp +++ b/src/compositor/wayland_wrapper/qwlcompositor.cpp @@ -176,8 +176,7 @@ Compositor::Compositor(QWaylandCompositor *qt_compositor) wl_display_init_shm(m_display->handle()); - m_output_global = new OutputGlobal(); - wl_display_add_global(m_display->handle(),&wl_output_interface, m_output_global, OutputGlobal::output_bind_func); + m_output_global = new OutputGlobal(m_display->handle()); m_shell = new Shell(); wl_display_add_global(m_display->handle(), &wl_shell_interface, m_shell, Shell::bind_func); @@ -426,8 +425,8 @@ Qt::ScreenOrientations Compositor::orientationUpdateMaskForClient(wl_client *cli { Output *output = m_output_global->outputForClient(client); Q_ASSERT(output); - if (output->extendedOutput()) - return output->extendedOutput()->orientationUpdateMask(); + if (output->extendedOutput) + return output->extendedOutput->orientationUpdateMask; return 0; } @@ -440,9 +439,8 @@ void Compositor::setScreenOrientation(Qt::ScreenOrientation orientation) struct wl_client *client = clientList.at(i); Output *output = m_output_global->outputForClient(client); Q_ASSERT(output); - if (output->extendedOutput()){ - output->extendedOutput()->sendOutputOrientation(orientation); - } + if (output->extendedOutput) + output->extendedOutput->sendOutputOrientation(orientation); } } |