**
****************************************************************************/
-#include "qtcompositor.h"
+#include "waylandcompositor.h"
#include "waylandsurface.h"
--- /dev/null
+INCLUDEPATH += $$PWD
+
+HEADERS += \
+ $$PWD/waylandcompositor.h \
+ $$PWD/waylandsurface.h
+
+SOURCES += \
+ $$PWD/waylandcompositor.cpp \
+ $$PWD/waylandsurface.cpp
**
****************************************************************************/
-#include "qtcompositor.h"
+#include "waylandcompositor.h"
-#include "private/wlcompositor.h"
-#include "private/wlsurface.h"
+#include "wayland_wrapper/wlcompositor.h"
+#include "wayland_wrapper/wlsurface.h"
WaylandCompositor::WaylandCompositor(QWidget *topLevelWidget)
: m_compositor(0)
#include "waylandsurface.h"
-#include "private/wlsurface.h"
+#include "wayland_wrapper/wlsurface.h"
class WaylandSurfacePrivate : public QObjectPrivate
{
SOURCES += \
$$PWD/dri2xcbhwintegration.cpp \
$$PWD/dri2xcbbuffer.cpp \
- $$PWD/../../3rdparty/wayland/wayland-drm-protocol.c \
+ $$PWD/../../../3rdparty/wayland/wayland-drm-protocol.c \
HEADERS += \
$$PWD/dri2xcbhwintegration.h \
$$PWD/dri2xcbbuffer.h \
- $$PWD/../../3rdparty/wayland/wayland-drm-server-protocol.h \
+ $$PWD/../../../3rdparty/wayland/wayland-drm-server-protocol.h \
#include "dri2xcbbuffer.h"
-#include "wlobject.h"
+#include "waylandobject.h"
#define EGL_EGLEXT_PROTOTYPES
#include <EGL/egl.h>
#ifndef DRI2XCBBUFFER_H
#define DRI2XCBBUFFER_H
-#include "wlobject.h"
-#include "wlcompositor.h"
+#include "waylandobject.h"
+#include "wayland_wrapper/wlcompositor.h"
#include <wayland-server.h>
#include "dri2xcbbuffer.h"
-#include "wlobject.h"
-#include "wldisplay.h"
-#include "wlcompositor.h"
+#include "waylandobject.h"
+#include "wayland_wrapper/wldisplay.h"
+#include "wayland_wrapper/wlcompositor.h"
#include "wayland-server.h"
#include "wayland-drm-server-protocol.h"
#ifndef DRI2XCBHWINTEGRATION_H
#define DRI2XCBHWINTEGRATION_H
-#include "../graphicshardwareintegration.h"
+#include "hardware_integration/graphicshardwareintegration.h"
class DrmObject;
#include <QtOpenGL/qgl.h>
#include <wayland-server.h>
-#include "qtcompositor.h"
-#include "private/wldisplay.h"
+#include "waylandcompositor.h"
+#include "wayland_wrapper/wldisplay.h"
class GraphicsHardwareIntegration
{
--- /dev/null
+HEADERS += \
+ $$PWD/graphicshardwareintegration.h
+
+SOURCES += \
+ $$PWD/graphicshardwareintegration.cpp
+
+wayland_gl {
+ mesa_egl {
+ include (mesa_egl/mesa_egl.pri)
+ DEFINES += QT_COMPOSITOR_MESA_EGL
+ }
+
+ dri2_xcb {
+ include (dri2_xcb/dri2_xcb.pri)
+ DEFINES += QT_COMPOSITOR_DRI2_XCB
+ }
+}
#ifndef MESAEGLINTEGRATION_H
#define MESAEGLINTEGRATION_H
-#include "../graphicshardwareintegration.h"
+#include "hardware_integration/graphicshardwareintegration.h"
#include <QtCore/QScopedPointer>
class MesaEglIntegrationPrivate;
INCLUDEPATH += $$PWD
-
use_pkgconfig {
QMAKE_CXXFLAGS += $$system(pkg-config --cflags wayland-server)
#for some reason this is not included in the cflags line
system(echo "Qt-Compositor configured with openGL")
QT += opengl
DEFINES += QT_COMPOSITOR_WAYLAND_GL
- mesa_egl {
- include (mesa_egl/mesa_egl.pri)
- DEFINES += QT_COMPOSITOR_MESA_EGL
- }
-
- dri2_xcb {
- include (dri2_xcb/dri2_xcb.pri)
- DEFINES += QT_COMPOSITOR_DRI2_XCB
- }
-
use_pkgconfig {
QMAKE_CXXFLAGS += $$system(pkg-config --cflags glesv2)
#for some reason this is not included in the cflags line
system(echo "Qt-Compositor configured as raster only compositor")
}
-SOURCES += $$PWD/qtcompositor.cpp \
- $$PWD/graphicshardwareintegration.cpp \
- $$PWD/waylandsurface.cpp \
- $$PWD/private/wlcompositor.cpp \
- $$PWD/private/wlsurface.cpp \
- $$PWD/private/wloutput.cpp \
- $$PWD/private/wldisplay.cpp \
- $$PWD/private/wlshmbuffer.cpp
-
-
-HEADERS += $$PWD/qtcompositor.h \
- $$PWD/graphicshardwareintegration.h \
- $$PWD/waylandsurface.h \
- $$PWD/private/wlcompositor.h \
- $$PWD/private/wlsurface.h \
- $$PWD/private/wloutput.h \
- $$PWD/private/wlshmbuffer.h \
- $$PWD/private/wldisplay.h \
- $$PWD/private/wlobject.h
+include ($$PWD/util/util.pri)
+include ($$PWD/wayland_wrapper/wayland_wrapper.pri)
+include ($$PWD/hardware_integration/hardware_integration.pri)
+include ($$PWD/compositor_api/compositor_api.pri)
--- /dev/null
+INCLUDEPATH += $$PWD
+
+HEADERS += \
+ $$PWD/waylandobject.h
--- /dev/null
+HEADERS += \
+ $$PWD/wlcompositor.h \
+ $$PWD/wldisplay.h \
+ $$PWD/wloutput.h \
+ $$PWD/wlshmbuffer.h \
+ $$PWD/wlsurface.h
+
+SOURCES += \
+ $$PWD/wlcompositor.cpp \
+ $$PWD/wldisplay.cpp \
+ $$PWD/wloutput.cpp \
+ $$PWD/wlshmbuffer.cpp \
+ $$PWD/wlsurface.cpp
#include "wlcompositor.h"
-#include "wlobject.h"
+#include "waylandobject.h"
#include "wldisplay.h"
#include "wlshmbuffer.h"
#include "wlsurface.h"
-#include "qtcompositor.h"
+#include "waylandcompositor.h"
#include <QApplication>
#include <QDesktopWidget>
#include <wayland-server.h>
-#ifdef QT_COMPOSITOR_MESA_EGL
-#include "../mesa_egl/mesaeglintegration.h"
-#endif
-
-#ifdef QT_COMPOSITOR_DRI2_XCB
-#include "../dri2_xcb/dri2xcbhwintegration.h"
-#endif
-
-#include "graphicshardwareintegration.h"
+#include "hardware_integration/graphicshardwareintegration.h"
namespace Wayland {
#ifndef WL_OUTPUT_H
#define WL_OUTPUT_H
-#include "wlobject.h"
+#include "waylandobject.h"
#include <QtCore/QSize>
#ifndef WL_SHMBUFFER_H
#define WL_SHMBUFFER_H
-#include "wlobject.h"
+#include "waylandobject.h"
#include <QtCore/QRect>
#include <QtGui/QImage>
#include "wlsurface.h"
-#include "../waylandsurface.h"
+#include "waylandsurface.h"
#include "wlcompositor.h"
#include "wlshmbuffer.h"
#include <linux/input.h>
#ifdef QT_COMPOSITOR_WAYLAND_GL
-#include "../graphicshardwareintegration.cpp"
+#include "hardware_integration/graphicshardwareintegration.h"
#include <QtGui/QPlatformGLContext>
#endif
#ifndef WL_SURFACE_H
#define WL_SURFACE_H
-#include "wlobject.h"
+#include "waylandobject.h"
#include "wlshmbuffer.h"
+#include "waylandsurface.h"
#include <QtCore/QRect>
#include <QtGui/QImage>
#include <QtCore/QMetaType>
#include <QtGui/private/qapplication_p.h>
-#include "../waylandsurface.h"
-
#ifdef QT_COMPOSITOR_WAYLAND_GL
#define GL_GLEXT_PROTOTYPES
#include <GLES2/gl2.h>